Changeset 87 for osgVisual/src/core

Timestamp:

Jul 28, 2010, 5:13:22 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Introductes VS 2008 Memory Leak Debugging.
Todo: Compile on Linux and compare with Valgrind, VS 2008 seems to be awkward in leak debugging

Location:

osgVisual/src/core

Files:

• osgVisual.cpp (modified) (4 diffs)
• visual_core.cpp (modified) (6 diffs)

osgVisual/src/core/osgVisual.cpp

@@ -15 +15 @@
 */
 
-// Declare this in header.
+const unsigned int MAX_NUM_EVENTS = 10;
+
+#ifdef _DEBUG
+        #ifdef WIN32
+                // Declare this in header.
+                #define _CRTDBG_MAP_ALLOC
+                #include <stdlib.h>
+                #include <crtdbg.h>
+        #endif 
+#endif 
+
 //#include <windows.h>
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
 
 #include <osg/ArgumentParser>
@@ -26 +34 @@
 #include <visual_core.h>
 
-const unsigned int MAX_NUM_EVENTS = 10;
+
 
 
@@ -33 +41 @@
         
 #ifdef _DEBUG
-        #include <leakDetection.h>      // ugly but must be included inside the class
+        #ifdef WIN32
+                #include <leakDetection.h>      // ugly but must be included inside the class
 
-    int tmp_flag;
+                int tmp_flag;
 
-    HANDLE log_file = CreateFile("mem_log.txt", GENERIC_WRITE,FILE_SHARE_WRITE,
-        NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+                HANDLE log_file = CreateFile("mem_log.txt", GENERIC_WRITE,FILE_SHARE_WRITE,
+                        NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 
-    _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW |
-        _CRTDBG_MODE_DEBUG);
-    _CrtSetReportMode(_CRT_WARN,_CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-    _CrtSetReportMode(_CRT_ERROR,_CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW |
-        _CRTDBG_MODE_DEBUG);
+                _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW |
+                        _CRTDBG_MODE_DEBUG);
+                _CrtSetReportMode(_CRT_WARN,_CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+                _CrtSetReportMode(_CRT_ERROR,_CRTDBG_MODE_FILE | _CRTDBG_MODE_WNDW |
+                        _CRTDBG_MODE_DEBUG);
 
-    // output to the file if not under VS
-    _CrtSetReportFile(_CRT_ASSERT, log_file);
-    _CrtSetReportFile(_CRT_WARN, log_file);
-    _CrtSetReportFile(_CRT_ERROR, log_file);
+                // output to the file if not under VS
+                _CrtSetReportFile(_CRT_ASSERT, log_file);
+                _CrtSetReportFile(_CRT_WARN, log_file);
+                _CrtSetReportFile(_CRT_ERROR, log_file);
 
-    tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-    tmp_flag |= _CRTDBG_ALLOC_MEM_DF;
-    tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
-    tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
+                tmp_flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+                tmp_flag |= _CRTDBG_ALLOC_MEM_DF;
+                tmp_flag |= _CRTDBG_DELAY_FREE_MEM_DF;
+                tmp_flag |= _CRTDBG_LEAK_CHECK_DF;
 
-    _CrtSetDbgFlag(tmp_flag);
+                _CrtSetDbgFlag(tmp_flag);
+        #endif 
 #endif 
 
@@ -68 +78 @@
     core->initialize();
 
+        // Shut osgVisual down
+        core->shutdown();
+
         // Set Pointer to null to destroy the objects before this function ends - otherwise memory leaks wil be detected.
         core = NULL;

osgVisual/src/core/visual_core.cpp

@@ -28 +28 @@
 visual_core::~visual_core(void)
 {
-        // shut osgVisual down
-        shutdown();
-
         OSG_NOTIFY( osg::ALWAYS ) << "visual_core destroyed." << std::endl;
-
 }
 
@@ -49 +45 @@
 
         // Setup coordinate system node
-        rootNode = new osg::CoordinateSystemNode;
+        rootNode = new osg::CoordinateSystemNode;       // todo memleakf
         rootNode->setEllipsoidModel(new osg::EllipsoidModel());
 
         // Test memory leak (todo)
-        double* test = new double[1000];
+        //double* test = new double[1000];
 
         #ifdef USE_SPACENAVIGATOR
@@ -130 +126 @@
         OSG_NOTIFY( osg::ALWAYS ) << "Shutdown visual_core..." << std::endl;
 
+        // Shutdown Dbug HUD
+        if(hud.valid())
+                hud->shutdown();
         // Unset scene data
         viewer->setSceneData( NULL );
@@ -144 +143 @@
                 distortion->shutdown();
 #endif
+
+        // Shutdown data
+        rootNode = NULL;
 
         // Shutdown dataIO
@@ -295 +297 @@
         //testObj->addUpdater( new object_updater(testObj) );
 
-        osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "cessna" );
+        osg::ref_ptr<visual_object> testObj2 = new visual_object( rootNode, "cessna" ); // todo memleak
         //testObj2->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 600 );
         testObj2->setNewPosition( osg::DegreesToRadians(50.8123), osg::DegreesToRadians(8.94088), 600 );
         testObj2->loadGeometry( "../models/cessna.osg" );
-        testObj2->addUpdater( new object_updater(testObj2) );
-
-        osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" );
+        testObj2->addUpdater( new object_updater(testObj2) );   // todo memleak
+
+        osg::ref_ptr<visual_object> testObj3 = new visual_object( rootNode, "SAENGER1" );       // todo memleak
         testObj3->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 600 );
         testObj3->loadGeometry( "../models/saenger1.flt" );
-        testObj3->addUpdater( new object_updater(testObj3) );
-        
-
-        osg::ref_ptr<visual_object> testObj4 = new visual_object( rootNode, "SAENGER2" );
+        testObj3->addUpdater( new object_updater(testObj3) );   // todo memleak
+        
+
+        osg::ref_ptr<visual_object> testObj4 = new visual_object( rootNode, "SAENGER2" );       // todo memleak
         testObj4->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 650 );
         testObj4->loadGeometry( "../models/saenger2.flt" );
-        testObj4->addUpdater( new object_updater(testObj4) );
+        testObj4->addUpdater( new object_updater(testObj4) );   // todo memleak
         testObj4->addLabel("testLabel", "LabelTest!!\nnächste Zeile :)",osg::Vec4(1.0f,0.25f,1.0f,1.0f));
 
-        osg::ref_ptr<visual_object> testObj5 = new visual_object( rootNode, "SAENGER" );
+        osg::ref_ptr<visual_object> testObj5 = new visual_object( rootNode, "SAENGER" );        // todo memleak
         testObj5->setNewPosition( osg::DegreesToRadians(47.8123), osg::DegreesToRadians(12.94088), 550 );
         testObj5->loadGeometry( "../models/saengerCombine.flt" );
         //testObj5->setScale( 2 );
-        testObj5->addUpdater( new object_updater(testObj5) );
+        testObj5->addUpdater( new object_updater(testObj5) );   // todo memleak
 
 #ifdef USE_SPACENAVIGATOR
@@ -359 +361 @@
         visual_draw2D::getInstance()->init( rootNode, viewer );
         //osg::ref_ptr<visual_hud> hud = new visual_hud();
-        osg::ref_ptr<visual_debug_hud> hud = new visual_debug_hud();
+        hud = new visual_debug_hud();
         hud->init( viewer, rootNode );