X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5acac9da28f84a6625be7afaa01fc4ec6c643e7..e13d26773d3aa31c3d0eb24816470bcf8ccc26c0:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index e052a98fdb..1f15dfe8d1 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -15,13 +15,19 @@ #include -#include "src/mc/mc_replay.h" +#include + +#include +#include + +#include "mc/mc.h" #include "smx_private.h" +#include "src/kernel/activity/SynchroComm.hpp" #include "src/mc/mc_forward.hpp" -#include "xbt/ex.h" -#include "mc/mc.h" +#include "src/mc/mc_replay.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.h" -#include "src/simix/smx_private.hpp" +#include "xbt/ex.h" #include @@ -29,10 +35,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.cpp" -void simcall_call(smx_process_t process) +void simcall_call(smx_actor_t process) { if (process != simix_global->maestro_process) { - XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name, + XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(), SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call); SIMIX_process_yield(process); } else { @@ -65,18 +71,17 @@ xbt_dict_t simcall_asr_get_properties(const char *name) * \param flops_amount amount Computation amount (in flops) * \param priority computation priority * \param bound - * \param affinity_mask * \return A new SIMIX execution synchronization */ -smx_synchro_t simcall_execution_start(const char *name, +smx_activity_t simcall_execution_start(const char *name, double flops_amount, - double priority, double bound, unsigned long affinity_mask) + double priority, double bound) { /* 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 simcall_BODY_execution_start(name, flops_amount, priority, bound, affinity_mask); + return simcall_BODY_execution_start(name, flops_amount, priority, bound); } /** @@ -92,21 +97,18 @@ smx_synchro_t simcall_execution_start(const char *name, * amount between each pair of hosts * \param amount the SURF action amount * \param rate the SURF action rate + * \param timeout timeout * \return A new SIMIX execution synchronization */ -smx_synchro_t simcall_execution_parallel_start(const char *name, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double amount, - double rate) +smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, + double* flops_amount, double* bytes_amount, double amount, double rate, + double timeout) { int i,j; /* checking for infinite values */ for (i = 0 ; i < host_nb ; ++i) { xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); - if (bytes_amount != NULL) { + if (bytes_amount != nullptr) { for (j = 0 ; j < host_nb ; ++j) { xbt_assert(std::isfinite(bytes_amount[i + host_nb * j]), "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j); @@ -117,23 +119,8 @@ smx_synchro_t simcall_execution_parallel_start(const char *name, xbt_assert(std::isfinite(amount), "amount is not finite!"); xbt_assert(std::isfinite(rate), "rate is not finite!"); - return simcall_BODY_execution_parallel_start(name, host_nb, host_list, - flops_amount, - bytes_amount, - amount, rate); - -} - -/** - * \ingroup simix_process_management - * \brief Destroys an execution synchro. - * - * Destroys a synchro, freeing its memory. This function cannot be called if there are a conditional waiting for it. - * \param execution The execution synchro to destroy - */ -void simcall_execution_destroy(smx_synchro_t execution) -{ - simcall_BODY_execution_destroy(execution); + return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate, + timeout); } /** @@ -143,35 +130,11 @@ void simcall_execution_destroy(smx_synchro_t execution) * This functions stops the execution. It calls a surf function. * \param execution The execution synchro to cancel */ -void simcall_execution_cancel(smx_synchro_t execution) +void simcall_execution_cancel(smx_activity_t execution) { simcall_BODY_execution_cancel(execution); } -/** - * \ingroup simix_process_management - * \brief Returns how much of an execution synchro remains to be done. - * - * \param execution The execution synchro - * \return The remaining amount - */ -double simcall_execution_get_remains(smx_synchro_t execution) -{ - return simcall_BODY_execution_get_remains(execution); -} - -/** - * \ingroup simix_process_management - * \brief Returns the state of an execution synchro. - * - * \param execution The execution synchro - * \return The state - */ -e_smx_state_t simcall_execution_get_state(smx_synchro_t execution) -{ - return simcall_BODY_execution_get_state(execution); -} - /** * \ingroup simix_process_management * \brief Changes the priority of an execution synchro. @@ -180,7 +143,7 @@ e_smx_state_t simcall_execution_get_state(smx_synchro_t execution) * \param execution The execution synchro * \param priority The new priority */ -void simcall_execution_set_priority(smx_synchro_t execution, double priority) +void simcall_execution_set_priority(smx_activity_t execution, double priority) { /* checking for infinite values */ xbt_assert(std::isfinite(priority), "priority is not finite!"); @@ -196,49 +159,39 @@ void simcall_execution_set_priority(smx_synchro_t execution, double priority) * \param execution The execution synchro * \param bound The new bound */ -void simcall_execution_set_bound(smx_synchro_t execution, double bound) +void simcall_execution_set_bound(smx_activity_t execution, double bound) { simcall_BODY_execution_set_bound(execution, bound); } -/** - * \ingroup simix_process_management - * \brief Changes the CPU affinity of an execution synchro. - * - * This functions changes the CPU affinity of an execution synchro. See taskset(1) on Linux. - * \param execution The execution synchro - * \param host Host - * \param mask Affinity mask - */ -void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask) -{ - simcall_BODY_execution_set_affinity(execution, host, mask); -} - /** * \ingroup simix_host_management * \brief Waits for the completion of an execution synchro and destroy it. * * \param execution The execution synchro */ -e_smx_state_t simcall_execution_wait(smx_synchro_t execution) +e_smx_state_t simcall_execution_wait(smx_activity_t execution) { return (e_smx_state_t) simcall_BODY_execution_wait(execution); } - /** * \ingroup simix_vm_management * \brief Create a VM on the given physical host. * * \param name VM name - * \param host Physical host + * \param dest Physical host on which to create the VM * * \return The host object of the VM */ -void* simcall_vm_create(const char *name, sg_host_t phys_host) +sg_host_t simcall_vm_create(const char* name, sg_host_t dest) { - return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host)); + return simgrid::simix::kernelImmediate([&name, &dest] { + sg_host_t host = new simgrid::s4u::VirtualMachine(name, dest); + host->extension_set(new simgrid::simix::Host()); + + return host; + }); } /** @@ -249,41 +202,32 @@ void* simcall_vm_create(const char *name, sg_host_t phys_host) */ void simcall_vm_start(sg_host_t vm) { - return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm)); + simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm)); } /** * \ingroup simix_vm_management - * \brief Get the state of the given VM + * \brief Get the physical host on which the given VM runs. * * \param vm VM - * \return The state of the VM + * \return The physical host */ -int simcall_vm_get_state(sg_host_t vm) +void *simcall_vm_get_pm(sg_host_t vm) { - return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm)); + return simgrid::simix::kernelImmediate( + [vm]() { return static_cast(vm)->pimpl_vm_->getPm(); }); } /** - * \ingroup simix_vm_management - * \brief Get the name of the physical host on which the given VM runs. + * @brief Function to set the CPU bound of the given SIMIX VM host. * - * \param vm VM - * \return The name of the physical host + * @param host the vm host (a sg_host_t) + * @param bound bound (a double) */ -void *simcall_vm_get_pm(sg_host_t vm) -{ - return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm)); -} - void simcall_vm_set_bound(sg_host_t vm, double bound) { - simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound)); -} - -void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask) -{ - simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask)); + simgrid::simix::kernelImmediate( + [vm, bound]() { static_cast(vm)->pimpl_vm_->setBound(bound); }); } /** @@ -295,7 +239,7 @@ void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask) */ void simcall_vm_migrate(sg_host_t vm, sg_host_t host) { - return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host)); + simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host)); } /** @@ -339,7 +283,23 @@ void simcall_vm_save(sg_host_t vm) */ void simcall_vm_restore(sg_host_t vm) { - simcall_BODY_vm_restore(vm); + simgrid::simix::kernelImmediate([vm]() { + if (static_cast(vm)->pimpl_vm_->getState() != SURF_VM_STATE_SAVED) + THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str()); + + XBT_DEBUG("restore VM(%s), where %d processes exist", vm->name().c_str(), + xbt_swag_size(sg_host_simix(vm)->process_list)); + + /* jump to vm_ws_restore() */ + static_cast(vm)->pimpl_vm_->restore(); + + smx_actor_t smx_process, smx_process_safe; + xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) + { + XBT_DEBUG("resume %s", smx_process->name.c_str()); + SIMIX_process_resume(smx_process); + } + }); } /** @@ -361,58 +321,24 @@ void simcall_vm_shutdown(sg_host_t vm) */ void simcall_vm_destroy(sg_host_t vm) { - simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm)); -} + simgrid::simix::kernelImmediate([vm]() { + /* this code basically performs a similar thing like SIMIX_host_destroy() */ + XBT_DEBUG("destroy %s", vm->name().c_str()); -/** - * \ingroup simix_vm_management - * \brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration - * The simcall actually invokes the following calls: - * simcall_vm_set_affinity(vm, src_pm, 0); - * simcall_vm_migrate(vm, dst_pm); - * simcall_vm_resume(vm); - * - * It is called at the end of the migration_rx_fun function from msg/msg_vm.c - * - * \param vm VM to migrate - * \param src_pm Source physical host - * \param dst_pmt Destination physical host - */ -void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm) -{ - simgrid::simix::kernel(std::bind( - SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm)); -} + /* FIXME: this is really strange that everything fails if the next line is removed. + * This is as if we shared these data with the PM, which definitely should not be the case... + * + * We need to test that suspending a VM does not suspends the processes running on its PM, for example. + * Or we need to simplify this code enough to make it actually readable (but this sounds harder than testing) + */ + vm->extension_set(nullptr); -/** - * \ingroup simix_process_management - * \brief Creates and runs a new SIMIX process. - * - * The structure and the corresponding thread are created and put in the list of ready processes. - * - * \param name a name for the process. It is for user-level information and can be NULL. - * \param code the main function of the process - * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be NULL. - * It can be retrieved with the function \ref simcall_process_get_data. - * \param hostname name of the host where the new agent is executed. - * \param kill_time time when the process is killed - * \param argc first argument passed to \a code - * \param argv second argument passed to \a code - * \param properties the properties of the process - * \param auto_restart either it is autorestarting or not. - */ -smx_process_t simcall_process_create(const char *name, - xbt_main_func_t code, - void *data, - const char *hostname, - double kill_time, - int argc, char **argv, - xbt_dict_t properties, - int auto_restart) -{ - return (smx_process_t) simcall_BODY_process_create(name, code, data, hostname, - kill_time, argc, argv, properties, - auto_restart); + /* Don't free these things twice: they are the ones of my physical host */ + vm->pimpl_cpu = nullptr; + vm->pimpl_netcard = nullptr; + + vm->destroy(); + }); } /** @@ -423,7 +349,7 @@ smx_process_t simcall_process_create(const char *name, * * \param process poor victim */ -void simcall_process_kill(smx_process_t process) +void simcall_process_kill(smx_actor_t process) { simcall_BODY_process_kill(process); } @@ -442,7 +368,7 @@ void simcall_process_killall(int reset_pid) * \brief Cleans up a SIMIX process. * \param process poor victim (must have already been killed) */ -void simcall_process_cleanup(smx_process_t process) +void simcall_process_cleanup(smx_actor_t process) { simcall_BODY_process_cleanup(process); } @@ -456,12 +382,12 @@ void simcall_process_cleanup(smx_process_t process) * \param process the process to migrate * \param dest name of the new host */ -void simcall_process_set_host(smx_process_t process, sg_host_t dest) +void simcall_process_set_host(smx_actor_t process, sg_host_t dest) { simcall_BODY_process_set_host(process, dest); } -void simcall_process_join(smx_process_t process, double timeout) +void simcall_process_join(smx_actor_t process, double timeout) { simcall_BODY_process_join(process, timeout); } @@ -475,10 +401,8 @@ void simcall_process_join(smx_process_t process, double timeout) * * \param process a SIMIX process */ -void simcall_process_suspend(smx_process_t process) +void simcall_process_suspend(smx_actor_t process) { - xbt_assert(process, "Invalid parameters"); - simcall_BODY_process_suspend(process); } @@ -491,7 +415,7 @@ void simcall_process_suspend(smx_process_t process) * * \param process a SIMIX process */ -void simcall_process_resume(smx_process_t process) +void simcall_process_resume(smx_actor_t process) { simcall_BODY_process_resume(process); } @@ -502,114 +426,59 @@ void simcall_process_resume(smx_process_t process) * * Maestro internal process is not counted, only user code processes are */ -int simcall_process_count(void) +int simcall_process_count() { - return simgrid::simix::kernel(SIMIX_process_count); + return simgrid::simix::kernelImmediate(SIMIX_process_count); } /** * \ingroup simix_process_management - * \brief Return the PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process - */ -int simcall_process_get_PID(smx_process_t process) -{ - return SIMIX_process_get_PID(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the parent PID of a #smx_process_t. - * \param process a SIMIX process - * \return the PID of this process parenrt - */ -int simcall_process_get_PPID(smx_process_t process) -{ - return SIMIX_process_get_PPID(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the user data of a #smx_process_t. + * \brief Return the user data of a #smx_actor_t. * \param process a SIMIX process * \return the user data of this process */ -void* simcall_process_get_data(smx_process_t process) +void* simcall_process_get_data(smx_actor_t process) { return SIMIX_process_get_data(process); } /** * \ingroup simix_process_management - * \brief Set the user data of a #smx_process_t. + * \brief Set the user data of a #smx_actor_t. * * This functions sets the user data associated to \a process. * \param process SIMIX process * \param data User data */ -void simcall_process_set_data(smx_process_t process, void *data) -{ - simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data)); -} - -static void kill_process_from_timer(void* arg) +void simcall_process_set_data(smx_actor_t process, void *data) { - smx_process_t process = (smx_process_t) arg; - simix_global->kill_process_function(process); - process->kill_timer=NULL; + simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data)); } /** * \ingroup simix_process_management * \brief Set the kill time of a process. */ -void simcall_process_set_kill_time(smx_process_t process, double kill_time) +void simcall_process_set_kill_time(smx_actor_t process, double kill_time) { - if (kill_time > SIMIX_get_clock()) { - if (simix_global->kill_process_function) { - XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name, - sg_host_get_name(process->host)); - process->kill_timer = SIMIX_timer_set(kill_time, kill_process_from_timer, process); - } - } + if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr) + return; + XBT_DEBUG("Set kill time %f for process %s(%s)", + kill_time, process->name.c_str(), sg_host_get_name(process->host)); + process->kill_timer = SIMIX_timer_set(kill_time, [=] { + simix_global->kill_process_function(process); + process->kill_timer=nullptr; + }); } /** * \ingroup simix_process_management * \brief Get the kill time of a process (or 0 if unset). */ -double simcall_process_get_kill_time(smx_process_t process) { +double simcall_process_get_kill_time(smx_actor_t process) { return SIMIX_timer_get_date(process->kill_timer); } -/** - * \ingroup simix_process_management - * \brief Return the location on which an agent is running. - * - * This functions returns the sg_host_t corresponding to the location on which - * \a process is running. - * \param process SIMIX process - * \return SIMIX host - */ -sg_host_t simcall_process_get_host(smx_process_t process) -{ - return SIMIX_process_get_host(process); -} - -/** - * \ingroup simix_process_management - * \brief Return the name of an agent. - * - * This functions checks whether \a process is a valid pointer or not and return its name. - * \param process SIMIX process - * \return The process name - */ -const char* simcall_process_get_name(smx_process_t process) -{ - return SIMIX_process_get_name(process); -} - /** * \ingroup simix_process_management * \brief Returns true if the process is suspended . @@ -618,7 +487,7 @@ const char* simcall_process_get_name(smx_process_t process) * \param process SIMIX process * \return 1, if the process is suspended, else 0. */ -int simcall_process_is_suspended(smx_process_t process) +int simcall_process_is_suspended(smx_actor_t process) { return simcall_BODY_process_is_suspended(process); } @@ -629,7 +498,7 @@ int simcall_process_is_suspended(smx_process_t process) * * This functions returns the properties associated with this process */ -xbt_dict_t simcall_process_get_properties(smx_process_t process) +xbt_dict_t simcall_process_get_properties(smx_actor_t process) { return SIMIX_process_get_properties(process); } @@ -638,7 +507,7 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process) * \brief Add an on_exit function * Add an on_exit function which will be executed when the process exits/is killed. */ -XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data) +XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data) { simcall_BODY_process_on_exit(process, fun, data); } @@ -648,7 +517,7 @@ XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoi * Will restart the process when the host comes back up if auto_restart is set to 1. */ -XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart) +XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart) { simcall_BODY_process_auto_restart_set(process, auto_restart); } @@ -657,9 +526,9 @@ XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int aut * \ingroup simix_process_management * \brief Restarts the process, killing it and starting it again from scratch. */ -XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process) +XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process) { - return (smx_process_t) simcall_BODY_process_restart(process); + return (smx_actor_t) simcall_BODY_process_restart(process); } /** * \ingroup simix_process_management @@ -690,47 +559,18 @@ smx_mailbox_t simcall_mbox_create(const char *name) return simcall_BODY_mbox_create(name); } -/** - * \ingroup simix_mbox_management - * \brief Returns a rendez-vous point knowing its name - */ -smx_mailbox_t simcall_mbox_get_by_name(const char *name) -{ - /* FIXME: this is a horrible loss of performance, so we hack it out by - * skipping the simcall (for now). It works in parallel, it won't work on - * distributed but probably we will change MSG for that. */ - - return SIMIX_mbox_get_by_name(name); -} - -/** - * \ingroup simix_mbox_management - * \brief returns the communication at the head of the rendez-vous - * \param mbox The rendez-vous point - * \return The communication or NULL if empty - */ -smx_synchro_t simcall_mbox_get_head(smx_mailbox_t mbox) -{ - return simcall_BODY_mbox_get_head(mbox); -} - -void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process) +void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process) { simcall_BODY_mbox_set_receiver(mbox, process); } -smx_process_t simcall_mbox_get_receiver(smx_mailbox_t mbox) -{ - return simcall_BODY_mbox_get_receiver(mbox); -} - /** * \ingroup simix_comm_management */ -void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, +void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout) { /* checking for infinite values */ @@ -742,11 +582,11 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */ + smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ comm = simcall_comm_isend(sender, mbox, task_size, rate, - src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0); + src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); simcall_comm_wait(comm, timeout); - comm = NULL; + comm = nullptr; } else { simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size, @@ -757,11 +597,11 @@ void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_siz /** * \ingroup simix_comm_management */ -smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate, +smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), + int (*match_fun)(void *, void *, smx_activity_t), void (*clean_fun)(void *), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, int detached) { @@ -779,9 +619,9 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, doubl /** * \ingroup simix_comm_management */ -void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), +void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size, + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double timeout, double rate) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); @@ -789,11 +629,11 @@ void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buf if (MC_is_active() || MC_record_replay_is_active()) { /* the model-checker wants two separate simcalls */ - smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */ + smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */ comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); simcall_comm_wait(comm, timeout); - comm = NULL; + comm = nullptr; } else { simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size, @@ -803,9 +643,9 @@ void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buf /** * \ingroup simix_comm_management */ -smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_synchro_t), - void (*copy_data_fun)(smx_synchro_t, void*, size_t), +smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, + int (*match_fun)(void *, void *, smx_activity_t), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data, double rate) { xbt_assert(mbox, "No rendez-vous point defined for irecv"); @@ -817,8 +657,8 @@ smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, voi /** * \ingroup simix_comm_management */ -smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, - int (*match_fun)(void *, void *, smx_synchro_t), void *data) +smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag, + int (*match_fun)(void *, void *, smx_activity_t), void *data) { xbt_assert(mbox, "No rendez-vous point defined for iprobe"); @@ -828,33 +668,36 @@ smx_synchro_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag /** * \ingroup simix_comm_management */ -void simcall_comm_cancel(smx_synchro_t comm) +void simcall_comm_cancel(smx_activity_t synchro) { - simcall_BODY_comm_cancel(comm); + simgrid::simix::kernelImmediate([synchro]{ + simgrid::kernel::activity::Comm *comm = static_cast(synchro); + comm->cancel(); + }); } /** * \ingroup simix_comm_management */ -unsigned int simcall_comm_waitany(xbt_dynar_t comms) +unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout) { - return simcall_BODY_comm_waitany(comms); + return simcall_BODY_comm_waitany(comms, timeout); } /** * \ingroup simix_comm_management */ -int simcall_comm_testany(xbt_dynar_t comms) +int simcall_comm_testany(smx_activity_t* comms, size_t count) { - if (xbt_dynar_is_empty(comms)) + if (count == 0) return -1; - return simcall_BODY_comm_testany(comms); + return simcall_BODY_comm_testany(comms, count); } /** * \ingroup simix_comm_management */ -void simcall_comm_wait(smx_synchro_t comm, double timeout) +void simcall_comm_wait(smx_activity_t comm, double timeout) { xbt_assert(std::isfinite(timeout), "timeout is not finite!"); simcall_BODY_comm_wait(comm, timeout); @@ -867,9 +710,9 @@ void simcall_comm_wait(smx_synchro_t comm, double timeout) * \param execution The execution synchro * \param category The tracing category */ -void simcall_set_category(smx_synchro_t synchro, const char *category) +void simcall_set_category(smx_activity_t synchro, const char *category) { - if (category == NULL) { + if (category == nullptr) { return; } simcall_BODY_set_category(synchro, category); @@ -879,61 +722,16 @@ void simcall_set_category(smx_synchro_t synchro, const char *category) * \ingroup simix_comm_management * */ -int simcall_comm_test(smx_synchro_t comm) +int simcall_comm_test(smx_activity_t comm) { return simcall_BODY_comm_test(comm); } -/** - * \ingroup simix_comm_management - * - */ -double simcall_comm_get_remains(smx_synchro_t comm) -{ - return simcall_BODY_comm_get_remains(comm); -} - -/** - * \ingroup simix_comm_management - * - */ -void *simcall_comm_get_src_data(smx_synchro_t comm) -{ - return simcall_BODY_comm_get_src_data(comm); -} - -/** - * \ingroup simix_comm_management - * - */ -void *simcall_comm_get_dst_data(smx_synchro_t comm) -{ - return simcall_BODY_comm_get_dst_data(comm); -} - -/** - * \ingroup simix_comm_management - * - */ -smx_process_t simcall_comm_get_src_proc(smx_synchro_t comm) -{ - return simcall_BODY_comm_get_src_proc(comm); -} - -/** - * \ingroup simix_comm_management - * - */ -smx_process_t simcall_comm_get_dst_proc(smx_synchro_t comm) -{ - return simcall_BODY_comm_get_dst_proc(comm); -} - /** * \ingroup simix_synchro_management * */ -smx_mutex_t simcall_mutex_init(void) +smx_mutex_t simcall_mutex_init() { if(!simix_global) { fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization @@ -973,7 +771,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex) * \ingroup simix_synchro_management * */ -smx_cond_t simcall_cond_init(void) +smx_cond_t simcall_cond_init() { return simcall_BODY_cond_init(); } @@ -1206,7 +1004,12 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage) void simcall_run_kernel(std::function const& code) { - return simcall_BODY_run_kernel((void*) &code); + simcall_BODY_run_kernel(&code); +} + +void simcall_run_blocking(std::function const& code) +{ + simcall_BODY_run_blocking(&code); } int simcall_mc_random(int min, int max) { @@ -1219,3 +1022,15 @@ int simcall_mc_random(int min, int max) { const char *SIMIX_simcall_name(e_smx_simcall_t kind) { return simcall_names[kind]; } + +namespace simgrid { +namespace simix { + +void unblock(smx_actor_t process) +{ + xbt_assert(SIMIX_is_maestro()); + SIMIX_simcall_answer(&process->simcall); +} + +} +}