A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add network factors in changelog
[simgrid.git]
/
src
/
msg
/
msg_task.cpp
diff --git
a/src/msg/msg_task.cpp
b/src/msg/msg_task.cpp
index 262158f1a77753c11a1b8579a150daaf2d69b7e5..0d35d731d54b7bc4cfbd43fabb2997b5851777c4 100644
(file)
--- a/
src/msg/msg_task.cpp
+++ b/
src/msg/msg_task.cpp
@@
-28,7
+28,7
@@
Task::Task(const std::string& name, double flops_amount, double bytes_amount, vo
id_ = counter++;
set_data(data);
if (MC_is_active())
id_ = counter++;
set_data(data);
if (MC_is_active())
- MC_ignore_heap(&
(id_), sizeof(id_)
);
+ MC_ignore_heap(&
id_, sizeof id_
);
}
Task::Task(const std::string& name, std::vector<s4u::Host*>&& hosts, std::vector<double>&& flops_amount,
}
Task::Task(const std::string& name, std::vector<s4u::Host*>&& hosts, std::vector<double>&& flops_amount,
@@
-220,10
+220,10
@@
msg_task_t MSG_task_create(const char *name, double flop_amount, double message_
*
* A constructor for #msg_task_t taking six arguments.
*
*
* A constructor for #msg_task_t taking six arguments.
*
- *
\
rst
- * See :
cpp:func:`void simgrid::s4u::this_actor::parallel_execute(int, s4u::Host**, double*, double*)
` for
+ *
@begin
rst
+ * See :
ref:`simgrid::s4u::this_actor::parallel_execute() <API_s4u_parallel_execute>
` for
* the exact semantic of the parameters.
* the exact semantic of the parameters.
- *
\
endrst
+ *
@
endrst
*
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param host_nb the number of hosts implied in the parallel task.
*
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param host_nb the number of hosts implied in the parallel task.
@@
-700,7
+700,7
@@
double MSG_task_get_remaining_work_ratio(const_msg_task_t task)
*/
double MSG_task_get_flops_amount(const_msg_task_t task)
{
*/
double MSG_task_get_flops_amount(const_msg_task_t task)
{
- if (task->compute != nullptr) {
+ if (task->compute != nullptr
&& task->compute->get_state() == simgrid::s4u::Activity::State::STARTED
) {
return task->compute->get_remaining();
} else {
// Not started or already done.
return task->compute->get_remaining();
} else {
// Not started or already done.
@@
-778,7
+778,7
@@
void MSG_task_set_bound(msg_task_t task, double bound)
* (or with #TRACE_category_with_color).
*
* @beginrst
* (or with #TRACE_category_with_color).
*
* @beginrst
- * See :ref:`outcome
s
_vizu` for details on how to trace the (categorized) resource utilization.
+ * See :ref:`outcome_vizu` for details on how to trace the (categorized) resource utilization.
* @endrst
*
* @param task the task that is going to be categorized
* @endrst
*
* @param task the task that is going to be categorized