X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32thread.h;h=c6f93097ffa14f453a93f3297843477212b0a97c;hb=cc61921f0ae7ed05d56abbd690cb97eea560d4a9;hp=cfa13cc9f5e285cc9b89618213dfa0b1ac50e00c;hpb=ba869debd80c55cfae8e9d4de0991d62f9efcb9b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32thread.h b/win32/win32thread.h
index cfa13cc..c6f9309 100644
--- a/win32/win32thread.h
+++ b/win32/win32thread.h
@@ -17,8 +17,6 @@ typedef CRITICAL_SECTION perl_mutex;
 #define MUTEX_INIT(m) InitializeCriticalSection(m)
 #define MUTEX_LOCK(m) EnterCriticalSection(m)
 #define MUTEX_UNLOCK(m) LeaveCriticalSection(m)
-#define MUTEX_LOCK_NOCONTEXT(m) EnterCriticalSection(m)
-#define MUTEX_UNLOCK_NOCONTEXT(m) LeaveCriticalSection(m)
 #define MUTEX_DESTROY(m) DeleteCriticalSection(m)
 
 #else
@@ -27,28 +25,16 @@ typedef HANDLE perl_mutex;
 #  define MUTEX_INIT(m) \
     STMT_START {						\
 	if ((*(m) = CreateMutex(NULL,FALSE,NULL)) == NULL)	\
-	    Perl_croak(aTHX_ "panic: MUTEX_INIT");		\
+	    Perl_croak_nocontext("panic: MUTEX_INIT");		\
     } STMT_END
 
 #  define MUTEX_LOCK(m) \
     STMT_START {						\
 	if (WaitForSingleObject(*(m),INFINITE) == WAIT_FAILED)	\
-	    Perl_croak(aTHX_ "panic: MUTEX_LOCK");		\
-    } STMT_END
-
-#  define MUTEX_UNLOCK(m) \
-    STMT_START {						\
-	if (ReleaseMutex(*(m)) == 0)				\
-	    Perl_croak(aTHX_ "panic: MUTEX_UNLOCK");		\
-    } STMT_END
-
-#  define MUTEX_LOCK_NOCONTEXT(m) \
-    STMT_START {						\
-	if (WaitForSingleObject(*(m),INFINITE) == WAIT_FAILED)	\
 	    Perl_croak_nocontext("panic: MUTEX_LOCK");		\
     } STMT_END
 
