minor USE_ITHREADS tweaks

[perl5.git] / thread.h

diff --git a/thread.h b/thread.h
index 695f288..1e2a220 100644 (file)
--- a/thread.h
+++ b/thread.h
@@ -8,11 +8,11 @@
     STMT_START {                               \
        if (pthread_detach(&(t)->self)) {       \
            MUTEX_UNLOCK(&(t)->mutex);          \
-           croak("panic: DETACH");             \
+           Perl_croak(aTHX_ "panic: DETACH");          \
        }                                       \
     } STMT_END
 #    define THR getTHR()
-struct perl_thread *getTHR _((void));
+struct perl_thread *getTHR (void);
 #    define PTHREAD_GETSPECIFIC_INT
 #    ifdef DJGPP
 #      define pthread_addr_t any_t
@@ -35,10 +35,8 @@ struct perl_thread *getTHR _((void));
 #      define YIELD pthread_yield(NULL)
 #    endif
 #  endif
-#  ifndef VMS
 #    define pthread_mutexattr_default NULL
 #    define pthread_condattr_default  NULL
-#  endif
 #endif
 
 #ifndef PTHREAD_CREATE
@@ -70,7 +68,7 @@ struct perl_thread *getTHR _((void));
                if (*m) {                               \
                        mutex_init(*m);                 \
                } else {                                \
-                       croak("panic: MUTEX_INIT");     \
+                       Perl_croak(aTHX_ "panic: MUTEX_INIT");  \
                }                                       \
        } STMT_END
 
@@ -88,7 +86,7 @@ struct perl_thread *getTHR _((void));
                if (*c) {                               \
                        condition_init(*c);             \
                } else {                                \
-                       croak("panic: COND_INIT");      \
+                       Perl_croak(aTHX_ "panic: COND_INIT");   \
                }                                       \
        } STMT_END
 
@@ -136,26 +134,50 @@ struct perl_thread *getTHR _((void));
 #  endif
 #endif
 
+#ifdef __hpux
+#  define MUTEX_INIT_NEEDS_MUTEX_ZEROED
+#endif
+
 #ifndef MUTEX_INIT
+#ifdef MUTEX_INIT_NEEDS_MUTEX_ZEROED
+    /* Temporary workaround, true bug is deeper. --jhi 1999-02-25 */
+#define MUTEX_INIT(m)                                          \
+    STMT_START {                                               \
+       Zero((m), 1, perl_mutex);                               \
+       if (pthread_mutex_init((m), pthread_mutexattr_default)) \
+           Perl_croak(aTHX_ "panic: MUTEX_INIT");                              \
+    } STMT_END
+#else
 #define MUTEX_INIT(m)                                          \
     STMT_START {                                               \
        if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-           croak("panic: MUTEX_INIT");                         \
+           Perl_croak(aTHX_ "panic: MUTEX_INIT");                              \
     } STMT_END
+#endif
 #define MUTEX_LOCK(m)                          \
     STMT_START {                               \
        if (pthread_mutex_lock((m)))            \
-           croak("panic: MUTEX_LOCK");         \
+           Perl_croak(aTHX_ "panic: MUTEX_LOCK");              \
     } STMT_END
 #define MUTEX_UNLOCK(m)                                \
     STMT_START {                               \
        if (pthread_mutex_unlock((m)))          \
-           croak("panic: MUTEX_UNLOCK");       \
+           Perl_croak(aTHX_ "panic: MUTEX_UNLOCK");    \
+    } STMT_END
+#define MUTEX_LOCK_NOCONTEXT(m)                                \
+    STMT_START {                                       \
+       if (pthread_mutex_lock((m)))                    \
+           Perl_croak_nocontext("panic: MUTEX_LOCK");  \
+    } STMT_END
+#define MUTEX_UNLOCK_NOCONTEXT(m)                      \
+    STMT_START {                                       \
+       if (pthread_mutex_unlock((m)))                  \
+           Perl_croak_nocontext("panic: MUTEX_UNLOCK");\
     } STMT_END
 #define MUTEX_DESTROY(m)                       \
     STMT_START {                               \
        if (pthread_mutex_destroy((m)))         \
-           croak("panic: MUTEX_DESTROY");      \
+           Perl_croak(aTHX_ "panic: MUTEX_DESTROY");   \
     } STMT_END
 #endif /* MUTEX_INIT */
 
