1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- a/ext/opcache/ZendAccelerator.c 2015-11-25 05:04:23.000000000 +0100
+++ b/ext/opcache/tmp/ZendAccelerator.c 2015-11-27 12:38:07.806097341 +0100
@@ -2515,6 +2515,8 @@
MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0);
if (mem == MAP_FAILED) {
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap failed: %s (%d)", strerror(errno), errno);
return -1;
}
memcpy(mem, start, size);
@@ -2525,17 +2527,42 @@
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | MAP_HUGETLB,
-1, 0);
# endif
-# ifdef MADV_HUGEPAGE
if (ret == MAP_FAILED) {
+# ifdef MADV_HUGEPAGE
ret = mmap(start, size,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
-1, 0);
- madvise(start, size, MADV_HUGEPAGE);
- }
+ if (ret == MAP_FAILED) {
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap(FIXED) failed: %s (%d)",
+ strerror(errno), errno);
+ munmap(mem, size);
+ return -1;
+ }
+ if (-1 == madvise(start, size, MADV_HUGEPAGE)) {
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME " huge_code_pages: madvise(HUGEPAGE) failed: %s (%d)",
+ strerror(errno), errno);
+ munmap(mem, size);
+ return -1;
+ }
+# else
+ ret = mmap(start, size,
+ PROT_READ | PROT_WRITE | PROT_EXEC,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+ if (ret == MAP_FAILED) {
+ /* this should never happen */
+ }
+ memcpy(start, mem, size);
+ zend_error(E_WARNING,
+ ACCELERATOR_PRODUCT_NAME "huge_code_pages: mmap(HUGETLB) failed: %s (%d)", strerror(errno), errno);
+ return -1;
# endif
+ }
+
if (ret == start) {
- memcpy(start, mem, size);
+ memcpy(start, mem, size);
mprotect(start, size, PROT_READ | PROT_EXEC);
}
munmap(mem, size);
|
