Changeset 5226 in orxonox.OLD

Timestamp:

Sep 23, 2005, 10:25:52 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: memory-leak-prevention

Location:

trunk/src

Files:

• lib/sound/sound_engine.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)
• util/loading/load_param.cc (modified) (6 diffs)
• util/loading/load_param.h (modified) (1 diff)

trunk/src/lib/sound/sound_engine.cc

@@ -252 +252 @@
   this->effectsVolume = atof(effectsVolume)/100.0;
 }
-
-
 
 /**

trunk/src/orxonox.cc

@@ -52 +52 @@
 #include "shell_command.h"
 #include "shell_buffer.h"
+
+#include "load_param.h"
 
 #include <string.h>
@@ -99 +101 @@
   ShellCommandBase::debug();
   delete ShellBuffer::getInstance();
+
+  LoadClassDescription::deleteAllDescriptions();
 
   delete EventHandler::getInstance();

trunk/src/util/loading/load_param.cc

@@ -213 +213 @@
  *  A list, that holds all the classes that are loadable (classes not objects!!)
 */
-tList<LoadClassDescription>* LoadClassDescription::classList = new tList<LoadClassDescription>;
+tList<LoadClassDescription>* LoadClassDescription::classList = NULL;
 
 /**
@@ -228 +228 @@
   strcpy(this->className, className);
 
-  classList->add(this);
+  if (LoadClassDescription::classList == NULL)
+    LoadClassDescription::classList = new tList<LoadClassDescription>;
+
+  LoadClassDescription::classList->add(this);
 
   this->paramList = new tList<LoadParamDescription>;
@@ -238 +241 @@
 LoadClassDescription::~LoadClassDescription()
 {
-  delete []this->className;
-
   tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
   LoadParamDescription* enumParamDesc = iterator->firstElement();
@@ -248 +249 @@
     }
   delete iterator;
-}
+
+  delete[] this->className;
+}
+
+void LoadClassDescription::deleteAllDescriptions()
+{
+  if (LoadClassDescription::classList != NULL)
+  {
+    tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
+    LoadClassDescription* delElem = iterator->firstElement();
+    while (delElem != NULL)
+    {
+      delete delElem;
+      delElem = iterator->nextElement();
+    }
+    delete iterator;
+    delete LoadClassDescription::classList;
+  }
+  LoadClassDescription::classList = NULL;
+}
+
 
 /**
@@ -259 +280 @@
 LoadClassDescription* LoadClassDescription::addClass(const char* className)
 {
-  tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = iterator->firstElement();
-  while (enumClassDesc)
-    {
-      if (!strcmp(enumClassDesc->className, className))
-        {
-          delete iterator;
-          return enumClassDesc;
-        }
-      enumClassDesc = iterator->nextElement();
-    }
-  delete iterator;
-
+  if (LoadClassDescription::classList != NULL)
+  {
+    tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
+   LoadClassDescription* enumClassDesc = iterator->firstElement();
+   while (enumClassDesc)
+     {
+       if (!strcmp(enumClassDesc->className, className))
+         {
+           delete iterator;
+           return enumClassDesc;
+         }
+       enumClassDesc = iterator->nextElement();
+     }
+   delete iterator;
+  }
   return new LoadClassDescription(className);
 }
@@ -307 +330 @@
   PRINT(3)("===============================================================\n");
   PRINT(3)(" Listing all the Loadable Options (loaded since Game started).\n\n");
-  tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = classIT->firstElement();
-  while (enumClassDesc)
-    {
-      PRINT(3)("<%s>\n", enumClassDesc->className);
-      tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
-      LoadParamDescription* enumParamDesc = paramIT->firstElement();
-      while (enumParamDesc)
-        {
-          enumParamDesc->print();
-          enumParamDesc = paramIT->nextElement();
-        }
-      delete paramIT;
-
-      PRINT(3)("</%s>\n\n", enumClassDesc->className);
-      enumClassDesc = classIT->nextElement();
-    }
-  delete classIT;
+  if (LoadClassDescription::classList != NULL)
+  {
+    tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
+    LoadClassDescription* enumClassDesc = classIT->firstElement();
+    while (enumClassDesc)
+     {
+       PRINT(3)("<%s>\n", enumClassDesc->className);
+       tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
+       LoadParamDescription* enumParamDesc = paramIT->firstElement();
+       while (enumParamDesc)
+         {
+           enumParamDesc->print();
+           enumParamDesc = paramIT->nextElement();
+         }
+       delete paramIT;
+
+       PRINT(3)("</%s>\n\n", enumClassDesc->className);
+       enumClassDesc = classIT->nextElement();
+     }
+    delete classIT;
+  }
+  else
+    PRINT(3)("no Classes defined so far\n");
   PRINT(3)("===============================================================\n");
 }

trunk/src/util/loading/load_param.h

@@ -254 +254 @@
   LoadParamDescription* addParam(const char* paramName);
 
+  static void deleteAllDescriptions();
+
   static void printAll(const char* fileName = NULL);
   static tList<const char>* searchClassWithShort(const char* classNameBegin);