disabled farmesh in default settings

[dragonfireclient.git] / src / debug.cpp

diff --git a/src/debug.cpp b/src/debug.cpp
index 2489413862615473166ad2bbe09ad9e8119364b2..a19186232a5b8d6e735b2db172ff5c7044135b0d 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -1,20 +1,27 @@
 /*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+
 #include "debug.h"
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef _WIN32
-       #define WIN32_LEAN_AND_MEAN
-       #include <windows.h>
-       #define sleep_ms(x) Sleep(x)
-#else
-       #include <unistd.h>
-       #define sleep_ms(x) usleep(x*1000)
-#endif
-
 /*
        Debug output
 */
@@ -25,6 +32,8 @@ void debugstreams_init(bool disable_stderr, const char *filename)
 {
        if(disable_stderr)
                g_debugstreams[0] = NULL;
+       else
+               g_debugstreams[0] = stderr;
 
        if(filename)
                g_debugstreams[1] = fopen(filename, "a");
@@ -35,6 +44,9 @@ void debugstreams_init(bool disable_stderr, const char *filename)
                fprintf(g_debugstreams[1],     "  Separator  \n");
                fprintf(g_debugstreams[1],     "-------------\n\n");
        }
+       
+       DEBUGPRINT("Debug streams initialized, disable_stderr=%d\n",
+                       disable_stderr);
 }
 
 void debugstreams_deinit()
@@ -66,8 +78,6 @@ void assert_fail(const char *assertion, const char *file,
        if(g_debugstreams[1])
                fclose(g_debugstreams[1]);
 
-       //sleep_ms(3000);
-
        abort();
 }
 
@@ -80,11 +90,12 @@ DebugStack::DebugStack(threadid_t id)
        threadid = id;
        stack_i = 0;
        stack_max_i = 0;
+       memset(stack, 0, DEBUG_STACK_SIZE*DEBUG_STACK_TEXT_SIZE);
 }
 
 void DebugStack::print(FILE *file, bool everything)
 {
-       fprintf(file, "BEGIN STACK: Debug stack for thread %x:\n",
+       fprintf(file, "DEBUG STACK FOR THREAD %x:\n",
                        (unsigned int)threadid);
 
        for(int i=0; i<stack_max_i; i++)
@@ -92,11 +103,10 @@ void DebugStack::print(FILE *file, bool everything)
                if(i == stack_i && everything == false)
                        continue;
 
-               if(everything == true && i == stack_i)
-                       fprintf(file, "END OF STACK.\n"
-                                       "! Continuing beyond stack end:\n");
-
-               fprintf(file, "#%d  %s\n", i, stack[i]);
+               if(i < stack_i)
+                       fprintf(file, "#%d  %s\n", i, stack[i]);
+               else
+                       fprintf(file, "(Leftover data: #%d  %s)\n", i, stack[i]);
        }
 
        if(stack_i == DEBUG_STACK_SIZE)
@@ -187,3 +197,35 @@ DebugStacker::~DebugStacker()
        }
 }
 
+
+#ifdef _MSC_VER
+#if CATCH_UNHANDLED_EXCEPTIONS == 1
+void se_trans_func(unsigned int u, EXCEPTION_POINTERS* pExp)
+{
+       dstream<<"In trans_func.\n";
+       if(u == EXCEPTION_ACCESS_VIOLATION)
+       {
+               PEXCEPTION_RECORD r = pExp->ExceptionRecord;
+               dstream<<"Access violation at "<<r->ExceptionAddress
+                               <<" write?="<<r->ExceptionInformation[0]
+                               <<" address="<<r->ExceptionInformation[1]
+                               <<std::endl;
+               throw FatalSystemException
+               ("Access violation");
+       }
+       if(u == EXCEPTION_STACK_OVERFLOW)
+       {
+               throw FatalSystemException
+               ("Stack overflow");
+       }
+       if(u == EXCEPTION_ILLEGAL_INSTRUCTION)
+       {
+               throw FatalSystemException
+               ("Illegal instruction");
+       }
+}
+#endif
+#endif
+
+
+