Improve internal threading API. Introduce win32/win32thread.[ch]

to use new API and patch win32 makefile stuff a little.

p4raw-id: //depot/perl@172

1 files changed, 128 insertions, 79 deletions

diff --git a/thread.h b/thread.h
index b375c98da1..b92e832f61 100644
--- a/thread.h
+++ b/thread.h
@@ -1,94 +1,123 @@
-#ifndef USE_THREADS
-#define MUTEX_LOCK(m)
-#define MUTEX_UNLOCK(m)
-#define MUTEX_INIT(m)
-#define MUTEX_DESTROY(m)
-#define COND_INIT(c)
-#define COND_SIGNAL(c)
-#define COND_BROADCAST(c)
-#define COND_WAIT(c, m)
-#define COND_DESTROY(c)
-
-#define THR
-/* Rats: if dTHR is just blank then the subsequent ";" throws an error */
-#define dTHR extern int errno
-#else
-
-#ifdef FAKE_THREADS
-typedef struct thread *perl_thread;
-/* With fake threads, thr is global(ish) so we don't need dTHR */
-#define dTHR extern int errno
+#ifdef USE_THREADS
 
-/*
- * Note that SCHEDULE() is only callable from pp code (which
- * must be expecting to be restarted). We'll have to do
- * something a bit different for XS code.
- */
-#define SCHEDULE() return schedule(), op
+#ifdef WIN32
+#  include "win32/win32thread.h"
+#endif
 
-#define MUTEX_LOCK(m)
-#define MUTEX_UNLOCK(m)
-#define MUTEX_INIT(m)
-#define MUTEX_DESTROY(m)
-#define COND_INIT(c) perl_cond_init(c)
-#define COND_SIGNAL(c) perl_cond_signal(c)
-#define COND_BROADCAST(c) perl_cond_broadcast(c)
-#define COND_WAIT(c, m) STMT_START {	\
-	perl_cond_wait(c);		\
-	SCHEDULE();			\
-    } STMT_END
-#define COND_DESTROY(c)
-#else
 /* POSIXish threads */
 typedef pthread_t perl_thread;
 #ifdef OLD_PTHREADS_API
-#define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
-#define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
-#define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d))
+#  define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
+#  define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
+#  define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d))
+#  define YIELD pthread_yield()
+#  define DETACH(t)				\
+    STMT_START {				\
+	if (pthread_detach(&(t)->Tself)) {	\
+	    MUTEX_UNLOCK(&(t)->mutex);		\
+	    croak("panic: DETACH");		\
+	}					\
+    } STMT_END
 #else
-#define pthread_mutexattr_default NULL
-#define pthread_condattr_default NULL
+#  define pthread_mutexattr_default NULL
+#  define pthread_condattr_default NULL
+#  define pthread_attr_default NULL
 #endif /* OLD_PTHREADS_API */
 
-#define MUTEX_INIT(m) \
-    if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-	croak("panic: MUTEX_INIT"); \
-    else 1
-#define MUTEX_LOCK(m) \
-    if (pthread_mutex_lock((m))) croak("panic: MUTEX_LOCK"); else 1
-#define MUTEX_UNLOCK(m) \
-    if (pthread_mutex_unlock((m))) croak("panic: MUTEX_UNLOCK"); else 1
-#define MUTEX_DESTROY(m) \
-    if (pthread_mutex_destroy((m))) croak("panic: MUTEX_DESTROY"); else 1
-#define COND_INIT(c) \
-    if (pthread_cond_init((c), pthread_condattr_default)) \
-	croak("panic: COND_INIT"); \
-    else 1
-#define COND_SIGNAL(c) \
-    if (pthread_cond_signal((c))) croak("panic: COND_SIGNAL"); else 1
-#define COND_BROADCAST(c) \
-    if (pthread_cond_broadcast((c))) croak("panic: COND_BROADCAST"); else 1
-#define COND_WAIT(c, m) \
-    if (pthread_cond_wait((c), (m))) croak("panic: COND_WAIT"); else 1
-#define COND_DESTROY(c) \
-    if (pthread_cond_destroy((c))) croak("panic: COND_DESTROY"); else 1
+#ifndef YIELD
+#  define YIELD sched_yield()
+#endif
+
+#ifndef MUTEX_INIT
+#define MUTEX_INIT(m)						\
+    STMT_START {						\
+	if (pthread_mutex_init((m), pthread_mutexattr_default))	\
+	    croak("panic: MUTEX_INIT");				\
+    } STMT_END
+#define MUTEX_LOCK(m)				\
+    STMT_START {				\
+	if (pthread_mutex_lock((m)))		\
+	    croak("panic: MUTEX_LOCK");		\
+    } STMT_END
+#define MUTEX_UNLOCK(m)				\
+    STMT_START {				\
+	if (pthread_mutex_unlock((m)))		\
+	    croak("panic: MUTEX_UNLOCK");	\
+    } STMT_END
+#define MUTEX_DESTROY(m)			\
+    STMT_START {				\
+	if (pthread_mutex_destroy((m)))		\
+	    croak("panic: MUTEX_DESTROY");	\
+    } STMT_END
+#endif /* MUTEX_INIT */
+
+#ifndef COND_INIT
+#define COND_INIT(c)						\
+    STMT_START {						\
+	if (pthread_cond_init((c), pthread_condattr_default))	\
+	    croak("panic: COND_INIT");				\
+    } STMT_END
+#define COND_SIGNAL(c)				\
+    STMT_START {				\
+	if (pthread_cond_signal((c)))		\
+	    croak("panic: COND_SIGNAL");	\
+    } STMT_END
+#define COND_BROADCAST(c)			\
+    STMT_START {				\
+	if (pthread_cond_broadcast((c)))	\
+	    croak("panic: COND_BROADCAST");	\
+    } STMT_END
+#define COND_WAIT(c, m)				\
+    STMT_START {				\
+	if (pthread_cond_wait((c), (m)))	\
+	    croak("panic: COND_WAIT");		\
+    } STMT_END
+#define COND_DESTROY(c)				\
+    STMT_START {				\
+	if (pthread_cond_destroy((c)))		\
+	    croak("panic: COND_DESTROY");	\
+    } STMT_END
+#endif /* COND_INIT */
 
 /* DETACH(t) must only be called while holding t->mutex */
