From 6282fe16ddf562366d87d7e23ba3b63413cb0218 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Fri, 21 Aug 2009 21:32:06 +0000
Subject: [PATCH] * dll_init.h (has_dtors): New flag. (run_dtors): New wrapper
 function which avoids calling dtors more than once. * dll_init.cc
 (dll_global_dtors): Use dll.run_dtors wrapper. (dll_list::detach): Ditto.
 (dll_list::alloc): Set has_dtors flag.

---
 winsup/cygwin/ChangeLog   | 9 +++++++++
 winsup/cygwin/dll_init.cc | 6 ++++--
 winsup/cygwin/dll_init.h  | 9 +++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 316a48a3e..b7621b1d9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-21  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* dll_init.h (has_dtors): New flag.
+	(run_dtors): New wrapper function which avoids calling dtors more than
+	once.
+	* dll_init.cc (dll_global_dtors): Use dll.run_dtors wrapper.
+	(dll_list::detach): Ditto.
+	(dll_list::alloc): Set has_dtors flag.
+
 2009-08-21  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* fcntl.cc (fcntl64): Detect negative fd as error.
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
index 39a8f505b..f1b9a9f92 100644
--- a/winsup/cygwin/dll_init.cc
+++ b/winsup/cygwin/dll_init.cc
@@ -35,7 +35,7 @@ dll_global_dtors ()
   dll_global_dtors_recorded = false;
   if (recorded && dlls.start.next)
     for (dll *d = dlls.end; d != &dlls.start; d = d->prev)
-      d->p.run_dtors ();
+      d->run_dtors ();
 }
 
 /* Run all constructors associated with a dll */
@@ -119,6 +119,7 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
       return d;		/* Return previously allocated pointer. */
     }
 
+  /* FIXME: Change this to new at some point. */
   d = (dll *) cmalloc (HEAP_2_DLL, sizeof (*d) + (namelen * sizeof (*name)));
 
   /* Now we've allocated a block of information.  Fill it in with the supplied
@@ -126,6 +127,7 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
   d->count = 1;
   wcscpy (d->name, name);
   d->handle = h;
+  d->has_dtors = true;
   d->p = p;
   d->type = type;
   if (end == NULL)
@@ -159,7 +161,7 @@ dll_list::detach (void *retaddr)
       system_printf ("WARNING: trying to detach an already detached dll ...");
     else if (--d->count == 0)
       {
-	d->p.run_dtors ();
+	d->run_dtors ();
 	d->prev->next = d->next;
 	if (d->next)
 	  d->next->prev = d->prev;
diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/dll_init.h
index 9a712a3cc..90cfa03e2 100644
--- a/winsup/cygwin/dll_init.h
+++ b/winsup/cygwin/dll_init.h
@@ -50,10 +50,19 @@ struct dll
   per_module p;
   HMODULE handle;
   int count;
+  bool has_dtors;
   dll_type type;
   WCHAR name[1];
   void detach ();
   int init ();
+  void run_dtors ()
+  {
+    if (has_dtors)
+      {
+	has_dtors = 0;
+	p.run_dtors ();
+      }
+  }
 };
 
 #define MAX_DLL_BEFORE_INIT     100