Integrate from mainperl.

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

diff --git a/win32/win32thread.c b/win32/win32thread.c
index 44f32e2..b40c5aa 100644 (file)
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,6 +1,12 @@
 #include "EXTERN.h"
 #include "perl.h"
 
+#if defined(PERL_OBJECT)
+#define NO_XSLOCKS
+extern CPerlObj* pPerl;
+#include "XSUB.h"
+#endif
+
 #ifdef USE_DECLSPEC_THREAD
 __declspec(thread) struct perl_thread *Perl_current_thread = NULL;
 #endif
@@ -12,7 +18,7 @@ Perl_setTHR(struct perl_thread *t)
 #ifdef USE_DECLSPEC_THREAD
  Perl_current_thread = t;
 #else
- TlsSetValue(thr_key,t);
+ TlsSetValue(PL_thr_key,t);
 #endif
 #endif
 }
@@ -24,7 +30,7 @@ Perl_getTHR(void)
 #ifdef USE_DECLSPEC_THREAD
  return Perl_current_thread;
 #else
- return (struct perl_thread *) TlsGetValue(thr_key);
+ return (struct perl_thread *) TlsGetValue(PL_thr_key);
 #endif
 #else
  return NULL;
@@ -37,7 +43,7 @@ Perl_alloc_thread_key(void)
 #ifdef USE_THREADS
     static int key_allocated = 0;
     if (!key_allocated) {
-       if ((thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
+       if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
            croak("panic: TlsAlloc");
        key_allocated = 1;
     }
@@ -86,8 +92,7 @@ Perl_thread_create(struct perl_thread *thr, thread_func_t *fn)
     DWORD junk;
     unsigned long th;
 
-    MUTEX_LOCK(&thr->mutex);
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+    DEBUG_S(PerlIO_printf(PerlIO_stderr(),
                          "%p: create OS thread\n", thr));
 #ifdef USE_RTL_THREAD_API
     /* See comment about USE_RTL_THREAD_API in win32thread.h */
@@ -118,9 +123,8 @@ Perl_thread_create(struct perl_thread *thr, thread_func_t *fn)
 #else  /* !USE_RTL_THREAD_API */
     thr->self = CreateThread(NULL, 0, fn, (void*)thr, 0, &junk);
 #endif /* !USE_RTL_THREAD_API */
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+    DEBUG_S(PerlIO_printf(PerlIO_stderr(),
                          "%p: OS thread = %p, id=%ld\n", thr, thr->self, junk));
-    MUTEX_UNLOCK(&thr->mutex);
     return thr->self ? 0 : -1;
 }
 #endif