Remove liquid_finite and weather

[minetest.git] / src / debug.cpp

diff --git a/src/debug.cpp b/src/debug.cpp
index 8b25cc22d4ec6b08a8f17ce78ed0f444345147f5..278902a081b7fa2836063ace205771cbbcd4c871 100644 (file)
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 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 Lesser General Public License as published by
@@ -19,16 +19,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 #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"
 
 /*
        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 +71,47 @@ 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)
+       {
+               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 +142,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;
@@ -130,12 +201,11 @@ void DebugStack::print(std::ostream &os, bool everything)
                os<<"Probably overflown."<<std::endl;
 }
 
-core::map<threadid_t, DebugStack*> g_debug_stacks;
+std::map<threadid_t, DebugStack*> g_debug_stacks;
 JMutex g_debug_stacks_mutex;
 
 void debug_stacks_init()
 {
-       g_debug_stacks_mutex.Init();
 }
 
 void debug_stacks_print_to(std::ostream &os)
@@ -144,12 +214,11 @@ void debug_stacks_print_to(std::ostream &os)
 
        os<<"Debug stacks:"<<std::endl;
 
-       for(core::map<threadid_t, DebugStack*>::Iterator
-                       i = g_debug_stacks.getIterator();
-                       i.atEnd() == false; i++)
+       for(std::map<threadid_t, DebugStack*>::iterator
+                       i = g_debug_stacks.begin();
+                       i != g_debug_stacks.end(); ++i)
        {
-               DebugStack *stack = i.getNode()->getValue();
-               stack->print(os, false);
+               i->second->print(os, false);
        }
 }
 
@@ -159,11 +228,11 @@ void debug_stacks_print()
 
        DEBUGPRINT("Debug stacks:\n");
 
-       for(core::map<threadid_t, DebugStack*>::Iterator
-                       i = g_debug_stacks.getIterator();
-                       i.atEnd() == false; i++)
+       for(std::map<threadid_t, DebugStack*>::iterator
+                       i = g_debug_stacks.begin();
+                       i != g_debug_stacks.end(); ++i)
        {
-               DebugStack *stack = i.getNode()->getValue();
+               DebugStack *stack = i->second;
 
                for(int i=0; i<DEBUGSTREAM_COUNT; i++)
                {
@@ -179,18 +248,18 @@ DebugStacker::DebugStacker(const char *text)
 
        JMutexAutoLock lock(g_debug_stacks_mutex);
 
-       core::map<threadid_t, DebugStack*>::Node *n;
+       std::map<threadid_t, DebugStack*>::iterator n;
        n = g_debug_stacks.find(threadid);
-       if(n != NULL)
+       if(n != g_debug_stacks.end())
        {
-               m_stack = n->getValue();
+               m_stack = n->second;
        }
        else
        {
                /*DEBUGPRINT("Creating new debug stack for thread %x\n",
                                (unsigned int)threadid);*/
                m_stack = new DebugStack(threadid);
-               g_debug_stacks.insert(threadid, m_stack);
+               g_debug_stacks[threadid] = m_stack;
        }
 
        if(m_stack->stack_i >= DEBUG_STACK_SIZE)
@@ -224,7 +293,7 @@ DebugStacker::~DebugStacker()
                /*DEBUGPRINT("Deleting debug stack for thread %x\n",
                                (unsigned int)threadid);*/
                delete m_stack;
-               g_debug_stacks.remove(threadid);
+               g_debug_stacks.erase(threadid);
        }
 }