php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove reundant address comparison in accel_remap_huge_pages

Browse Source 
Closes GH-8830

MAP_FIXED guarantees mmap will return that exact address or fail so the
address comparison is redundant.

The return value of this function is unused but I kept it because it
improves readability.
This commit is contained in:
Ilija Tovilo
2022-06-19 23:46:57 +02:00
parent 2ca4116e0a
commit 1380b65d26
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/opcache/ZendAccelerator.c
+6 -6
View File
@@ -2984,19 +2984,19 @@ static int accel_remap_huge_pages(void *start, size_t size, size_t real_size, co
zend_error(E_WARNING,
ACCELERATOR_PRODUCT_NAME " huge_code_pages: mmap(HUGETLB) failed: %s (%d)",
strerror(errno), errno);
return -1;
return FAILURE;
# endif
}
// Given the MAP_FIXED flag the address can never diverge
ZEND_ASSERT(ret == start);
zend_mmap_set_name(start, size, "zend_huge_code_pages");
memcpy(start, mem, real_size);
mprotect(start, size, PROT_READ | PROT_EXEC);
if (ret == start) {
memcpy(start, mem, real_size);
mprotect(start, size, PROT_READ | PROT_EXEC);
}
munmap(mem, size);
return (ret == start) ? 0 : -1;
return SUCCESS;
}
static void accel_move_code_to_huge_pages(void)