Garbage: Shutdown at the appropriate time

Manually delete the Garbages std::map when the garbage subsystem
is shut down.

doomsday/engine/portable/include/garbage.h

@@ -33,6 +33,8 @@
 extern "C" {
 #endif
 
+void Garbage_Init(void);
+
 /**
  * Recycles all collected garbage and deletes the collectors. Called at engine
  * shutdown. Should be called in the main thread.

doomsday/engine/portable/src/dd_init.cpp

@@ -67,6 +67,7 @@
 #include "dd_loop.h"
 #include "con_main.h"
 #include "window.h"
+#include "garbage.h"
 #include "displaymode.h"
 #include "sys_system.h"
 
@@ -127,6 +128,8 @@ int main(int argc, char** argv)
         }
     }
 
+    Garbage_Init();
+
     // Application core.
     de::App dengApp(argc, argv, useGUI);
 

doomsday/engine/portable/src/garbage.cpp

@@ -60,36 +60,44 @@ struct Garbage
 };
 
 typedef std::map<uint, Garbage*> Garbages; // threadId => Garbage
-static Garbages garbages;
+static Garbages* garbages;
 
 static Garbage* garbageForThread(uint thread)
 {
-    Garbages::iterator i = garbages.find(thread);
-    if(i != garbages.end()) return i->second;
+    Garbages::iterator i = garbages->find(thread);
+    if(i != garbages->end()) return i->second;
 
     // Allocate a new one.
     Garbage* g = new Garbage;
-    garbages[thread] = g;
+    (*garbages)[thread] = g;
     return g;
 }
 
+void Garbage_Init(void)
+{
+    DENG2_ASSERT(garbages == 0);
+    garbages = new Garbages;
+}
+
 void Garbage_Shutdown(void)
 {
-    for(Garbages::iterator i = garbages.begin(); i != garbages.end(); ++i)
+    DENG2_ASSERT(garbages != 0);
+    for(Garbages::iterator i = garbages->begin(); i != garbages->end(); ++i)
     {
         delete i->second;
     }
-    garbages.clear();
+    delete garbages;
+    garbages = 0;
 }
 
 void Garbage_ClearForThread(void)
 {
-    Garbages::iterator i = garbages.find(Sys_CurrentThreadId());
-    if(i == garbages.end()) return;
+    Garbages::iterator i = garbages->find(Sys_CurrentThreadId());
+    if(i == garbages->end()) return;
 
     Garbage* g = i->second;
     delete g;
-    garbages.erase(i);
+    garbages->erase(i);
 }
 
 void Garbage_Trash(void* ptr)