Changeset 2344 for code/branches/objecthierarchy2/src/core/XMLPort.h

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/XMLPort.h (modified) (3 diffs)

code/branches/objecthierarchy2/src/core/XMLPort.h

@@ -43 +43 @@
 #include "CorePrereqs.h"
 
+#include <cassert>
 #include "util/Debug.h"
 #include "util/Exception.h"
@@ -327 +328 @@
                 this->loadexecutor_ = loadexecutor;
                 this->saveexecutor_ = saveexecutor;
+            }
+
+            ~XMLPortClassParamContainer()
+            {
+                assert(this->loadexecutor_);
+                delete this->loadexecutor_;
+                if (this->saveexecutor_)
+                    delete this->saveexecutor_;
             }
 
@@ -471 +480 @@
                 this->bApplyLoaderMask_ = bApplyLoaderMask;
                 this->bLoadBefore_ = bLoadBefore;
+            }
+
+            ~XMLPortClassObjectContainer()
+            {
+                assert(this->loadexecutor_);
+                delete this->loadexecutor_;
+                if (this->saveexecutor_)
+                    delete this->saveexecutor_;
             }