com php-src: .text segment may be not the first one: ext/opcache/ZendAccelerator.c

From: Date: Wed, 22 May 2019 09:20:34 +0000
Subject: com php-src: .text segment may be not the first one: ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106284@lists.php.net to get a copy of this message
Commit: 7c99589be210eac023bf780263ed6ebcddf76a16 Author: Dmitry Stogov <dmitry@zend.com> Wed, 22 May 2019 12:20:34 +0300 Parents: ff4b0ce0e8d582e4b8f6c44270a77f511d28bacd Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c99589be210eac023bf780263ed6ebcddf76a16 Log: .text segment may be not the first one Changed paths: M ext/opcache/ZendAccelerator.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index e28db63..7824ff9 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2692,14 +2692,21 @@ static void accel_move_code_to_huge_pages(void) char perm[5], dev[6], name[MAXPATHLEN]; int ret; - ret = fscanf(f, "%lx-%lx %4s %lx %5s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name); - if (ret == 7 && perm[0] == 'r' && perm[1] == '-' && perm[2] == 'x' && name[0] == '/') { - long unsigned int seg_start = ZEND_MM_ALIGNED_SIZE_EX(start, huge_page_size); - long unsigned int seg_end = (end & ~(huge_page_size-1L)); - - if (seg_end > seg_start) { - zend_accel_error(ACCEL_LOG_DEBUG, "remap to huge page %lx-%lx %s \n", seg_start, seg_end, name); - accel_remap_huge_pages((void*)seg_start, seg_end - seg_start, name, offset + seg_start - start); + while (1) { + ret = fscanf(f, "%lx-%lx %4s %lx %5s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name); + if (ret == 7) { + if (perm[0] == 'r' && perm[1] == '-' && perm[2] == 'x' && name[0] == '/') { + long unsigned int seg_start = ZEND_MM_ALIGNED_SIZE_EX(start, huge_page_size); + long unsigned int seg_end = (end & ~(huge_page_size-1L)); + + if (seg_end > seg_start) { + zend_accel_error(ACCEL_LOG_DEBUG, "remap to huge page %lx-%lx %s \n", seg_start, seg_end, name); + accel_remap_huge_pages((void*)seg_start, seg_end - seg_start, name, offset + seg_start - start); + } + break; + } + } else { + break; } } fclose(f);

« previous php.cvs (#106284) next »