projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use GenericCAO in place of LuaEntityCAO and PlayerCAO
[oweals/minetest.git]
/
src
/
debug.h
diff --git
a/src/debug.h
b/src/debug.h
index 234b7c74afd4dbdd6290ea792217267f93cb0a72..5150758be13506d070b9ed8cca5bcd6ed4fd3f1b 100644
(file)
--- a/
src/debug.h
+++ b/
src/debug.h
@@
-85,7
+85,7
@@
public:
return c;
}
return c;
}
-
int xsputn(const char *s, int
n)
+
std::streamsize xsputn(const char *s, std::streamsize
n)
{
for(int i=0; i<DEBUGSTREAM_COUNT; i++)
{
{
for(int i=0; i<DEBUGSTREAM_COUNT; i++)
{
@@
-145,6
+145,7
@@
struct DebugStack
{
DebugStack(threadid_t id);
void print(FILE *file, bool everything);
{
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];
threadid_t threadid;
char stack[DEBUG_STACK_SIZE][DEBUG_STACK_TEXT_SIZE];
@@
-156,6
+157,7
@@
extern core::map<threadid_t, DebugStack*> g_debug_stacks;
extern JMutex g_debug_stacks_mutex;
extern void debug_stacks_init();
extern JMutex g_debug_stacks_mutex;
extern void debug_stacks_init();
+extern void debug_stacks_print_to(std::ostream &os);
extern void debug_stacks_print();
class DebugStacker
extern void debug_stacks_print();
class DebugStacker
@@
-235,10
+237,9
@@
private:
#if CATCH_UNHANDLED_EXCEPTIONS == 1
#define BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER try{
#if CATCH_UNHANDLED_EXCEPTIONS == 1
#define BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER try{
- #define END_PORTABLE_DEBUG_EXCEPTION_HANDLER\
+ #define END_PORTABLE_DEBUG_EXCEPTION_HANDLER
(logstream)
\
}catch(std::exception &e){\
}catch(std::exception &e){\
- dstream<<std::endl<<DTIME\
- <<"ERROR: An unhandled exception occurred: "\
+ logstream<<"ERROR: An unhandled exception occurred: "\
<<e.what()<<std::endl;\
assert(0);\
}
<<e.what()<<std::endl;\
assert(0);\
}
@@
-257,24
+258,24
@@
public:
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\
_set_se_translator(se_trans_func);
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER\
_set_se_translator(se_trans_func);
- #define END_DEBUG_EXCEPTION_HANDLER \
- END_PORTABLE_DEBUG_EXCEPTION_HANDLER
+ #define END_DEBUG_EXCEPTION_HANDLER
(logstream)
\
+ END_PORTABLE_DEBUG_EXCEPTION_HANDLER
(logstream)
#else // Probably mingw
#define BEGIN_DEBUG_EXCEPTION_HANDLER\
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
#else // Probably mingw
#define BEGIN_DEBUG_EXCEPTION_HANDLER\
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
- #define END_DEBUG_EXCEPTION_HANDLER\
- END_PORTABLE_DEBUG_EXCEPTION_HANDLER
+ #define END_DEBUG_EXCEPTION_HANDLER
(logstream)
\
+ END_PORTABLE_DEBUG_EXCEPTION_HANDLER
(logstream)
#endif
#else // Posix
#define BEGIN_DEBUG_EXCEPTION_HANDLER\
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
#endif
#else // Posix
#define BEGIN_DEBUG_EXCEPTION_HANDLER\
BEGIN_PORTABLE_DEBUG_EXCEPTION_HANDLER
- #define END_DEBUG_EXCEPTION_HANDLER\
- END_PORTABLE_DEBUG_EXCEPTION_HANDLER
+ #define END_DEBUG_EXCEPTION_HANDLER
(logstream)
\
+ END_PORTABLE_DEBUG_EXCEPTION_HANDLER
(logstream)
#endif
#else
// Dummy ones
#define BEGIN_DEBUG_EXCEPTION_HANDLER
#endif
#else
// Dummy ones
#define BEGIN_DEBUG_EXCEPTION_HANDLER
- #define END_DEBUG_EXCEPTION_HANDLER
+ #define END_DEBUG_EXCEPTION_HANDLER
(logstream)
#endif
#endif // DEBUG_HEADER
#endif
#endif // DEBUG_HEADER