changed create_task function to be global

4 files changed, 33 insertions, 31 deletions

diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
index e6298660413..2dbd873eeda 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
@@ -79,7 +79,7 @@ FTRMFF_Forward_Packing_Algorithm::operator () (const TASK_LIST & tasks)
        ++it)
     {
       // create the right amount of backup replica tasks
-      TASK_LIST task_group = this->create_tasks (*it);
+      TASK_LIST task_group = create_ranked_tasks (*it, consistency_level_);
 
       // schedule the tasks of one application
       for (TASK_LIST::iterator task_it = task_group.begin ();
@@ -117,31 +117,3 @@ FTRMFF_Forward_Packing_Algorithm::schedule () const
 {
   return scheduler_->schedule ();
 }
-
-TASK_LIST 
-FTRMFF_Forward_Packing_Algorithm::create_tasks (const Task & task)
-{
-  TASK_LIST tasks;
-
-  for (unsigned int i = 0; i <= consistency_level_; ++i)
-    {
-      Task t = task;
-      t.rank = i;
-      if (t.rank > 0)
-        {
-          t.role = BACKUP;
-
-          std::stringstream ss;
-          ss << t.name << "_" << i;
-          t.name = ss.str ();
-        }
-      else
-        {
-          t.role = PRIMARY;
-        }
-
-      tasks.push_back (t);
-    }
-
-  return tasks;
-}
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
index be8a3c5b4aa..b1e2a3731f0 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
@@ -43,8 +43,6 @@ public:
   SCHEDULE_PROGRESS_LIST get_unschedulable ();
 
   SCHEDULE schedule () const;
-private:
-  TASK_LIST create_tasks (const Task & task);
 
 private:
   SCHEDULE_PROGRESS_LIST unschedulable_;
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.cpp
index a4bcf250b1e..f82ef0ad784 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.cpp
@@ -75,6 +75,34 @@ create_tasks (const Task & task,
   return output;
 }
 
+TASK_LIST create_ranked_tasks (const Task & task,
+                               unsigned int backup_number)
+{
+  TASK_LIST tasks;
+
+  for (unsigned int i = 0; i <= backup_number; ++i)
+    {
+      Task t = task;
+      t.rank = i;
+      if (t.rank > 0)
+        {
+          t.role = BACKUP;
+
+          std::stringstream ss;
+          ss << t.name << "_" << i;
+          t.name = ss.str ();
+        }
+      else
+        {
+          t.role = PRIMARY;
+        }
+
+      tasks.push_back (t);
+    }
+
+  return tasks;
+}
+
 bool
 WCRTComparison::operator () (const ScheduleResult & r1,
                              const ScheduleResult & r2)
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.h
index 6bd708aa172..9745372654d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Schedule.h
@@ -75,6 +75,10 @@ void add_schedule_results (const SCHEDULE_RESULT_LIST & result_list,
 TASK_LIST create_tasks (const Task & task,
                         unsigned int backup_number);
 
+/// helper function that creates a list of tasks that is already ranked
+TASK_LIST create_ranked_tasks (const Task & task,
+                               unsigned int backup_number);
+
 struct WCRTComparison : public std::binary_function <ScheduleResult,
                                                      ScheduleResult,
                                                      bool>