Make panics a bit more verbose to ease debugging.
Marcus Holland-Moritz [Sun, 29 Feb 2004 21:46:19 +0000 (21:46 +0000)]
p4raw-id: //depot/perl@22417

thread.h

index 00e4d76..955be24 100644 (file)
--- a/thread.h
+++ b/thread.h
 #  ifdef OLD_PTHREADS_API /* Here be dragons. */
 #    define DETACH(t) \
     STMT_START {                                               \
-       if (pthread_detach(&(t)->self)) {                       \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_detach(&(t)->self))) {              \
            MUTEX_UNLOCK(&(t)->mutex);                          \
-           Perl_croak_nocontext("panic: DETACH");              \
+           Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
        }                                                       \
     } STMT_END
 
        if (*m) {                                               \
            mutex_init(*m);                                     \
        } else {                                                \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+           Perl_croak_nocontext("panic: MUTEX_INIT [%s:%d]",   \
+                                __FILE__, __LINE__);           \
        }                                                       \
     } STMT_END
 
            condition_init(*c);                                 \
        }                                                       \
        else {                                                  \
-           Perl_croak_nocontext("panic: COND_INIT");           \
+           Perl_croak_nocontext("panic: COND_INIT [%s:%d]",    \
+                                __FILE__, __LINE__);           \
        }                                                       \
     } STMT_END
 
     /* Temporary workaround, true bug is deeper. --jhi 1999-02-25 */
 #    define MUTEX_INIT(m) \
     STMT_START {                                               \
+       int _eC_;                                               \
        Zero((m), 1, perl_mutex);                               \
-       if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+       if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))        \
+           Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #  else
 #    define MUTEX_INIT(m) \
     STMT_START {                                               \
-       if (pthread_mutex_init((m), pthread_mutexattr_default)) \
-           Perl_croak_nocontext("panic: MUTEX_INIT");          \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_init((m), pthread_mutexattr_default)))        \
+           Perl_croak_nocontext("panic: MUTEX_INIT (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #  endif
 
 #  define MUTEX_LOCK(m) \
     STMT_START {                                               \
-       if (pthread_mutex_lock((m)))                            \
-           Perl_croak_nocontext("panic: MUTEX_LOCK");          \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_lock((m))))                   \
+           Perl_croak_nocontext("panic: MUTEX_LOCK (%d) [%s:%d]",      \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define MUTEX_UNLOCK(m) \
     STMT_START {                                               \
-       if (pthread_mutex_unlock((m)))                          \
-           Perl_croak_nocontext("panic: MUTEX_UNLOCK");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_unlock((m))))                 \
+           Perl_croak_nocontext("panic: MUTEX_UNLOCK (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define MUTEX_DESTROY(m) \
     STMT_START {                                               \
-       if (pthread_mutex_destroy((m)))                         \
-           Perl_croak_nocontext("panic: MUTEX_DESTROY");       \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_mutex_destroy((m))))                \
+           Perl_croak_nocontext("panic: MUTEX_DESTROY (%d) [%s:%d]",   \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* MUTEX_INIT */
 
 #ifndef COND_INIT
 #  define COND_INIT(c) \
     STMT_START {                                               \
-       if (pthread_cond_init((c), pthread_condattr_default))   \
-           Perl_croak_nocontext("panic: COND_INIT");           \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_init((c), pthread_condattr_default)))  \
+           Perl_croak_nocontext("panic: COND_INIT (%d) [%s:%d]",       \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_SIGNAL(c) \
     STMT_START {                                               \
-       if (pthread_cond_signal((c)))                           \
-           Perl_croak_nocontext("panic: COND_SIGNAL");         \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_signal((c))))                  \
+           Perl_croak_nocontext("panic: COND_SIGNAL (%d) [%s:%d]",     \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_BROADCAST(c) \
     STMT_START {                                               \
-       if (pthread_cond_broadcast((c)))                        \
-           Perl_croak_nocontext("panic: COND_BROADCAST");      \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_broadcast((c))))               \
+           Perl_croak_nocontext("panic: COND_BROADCAST (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_WAIT(c, m) \
     STMT_START {                                               \
-       if (pthread_cond_wait((c), (m)))                        \
-           Perl_croak_nocontext("panic: COND_WAIT");           \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_wait((c), (m))))               \
+           Perl_croak_nocontext("panic: COND_WAIT (%d) [%s:%d]",       \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 
 #  define COND_DESTROY(c) \
     STMT_START {                                               \
-       if (pthread_cond_destroy((c)))                          \
-           Perl_croak_nocontext("panic: COND_DESTROY");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_cond_destroy((c))))                 \
+           Perl_croak_nocontext("panic: COND_DESTROY (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* COND_INIT */
 
 #ifndef DETACH
 #  define DETACH(t) \
     STMT_START {                                               \
-       if (pthread_detach((t)->self)) {                        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_detach((t)->self))) {               \
            MUTEX_UNLOCK(&(t)->mutex);                          \
-           Perl_croak_nocontext("panic: DETACH");              \
+           Perl_croak_nocontext("panic: DETACH (%d) [%s:%d]",  \
+                                _eC_, __FILE__, __LINE__);     \
        }                                                       \
     } STMT_END
 #endif /* DETACH */
 #ifndef JOIN
 #  define JOIN(t, avp) \
     STMT_START {                                               \
-       if (pthread_join((t)->self, (void**)(avp)))             \
-           Perl_croak_nocontext("panic: pthread_join");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_join((t)->self, (void**)(avp))))    \
+           Perl_croak_nocontext("panic: pthread_join (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* JOIN */
 
 #ifndef PERL_SET_CONTEXT
 #  define PERL_SET_CONTEXT(t) \
     STMT_START {                                               \
-       if (pthread_setspecific(PL_thr_key, (void *)(t)))       \
-           Perl_croak_nocontext("panic: pthread_setspecific"); \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_setspecific(PL_thr_key, (void *)(t))))      \
+           Perl_croak_nocontext("panic: pthread_setspecific (%d) [%s:%d]",     \
+                                _eC_, __FILE__, __LINE__);     \
     } STMT_END
 #endif /* PERL_SET_CONTEXT */
 
 #ifndef ALLOC_THREAD_KEY
 #  define ALLOC_THREAD_KEY \
     STMT_START {                                               \
-       if (pthread_key_create(&PL_thr_key, 0)) {               \
-           PerlIO_printf(PerlIO_stderr(), "panic: pthread_key_create");        \
+       int _eC_;                                               \
+       if ((_eC_ = pthread_key_create(&PL_thr_key, 0))) {      \
+           PerlIO_printf(PerlIO_stderr(), "panic: pthread_key_create (%d) [%s:%d]",    \
+                                _eC_, __FILE__, __LINE__);     \
            exit(1);                                            \
        }                                                       \
     } STMT_END