/*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser 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>
+#include <cstring>
/*
Debug output
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()
void assert_fail(const char *assertion, const char *file,
unsigned int line, const char *function)
{
- DEBUGPRINT("\nIn thread %x:\n"
+ DEBUGPRINT("\nIn thread %lx:\n"
"%s:%d: %s: Assertion '%s' failed.\n",
- (unsigned int)get_current_thread_id(),
+ (unsigned long)get_current_thread_id(),
file, line, function, assertion);
debug_stacks_print();
void DebugStack::print(FILE *file, bool everything)
{
- fprintf(file, "DEBUG STACK FOR THREAD %x:\n",
- (unsigned int)threadid);
+ 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)
- continue;
+ break;
if(i < stack_i)
fprintf(file, "#%d %s\n", i, stack[i]);
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;
-core::map<threadid_t, DebugStack*> g_debug_stacks;
+ 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()
g_debug_stacks_mutex.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(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++)
{
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)
/*DEBUGPRINT("Deleting debug stack for thread %x\n",
(unsigned int)threadid);*/
delete m_stack;
- g_debug_stacks.remove(threadid);
+ g_debug_stacks.erase(threadid);
}
}