ping reporter added to interface

audio-mixer/src/main.cpp

@@ -398,6 +398,10 @@ int main(int argc, const char* argv[]) {
                 
                 // give the new audio data to the matching injector agent
                 agentList->updateAgentWithData(matchingInjector, packetData, receivedBytes);
+            } else if (packetData[0] == PACKET_HEADER_PING) {
+
+                // If the packet is a ping, let processAgentData handle it.
+                agentList->processAgentData(agentAddress, packetData, receivedBytes);
             }
         }
         

avatar-mixer/src/main.cpp

@@ -93,6 +93,7 @@ int main(int argc, const char* argv[]) {
         }
         
         if (agentList->getAgentSocket()->receive(agentAddress, packetData, &receivedBytes)) {
+
             switch (packetData[0]) {
                 case PACKET_HEADER_HEAD_DATA:
                     // grab the agent ID from the packet

interface/src/Application.cpp

@@ -161,7 +161,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
         _packetCount(0),
         _packetsPerSecond(0),
         _bytesPerSecond(0),
-        _bytesCount(0)
+        _bytesCount(0),
+        _pingSentTime(0)
 {
     _applicationStartupTime = startup_time;
     _window->setWindowTitle("Interface");
@@ -759,9 +760,23 @@ void Application::wheelEvent(QWheelEvent* event) {
     }
 }
 
+void sendPingPacket() {
+
+    char agentTypesOfInterest[] = {'V', 'M', 'W'};
+    char pingPacket[1 + sizeof(long long)];
+    pingPacket[0] = PACKET_HEADER_PING;
+    long long currTime = usecTimestampNow();
+    memcpy(&pingPacket[1], &currTime, sizeof(long long));
+    AgentList::getInstance()->broadcastToAgents((unsigned char*)&pingPacket, 1 + sizeof(long long), agentTypesOfInterest, 3);
+
+}
+
 //  Every second, check the frame rates and other stuff
 void Application::timer() {
     gettimeofday(&_timerEnd, NULL);
+    _pingSentTime = usecTimestampNow();
+    sendPingPacket();
+
     _fps = (float)_frameCount / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
     _packetsPerSecond = (float)_packetCount / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
     _bytesPerSecond = (float)_bytesCount / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
@@ -2150,6 +2165,23 @@ void Application::displayOverlay() {
     glPopMatrix();
 }
 
+void Application::getPing(long long &pingAudio, long long &pingAvatar, long long &pingVoxel) {
+    AgentList *agentList = AgentList::getInstance();
+    for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
+        const char *agentType = agent->getTypeName();
+        long long pingTime = agent->getPingTime();
+        if (strcmp(agentType, "Audio Mixer") == 0) {
+            pingAudio = pingTime / 1000;
+        }
+        if (strcmp(agentType, "Avatar Mixer") == 0) {
+            pingAvatar = pingTime / 1000;
+        }
+        if (strcmp(agentType, "Voxel Server") == 0) {
+            pingVoxel = pingTime / 1000;
+        }
+    }
+}
+
 void Application::displayStats() {
     int statsVerticalOffset = 8;
 
@@ -2157,6 +2189,13 @@ void Application::displayStats() {
     sprintf(stats, "%3.0f FPS, %d Pkts/sec, %3.2f Mbps", 
             _fps, _packetsPerSecond,  (float)_bytesPerSecond * 8.f / 1000000.f);
     drawtext(10, statsVerticalOffset + 15, 0.10f, 0, 1.0, 0, stats);
+
+    long long pingAudio = 0, pingAvatar = 0, pingVoxel = 0;
+    getPing(pingAudio, pingAvatar, pingVoxel);
+
+    char pingStats[200];
+    sprintf(pingStats, "Ping audio/avatar/voxel: %lld / %lld / %lld ", pingAudio, pingAvatar, pingVoxel);
+    drawtext(10, statsVerticalOffset + 35, 0.10f, 0, 1.0, 0, pingStats);
     
     std::stringstream voxelStats;
     voxelStats.precision(4);

interface/src/Application.h

@@ -81,6 +81,7 @@ public:
     
 private slots:
     
+    void getPing(long long &pingAudio, long long &pingAvatar, long long &pingVoxel);
     void timer();
     void idle();
     void terminate();
@@ -221,6 +222,7 @@ private:
     timeval _applicationStartupTime;
     timeval _timerStart, _timerEnd;
     timeval _lastTimeIdle;
+    long long _pingSentTime;
     bool _justStarted;
     
     Stars _stars;
@@ -305,6 +307,7 @@ private:
     int _packetsPerSecond;
     int _bytesPerSecond;
     int _bytesCount;
+
 };
 
 #endif /* defined(__interface__Application__) */

libraries/shared/src/Agent.h

@@ -63,6 +63,9 @@ public:
     float getAverageKilobitsPerSecond();
     float getAveragePacketsPerSecond();
 
+    long long getPingTime() { return _pingTime; };
+    void setPingTime(long long pingTime) { _pingTime = pingTime; };
+
     static void printLog(Agent const&);
 private:
     // privatize copy and assignment operator to disallow Agent copying
@@ -79,6 +82,7 @@ private:
     SimpleMovingAverage* _bytesReceivedMovingAverage;
     AgentData* _linkedData;
     bool _isAlive;
+    long long _pingTime;
 };
 
 

libraries/shared/src/AgentList.cpp

@@ -77,6 +77,20 @@ AgentList::~AgentList() {
     pthread_mutex_destroy(&mutex);
 }
 
+void AgentList::timePingReply(sockaddr *agentAddress, unsigned char *packetData) {
+
+    char pingPacket[1 + sizeof(long long)];
+    memcpy(pingPacket, packetData, 1 + sizeof(long long));
+    for(AgentList::iterator agent = begin(); agent != end(); agent++) {
+        if (socketMatch(agent->getPublicSocket(), agentAddress) || 
+                socketMatch(agent->getLocalSocket(), agentAddress)) {     
+            long long pingTime = usecTimestampNow() - *(long long *)(pingPacket+1);
+            agent->setPingTime(pingTime);
+            break;
+        }
+    }
+}
+
 void AgentList::processAgentData(sockaddr *senderAddress, unsigned char *packetData, size_t dataBytes) {
     switch (((char *)packetData)[0]) {
         case PACKET_HEADER_DOMAIN: {
@@ -84,11 +98,15 @@ void AgentList::processAgentData(sockaddr *senderAddress, unsigned char *packetD
             break;
         }
         case PACKET_HEADER_PING: {
-            _agentSocket.send(senderAddress, &PACKET_HEADER_PING_REPLY, 1);
+            char pingPacket[1 + sizeof(long long)];
+            memcpy(pingPacket, packetData, 1 + sizeof(long long));
+            pingPacket[0] = PACKET_HEADER_PING_REPLY;
+            _agentSocket.send(senderAddress, pingPacket, 1 + sizeof(long long));
             break;
         }
         case PACKET_HEADER_PING_REPLY: {
-            handlePingReply(senderAddress);
+            // handlePingReply(senderAddress);
+            timePingReply(senderAddress, packetData);
             break;
         }
     }

libraries/shared/src/AgentList.h

@@ -49,6 +49,7 @@ public:
     AgentListIterator end() const;
     
     char getOwnerType() const { return _ownerType; }
+    char *getAgentTypesOfInterest() const { return _agentTypesOfInterest; }
     
     uint16_t getLastAgentID() const { return _lastAgentID; }
     void increaseAgentID() { ++_lastAgentID; }
@@ -116,6 +117,7 @@ private:
     pthread_mutex_t mutex;
     
     void handlePingReply(sockaddr *agentAddress);
+    void timePingReply(sockaddr *agentAddress, unsigned char *packetData);
 };
 
 class AgentListIterator : public std::iterator<std::input_iterator_tag, Agent> {

voxel-server/src/main.cpp

@@ -706,6 +706,10 @@ int main(int argc, const char * argv[]) {
                 
                 agentList->updateAgentWithData(agent, packetData, receivedBytes);
             }
+            // If the packet is a ping, let processAgentData handle it.
+            if (packetData[0] == PACKET_HEADER_PING) {
+                agentList->processAgentData(&agentPublicAddress, packetData, receivedBytes);
+            }
         }
     }