summaryrefslogtreecommitdiff
path: root/win32/win32thread.c
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1997-11-10 00:57:53 +0000
committerGurusamy Sarathy <gsar@cpan.org>1997-11-10 00:57:53 +0000
commitd55594aef6b1fb9e305275c3d19a25e4cdfb2cda (patch)
treef7d6379858b9595f060beee6161b43a373132fe9 /win32/win32thread.c
parent5cb186c2cd2ac09e46b98e7cfd9fde70c8a3481c (diff)
downloadperl-d55594aef6b1fb9e305275c3d19a25e4cdfb2cda.tar.gz
Initial (untested) merge of all non-ansi changes on ansiperl branch
into win32 branch. p4raw-id: //depot/win32/perl@221
Diffstat (limited to 'win32/win32thread.c')
-rw-r--r--win32/win32thread.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/win32/win32thread.c b/win32/win32thread.c
index 9f63d178f4..dfa9a0c733 100644
--- a/win32/win32thread.c
+++ b/win32/win32thread.c
@@ -1,10 +1,26 @@
#include "EXTERN.h"
#include "perl.h"
-#include "win32/win32thread.h"
+
+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;
+ }
+#endif
+}
void
init_thread_intern(struct thread *thr)
{
+#ifdef USE_THREADS
+ /* GetCurrentThread() retrurns a pseudo handle, need
+ this to convert it into a handle another thread can use
+ */
DuplicateHandle(GetCurrentProcess(),
GetCurrentThread(),
GetCurrentProcess(),
@@ -12,19 +28,22 @@ init_thread_intern(struct thread *thr)
0,
FALSE,
DUPLICATE_SAME_ACCESS);
- if ((thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
- croak("panic: TlsAlloc");
- if (TlsSetValue(thr_key, (LPVOID) thr) != TRUE)
- croak("panic: TlsSetValue");
+#endif
}
+#ifdef USE_THREADS
int
-thread_create(struct thread *thr, THREAD_RET_TYPE (*fn)(void *))
+Perl_thread_create(struct thread *thr, thread_func_t *fn)
{
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;
}
+#endif