X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e297595301ee5f3b0643be0fb1fffae9b6b548a0..e537ac38cb8a0eeb6351f73ebefac120742db282:/thread.h diff --git a/thread.h b/thread.h index 1b57ebe..7ff71fa 100644 --- a/thread.h +++ b/thread.h @@ -1,6 +1,7 @@ /* thread.h * - * Copyright (c) 1997-2002, Larry Wall + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + * by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -22,9 +23,11 @@ # 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 @@ -40,6 +43,11 @@ # ifdef __OPEN_VM # define pthread_addr_t void * # endif +# ifdef OEMVS +# define pthread_addr_t void * +# define pthread_create(t,a,s,d) pthread_create(t,&(a),s,d) +# define pthread_keycreate pthread_key_create +# endif # ifdef VMS # define pthread_attr_init(a) pthread_attr_create(a) # define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_setdetach_np(a,s) @@ -57,7 +65,7 @@ # 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) +# if defined(DJGPP) || defined(__OPEN_VM) || defined(OEMVS) # define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s)) # define YIELD pthread_yield(NULL) # endif @@ -90,6 +98,11 @@ # define THREAD_CREATE_NEEDS_STACK (32*1024) #endif +#ifdef __VMS + /* Default is 1024 on VAX, 8192 otherwise */ +# define THREAD_CREATE_NEEDS_STACK (32*1024) +#endif + #ifdef I_MACH_CTHREADS /* cthreads interface */ @@ -102,7 +115,8 @@ if (*m) { \ mutex_init(*m); \ } else { \ - Perl_croak_nocontext("panic: MUTEX_INIT"); \ + Perl_croak_nocontext("panic: MUTEX_INIT [%s:%d]", \ + __FILE__, __LINE__); \ } \ } STMT_END @@ -121,7 +135,8 @@ condition_init(*c); \ } \ else { \ - Perl_croak_nocontext("panic: COND_INIT"); \ + Perl_croak_nocontext("panic: COND_INIT [%s:%d]", \ + __FILE__, __LINE__); \ } \ } STMT_END @@ -180,66 +195,86 @@ /* 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 */ @@ -247,9 +282,11 @@ #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 */ @@ -257,8 +294,10 @@ #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 */ @@ -273,7 +312,7 @@ #ifdef HAS_PTHREAD_UNCHECKED_GETSPECIFIC_NP # define PTHREAD_GETSPECIFIC(key) pthread_unchecked_getspecific_np(key) #else -# define PTHREAD_GETSPECIFIC(key) pthread_getspecific(key) +# define PTHREAD_GETSPECIFIC(key) pthread_getspecific(key) #endif #ifndef PERL_GET_CONTEXT @@ -283,8 +322,10 @@ #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 */ @@ -297,8 +338,8 @@ #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"); \ + if (pthread_key_create(&PL_thr_key, 0)) { \ + write(2, STR_WITH_LEN("panic: pthread_key_create failed\n")); \ exit(1); \ } \ } STMT_END