stop using MSG_task_get_initial_flops_amount(): it's useless now

diff --git a/examples/msg/energy-consumption/energy-consumption.c b/examples/msg/energy-consumption/energy-consumption.c
index 19b93a6..87cb1d4 100644 (file)
--- a/examples/msg/energy-consumption/energy-consumption.c
+++ b/examples/msg/energy-consumption/energy-consumption.c
@@ -26,7 +26,7 @@ static int dvfs(int argc, char *argv[])
   // Run a task
   start = MSG_get_clock();
   msg_task_t task1 = MSG_task_create ("t1", 100E6, 0, NULL);
-  XBT_INFO("Run a task of %.0E flops", MSG_task_get_initial_flops_amount(task1));
+  XBT_INFO("Run a task of %.0E flops", MSG_task_get_flops_amount(task1));
   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Current consumption: from %.0fW to %.0fW"
@@ -43,7 +43,7 @@ static int dvfs(int argc, char *argv[])
   // Run a second task
   start = MSG_get_clock();
   task1 = MSG_task_create ("t2", 100E6, 0, NULL);
-  XBT_INFO("Run a task of %.0E flops", MSG_task_get_initial_flops_amount(task1));
+  XBT_INFO("Run a task of %.0E flops", MSG_task_get_flops_amount(task1));
   MSG_task_execute (task1);
   MSG_task_destroy(task1);
   XBT_INFO("Task done (duration: %.2f s). Current peak speed=%.0E flop/s; Energy dissipated=%.0f J",

diff --git a/examples/msg/plugin-hostload/plugin-hostload.c b/examples/msg/plugin-hostload/plugin-hostload.c
index e458d27..717c54b 100644 (file)
--- a/examples/msg/plugin-hostload/plugin-hostload.c
+++ b/examples/msg/plugin-hostload/plugin-hostload.c
@@ -27,7 +27,7 @@ static int execute_load_test(int argc, char* argv[])
   // Run a task
   start            = MSG_get_clock();
   msg_task_t task1 = MSG_task_create("t1", 100E6, 0, NULL);
-  XBT_INFO("Run a task of %.0E flops", MSG_task_get_initial_flops_amount(task1));
+  XBT_INFO("Run a task of %.0E flops", MSG_task_get_flops_amount(task1));
   MSG_task_execute(task1);
   MSG_task_destroy(task1);
 
@@ -44,7 +44,7 @@ static int execute_load_test(int argc, char* argv[])
   // Run a second task
   start = MSG_get_clock();
   task1 = MSG_task_create("t2", 100E6, 0, NULL);
-  XBT_INFO("Run a task of %.0E flops", MSG_task_get_initial_flops_amount(task1));
+  XBT_INFO("Run a task of %.0E flops", MSG_task_get_flops_amount(task1));
   MSG_task_execute(task1);
   MSG_task_destroy(task1);
   XBT_INFO("Done working on my task; this took %.2fs; current peak speed: %.0E flop/s; number of flops computed so "

diff --git a/examples/msg/trace-masterworker/trace-masterworker.c b/examples/msg/trace-masterworker/trace-masterworker.c
index 56cb7a3..fe7f050 100644 (file)
--- a/examples/msg/trace-masterworker/trace-masterworker.c
+++ b/examples/msg/trace-masterworker/trace-masterworker.c
@@ -54,8 +54,7 @@ static int worker(int argc, char *argv[])
       break;
     }
     // adding the value returned by MSG_task_get_compute_duration(task) to the variable "task_computation"
-    TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()), "task_computation",
-                            MSG_task_get_initial_flops_amount(task));
+    TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()), "task_computation", MSG_task_get_flops_amount(task));
     MSG_task_execute(task);
     MSG_task_destroy(task);
     task = NULL;

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index 3da12b6..88e602f 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -406,7 +406,7 @@ void MSG_host_add_task(msg_host_t host, msg_task_t task)
   if (vm == nullptr)
     return;
 
-  double remaining = MSG_task_get_initial_flops_amount(task);
+  double remaining = MSG_task_get_flops_amount(task);
   std::string key  = simgrid::xbt::string_printf("%s-%p", task->name, task);
 
   dirty_page_t dp = new s_dirty_page;