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

fixed poll priority queue order

Browse Source
This commit is contained in:
john30
2014-12-29 21:56:19 +01:00
parent ec42fb5259
commit f6c036c000
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+14 -5
View File
@@ -326,12 +326,19 @@ result_t Message::decode(const PartType partType, SymbolString& data,
return RESULT_OK;
}
bool Message::isLessPollWeight(Message* other) {
if (m_pollPriority * m_pollCount < other->m_pollPriority * other->m_pollCount)
bool Message::isLessPollWeight(const Message* other)
{
unsigned int tw = m_pollPriority * m_pollCount;
unsigned int ow = other->m_pollPriority * other->m_pollCount;
if (tw > ow)
return true;
if (tw < ow)
return false;
if (m_pollPriority > other->m_pollPriority)
return true;
if (m_pollPriority < other->m_pollPriority)
return true;
if (m_lastPollTime < other->m_lastPollTime)
return false;
if (m_lastPollTime > other->m_lastPollTime)
return true;
return false;
@@ -373,8 +380,10 @@ result_t MessageMap::add(Message* message)
m_maxIdLength = idLength;
m_messagesByKey[key] = message;
if (message->getPollPriority() > 0)
if (message->getPollPriority() > 0) {
message->m_lastPollTime = m_pollMessages.size();
m_pollMessages.push(message);
}
return RESULT_OK;
}