X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=thread.h;h=1b12978dd8c9dbc03a80b72c268310f63357347a;hb=494f3023e6cb99f0f26ded70a0869fe24d04973e;hp=09ed596a52bec0d35920635a9d48a8581381d1ce;hpb=ba869debd80c55cfae8e9d4de0991d62f9efcb9b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/thread.h b/thread.h
index 09ed596..1b12978 100644
--- a/thread.h
+++ b/thread.h
@@ -8,7 +8,7 @@
     STMT_START {						\
 	if (pthread_detach(&(t)->self)) {			\
 	    MUTEX_UNLOCK(&(t)->mutex);				\
-	    Perl_croak(aTHX_ "panic: DETACH");			\
+	    Perl_croak_nocontext("panic: DETACH");		\
 	}							\
     } STMT_END
 
@@ -32,13 +32,24 @@
 #      define pthread_mutexattr_init(a) pthread_mutexattr_create(a)
 #      define pthread_mutexattr_settype(a,t) pthread_mutexattr_setkind_np(a,t)
 #    endif
+#    if defined(__hpux) && defined(__ux_version) && __ux_version <= 1020
+#      define pthread_attr_init(a) pthread_attr_create(a)
+       /* XXX pthread_setdetach_np() missing in DCE threads on HP-UX 10.20 */
+#      define PTHREAD_ATTR_SETDETACHSTATE(a,s)	(0)
+#      define PTHREAD_CREATE(t,a,s,d) pthread_create(t,a,s,d)
+#      define pthread_key_create(k,d) pthread_keycreate(k,(pthread_destructor_t)(d))
+#      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)
 #      define PTHREAD_ATTR_SETDETACHSTATE(a,s) pthread_attr_setdetachstate(a,&(s))
 #      define YIELD pthread_yield(NULL)
 #    endif
 #  endif
+#  if !defined(__hpux) || !defined(__ux_version) || __ux_version > 1020
 #    define pthread_mutexattr_default NULL
 #    define pthread_condattr_default  NULL
+#  endif
 #endif
 
 #ifndef PTHREAD_CREATE
@@ -70,14 +81,12 @@
 	if (*m) {						\
 	    mutex_init(*m);					\
 	} else {						\
-	    Perl_croak(aTHX_ "panic: MUTEX_INIT");		\
+	    Perl_croak_nocontext("panic: MUTEX_INIT");		\
 	}							\
     } STMT_END
 
 #define MUTEX_LOCK(m)			mutex_lock(*m)
-#define MUTEX_LOCK_NOCONTEXT(m)		mutex_lock(*m)
 #define MUTEX_UNLOCK(m)			mutex_unlock(*m)
-#define MUTEX_UNLOCK_NOCONTEXT(m)	mutex_unlock(*m)
 #define MUTEX_DESTROY(m) \
     STMT_START {						\
 	mutex_free(*m);						\
@@ -91,7 +100,7 @@
 	    condition_init(*c);					\
 	}							\
 	else {							\
-	    Perl_croak(aTHX_ "panic: COND_INIT");		\
+	    Perl_croak_nocontext("panic: COND_INIT");		\
 	}							\
     } STMT_END
 
@@ -119,6 +128,7 @@
 #define INIT_THREADS		cthread_init()
 #define YIELD			cthread_yield()
 #define ALLOC_THREAD_KEY	NOOP
+#define FREE_THREAD_KEY		NOOP
 #define SET_THREAD_SELF(thr)	(thr->self = cthread_self())
 
 #endif /* I_MACH_CTHREADS */
