CMake stuff works now on linux and windows... and should be possible to make to work...

[dragonfireclient.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 9a2e282f5c2d7eba4c5f69c670aa5f5b272aa89e..8faa65eb85b7898a9e5437ae9706fa869c47f062 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -17,11 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-
-/*
-       Debug stuff
-*/
-
 #ifndef DEBUG_HEADER
 #define DEBUG_HEADER
 
@@ -30,34 +25,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <jmutexautolock.h>
 #include <iostream>
 #include "common_irrlicht.h"
-
-/*
-       Compatibility stuff
-*/
-
-#if (defined(WIN32) || defined(_WIN32_WCE))
-typedef DWORD threadid_t;
-#define __NORETURN __declspec(noreturn)
-#define __FUNCTION_NAME __FUNCTION__
+#include "threads.h"
+#include "gettime.h"
+#include "constants.h"
+#include "exceptions.h"
+
+#ifdef _WIN32
+       #define WIN32_LEAN_AND_MEAN
+       #include <windows.h>
+       #include <eh.h>
 #else
-typedef pthread_t threadid_t;
-#define __NORETURN __attribute__ ((__noreturn__))
-#define __FUNCTION_NAME __PRETTY_FUNCTION__
 #endif
 
-inline threadid_t get_current_thread_id()
-{
-#if (defined(WIN32) || defined(_WIN32_WCE))
-       return GetCurrentThreadId();
-#else
-       return pthread_self();
-#endif
-}
-
 /*
        Debug output
 */
 
+#define DTIME (getTimestamp()+": ")
+
 #define DEBUGSTREAM_COUNT 2
 
 extern FILE *g_debugstreams[DEBUGSTREAM_COUNT];
@@ -239,6 +224,60 @@ class PacketCounter
        core::map<u16, u16> m_packets;
 };
 
+/*
+       These should be put into every thread
+*/
+
+#if CATCH_UNHANDLED_EXCEPTIONS == 1
+       #define BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER try{
+       #define END_PORTABLE_DEBUG_EXCEPTION_HANDLER\
+               }catch(std::exception &e){\
+                       dstream<<std::endl<<DTIME\
+                                       <<"ERROR: An unhandled exception occurred: "\
+                                       <<e.what()<<std::endl;\
+                       assert(0);\
+               }
+       #ifdef _WIN32 // Windows
+
+/*class SE_Exception : public std::exception
+{
+private:
+    unsigned int nSE;
+public:
+    SE_Exception() {}
+    SE_Exception( unsigned int n ) : nSE( n ) {}
+    ~SE_Exception() {}
+    unsigned int getSeNumber() { return nSE; }
+};*/
+
+void se_trans_func(unsigned int, EXCEPTION_POINTERS*);
+
+class FatalSystemException : public BaseException
+{
+public:
+       FatalSystemException(const char *s):
+               BaseException(s)
+       {}
+};
+
+               #define BEGIN_DEBUG_EXCEPTION_HANDLER \
+                       BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\
+                       _set_se_translator(se_trans_func);
+
+               #define END_DEBUG_EXCEPTION_HANDLER \
+                       END_PORTABLE_DEBUG_EXCEPTION_HANDLER
+
+       #else // Posix
+               #define BEGIN_DEBUG_EXCEPTION_HANDLER\
+                       BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
+               #define END_DEBUG_EXCEPTION_HANDLER\
+                       END_PORTABLE_DEBUG_EXCEPTION_HANDLER
+       #endif
+#else
+       // Dummy ones
+       #define BEGIN_DEBUG_EXCEPTION_HANDLER
+       #define END_DEBUG_EXCEPTION_HANDLER
+#endif
 
 #endif // DEBUG_HEADER