Changeset 11cb98

Timestamp:

May 29, 2010, 1:11:22 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

25a549

Parents:

aa36cc

Message:

Fixes to prevent seg'faults.

• CommandLineWindow::~CommandLineWindow() - does not unregister and delete all actions as this is done by the ActionRegistry anyway
• main() - use atexit(cleanUp) (by Till) to ensure correct order of the cleanup
• performCriticalExit() - don't free still allocated memory as this is handled by any good operation system nowadays

Location:

molecuilder/src

Files:

• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)
• builder.cpp (modified) (2 diffs)
• helpers.cpp (modified) (1 diff)

molecuilder/src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -73 +73 @@
 CommandLineWindow::~CommandLineWindow()
 {
-  // go through all possible actions
-  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRegistry::getInstance().getBeginIter() != ActionRegistry::getInstance().getEndIter(); ActionRunner = ActionRegistry::getInstance().getBeginIter()) {
-    ActionRegistry::getInstance().unregisterAction(ActionRunner->second);
-    delete(ActionRunner->second);
-  }
+//  // go through all possible actions
+//  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRegistry::getInstance().getBeginIter() != ActionRegistry::getInstance().getEndIter(); ActionRunner = ActionRegistry::getInstance().getBeginIter()) {
+//    ActionRegistry::getInstance().unregisterAction(ActionRunner->second);
+//    delete(ActionRunner->second);
+//  }
 
   delete statusIndicator;

molecuilder/src/builder.cpp

@@ -53 +53 @@
 
 #include <cstring>
+#include <cstdlib>
 
 #include "analysis_bonds.hpp"
@@ -2517 +2518 @@
     ActionHistory::init();
 
+    // from this moment on, we need to be sure to deeinitialize in the correct order
+    // this is handled by the cleanup function
+    atexit(cleanUp);
+
     // Parse command line options and if present create respective UI
     {

molecuilder/src/helpers.cpp

@@ -209 +209 @@
  */
 void performCriticalExit() {
-  map<void*, size_t> pointers = MemoryUsageObserver::getInstance()->getPointersToAllocatedMemory();
-  for (map<void*, size_t>::iterator runner = pointers.begin(); runner != pointers.end(); runner++) {
-    Free(((void**) &runner->first));
-  }
+//  map<void*, size_t> pointers = MemoryUsageObserver::getInstance()->getPointersToAllocatedMemory();
+//  for (map<void*, size_t>::iterator runner = pointers.begin(); runner != pointers.end(); runner++) {
+//    Free(((void**) &runner->first));
+//  }
 
   exit(255);