loglevel can be set now and all logging macros support streaming

Former-commit-id: c8c32b43e6

src/utility/macros.h

@@ -18,14 +18,20 @@ extern int storm_runtime_loglevel;
 
 #define STORM_LOG_DEBUG(message)                                    \
 do {                                                                \
-    if(storm_runtime_loglevel <= STORM_LOGLEVEL_DEBUG) {            \
-        std::cout << "LOG DBG: " << message << std::endl;           \
+    if(storm_runtime_loglevel >= STORM_LOGLEVEL_DEBUG) {            \
+        std::stringstream __ss;                                     \
+        __ss << message;                                            \
+        std::cout << "LOG DBG: " << __ss.str() << std::endl;        \
     }                                                               \
 } while (false)
 
 #define STORM_LOG_TRACE(message)                                \
 do {                                                            \
+    if(storm_runtime_loglevel >= STORM_LOGLEVEL_TRACE) {        \
+        std::stringstream __ss;                                 \
+        __ss << message;                                        \
         std::cout << "LOG TRC: " << message << std::endl;       \
+    }                                                           \
 } while(false)  
 
 
@@ -34,10 +40,10 @@ do {                                                    \
 #define STORM_LOG_ASSERT(cond, message)                     \
 do {                                                        \
 if (!(cond)) {                                              \
-std::cout << "LOG ERR: " << message << std::endl;          \
+std::cout << "ASSERT FAILED: " << message << std::endl;     \
 assert(cond);                                               \
 }                                                           \
-} while (false)                                 \
+} while (false)                                 
 
 #else
 #define STORM_LOG_ASSERT(cond, message)         
@@ -49,61 +55,73 @@ do {                                            \
         std::cout << "LOG ERR: " << message << std::endl;       \
         throw exception() << message;                           \
     }                                                           \
-} while (false)                                 \
+} while (false)                                
 
 
 // Define STORM_LOG_WARN, STORM_LOG_ERROR and STORM_LOG_INFO to log the given message with the corresponding log levels.
 #define STORM_LOG_WARN(message)                                \
 do {                                                           \
+    if(storm_runtime_loglevel >= STORM_LOGLEVEL_WARN) {        \
+        std::stringstream __ss;                                \
+        __ss << message;                                       \
         std::cout << "LOG WRN: " << message << std::endl;      \
-} while (false)                                 \
+    }                                                          \
+} while (false)                               
 
 #define STORM_LOG_WARN_COND(cond, message)                      \
 do {                                                            \
     if (!(cond)) {                                              \
-        std::cout << "LOG WRN: " << message << std::endl;       \
+        STORM_LOG_WARN(message);                                 \
     }                                                           \
-} while (false)                                 \
+} while (false)                                 
 
 #define STORM_LOG_INFO(message)                                 \
 do {                                                            \
+    if(storm_runtime_loglevel >= STORM_LOGLEVEL_INFO) {         \
+        std::stringstream __ss;                                 \
+        __ss << message;                                        \
         std::cout << "LOG INF: " << message << std::endl;       \
-} while (false)                                 \
+    }                                                           \
+} while (false)                                 
 
 #define STORM_LOG_INFO_COND(cond, message)                      \
 do {                                                            \
     if (!(cond)) {                                              \
-        std::cout << "LOG INF: " << message << std::endl;        \
+        STORM_LOG_INFO(message);                                \
     }                                                           \
-} while (false)                                 \
+} while (false)                                 
 
 #define STORM_LOG_ERROR(message)                                \
 do {                                                            \
+    if(storm_runtime_loglevel >= STORM_LOGLEVEL_ERROR) {        \
         std::stringstream __ss;                                 \
         __ss << message;                                        \
-     std::cout << "LOG ERR: " << __ss.str() << std::endl;          \
+        std::cout << "LOG ERR: " << message << std::endl;       \
+    }                                                           \
 } while (false)                                                 \
 
 #define STORM_LOG_ERROR_COND(cond, message)     \
 do {                                            \
     if (!(cond)) {                              \
-        STORM_LOG_ERROR(message)        \
+        STORM_LOG_ERROR(message);               \
     }                                           \
 } while (false)                                 \
 
 #define STORM_GLOBAL_LOGLEVEL_INFO()                \
 do {                                                \
+storm_runtime_loglevel = STORM_LOGLEVEL_INFO;       \
 } while (false)
 
 #define STORM_GLOBAL_LOGLEVEL_DEBUG()               \
 do {                                                \
+storm_runtime_loglevel = STORM_LOGLEVEL_DEBUG;      \
 } while(false)
     
 #define STORM_GLOBAL_LOGLEVEL_TRACE()               \
 do {                                                \
+storm_runtime_loglevel = STORM_LOGLEVEL_TRACE;      \
 } while(false)
 
-
 #else 
 // Include the parts necessary for Log4cplus.
 #include "log4cplus/logger.h"