Utils/Console: Fix singleton instantiation order (ServerManager / Scheduler)

[senf.git] / Console / Server.cci

diff --git a/Console/Server.cci b/Console/Server.cci
index 5147dfd..81aaf6d 100644 (file)
--- a/Console/Server.cci
+++ b/Console/Server.cci
@@ -31,18 +31,134 @@
 ///////////////////////////////cci.p///////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::ServerManager
+
+prefix_ void senf::console::detail::ServerManager::add(ptr server)
+{
+    instance().servers_.insert(server);
+}
+
+prefix_ void senf::console::detail::ServerManager::remove(ptr server)
+{
+    instance().servers_.erase(instance().servers_.find(server));
+}
+
+prefix_ senf::console::detail::ServerManager & senf::console::detail::ServerManager::instance()
+{
+    static ServerManager manager;
+    return manager;
+}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NonblockingSocketSink
 
-prefix_ senf::console::detail::NonblockingSocketSink::NonblockingSocketSink(Handle handle)
-    : handle_ (handle)
+prefix_ senf::console::detail::NonblockingSocketSink::NonblockingSocketSink(Client & client)
+    : client_ (client)
 {}
 
+prefix_ senf::console::Client & senf::console::detail::NonblockingSocketSink::client()
+    const
+{
+    return client_;
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::Server
 
-prefix_ void senf::console::Server::name(std::string const & name)
+prefix_ senf::console::Server & senf::console::Server::name(std::string const & name)
 {
     name_ = name;
+    return *this;
+}
+
+prefix_ std::string const & senf::console::Server::name()
+    const
+{
+    return name_;
+}
+
+prefix_ senf::console::DirectoryNode & senf::console::Server::root()
+    const
+{
+    return *root_;
+}
+
+prefix_ senf::console::Server & senf::console::Server::root(DirectoryNode & root)
+{
+    root_ = root.thisptr();
+    return *this;
+}
+
+prefix_ senf::console::Server & senf::console::Server::mode(Mode m)
+{
+    mode_ = m;
+    return *this;
+}
+
+prefix_ senf::console::Server::Mode senf::console::Server::mode()
+    const
+{
+    return mode_;
+}
+
+prefix_ void senf::console::Server::stop()
+{
+    // commit suicide
+    detail::ServerManager::remove(boost::intrusive_ptr<Server>(this));
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::Client
+
+prefix_ senf::console::Client::~Client()
+{
+    stream() << std::flush;
+}
+
+prefix_ void senf::console::Client::stop()
+{
+    // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER removeClient RETURNS
+    server_.removeClient(*this);
+}
+
+prefix_ std::string const & senf::console::Client::name()
+    const
+{
+    return name_;
+}
+
+prefix_ std::string senf::console::Client::promptString()
+    const
+{
+    return name_ + ":" + executor_.cwdPath() + "$ ";
+}
+
+prefix_ senf::console::DirectoryNode & senf::console::Client::root()
+    const
+{
+    return server_.root();
+}
+
+prefix_ senf::console::Server::Mode senf::console::Client::mode()
+    const
+{
+    return mode_;
+}
+
+prefix_ senf::console::Client & senf::console::Client::get(std::ostream & os)
+{
+    return dynamic_cast<detail::NonblockingSocketOStream&>(os)->client();
+}
+
+prefix_ senf::console::Client::ClientHandle senf::console::Client::handle()
+    const
+{
+    return handle_;
+}
+
+prefix_ std::ostream & senf::console::Client::stream()
+{
+    return out_t::member;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -69,7 +185,7 @@ prefix_ senf::console::detail::ClientReader::ClientHandle senf::console::detail:
     return client().handle();
 }
 
-prefix_ senf::console::detail::ClientReader::OutputStream & senf::console::detail::ClientReader::stream()
+prefix_ std::ostream & senf::console::detail::ClientReader::stream()
     const
 {
     return client().stream();
@@ -80,10 +196,11 @@ prefix_ void senf::console::detail::ClientReader::stopClient()
     client().stop();
 }
 
-prefix_ void senf::console::detail::ClientReader::handleInput(std::string const & input)
+prefix_ std::string::size_type
+senf::console::detail::ClientReader::handleInput(std::string const & input, bool incremental)
     const
 {
-    client().handleInput(input);
+    return client().handleInput(input, incremental);
 }
 
 prefix_ void senf::console::detail::ClientReader::disablePrompt()
@@ -96,29 +213,14 @@ prefix_ void senf::console::detail::ClientReader::enablePrompt()
     v_enablePrompt();
 }
 
-prefix_ senf::console::detail::ClientReader::ClientReader(Client & client)
-    : client_ (client)
-{}
-
-///////////////////////////////////////////////////////////////////////////
-// senf::console::Client
-
-prefix_ std::string senf::console::Client::promptString()
-    const
-{
-    return name_ + ":" + executor_.cwd().path() + "$ ";
-}
-
-prefix_ senf::console::Client::ClientHandle senf::console::Client::handle()
-    const
+prefix_ void senf::console::detail::ClientReader::translate(std::string & data)
 {
-    return handle_;
+    v_translate(data);
 }
 
-prefix_ senf::console::detail::NonblockingSocketOStream & senf::console::Client::stream()
-{
-    return out_t::member;
-}
+prefix_ senf::console::detail::ClientReader::ClientReader(Client & client)
+    : client_ (client)
+{}
 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_