X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32thread.c;h=1f327d6d415ec751a5a44395ad1caed6be08cd32;hb=6702284617d8c80196d105d0d999663377cec94b;hp=c0c3c60239148e4a73bee7bb1f9460ec0ecf4e2f;hpb=0fefa03b970ac01e359bb69c9e4daaddc57f3db9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32thread.c b/win32/win32thread.c
index c0c3c60..1f327d6 100644
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,63 +1,37 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-__declspec(thread) struct thread *Perl_current_thread = NULL;
-
-void
-Perl_setTHR(struct thread *t)
-{
- Perl_current_thread = t;
-}
-
-struct thread *
-Perl_getTHR(void)
-{
- return Perl_current_thread;
-}
-
-void
-Perl_alloc_thread_key(void)
-{
-#ifdef USE_THREADS
-    static int key_allocated = 0;
-    if (!key_allocated) {
-	if ((thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
-	    croak("panic: TlsAlloc");
-	key_allocated = 1;
-    }
+#ifdef USE_DECLSPEC_THREAD
+__declspec(thread) void *PL_current_context = NULL;
 #endif
-}
 
 void
-Perl_set_thread_self(struct thread *thr)
+Perl_set_context(void *t)
 {
-#ifdef USE_THREADS
-    /* Set thr->self.  GetCurrentThread() retrurns a pseudo handle, need
-       this to convert it into a handle another thread can use.
-     */
-    DuplicateHandle(GetCurrentProcess(),
-		    GetCurrentThread(),
-		    GetCurrentProcess(),
-		    &thr->self,
-		    0,
-		    FALSE,
-		    DUPLICATE_SAME_ACCESS);
+#if defined(USE_ITHREADS)
+#  ifdef USE_DECLSPEC_THREAD
+    Perl_current_context = t;
+#  else
+    DWORD err = GetLastError();
+    TlsSetValue(PL_thr_key,t);
+    SetLastError(err);
+#  endif
 #endif
 }
 
-#ifdef USE_THREADS
-int
-Perl_thread_create(struct thread *thr, thread_func_t *fn)
+void *
+Perl_get_context(void)
 {
-    DWORD junk;
-
-    MUTEX_LOCK(&thr->mutex);
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
-			  "%p: create OS thread\n", thr));
-    thr->self = CreateThread(NULL, 0, fn, (void*)thr, 0, &junk);
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
-			  "%p: OS thread = %p, id=%ld\n", thr, thr->self, junk));
-    MUTEX_UNLOCK(&thr->mutex);
-    return thr->self ? 0 : -1;
-}
+#if 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;
 #endif
+}