From 2c9cf2269d00dab91af16e3ab7ed2228e2047817 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 10 Oct 2018 02:27:36 +0200 Subject: [PATCH] woops, I broke the build while fixing the doc --- include/simgrid/msg.h | 2 +- include/simgrid/s4u/Actor.hpp | 7 ++++--- src/msg/msg_task.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 1092890a09..a62ed6facb 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -236,7 +236,7 @@ typedef struct msg_task* msg_task_t; /** @brief Default value for an uninitialized #msg_task_t. */ #define MSG_TASK_UNINITIALIZED NULL -/** @brief Return code of most MSG functions +/** @brief Return code of most MSG functions */ /* Keep these code as binary values: java bindings manipulate | of these values */ typedef enum { MSG_OK = 0, /**< @brief Everything is right. Keep on going this way ! */ diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 24b30a6920..409e257a9a 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -463,11 +463,12 @@ XBT_PUBLIC void execute(double flop, double priority); * \endrst */ -XBT_PUBLIC void parallel_execute(int host_nb, s4u::Host* host_list, double* flops_amount, double* bytes_amount); +XBT_PUBLIC void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount, double* bytes_amount); /** \rst * Block the actor until the built :ref:`parallel execution ` completes, or until the timeout. - * \endrst*/ -XBT_PUBLIC void parallel_execute(int host_nb, s4u::Host* host_list, double* flops_amount, double* bytes_amount, + * \endrst + */ +XBT_PUBLIC void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount, double* bytes_amount, double timeout); XBT_PUBLIC ExecPtr exec_init(double flops_amounts); diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 07e6db979b..1fb09fc312 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -61,7 +61,7 @@ msg_task_t MSG_task_create(const char *name, double flop_amount, double message_ * A constructor for #msg_task_t taking six arguments and returning the corresponding object. * * \rst - * See :cpp:func:`void simgrid::s4u::this_actor::parallel_execute(int, s4u::Host*, double*, double*)` for + * See :cpp:func:`void simgrid::s4u::this_actor::parallel_execute(int, s4u::Host**, double*, double*)` for * the exact semantic of the parameters. * \endrst * -- 2.20.1