php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Improve shared_alloc_shm.c strategy to support OPcache JIT on Solaris
This commit is contained in:
Ilija Tovilo
2026-02-09 14:58:57 +01:00
parent d992576abc 7c6f08945f
commit 81de7b964f
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -27,6 +27,10 @@ PHP NEWS
. Fixed bug GH-21097 (Accessing Dom\Node properties can can throw TypeError).
(ndossche)
- Opcache:
. Fixed bug GH-20718 ("Insufficient shared memory" when using JIT on Solaris).
(Petr Sumbera)
- Windows:
. Fixed compilation with clang (missing intrin.h include). (Kévin Dunglas)

43
ext/opcache/shared_alloc_shm.c
View File

@@ -42,7 +42,6 @@
# define MIN(x, y) ((x) > (y)? (y) : (x))
#endif
#define SEG_ALLOC_SIZE_MAX 32*1024*1024
#define SEG_ALLOC_SIZE_MIN 2*1024*1024
typedef struct {
@@ -53,36 +52,38 @@ typedef struct {
static int create_segments(size_t requested_size, zend_shared_segment_shm ***shared_segments_p, int *shared_segments_count, const char **error_in)
{
int i;
size_t allocate_size = 0, remaining_bytes = requested_size, seg_allocate_size;
size_t allocate_size = 0, remaining_bytes, seg_allocate_size;
int first_segment_id = -1;
key_t first_segment_key = -1;
struct shmid_ds sds;
int shmget_flags;
zend_shared_segment_shm *shared_segments;
seg_allocate_size = SEG_ALLOC_SIZE_MAX;
/* determine segment size we _really_ need:
* no more than to include requested_size
*/
while (requested_size * 2 <= seg_allocate_size && seg_allocate_size > SEG_ALLOC_SIZE_MIN) {
seg_allocate_size >>= 1;
}
shmget_flags = IPC_CREAT|SHM_R|SHM_W|IPC_EXCL;
/* try allocating this much, if not - try shrinking */
while (seg_allocate_size >= SEG_ALLOC_SIZE_MIN) {
allocate_size = MIN(requested_size, seg_allocate_size);
first_segment_id = shmget(first_segment_key, allocate_size, shmget_flags);
if (first_segment_id != -1) {
break;
/* Try contiguous allocation first. */
seg_allocate_size = requested_size;
first_segment_id = shmget(first_segment_key, seg_allocate_size, shmget_flags);
if (UNEXPECTED(first_segment_id == -1)) {
/* Search for biggest n^2 < requested_size. */
seg_allocate_size = SEG_ALLOC_SIZE_MIN;
while (seg_allocate_size < requested_size / 2) {
seg_allocate_size *= 2;
}
seg_allocate_size >>= 1; /* shrink the allocated block */
}
if (first_segment_id == -1) {
*error_in = "shmget";
return ALLOC_FAILURE;
/* try allocating this much, if not - try shrinking */
while (seg_allocate_size >= SEG_ALLOC_SIZE_MIN) {
first_segment_id = shmget(first_segment_key, seg_allocate_size, shmget_flags);
if (first_segment_id != -1) {
break;
}
seg_allocate_size >>= 1; /* shrink the allocated block */
}
if (first_segment_id == -1) {
*error_in = "shmget";
return ALLOC_FAILURE;
}
}
*shared_segments_count = ((requested_size - 1) / seg_allocate_size) + 1;