WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/net/Manager.cpp

 #include <iostream>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
 #include <boost/cast.hpp>
+#include "common/log.h"
+static const std::string log_module_ = "net::manager";
 namespace atom {
 namespace net {
 Manager::Pointer Manager::instance_;
-logging::Logger Manager::LOG("net::Manager");
 Manager::Manager()
 {
+  LOG_DEBUG_ENTER;
+  LOG_DEBUG_EXIT;
 }
 Manager::~Manager()
 {
+  LOG_DEBUG_ENTER;
-    this->Stop();
+  this->Stop();
-    this->clients_.clear();
+  this->clients_.clear();
+  LOG_DEBUG_EXIT;
+}
 Manager::Pointer Manager::Instance()
+{
+  LOG_DEBUG_ENTER;
-    return Manager::instance_;
+  return Manager::instance_;
+  LOG_DEBUG_EXIT;
+}
 void Manager::Create()
 {
+  LOG_DEBUG_ENTER;
-    Manager::instance_ = Manager::Pointer(new Manager());
+  Manager::instance_ = Manager::Pointer(new Manager());
+  LOG_DEBUG_EXIT;
+}
 void Manager::Delete()
+{
+  LOG_DEBUG_ENTER;
-    Manager::instance_.reset();
+  Manager::instance_.reset();
+  LOG_DEBUG_EXIT;
 }
 void Manager::ConnectSlots(const SignalOnNewState::slot_type& slot_on_new_state, const SignalOnNewData::slot_type& slot_on_new_data)
 {
+  LOG_DEBUG_ENTER;
-    this->signal_on_new_state_.connect(slot_on_new_state);
+  this->signal_on_new_state_.connect(slot_on_new_state);
-    this->signal_on_new_data_.connect(slot_on_new_data);
+  this->signal_on_new_data_.connect(slot_on_new_data);
+  LOG_DEBUG_EXIT;
+}
 void Manager::SlotOnNewState(SocketId client_id, SocketId server_id, ClientState client_state)
+{
-    if (client_state == CLIENT_STATE_DISCONNECTED)
-    {
-        this->clients_.erase(client_id);
+  LOG_DEBUG_ENTER;
-    }
-    else if (client_state == CLIENT_STATE_ACCEPTED)
-    {
-        ClientList::iterator it = this->clients_.find(client_id);
-        if (it != this->clients_.end())
+  if (client_state == CLIENT_STATE_DISCONNECTED)
+  {
+    this->clients_.erase(client_id);
+  }
+  this->signal_on_new_state_(client_id, server_id, client_state);
+  LOG_DEBUG_EXIT;
+}
+void Manager::SlotOnNewClient(SocketId server_id, TcpSocketPointer socket)
+{
+  LOG_DEBUG_ENTER;
-            TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeSocketId(), it->second->GetServerId()));
+  TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, socket, this->GetFreeSocketId(), server_id));
-            client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
+  client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
-                                 Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
+                       Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
-            client->Accept(boost::polymorphic_downcast<TcpClient*>(it->second.get())->ReleaseAcceptor());
-            this->clients_[client->GetId()] = client;
+  this->clients_[client->GetId()] = client;
-            this->signal_on_new_state_(client_id, server_id, CLIENT_STATE_CONNECTED);
+  log::Debug(log_module_, "Client connected on server id %d with client id %d!", server_id, client->GetId());
-            return;
-        }
-        else
-        {
-            throw std::runtime_error("Accepted unknown client!");
+  this->signal_on_new_state_(client->GetId(), server_id, CLIENT_STATE_CONNECTED);
-        }
-    }
+  LOG_DEBUG_EXIT;
-    this->signal_on_new_state_(client_id, server_id, client_state);
 }
 void Manager::SlotOnNewData(SocketId client_id, SocketId server_id, common::Byteset data)
+{
+  LOG_DEBUG_ENTER;
-    this->signal_on_new_data_(client_id, server_id, data);
+  this->signal_on_new_data_(client_id, server_id, data);
+  LOG_DEBUG_EXIT;
+}
 SocketId Manager::GetFreeSocketId()
