Skip to content

Commit bd73607

Browse files
krakjoekrakjoe
committed
TSRM cleanup for PHP8
1 parent 11663ba commit bd73607

File tree

7 files changed

+45
-264
lines changed

7 files changed

+45
-264
lines changed

‎TSRM/TSRM.c

+19-144
Original file line numberDiff line numberDiff line change
@@ -94,48 +94,25 @@ static FILE *tsrm_error_file;
9494
}
9595
#endif
9696

97-
#if defined(GNUPTH)
98-
static pth_key_t tls_key;
99-
# define tsrm_tls_set(what) pth_key_setdata(tls_key, (void*)(what))
100-
# define tsrm_tls_get() pth_key_getdata(tls_key)
101-
102-
#elif defined(PTHREADS)
103-
/* Thread local storage */
104-
static pthread_key_t tls_key;
105-
# define tsrm_tls_set(what) pthread_setspecific(tls_key, (void*)(what))
106-
# define tsrm_tls_get() pthread_getspecific(tls_key)
107-
108-
#elif defined(TSRM_ST)
109-
static int tls_key;
110-
# define tsrm_tls_set(what) st_thread_setspecific(tls_key, (void*)(what))
111-
# define tsrm_tls_get() st_thread_getspecific(tls_key)
112-
113-
#elif defined(TSRM_WIN32)
97+
#if defined(TSRM_WIN32)
11498
static DWORD tls_key;
11599
# define tsrm_tls_set(what) TlsSetValue(tls_key, (void*)(what))
116100
# define tsrm_tls_get() TlsGetValue(tls_key)
117-
118101
#else
119-
# define tsrm_tls_set(what)
120-
# define tsrm_tls_get() NULL
121-
# warning tsrm_set_interpreter_context is probably broken on this platform
102+
static pthread_key_t tls_key;
103+
# define tsrm_tls_set(what) pthread_setspecific(tls_key, (void*)(what))
104+
# define tsrm_tls_get() pthread_getspecific(tls_key)
122105
#endif
123106

124107
TSRM_TLS uint8_t in_main_thread = 0;
125108

126109
/* Startup TSRM (call once for the entire process) */
127110
TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
128111
{/*{{{*/
129-
#if defined(GNUPTH)
130-
pth_init();
131-
pth_key_create(&tls_key, 0);
132-
#elif defined(PTHREADS)
133-
pthread_key_create( &tls_key, 0 );
134-
#elif defined(TSRM_ST)
135-
st_init();
136-
st_key_create(&tls_key, 0);
137-
#elif defined(TSRM_WIN32)
112+
#if defined(TSRM_WIN32)
138113
tls_key = TlsAlloc();
114+
#else
115+
pthread_key_create(&tls_key, 0);
139116
#endif
140117

141118
/* ensure singleton */
@@ -218,13 +195,11 @@ TSRM_API void tsrm_shutdown(void)
218195
if (tsrm_error_file!=stderr) {
219196
fclose(tsrm_error_file);
220197
}
221-
#if defined(GNUPTH)
222-
pth_kill();
223-
#elif defined(PTHREADS)
198+
#if defined(TSRM_WIN32)
199+
TlsFree(tls_key);
200+
#else
224201
pthread_setspecific(tls_key, 0);
225202
pthread_key_delete(tls_key);
226-
#elif defined(TSRM_WIN32)
227-
TlsFree(tls_key);
228203
#endif
229204
if (tsrm_shutdown_handler) {
230205
tsrm_shutdown_handler();
@@ -471,67 +446,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
471446
TSRM_SAFE_RETURN_RSRC(thread_resources->storage, id, thread_resources->count);
472447
}/*}}}*/
473448

474-
/* frees an interpreter context. You are responsible for making sure that
475-
* it is not linked into the TSRM hash, and not marked as the current interpreter */
476-
void tsrm_free_interpreter_context(void *context)
477-
{/*{{{*/
478-
tsrm_tls_entry *next, *thread_resources = (tsrm_tls_entry*)context;
479-
int i;
480-
481-
while (thread_resources) {
482-
next = thread_resources->next;
483-
484-
for (i=0; i<thread_resources->count; i++) {
485-
if (resource_types_table[i].dtor) {
486-
resource_types_table[i].dtor(thread_resources->storage[i]);
487-
}
488-
}
489-
for (i=0; i<thread_resources->count; i++) {
490-
if (!resource_types_table[i].fast_offset) {
491-
free(thread_resources->storage[i]);
492-
}
493-
}
494-
free(thread_resources->storage);
495-
free(thread_resources);
496-
thread_resources = next;
497-
}
498-
}/*}}}*/
499-
500-
void *tsrm_set_interpreter_context(void *new_ctx)
501-
{/*{{{*/
502-
tsrm_tls_entry *current;
503-
504-
current = tsrm_tls_get();
505-
506-
/* TODO: unlink current from the global linked list, and replace it
507-
* it with the new context, protected by mutex where/if appropriate */
508-
509-
/* Set thread local storage to this new thread resources structure */
510-
tsrm_tls_set(new_ctx);
511-
512-
/* return old context, so caller can restore it when they're done */
513-
return current;
514-
}/*}}}*/
515-
516-
517-
/* allocates a new interpreter context */
518-
void *tsrm_new_interpreter_context(void)
519-
{/*{{{*/
520-
tsrm_tls_entry *new_ctx, *current;
521-
THREAD_T thread_id;
522-
523-
thread_id = tsrm_thread_id();
524-
tsrm_mutex_lock(tsmm_mutex);
525-
526-
current = tsrm_tls_get();
527-
528-
allocate_new_resource(&new_ctx, thread_id);
529-
530-
/* switch back to the context that was in use prior to our creation
531-
* of the new one */
532-
return tsrm_set_interpreter_context(current);
533-
}/*}}}*/
534-
535449

536450
/* frees all resources allocated for the current thread */
537451
void ts_free_thread(void)
@@ -661,8 +575,6 @@ void ts_free_id(ts_rsrc_id id)
661575
}/*}}}*/
662576

