CVS update: php31/main

Date: Monday September 14, 1998 @ 21:34 Author: shane Update of /repository/php31/main In directory asf:/u2/tmp/cvs-serv27176/main Modified Files: automated_configuration_definitions.h main.c Log Message: registry now gets cached. Index: php31/main/automated_configuration_definitions.h diff -c php31/main/automated_configuration_definitions.h:2.5 php31/main/automated_configuration_definitions.h:2.6 *** php31/main/automated_configuration_definitions.h:2.5 Sun Sep 6 17:34:33 1998 --- php31/main/automated_configuration_definitions.h Mon Sep 14 21:34:23 1998 *************** *** 285,313 **** - #elif defined(AC_REGISTRY_TABLE_FREE) && !defined(AC_REGISTRY_TABLE_FREE_DONE) - # define BEGIN_INI_TABLE(name) - # define END_INI_TABLE() - # define AC_LONG 0 - # define AC_DOUBLE 0 - # define AC_STRING 1 - # define AC_BOOL AC_LONG - # define AC_YES 1 - # define AC_NO 0 - # define AC_NO_SAFEMODE AC_NO - # define INI_ENTRY(name, type, default_value, user_modifyable, description) \ - if (user_modifyable && type) efree(GLOBAL(php3_ini)->name; - # define GROUP_INI_ENTRY(group_name, name, type, default_value, user_modifyable, description) \ - if (user_modifyable && type) efree(GLOBAL(php3_ini)->group_name##_##name; - - - - - - - - - #elif defined(AC_INFO_TABLE) && !defined(AC_INFO_TABLE_DONE) # define BEGIN_INI_TABLE(name) --- 285,290 ---- Index: php31/main/main.c diff -c php31/main/main.c:2.36 php31/main/main.c:2.37 *** php31/main/main.c:2.36 Thu Sep 10 20:22:51 1998 --- php31/main/main.c Mon Sep 14 21:34:23 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.36 1998/09/11 00:22:51 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 2.37 1998/09/15 01:34:23 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1217,1222 **** --- 1217,1229 ---- * * this is the same for process_end. */ + + #if WIN32|WINNT + /* for registry cache, only needed for process start/end */ + extern void *reg_mutex; + extern void _reg_clear_cache(void); + #endif + PHPAPI int _php3_sapi_process_start(php3_module_entry *module_info){ #ifdef THREAD_SAFE php3_globals_struct *php3_globals; *************** *** 1236,1241 **** --- 1243,1251 ---- #endif #ifdef THREAD_SAFE + #if WIN32|WINNT + PHP3_MUTEX_ALLOC(reg_mutex); + #endif PHP3_MUTEX_ALLOC(gLock); PHP3_CRITICAL_ALLOC(Tls_crit); if (!PHP3_TLS_PROC_STARTUP(TlsIndex))return 0; *************** *** 1349,1355 **** /* * sapi thread end */ ! PHPAPI int _php3_sapi_thread_end(){ #ifdef THREAD_SAFE php3_globals_struct *php3_globals; PHP3_TLS_GET(TlsIndex,php3_globals); --- 1359,1365 ---- /* * sapi thread end */ ! PHPAPI int _php3_sapi_thread_end(void){ #ifdef THREAD_SAFE php3_globals_struct *php3_globals; PHP3_TLS_GET(TlsIndex,php3_globals); *************** *** 1373,1379 **** /* * sapi process end */ ! PHPAPI int _php3_sapi_process_end(){ #ifdef THREAD_SAFE php3_globals_struct *php3_globals; PHP3_TLS_GET(TlsIndex,php3_globals); --- 1383,1389 ---- /* * sapi process end */ ! PHPAPI int _php3_sapi_process_end(void){ #ifdef THREAD_SAFE php3_globals_struct *php3_globals; PHP3_TLS_GET(TlsIndex,php3_globals); *************** *** 1390,1395 **** --- 1400,1409 ---- yy_destroy_tls(); #if defined(CRASH_DETECTION) debug_log("%d:DLL UNLoad Success\n",GetCurrentThreadId()); + #endif + #if WIN32|WINNT + _reg_clear_cache(); + PHP3_MUTEX_FREE(reg_mutex); #endif PHP3_MUTEX_FREE(gLock); PHP3_CRITICAL_FREE(Tls_crit); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net