Changeset 87 for osgVisual/src/core/osgVisual.cpp

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

File:

• osgVisual/src/core/osgVisual.cpp (modified) (4 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;