[PHP-CVS] cvs: php4 /main main.c

[Zeev Suraski]

zeev            Sat Jan 13 05:16:57 2001 EDT

  Modified files:              
    /php4/main  main.c 
  Log:
  cleanup time...
  
  
Index: php4/main/main.c
diff -u php4/main/main.c:1.348 php4/main/main.c:1.349
--- php4/main/main.c:1.348      Sat Jan 13 05:14:49 2001
+++ php4/main/main.c    Sat Jan 13 05:16:56 2001
@@ -19,7 +19,7 @@
 */
 
 
-/* $Id: main.c,v 1.348 2001/01/13 13:14:49 zeev Exp $ */
+/* $Id: main.c,v 1.349 2001/01/13 13:16:56 zeev Exp $ */
 
 
 #include <stdio.h>
@@ -81,22 +81,6 @@
 #else
 PHPAPI int core_globals_id;
 #endif
-
-#define NO_GLOBAL_LOCK
-
-/* temporary workaround for thread-safety issues in Zend */
-#if defined(ZTS) && !defined(NO_GLOBAL_LOCK)
-static MUTEX_T global_lock;
-#define global_lock() tsrm_mutex_lock(global_lock)
-#define global_unlock() tsrm_mutex_unlock(global_lock);
-#define global_lock_init() global_lock = tsrm_mutex_alloc()
-#define global_lock_destroy() tsrm_mutex_free(global_lock)
-#else
-#define global_lock()
-#define global_unlock()
-#define global_lock_init()
-#define global_lock_destroy()
-#endif
  
 
 static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC);
@@ -598,8 +582,6 @@
 #endif
 
        PG(during_request_startup) = 1;
-
-       global_lock();
        
        php_output_startup();
 
@@ -686,10 +668,6 @@
        if (setjmp(EG(bailout))==0) { 
                zend_unset_timeout();
        }
-
-       if (setjmp(EG(bailout))==0) { 
-               global_unlock();
-       }
 }
 
  
@@ -791,7 +769,6 @@
     php_os=PHP_OS;
 #endif
 
-       global_lock_init();
        sapi_initialize_empty_request(SLS_C);
        sapi_activate(SLS_C);
 
@@ -915,7 +892,6 @@
        php_shutdown_ticks(PLS_C);
        sapi_flush();
 
-       global_lock_destroy();
        zend_shutdown();
        php_shutdown_fopen_wrappers();
        php_shutdown_info_logos();



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]