Change 11281 by jhi@alpha on 2001/07/12 00:32:17
Subject: [patch] pthread_atfork bandaid
From: Doug MacEachern <[EMAIL PROTECTED]>
Date: Wed, 11 Jul 2001 08:59:12 -0700 (PDT)
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/miniperlmain.c#25 edit
... //depot/perl/perl.c#344 edit
Differences ...
==== //depot/perl/miniperlmain.c#25 (text) ====
Index: perl/miniperlmain.c
--- perl/miniperlmain.c.~1~ Wed Jul 11 18:45:06 2001
+++ perl/miniperlmain.c Wed Jul 11 18:45:06 2001
@@ -48,6 +48,12 @@
PERL_SYS_INIT3(&argc,&argv,&env);
+#ifdef USE_ITHREADS
+ PTHREAD_ATFORK(Perl_atfork_lock,
+ Perl_atfork_unlock,
+ Perl_atfork_unlock);
+#endif
+
if (!PL_do_undump) {
my_perl = perl_alloc();
if (!my_perl)
==== //depot/perl/perl.c#344 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Wed Jul 11 18:45:06 2001
+++ perl/perl.c Wed Jul 11 18:45:06 2001
@@ -59,12 +59,9 @@
#else
# if defined(USE_ITHREADS)
-static void S_atfork_lock(void);
-static void S_atfork_unlock(void);
-
/* this is called in parent before the fork() */
-static void
-S_atfork_lock(void)
+void
+Perl_atfork_lock(void)
{
/* locks must be held in locking order (if any) */
#ifdef MYMALLOC
@@ -74,8 +71,8 @@
}
/* this is called in both parent and child after the fork() */
-static void
-S_atfork_unlock(void)
+void
+Perl_atfork_unlock(void)
{
/* locks must be released in same order as in S_atfork_lock() */
#ifdef MYMALLOC
@@ -92,9 +89,6 @@
ALLOC_THREAD_KEY; \
PERL_SET_THX(my_perl); \
OP_REFCNT_INIT; \
- PTHREAD_ATFORK(S_atfork_lock, \
- S_atfork_unlock, \
- S_atfork_unlock); \
} \
else { \
PERL_SET_THX(my_perl); \
End of Patch.
