Changeset 7107 for code/branches/presentation3/src/orxonox

Timestamp:

Jun 3, 2010, 4:43:42 AM (14 years ago)

Author:

landauf

Message:

fixed various cases where master/slave pointers weren't synchronized with the AI's state (and therefore not removed after destruction). I couldn't find all edge cases though, so there's still some work to do. Instead i implemented a cleanup function in the destructor which removes all dangling pointers.

Location:

code/branches/presentation3/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (8 diffs)
• ArtificialController.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

@@ -88 +88 @@
     ArtificialController::~ArtificialController()
     {
+        if (this->isInitialized())
+        {
+            this->removeFromFormation();
+            
+            for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it; ++it)
+            {
+                if (*it != this)
+                {
+                    if (it->myMaster_ == this)
+                    {
+                        COUT(1) << "error: " << this << " is still master in " << (*it) << std::endl;
+                        it->myMaster_ = 0;
+                    }
+                    
+                    while (true)
+                    {
+                        std::vector<ArtificialController*>::iterator it2 = std::find(it->slaves_.begin(), it->slaves_.end(), this);
+                        if (it2 != it->slaves_.end())
+                        {
+                            COUT(1) << "error: " << this << " is still slave in " << (*it) << std::endl;
+                            it->slaves_.erase(it2);
+                        }
+                        else
+                            break;
+                    }
+                }
+            }
+        }
     }
 
@@ -122 +150 @@
             ArtificialController *aiController = orxonox_cast<ArtificialController*>(controller);
 
-            if(aiController)
+            if (aiController)
             {
                 aiController->formationFlight_ = form;
-                if(!form)
+                if (!form)
                 {
-                    if(aiController->state_ == MASTER) aiController->freeSlaves();
-                    aiController->state_ = FREE;
+                    aiController->removeFromFormation();
                 }
             }
@@ -276 +303 @@
     void ArtificialController::changedControllableEntity()
     {
-        if(!getControllableEntity()) 
-        {
-        if (this->state_ == SLAVE) unregisterSlave();
-        if (this->state_ == MASTER) setNewMasterWithinFormation();
-        this->slaves_.clear();
-        this->state_ = FREE;
-        this->specificMasterAction_ = NONE;
-
-        }
-    }
-
+        if (!this->getControllableEntity()) 
+            this->removeFromFormation();
+    }
+
+    void ArtificialController::removeFromFormation()
+    {
+        if (this->state_ == SLAVE || this->myMaster_) // slaves can also be temporary free, so check if myMaster_ is set
+            this->unregisterSlave();
+        else if (this->state_ == MASTER)
+            this->setNewMasterWithinFormation();
+    }
 
     void ArtificialController::moveToPosition(const Vector3& target)
@@ -365 +392 @@
         @brief Unregisters a slave from its master. Initiated by a slave.
     */
-    void ArtificialController::unregisterSlave() {
-        if(myMaster_)
-        {
-            std::vector<ArtificialController*>::iterator it = std::find(myMaster_->slaves_.begin(), myMaster_->slaves_.end(), this);
-            if( it != myMaster_->slaves_.end() )
-                myMaster_->slaves_.erase(it);
-        }
+    void ArtificialController::unregisterSlave()
+    {
+        if (this->myMaster_)
+        {
+            std::vector<ArtificialController*>::iterator it = std::find(this->myMaster_->slaves_.begin(), this->myMaster_->slaves_.end(), this);
+            if (it != this->myMaster_->slaves_.end())
+                this->myMaster_->slaves_.erase(it);
+        }
+        
+        this->myMaster_ = 0;
+        this->state_ = FREE;
     }
 
@@ -386 +417 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-
             //same team?
             if (!ArtificialController::sameTeam(this->getControllableEntity(), static_cast<ControllableEntity*>(*it), this->getGametype()))
@@ -436 +466 @@
         }
 
-        if (state_ != SLAVE  && teamSize != 0) state_ = MASTER;
-
+        if (this->state_ != SLAVE  && teamSize != 0)
+        {
+            this->state_ = MASTER;
+            this->myMaster_ = 0;
+        }
     }
 
@@ -489 +522 @@
         if(this->state_ != MASTER) return;
 
-        if (this->slaves_.empty())
-            return;
-
-        ArtificialController *newMaster = this->slaves_.back();
-        this->slaves_.pop_back();
-
-        if(!newMaster) return;
-        newMaster->state_ = MASTER;
-        newMaster->slaves_ = this->slaves_;
+        if (!this->slaves_.empty())
+        {
+            ArtificialController *newMaster = this->slaves_.back();
+            this->slaves_.pop_back();
+
+            newMaster->state_ = MASTER;
+            newMaster->slaves_ = this->slaves_;
+            newMaster->myMaster_ = 0;
+
+            for(std::vector<ArtificialController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
+            {
+                (*it)->myMaster_ = newMaster;
+            }
+        }
 
         this->slaves_.clear();
         this->specificMasterAction_ = NONE;
-        this->state_ = SLAVE;
-        this->myMaster_ = newMaster;
-
-        for(std::vector<ArtificialController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
-        {
-            (*it)->myMaster_ = newMaster;
-        }
-
+        this->state_ = FREE;
     }
 
@@ -521 +552 @@
         {
             (*it)->state_ = FREE;
+            (*it)->myMaster_ = 0;
         }
         this->slaves_.clear();

code/branches/presentation3/src/orxonox/controllers/ArtificialController.h

@@ -97 +97 @@
             void moveToTargetPosition();
 
+            void removeFromFormation();
             void unregisterSlave();
             void searchNewMaster();