Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rename the _movingAverage variable so it is more descriptive

Browse source
This commit is contained in:
Stephen Birarda 2013-04-18 15:45:20 -07:00
parent d0e3a96485
commit cf1254f53b
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/shared/src/Agent.cpp
View file

@ -37,7 +37,7 @@ Agent::Agent(sockaddr *agentPublicSocket, sockaddr *agentLocalSocket, char agent
activeSocket = NULL; activeSocket = NULL;
linkedData = NULL; linkedData = NULL;
_movingAverage = NULL; _bytesReceivedMovingAverage = NULL;
deleteMutex = new pthread_mutex_t; deleteMutex = new pthread_mutex_t;
pthread_mutex_init(deleteMutex, NULL); pthread_mutex_init(deleteMutex, NULL);
@ -70,11 +70,11 @@ Agent::Agent(const Agent &otherAgent) {
linkedData = NULL; linkedData = NULL;
} }
if (otherAgent._movingAverage != NULL) { if (otherAgent._bytesReceivedMovingAverage != NULL) {
_movingAverage = new SimpleMovingAverage(100); _bytesReceivedMovingAverage = new SimpleMovingAverage(100);
memcpy(_movingAverage, otherAgent._movingAverage, sizeof(SimpleMovingAverage)); memcpy(_bytesReceivedMovingAverage, otherAgent._bytesReceivedMovingAverage, sizeof(SimpleMovingAverage));
} else { } else {
_movingAverage = NULL; _bytesReceivedMovingAverage = NULL;
} }
deleteMutex = new pthread_mutex_t; deleteMutex = new pthread_mutex_t;
@ -97,7 +97,7 @@ void Agent::swap(Agent &first, Agent &second) {
swap(first.agentId, second.agentId); swap(first.agentId, second.agentId);
swap(first.firstRecvTimeUsecs, second.firstRecvTimeUsecs); swap(first.firstRecvTimeUsecs, second.firstRecvTimeUsecs);
swap(first.lastRecvTimeUsecs, second.lastRecvTimeUsecs); swap(first.lastRecvTimeUsecs, second.lastRecvTimeUsecs);
swap(first._movingAverage, second._movingAverage); swap(first._bytesReceivedMovingAverage, second._bytesReceivedMovingAverage);
swap(first.deleteMutex, second.deleteMutex); swap(first.deleteMutex, second.deleteMutex);
} }
@ -108,7 +108,7 @@ Agent::~Agent() {
delete publicSocket; delete publicSocket;
delete localSocket; delete localSocket;
delete linkedData; delete linkedData;
delete _movingAverage; delete _bytesReceivedMovingAverage;
} }
char Agent::getType() const { char Agent::getType() const {
@ -209,7 +209,6 @@ void Agent::setLinkedData(AgentData *newData) {
linkedData = newData; linkedData = newData;
} }
bool Agent::operator==(const Agent& otherAgent) { bool Agent::operator==(const Agent& otherAgent) {
return matches(otherAgent.publicSocket, otherAgent.localSocket, otherAgent.type); return matches(otherAgent.publicSocket, otherAgent.localSocket, otherAgent.type);
} }
@ -222,25 +221,25 @@ bool Agent::matches(sockaddr *otherPublicSocket, sockaddr *otherLocalSocket, cha
} }
void Agent::recordBytesReceived(int bytesReceived) { void Agent::recordBytesReceived(int bytesReceived) {
if (_movingAverage == NULL) { if (_bytesReceivedMovingAverage == NULL) {
printf("Setting up the moving average for agent\n"); printf("Setting up the moving average for agent\n");
_movingAverage = new SimpleMovingAverage(100); _bytesReceivedMovingAverage = new SimpleMovingAverage(100);
} }
_movingAverage->updateAverage((float) bytesReceived); _bytesReceivedMovingAverage->updateAverage((float) bytesReceived);
} }
float Agent::getAveragePacketsPerSecond() { float Agent::getAveragePacketsPerSecond() {
if (_movingAverage != NULL) { if (_bytesReceivedMovingAverage != NULL) {
return (1 / _movingAverage->getEventDeltaAverage()); return (1 / _bytesReceivedMovingAverage->getEventDeltaAverage());
} else { } else {
return 0; return 0;
} }
} }
float Agent::getAverageKilobitsPerSecond() { float Agent::getAverageKilobitsPerSecond() {
if (_movingAverage != NULL) { if (_bytesReceivedMovingAverage != NULL) {
return (_movingAverage->getAverageSampleValuePerSecond() * (8.0f / 1000)); return (_bytesReceivedMovingAverage->getAverageSampleValuePerSecond() * (8.0f / 1000));
} else { } else {
return 0; return 0;
} }

2
libraries/shared/src/Agent.h
View file

@ -72,7 +72,7 @@ private:
uint16_t agentId; uint16_t agentId;
double firstRecvTimeUsecs; double firstRecvTimeUsecs;
double lastRecvTimeUsecs; double lastRecvTimeUsecs;
SimpleMovingAverage* _movingAverage; SimpleMovingAverage* _bytesReceivedMovingAverage;
AgentData* linkedData; AgentData* linkedData;
}; };