Changeset 174 for trunk/src/dnmalloc.c

Timestamp:

Aug 27, 2008, 5:40:28 PM (16 years ago)

Author:

katerina

Message:

Fix for tickets #112, #113 (dnmalloc deadlock on fork, hostname portability in test script).

File:

• trunk/src/dnmalloc.c (modified) (1 diff)

trunk/src/dnmalloc.c

@@ -1508 +1508 @@
     pthread_mutex_unlock(&mALLOC_MUTEx); 
 }
-void dnmalloc_fork_child(void) { 
+void dnmalloc_fork_child(void) {
+  int rc;
 #ifdef __GLIBC__
   if (dnmalloc_use_mutex)
-    pthread_mutex_init(&mALLOC_MUTEx, NULL); 
+    {
+      pthread_mutex_unlock (&mALLOC_MUTEx);
+      pthread_mutex_destroy(&mALLOC_MUTEx);
+      rc = pthread_mutex_init(&mALLOC_MUTEx, NULL);
+    } 
 #else
   if (dnmalloc_use_mutex)
-    pthread_mutex_unlock(&mALLOC_MUTEx); 
-#endif
+    rc = pthread_mutex_unlock(&mALLOC_MUTEx); 
+#endif
+  if (rc != 0)
+    {
+      fputs("fork_child failed", stderr);
+      _exit(EXIT_FAILURE);
+    }
 }
 static int dnmalloc_mutex_lock(pthread_mutex_t *mutex)