summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/perl.c b/perl.c
index 7bb7dee78d..cef5c4783a 100644
--- a/perl.c
+++ b/perl.c
@@ -58,6 +58,32 @@ static I32 read_e_script(pTHXo_ int idx, SV *buf_sv, int maxlen);
} STMT_END
#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)
+{
+ /* locks must be held in locking order (if any) */
+#ifdef MYMALLOC
+ MUTEX_LOCK(&PL_malloc_mutex);
+#endif
+ OP_REFCNT_LOCK;
+}
+
+/* this is called in both parent and child after the fork() */
+static void
+S_atfork_unlock(void)
+{
+ /* locks must be released in same order as in S_atfork_lock() */
+#ifdef MYMALLOC
+ MUTEX_UNLOCK(&PL_malloc_mutex);
+#endif
+ OP_REFCNT_UNLOCK;
+}
+
# define INIT_TLS_AND_INTERP \
STMT_START { \
if (!PL_curinterp) { \
@@ -66,6 +92,9 @@ static I32 read_e_script(pTHXo_ int idx, SV *buf_sv, int maxlen);
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); \
@@ -2037,7 +2066,7 @@ STATIC void
S_usage(pTHX_ char *name) /* XXX move this out into a module ? */
{
/* This message really ought to be max 23 lines.
- * Removed -h because the user already knows that opton. Others? */
+ * Removed -h because the user already knows that option. Others? */
static char *usage_msg[] = {
"-0[octal] specify record separator (\\0, if no argument)",