From: Andi Gutmans <andi@php.net>
Date: Mon, 24 Jun 2002 13:45:21 +0000 (+0000)
Subject: - MFZE1
X-Git-Tag: php-4.3.0dev_zend2_alpha2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95e0bb6a4b2b5a43e874ebc24d2e4a0b0c54c185;p=php

- MFZE1
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 48d1f3e3fc..2074b665e2 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -404,13 +404,6 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
 
 ZEND_API void start_memory_manager(TSRMLS_D)
 {
-#if 0
-#ifndef ZTS
-	int i, j;
-	void *cached_entries[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
-#endif
-#endif
-
 	AG(head) = NULL;
 	
 #if MEMORY_LIMIT
@@ -433,25 +426,6 @@ ZEND_API void start_memory_manager(TSRMLS_D)
 	AG(memory_heap) = HeapCreate(HEAP_NO_SERIALIZE, 256*1024, 0);
 #endif
 
-#if 0
-#ifndef ZTS
-	/* Initialize cache, to prevent fragmentation */
-	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
-	 * will yield an endless recursion calling to alloc_globals_ctor()
-	 */
-	for (i=1; i<MAX_CACHED_MEMORY; i++) {
-		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<PRE_INIT_CACHE_ENTRIES; j++) {
-			efree(cached_entries[i][j]);
-		}
-	}
-#endif
-#endif
-
 #if ZEND_DEBUG
 	memset(AG(cache_stats), 0, sizeof(AG(cache_stats)));
 	memset(AG(fast_cache_stats), 0, sizeof(AG(fast_cache_stats)));