[simspark-svn] SF.net SVN: simspark:[81] trunk/spark

[<he...@us...>]

Revision: 81
          http://simspark.svn.sourceforge.net/simspark/?rev=81&view=rev
Author:   hedayat
Date:     2009-07-31 20:27:41 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
small code cleanup
NetControl: reverting to the old behaviour; the intended logic of the new changes is already implemented.

Modified Paths:
--------------
    trunk/spark/ChangeLog
    trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
    trunk/spark/lib/oxygen/simulationserver/monitorcontrol.cpp
    trunk/spark/lib/oxygen/simulationserver/netcontrol.cpp

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-07-30 17:25:42 UTC (rev 80)
+++ trunk/spark/ChangeLog	2009-07-31 20:27:41 UTC (rev 81)
@@ -1,3 +1,11 @@
+2009-07-31  Hedayat Vatankhah  <he...@gr...>
+
+	* lib/oxygen/simulationserver/agentcontrol.cpp: 
+	- a small cleanup
+	
+	* lib/oxygen/simulationserver/netcontrol.cpp (NetControl::ReadTCPMessages): 
+	- reverting to the old behaviour; the intended logic is already implemented.
+
 2009-07-30  Hedayat Vatankhah  <he...@gr...>
 
 	* lib/oxygen/physicsserver/space.h (Space): 

Modified: trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp	2009-07-30 17:25:42 UTC (rev 80)
+++ trunk/spark/lib/oxygen/simulationserver/agentcontrol.cpp	2009-07-31 20:27:41 UTC (rev 81)
@@ -183,12 +183,10 @@
          ++iter, idx++
          )
         {
-            if (sensesArray[idx].empty())
+            if (!sensesArray[idx].empty())
                 {
-                    continue;
+                    SendClientMessage(iter->second, sensesArray[idx]);
                 }
 
-            SendClientMessage(iter->second,sensesArray[idx]);
         }
 }
-

Modified: trunk/spark/lib/oxygen/simulationserver/monitorcontrol.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/monitorcontrol.cpp	2009-07-30 17:25:42 UTC (rev 80)
+++ trunk/spark/lib/oxygen/simulationserver/monitorcontrol.cpp	2009-07-31 20:27:41 UTC (rev 81)
@@ -64,7 +64,7 @@
     string header = mMonitorServer->GetMonitorHeaderInfo();
     mNetMessage->PrepareToSend(header);
     SendClientMessage(client->addr,header);
-    
+
     shared_ptr<Scene> scene = GetActiveScene();
     if (scene.get() != 0)
     {
@@ -83,7 +83,7 @@
     {
         return;
     }
-    
+
     // send updates to all connected monitors
     if ( !mClients.empty() )
     {
@@ -99,7 +99,7 @@
         {
             info = mMonitorServer->GetMonitorData();
         }
-        
+
         mNetMessage->PrepareToSend(info);
 
         for (
@@ -148,5 +148,3 @@
                 }
         }
 }
-
-

Modified: trunk/spark/lib/oxygen/simulationserver/netcontrol.cpp
===================================================================
--- trunk/spark/lib/oxygen/simulationserver/netcontrol.cpp	2009-07-30 17:25:42 UTC (rev 80)
+++ trunk/spark/lib/oxygen/simulationserver/netcontrol.cpp	2009-07-31 20:27:41 UTC (rev 81)
@@ -627,30 +627,14 @@
 
                     // read a fragment
                     shared_ptr<Client>& client = (*iter).second;
-                    
-                    const unsigned int preSz = sizeof(unsigned int);
-                    int nRead = 0;
-                    int retval = 1;
-                    while (nRead < preSz && retval > 0)
-                    {
-                      retval = client->socket->recv(mBuffer.get() + nRead, preSz - nRead);
-                      nRead += retval;
-                    }
-                    
-                    unsigned int len = ntohl(reinterpret_cast<unsigned int*>(mBuffer.get())[0]);
+                    int rval = client->socket->recv(mBuffer.get(), mBufferSize);
 
-                    while (nRead < preSz + len && retval > 0)
-                    {
-                      retval = client->socket->recv(mBuffer.get() + nRead, preSz + len - nRead);
-                      nRead += retval;
-                    }
-                    
-                    if (retval > 0)
+                    if (rval > 0)
                         {
-                            StoreFragment(client->addr,nRead);
+                            StoreFragment(client->addr,rval);
                         } else
                             {
-                                if (retval <= 0)
+                                if (rval <= 0)
                                     {
                                         GetLog()->Error()
                                             << "(NetControl) ERROR: '" << GetName()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.