Utils/Logger: Reorganize source code

[senf.git] / Utils / Logger / Log.ih

diff --git a/Utils/Logger/Stream.ih b/Utils/Logger/Log.ih
similarity index 60%
rename from Utils/Logger/Stream.ih
rename to Utils/Logger/Log.ih
index a2db435..d669ff5 100644 (file)
--- a/Utils/Logger/Stream.ih
+++ b/Utils/Logger/Log.ih
@@ -2,7 +2,7 @@
 //
 // Copyright (C) 2007 
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Kompetenzzentrum fuer NETwork research (NET)
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -21,35 +21,23 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Stream internal header */
+    \brief Log internal header */
 
-#ifndef IH_Stream_
-#define IH_Stream_ 1
+#ifndef IH_Log_
+#define IH_Log_ 1
 
 // Custom includes
-#include <string>
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
-namespace senf {
-namespace log {
-namespace detail {
-
-    struct StreamBase 
-    {
-        StreamBase();
-        virtual ~StreamBase() {};
-        
-        std::string fullName() const;
-        virtual std::string v_name() const;
-
-        void init();
-
-        unsigned index;
-        static unsigned nStreams;
-    };
-
-}}}
+#define SENF_LOG_BLOCK_(parameters, block)                                                        \
+    do {                                                                                          \
+        if (parameters::compile_enabled && parameters::enabled()) {                               \
+            std::ostream & log (parameters::log_stream());                                        \
+            do block while(0);                                                                    \
+            log << std::endl;                                                                     \
+        }                                                                                         \
+    } while(0) 
 
 ///////////////////////////////ih.e////////////////////////////////////////
 #endif