Commit:29ee4b81f2a17943b677d9b6fb372ec36166984a
Author:Rasmus Lerdorf ras...@php.net Wed, 29 May 2013 14:17:32
-0700
Parents: 7e00d0994f666f9ed698f86bcd88087ebabe2bfe
Branches: PHP-5.5
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=29ee4b81f2a17943b677d9b6fb372ec36166984a
Log:
This needs to be a long
Otherwise we are limited to a 32G opcache segment
Changed paths:
M ext/opcache/zend_shared_alloc.c
M ext/opcache/zend_shared_alloc.h
Diff:
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 5405751..691c2a5 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 b7f3629..40f1f89 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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