-#  define MUTEX_UNLOCK_NOCONTEXT(m) \
+#  define MUTEX_UNLOCK(m) \
     STMT_START {						\
 	if (ReleaseMutex(*(m)) == 0)				\
 	    Perl_croak_nocontext("panic: MUTEX_UNLOCK");	\
@@ -57,7 +43,7 @@ typedef HANDLE perl_mutex;
 #  define MUTEX_DESTROY(m) \
     STMT_START {						\
 	if (CloseHandle(*(m)) == 0)				\
-	    Perl_croak(aTHX_ "panic: MUTEX_DESTROY");		\
+	    Perl_croak_nocontext("panic: MUTEX_DESTROY");	\
     } STMT_END
 
 #endif
@@ -69,23 +55,23 @@ typedef HANDLE perl_mutex;
 #define COND_INIT(c) \
     STMT_START {						\
 	(c)->waiters = 0;					\
-	(c)->sem = CreateSemaphore(NULL,0,LONG_MAX,NULL);	\
+	(c)->sem = Win_CreateSemaphore(NULL,0,LONG_MAX,NULL);	\
 	if ((c)->sem == NULL)					\
-	    Perl_croak(aTHX_ "panic: COND_INIT (%ld)",GetLastError());	\
+	    Perl_croak_nocontext("panic: COND_INIT (%ld)",GetLastError());	\
     } STMT_END
 
 #define COND_SIGNAL(c) \
     STMT_START {						\
 	if ((c)->waiters > 0 &&					\
 	    ReleaseSemaphore((c)->sem,1,NULL) == 0)		\
-	    Perl_croak(aTHX_ "panic: COND_SIGNAL (%ld)",GetLastError());	\
+	    Perl_croak_nocontext("panic: COND_SIGNAL (%ld)",GetLastError());	\
     } STMT_END
 
 #define COND_BROADCAST(c) \
     STMT_START {						\
 	if ((c)->waiters > 0 &&					\
 	    ReleaseSemaphore((c)->sem,(c)->waiters,NULL) == 0)	\
-	    Perl_croak(aTHX_ "panic: COND_BROADCAST (%ld)",GetLastError());\
+	    Perl_croak_nocontext("panic: COND_BROADCAST (%ld)",GetLastError());\
     } STMT_END
 
 #define COND_WAIT(c, m) \
@@ -96,7 +82,7 @@ typedef HANDLE perl_mutex;
 	 * COND_BROADCAST() on another thread will have seen the\
 	 * right number of waiters (i.e. including this one) */	\
 	if (WaitForSingleObject((c)->sem,INFINITE)==WAIT_FAILED)\
-	    Perl_croak(aTHX_ "panic: COND_WAIT (%ld)",GetLastError());	\
+	    Perl_croak_nocontext("panic: COND_WAIT (%ld)",GetLastError());	\
 	/* XXX there may be an inconsequential race here */	\
 	MUTEX_LOCK(m);						\
 	(c)->waiters--;						\
@@ -106,14 +92,14 @@ typedef HANDLE perl_mutex;
     STMT_START {						\
 	(c)->waiters = 0;					\
 	if (CloseHandle((c)->sem) == 0)				\
-	    Perl_croak(aTHX_ "panic: COND_DESTROY (%ld)",GetLastError());	\
+	    Perl_croak_nocontext("panic: COND_DESTROY (%ld)",GetLastError());	\
     } STMT_END
 
 #define DETACH(t) \
     STMT_START {						\
 	if (CloseHandle((t)->self) == 0) {			\
 	    MUTEX_UNLOCK(&(t)->mutex);				\
-	    Perl_croak(aTHX_ "panic: DETACH");				\
+	    Perl_croak_nocontext("panic: DETACH");		\
 	}							\
     } STMT_END
 
@@ -168,34 +154,31 @@ extern __declspec(thread) void *PL_current_context;
 #define PERL_SET_CONTEXT(t)		Perl_set_context(t)
 #endif
 
-#define PERL_GET_CONTEXT_DEFINED
-
-#if defined(USE_THREADS)
-struct perl_thread;
-int Perl_thread_create (struct perl_thread *thr, thread_func_t *fn);
-void Perl_set_thread_self (struct perl_thread *thr);
-void Perl_init_thread_intern (struct perl_thread *t);
-
-#define SET_THREAD_SELF(thr) Perl_set_thread_self(thr)
-
-#endif /* USE_THREADS */
-
 END_EXTERN_C
 
 #define INIT_THREADS		NOOP
 #define ALLOC_THREAD_KEY \
     STMT_START {							\
-	if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)		\
-	    Perl_croak_nocontext("panic: TlsAlloc");			\
+	if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) {		\
+	    PerlIO_printf(PerlIO_stderr(),"panic: TlsAlloc");				\
+	    exit(1);							\
+	}								\
     } STMT_END
 
+#define FREE_THREAD_KEY \
+    STMT_START {							\
+	TlsFree(PL_thr_key);						\
+    } STMT_END
+
+#define PTHREAD_ATFORK(prepare,parent,child)	NOOP
+
 #if defined(USE_RTL_THREAD_API) && !defined(_MSC_VER)
 #define JOIN(t, avp)							\
     STMT_START {							\
 	if ((WaitForSingleObject((t)->self,INFINITE) == WAIT_FAILED)	\
 	     || (GetExitCodeThread((t)->self,(LPDWORD)(avp)) == 0)	\
 	     || (CloseHandle((t)->self) == 0))				\
-	    Perl_croak(aTHX_ "panic: JOIN");					\
+	    Perl_croak_nocontext("panic: JOIN");			\
 	*avp = (AV *)((t)->i.retv);					\
     } STMT_END
 #else	/* !USE_RTL_THREAD_API || _MSC_VER */
@@ -204,7 +187,7 @@ END_EXTERN_C
 	if ((WaitForSingleObject((t)->self,INFINITE) == WAIT_FAILED)	\
 	     || (GetExitCodeThread((t)->self,(LPDWORD)(avp)) == 0)	\
 	     || (CloseHandle((t)->self) == 0))				\
-	    Perl_croak(aTHX_ "panic: JOIN");				\
+	    Perl_croak_nocontext("panic: JOIN");			\
     } STMT_END
 #endif	/* !USE_RTL_THREAD_API || _MSC_VER */