Re: cvs: php4 /main main.c php_main.h Zend zend.c zend_alloc.c zend_alloc.h

Sebastian, I'll fix it. It seems that some of my stuff went it and some didn't. Andi At 06:59 PM 2/26/2002 +0000, Andi Gutmans wrote:

andi            Tue Feb 26 13:59:30 2002 EDT

Modified files:

    /Zend       zend.c zend_alloc.c zend_alloc.h
    /php4/main  main.c php_main.h

Log: - Pass shutdown_memory_manager the TSRMLS context. Index: Zend/zend.c diff -u Zend/zend.c:1.144 Zend/zend.c:1.145 --- Zend/zend.c:1.144 Sun Jan 6 10:21:08 2002 +++ Zend/zend.c Tue Feb 26 13:59:25 2002 @@ -349,7 +349,7 @@ static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC) {

-       shutdown_memory_manager(0, 1);
+       shutdown_memory_manager(0, 1 TSRMLS_CC);

} Index: Zend/zend_alloc.c diff -u Zend/zend_alloc.c:1.95 Zend/zend_alloc.c:1.96

--- Zend/zend_alloc.c:1.95      Sun Jan  6 10:21:09 2002

+++ Zend/zend_alloc.c Tue Feb 26 13:59:25 2002 @@ -445,7 +445,7 @@ } -ZEND_API void shutdown_memory_manager(int silent, int clean_cache) +ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) {

        zend_mem_header *p, *t;
        unsigned int fci, i, j;

@@ -453,7 +453,6 @@

        int had_leaks = 0;

#endif

        zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
-       TSRMLS_FETCH();

#if defined(ZEND_WIN32) && !ZEND_DEBUG

        if (clean_cache && AG(memory_heap)) {

Index: Zend/zend_alloc.h diff -u Zend/zend_alloc.h:1.33 Zend/zend_alloc.h:1.34

--- Zend/zend_alloc.h:1.33      Sun Jan  6 10:21:09 2002

+++ Zend/zend_alloc.h Tue Feb 26 13:59:25 2002 @@ -115,7 +115,7 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit); ZEND_API void start_memory_manager(TSRMLS_D); -ZEND_API void shutdown_memory_manager(int silent, int clean_cache); +ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC); #if ZEND_DEBUG ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); Index: php4/main/main.c diff -u php4/main/main.c:1.422 php4/main/main.c:1.423

--- php4/main/main.c:1.422      Thu Feb 14 15:16:05 2002
+++ php4/main/main.c    Tue Feb 26 13:59:27 2002

@@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: main.c,v 1.422 2002/02/14 20:16:05 derick Exp $ */ +/* $Id: main.c,v 1.423 2002/02/26 18:59:27 andi Exp $ */ /* {{{ includes */ @@ -698,9 +698,11 @@ */ void php_request_shutdown_for_exec(void *dummy) {

+       TSRMLS_FETCH();

+

        /* used to close fd's in the 3..255 range here, but it's problematic
        */
-       shutdown_memory_manager(1, 1);
+       shutdown_memory_manager(1, 1 TSRMLS_CC);

} /* }}} */ Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.16 php4/main/php_main.h:1.17 --- php4/main/php_main.h:1.16 Tue Dec 11 10:31:04 2001

+++ php4/main/php_main.h        Tue Feb 26 13:59:27 2002

@@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.16 2001/12/11 15:31:04 sebastian Exp $ */ +/* $Id: php_main.h,v 1.17 2002/02/26 18:59:27 andi Exp $ */ #ifndef PHP_MAIN_H @@ -30,7 +30,7 @@ PHPAPI int php_request_startup(TSRMLS_D); PHPAPI void php_request_shutdown(void *dummy); -PHPAPI void php_request_shutdown_for_exec(void *dummy); +PHPAPI void php_request_shutdown_for_exec(void *dummy TSRMLS_DC); PHPAPI int php_module_startup(sapi_module_struct *sf); PHPAPI void php_module_shutdown(TSRMLS_D); PHPAPI void php_module_shutdown_for_exec(void); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php