X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8eb62b207b566949a0d9ce649a7b21e226b9168..138a767165df006f5ae2a28a5d0db79f06c6a7fb:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 9c1a73d2a6..447032f7fb 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -15,10 +15,12 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ConditionVariableImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_io_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); @@ -38,15 +40,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); * @param host host where the synchro will be executed * @return A new SIMIX execution synchronization */ -smx_activity_t simcall_execution_start(std::string name, double flops_amount, double priority, double bound, - simgrid::s4u::Host* host) +smx_activity_t simcall_execution_start(std::string name, std::string category, double flops_amount, double priority, + double bound, simgrid::s4u::Host* host) { /* checking for infinite values */ xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!"); xbt_assert(std::isfinite(priority), "priority is not finite!"); - return simgrid::simix::simcall([name, flops_amount, priority, bound, host] { - return SIMIX_execution_start(name, flops_amount, priority, bound, host); + return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] { + return SIMIX_execution_start(name, category, flops_amount, priority, bound, host); }); } @@ -362,9 +364,9 @@ void simcall_comm_wait(smx_activity_t comm, double timeout) * @param synchro The execution synchro * @param category The tracing category */ -void simcall_set_category(smx_activity_t synchro, const char *category) +void simcall_set_category(smx_activity_t synchro, std::string category) { - if (category == nullptr) { + if (category.empty()) { return; } simgrid::simix::simcall([synchro, category] { SIMIX_set_category(synchro, category); });