-#define DETACH(t)			\
-    if (pthread_detach((t)->Tself)) {	\
-	MUTEX_UNLOCK(&(t)->mutex);	\
-	croak("panic: DETACH");		\
-    } else 1
+#ifndef DETACH
+#define DETACH(t)				\
+    STMT_START {				\
+	if (pthread_detach((t)->Tself)) {	\
+	    MUTEX_UNLOCK(&(t)->mutex);		\
+	    croak("panic: DETACH");		\
+	}					\
+    } STMT_END
+#endif /* DETACH */
 
-/* XXX Add "old" (?) POSIX draft interface too */
-#ifdef OLD_PTHREADS_API
+#ifndef JOIN
+#define JOIN(t, avp) 					\
+    STMT_START {					\
+	if (pthread_join((t)->Tself, (void**)(avp)))	\
+	    croak("panic: pthread_join");		\
+    } STMT_END
+#endif /* JOIN */
+
+#ifndef SET_THR
+#define SET_THR(t)					\
+    STMT_START {					\
+	if (pthread_setspecific(thr_key, (void *) (t)))	\
+	    croak("panic: pthread_setspecific");	\
+    } STMT_END
+#endif /* SET_THR */
+
+#ifndef THR
+#  ifdef OLD_PTHREADS_API
 struct thread *getTHR _((void));
-#define THR getTHR()
-#else
-#define THR ((struct thread *) pthread_getspecific(thr_key))
-#endif /* OLD_PTHREADS_API */
-#define dTHR struct thread *thr = THR
-#endif /* FAKE_THREADS */
+#    define THR getTHR()
+#  else
+#    define THR ((struct thread *) pthread_getspecific(thr_key))
+#  endif /* OLD_PTHREADS_API */
+#endif /* THR */
+
+#ifndef dTHR
+#  define dTHR struct thread *thr = THR
+#endif /* dTHR */
 
 #ifndef INIT_THREADS
 #  ifdef NEED_PTHREAD_INIT
@@ -98,6 +127,11 @@ struct thread *getTHR _((void));
 #  endif
 #endif
 
+#ifndef THREAD_RET_TYPE
+#  define THREAD_RET_TYPE	void *
+#  define THREAD_RET_CAST(p)	((void *)(p))
+#endif /* THREAD_RET */
+
 struct thread {
     /* The fields that used to be global */
     /* Important ones in the first cache line (if alignment is done right) */
@@ -308,4 +342,19 @@ typedef struct condpair {
 #define	runlevel	(thr->Trunlevel)
 
 #define	cvcache		(thr->Tcvcache)
+#else
+/* USE_THREADS is not defined */
+#define MUTEX_LOCK(m)
+#define MUTEX_UNLOCK(m)
+#define MUTEX_INIT(m)
+#define MUTEX_DESTROY(m)
+#define COND_INIT(c)
+#define COND_SIGNAL(c)
+#define COND_BROADCAST(c)
+#define COND_WAIT(c, m)
+#define COND_DESTROY(c)
+
+#define THR
+/* Rats: if dTHR is just blank then the subsequent ";" throws an error */
+#define dTHR extern int errno
 #endif /* USE_THREADS */