added scheduler watchdog members to sys/scheduler console dir

[senf.git] / senf / Utils / Console / Server.ih

diff --git a/senf/Utils/Console/Server.ih b/senf/Utils/Console/Server.ih
index aa77d74..e293878 100644 (file)
--- a/senf/Utils/Console/Server.ih
+++ b/senf/Utils/Console/Server.ih
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -30,8 +30,9 @@
 #include <boost/iostreams/concepts.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <set>
+#include <senf/Utils/Logger/SenfLog.hh>
 
-///////////////////////////////ih.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -66,7 +67,7 @@ namespace detail {
 
         \fixme Don't throw exceptions ... set stream error indicator (if at all)
      */
-    class NonblockingSocketSink 
+    class NonblockingSocketSink
         : public boost::iostreams::sink
     {
     public:
@@ -74,7 +75,7 @@ namespace detail {
         std::streamsize write(const char * s, std::streamsize n);
 
         Client & client() const;
-        
+
     private:
         Client & client_;
     };
@@ -82,7 +83,7 @@ namespace detail {
     typedef boost::iostreams::stream<NonblockingSocketSink> NonblockingSocketOStream;
 
     typedef senf::ServerSocketHandle<
-        senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy, 
+        senf::MakeSocketPolicy< senf::TCPv4SocketProtocol::Policy,
                                 senf::BSDAddressingPolicy>::policy > ServerHandle;
 
     /** \brief Internal: Generic client interface
@@ -93,6 +94,8 @@ namespace detail {
     class ClientReader
     {
     public:
+        SENF_LOG_CLASS_AREA();
+
         typedef ServerHandle::ClientHandle ClientHandle;
 
         virtual ~ClientReader() = 0;
@@ -129,7 +132,7 @@ namespace detail {
     };
 
     /** \brief Internal: Primitive ClientReader implementation
-        
+
         This implementation uses the cooked telnet mode to read lines from the console. It does not
         support explicit line editing or any other advanced features.
      */
@@ -154,7 +157,7 @@ namespace detail {
     };
 
     /** \brief Internal: Primitive ClientReader implementation
-        
+
         This implementation uses the cooked telnet mode to read lines from the console. It does not
         support explicit line editing or any other advanced features.
      */
@@ -175,10 +178,10 @@ namespace detail {
         scheduler::FdEvent readevent_;
         std::string buffer_;
     };
-    
+
 }}}
 
-///////////////////////////////ih.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #endif
 
 \f