archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.4'

Browse source
This commit is contained in:
Nikita Popov 2019-07-02 11:59:21 +02:00
commit 2f7c3971cc
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/opcache/ZendAccelerator.c
View file

@ -2750,7 +2750,7 @@ static void accel_move_code_to_huge_pages(void)
long unsigned int huge_page_size = 2 * 1024 * 1024; long unsigned int huge_page_size = 2 * 1024 * 1024;
if (sysctl(mib, 4, NULL, &s, NULL, 0) == 0) { if (sysctl(mib, 4, NULL, &s, NULL, 0) == 0) {
s = s * 4 / 3; s = s * 4 / 3;
void *addr = mmap(NULL, s * sizeof (struct kinfo_vmentry), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); void *addr = mmap(NULL, s, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
if (addr != MAP_FAILED) { if (addr != MAP_FAILED) {
if (sysctl(mib, 4, addr, &s, NULL, 0) == 0) { if (sysctl(mib, 4, addr, &s, NULL, 0) == 0) {
uintptr_t start = (uintptr_t)addr; uintptr_t start = (uintptr_t)addr;
@ -2769,11 +2769,14 @@ static void accel_move_code_to_huge_pages(void)
if (seg_end > seg_start) { if (seg_end > seg_start) {
zend_accel_error(ACCEL_LOG_DEBUG, "remap to huge page %lx-%lx %s \n", seg_start, seg_end, entry->kve_path); zend_accel_error(ACCEL_LOG_DEBUG, "remap to huge page %lx-%lx %s \n", seg_start, seg_end, entry->kve_path);
accel_remap_huge_pages((void*)seg_start, seg_end - seg_start, seg_end - seg_start, entry->kve_path, entry->kve_offset + seg_start - start); accel_remap_huge_pages((void*)seg_start, seg_end - seg_start, seg_end - seg_start, entry->kve_path, entry->kve_offset + seg_start - start);
// First relevant segment found is our binary
break;
} }
} }
start += sz; start += sz;
} }
} }
munmap(addr, s);
} }
} }
#endif #endif