Add initial cut of StreamTiming class
This singleton class will keep track of Ttag timing across all ports and GUIDs. A bunch of FIXMEs/TODOs are pending for this class implementation; also this class has not been hooked up to the rest of the code yet.
This commit is contained in:
parent
219ad576ad
commit
39c8d6f5f3
@ -41,7 +41,8 @@ LIBS += -lm
|
|||||||
LIBS += -lprotobuf
|
LIBS += -lprotobuf
|
||||||
HEADERS += drone.h \
|
HEADERS += drone.h \
|
||||||
pcaptransmitter.h \
|
pcaptransmitter.h \
|
||||||
myservice.h
|
myservice.h \
|
||||||
|
streamtiming.h
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
devicemanager.cpp \
|
devicemanager.cpp \
|
||||||
device.cpp \
|
device.cpp \
|
||||||
@ -63,6 +64,7 @@ SOURCES += \
|
|||||||
linuxport.cpp \
|
linuxport.cpp \
|
||||||
linuxutils.cpp \
|
linuxutils.cpp \
|
||||||
params.cpp \
|
params.cpp \
|
||||||
|
streamtiming.cpp \
|
||||||
turbo.cpp \
|
turbo.cpp \
|
||||||
winhostdevice.cpp \
|
winhostdevice.cpp \
|
||||||
winpcapport.cpp
|
winpcapport.cpp
|
||||||
|
@ -30,6 +30,7 @@ struct StreamStatsTuple
|
|||||||
quint64 tx_bytes;
|
quint64 tx_bytes;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Key(uint) is GUID
|
||||||
typedef QHash<uint, StreamStatsTuple> StreamStats;
|
typedef QHash<uint, StreamStatsTuple> StreamStats;
|
||||||
typedef QHashIterator<uint, StreamStatsTuple> StreamStatsIterator;
|
typedef QHashIterator<uint, StreamStatsTuple> StreamStatsIterator;
|
||||||
|
|
||||||
|
158
server/streamtiming.cpp
Normal file
158
server/streamtiming.cpp
Normal file
@ -0,0 +1,158 @@
|
|||||||
|
/*
|
||||||
|
Copyright (C) 2023 Srivats P.
|
||||||
|
|
||||||
|
This file is part of "Ostinato"
|
||||||
|
|
||||||
|
This is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "streamtiming.h"
|
||||||
|
|
||||||
|
#include "timestamp.h"
|
||||||
|
|
||||||
|
StreamTiming::StreamTiming(int portCount)
|
||||||
|
: QObject(nullptr) // FIXME: parent
|
||||||
|
{
|
||||||
|
for (int i = 0; i < portCount; i++)
|
||||||
|
timing_.append(new QHash<Key, Timing>);
|
||||||
|
|
||||||
|
timer_ = new QTimer(this);
|
||||||
|
connect(timer_, &QTimer::timeout, this, &StreamTiming::processRecords);
|
||||||
|
timer_->setInterval(3000);
|
||||||
|
|
||||||
|
gcTimer_ = new QTimer(this);
|
||||||
|
connect(gcTimer_, &QTimer::timeout, this, &StreamTiming::deleteStaleRecords);
|
||||||
|
gcTimer_->setInterval(30000);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool StreamTiming::recordTxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timespec timestamp)
|
||||||
|
{
|
||||||
|
Key key = makeKey(guid, ttagId);
|
||||||
|
TtagData value = { .timeStamp = timestamp, .portId = portId};
|
||||||
|
|
||||||
|
QMutexLocker locker(&txHashLock_);
|
||||||
|
txHash_.insert(key, value);
|
||||||
|
|
||||||
|
if (!timer_->isActive())
|
||||||
|
timer_->start();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool StreamTiming::recordRxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timespec timestamp)
|
||||||
|
{
|
||||||
|
Key key = makeKey(guid, ttagId);
|
||||||
|
TtagData value = { .timeStamp = timestamp, .portId = portId};
|
||||||
|
|
||||||
|
QMutexLocker locker(&rxHashLock_);
|
||||||
|
rxHash_.insert(key, value);
|
||||||
|
|
||||||
|
if (!timer_->isActive())
|
||||||
|
timer_->start();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool StreamTiming::recordTxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timeval timestamp)
|
||||||
|
{
|
||||||
|
struct timespec ts;
|
||||||
|
ts.tv_sec = timestamp.tv_sec;
|
||||||
|
ts.tv_nsec = timestamp.tv_usec*1000;
|
||||||
|
|
||||||
|
return recordTxTime(portId, guid, ttagId, ts);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool StreamTiming::recordRxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timeval timestamp)
|
||||||
|
{
|
||||||
|
struct timespec ts;
|
||||||
|
ts.tv_sec = timestamp.tv_sec;
|
||||||
|
ts.tv_nsec = timestamp.tv_usec*1000;
|
||||||
|
|
||||||
|
return recordRxTime(portId, guid, ttagId, ts);
|
||||||
|
}
|
||||||
|
|
||||||
|
int StreamTiming::processRecords()
|
||||||
|
{
|
||||||
|
// FIXME: yield after a certain count of records or time?
|
||||||
|
|
||||||
|
int count = 0;
|
||||||
|
QMutexLocker txLocker(&txHashLock_);
|
||||||
|
QMutexLocker rxLocker(&rxHashLock_);
|
||||||
|
QMutexLocker timingLocker(&timingLock_);
|
||||||
|
|
||||||
|
auto i = rxHash_.begin();
|
||||||
|
while (i != rxHash_.end()) {
|
||||||
|
if (txHash_.contains(i.key())) {
|
||||||
|
struct timespec txTime = txHash_.take(i.key()).timeStamp;
|
||||||
|
struct timespec rxTime = i.value().timeStamp;
|
||||||
|
struct timespec diff;
|
||||||
|
timespecsub(&rxTime, &txTime, &diff);
|
||||||
|
auto timingHash = timing_[i.value().portId];
|
||||||
|
auto guidTiming = (*timingHash)[i.key()];
|
||||||
|
timespecadd(&guidTiming.sumDelays, &diff, &guidTiming.sumDelays);
|
||||||
|
guidTiming.countDelays++;
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
i = rxHash_.erase(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_ASSERT(rxHash_.isEmpty());
|
||||||
|
|
||||||
|
// FIXME: when to stop timer?
|
||||||
|
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
int StreamTiming::deleteStaleRecords()
|
||||||
|
{
|
||||||
|
// FIXME: yield after a certain count of records or time?
|
||||||
|
|
||||||
|
// FIXME: Can we compare 'now' below with libpcap provided timestamp?
|
||||||
|
// Are their sources same or synced?
|
||||||
|
int count = 0;
|
||||||
|
struct timespec now;
|
||||||
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
||||||
|
|
||||||
|
// XXX: processRecords() iterates and deletes all rx records irrespective
|
||||||
|
// of whether it found a matching tx record. So for garbage collection we
|
||||||
|
// only need to look at (and delete) tx records
|
||||||
|
QMutexLocker locker(&txHashLock_);
|
||||||
|
|
||||||
|
auto i = txHash_.begin();
|
||||||
|
while (i != txHash_.end()) {
|
||||||
|
struct timespec txTime = i.value().timeStamp;
|
||||||
|
struct timespec diff;
|
||||||
|
timespecsub(&now, &txTime, &diff);
|
||||||
|
if (diff.tv_sec > 30) {
|
||||||
|
i = txHash_.erase(i);
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: when to stop gc timer?
|
||||||
|
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
StreamTiming* StreamTiming::instance()
|
||||||
|
{
|
||||||
|
static StreamTiming *instance{nullptr};
|
||||||
|
|
||||||
|
if (!instance)
|
||||||
|
instance = new StreamTiming(10); // FIXME: WRONG param
|
||||||
|
|
||||||
|
return instance;
|
||||||
|
}
|
85
server/streamtiming.h
Normal file
85
server/streamtiming.h
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
Copyright (C) 2023 Srivats P.
|
||||||
|
|
||||||
|
This file is part of "Ostinato"
|
||||||
|
|
||||||
|
This is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _STREAM_TIMING
|
||||||
|
#define _STREAM_TIMING
|
||||||
|
|
||||||
|
#include <QHash>
|
||||||
|
#include <QMutex>
|
||||||
|
#include <QTimer>
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
class StreamTiming : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
StreamTiming(int portCount);
|
||||||
|
|
||||||
|
bool recordTxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timespec timestamp);
|
||||||
|
bool recordRxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timespec timestamp);
|
||||||
|
|
||||||
|
bool recordTxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timeval timestamp);
|
||||||
|
bool recordRxTime(uint portId, uint guid, uint ttagId,
|
||||||
|
struct timeval timestamp);
|
||||||
|
|
||||||
|
static StreamTiming* instance();
|
||||||
|
|
||||||
|
private:
|
||||||
|
int processRecords();
|
||||||
|
int deleteStaleRecords();
|
||||||
|
|
||||||
|
quint32 makeKey(uint guid, uint ttagId) {
|
||||||
|
return guid << 24 | (ttagId & 0xFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX: use only time intervals, not absolute time
|
||||||
|
quint64 timespecToNsecs(const struct timespec &interval) {
|
||||||
|
return interval.tv_nsec + interval.tv_sec*1e9;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct TtagData {
|
||||||
|
struct timespec timeStamp; // nanosec resolution
|
||||||
|
uint portId;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Timing {
|
||||||
|
struct timespec sumDelays; // nanosec resolution
|
||||||
|
uint countDelays;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// XXX: Key = guid (24 bit MSG), ttagid (8 bit LSB)
|
||||||
|
// TODO: encode tx port in in packet and use as part of key
|
||||||
|
typedef quint32 Key;
|
||||||
|
QHash<Key, TtagData> txHash_;
|
||||||
|
QHash<Key, TtagData> rxHash_;
|
||||||
|
QList<QHash<Key, Timing>*> timing_; // list index => portId
|
||||||
|
QMutex txHashLock_;
|
||||||
|
QMutex rxHashLock_;
|
||||||
|
QMutex timingLock_; // FIXME: change to RW lock?
|
||||||
|
|
||||||
|
QTimer *timer_; // Periodic timer to process tx/rx records
|
||||||
|
QTimer *gcTimer_; // Garbage collection for stale tx records
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user