Changeset 11190 for code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc

Timestamp:

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

Author:

plehmann

Message:

modified newScriptController to prevent memory leacks caused by tasks

File:

• code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc (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);
+      }
+
     }