Changeset 2344 for code/branches/objecthierarchy2/src/core/Identifier.cc

Timestamp:

Dec 4, 2008, 8:28:14 PM (16 years ago)

Author:

rgrieder

Message:

Completed destruction of static elements like XMLPort, Identifier, etc.
Of initially about 250 memory leaks (not in the actual meaning but the memory was never freed anyway) only 1 remains in TinyCpp.

• Core class is now a normal Singleton that gets created and destroyed in main.
• The same goes for Language, LuaBind, SignalHandler and PlayerManager.
• Added a new std::set to the CommandExecutor so that the external ConsoleCommands can get destroyed too.
• Code for destroying CommandLineArguments
• Added destruction code for ConstructionCallbacks in Identifier
• Moved internal identifier map (the one with the typeid(.) names) in a static function in Identifier. This was necessary in order to destroy ALL Identifiers with the static destruction function. Before it was possible to create an Identifier with having a class instance (that would call RegisterObject) for instance by simply accessing it via getIdentifier.
• Removed a big memory leak in Button (forgot to destroy the ConfigValueContainers)
• Added destruction code for InputBufferListenerTuples in InputBuffer destructor.
• Added destruction code for load and save executors in both XMLPortParam and XMLPortObject
• Added destruction code for ConsoleCommands in GSRoot, GSGraphics and GSLevel (temporary solution anyway)
• Deleting the CEGUILua script module seems to work properly now, one memory leak less (GUIManager.cc)
• Added global destruction calls in Main.cc

File:

• code/branches/objecthierarchy2/src/core/Identifier.cc (modified) (4 diffs)

code/branches/objecthierarchy2/src/core/Identifier.cc

@@ -93 +93 @@
         for (std::map<std::string, XMLPortObjectContainer*>::iterator it = this->xmlportObjectContainers_.begin(); it != this->xmlportObjectContainers_.end(); ++it)
             delete (it->second);
+        for (std::vector<Functor*>::iterator it = this->constructionCallbacks_.begin(); it != this->constructionCallbacks_.end(); ++it)
+            delete *it;
+    }
+
+    /**
+        @brief Returns the identifier map with the names as received by typeid(). This is only used internally.
+    */
+    std::map<std::string, Identifier*>& Identifier::getTypeIDIdentifierMap()
+    {
+        static std::map<std::string, Identifier*> identifiers;    //!< The map to store all Identifiers.
+        return identifiers;
     }
 
@@ -103 +114 @@
     Identifier* Identifier::getIdentifierSingleton(const std::string& name, Identifier* proposal)
     {
-        static std::map<std::string, Identifier*> identifiers;    //!< The map to store all Identifiers.
-        std::map<std::string, Identifier*>::const_iterator it = identifiers.find(name);
-
-        if (it != identifiers.end())
+        std::map<std::string, Identifier*>::const_iterator it = getTypeIDIdentifierMap().find(name);
+
+        if (it != getTypeIDIdentifierMap().end())
         {
             // There is already an entry: return it and delete the proposal
@@ -115 +125 @@
         {
             // There is no entry: put the proposal into the map and return it
-            identifiers[name] = proposal;
+            getTypeIDIdentifierMap()[name] = proposal;
             return proposal;
         }
@@ -192 +202 @@
     void Identifier::destroyAllIdentifiers()
     {
-        for (std::map<std::string, Identifier*>::iterator it = Identifier::getIdentifierMapIntern().begin(); it != Identifier::getIdentifierMapIntern().end(); ++it)
+        for (std::map<std::string, Identifier*>::iterator it = Identifier::getTypeIDIdentifierMap().begin(); it != Identifier::getTypeIDIdentifierMap().end(); ++it)
             delete (it->second);
     }