add missing file from change#1943

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

diff --git a/thread.h b/thread.h
index 2c6e192..035c5ca 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -36,10 +36,12 @@
 #endif
 
 #ifndef YIELD
-#  ifdef HAS_PTHREAD_YIELD
-#    define YIELD pthread_yield()
-#  else
+#  ifdef HAS_SCHED_YIELD
 #    define YIELD sched_yield()
+#  else
+#    ifdef HAS_PTHREAD_YIELD
+#      define YIELD pthread_yield()
+#    endif
 #  endif
 #endif
 
@@ -116,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 */
@@ -126,7 +128,7 @@
 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 */
 
@@ -139,7 +141,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
@@ -159,16 +161,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 (PL_threadnum)                       \
+           MUTEX_UNLOCK(&PL_sv_mutex);         \
     } STMT_END
 
-#define UNLOCK_SV_MUTEX                        \
-    STMT_START {                       \
-       if (threadnum)                  \
-           MUTEX_UNLOCK(&sv_mutex);    \
+/* 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
@@ -192,7 +207,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
 
@@ -221,11 +236,13 @@ 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
+#define dTHR extern int Perl___notused
 #else
 #define dTHR extern int errno
 #endif