Changeset 86

Timestamp:

Jul 28, 2010, 3:36:28 PM (14 years ago)

Author:

Torben Dannhauer

Message:

implemented technique to debug memory leaks

Location:

osgVisual

Files:

• CMakeLists.txt (modified) (1 diff)
• include/core/leakDetection.h (added)
• include/dataIO/visual_dataIO.h (modified) (1 diff)
• src/core/osgVisual.cpp (modified) (3 diffs)
• src/core/visual_core.cpp (modified) (6 diffs)

osgVisual/CMakeLists.txt

@@ -263 +263 @@
         src/core/visual_core.cpp
         src/core/osgVisual.cpp
+        # Memory Leak debugging
+        include/core/leakDetection.h
         # Util
         include/util/visual_util.h

osgVisual/include/dataIO/visual_dataIO.h

@@ -16 +16 @@
 */
 
-#include <osg/notify>
-#include <osg/referenced>
+#include <osg/Notify>
+#include <osg/Referenced>
 #include <osg/ArgumentParser>
 

osgVisual/src/core/osgVisual.cpp

@@ -15 +15 @@
 */
 
+// Declare this in header.
+//#include <windows.h>
+#define _CRTDBG_MAP_ALLOC
+#include <crtdbg.h>
+
 #include <osg/ArgumentParser>
 #include <osg/Referenced>
@@ -21 +26 @@
 #include <visual_core.h>
 
+const unsigned int MAX_NUM_EVENTS = 10;
 
-const unsigned int MAX_NUM_EVENTS = 10;
-const unsigned int SWAP_BYTES_COMPARE = 0x12345678;
 
 int main(int argc, char** argv)
 {
+        
+#ifdef _DEBUG
+        #include <leakDetection.h>      // ugly but must be included inside the class
+
+    int tmp_flag;
+
+    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);
+
+    // 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;
+
+    _CrtSetDbgFlag(tmp_flag);
+#endif 
+
     // Use an ArgumentParser object to manage the program arguments.
         osg::ArgumentParser arguments(&argc,argv);
@@ -36 +68 @@
     core->initialize();
 
+        // Set Pointer to null to destroy the objects before this function ends - otherwise memory leaks wil be detected.
+        core = NULL;
+
         return 0;
 }

osgVisual/src/core/visual_core.cpp

@@ -15 +15 @@
 */
 
+
 #include <visual_core.h>
 
@@ -22 +23 @@
 {
         OSG_NOTIFY( osg::ALWAYS ) << "visual_core instantiated." << std::endl;
+        #include <leakDetection.h>
+}
+
+visual_core::~visual_core(void)
+{
+        // shut osgVisual down
+        shutdown();
+
+        OSG_NOTIFY( osg::ALWAYS ) << "visual_core destroyed." << std::endl;
+
+}
+
+void visual_core::initialize()
+{
+        OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_core..." << std::endl;
+
+        // Configure osg to use KdTrees
+        osgDB::Registry::instance()->setBuildKdTreesHint(osgDB::ReaderWriter::Options::BUILD_KDTREES);
 
         // Setup pathes
@@ -34 +53 @@
 
         // Test memory leak (todo)
-        //double* test = new double[1000];
+        double* test = new double[1000];
 
         #ifdef USE_SPACENAVIGATOR
@@ -41 +60 @@
 
         //osg::DisplaySettings::instance()->setNumOfDatabaseThreadsHint( 8 );
-}
-
-visual_core::~visual_core(void)
-{
-        // shut osgVisual down
-        shutdown();
-
-        OSG_NOTIFY( osg::ALWAYS ) << "visual_core destroyed." << std::endl;
-
-}
-
-void visual_core::initialize()
-{
-        OSG_NOTIFY( osg::ALWAYS ) << "Initialize visual_core..." << std::endl;
-
-        // Load terrain
-        //loadTerrain(arguments);
 
         // Show model
@@ -73 +75 @@
 #ifdef USE_SKY_SILVERLINING
         // Initialize sky
-        OSG_NOTIFY( osg::ALWAYS ) << "Using Sky without distortion." << std::endl;
         sky = new visual_skySilverLining( viewer );
         sky->init(distortedSceneGraph, rootNode);       // Without distortedSceneGraph=NULL
@@ -156 +157 @@
         }
 #endif
+
+        // Destroy osgViewer
+        viewer = NULL;
 }