GCC + Threads on Win32 - best gcc results yet

[p5sagit/p5-mst-13.2.git] / win32 / win32thread.c

diff --git a/win32/win32thread.c b/win32/win32thread.c
index dfa9a0c..d62dadd 100644 (file)
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,6 +1,30 @@
 #include "EXTERN.h"
 #include "perl.h"
 
+#ifdef USE_DECLSPEC_THREAD
+__declspec(thread) struct perl_thread *Perl_current_thread = NULL;
+#endif
+
+void
+Perl_setTHR(struct perl_thread *t)
+{
+#ifdef USE_DECLSPEC_THREAD
+ Perl_current_thread = t;
+#else
+ TlsSetValue(thr_key,t);
+#endif
+}
+
+struct perl_thread *
+Perl_getTHR(void)
+{
+#ifdef USE_DECLSPEC_THREAD
+ return Perl_current_thread;
+#else
+ return (struct perl_thread *) TlsGetValue(thr_key);
+#endif
+}
+
 void
 Perl_alloc_thread_key(void)
 {
@@ -15,11 +39,11 @@ Perl_alloc_thread_key(void)
 }
 
 void
-init_thread_intern(struct thread *thr)
+Perl_set_thread_self(struct perl_thread *thr)
 {
 #ifdef USE_THREADS
-    /* GetCurrentThread() retrurns a pseudo handle, need
-       this to convert it into a handle another thread can use
+    /* Set thr->self.  GetCurrentThread() retrurns a pseudo handle, need
+       this to convert it into a handle another thread can use.
      */
     DuplicateHandle(GetCurrentProcess(),
                    GetCurrentThread(),
@@ -33,7 +57,7 @@ init_thread_intern(struct thread *thr)
 
 #ifdef USE_THREADS
 int
-Perl_thread_create(struct thread *thr, thread_func_t *fn)
+Perl_thread_create(struct perl_thread *thr, thread_func_t *fn)
 {
     DWORD junk;