663577

664-
665-
666578
/*
667579
* Utility Functions
668580
*/
@@ -672,12 +584,8 @@ TSRM_API THREAD_T tsrm_thread_id(void)
672584
{/*{{{*/
673585
#ifdef TSRM_WIN32
674586
return GetCurrentThreadId();
675-
#elif defined(GNUPTH)
676-
return pth_self();
677-
#elif defined(PTHREADS)
587+
#else
678588
return pthread_self();
679-
#elif defined(TSRM_ST)
680-
return st_thread_self();
681589
#endif
682590
}/*}}}*/
683591

@@ -689,14 +597,9 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
689597
#ifdef TSRM_WIN32
690598
mutexp = malloc(sizeof(CRITICAL_SECTION));
691599
InitializeCriticalSection(mutexp);
692-
#elif defined(GNUPTH)
693-
mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
694-
pth_mutex_init(mutexp);
695-
#elif defined(PTHREADS)
600+
#else
696601
mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
697602
pthread_mutex_init(mutexp,NULL);
698-
#elif defined(TSRM_ST)
699-
mutexp = st_mutex_new();
700603
#endif
701604
#ifdef THR_DEBUG
702605
printf("Mutex created thread: %d\n",mythreadid());
@@ -712,13 +615,9 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
712615
#ifdef TSRM_WIN32
713616
DeleteCriticalSection(mutexp);
714617
free(mutexp);
715-
#elif defined(GNUPTH)
716-
free(mutexp);
717-
#elif defined(PTHREADS)
618+
#else
718619
pthread_mutex_destroy(mutexp);
719620
free(mutexp);
720-
#elif defined(TSRM_ST)
721-
st_mutex_destroy(mutexp);
722621
#endif
723622
}
724623
#ifdef THR_DEBUG
@@ -737,15 +636,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
737636
#ifdef TSRM_WIN32
738637
EnterCriticalSection(mutexp);
739638
return 0;
740-
#elif defined(GNUPTH)
741-
if (pth_mutex_acquire(mutexp, 0, NULL)) {
742-
return 0;
743-
}
744-
return -1;
745-
#elif defined(PTHREADS)
639+
#else
746640
return pthread_mutex_lock(mutexp);
747-
#elif defined(TSRM_ST)
748-
return st_mutex_lock(mutexp);
749641
#endif
750642
}/*}}}*/
751643

@@ -760,15 +652,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
760652
#ifdef TSRM_WIN32
761653
LeaveCriticalSection(mutexp);
762654
return 0;
763-
#elif defined(GNUPTH)
764-
if (pth_mutex_release(mutexp)) {
765-
return 0;
766-
}
767-
return -1;
768-
#elif defined(PTHREADS)
655+
#else
769656
return pthread_mutex_unlock(mutexp);
770-
#elif defined(TSRM_ST)
771-
return st_mutex_unlock(mutexp);
772657
#endif
773658
}/*}}}*/
774659

@@ -779,12 +664,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
779664
TSRM_API int tsrm_sigmask(int how, const sigset_t *set, sigset_t *oldset)
780665
{/*{{{*/
781666
TSRM_ERROR((TSRM_ERROR_LEVEL_INFO, "Changed sigmask in thread: %ld", tsrm_thread_id()));
782-
/* TODO: add support for other APIs */
783-
#ifdef PTHREADS
784-
return pthread_sigmask(how, set, oldset);
785-
#else
786-
return sigprocmask(how, set, oldset);
787-
#endif
667+
668+
return pthread_sigmask(how, set, oldset);
788669
}/*}}}*/
789670
#endif
790671

