X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32thread.c;h=1bca3c3ca5fb5c5385042df9cf7a23ba93ae03ce;hb=9eaf016b1f0ee5c9f1c466e7c9deb66c2a8c9605;hp=eefa92c3851a9638180115b15eeaa356ba305c41;hpb=9811a7d768316e95d4f07bb4877adaf9834ec499;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32thread.c b/win32/win32thread.c
index eefa92c..1bca3c3 100644
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,18 +1,40 @@
 #include "EXTERN.h"
 #include "perl.h"
 
-__declspec(thread) struct thread *current_thread;
+#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
 
 void
-Perl_setTHR(struct thread *t)
+Perl_setTHR(struct perl_thread *t)
 {
- current_thread = t;
+#ifdef USE_THREADS
+#ifdef USE_DECLSPEC_THREAD
+ Perl_current_thread = t;
+#else
+ TlsSetValue(PL_thr_key,t);
+#endif
+#endif
 }
 
-struct thread *
+struct perl_thread *
 Perl_getTHR(void)
 {
- return current_thread;
+#ifdef USE_THREADS
+#ifdef USE_DECLSPEC_THREAD
+ return Perl_current_thread;
+#else
+ return (struct perl_thread *) TlsGetValue(PL_thr_key);
+#endif
+#else
+ return NULL;
+#endif
 }
 
 void
@@ -21,15 +43,33 @@ 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");
+	if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
+	    Perl_croak_nocontext("panic: TlsAlloc");
 	key_allocated = 1;
     }
 #endif
 }
 
 void
-Perl_set_thread_self(struct thread *thr)
+Perl_init_thread_intern(struct perl_thread *athr)
+{
+#ifdef USE_THREADS
+#ifndef USE_DECLSPEC_THREAD
+
+ /* 
+  * Initialize port-specific per-thread data in thr->i
+  * as only things we have there are just static areas for
+  * return values we don't _need_ to do anything but 
+  * this is good practice:
+  */
+ 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
@@ -47,17 +87,45 @@ Perl_set_thread_self(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;
+    unsigned long th;
 
-    MUTEX_LOCK(&thr->mutex);
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+    DEBUG_S(PerlIO_printf(Perl_debug_log,
 			  "%p: create OS thread\n", thr));
+#ifdef USE_RTL_THREAD_API
+    /* See comment about USE_RTL_THREAD_API in win32thread.h */
+#if defined(__BORLANDC__)
+    th = _beginthreadNT(fn,				/* start address */
+			0,				/* stack size */
+			(void *)thr,			/* parameters */
+			(void *)NULL,			/* security attrib */
+			0,				/* creation flags */
+			(unsigned long *)&junk);	/* tid */
+    if (th == (unsigned long)-1)
+	th = 0;
+#elif defined(_MSC_VER_)
+    th = _beginthreadex((void *)NULL,			/* security attrib */
+			0,				/* stack size */
+			fn,				/* start address */
+			(void*)thr,			/* parameters */
+			0,				/* creation flags */
+			(unsigned *)&junk);		/* tid */
+#else /* compilers using CRTDLL.DLL only have _beginthread() */
+    th = _beginthread(fn,				/* start address */
+		      0,				/* stack size */
+		      (void*)thr);			/* parameters */
+    if (th == (unsigned long)-1)
+	th = 0;
+#endif
+    thr->self = (HANDLE)th;
+#else	/* !USE_RTL_THREAD_API */
     thr->self = CreateThread(NULL, 0, fn, (void*)thr, 0, &junk);
-    DEBUG_L(PerlIO_printf(PerlIO_stderr(),
+#endif	/* !USE_RTL_THREAD_API */
+    DEBUG_S(PerlIO_printf(Perl_debug_log,
 			  "%p: OS thread = %p, id=%ld\n", thr, thr->self, junk));
-    MUTEX_UNLOCK(&thr->mutex);
     return thr->self ? 0 : -1;
 }
 #endif
+