X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/684313ff27ab7b9a3205b2c0af38916e44ead89e..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 3e1d68be7a..57b1636953 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,8 +7,6 @@ #include "src/simix/smx_private.hpp" #include -extern "C" { - /** @addtogroup m_task_management * * Since most scheduling algorithms rely on a concept of task that can be either computed locally or @@ -239,7 +237,7 @@ double MSG_task_get_remaining_work_ratio(msg_task_t task) { xbt_assert((task != nullptr), "Cannot get information from a nullptr task"); if (task->simdata->compute) { // Task in progress - return task->simdata->compute->remainingRatio(); + return task->simdata->compute->get_remaining_ratio(); } else { // Task not started (flops_amount is > 0.0) or finished (flops_amount is set to 0.0) return task->simdata->flops_amount > 0.0 ? 1.0 : 0.0; @@ -256,7 +254,7 @@ double MSG_task_get_remaining_work_ratio(msg_task_t task) { */ double MSG_task_get_flops_amount(msg_task_t task) { if (task->simdata->compute != nullptr) { - return task->simdata->compute->remains(); + return task->simdata->compute->get_remaining(); } else { // Not started or already done. // - Before starting, flops_amount is initially the task cost @@ -333,4 +331,3 @@ void MSG_task_set_bound(msg_task_t task, double bound) if (task->simdata->compute) simcall_execution_set_bound(task->simdata->compute, task->simdata->bound); } -}