@@ -873,16 +754,10 @@ TSRM_API uint8_t tsrm_is_main_thread(void)
873754

874755
TSRM_API const char *tsrm_api_name(void)
875756
{/*{{{*/
876-
#if defined(GNUPTH)
877-
return "GNU Pth";
878-
#elif defined(PTHREADS)
879-
return "POSIX Threads";
880-
#elif defined(TSRM_ST)
881-
return "State Threads";
882-
#elif defined(TSRM_WIN32)
757+
#if defined(TSRM_WIN32)
883758
return "Windows Threads";
884759
#else
885-
return "Unknown";
760+
return "POSIX Threads";
886761
#endif
887762
}/*}}}*/
888763

‎TSRM/TSRM.h

+2-42
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,8 @@ typedef uintptr_t tsrm_uintptr_t;
4444
# ifndef TSRM_INCLUDE_FULL_WINDOWS_HEADERS
4545
# define WIN32_LEAN_AND_MEAN
4646
# endif
47-
# include <windows.h>
48-
# include <shellapi.h>
49-
#elif defined(GNUPTH)
50-
# include <pth.h>
51-
#elif defined(PTHREADS)
47+
#else
5248
# include <pthread.h>
53-
#elif defined(TSRM_ST)
54-
# include <st.h>
55-
#elif defined(BETHREADS)
56-
#include <kernel/OS.h>
57-
#include <TLS.h>
5849
#endif
5950

6051
#if SIZEOF_SIZE_T == 4
@@ -71,15 +62,9 @@ typedef int ts_rsrc_id;
7162
#ifdef TSRM_WIN32
7263
# define THREAD_T DWORD
7364
# define MUTEX_T CRITICAL_SECTION *
74-
#elif defined(GNUPTH)
75-
# define THREAD_T pth_t
76-
# define MUTEX_T pth_mutex_t *
77-
#elif defined(PTHREADS)
65+
#else
7866
# define THREAD_T pthread_t
7967
# define MUTEX_T pthread_mutex_t *
80-
#elif defined(TSRM_ST)
81-
# define THREAD_T st_thread_t
82-
# define MUTEX_T st_mutex_t
8368
#endif
8469

8570
#ifdef HAVE_SIGNAL_H
@@ -147,12 +132,6 @@ TSRM_API void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_th
147132
TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
148133
TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
149134

150-
/* these 3 APIs should only be used by people that fully understand the threading model
151-
* used by PHP/Zend and the selected SAPI. */
152-
TSRM_API void *tsrm_new_interpreter_context(void);
153-
TSRM_API void *tsrm_set_interpreter_context(void *new_ctx);
154-
TSRM_API void tsrm_free_interpreter_context(void *context);
155-
156135
TSRM_API void *tsrm_get_ls_cache(void);
157136
TSRM_API uint8_t tsrm_is_main_thread(void);
158137
TSRM_API const char *tsrm_api_name(void);
@@ -170,8 +149,6 @@ TSRM_API const char *tsrm_api_name(void);
170149
#define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1)
171150
#define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)-1)
172151

173-
#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx
174-
#define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache()
175152
#define TSRMG(id, type, element) (TSRMG_BULK(id, type)->element)
176153
#define TSRMG_BULK(id, type) ((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])
177154
#define TSRMG_FAST(offset, type, element) (TSRMG_FAST_BULK(offset, type)->element)
@@ -192,23 +169,12 @@ TSRM_API const char *tsrm_api_name(void);
192169
#endif
193170
#define TSRMLS_CACHE _tsrm_ls_cache
194171

195-
/* BC only */
196-
#define TSRMLS_D void
197-
#define TSRMLS_DC
198-
#define TSRMLS_C
199-
#define TSRMLS_CC
200-
#define TSRMLS_FETCH()
201-
202172
#ifdef __cplusplus
203173
}
204174
#endif
205175

206176
#else /* non ZTS */
207177

208-
#define TSRMLS_FETCH()
209-
#define TSRMLS_FETCH_FROM_CTX(ctx)
210-
#define TSRMLS_SET_CTX(ctx)
211-
212178
#define TSRMG_STATIC(id, type, element)
213179
#define TSRMLS_CACHE_EXTERN()
214180
#define TSRMLS_CACHE_DEFINE()
@@ -217,12 +183,6 @@ TSRM_API const char *tsrm_api_name(void);
217183

218184
#define TSRM_TLS
219185

220-
/* BC only */
221-
#define TSRMLS_D void
222-
#define TSRMLS_DC
223-
#define TSRMLS_C
224-
#define TSRMLS_CC
225-
226186
#endif /* ZTS */
227187

228188
#endif /* TSRM_H */

0 commit comments

Comments
 (0)