add a few more globals with old names #defined

[p5sagit/p5-mst-13.2.git] / thread.h

diff --git a/thread.h b/thread.h
index 2328f7e..0f350ed 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -4,6 +4,7 @@
 #  include <win32thread.h>
 #else
 
+#ifndef DJGPP
 /* POSIXish threads */
 #ifdef OLD_PTHREADS_API
 #  define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
@@ -20,15 +21,27 @@
 #else
 #  define pthread_mutexattr_default NULL
 #  define pthread_condattr_default NULL
-#  define pthread_attr_default NULL
 #endif /* OLD_PTHREADS_API */
 #endif
+#endif
 
-#ifndef YIELD
-#  ifdef HAS_PTHREAD_YIELD
-#    define YIELD pthread_yield()
+#ifdef PTHREADS_CREATED_JOINABLE
+#  define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE
+#else
+#  ifdef PTHREAD_CREATE_UNDETACHED
+#    define ATTR_JOINABLE PTHREAD_CREATE_UNDETACHED
 #  else
+#    define ATTR_JOINABLE PTHREAD_CREATE_JOINABLE
+#  endif
+#endif
+
+#ifndef YIELD
+#  ifdef HAS_SCHED_YIELD
 #    define YIELD sched_yield()
+#  else
+#    ifdef HAS_PTHREAD_YIELD
+#      define YIELD pthread_yield()
+#    endif
 #  endif
 #endif
 
@@ -105,7 +118,7 @@
 #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 */
@@ -115,12 +128,20 @@
 struct perl_thread *getTHR _((void));
 #    define THR getTHR()
 #  else
-#    define THR ((struct perl_thread *) pthread_getspecific(thr_key))
+#    define THR ((struct perl_thread *) pthread_getspecific(PL_thr_key))
 #  endif /* OLD_PTHREADS_API */
 #endif /* THR */
 
+/*
+ * dTHR is performance-critical. Here, we only do the pthread_get_specific
+ * if there may be more than one thread in existence, otherwise we get thr
+ * from thrsv which is cached in the per-interpreter structure.
+ * Systems with very fast pthread_get_specific (which should be all systems
+ * but unfortunately isn't) may wish to simplify to "...*thr = THR".
+ */
 #ifndef dTHR
-#  define dTHR struct perl_thread *thr = THR
+#  define dTHR \
+    struct perl_thread *thr = PL_threadnum? THR : (struct perl_thread*)SvPVX(PL_thrsv)
 #endif /* dTHR */
 
 #ifndef INIT_THREADS
@@ -131,6 +152,26 @@ struct perl_thread *getTHR _((void));
 #  endif
 #endif
 
+/* Accessor for per-thread SVs */
+#define THREADSV(i) (thr->threadsvp[i])
+
+/*
+ * LOCK_SV_MUTEX and UNLOCK_SV_MUTEX are performance-critical. Here, we
+ * try only locking them if there may be more than one thread in existence.
+ * Systems with very fast mutexes (and/or slow conditionals) may wish to
+ * remove the "if (threadnum) ..." test.
+ */
+#define LOCK_SV_MUTEX                  \
+    STMT_START {                       \
+       if (PL_threadnum)                       \
+           MUTEX_LOCK(&PL_sv_mutex);   \
+    } STMT_END
+
+#define UNLOCK_SV_MUTEX                        \
+    STMT_START {                       \
+       if (PL_threadnum)                       \
+           MUTEX_UNLOCK(&PL_sv_mutex); \
+    } STMT_END
 
 #ifndef THREAD_RET_TYPE
 #  define THREAD_RET_TYPE      void *
@@ -180,8 +221,14 @@ typedef struct condpair {
 #define COND_BROADCAST(c)
 #define COND_WAIT(c, m)
 #define COND_DESTROY(c)
+#define LOCK_SV_MUTEX
+#define UNLOCK_SV_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 */