Changeset 1389 for code/branches/network/src

Timestamp:

May 22, 2008, 5:53:24 PM (17 years ago)

Author:

scheusso

Message:

some fixes in client disconnect procedure — mostly because of multithreading

Location:

code/branches/network/src/network

Files:

• ClientInformation.cc (modified) (1 diff)
• ClientInformation.h (modified) (2 diffs)
• ConnectionManager.cc (modified) (2 diffs)
• Server.cc (modified) (2 diffs)

code/branches/network/src/network/ClientInformation.cc

@@ -85 +85 @@
   ClientInformation::~ClientInformation() {
     boost::recursive_mutex::scoped_lock lock(mutex_);
-    if(next()!=0)
+    if(prev()!=0)
       prev()->setNext(this->next());
     if(next()!=0)

code/branches/network/src/network/ClientInformation.h

@@ -95 +95 @@
     bool setSynched(bool s);
     bool getSynched();
+    static boost::recursive_mutex mutex_;
 
 
@@ -114 +115 @@
     bool head_;
     unsigned short failures_;
-    static boost::recursive_mutex mutex_;
     
   };

code/branches/network/src/network/ConnectionManager.cc

@@ -345 +345 @@
   
   bool ConnectionManager::removeClient(int clientID){
+    boost::recursive_mutex::scoped_lock lock(head_->mutex_);
     orxonox::Iterator<orxonox::SpaceShip> it = orxonox::ObjectList<orxonox::SpaceShip>::start();
     ClientInformation *client = head_->findClient(clientID);
@@ -371 +372 @@
     }
     orxonox::SpaceShip *no = dynamic_cast<orxonox::SpaceShip *>(id->fabricate());
-    no->setPosition(orxonox::Vector3(0,80,0));
+    no->setPosition(orxonox::Vector3(0,0,80));
     no->setScale(10);
-    no->setYawPitchRoll(orxonox::Degree(-90),orxonox::Degree(-90),orxonox::Degree(0));
+    //no->setYawPitchRoll(orxonox::Degree(-90),orxonox::Degree(-90),orxonox::Degree(0));
     no->setMesh("assff.mesh");
     no->setMaxSpeed(500);

code/branches/network/src/network/Server.cc

@@ -42 +42 @@
 
 #include <iostream>
+
 
 #include "ConnectionManager.h"
@@ -196 +197 @@
   bool Server::sendGameState() {
     COUT(5) << "Server: starting function sendGameState" << std::endl;
+    boost::recursive_mutex::scoped_lock lock(clients->mutex_);
     ClientInformation *temp = clients;
     bool added=false;