@@ -151,35 +161,23 @@
     STMT_START {						\
 	Zero((m), 1, perl_mutex);                               \
  	if (pthread_mutex_init((m), pthread_mutexattr_default))	\
-	    Perl_croak(aTHX_ "panic: MUTEX_INIT");		\
+	    Perl_croak_nocontext("panic: MUTEX_INIT");		\
     } STMT_END
 #  else
 #    define MUTEX_INIT(m) \
     STMT_START {						\
 	if (pthread_mutex_init((m), pthread_mutexattr_default))	\
-	    Perl_croak(aTHX_ "panic: MUTEX_INIT");		\
+	    Perl_croak_nocontext("panic: MUTEX_INIT");		\
     } STMT_END
 #  endif
 
 #  define MUTEX_LOCK(m) \
     STMT_START {						\
 	if (pthread_mutex_lock((m)))				\
-	    Perl_croak(aTHX_ "panic: MUTEX_LOCK");		\
-    } STMT_END
-
-#  define MUTEX_UNLOCK(m) \
-    STMT_START {						\
-	if (pthread_mutex_unlock((m)))				\
-	    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) \
+#  define MUTEX_UNLOCK(m) \
     STMT_START {						\
 	if (pthread_mutex_unlock((m)))				\
 	    Perl_croak_nocontext("panic: MUTEX_UNLOCK");	\
@@ -188,7 +186,7 @@
 #  define MUTEX_DESTROY(m) \
     STMT_START {						\
 	if (pthread_mutex_destroy((m)))				\
-	    Perl_croak(aTHX_ "panic: MUTEX_DESTROY");		\
+	    Perl_croak_nocontext("panic: MUTEX_DESTROY");	\
     } STMT_END
 #endif /* MUTEX_INIT */
 
@@ -196,31 +194,31 @@
 #  define COND_INIT(c) \
     STMT_START {						\
 	if (pthread_cond_init((c), pthread_condattr_default))	\
-	    Perl_croak(aTHX_ "panic: COND_INIT");		\
+	    Perl_croak_nocontext("panic: COND_INIT");		\
     } STMT_END
 
 #  define COND_SIGNAL(c) \
     STMT_START {						\
 	if (pthread_cond_signal((c)))				\
-	    Perl_croak(aTHX_ "panic: COND_SIGNAL");		\
+	    Perl_croak_nocontext("panic: COND_SIGNAL");		\
     } STMT_END
 
 #  define COND_BROADCAST(c) \
     STMT_START {						\
 	if (pthread_cond_broadcast((c)))			\
-	    Perl_croak(aTHX_ "panic: COND_BROADCAST");		\
+	    Perl_croak_nocontext("panic: COND_BROADCAST");	\
     } STMT_END
 
 #  define COND_WAIT(c, m) \
     STMT_START {						\
 	if (pthread_cond_wait((c), (m)))			\
-	    Perl_croak(aTHX_ "panic: COND_WAIT");		\
+	    Perl_croak_nocontext("panic: COND_WAIT");		\
     } STMT_END
 
 #  define COND_DESTROY(c) \
     STMT_START {						\
 	if (pthread_cond_destroy((c)))				\
-	    Perl_croak(aTHX_ "panic: COND_DESTROY");		\
+	    Perl_croak_nocontext("panic: COND_DESTROY");	\
     } STMT_END
 #endif /* COND_INIT */
 
@@ -230,7 +228,7 @@
     STMT_START {						\
 	if (pthread_detach((t)->self)) {			\
 	    MUTEX_UNLOCK(&(t)->mutex);				\
-	    Perl_croak(aTHX_ "panic: DETACH");			\
+	    Perl_croak_nocontext("panic: DETACH");		\
 	}							\
     } STMT_END
 #endif /* DETACH */
@@ -239,7 +237,7 @@
 #  define JOIN(t, avp) \
     STMT_START {						\
 	if (pthread_join((t)->self, (void**)(avp)))		\
-	    Perl_croak(aTHX_ "panic: pthread_join");		\
+	    Perl_croak_nocontext("panic: pthread_join");	\
     } STMT_END
 #endif /* JOIN */
 
@@ -251,7 +249,7 @@
 #  define PERL_SET_CONTEXT(t) \
     STMT_START {						\
 	if (pthread_setspecific(PL_thr_key, (void *)(t)))	\
-	    Perl_croak(aTHX_ "panic: pthread_setspecific");	\
+	    Perl_croak_nocontext("panic: pthread_setspecific");	\
     } STMT_END
 #endif /* PERL_SET_CONTEXT */
 
@@ -264,8 +262,17 @@
 #ifndef ALLOC_THREAD_KEY
 #  define ALLOC_THREAD_KEY \
     STMT_START {						\
-	if (pthread_key_create(&PL_thr_key, 0))			\
-	    Perl_croak(aTHX_ "panic: pthread_key_create");	\
+	if (pthread_key_create(&PL_thr_key, 0))	{		\
+	    PerlIO_printf(PerlIO_stderr(), "panic: pthread_key_create");	\
+	    exit(1);						\
+	}							\
+    } STMT_END
+#endif
+
+#ifndef FREE_THREAD_KEY
+#  define FREE_THREAD_KEY \
+    STMT_START {						\
+	pthread_key_delete(PL_thr_key);				\
     } STMT_END
 #endif
 
@@ -292,7 +299,10 @@
 #  define UNLOCK_STRTAB_MUTEX	MUTEX_UNLOCK(&PL_strtab_mutex)
 #  define LOCK_CRED_MUTEX	MUTEX_LOCK(&PL_cred_mutex)
 #  define UNLOCK_CRED_MUTEX	MUTEX_UNLOCK(&PL_cred_mutex)
-
+#  define LOCK_FDPID_MUTEX	MUTEX_LOCK(&PL_fdpid_mutex)
+#  define UNLOCK_FDPID_MUTEX	MUTEX_UNLOCK(&PL_fdpid_mutex)
+#  define LOCK_SV_LOCK_MUTEX	MUTEX_LOCK(&PL_sv_lock_mutex)
+#  define UNLOCK_SV_LOCK_MUTEX	MUTEX_UNLOCK(&PL_sv_lock_mutex)
 
 /* Values and macros for thr->flags */
 #define THRf_STATE_MASK	7
@@ -332,18 +342,10 @@ typedef struct condpair {
 #  define MUTEX_LOCK(m)
 #endif
 
-#ifndef MUTEX_LOCK_NOCONTEXT
-#  define MUTEX_LOCK_NOCONTEXT(m)
-#endif
-
 #ifndef MUTEX_UNLOCK
 #  define MUTEX_UNLOCK(m)
 #endif
 
-#ifndef MUTEX_UNLOCK_NOCONTEXT
-#  define MUTEX_UNLOCK_NOCONTEXT(m)
-#endif
-
 #ifndef MUTEX_INIT
 #  define MUTEX_INIT(m)
 #endif
@@ -396,6 +398,22 @@ typedef struct condpair {
 #  define UNLOCK_CRED_MUTEX
 #endif
 
+#ifndef LOCK_FDPID_MUTEX
+#  define LOCK_FDPID_MUTEX
+#endif
+
+#ifndef UNLOCK_FDPID_MUTEX
+#  define UNLOCK_FDPID_MUTEX
+#endif
+
+#ifndef LOCK_SV_LOCK_MUTEX
+#  define LOCK_SV_LOCK_MUTEX
+#endif
+
+#ifndef UNLOCK_SV_LOCK_MUTEX
+#  define UNLOCK_SV_LOCK_MUTEX
+#endif
+
 /* THR, SET_THR, and dTHR are there for compatibility with old versions */
 #ifndef THR
 #  define THR		PERL_GET_THX