Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second

Browse source
This commit is contained in:
Seth Alves 2015-02-02 11:56:50 -08:00
parent f1cca2ac92
commit 779a0086c4
10 changed files with 188 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -437,9 +437,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
// hook up bandwidth estimator
QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
connect(nodeList.data(), SIGNAL(dataSent(const quint8, const int)),
&*bandwidthRecorder, SLOT(updateOutboundData(const quint8, const int)));
bandwidthRecorder.data(), SLOT(updateOutboundData(const quint8, const int)));
connect(nodeList.data(), SIGNAL(dataReceived(const quint8, const int)),
&*bandwidthRecorder, SLOT(updateInboundData(const quint8, const int)));
bandwidthRecorder.data(), SLOT(updateInboundData(const quint8, const int)));
// check first run...
bool firstRun = SettingHandles::firstRun.get();

8
interface/src/ui/ApplicationOverlay.cpp
View file

@ -920,10 +920,10 @@ void ApplicationOverlay::renderStatsAndLogs() {
int voxelPacketsToProcess = octreePacketProcessor.packetsToProcessCount();
// Onscreen text about position, servers, etc
Stats::getInstance()->display(WHITE_TEXT, horizontalOffset, application->getFps(),
bandwidthRecorder->totalChannel.getAverageInputPacketsPerSecond(),
bandwidthRecorder->totalChannel.getAverageOutputPacketsPerSecond(),
bandwidthRecorder->totalChannel.getAverageInputKilobitsPerSecond(),
bandwidthRecorder->totalChannel.getAverageOutputKilobitsPerSecond(),
bandwidthRecorder->getCachedTotalAverageInputPacketsPerSecond(),
bandwidthRecorder->getCachedTotalAverageOutputPacketsPerSecond(),
bandwidthRecorder->getCachedTotalAverageInputKilobitsPerSecond(),
bandwidthRecorder->getCachedTotalAverageOutputKilobitsPerSecond(),
voxelPacketsToProcess);
}

38
interface/src/ui/BandwidthDialog.cpp
View file

@ -22,16 +22,16 @@
#include <QColor>
BandwidthChannelDisplay::BandwidthChannelDisplay(BandwidthRecorder::Channel *ch, QFormLayout* form,
BandwidthChannelDisplay::BandwidthChannelDisplay(QVector<NodeType_t> nodeTypesToFollow,
QFormLayout* form,
char const* const caption, char const* unitCaption,
const float unitScale, unsigned colorRGBA) :
nodeTypesToFollow(nodeTypesToFollow),
caption(caption),
unitCaption(unitCaption),
unitScale(unitScale),
colorRGBA(colorRGBA)
{
this->ch = ch;
label = new QLabel();
label->setAlignment(Qt::AlignRight);
@ -47,9 +47,19 @@ BandwidthChannelDisplay::BandwidthChannelDisplay(BandwidthRecorder::Channel *ch,
void BandwidthChannelDisplay::bandwidthAverageUpdated() {
float inTotal = 0.;
float outTotal = 0.;
QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
for (int i = 0; i < nodeTypesToFollow.size(); ++i) {
inTotal += bandwidthRecorder->getAverageInputKilobitsPerSecond(nodeTypesToFollow.at(i));
outTotal += bandwidthRecorder->getAverageOutputKilobitsPerSecond(nodeTypesToFollow.at(i));
}
strBuf =
QString("").setNum((int) (ch->getAverageInputKilobitsPerSecond() * unitScale)) + "/" +
QString("").setNum((int) (ch->getAverageOutputKilobitsPerSecond() * unitScale)) + " " + unitCaption;
QString("").setNum((int) (inTotal * unitScale)) + "/" +
QString("").setNum((int) (outTotal * unitScale)) + " " + unitCaption;
}
@ -58,7 +68,6 @@ void BandwidthChannelDisplay::Paint() {
}
BandwidthDialog::BandwidthDialog(QWidget* parent) :
QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) {
@ -71,18 +80,21 @@ BandwidthDialog::BandwidthDialog(QWidget* parent) :
QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
_allChannelDisplays[0] = _audioChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->audioChannel, form, "Audio", "Kbps", 1.0, COLOR0);
new BandwidthChannelDisplay({NodeType::AudioMixer}, form, "Audio", "Kbps", 1.0, COLOR0);
_allChannelDisplays[1] = _avatarsChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->avatarsChannel, form, "Avatars", "Kbps", 1.0, COLOR1);
new BandwidthChannelDisplay({NodeType::Agent, NodeType::AvatarMixer}, form, "Avatars", "Kbps", 1.0, COLOR1);
_allChannelDisplays[2] = _octreeChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->octreeChannel, form, "Octree", "Kbps", 1.0, COLOR2);
new BandwidthChannelDisplay({NodeType::DomainServer, NodeType::EntityServer}, form, "Octree", "Kbps", 1.0, COLOR2);
_allChannelDisplays[3] = _metavoxelsChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->metavoxelsChannel, form, "Metavoxels", "Kbps", 1.0, COLOR2);
new BandwidthChannelDisplay({NodeType::MetavoxelServer, NodeType::EnvironmentServer}, form, "Metavoxels", "Kbps", 1.0, COLOR2);
_allChannelDisplays[4] = _otherChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->otherChannel, form, "Other", "Kbps", 1.0, COLOR2);
new BandwidthChannelDisplay({NodeType::Unassigned}, form, "Other", "Kbps", 1.0, COLOR2);
_allChannelDisplays[5] = _totalChannelDisplay =
new BandwidthChannelDisplay(&bandwidthRecorder->totalChannel, form, "Total", "Kbps", 1.0, COLOR2);
new BandwidthChannelDisplay({NodeType::DomainServer, NodeType::EntityServer, NodeType::MetavoxelServer,
NodeType::EnvironmentServer, NodeType::AudioMixer, NodeType::Agent,
NodeType::AvatarMixer, NodeType::Unassigned},
form, "Total", "Kbps", 1.0, COLOR2);
connect(averageUpdateTimer, SIGNAL(timeout()), this, SLOT(updateTimerTimeout()));
averageUpdateTimer->start(1000);
}

