diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-07-06 11:40:17 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-07-06 11:40:17 +0000 |
| commit | 1a1178a685a0a366d7b435af635cbcc6f2850ab4 (patch) | |
| tree | b86768714cae9d6746bf218e829de80087ab724a /Zend/zend.c | |
| parent | 388a9ccaf041e5969effefcd9f34223e441a5a8f (diff) | |
| download | php-git-1a1178a685a0a366d7b435af635cbcc6f2850ab4.tar.gz | |
eliminated unnecessary iterations during request startup/shutdown
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 64a75511f4..cdf6dacfbd 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -761,7 +761,7 @@ void zend_shutdown(TSRMLS_D) /* {{{ */ zend_shutdown_timeout_thread(); #endif zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); - zend_hash_graceful_reverse_destroy(&module_registry); + zend_destroy_modules(); zend_hash_destroy(GLOBAL_FUNCTION_TABLE); zend_hash_destroy(GLOBAL_CLASS_TABLE); @@ -859,22 +859,6 @@ void zend_activate(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_activate_modules(TSRMLS_D) /* {{{ */ -{ - zend_hash_apply(&module_registry, (apply_func_t) module_registry_request_startup TSRMLS_CC); -} -/* }}} */ - -void zend_deactivate_modules(TSRMLS_D) /* {{{ */ -{ - EG(opline_ptr) = NULL; /* we're no longer executing anything */ - - zend_try { - zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_cleanup TSRMLS_CC); - } zend_end_try(); -} -/* }}} */ - void zend_call_destructors(TSRMLS_D) /* {{{ */ { zend_try { @@ -928,22 +912,6 @@ void zend_deactivate(TSRMLS_D) /* {{{ */ } /* }}} */ -static int exec_done_cb(zend_module_entry *module TSRMLS_DC) /* {{{ */ -{ - if (module->post_deactivate_func) { - module->post_deactivate_func(); - } - return 0; -} -/* }}} */ - -void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ -{ - zend_hash_apply(&module_registry, (apply_func_t) exec_done_cb TSRMLS_CC); - zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_unload_temp TSRMLS_CC); -} -/* }}} */ - BEGIN_EXTERN_C() ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /* {{{ */ { |