Merge pull request #158 from ey6es/master

Reverted threading change by default, since we're seeing lower frame rates.

interface/src/main.cpp

@@ -39,6 +39,8 @@
 #include <ifaddrs.h>
 #endif
 
+#include <pthread.h> 
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
@@ -86,6 +88,10 @@ using namespace std;
 void reshape(int width, int height); // will be defined below
 void loadViewFrustum(ViewFrustum& viewFrustum);  // will be defined below
 
+bool enableNetworkThread = true;
+pthread_t networkReceiveThread;
+bool stopNetworkReceiveThread = false;
+ 
 unsigned char incomingPacket[MAX_PACKET_SIZE];
 int packetCount = 0;
 int packetsPerSecond = 0; 
@@ -349,6 +355,11 @@ void terminate () {
     audio.terminate();
     #endif
     
+    if (enableNetworkThread) {
+        stopNetworkReceiveThread = true;
+        pthread_join(networkReceiveThread, NULL); 
+    }
+    
     exit(EXIT_SUCCESS);
 }
 
@@ -1408,12 +1419,13 @@ void key(unsigned char k, int x, int y)
 }
 
 //  Receive packets from other agents/servers and decide what to do with them!
-void networkReceive()
+void* networkReceive(void* args)
 {    
     sockaddr senderAddress;
     ssize_t bytesReceived;
     
-    while (AgentList::getInstance()->getAgentSocket().receive(&senderAddress, incomingPacket, &bytesReceived)) {
+    while (!stopNetworkReceiveThread) {
+        if (AgentList::getInstance()->getAgentSocket().receive(&senderAddress, incomingPacket, &bytesReceived)) {
             packetCount++;
             bytesCount += bytesReceived;
             
@@ -1435,9 +1447,17 @@ void networkReceive()
                     AgentList::getInstance()->processAgentData(&senderAddress, incomingPacket, bytesReceived);
                     break;
             }
+        } else if (!enableNetworkThread) {
+            break;
         }
     }
     
+    if (enableNetworkThread) {
+        pthread_exit(0); 
+    }
+    return NULL; 
+}
+
 void idle(void) {
     timeval check;
     gettimeofday(&check, NULL);
@@ -1472,7 +1492,9 @@ void idle(void) {
         updateAvatar(deltaTime);
 
         // read incoming packets from network
-        networkReceive();
+        if (!enableNetworkThread) {
+            networkReceive(0);
+		}
 		
         //loop through all the other avatars and simulate them...
         AgentList* agentList = AgentList::getInstance();
@@ -1616,7 +1638,10 @@ int main(int argc, const char * argv[])
         listenPort = atoi(portStr);
     }
     AgentList::createInstance(AGENT_TYPE_AVATAR, listenPort);
+    enableNetworkThread = !cmdOptionExists(argc, argv, "--nonblocking");
+    if (!enableNetworkThread) {
         AgentList::getInstance()->getAgentSocket().setBlocking(false);
+    }
     
     gettimeofday(&applicationStartupTime, NULL);
     const char* domainIP = getCmdOption(argc, argv, "--domain");
@@ -1699,6 +1724,12 @@ int main(int argc, const char * argv[])
         printLog("Local Voxel File loaded.\n");
 	}
     
+    // create thread for receipt of data via UDP
+    if (enableNetworkThread) {
+        pthread_create(&networkReceiveThread, NULL, networkReceive, NULL);
+        printLog("Network receive thread created.\n"); 
+    }
+    
     glutTimerFunc(1000, Timer, 0);
     glutMainLoop();