7
interface/src/ui/BandwidthDialog.h
View file

@ -15,7 +15,9 @@
#include <QDialog>
#include <QLabel>
#include <QFormLayout>
#include <QVector>
#include "Node.h"
#include "BandwidthRecorder.h"
@ -28,12 +30,13 @@ class BandwidthChannelDisplay : public QObject {
Q_OBJECT
public:
BandwidthChannelDisplay(BandwidthRecorder::Channel *ch, QFormLayout* form,
BandwidthChannelDisplay(QVector<NodeType_t> nodeTypesToFollow,
QFormLayout* form,
char const* const caption, char const* unitCaption, float unitScale, unsigned colorRGBA);
void Paint();
private:
BandwidthRecorder::Channel *ch;
QVector<NodeType_t> nodeTypesToFollow;
QLabel* label;
QString strBuf;
char const* const caption;

10
interface/src/ui/Stats.cpp
View file

@ -443,12 +443,10 @@ void Stats::display(
SharedNodePointer avatarMixer = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::AvatarMixer);
if (avatarMixer) {
sprintf(avatarMixerStats, "Avatar Mixer: %.f kbps, %.f pps",
// roundf(avatarMixer->getAverageKilobitsPerSecond()),
// roundf(avatarMixer->getAveragePacketsPerSecond())
roundf(bandwidthRecorder->audioChannel.getAverageInputKilobitsPerSecond() +
bandwidthRecorder->audioChannel.getAverageOutputKilobitsPerSecond()),
roundf(bandwidthRecorder->audioChannel.getAverageInputPacketsPerSecond() +
bandwidthRecorder->audioChannel.getAverageOutputPacketsPerSecond()));
roundf(bandwidthRecorder->getAverageInputKilobitsPerSecond(NodeType::AudioMixer) +
bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AudioMixer)),
roundf(bandwidthRecorder->getAverageInputPacketsPerSecond(NodeType::AudioMixer) +
bandwidthRecorder->getAverageOutputPacketsPerSecond(NodeType::AudioMixer)));
} else {
sprintf(avatarMixerStats, "No Avatar Mixer");
}

177
libraries/networking/src/BandwidthRecorder.cpp
View file

