Initial (untested) merge of all non-ansi changes on ansiperl branch

into win32 branch.

p4raw-id: //depot/win32/perl@221

1 files changed, 61 insertions, 33 deletions

diff --git a/win32/win32thread.h b/win32/win32thread.h
index ab0dbc598f..75aa25b632 100644
--- a/win32/win32thread.h
+++ b/win32/win32thread.h
@@ -1,6 +1,6 @@
-/*typedef CRITICAL_SECTION perl_mutex;*/
-typedef HANDLE perl_mutex;
-typedef HANDLE perl_cond;
+#ifndef _WIN32THREAD_H
+#define _WIN32THREAD_H
+typedef struct win32_cond { LONG waiters; HANDLE sem; } perl_cond;
 typedef DWORD perl_key;
 typedef HANDLE perl_thread;
 
@@ -8,12 +8,15 @@ typedef HANDLE perl_thread;
  * but can't be communicated to child processes, and can't get
  * HANDLE to it for use elsewhere
  */
-/*
+
+#ifndef DONT_USE_CRITICAL_SECTION
+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_DESTROY(m) DeleteCriticalSection(m)
-*/
+#else
+typedef HANDLE perl_mutex;
 
 #define MUTEX_INIT(m) \
     STMT_START {						\
@@ -36,38 +39,51 @@ typedef HANDLE perl_thread;
 	    croak("panic: MUTEX_DESTROY");			\
     } STMT_END
 
+#endif
+
+/* These macros assume that the mutex associated with the condition
+ * will always be held before COND_{SIGNAL,BROADCAST,WAIT,DESTROY},
+ * so there's no separate mutex protecting access to (c)->waiters
+ */
 #define COND_INIT(c) \
-    STMT_START {						\
-	if ((*(c) = CreateEvent(NULL,TRUE,FALSE,NULL)) == NULL)	\
-	    croak("panic: COND_INIT");				\
+    STMT_START {                                                \
+        (c)->waiters = 0;                                       \
+        (c)->sem = CreateSemaphore(NULL,0,LONG_MAX,NULL);       \
+        if ((c)->sem == NULL)                                   \
+            croak("panic: COND_INIT (%ld)",GetLastError());     \
     } STMT_END
+
 #define COND_SIGNAL(c) \
-    STMT_START {						\
-	if (PulseEvent(*(c)) == 0)				\
-	    croak("panic: COND_SIGNAL (%ld)",GetLastError());	\
+    STMT_START {                                                \
+        if (ReleaseSemaphore((c)->sem,1,NULL) == 0)             \
+            croak("panic: COND_SIGNAL (%ld)",GetLastError());   \
     } STMT_END
+
 #define COND_BROADCAST(c) \
-    STMT_START {						\
-	if (PulseEvent(*(c)) == 0)				\
-	    croak("panic: COND_BROADCAST");			\
+    STMT_START {                                                \
+        if ((c)->waiters > 0 &&                                 \
+            ReleaseSemaphore((c)->sem,(c)->waiters,NULL) == 0)  \
+            croak("panic: COND_BROADCAST (%ld)",GetLastError());\
     } STMT_END
-/* #define COND_WAIT(c, m) \
-    STMT_START {						\
-	if (WaitForSingleObject(*(c),INFINITE) == WAIT_FAILED)	\
-	    croak("panic: COND_WAIT");				\
-    } STMT_END
-*/
+
 #define COND_WAIT(c, m) \
-    STMT_START {						\
-	if (SignalObjectAndWait(*(m),*(c),INFINITE,FALSE) == WAIT_FAILED)\
-	    croak("panic: COND_WAIT");				\
-	else							\
-	    MUTEX_LOCK(m);					\
+    STMT_START {                                                \
+        (c)->waiters++;                                         \
+        MUTEX_UNLOCK(m);                                        \
+        /* Note that there's no race here, since a              \
+         * 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)\
+            croak("panic: COND_WAIT (%ld)",GetLastError());     \
+        MUTEX_LOCK(m);                                          \
+        (c)->waiters--;                                         \
     } STMT_END
+
 #define COND_DESTROY(c) \
-    STMT_START {						\
-	if (CloseHandle(*(c)) == 0)				\
-	    croak("panic: COND_DESTROY");			\
+    STMT_START {                                                \
+        (c)->waiters = 0;                                       \
+        if (CloseHandle((c)->sem) == 0)                         \
+            croak("panic: COND_DESTROY (%ld)",GetLastError());  \
     } STMT_END
 
 #define DETACH(t) \
@@ -79,8 +95,22 @@ typedef HANDLE perl_thread;
     } STMT_END
 
 #define THR ((struct thread *) TlsGetValue(thr_key))
+#define THREAD_CREATE(t, f)	Perl_thread_create(t, f)
+#define THREAD_POST_CREATE(t)	NOOP
+#define THREAD_RET_TYPE		DWORD WINAPI
+#define THREAD_RET_CAST(p)	((DWORD)(p))
 
-#define HAVE_THREAD_INTERN
+typedef THREAD_RET_TYPE thread_func_t(void *);
+
+START_EXTERN_C
+void Perl_alloc_thread_key _((void));
+int Perl_thread_create _((struct thread *thr, thread_func_t *fn));
+void Perl_init_thread_intern _((struct thread *thr));
+END_EXTERN_C
+
+#define INIT_THREADS NOOP
+#define ALLOC_THREAD_KEY Perl_alloc_thread_key()
+#define INIT_THREAD_INTERN(thr) Perl_init_thread_intern(thr)
 
 #define JOIN(t, avp)							\
     STMT_START {							\
@@ -95,8 +125,6 @@ typedef HANDLE perl_thread;
 	    croak("panic: TlsSetValue");		\
     } STMT_END
 
-#define THREAD_CREATE(t, f)	thread_create(t, f)
-#define THREAD_POST_CREATE(t)	NOOP
-#define THREAD_RET_TYPE		DWORD WINAPI
-#define THREAD_RET_CAST(p)	((DWORD)(p))
 #define YIELD			Sleep(0)
+
+#endif /* _WIN32THREAD_H */