]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/debug.cpp
Added JetPack and AutoHit (-> Credits to Code-Sploit and cora)
[dragonfireclient.git] / src / debug.cpp
index 521891bbd42d47905b24932654e2fc80a177ef10..3c82ed9e1c23ec62e51fb5bc3e91d0c7608efa23 100644 (file)
@@ -21,13 +21,13 @@ 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 <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <map>
-#include "jthread/jmutex.h"
-#include "jthread/jmutexautolock.h"
+#include <sstream>
+#include <thread>
+#include "threading/mutex_auto_lock.h"
 #include "config.h"
 
 #ifdef _MSC_VER
@@ -36,98 +36,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #include "filesys.h"
 #endif
 
-/*
-       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)
-               g_debugstreams[0] = NULL;
-       else
-               g_debugstreams[0] = stderr;
-
-       if(filename)
-               g_debugstreams[1] = fopen(filename, "a");
-
-       if(g_debugstreams[1])
-       {
-               fprintf(g_debugstreams[1], "\n\n-------------\n");
-               fprintf(g_debugstreams[1],     "  Separator  \n");
-               fprintf(g_debugstreams[1],     "-------------\n\n");
-       }
-}
-
-void debugstreams_deinit()
-{
-       if(g_debugstreams[1] != NULL)
-               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);
+#if USE_CURSES
+       #include "terminal_chat_console.h"
 #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);
-std::ostream dstream_no_stderr(&debugbuf_no_stderr);
-Nullstream dummyout;
 
 /*
        Assert
@@ -136,15 +47,14 @@ Nullstream dummyout;
 void sanity_check_fn(const char *assertion, const char *file,
                unsigned int line, const char *function)
 {
-       DEBUGPRINT("\nIn thread %lx:\n"
-                       "%s:%u: %s: An engine assumption '%s' failed.\n",
-                       (unsigned long)get_current_thread_id(),
-                       file, line, function, assertion);
-
-       debug_stacks_print();
+#if USE_CURSES
+       g_term_console.stopAndWaitforThread();
+#endif
 
-       if(g_debugstreams[1])
-               fclose(g_debugstreams[1]);
+       errorstream << std::endl << "In thread " << std::hex
+               << std::this_thread::get_id() << ":" << std::endl;
+       errorstream << file << ":" << line << ": " << function
+               << ": An engine assumption '" << assertion << "' failed." << std::endl;
 
        abort();
 }
@@ -152,178 +62,18 @@ void sanity_check_fn(const char *assertion, const char *file,
 void fatal_error_fn(const char *msg, const char *file,
                unsigned int line, const char *function)
 {
-       DEBUGPRINT("\nIn thread %lx:\n"
-                       "%s:%u: %s: A fatal error occurred: %s\n",
-                       (unsigned long)get_current_thread_id(),
-                       file, line, function, msg);
-
-       debug_stacks_print();
+#if USE_CURSES
+       g_term_console.stopAndWaitforThread();
+#endif
 
-       if(g_debugstreams[1])
-               fclose(g_debugstreams[1]);
+       errorstream << std::endl << "In thread " << std::hex
+               << std::this_thread::get_id() << ":" << std::endl;
+       errorstream << file << ":" << line << ": " << function
+               << ": A fatal error occurred: " << msg << std::endl;
 
        abort();
 }
 
-/*
-       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;
-       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, "DEBUG STACK FOR THREAD %lx:\n",
-                       (unsigned long)threadid);
-
-       for(int i=0; i<stack_max_i; i++)
-       {
-               if(i == stack_i && everything == false)
-                       break;
-
-               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)
-               fprintf(file, "Probably overflown.\n");
-}
-
-void DebugStack::print(std::ostream &os, bool everything)
-{
-       os<<"DEBUG STACK FOR THREAD "<<(unsigned long)threadid<<": "<<std::endl;
-
-       for(int i=0; i<stack_max_i; i++)
-       {
-               if(i == stack_i && everything == false)
-                       break;
-
-               if(i < stack_i)
-                       os<<"#"<<i<<"  "<<stack[i]<<std::endl;
-               else
-                       os<<"(Leftover data: #"<<i<<"  "<<stack[i]<<")"<<std::endl;
-       }
-
-       if(stack_i == DEBUG_STACK_SIZE)
-               os<<"Probably overflown."<<std::endl;
-}
-
-std::map<threadid_t, DebugStack*> g_debug_stacks;
-JMutex g_debug_stacks_mutex;
-
-void debug_stacks_init()
-{
-}
-
-void debug_stacks_print_to(std::ostream &os)
-{
-       JMutexAutoLock lock(g_debug_stacks_mutex);
-
-       os<<"Debug stacks:"<<std::endl;
-
-       for(std::map<threadid_t, DebugStack*>::iterator
-                       i = g_debug_stacks.begin();
-                       i != g_debug_stacks.end(); ++i)
-       {
-               i->second->print(os, false);
-       }
-}
-
-void debug_stacks_print()
-{
-       JMutexAutoLock lock(g_debug_stacks_mutex);
-
-       DEBUGPRINT("Debug stacks:\n");
-
-       for(std::map<threadid_t, DebugStack*>::iterator
-                       i = g_debug_stacks.begin();
-                       i != g_debug_stacks.end(); ++i)
-       {
-               DebugStack *stack = i->second;
-
-               for(int i=0; i<DEBUGSTREAM_COUNT; i++)
-               {
-                       if(g_debugstreams[i] != NULL)
-                               stack->print(g_debugstreams[i], true);
-               }
-       }
-}
-
-DebugStacker::DebugStacker(const char *text)
-{
-       threadid_t threadid = get_current_thread_id();
-
-       JMutexAutoLock lock(g_debug_stacks_mutex);
-
-       std::map<threadid_t, DebugStack*>::iterator n;
-       n = g_debug_stacks.find(threadid);
-       if(n != g_debug_stacks.end())
-       {
-               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[threadid] = m_stack;
-       }
-
-       if(m_stack->stack_i >= DEBUG_STACK_SIZE)
-       {
-               m_overflowed = true;
-       }
-       else
-       {
-               m_overflowed = false;
-
-               snprintf(m_stack->stack[m_stack->stack_i],
-                               DEBUG_STACK_TEXT_SIZE, "%s", text);
-               m_stack->stack_i++;
-               if(m_stack->stack_i > m_stack->stack_max_i)
-                       m_stack->stack_max_i = m_stack->stack_i;
-       }
-}
-
-DebugStacker::~DebugStacker()
-{
-       JMutexAutoLock lock(g_debug_stacks_mutex);
-
-       if(m_overflowed == true)
-               return;
-
-       m_stack->stack_i--;
-
-       if(m_stack->stack_i == 0)
-       {
-               threadid_t threadid = m_stack->threadid;
-               /*DEBUGPRINT("Deleting debug stack for thread %x\n",
-                               (unsigned int)threadid);*/
-               delete m_stack;
-               g_debug_stacks.erase(threadid);
-       }
-}
-
 #ifdef _MSC_VER
 
 const char *Win32ExceptionCodeToString(DWORD exception_code)
@@ -385,9 +135,11 @@ long WINAPI Win32ExceptionHandler(struct _EXCEPTION_POINTERS *pExceptInfo)
        MINIDUMP_USER_STREAM_INFORMATION mdusi;
        MINIDUMP_USER_STREAM mdus;
        bool minidump_created = false;
-       std::string version_str("Minetest ");
 
-       std::string dumpfile = porting::path_user + DIR_DELIM "minetest.dmp";
+       std::string dumpfile = porting::path_user + DIR_DELIM PROJECT_NAME ".dmp";
+
+       std::string version_str(PROJECT_NAME " ");
+       version_str += g_version_hash;
 
        HANDLE hFile = CreateFileA(dumpfile.c_str(), GENERIC_WRITE,
                FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -401,8 +153,6 @@ long WINAPI Win32ExceptionHandler(struct _EXCEPTION_POINTERS *pExceptInfo)
        mdei.ExceptionPointers = pExceptInfo;
        mdei.ThreadId              = GetCurrentThreadId();
 
-       version_str += minetest_version_hash;
-
        mdus.Type       = CommentStreamA;
        mdus.BufferSize = version_str.size();
        mdus.Buffer     = (PVOID)version_str.c_str();