diff options
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.c | 186 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 42 | ||||
| -rw-r--r-- | TSRM/tsrm.m4 | 74 |
3 files changed, 45 insertions, 257 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 1a8d5192ff..bcd5c806b1 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -102,31 +102,14 @@ static FILE *tsrm_error_file; } #endif -#if defined(GNUPTH) -static pth_key_t tls_key; -# define tsrm_tls_set(what) pth_key_setdata(tls_key, (void*)(what)) -# define tsrm_tls_get() pth_key_getdata(tls_key) - -#elif defined(PTHREADS) -/* Thread local storage */ -static pthread_key_t tls_key; -# define tsrm_tls_set(what) pthread_setspecific(tls_key, (void*)(what)) -# define tsrm_tls_get() pthread_getspecific(tls_key) - -#elif defined(TSRM_ST) -static int tls_key; -# define tsrm_tls_set(what) st_thread_setspecific(tls_key, (void*)(what)) -# define tsrm_tls_get() st_thread_getspecific(tls_key) - -#elif defined(TSRM_WIN32) +#if defined(TSRM_WIN32) static DWORD tls_key; # define tsrm_tls_set(what) TlsSetValue(tls_key, (void*)(what)) # define tsrm_tls_get() TlsGetValue(tls_key) - #else -# define tsrm_tls_set(what) -# define tsrm_tls_get() NULL -# warning tsrm_set_interpreter_context is probably broken on this platform +static pthread_key_t tls_key; +# define tsrm_tls_set(what) pthread_setspecific(tls_key, (void*)(what)) +# define tsrm_tls_get() pthread_getspecific(tls_key) #endif TSRM_TLS uint8_t in_main_thread = 0; @@ -135,16 +118,10 @@ TSRM_TLS uint8_t is_thread_shutdown = 0; /* Startup TSRM (call once for the entire process) */ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename) {/*{{{*/ -#if defined(GNUPTH) - pth_init(); - pth_key_create(&tls_key, 0); -#elif defined(PTHREADS) - pthread_key_create( &tls_key, 0 ); -#elif defined(TSRM_ST) - st_init(); - st_key_create(&tls_key, 0); -#elif defined(TSRM_WIN32) +#if defined(TSRM_WIN32) tls_key = TlsAlloc(); +#else + pthread_key_create(&tls_key, 0); #endif /* ensure singleton */ @@ -232,13 +209,11 @@ TSRM_API void tsrm_shutdown(void) if (tsrm_error_file!=stderr) { fclose(tsrm_error_file); } -#if defined(GNUPTH) - pth_kill(); -#elif defined(PTHREADS) +#if defined(TSRM_WIN32) + TlsFree(tls_key); +#else pthread_setspecific(tls_key, 0); pthread_key_delete(tls_key); -#elif defined(TSRM_WIN32) - TlsFree(tls_key); #endif if (tsrm_shutdown_handler) { tsrm_shutdown_handler(); @@ -494,67 +469,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id) TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count); }/*}}}*/ -/* frees an interpreter context. You are responsible for making sure that - * it is not linked into the TSRM hash, and not marked as the current interpreter */ -void tsrm_free_interpreter_context(void *context) -{/*{{{*/ - tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context; - int i; - - while (thread_resources) { - next = thread_resources->next; - - for (i=0; i<thread_resources->count; i++) { - if (resource_types_table[i].dtor) { - resource_types_table[i].dtor(thread_resources->storage[i]); - } - } - for (i=0; i<thread_resources->count; i++) { - if (!resource_types_table[i].fast_offset) { - free(thread_resources->storage[i]); - } - } - free(thread_resources->storage); - free(thread_resources); - thread_resources = next; - } -}/*}}}*/ - -void *tsrm_set_interpreter_context(void *new_ctx) -{/*{{{*/ - tsrm_tls_entry *current; - - current = tsrm_tls_get(); - - /* TODO: unlink current from the global linked list, and replace it - * it with the new context, protected by mutex where/if appropriate */ - - /* Set thread local storage to this new thread resources structure */ - tsrm_tls_set(new_ctx); - - /* return old context, so caller can restore it when they're done */ - return current; -}/*}}}*/ - - -/* allocates a new interpreter context */ -void *tsrm_new_interpreter_context(void) -{/*{{{*/ - tsrm_tls_entry *new_ctx, *current; - THREAD_T thread_id; - - thread_id = tsrm_thread_id(); - tsrm_mutex_lock(tsmm_mutex); - - current = tsrm_tls_get(); - - allocate_new_resource(&new_ctx, thread_id); - - /* switch back to the context that was in use prior to our creation - * of the new one */ - return tsrm_set_interpreter_context(current); -}/*}}}*/ - /* frees all resources allocated for the current thread */ void ts_free_thread(void) @@ -637,8 +551,6 @@ void ts_free_id(ts_rsrc_id id) }/*}}}*/ - - /* * Utility Functions */ @@ -648,12 +560,8 @@ TSRM_API THREAD_T tsrm_thread_id(void) {/*{{{*/ #ifdef TSRM_WIN32 return GetCurrentThreadId(); -#elif defined(GNUPTH) - return pth_self(); -#elif defined(PTHREADS) +#else return pthread_self(); -#elif defined(TSRM_ST) - return st_thread_self(); #endif }/*}}}*/ @@ -665,14 +573,9 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void) #ifdef TSRM_WIN32 mutexp = malloc(sizeof(CRITICAL_SECTION)); InitializeCriticalSection(mutexp); -#elif defined(GNUPTH) - mutexp = (MUTEX_T) malloc(sizeof(*mutexp)); - pth_mutex_init(mutexp); -#elif defined(PTHREADS) +#else mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t)); pthread_mutex_init(mutexp,NULL); -#elif defined(TSRM_ST) - mutexp = st_mutex_new(); #endif #ifdef THR_DEBUG printf("Mutex created thread: %d\n",mythreadid()); @@ -688,13 +591,9 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp) #ifdef TSRM_WIN32 DeleteCriticalSection(mutexp); free(mutexp); -#elif defined(GNUPTH) - free(mutexp); -#elif defined(PTHREADS) +#else pthread_mutex_destroy(mutexp); free(mutexp); -#elif defined(TSRM_ST) - st_mutex_destroy(mutexp); #endif } #ifdef THR_DEBUG @@ -713,15 +612,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp) #ifdef TSRM_WIN32 EnterCriticalSection(mutexp); return 0; -#elif defined(GNUPTH) - if (pth_mutex_acquire(mutexp, 0, NULL)) { - return 0; - } - return -1; -#elif defined(PTHREADS) +#else return pthread_mutex_lock(mutexp); -#elif defined(TSRM_ST) - return st_mutex_lock(mutexp); #endif }/*}}}*/ @@ -736,15 +628,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp) #ifdef TSRM_WIN32 LeaveCriticalSection(mutexp); return 0; -#elif defined(GNUPTH) - if (pth_mutex_release(mutexp)) { - return 0; - } - return -1; -#elif defined(PTHREADS) +#else return pthread_mutex_unlock(mutexp); -#elif defined(TSRM_ST) - return st_mutex_unlock(mutexp); #endif }/*}}}*/ @@ -755,12 +640,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp) TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset) {/*{{{*/ TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id())); - /* TODO: add support for other APIs */ -#ifdef PTHREADS - return pthread_sigmask(how, set, oldset); -#else - return sigprocmask(how, set, oldset); -#endif + + return pthread_sigmask(how, set, oldset); }/*}}}*/ #endif @@ -842,6 +723,29 @@ TSRM_API void *tsrm_get_ls_cache(void) return tsrm_tls_get(); }/*}}}*/ +/* Returns offset of tsrm_ls_cache slot from Thread Control Block address */ +TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void) +{/*{{{*/ +#if defined(__APPLE__) && defined(__x86_64__) + // TODO: Implement support for fast JIT ZTS code ??? + return 0; +#elif defined(__x86_64__) && defined(__GNUC__) + size_t ret; + + asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0" + : "=r" (ret)); + return ret; +#elif defined(__i386__) && defined(__GNUC__) + size_t ret; + + asm ("leal _tsrm_ls_cache@ntpoff,%0" + : "=r" (ret)); + return ret; +#else + return 0; +#endif +}/*}}}*/ + TSRM_API uint8_t tsrm_is_main_thread(void) {/*{{{*/ return in_main_thread; @@ -854,16 +758,10 @@ TSRM_API uint8_t tsrm_is_shutdown(void) TSRM_API const char *tsrm_api_name(void) {/*{{{*/ -#if defined(GNUPTH) - return "GNU Pth"; -#elif defined(PTHREADS) - return "POSIX Threads"; -#elif defined(TSRM_ST) - return "State Threads"; -#elif defined(TSRM_WIN32) +#if defined(TSRM_WIN32) return "Windows Threads"; #else - return "Unknown"; + return "POSIX Threads"; #endif }/*}}}*/ diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index d710eb6f75..9b67c0c2df 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -44,14 +44,8 @@ typedef uintptr_t tsrm_uintptr_t; # ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS # define WIN32_LEAN_AND_MEAN # endif -# include <windows.h> -# include <shellapi.h> -#elif defined(GNUPTH) -# include <pth.h> -#elif defined(PTHREADS) +#else # include <pthread.h> -#elif defined(TSRM_ST) -# include <st.h> #endif #if SIZEOF_SIZE_T == 4 @@ -68,15 +62,9 @@ typedef int ts_rsrc_id; #ifdef TSRM_WIN32 # define THREAD_T DWORD # define MUTEX_T CRITICAL_SECTION * -#elif defined(GNUPTH) -# define THREAD_T pth_t -# define MUTEX_T pth_mutex_t * -#elif defined(PTHREADS) +#else # define THREAD_T pthread_t # define MUTEX_T pthread_mutex_t * -#elif defined(TSRM_ST) -# define THREAD_T st_thread_t -# define MUTEX_T st_mutex_t #endif #include <signal.h> @@ -143,13 +131,8 @@ TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_th TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler); TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler); -/* these 3 APIs should only be used by people that fully understand the threading model - * used by PHP/Zend and the selected SAPI. */ -TSRM_API void *tsrm_new_interpreter_context(void); -TSRM_API void *tsrm_set_interpreter_context(void *new_ctx); -TSRM_API void tsrm_free_interpreter_context(void *context); - TSRM_API void *tsrm_get_ls_cache(void); +TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void); TSRM_API uint8_t tsrm_is_main_thread(void); TSRM_API uint8_t tsrm_is_shutdown(void); TSRM_API const char *tsrm_api_name(void); @@ -163,8 +146,6 @@ TSRM_API const char *tsrm_api_name(void); #define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1) #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)-1) -#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx -#define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache() #define TSRMG(id, type, element) (TSRMG_BULK(id, type)->element) #define TSRMG_BULK(id, type) ((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)]) #define TSRMG_FAST(offset, type, element) (TSRMG_FAST_BULK(offset, type)->element) @@ -179,13 +160,6 @@ TSRM_API const char *tsrm_api_name(void); #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() #define TSRMLS_CACHE _tsrm_ls_cache -/* BC only */ -#define TSRMLS_D void -#define TSRMLS_DC -#define TSRMLS_C -#define TSRMLS_CC -#define TSRMLS_FETCH() - #ifdef __cplusplus } #endif @@ -195,10 +169,6 @@ TSRM_API const char *tsrm_api_name(void); #define tsrm_env_lock() #define tsrm_env_unlock() -#define TSRMLS_FETCH() -#define TSRMLS_FETCH_FROM_CTX(ctx) -#define TSRMLS_SET_CTX(ctx) - #define TSRMG_STATIC(id, type, element) #define TSRMLS_CACHE_EXTERN() #define TSRMLS_CACHE_DEFINE() @@ -207,12 +177,6 @@ TSRM_API const char *tsrm_api_name(void); #define TSRM_TLS -/* BC only */ -#define TSRMLS_D void -#define TSRMLS_DC -#define TSRMLS_C -#define TSRMLS_CC - #endif /* ZTS */ #endif /* TSRM_H */ diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 0330d7a7da..9f5c8001d8 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -1,44 +1,6 @@ dnl This file contains TSRM specific autoconf macros. dnl -dnl TSRM_CHECK_PTH -dnl -AC_DEFUN([TSRM_CHECK_PTH],[ -AC_MSG_CHECKING(for GNU Pth) -PTH_PREFIX="`$1 --prefix`" -if test -z "$PTH_PREFIX"; then - AC_MSG_RESULT(Please check your Pth installation) -fi - -CPPFLAGS="$CPPFLAGS `$1 --cflags`" -LDFLAGS="$LDFLAGS `$1 --ldflags`" -LIBS="$LIBS `$1 --libs`" - -AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth]) -AC_MSG_RESULT(yes - installed in $PTH_PREFIX) -]) - -dnl -dnl TSRM_CHECK_ST -dnl -AC_DEFUN([TSRM_CHECK_ST],[ - if test -r "$1/include/st.h"; then - CPPFLAGS="$CPPFLAGS -I$1/include" - LDFLAGS="$LDFLAGS -L$1/lib" - elif test -r "$1/st.h"; then - CPPFLAGS="$CPPFLAGS -I$1" - LDFLAGS="$LDFLAGS -L$1" - fi - AC_CHECK_HEADERS(st.h,[],[ - AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix]) - ]) - LIBS="$LIBS -lst" - AC_MSG_CHECKING(for SGI's State Threads) - AC_MSG_RESULT(yes) - AC_DEFINE(TSRM_ST, 1, [ ]) -]) - -dnl dnl TSRM_CHECK_PTHREADS dnl AC_DEFUN([TSRM_CHECK_PTHREADS],[ @@ -53,39 +15,3 @@ AC_DEFINE(PTHREADS, 1, Whether to use Pthreads) AC_MSG_CHECKING(for POSIX threads) AC_MSG_RESULT(yes) ]) - -dnl -dnl TSRM_THREADS_CHECKS -dnl -dnl For the thread implementations, we always use --with-* to maintain -dnl consistency. -dnl -AC_DEFUN([TSRM_THREADS_CHECKS],[ -AC_ARG_WITH([tsrm-pth], - [AS_HELP_STRING([[--with-tsrm-pth[=pth-config]]], - [Use GNU Pth])], - [TSRM_PTH=$withval], - [TSRM_PTH=no]) - -AC_ARG_WITH([tsrm-st], - [AS_HELP_STRING([--with-tsrm-st], - [Use SGI's State Threads])], - [TSRM_ST=$withval], - [TSRM_ST=no]) - -AC_ARG_WITH([tsrm-pthreads], - [AS_HELP_STRING([--with-tsrm-pthreads], - [Use POSIX threads (default)])], - [TSRM_PTHREADS=$withval], - [TSRM_PTHREADS=yes]) - -test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config - -if test "$TSRM_PTH" != "no"; then - TSRM_CHECK_PTH($TSRM_PTH) -elif test "$TSRM_ST" != "no"; then - TSRM_CHECK_ST($TSRM_ST) -elif test "$TSRM_PTHREADS" != "no"; then - TSRM_CHECK_PTHREADS -fi -]) |