nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetic

Browse Source
This commit is contained in:
Roland Jax
2014-11-11 20:12:33 +01:00
parent e8d4fbaff5
commit 2c7edad067
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+7 -7
View File
@@ -27,36 +27,36 @@ extern Appl& A;
BaseLoop::BaseLoop() BaseLoop::BaseLoop()
{ {
// create Commands DB // create commands DB
m_commands = ConfigCommands(A.getParam<const char*>("p_ebusconfdir"), CSV).getCommands(); m_commands = ConfigCommands(A.getParam<const char*>("p_ebusconfdir"), CSV).getCommands();
L.log(bas, trace, "ebus configuration dir: %s", A.getParam<const char*>("p_ebusconfdir")); L.log(bas, trace, "ebus configuration dir: %s", A.getParam<const char*>("p_ebusconfdir"));
L.log(bas, event, "commands DB: %d ", m_commands->sizeCmdDB()); L.log(bas, event, "commands DB: %d ", m_commands->sizeCmdDB());
L.log(bas, event, " cycle DB: %d ", m_commands->sizeCycDB()); L.log(bas, event, " cycle DB: %d ", m_commands->sizeCycDB());
L.log(bas, event, " polling DB: %d ", m_commands->sizePolDB()); L.log(bas, event, " polling DB: %d ", m_commands->sizePolDB());
// create EBusLoop // create ebusloop
m_ebusloop = new EBusLoop(m_commands); m_ebusloop = new EBusLoop(m_commands);
m_ebusloop->start("ebusloop"); m_ebusloop->start("ebusloop");
// create Network // create network
m_network = new Network(A.getParam<bool>("p_localhost"), &m_msgQueue); m_network = new Network(A.getParam<bool>("p_localhost"), &m_msgQueue);
m_network->start("network"); m_network->start("network");
} }
BaseLoop::~BaseLoop() BaseLoop::~BaseLoop()
{ {
// free Network // free network
if (m_network != NULL) if (m_network != NULL)
delete m_network; delete m_network;
// free EBusLoop // free ebusloop
if (m_ebusloop != NULL) { if (m_ebusloop != NULL) {
m_ebusloop->stop(); m_ebusloop->stop();
m_ebusloop->join(); m_ebusloop->join();
delete m_ebusloop; delete m_ebusloop;
} }
// free Commands DB // free commands DB
if (m_commands != NULL) if (m_commands != NULL)
delete m_commands; delete m_commands;
} }
@@ -343,7 +343,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
} }
{ {
// create Commands DB // create commands DB
Commands* commands = ConfigCommands(A.getParam<const char*>("p_ebusconfdir"), CSV).getCommands(); Commands* commands = ConfigCommands(A.getParam<const char*>("p_ebusconfdir"), CSV).getCommands();
L.log(bas, trace, "ebus configuration dir: %s", A.getParam<const char*>("p_ebusconfdir")); L.log(bas, trace, "ebus configuration dir: %s", A.getParam<const char*>("p_ebusconfdir"));
L.log(bas, event, "commands DB: %d ", m_commands->sizeCmdDB()); L.log(bas, event, "commands DB: %d ", m_commands->sizeCmdDB());