@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QDebug>
#include <QDateTime>
#include "BandwidthRecorder.h"
@ -48,69 +50,134 @@ void BandwidthRecorder::Channel::updateOutputAverage(const float sample) {
_output.updateAverage(sample);
}
BandwidthRecorder::BandwidthRecorder() {
for (uint i=0; i<CHANNEL_COUNT; i++)
_channels[ i ] = NULL;
}
BandwidthRecorder::~BandwidthRecorder() {
for (uint i=0; i<CHANNEL_COUNT; i++)
delete _channels[ i ];
}
void BandwidthRecorder::updateInboundData(const quint8 channelType, const int sample) {
totalChannel.updateInputAverage(sample);
// see Node.h NodeType
switch (channelType) {
case NodeType::DomainServer:
case NodeType::EntityServer:
octreeChannel.updateInputAverage(sample);
break;
case NodeType::MetavoxelServer:
case NodeType::EnvironmentServer:
metavoxelsChannel.updateInputAverage(sample);
break;
case NodeType::AudioMixer:
audioChannel.updateInputAverage(sample);
break;
case NodeType::Agent:
case NodeType::AvatarMixer:
avatarsChannel.updateInputAverage(sample);
break;
case NodeType::Unassigned:
default:
otherChannel.updateInputAverage(sample);
break;
}
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
_channels[channelType] = new Channel();
_channels[channelType]->updateInputAverage(sample);
}
void BandwidthRecorder::updateOutboundData(const quint8 channelType, const int sample) {
totalChannel.updateOutputAverage(sample);
// see Node.h NodeType
switch (channelType) {
case NodeType::DomainServer:
case NodeType::EntityServer:
octreeChannel.updateOutputAverage(sample);
break;
case NodeType::MetavoxelServer:
case NodeType::EnvironmentServer:
metavoxelsChannel.updateOutputAverage(sample);
break;
case NodeType::AudioMixer:
audioChannel.updateOutputAverage(sample);
break;
case NodeType::Agent:
case NodeType::AvatarMixer:
avatarsChannel.updateOutputAverage(sample);
break;
case NodeType::Unassigned:
default:
otherChannel.updateOutputAverage(sample);
break;
}
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
_channels[channelType] = new Channel();
_channels[channelType]->updateOutputAverage(sample);
}
float BandwidthRecorder::getAverageInputPacketsPerSecond(const quint8 channelType) {
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
return 0.;
return _channels[channelType]->getAverageInputPacketsPerSecond();
}
float BandwidthRecorder::getAverageOutputPacketsPerSecond(const quint8 channelType) {
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
return 0.;
return _channels[channelType]->getAverageOutputPacketsPerSecond();
}
float BandwidthRecorder::getAverageInputKilobitsPerSecond(const quint8 channelType) {
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
return 0.;
return _channels[channelType]->getAverageInputKilobitsPerSecond();
}
float BandwidthRecorder::getAverageOutputKilobitsPerSecond(const quint8 channelType) {
Q_ASSERT(channelType < CHANNEL_COUNT);
if (! _channels[channelType])
return 0.;
return _channels[channelType]->getAverageOutputKilobitsPerSecond();
}
float BandwidthRecorder::getTotalAverageInputPacketsPerSecond() {
float result = 0.;
for (uint i=0; i<CHANNEL_COUNT; i++) {
if (_channels[i])
result += _channels[i]->getAverageInputPacketsPerSecond();
}
return result;
}
float BandwidthRecorder::getTotalAverageOutputPacketsPerSecond() {
float result = 0.;
for (uint i=0; i<CHANNEL_COUNT; i++) {
if (_channels[i])
result += _channels[i]->getAverageOutputPacketsPerSecond();
}
return result;
}
float BandwidthRecorder::getTotalAverageInputKilobitsPerSecond(){
float result = 0.;
for (uint i=0; i<CHANNEL_COUNT; i++) {
if (_channels[i])
result += _channels[i]->getAverageInputKilobitsPerSecond();
}
return result;
}
float BandwidthRecorder::getTotalAverageOutputKilobitsPerSecond(){
float result = 0.;
for (uint i=0; i<CHANNEL_COUNT; i++) {
if (_channels[i])
result += _channels[i]->getAverageOutputKilobitsPerSecond();
}
return result;
}
float BandwidthRecorder::getCachedTotalAverageInputPacketsPerSecond() {
static qint64 lastCalculated = 0;
static float cachedValue = 0.;
qint64 now = QDateTime::currentMSecsSinceEpoch();
if (now - lastCalculated > 1000.) {
lastCalculated = now;
cachedValue = getTotalAverageInputPacketsPerSecond();
}
return cachedValue;
}
float BandwidthRecorder::getCachedTotalAverageOutputPacketsPerSecond() {
static qint64 lastCalculated = 0;
static float cachedValue = 0.;
qint64 now = QDateTime::currentMSecsSinceEpoch();
if (now - lastCalculated > 1000.) {
lastCalculated = now;
cachedValue = getTotalAverageOutputPacketsPerSecond();
}
return cachedValue;
}
float BandwidthRecorder::getCachedTotalAverageInputKilobitsPerSecond() {
static qint64 lastCalculated = 0;
static float cachedValue = 0.;
qint64 now = QDateTime::currentMSecsSinceEpoch();
if (now - lastCalculated > 1000.) {
lastCalculated = now;
cachedValue = getTotalAverageInputKilobitsPerSecond();
}
return cachedValue;
}
float BandwidthRecorder::getCachedTotalAverageOutputKilobitsPerSecond() {
static qint64 lastCalculated = 0;
static float cachedValue = 0.;
qint64 now = QDateTime::currentMSecsSinceEpoch();
if (now - lastCalculated > 1000.) {
lastCalculated = now;
cachedValue = getTotalAverageOutputKilobitsPerSecond();
}
return cachedValue;
}

