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

corrected MessageMap::invalidateCache()

Browse Source
This commit is contained in:
john30
2015-12-12 17:57:16 +01:00
parent f26e1d0835
commit 5b7aea8564
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+9 -10
View File
@@ -1209,10 +1209,10 @@ deque<Message*> MessageMap::findAll(SymbolString& master)
maxIdLength = m_maxIdLength; maxIdLength = m_maxIdLength;
if (master.size() < 5+maxIdLength) if (master.size() < 5+maxIdLength)
return ret; return ret;
unsigned long long baseKey = (unsigned long long)getMasterNumber(master[0]) << (8 * 7); unsigned long long baseKey = (unsigned long long)getMasterNumber(master[0]) << (8 * 7); // src address for passive message
baseKey |= (unsigned long long)master[1] << (8 * 6); baseKey |= (unsigned long long)master[1] << (8 * 6); // dst address
baseKey |= (unsigned long long)master[2] << (8 * 5); baseKey |= (unsigned long long)master[2] << (8 * 5); // PB
baseKey |= (unsigned long long)master[3] << (8 * 4); baseKey |= (unsigned long long)master[3] << (8 * 4); // SB
for (unsigned char idLength = maxIdLength; ret.size()==0; idLength--) { for (unsigned char idLength = maxIdLength; ret.size()==0; idLength--) {
unsigned long long key = (unsigned long long)idLength << (8 * 7 + 5); unsigned long long key = (unsigned long long)idLength << (8 * 7 + 5);
key |= baseKey; key |= baseKey;
@@ -1269,12 +1269,11 @@ void MessageMap::invalidateCache(Message* message)
string name = message->getName(); string name = message->getName();
deque<Message*> messages = findAll(circuit, name, false, true, true, true); deque<Message*> messages = findAll(circuit, name, false, true, true, true);
for (deque<Message*>::iterator it = messages.begin(); it != messages.end(); it++) { for (deque<Message*>::iterator it = messages.begin(); it != messages.end(); it++) {
if (*it==message) Message* checkMessage = *it;
continue; if (checkMessage==message
message = *it; || name!=checkMessage->getName())
if (name!=message->getName())
continue; // check exact name continue; // check exact name
string check = message->getCircuit(); string check = checkMessage->getCircuit();
if (check!=circuit) { if (check!=circuit) {
size_t pos = check.find('#'); size_t pos = check.find('#');
if (pos!=string::npos) if (pos!=string::npos)
@@ -1282,7 +1281,7 @@ void MessageMap::invalidateCache(Message* message)
if (check!=circuit) if (check!=circuit)
continue; continue;
} }
message->m_lastUpdateTime = 0; checkMessage->m_lastUpdateTime = 0;
} }
} }