All random numbers generated via one PRNG seeded in one place.

[invirt/third/libt4.git] / threaded_log.h

diff --git a/threaded_log.h b/threaded_log.h
index 7b1dd75..9a83bfb 100644 (file)
--- a/threaded_log.h
+++ b/threaded_log.h
@@ -1,10 +1,8 @@
 #ifndef threaded_log_h
 #define threaded_log_h
 
 #ifndef threaded_log_h
 #define threaded_log_h
 

-#include "types.h"
-
-extern char log_thread_prefix;
-extern int DEBUG_LEVEL;
+#include <string>
+#include <ostream>

 
 struct locked_ostream {
     std::ostream & s;
 
 struct locked_ostream {
     std::ostream & s;

@@ -17,11 +15,12 @@ struct locked_ostream {
 
 locked_ostream && _log_prefix(locked_ostream && f, const string & file, const string & func);
 locked_ostream && _log_member(locked_ostream && f, const void *ptr);
 
 locked_ostream && _log_prefix(locked_ostream && f, const string & file, const string & func);
 locked_ostream && _log_member(locked_ostream && f, const void *ptr);

+int _log_debug_level();

 lock _log_lock();
 
 #define LOG_NONMEMBER _log_prefix(locked_ostream{std::cerr, _log_lock()}, __FILE__, __func__)
 #define LOG           _log_member(LOG_NONMEMBER, (const void *)this)
 
 lock _log_lock();
 
 #define LOG_NONMEMBER _log_prefix(locked_ostream{std::cerr, _log_lock()}, __FILE__, __func__)
 #define LOG           _log_member(LOG_NONMEMBER, (const void *)this)
 

-#define IF_LEVEL(level) if(DEBUG_LEVEL >= abs(level))
+#define IF_LEVEL(level) if(_log_debug_level() >= abs(level))

 
 #endif
 
 #endif