Rework texture generating code, add texture grouping via ( ... )

[minetest.git] / src / debug.cpp

diff --git a/src/debug.cpp b/src/debug.cpp
index 2e4992a78013f752ae51211db4d5d018cda11498..8c02f1d6b00ad54a403b13b72afd2c1c575e8c7f 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -18,17 +18,36 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 
+#include "porting.h"
 #include "debug.h"
+#include "exceptions.h"
+#include "threads.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
-
+#include <map>
+#include "jthread/jmutex.h"
+#include "jthread/jmutexautolock.h"
+#include "config.h"
 /*
        Debug output
 */
 
+#define DEBUGSTREAM_COUNT 2
+
 FILE *g_debugstreams[DEBUGSTREAM_COUNT] = {stderr, NULL};
 
+#define DEBUGPRINT(...)\
+{\
+       for(int i=0; i<DEBUGSTREAM_COUNT; i++)\
+       {\
+               if(g_debugstreams[i] != NULL){\
+                       fprintf(g_debugstreams[i], __VA_ARGS__);\
+                       fflush(g_debugstreams[i]);\
+               }\
+       }\
+}
+
 void debugstreams_init(bool disable_stderr, const char *filename)
 {
        if(disable_stderr)
@@ -53,6 +72,50 @@ void debugstreams_deinit()
                fclose(g_debugstreams[1]);
 }
 
+class Debugbuf : public std::streambuf
+{
+public:
+       Debugbuf(bool disable_stderr)
+       {
+               m_disable_stderr = disable_stderr;
+       }
+
+       int overflow(int c)
+       {
+               for(int i=0; i<DEBUGSTREAM_COUNT; i++)
+               {
+                       if(g_debugstreams[i] == stderr && m_disable_stderr)
+                               continue;
+                       if(g_debugstreams[i] != NULL)
+                               (void)fwrite(&c, 1, 1, g_debugstreams[i]);
+                       //TODO: Is this slow?
+                       fflush(g_debugstreams[i]);
+               }
+               
+               return c;
+       }
+       std::streamsize xsputn(const char *s, std::streamsize n)
+       {
+#ifdef __ANDROID__
+               __android_log_print(ANDROID_LOG_VERBOSE, PROJECT_NAME, "%s", s);
+#endif
+               for(int i=0; i<DEBUGSTREAM_COUNT; i++)
+               {
+                       if(g_debugstreams[i] == stderr && m_disable_stderr)
+                               continue;
+                       if(g_debugstreams[i] != NULL)
+                               (void)fwrite(s, 1, n, g_debugstreams[i]);
+                       //TODO: Is this slow?
+                       fflush(g_debugstreams[i]);
+               }
+
+               return n;
+       }
+       
+private:
+       bool m_disable_stderr;
+};
+
 Debugbuf debugbuf(false);
 std::ostream dstream(&debugbuf);
 Debugbuf debugbuf_no_stderr(true);
@@ -83,6 +146,18 @@ void assert_fail(const char *assertion, const char *file,
        DebugStack
 */
 
+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];
+       int stack_i; // Points to the lowest empty position
+       int stack_max_i; // Highest i that was seen
+};
+
 DebugStack::DebugStack(threadid_t id)
 {
        threadid = id;
@@ -135,7 +210,6 @@ JMutex g_debug_stacks_mutex;
 
 void debug_stacks_init()
 {
-       g_debug_stacks_mutex.Init();
 }
 
 void debug_stacks_print_to(std::ostream &os)