- Change cache size and only initialize part of it.

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index ae1449eb6601f45ef0b0cb5a014b3b4a98ce934a..52526d88d9d75da02bc4d96f7e6f34fb60430653 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -369,12 +369,12 @@ ZEND_API void start_memory_manager(ALS_D)
         * will yield an endless recursion calling to alloc_globals_ctor()
         */
        for (i=1; i<MAX_CACHED_MEMORY; i++) {
-               for (j=0; j<MAX_CACHED_ENTRIES; j++) {
+               for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
                        cached_entries[i][j] = emalloc(8*i);
                }
        }
        for (i=1; i<MAX_CACHED_MEMORY; i++) {
-               for (j=0; j<MAX_CACHED_ENTRIES; j++) {
+               for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
                        efree(cached_entries[i][j]);
                }
        }

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 2e15f17d42c6bf273a80791e2f61f82d3a0b209e..df24b98f70e12f964bda7f8c32190f3e7b3e4d01 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -26,7 +26,7 @@
 #include "zend_globals_macros.h"
 
 #define MEM_BLOCK_START_MAGIC  0x7312F8DCL
-#define MEM_BLOCK_END_MAGIC            0x2A8FCC84L
+#define MEM_BLOCK_END_MAGIC    0x2A8FCC84L
 #define MEM_BLOCK_FREED_MAGIC  0x99954317L
 #define MEM_BLOCK_CACHED_MAGIC 0xFB8277DCL
 
@@ -52,8 +52,10 @@ typedef union _align_test {
        long lng;
 } align_test;
 
-#define MAX_CACHED_MEMORY      16
-#define MAX_CACHED_ENTRIES     24
+#define MAX_CACHED_MEMORY      11
+#define MAX_CACHED_ENTRIES     256
+#define PRE_INIT_CACHE_ENTRIES 32
+
 #if (defined (__GNUC__) && __GNUC__ >= 2)
 #define PLATFORM_ALIGNMENT (__alignof__ (align_test))
 #else