X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FServer.cc;h=856a67c6b6dded059659a26fd8ce7a80c649c1b5;hb=bf1d8ba5ce6fc6a169a938183f8d01c8bdbccf32;hp=0fd831d5435d755c4c118668e069593a04fc5f95;hpb=826e50343096b75247521f6593cb78eb8c01615b;p=senf.git diff --git a/Console/Server.cc b/Console/Server.cc index 0fd831d..856a67c 100644 --- a/Console/Server.cc +++ b/Console/Server.cc @@ -32,6 +32,7 @@ #include #include #include +#include #include "../Utils/senfassert.hh" #include "../Utils/membind.hh" #include "../Utils/Logger/SenfLog.hh" @@ -40,55 +41,89 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -prefix_ void senf::console::start(senf::INet4SocketAddress const & address) +/////////////////////////////////////////////////////////////////////////// +// 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) { senf::TCPv4ServerSocketHandle handle (address); - handle.protocol().reuseaddr(); - senf::console::detail::Server::start(handle); - SENF_LOG((detail::Server::SENFLogArea)(log::NOTICE)( + senf::console::Server::start(handle); + SENF_LOG((Server::SENFLogArea)(log::NOTICE)( "Console server started at " << address )); + return instance(); } -prefix_ void senf::console::start(senf::INet6SocketAddress const & address) +prefix_ senf::console::Server & +senf::console::Server::start(senf::INet6SocketAddress const & address) { senf::TCPv6ServerSocketHandle handle (address); - handle.protocol().reuseaddr(); - senf::console::detail::Server::start(handle); - SENF_LOG((detail::Server::SENFLogArea)(log::NOTICE)( + senf::console::Server::start(handle); + SENF_LOG((Server::SENFLogArea)(log::NOTICE)( "Console server started at " << address )); + return instance(); } -/////////////////////////////////////////////////////////////////////////// -// senf::console::detail::Server +prefix_ senf::console::Server & senf::console::Server::instance() +{ + SENF_ASSERT( instancePtr() ); + return *instancePtr(); +} -boost::scoped_ptr senf::console::detail::Server::instance_; +prefix_ boost::scoped_ptr & 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 instance; + return instance; +} -prefix_ void senf::console::detail::Server::start(ServerHandle handle) +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::detail::Server::Server(ServerHandle handle) +prefix_ senf::console::Server::Server(ServerHandle handle) : handle_ (handle) { Scheduler::instance().add( handle_, senf::membind(&Server::newClient, this) ); } -prefix_ senf::console::detail::Server::~Server() +prefix_ senf::console::Server::~Server() { Scheduler::instance().remove(handle_); } -prefix_ void senf::console::detail::Server::newClient(Scheduler::EventId event) +prefix_ void senf::console::Server::newClient(Scheduler::EventId event) { ServerHandle::ClientSocketHandle client (handle_.accept()); - boost::intrusive_ptr p (new Client(client)); + boost::intrusive_ptr p (new Client(client, name_)); clients_.insert( p ); SENF_LOG(( "Registered new client " << p.get() )); } -prefix_ void senf::console::detail::Server::removeClient(Client & client) +prefix_ void senf::console::Server::removeClient(Client & client) { SENF_LOG(( "Disposing client " << & client )); // THIS DELETES THE CLIENT INSTANCE !! @@ -96,53 +131,87 @@ prefix_ void senf::console::detail::Server::removeClient(Client & client) } /////////////////////////////////////////////////////////////////////////// -// senf::console::detail::Client +// senf::console::Client -prefix_ senf::console::detail::Client::Client(ClientHandle handle) - : handle_ (handle), out_(::dup(handle.fd())) +prefix_ senf::console::Client::Client(ClientHandle handle, std::string const & name) + : out_t(handle), senf::log::IOStreamTarget(out_t::member), + handle_ (handle), name_ (name), promptLen_(0) { - out_ << "# " << std::flush; + showPrompt(); ReadHelper::dispatch( handle_, 16384u, ReadUntil("\n"), senf::membind(&Client::clientData, this) ); + route< senf::SenfLog, senf::log::NOTICE >(); } -prefix_ senf::console::detail::Client::~Client() +prefix_ senf::console::Client::~Client() {} -prefix_ void senf::console::detail::Client::stopClient() +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::detail::Client::clientData(ReadHelper::ptr helper) +prefix_ void senf::console::Client::clientData(ReadHelper::ptr helper) { + promptLen_ = 0; if (helper->error() || handle_.eof()) { // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER stopClient RETURNS stopClient(); return; } -# warning fix Client::clientData implementation - // Remove the 'dup' needed here so we don't close the same fd twice (see Client constructor) - // Make output non-blocking - // Don't register a new ReadHelper every round - std::string data (tail_ + helper->data()); tail_ = helper->tail(); boost::trim(data); // Gets rid of superfluous \r or \n characters - ParseCommandInfo command; - if (parser_.parseCommand(data, command)) - executor_(command, out_); - else - out_ << "syntax error" << std::endl; + if (data.empty()) + data = lastCommand_; + else + lastCommand_ = data; - out_ << "# " << std::flush; + try { + if (! parser_.parse(data, boost::bind( boost::ref(executor_), + boost::ref(out_t::member), + _1 )) ) + out_t::member << "syntax error" << std::endl; + } + catch (Executor::ExitException &) { + // THIS COMMITS SUICIDE. THE INSTANCE IS GONE AFTER stopClient RETURNS + stopClient(); + return; + } + catch (std::exception & ex) { + out_t::member << ex.what() << std::endl; + } + catch (...) { + out_t::member << "unidentified error (unknown exception thrown)" << std::endl; + } + + showPrompt(); ReadHelper::dispatch( handle_, 16384u, ReadUntil("\n"), senf::membind(&Client::clientData, this) ); } +prefix_ void senf::console::Client::showPrompt() +{ + std::string path (executor_.cwd().path()); + out_t::member << name_ << ":" << path << "# " << std::flush; + promptLen_ = name_.size() + 1 + path.size() + 1; +} + +prefix_ void senf::console::Client::v_write(boost::posix_time::ptime timestamp, + std::string const & stream, + std::string const & area, unsigned level, + std::string const & message) +{ + if (promptLen_) + out_t::member << '\r' << std::string(' ', promptLen_) << '\r'; + IOStreamTarget::v_write(timestamp, stream, area, level, message); + if (promptLen_) + showPrompt(); +} + ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_ //#include "Server.mpp"