diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-29 04:53:00 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-29 04:53:00 +0000 |
| commit | ba869debd80c55cfae8e9d4de0991d62f9efcb9b (patch) | |
| tree | 73f5810de88203f0df413aee0bc7f3c94d686329 /win32/win32thread.c | |
| parent | d5c3ff09f505a33428a0772c6e16c91e1df4ce85 (diff) | |
| download | perl-ba869debd80c55cfae8e9d4de0991d62f9efcb9b.tar.gz | |
support fetching current interpreter from TLS under useithreads
p4raw-id: //depot/perl@5342
Diffstat (limited to 'win32/win32thread.c')
| -rw-r--r-- | win32/win32thread.c | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/win32/win32thread.c b/win32/win32thread.c index 1bca3c3ca5..900f5fedff 100644 --- a/win32/win32thread.c +++ b/win32/win32thread.c @@ -8,52 +8,44 @@ extern CPerlObj* pPerl; #endif #ifdef USE_DECLSPEC_THREAD -__declspec(thread) struct perl_thread *Perl_current_thread = NULL; +__declspec(thread) void *PL_current_context = NULL; #endif void -Perl_setTHR(struct perl_thread *t) +Perl_set_context(void *t) { -#ifdef USE_THREADS -#ifdef USE_DECLSPEC_THREAD - Perl_current_thread = t; -#else - TlsSetValue(PL_thr_key,t); -#endif +#if defined(USE_THREADS) || defined(USE_ITHREADS) +# ifdef USE_DECLSPEC_THREAD + Perl_current_context = t; +# else + DWORD err = GetLastError(); + TlsSetValue(PL_thr_key,t); + SetLastError(err); +# endif #endif } -struct perl_thread * -Perl_getTHR(void) +void * +Perl_get_context(void) { -#ifdef USE_THREADS -#ifdef USE_DECLSPEC_THREAD - return Perl_current_thread; -#else - return (struct perl_thread *) TlsGetValue(PL_thr_key); -#endif +#if defined(USE_THREADS) || defined(USE_ITHREADS) +# ifdef USE_DECLSPEC_THREAD + return Perl_current_context; +# else + DWORD err = GetLastError(); + void *result = TlsGetValue(PL_thr_key); + SetLastError(err); + return result; +# endif #else - return NULL; + return NULL; #endif } -void -Perl_alloc_thread_key(void) -{ #ifdef USE_THREADS - static int key_allocated = 0; - if (!key_allocated) { - if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) - Perl_croak_nocontext("panic: TlsAlloc"); - key_allocated = 1; - } -#endif -} - void Perl_init_thread_intern(struct perl_thread *athr) { -#ifdef USE_THREADS #ifndef USE_DECLSPEC_THREAD /* @@ -65,13 +57,11 @@ Perl_init_thread_intern(struct perl_thread *athr) memset(&athr->i,0,sizeof(athr->i)); #endif -#endif } void Perl_set_thread_self(struct perl_thread *thr) { -#ifdef USE_THREADS /* Set thr->self. GetCurrentThread() retrurns a pseudo handle, need this to convert it into a handle another thread can use. */ @@ -82,10 +72,8 @@ Perl_set_thread_self(struct perl_thread *thr) 0, FALSE, DUPLICATE_SAME_ACCESS); -#endif } -#ifdef USE_THREADS int Perl_thread_create(struct perl_thread *thr, thread_func_t *fn) { |