Console: Add member function argument parsing

[senf.git] / Console / Server.cc

diff --git a/Console/Server.cc b/Console/Server.cc
index eb1fac1..856a67c 100644 (file)
--- a/Console/Server.cc
+++ b/Console/Server.cc
@@ -24,7 +24,7 @@
     \brief Server non-inline non-template implementation */
 
 #include "Server.hh"
-//#include "Server.ih"
+#include "Server.ih"
 
 // Custom includes
 #include <unistd.h>
@@ -41,6 +41,25 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::NonBlockingSocketSink
+
+prefix_ std::streamsize senf::console::detail::NonblockingSocketSink::write(const char * s,
+                                                                            std::streamsize n)
+{
+    try {
+        if (handle_.writeable()) 
+            handle_.write(s, s+n);
+    }
+    catch (SystemException & ex) {
+        ;
+    }
+    return n;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::Server
+
 prefix_ senf::console::Server &
 senf::console::Server::start(senf::INet4SocketAddress const & address)
 {
@@ -48,7 +67,7 @@ senf::console::Server::start(senf::INet4SocketAddress const & address)
     senf::console::Server::start(handle);
     SENF_LOG((Server::SENFLogArea)(log::NOTICE)( 
                  "Console server started at " << address ));
-    return *instance_;
+    return instance();
 }
 
 prefix_ senf::console::Server &
@@ -58,18 +77,31 @@ senf::console::Server::start(senf::INet6SocketAddress const & address)
     senf::console::Server::start(handle);
     SENF_LOG((Server::SENFLogArea)(log::NOTICE)( 
                  "Console server started at " << address ));
-    return *instance_;
+    return instance();
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::console::Server
+prefix_ senf::console::Server & senf::console::Server::instance()
+{
+    SENF_ASSERT( instancePtr() );
+    return *instancePtr();
+}
 
-boost::scoped_ptr<senf::console::Server> senf::console::Server::instance_;
+prefix_ boost::scoped_ptr<senf::console::Server> & senf::console::Server::instancePtr()
+{
+    // We cannot make 'instance' a global or class-static variable, since it will then be destructed
+    // at an unknown time which may fail if the scheduler or the file-handle pool allocators have
+    // already been destructed.
+    static boost::scoped_ptr<senf::console::Server> instance;
+    return instance;
+}
 
 prefix_ void senf::console::Server::start(ServerHandle handle)
 {
-    SENF_ASSERT( ! instance_ );
-    instance_.reset(new Server(handle));
+    // Uah .... ensure the scheduler is created before the instance pointer so it get's destructed
+    // AFTER it.
+    (void) senf::Scheduler::instance();
+    SENF_ASSERT( ! instancePtr() );
+    instancePtr().reset(new Server(handle));
 }
 
 prefix_ senf::console::Server::Server(ServerHandle handle)
@@ -102,7 +134,7 @@ prefix_ void senf::console::Server::removeClient(Client & client)
 // senf::console::Client
 
 prefix_ senf::console::Client::Client(ClientHandle handle, std::string const & name)
-    : out_t(::dup(handle.fd())), senf::log::IOStreamTarget(out_t::member),
+    : out_t(handle), senf::log::IOStreamTarget(out_t::member),
       handle_ (handle), name_ (name), promptLen_(0)
 {
     showPrompt();
@@ -117,7 +149,7 @@ prefix_ senf::console::Client::~Client()
 prefix_ void senf::console::Client::stopClient()
 {
     // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER removeClient RETURNS
-    Server::instance_->removeClient(*this);
+    Server::instance().removeClient(*this);
 }
 
 prefix_ void senf::console::Client::clientData(ReadHelper<ClientHandle>::ptr helper)
@@ -133,9 +165,15 @@ prefix_ void senf::console::Client::clientData(ReadHelper<ClientHandle>::ptr hel
     tail_ = helper->tail();
     boost::trim(data); // Gets rid of superfluous  \r or \n characters
 
+    if (data.empty())
+        data = lastCommand_;
+    else
+        lastCommand_ = data;
+
     try {
-        if (! parser_.parse(data, boost::bind<void>(boost::ref(executor_), _1, 
-                                                    boost::ref(out_t::member))))
+        if (! parser_.parse(data, boost::bind<void>( boost::ref(executor_),
+                                                     boost::ref(out_t::member),
+                                                     _1 )) )
             out_t::member << "syntax error" << std::endl;
     }
     catch (Executor::ExitException &) {