26
libraries/networking/src/BandwidthRecorder.h
View file

@ -47,15 +47,27 @@ public:
SimpleMovingAverage _output = SimpleMovingAverage();
};
float getAverageInputPacketsPerSecond(const quint8 channelType);
float getAverageOutputPacketsPerSecond(const quint8 channelType);
float getAverageInputKilobitsPerSecond(const quint8 channelType);
float getAverageOutputKilobitsPerSecond(const quint8 channelType);
float getTotalAverageInputPacketsPerSecond();
float getTotalAverageOutputPacketsPerSecond();
float getTotalAverageInputKilobitsPerSecond();
float getTotalAverageOutputKilobitsPerSecond();
float getCachedTotalAverageInputPacketsPerSecond();
float getCachedTotalAverageOutputPacketsPerSecond();
float getCachedTotalAverageInputKilobitsPerSecond();
float getCachedTotalAverageOutputKilobitsPerSecond();
// create the channels we keep track of
Channel audioChannel = Channel();
Channel avatarsChannel = Channel();
Channel octreeChannel = Channel();
Channel metavoxelsChannel = Channel();
Channel otherChannel = Channel();
Channel totalChannel = Channel();
private:
// one for each possible Node type
static const unsigned int CHANNEL_COUNT = 256;
Channel* _channels[CHANNEL_COUNT];
public slots:
void updateInboundData(const quint8 channelType, const int bytes);

5
libraries/networking/src/LimitedNodeList.cpp
View file

@ -233,9 +233,10 @@ qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram, const HifiSock
replaceHashInPacketGivenConnectionUUID(datagramCopy, connectionSecret);
}
// XXX can BandwidthRecorder be used for this?
// stat collection for packets
// ++_numCollectedPackets;
// _numCollectedBytes += datagram.size();
++_numCollectedPackets;
_numCollectedBytes += datagram.size();
qint64 bytesWritten = _nodeSocket.writeDatagram(datagramCopy,
destinationSockAddr.getAddress(), destinationSockAddr.getPort());

3
libraries/networking/src/LimitedNodeList.h
View file

@ -206,8 +206,11 @@ protected:
HifiSockAddr _localSockAddr;
HifiSockAddr _publicSockAddr;
HifiSockAddr _stunSockAddr;
// XXX can BandwidthRecorder be used for this?
int _numCollectedPackets;
int _numCollectedBytes;
QElapsedTimer _packetStatTimer;
template<typename IteratorLambda>

1
libraries/networking/src/ThreadedAssignment.cpp
View file

@ -83,6 +83,7 @@ void ThreadedAssignment::addPacketStatsAndSendStatsPacket(QJsonObject &statsObje
auto nodeList = DependencyManager::get<NodeList>();
float packetsPerSecond, bytesPerSecond;
// XXX can BandwidthRecorder be used for this?
nodeList->getPacketStats(packetsPerSecond, bytesPerSecond);
nodeList->resetPacketStats();