matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix StreamTiming TxRxKey

Browse Source 
makeKey was incorrect by mistake
This commit is contained in:
Srivats P 2023-04-04 13:22:18 +05:30
parent 8ecbe78ddd
commit 5540253e61
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/streamtiming.cpp
View File

@ -155,8 +155,8 @@ int StreamTiming::processRecords()
count++; count++;
qDebug("XXXXX [%u/%u] diff %ld.%ld (%ld.%ld - %ld.%ld)", qDebug("XXXXX [%u/%u/%u] diff %ld.%ld (%ld.%ld - %ld.%ld)",
i.value().portId, i.key(), i.value().portId, guid, i.key() & 0xFF,
diff.tv_sec, diff.tv_nsec, diff.tv_sec, diff.tv_nsec,
rxTime.tv_sec, rxTime.tv_nsec, rxTime.tv_sec, rxTime.tv_nsec,
txTime.tv_sec, txTime.tv_nsec); txTime.tv_sec, txTime.tv_nsec);

4
server/streamtiming.h
View File

@ -54,7 +54,7 @@ private:
int deleteStaleRecords(); int deleteStaleRecords();
quint32 makeKey(uint guid, uint ttagId) { quint32 makeKey(uint guid, uint ttagId) {
return guid << 24 | (ttagId & 0xFF); return guid << 8 | (ttagId & 0xFF);
} }
// XXX: use only time intervals, not absolute time // XXX: use only time intervals, not absolute time
@ -73,7 +73,7 @@ private:
}; };
// XXX: TxRxKey = guid (24 bit MSG) + ttagid (8 bit LSB) // XXX: TxRxKey = guid (24 bit MSB) + ttagid (8 bit LSB)
// TODO: encode tx port in in packet and use as part of key // TODO: encode tx port in in packet and use as part of key
typedef quint32 TxRxKey; typedef quint32 TxRxKey;
QHash<TxRxKey, TtagData> txHash_; QHash<TxRxKey, TtagData> txHash_;