From 9075e66a697269a01d657f67d684a8d63627d124 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 5 Aug 2016 12:09:55 +0200
Subject: [PATCH] get rid of remains field

---
 src/simdag/sd_task.cpp      | 7 ++-----
 src/simdag/simdag_private.h | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 8ce0b26bfa..8723e1e333 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -54,7 +54,6 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   task->data = data;
   task->name = xbt_strdup(name);
   task->amount = amount;
-  task->remains = amount;
   task->allocation = new std::vector<sg_host_t>();
   task->rate = -1;
   return task;
@@ -292,7 +291,6 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
     task->start_time = task->surf_action->getStartTime();
     if (new_state == SD_DONE){
       task->finish_time = task->surf_action->getFinishTime();
-      task->remains = 0;
 #if HAVE_JEDULE
       jedule_log_sd_event(task);
 #endif
@@ -440,7 +438,7 @@ double SD_task_get_remaining_amount(SD_task_t task)
   if (task->surf_action)
     return task->surf_action->getRemains();
   else
-    return task->remains;
+    return (task->state == SD_DONE) ? 0 : task->amount;
 }
 
 e_SD_task_kind_t SD_task_get_kind(SD_task_t task)
@@ -793,7 +791,6 @@ void SD_task_unschedule(SD_task_t task)
     else
       SD_task_set_state(task, SD_NOT_SCHEDULED);
   }
-  task->remains = task->amount;
   task->start_time = -1.0;
 }
 
@@ -920,7 +917,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
   if (task->kind == SD_TASK_COMP_SEQ) {
     if (!task->flops_amount){ /*This task has failed and is rescheduled. Reset the flops_amount*/
       task->flops_amount = xbt_new0(double, 1);
-      task->flops_amount[0] = task->remains;
+      task->flops_amount[0] = task->amount;
     }
     XBT_VERB("It costs %.f flops", task->flops_amount[0]);
   }
diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index 9691647fbd..5fe62c6e1e 100644
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -42,7 +42,6 @@ typedef struct SD_task {
   e_SD_task_kind_t kind;
   double amount;
   double alpha;          /* used by typed parallel tasks */
-  double remains;
   double start_time;
   double finish_time;
   surf_action_t surf_action;
-- 
2.20.1