X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b94b2100679d5b4355fccb6d22927efc12ca5bc..f6361035ba2972dede69bcdf16bc6724bd50bf7d:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 4909007cbc..cd27911cc6 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -110,7 +110,7 @@ smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), - void* data, int detached) + void* data, bool detached) { /* checking for infinite values */ xbt_assert(std::isfinite(task_size), "task_size is not finite!"); @@ -384,10 +384,16 @@ smx_activity_t simcall_execution_start(const std::string& name, const std::strin double priority, double bound, sg_host_t host) { return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { - return simgrid::kernel::activity::ExecImplPtr( - new simgrid::kernel::activity::ExecImpl(std::move(name), std::move(category))) - ->set_host(host) - ->start(flops_amount, priority, bound); + simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl(); + (*exec) + .set_name(name) + .set_tracing_category(category) + .set_host(host) + .set_priority(priority) + .set_bound(bound) + .set_flops_amount(flops_amount) + .start(); + return simgrid::kernel::activity::ExecImplPtr(exec); }); } @@ -424,9 +430,15 @@ smx_activity_t simcall_execution_parallel_start(const std::string& name, int hos if (bytes_amount != nullptr) bytes_parallel_amount = std::vector(bytes_amount, bytes_amount + host_nb * host_nb); return simgrid::simix::simcall([name, hosts, flops_parallel_amount, bytes_parallel_amount, timeout] { - return simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(std::move(name), "")) - ->set_timeout(timeout) - ->start(hosts, flops_parallel_amount, bytes_parallel_amount); + simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl(); + (*exec) + .set_name(name) + .set_hosts(hosts) + .set_timeout(timeout) + .set_flops_amounts(flops_parallel_amount) + .set_bytes_amounts(bytes_parallel_amount) + .start(); + return simgrid::kernel::activity::ExecImplPtr(exec); }); }