Use GenericCAO in place of LuaEntityCAO and PlayerCAO

[oweals/minetest.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 3f269176abcf889cf7fe06fff820382efde4b6d0..5150758be13506d070b9ed8cca5bcd6ed4fd3f1b 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -27,6 +27,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common_irrlicht.h"
 #include "threads.h"
 #include "gettime.h"
+#include "constants.h"
+#include "exceptions.h"
+
+#ifdef _WIN32
+       #define WIN32_LEAN_AND_MEAN
+       #include <windows.h>
+       #ifdef _MSC_VER
+               #include <eh.h>
+       #endif
+#else
+#endif
 
 /*
        Debug output
@@ -67,21 +78,21 @@ public:
                        if(g_debugstreams[i] == stderr && m_disable_stderr)
                                continue;
                        if(g_debugstreams[i] != NULL)
-                               fwrite(&c, 1, 1, g_debugstreams[i]);
+                               (void)fwrite(&c, 1, 1, g_debugstreams[i]);
                        //TODO: Is this slow?
                        fflush(g_debugstreams[i]);
                }
                
                return c;
        }
-       int xsputn(const char *s, int n)
+       std::streamsize xsputn(const char *s, std::streamsize n)
        {
                for(int i=0; i<DEBUGSTREAM_COUNT; i++)
                {
                        if(g_debugstreams[i] == stderr && m_disable_stderr)
                                continue;
                        if(g_debugstreams[i] != NULL)
-                               fwrite(s, 1, n, g_debugstreams[i]);
+                               (void)fwrite(s, 1, n, g_debugstreams[i]);
                        //TODO: Is this slow?
                        fflush(g_debugstreams[i]);
                }
@@ -134,6 +145,7 @@ struct DebugStack
 {
        DebugStack(threadid_t id);
        void print(FILE *file, bool everything);
+       void print(std::ostream &os, bool everything);
        
        threadid_t threadid;
        char stack[DEBUG_STACK_SIZE][DEBUG_STACK_TEXT_SIZE];
@@ -145,6 +157,7 @@ extern core::map<threadid_t, DebugStack*> g_debug_stacks;
 extern JMutex g_debug_stacks_mutex;
 
 extern void debug_stacks_init();
+extern void debug_stacks_print_to(std::ostream &os);
 extern void debug_stacks_print();
 
 class DebugStacker
@@ -158,7 +171,10 @@ private:
        bool m_overflowed;
 };
 
-#define DSTACK(...)\
+#define DSTACK(msg)\
+       DebugStacker __debug_stacker(msg);
+
+#define DSTACKF(...)\
        char __buf[DEBUG_STACK_TEXT_SIZE];\
        snprintf(__buf,\
                        DEBUG_STACK_TEXT_SIZE, __VA_ARGS__);\
@@ -215,6 +231,52 @@ private:
        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(logstream)\
+               }catch(std::exception &e){\
+                       logstream<<"ERROR: An unhandled exception occurred: "\
+                                       <<e.what()<<std::endl;\
+                       assert(0);\
+               }
+       #ifdef _WIN32 // Windows
+               #ifdef _MSC_VER // MSVC
+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(logstream) \
+                               END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream)
+               #else // Probably mingw
+                       #define BEGIN_DEBUG_EXCEPTION_HANDLER\
+                               BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
+                       #define END_DEBUG_EXCEPTION_HANDLER(logstream)\
+                               END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream)
+               #endif
+       #else // Posix
+               #define BEGIN_DEBUG_EXCEPTION_HANDLER\
+                       BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
+               #define END_DEBUG_EXCEPTION_HANDLER(logstream)\
+                       END_PORTABLE_DEBUG_EXCEPTION_HANDLER(logstream)
+       #endif
+#else
+       // Dummy ones
+       #define BEGIN_DEBUG_EXCEPTION_HANDLER
+       #define END_DEBUG_EXCEPTION_HANDLER(logstream)
+#endif
 
 #endif // DEBUG_HEADER