Don't panic if can't destroy mutex during global destruction

It's going to be destroyed anyway; this just obscures what the real failure might be.
Perl · Jan 13, 2023 · 2dc676e · 2dc676e
1 parent dcf3fa4
commit 2dc676e
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/thread.h b/thread.h
@@ -221,13 +221,16 @@
         RESTORE_ERRNO;                                          \
     } STMT_END
 
-#  define MUTEX_DESTROY(m)                                      \
-    STMT_START {						\
-        int _eC_;						\
-        if ((_eC_ = pthread_mutex_destroy((m)))) {              \
-            Perl_croak_nocontext("panic: MUTEX_DESTROY (%d) [%s:%d]",	\
-                                 _eC_, __FILE__, __LINE__);	\
-        }                                                       \
+#  define MUTEX_DESTROY(m)                                                  \
+    STMT_START {						            \
+        int _eC_;						            \
+        if ((_eC_ = pthread_mutex_destroy((m)))) {                          \
+            dTHX;                                                           \
+            if (PL_phase != PERL_PHASE_DESTRUCT) {                          \
+                Perl_croak_nocontext("panic: MUTEX_DESTROY (%d) [%s:%d]",   \
+                                    _eC_, __FILE__, __LINE__);	            \
+            }                                                               \
+        }                                                                   \
     } STMT_END
 #endif /* MUTEX_INIT */
 
@@ -265,11 +268,15 @@
     } STMT_END
 
 #  define COND_DESTROY(c) \
-    STMT_START {						\
-        int _eC_;						\
-        if ((_eC_ = pthread_cond_destroy((c))))			\
-            Perl_croak_nocontext("panic: COND_DESTROY (%d) [%s:%d]",	\
-                                 _eC_, __FILE__, __LINE__);	\
+    STMT_START {						            \
+        int _eC_;						            \
+        if ((_eC_ = pthread_cond_destroy((c)))) {                           \
+            dTHX;                                                           \
+            if (PL_phase != PERL_PHASE_DESTRUCT) {                          \
+                Perl_croak_nocontext("panic: COND_DESTROY (%d) [%s:%d]",    \
+                                    _eC_, __FILE__, __LINE__);	            \
+            }                                                               \
+        }                                                                   \
     } STMT_END
 #endif /* COND_INIT */