Changeset 11190 for code/branches

Timestamp:

May 19, 2016, 5:34:38 PM (8 years ago)

Author:

plehmann

Message:

modified newScriptController to prevent memory leacks caused by tasks

Location:

code/branches/plehmannFS16/src/orxonox/controllers

Files:

• NewScriptController.cc (modified) (2 diffs)
• NewScriptController.h (modified) (2 diffs)
• scriptTasks/MoveToTask.cc (modified) (2 diffs)
• scriptTasks/MoveToTask.h (modified) (1 diff)
• scriptTasks/Task.cc (modified) (2 diffs)
• scriptTasks/Task.h (modified) (2 diffs)

code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc

@@ -130 +130 @@
         }*/
 
-        if(this->taskList_.size() != 0)
-        {
-
-          orxout() << this->scTime_ << endl;
-
-          if(this->taskList_.front().getStartTime() < this->scTime_)
-          {
-             activeTasks_.push_back(this->taskList_.front());
-             this->taskList_.pop_front();
+        if(!this->taskList_.empty())
+        {
+           orxout() << scTime_ << endl;
+
+           orxout() << taskList_.size() << endl;
+
+
+          if(this->taskList_.front()->getStartTime() < this->scTime_)
+          {
+              activeTasks_.push_back(this->taskList_.front());
+              this->taskList_.pop_front();
           }
         }
         else
         {
-          //orxout() << "no tasks in taskList_" << endl;
-        }
-        
-        for (std::vector<Task>::iterator it = activeTasks_.begin(); it != activeTasks_.end(); it++)
-        {
-          if( !(it->update(dt)) )
-          {
-            activeTasks_.erase(it);
-            it--; // set back the iterator so we continue with the next element and not with the one after that
-          }
-        }
+          orxout() << "no tasks in taskList_" << endl;
+        }
+
+        std::vector<Task*>::iterator it = activeTasks_.begin();
+        while (it != activeTasks_.end() )
+        {
+          if( !((*it)->update(dt)) )
+          {
+            (*(*it)).destroyLater();
+            it = activeTasks_.erase(it);
+          }
+          else
+          {
+            it++;
+          }
+
+        }
+
 
 
@@ -159 +168 @@
     }
 
-
-    void NewScriptController::createAndAddTask(Task newTask)
-    {
-      //taskQueue_->push(newTask);
-    }
-
     void NewScriptController::debugOut(float startTime)
     {
-      DebugTask task = DebugTask(context_);
-      task.initialize(startTime);
+
+      DebugTask* task = new DebugTask(context_);
+
+      task->initialize(startTime);
+
+      bool inserted = false;
 
       if(taskList_.empty())
       {
         taskList_.push_front(task);
+        inserted = true;
       }
 
       else
       {
-        for (std::list<Task>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
-        {
-          orxout() << taskList_.empty() << endl;
-
-          if(task.getStartTime() < it->getStartTime() )
+        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        {
+          orxout() << "debugOutTask" << endl;
+
+          if(task->getStartTime() < (*it)->getStartTime() )
           {
             taskList_.insert(it, task);
-          }
-        }
-      }
+            inserted = true;
+            break;
+          }
+        }
+      }
+
+      if (!inserted)
+      {
+        taskList_.push_back(task);
+      }
+      
     }
 
     void NewScriptController::stringOut(float startTime, std::string output)
     {
-      stringOutTask task = stringOutTask(context_);
-      task.initialize(startTime, output);
+
+      stringOutTask* task = new stringOutTask(context_);
+
+      task->initialize(startTime, output);
+
+      bool inserted = false;
 
       if(taskList_.empty())
       {
         taskList_.push_front(task);
+        inserted = true;
       }
 
       else
       {
-        for (std::list<Task>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
-        {
-          orxout() << taskList_.empty() << endl;
-
-          if(task.getStartTime() < it->getStartTime() )
+        for (std::list<Task*>::iterator it = taskList_.begin(); it != taskList_.end(); it++) // insert sorted by starttime
+        {
+          orxout() << "stringOutTask" << endl;
+
+          if(task->getStartTime() < (*it)->getStartTime() )
           {
             taskList_.insert(it, task);
-          }
-        }
-      }
+            inserted = true;
+            break;
+          }
+        }
+      }
+
+      if (!inserted)
+      {
+        taskList_.push_back(task);
+      }
+
     }
 

code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h

@@ -68 +68 @@
             void printDebug() {orxout() << "fffff" << endl;} // tolua_export
 
-
-            void createAndAddTask(Task newTask);
-
         private:
             // Information about the player that this ScriptController will
@@ -85 +82 @@
 
             // List of events to walk through sorted by starting times
-            std::list<Task> taskList_;
-
+            std::list<Task*> taskList_;
 
             //List of Tasks currently active 
-            std::vector<Task> activeTasks_;
+            std::vector<Task*> activeTasks_;
 
             // Time since the creation of this ScriptController object

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.cc

@@ -49 +49 @@
         this->entity_ = this->player_->getControllableEntity();
         this->destination_ = destination;
+        this->velocity_ = velocity;
         this->entity->setVelocity( Vector3(0,0,0) )
     }
@@ -55 +56 @@
     {
 
+        float dl = this->velocity_ * dt;
 
+        
         /* Set the position to the correct place in the trajectory */
         this->entity_->setPosition( (1-dl)*startpos + dl * this->currentEvent.v1);

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/MoveToTask.h

@@ -62 +62 @@
             vector3 destination_;
 
+            float velocity_;
+
     };
 }

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.cc

@@ -38 +38 @@
     RegisterClass(Task);
 
-    Task::Task(Context* context)
+    Task::Task(Context* context) : BaseObject(context)
     {
         RegisterObject(Task);
@@ -49 +49 @@
     }
 
-    bool Task::update(float dt)
-    {
-        SUPER(Task, tick, dt);
-    }
-
 }

code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks/Task.h

@@ -32 +32 @@
 #include "infos/PlayerInfo.h"
 #include "tools/interfaces/Tickable.h"
-#include "core/class/OrxonoxClass.h"
+//#include "core/class/OrxonoxClass.h"
+#include "core/BaseObject.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Task : public OrxonoxClass {
+    class _OrxonoxExport Task : public BaseObject {
    
         public:
@@ -46 +47 @@
 
             //important return true while the task is running and false to stop it!!!
-            virtual bool update(float dt); 
+            virtual bool update(float dt) {return false;} 
 
             float getStartTime()