From 999545258308effa49fde71b7af7fdd991256e3a Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 8 Dec 2014 13:14:15 +0100 Subject: [PATCH 1/3] Wasted Shared Memory aboce 2Gb fix --- ext/opcache/zend_shared_alloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h index ec7cc14d07e..9b0bbc378ce 100644 --- a/ext/opcache/zend_shared_alloc.h +++ b/ext/opcache/zend_shared_alloc.h @@ -102,7 +102,7 @@ typedef struct _zend_smm_shared_globals { /* Amount of free shared memory */ size_t shared_free; /* Amount of shared memory allocated by garbage */ - int wasted_shared_memory; + size_t wasted_shared_memory; /* No more shared memory flag */ zend_bool memory_exhausted; /* Saved Shared Allocator State */ From 3141922321b000d6d9b186e781a6849c18324f21 Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 8 Dec 2014 13:54:12 +0100 Subject: [PATCH 2/3] hashmap sizes --- ext/opcache/zend_accelerator_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/zend_accelerator_hash.c b/ext/opcache/zend_accelerator_hash.c index 671792239b5..c399d89a09a 100644 --- a/ext/opcache/zend_accelerator_hash.c +++ b/ext/opcache/zend_accelerator_hash.c @@ -26,7 +26,7 @@ /* Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster */ static uint prime_numbers[] = - {5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 }; + {5, 11, 19, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 49157, 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469, 12582917, 25165843, 50331653, 100663319, 201326611, 402653189, 805306457, 1610612741 }; static uint num_prime_numbers = sizeof(prime_numbers) / sizeof(uint); void zend_accel_hash_clean(zend_accel_hash *accel_hash) From bdb2d490715c70b413e0c8a4eaebab78407a46b5 Mon Sep 17 00:00:00 2001 From: Adrian Date: Sun, 21 Dec 2014 15:22:49 +0100 Subject: [PATCH 3/3] Update zend_accelerator_hash.c --- ext/opcache/zend_accelerator_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/zend_accelerator_hash.c b/ext/opcache/zend_accelerator_hash.c index c399d89a09a..671792239b5 100644 --- a/ext/opcache/zend_accelerator_hash.c +++ b/ext/opcache/zend_accelerator_hash.c @@ -26,7 +26,7 @@ /* Generated on an Octa-ALPHA 300MHz CPU & 2.5GB RAM monster */ static uint prime_numbers[] = - {5, 11, 19, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 49157, 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469, 12582917, 25165843, 50331653, 100663319, 201326611, 402653189, 805306457, 1610612741 }; + {5, 11, 19, 53, 107, 223, 463, 983, 1979, 3907, 7963, 16229, 32531, 65407, 130987, 262237, 524521, 1048793 }; static uint num_prime_numbers = sizeof(prime_numbers) / sizeof(uint); void zend_accel_hash_clean(zend_accel_hash *accel_hash)