X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thread.h;h=4d2c7dd43c052ea74a21d4150584908117bc434b;hb=6dc3770de71571cb8748c31b5cb908c0da56924c;hp=07604f6bcc04922e2a3013e55b4a4562144440cc;hpb=93bce2dcd9a377cf8ad779ab0e9115bcce1265d2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/thread.h b/thread.h
index 07604f6..4d2c7dd 100644
--- a/thread.h
+++ b/thread.h
@@ -3,24 +3,67 @@
 #ifdef WIN32
 #  include <win32thread.h>
 #else
-
-/* POSIXish threads */
-#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 YIELD pthread_yield()
-#  define DETACH(t)				\
+#  ifdef OLD_PTHREADS_API /* Here be dragons. */
+#    define DETACH(t)				\
     STMT_START {				\
 	if (pthread_detach(&(t)->self)) {	\
 	    MUTEX_UNLOCK(&(t)->mutex);		\
 	    croak("panic: DETACH");		\
 	}					\
     } STMT_END
-#else
-#  define pthread_mutexattr_default NULL
-#  define pthread_condattr_default NULL
-#endif /* OLD_PTHREADS_API */
+#    define THR getTHR()
+struct perl_thread *getTHR _((void));
+#    define PTHREAD_GETSPECIFIC_INT
+#    ifdef DJGPP
+#      define pthread_addr_t any_t
+#      define NEED_PTHREAD_INIT
+#      define PTHREAD_CREATE_JOINABLE (1)
+#    endif
+#    ifdef __OPEN_VM
+#      define pthread_addr_t void *
+#    endif
+#    ifdef VMS
+#      define pthread_attr_init(a) pthread_attr_create(a)
+#      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_setdetach_np(a,s)
+#      define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d)
+#      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)
+#    endif
+#    if defined(DJGPP) || defined(__OPEN_VM)
+#      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s))
+#      define YIELD pthread_yield(NULL)
+#    endif
+#  endif
+#  ifndef VMS
+#    define pthread_mutexattr_default NULL
+#    define pthread_condattr_default  NULL
+#  endif
+#endif
+
+#ifndef PTHREAD_CREATE
+/* You are not supposed to pass NULL as the 2nd arg of PTHREAD_CREATE(). */
+#  define PTHREAD_CREATE(t,a,s,d) pthread_create(t,&(a),s,d)
+#endif
+
+#ifndef PTHREAD_ATTR_SETDETACHSTATE
+#  define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,s)
+#endif
+
+#ifndef YIELD
+#  ifdef SCHED_YIELD
+#    define YIELD SCHED_YIELD
+#  else
+#    ifdef HAS_SCHED_YIELD
+#      define YIELD sched_yield()
+#    else
+#      ifdef HAS_PTHREAD_YIELD
+    /* pthread_yield(NULL) platforms are expected
+     * to have #defined YIELD for themselves. */
+#        define YIELD pthread_yield()
+#      endif
+#    endif
+#  endif
 #endif
 
 #ifdef PTHREADS_CREATED_JOINABLE
@@ -29,15 +72,9 @@
 #  ifdef PTHREAD_CREATE_UNDETACHED
 #    define ATTR_JOINABLE PTHREAD_CREATE_UNDETACHED
 #  else
-#    define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE
-#  endif
-#endif
-
-#ifndef YIELD
-#  ifdef HAS_PTHREAD_YIELD
-#    define YIELD pthread_yield()
-#  else
-#    define YIELD sched_yield()
+#    ifdef __UNDETACHED
+#      define ATTR_JOINABLE __UNDETACHED
+#    endif
 #  endif
 #endif
 
@@ -114,19 +151,14 @@
 #ifndef SET_THR
 #define SET_THR(t)					\
     STMT_START {					\
-	if (pthread_setspecific(thr_key, (void *) (t)))	\
+	if (pthread_setspecific(PL_thr_key, (void *) (t)))	\
 	    croak("panic: pthread_setspecific");	\
     } STMT_END
 #endif /* SET_THR */
 
 #ifndef THR
-#  ifdef OLD_PTHREADS_API
-struct perl_thread *getTHR _((void));
-#    define THR getTHR()
-#  else
-#    define THR ((struct perl_thread *) pthread_getspecific(thr_key))
-#  endif /* OLD_PTHREADS_API */
-#endif /* THR */
+#define THR ((struct perl_thread *) pthread_getspecific(PL_thr_key))
+#endif
 
 /*
  * dTHR is performance-critical. Here, we only do the pthread_get_specific
@@ -137,7 +169,7 @@ struct perl_thread *getTHR _((void));
  */
 #ifndef dTHR
 #  define dTHR \
-    struct perl_thread *thr = threadnum? THR : (struct perl_thread*)SvPVX(thrsv)
+    struct perl_thread *thr = PL_threadnum? THR : (struct perl_thread*)SvPVX(PL_thrsv)
 #endif /* dTHR */
 
 #ifndef INIT_THREADS
@@ -157,16 +189,29 @@ struct perl_thread *getTHR _((void));
  * Systems with very fast mutexes (and/or slow conditionals) may wish to
  * remove the "if (threadnum) ..." test.
  */
-#define LOCK_SV_MUTEX			\
-    STMT_START {			\
-	if (threadnum)			\
-	    MUTEX_LOCK(&sv_mutex);	\
+#define LOCK_SV_MUTEX				\
+    STMT_START {				\
+	if (PL_threadnum)			\
+	    MUTEX_LOCK(&PL_sv_mutex);		\
     } STMT_END
 
-#define UNLOCK_SV_MUTEX			\
-    STMT_START {			\
-	if (threadnum)			\
-	    MUTEX_UNLOCK(&sv_mutex);	\
+#define UNLOCK_SV_MUTEX				\
+    STMT_START {				\
+	if (PL_threadnum)			\
+	    MUTEX_UNLOCK(&PL_sv_mutex);		\
+    } STMT_END
+
+/* Likewise for strtab_mutex */
+#define LOCK_STRTAB_MUTEX			\
+    STMT_START {				\
+	if (PL_threadnum)			\
+	    MUTEX_LOCK(&PL_strtab_mutex);	\
+    } STMT_END
+
+#define UNLOCK_STRTAB_MUTEX			\
+    STMT_START {				\
+	if (PL_threadnum)			\
+	    MUTEX_UNLOCK(&PL_strtab_mutex);	\
     } STMT_END
 
 #ifndef THREAD_RET_TYPE
@@ -190,7 +235,7 @@ struct perl_thread *getTHR _((void));
 #define ThrSETSTATE(t, s) STMT_START {		\
 	(t)->flags &= ~THRf_STATE_MASK;		\
 	(t)->flags |= (s);			\
-	DEBUG_L(PerlIO_printf(PerlIO_stderr(),	\
+	DEBUG_S(PerlIO_printf(PerlIO_stderr(),	\
 			      "thread %p set to state %d\n", (t), (s))); \
     } STMT_END
 
@@ -219,8 +264,14 @@ typedef struct condpair {
 #define COND_DESTROY(c)
 #define LOCK_SV_MUTEX
 #define UNLOCK_SV_MUTEX
+#define LOCK_STRTAB_MUTEX
+#define UNLOCK_STRTAB_MUTEX
 
 #define THR
 /* Rats: if dTHR is just blank then the subsequent ";" throws an error */
+#ifdef WIN32
+#define dTHR extern int Perl___notused
+#else
 #define dTHR extern int errno
+#endif
 #endif /* USE_THREADS */