diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-05-29 14:17:32 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-05-29 14:26:42 -0700 |
| commit | 80c13e99653ce2638700b6b0c32f8cf732213d75 (patch) | |
| tree | f8650f4f17094f56105b2697062ee1e86374b1c8 | |
| parent | 029c1da84647d55ddc9fb09722e1fd0cdf427ac5 (diff) | |
| download | php-git-80c13e99653ce2638700b6b0c32f8cf732213d75.tar.gz | |
This needs to be a long
Otherwise we are limited to a 2G opcache segment
| -rw-r--r-- | ext/opcache/zend_shared_alloc.c | 4 | ||||
| -rw-r--r-- | ext/opcache/zend_shared_alloc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c index 5405751ac3..691c2a595a 100644 --- a/ext/opcache/zend_shared_alloc.c +++ b/ext/opcache/zend_shared_alloc.c @@ -119,7 +119,7 @@ static void copy_shared_segments(void *to, void *from, int count, int size) } } -static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, int requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, char **error_in) +static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, long requested_size, zend_shared_segment ***shared_segments_p, int *shared_segments_count, char **error_in) { int res; g_shared_alloc_handler = he->handler; @@ -148,7 +148,7 @@ static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, int return ALLOC_FAILURE; } -int zend_shared_alloc_startup(int requested_size) +int zend_shared_alloc_startup(long requested_size) { zend_shared_segment **tmp_shared_segments; size_t shared_segments_array_size; diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h index b7f36299bf..40f1f89ec0 100644 --- a/ext/opcache/zend_shared_alloc.h +++ b/ext/opcache/zend_shared_alloc.h @@ -117,7 +117,7 @@ extern zend_smm_shared_globals *smm_shared_globals; #define SHARED_ALLOC_REATTACHED (SUCCESS+1) -int zend_shared_alloc_startup(int requested_size); +int zend_shared_alloc_startup(long requested_size); void zend_shared_alloc_shutdown(void); /* allocate shared memory block */ |