+{
-    SocketId id = 1;
+  LOG_DEBUG_ENTER;
-    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
+  SocketId id = 1;
-    {
-        if (it->second->GetServerId() != id && this->clients_.find(id) == this->clients_.end())
+  while (this->clients_.find(id) != this->clients_.end() || this->servers_.find(id) != this->servers_.end())
+  {
-            return id;
-        }
-        id++;
+    id++;
-    }
+  }
+  LOG_DEBUG_EXIT;
-    return id;
+  return id;
 }
 SocketId Manager::StartServer(Protocol protocol, unsigned int port)
 {
+  LOG_DEBUG_ENTER;
-    if (protocol != PROTOCOL_TCP)
+  if (protocol != PROTOCOL_TCP)
+  {
-        throw std::runtime_error("Can not start server for the Serial or UDP protocol!");
+    throw std::runtime_error("Can not start server for the Serial or UDP protocol!");
-        return 0;
-    }
-    TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeSocketId(), this->GetFreeSocketId()));
-    client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
-                         Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
-    TcpClient::AcceptorPointer acceptor = TcpClient::AcceptorPointer(new boost::asio::ip::tcp::acceptor(this->io_service_, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)));
-    client->Accept(acceptor);
-    this->clients_[client->GetId()] = client;
-    return client->GetServerId();
+  }
+  TcpServer::Pointer server = TcpServer::Pointer(new TcpServer(this->io_service_, port, this->GetFreeSocketId()));
+  server->ConnectSlots(TcpServer::SignalOnNewClient::slot_type(&Manager::SlotOnNewClient, this, _1, _2).track(Manager::instance_));
+  server->Accept();
+  this->servers_[server->GetId()] = server;
+  log::Debug(log_module_, "Started server with id %d!", server->GetId());
+  LOG_DEBUG_EXIT;
+  return server->GetId();
+}
 SocketId Manager::Connect(Protocol protocol, std::string address, unsigned int port_or_baud)
+{
+  LOG_DEBUG_ENTER;
-    Client::Pointer client;
+  Client::Pointer client;
-    switch (protocol)
+  switch (protocol)
+  {
-        case PROTOCOL_TCP:
+    case PROTOCOL_TCP:
-            break;
+      break;
+    }
-        default:
+    default:
+    {
-            throw std::runtime_error("Invalid protocol specified!");
+      throw std::runtime_error("Invalid protocol specified!");
-            return 0;
+    }
+  }
-    client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
+  client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
-                         Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
+                       Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
-    client->Connect(address, port_or_baud);
+  client->Connect(address, port_or_baud);
-    this->clients_[client->GetId()] = client;
+  this->clients_[client->GetId()] = client;
+  LOG_DEBUG_EXIT;
-    return client->GetId();
+  return client->GetId();
 }
 void Manager::SendToAll(SocketId server_id, common::Byteset data)
 {
+  LOG_DEBUG_ENTER;
-    this->io_service_.post(boost::bind(&Manager::SendToAllHandler, this, server_id, data));
+  this->io_service_.post(boost::bind(&Manager::SendToAllHandler, this, server_id, data));
+  LOG_DEBUG_EXIT;
+}
 void Manager::SendTo(SocketId client_id, common::Byteset data)
+{
+  LOG_DEBUG_ENTER;
-    this->io_service_.post(boost::bind(&Manager::SendToHandler, this, client_id, data));
+  this->io_service_.post(boost::bind(&Manager::SendToHandler, this, client_id, data));
+  LOG_DEBUG_EXIT;
 }
 void Manager::StopServer(SocketId server_id)
+{
+  LOG_DEBUG_ENTER;
-    this->io_service_.post(boost::bind(&Manager::StopServerHandler, this, server_id));
+  this->io_service_.post(boost::bind(&Manager::StopServerHandler, this, server_id));
+  LOG_DEBUG_EXIT;
 }
 void Manager::Disconnect(SocketId client_id)
 {
+  LOG_DEBUG_ENTER;
-    this->io_service_.post(boost::bind(&Manager::DisconnectHandler, this, client_id));
+  this->io_service_.post(boost::bind(&Manager::DisconnectHandler, this, client_id));
+  LOG_DEBUG_EXIT;
 }
 void Manager::SendToAllHandler(SocketId server_id, common::Byteset data)
+{
+  LOG_DEBUG_ENTER;
-    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
+  for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
+  {
-        if (it->second->GetServerId() == server_id)
+    if (it->second->GetServerId() == server_id)
+    {
-            it->second->Send(data);
+      it->second->Send(data);
+    }
+  }
+  LOG_DEBUG_EXIT;
+}
 void Manager::SendToHandler(SocketId client_id, common::Byteset data)
 {
+  LOG_DEBUG_ENTER;
-    ClientList::iterator it = this->clients_.find(client_id);
+  ClientList::iterator it = this->clients_.find(client_id);
-    if (it != this->clients_.end())
+  if (it != this->clients_.end())
+  {
-        it->second->Send(data);
+    it->second->Send(data);
-    }
+  }
+  LOG_DEBUG_EXIT;
+}
 void Manager::StopServerHandler(SocketId server_id)
 {
-    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
+  LOG_DEBUG_ENTER;
-    {
-        if (it->second->GetServerId() == server_id)
+  this->clients_.erase(server_id);
-        {
-            it->second->Stop();
-        }
+  LOG_DEBUG_EXIT;
-    }
 }
 void Manager::DisconnectHandler(SocketId client_id)
+{
+  LOG_DEBUG_ENTER;
-    ClientList::iterator it = this->clients_.find(client_id);
+  ClientList::iterator it = this->clients_.find(client_id);
-    if (it != this->clients_.end())
+  if (it != this->clients_.end())
+  {
-        it->second->Disconnect();
+    it->second->Disconnect();
+  }
+  LOG_DEBUG_EXIT;
+}
 }; // namespace net
 }; // namespace atom

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/net/Manager.cpp – Rev 1959 → 1962