@@ -163,27 +185,27 @@ struct perl_thread *getTHR _((void));
 #define COND_INIT(c)                                           \
     STMT_START {                                               \
        if (pthread_cond_init((c), pthread_condattr_default))   \
-           croak("panic: COND_INIT");                          \
+           Perl_croak(aTHX_ "panic: COND_INIT");                               \
     } STMT_END
 #define COND_SIGNAL(c)                         \
     STMT_START {                               \
        if (pthread_cond_signal((c)))           \
-           croak("panic: COND_SIGNAL");        \
+           Perl_croak(aTHX_ "panic: COND_SIGNAL");     \
     } STMT_END
 #define COND_BROADCAST(c)                      \
     STMT_START {                               \
        if (pthread_cond_broadcast((c)))        \
-           croak("panic: COND_BROADCAST");     \
+           Perl_croak(aTHX_ "panic: COND_BROADCAST");  \
     } STMT_END
 #define COND_WAIT(c, m)                                \
     STMT_START {                               \
        if (pthread_cond_wait((c), (m)))        \
-           croak("panic: COND_WAIT");          \
+           Perl_croak(aTHX_ "panic: COND_WAIT");               \
     } STMT_END
 #define COND_DESTROY(c)                                \
     STMT_START {                               \
        if (pthread_cond_destroy((c)))          \
-           croak("panic: COND_DESTROY");       \
+           Perl_croak(aTHX_ "panic: COND_DESTROY");    \
     } STMT_END
 #endif /* COND_INIT */
 
@@ -193,7 +215,7 @@ struct perl_thread *getTHR _((void));
     STMT_START {                               \
        if (pthread_detach((t)->self)) {        \
            MUTEX_UNLOCK(&(t)->mutex);          \
-           croak("panic: DETACH");             \
+           Perl_croak(aTHX_ "panic: DETACH");          \
        }                                       \
     } STMT_END
 #endif /* DETACH */
@@ -202,7 +224,7 @@ struct perl_thread *getTHR _((void));
 #define JOIN(t, avp)                                   \
     STMT_START {                                       \
        if (pthread_join((t)->self, (void**)(avp)))     \
-           croak("panic: pthread_join");               \
+           Perl_croak(aTHX_ "panic: pthread_join");            \
     } STMT_END
 #endif /* JOIN */
 
@@ -210,7 +232,7 @@ struct perl_thread *getTHR _((void));
 #define SET_THR(t)                                     \
     STMT_START {                                       \
        if (pthread_setspecific(PL_thr_key, (void *) (t)))      \
-           croak("panic: pthread_setspecific");        \
+           Perl_croak(aTHX_ "panic: pthread_setspecific");     \
     } STMT_END
 #endif /* SET_THR */
 
@@ -292,7 +314,7 @@ struct perl_thread *getTHR _((void));
 #define ThrSETSTATE(t, s) STMT_START {         \
        (t)->flags &= ~THRf_STATE_MASK;         \
        (t)->flags |= (s);                      \
-       DEBUG_S(PerlIO_printf(PerlIO_stderr(),  \
+       DEBUG_S(PerlIO_printf(Perl_debug_log,   \
                              "thread %p set to state %d\n", (t), (s))); \
     } STMT_END
 
@@ -311,7 +333,9 @@ typedef struct condpair {
 #else
 /* USE_THREADS is not defined */
 #define MUTEX_LOCK(m)
+#define MUTEX_LOCK_NOCONTEXT(m)
 #define MUTEX_UNLOCK(m)
+#define MUTEX_UNLOCK_NOCONTEXT(m)
 #define MUTEX_INIT(m)
 #define MUTEX_DESTROY(m)
 #define COND_INIT(c)
@@ -325,10 +349,5 @@ typedef struct condpair {
 #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
+#define dTHR dNOOP
 #endif /* USE_THREADS */