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

class WQueue: method 'T remove(const long delay)' added.

Browse Source
This commit is contained in:
Roland Jax
2014-06-20 13:35:16 +02:00
parent 56c5dc668c
commit ffbdf5f8b3
4 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/baseloop.cpp
+41 -24
View File
@@ -96,22 +96,27 @@ std::string BaseLoop::decodeMessage(const std::string& data)
m_ebusloop->addBusCommand(new BusCommand(type, ebusCommand));
BusCommand* busCommand = m_ebusloop->getBusCommand();
if (busCommand->getResult().c_str()[0] != '-') {
// decode data
Command* command = new Command(index, (*m_commands)[index], busCommand->getResult());
if (busCommand != NULL) {
if (busCommand->getResult().c_str()[0] != '-') {
// decode data
Command* command = new Command(index, (*m_commands)[index], busCommand->getResult());
// return result
result << command->calcResult(cmd);
// return result
result << command->calcResult(cmd);
delete command;
delete command;
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult();
}
delete busCommand;
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult();
L.log(bas, error, " busCommand timeout reached");
result << "busCommand timeout reached";
}
delete busCommand;
} else {
result << "ebus command not found";
}
@@ -150,19 +155,25 @@ std::string BaseLoop::decodeMessage(const std::string& data)
m_ebusloop->addBusCommand(new BusCommand(type, ebusCommand));
BusCommand* busCommand = m_ebusloop->getBusCommand();
if (busCommand->getResult().c_str()[0] != '-') {
// decode result
if (busCommand->getResult().substr(busCommand->getResult().length()-8) == "00000000")
result << "done";
else
result << "error";
if (busCommand != NULL) {
if (busCommand->getResult().c_str()[0] != '-') {
// decode result
if (busCommand->getResult().substr(busCommand->getResult().length()-8) == "00000000")
result << "done";
else
result << "error";
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult();
}
delete busCommand;
} else {
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult();
L.log(bas, error, " busCommand timeout reached");
result << "busCommand timeout reached";
}
delete busCommand;
delete command;
} else {
@@ -220,12 +231,18 @@ std::string BaseLoop::decodeMessage(const std::string& data)
m_ebusloop->addBusCommand(new BusCommand(type, ebusCommand));
BusCommand* busCommand = m_ebusloop->getBusCommand();
if (busCommand->getResult().c_str()[0] == '-')
L.log(bas, error, " %s", busCommand->getResult().c_str());
if (busCommand != NULL) {
if (busCommand->getResult().c_str()[0] == '-')
L.log(bas, error, " %s", busCommand->getResult().c_str());
result << busCommand->getResult();
result << busCommand->getResult();
delete busCommand;
} else {
L.log(bas, error, " busCommand timeout reached");
result << "busCommand timeout reached";
}
delete busCommand;
} else {
result << "specified message type is incorrect";
}
src/ebusloop.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
std::string getData() { return m_cycBuffer.remove(); }
void addBusCommand(BusCommand* busCommand) { m_sendBuffer.add(busCommand); }
BusCommand* getBusCommand() { return m_recvBuffer.remove(); }
BusCommand* getBusCommand() { return m_recvBuffer.remove(10); }
void dump(const bool dumpState) { m_bus->setDumpState(dumpState); }
src/network.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ Network::Network(const bool localhost) : m_listening(false), m_running(false)
else
m_Server = new TCPServer(A.getParam<int>("p_port"), "0.0.0.0");
if (m_Server && m_Server->start() == 0)
if (m_Server != NULL && m_Server->start() == 0)
m_listening = true;
}