#include <functional>
-#include <xbt/functional.hpp>
-
-#include <simgrid/simix/blocking_simcall.hpp>
-
-#include "src/mc/mc_replay.h"
+#include "mc/mc.h"
+#include "simgrid/s4u/VirtualMachine.hpp"
+#include "simgrid/simix.hpp"
+#include "simgrid/simix/blocking_simcall.hpp"
#include "smx_private.h"
+#include "src/kernel/activity/CommImpl.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/SynchroComm.hpp"
-
-#include <simgrid/simix.hpp>
+#include "xbt/ex.h"
+#include "xbt/functional.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
#include "popping_bodies.cpp"
-void simcall_call(smx_process_t process)
+void simcall_call(smx_actor_t actor)
{
- if (process != simix_global->maestro_process) {
- 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);
+ if (actor != simix_global->maestro_process) {
+ XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->cname(), SIMIX_simcall_name(actor->simcall.call),
+ (int)actor->simcall.call);
+ SIMIX_process_yield(actor);
} else {
- SIMIX_simcall_handle(&process->simcall, 0);
+ SIMIX_simcall_handle(&actor->simcall, 0);
}
}
-// ***** AS simcalls
-
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a router or AS.
- *
- * \param name The name of the router or AS
- * \return The properties
- */
-xbt_dict_t simcall_asr_get_properties(const char *name)
-{
- return simcall_BODY_asr_get_properties(name);
-}
-
/**
* \ingroup simix_process_management
* \brief Creates a synchro that executes some computation of an host.
* \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);
}
/**
* 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) {
+ for (int i = 0 ; i < host_nb ; ++i) {
xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
if (bytes_amount != nullptr) {
- for (j = 0 ; j < host_nb ; ++j) {
+ for (int 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);
}
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);
-
+ return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate,
+ timeout);
}
/**
* 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);
}
* \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!");
* \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
- *
- * \return The host object of the VM
- */
-void* simcall_vm_create(const char *name, sg_host_t phys_host)
-{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host));
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Start the given VM to the given physical host
- *
- * \param vm VM
- */
-void simcall_vm_start(sg_host_t vm)
-{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Get the state of the given VM
- *
- * \param vm VM
- * \return The state of the VM
- */
-int simcall_vm_get_state(sg_host_t vm)
-{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_state, vm));
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Get the name of the physical host on which the given VM runs.
- *
- * \param vm VM
- * \return The name of the physical host
- */
-void *simcall_vm_get_pm(sg_host_t vm)
-{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
-}
-
-void simcall_vm_set_bound(sg_host_t vm, double bound)
-{
- simgrid::simix::kernelImmediate(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::kernelImmediate(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Migrate the given VM to the given physical host
- *
- * \param vm VM
- * \param host Destination physical host
- */
-void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
-{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Suspend the given VM
- *
- * \param vm VM
- */
-void simcall_vm_suspend(sg_host_t vm)
-{
- simcall_BODY_vm_suspend(vm);
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Resume the given VM
- *
- * \param vm VM
- */
-void simcall_vm_resume(sg_host_t vm)
-{
- simcall_BODY_vm_resume(vm);
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Save the given VM
- *
- * \param vm VM
- */
-void simcall_vm_save(sg_host_t vm)
-{
- simcall_BODY_vm_save(vm);
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Restore the given VM
- *
- * \param vm VM
- */
-void simcall_vm_restore(sg_host_t vm)
-{
- simcall_BODY_vm_restore(vm);
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Shutdown the given VM
- *
- * \param vm VM
- */
-void simcall_vm_shutdown(sg_host_t vm)
-{
- simcall_BODY_vm_shutdown(vm);
-}
-
-/**
- * \ingroup simix_vm_management
- * \brief Destroy the given VM
- *
- * \param vm VM
- */
-void simcall_vm_destroy(sg_host_t vm)
-{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_destroy, vm));
-}
-
-/**
- * \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::kernelImmediate(std::bind(
- SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
-}
-
/**
* \ingroup simix_process_management
* \brief Kills a SIMIX process.
*
* \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);
}
* \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);
}
-/**
- * \ingroup simix_process_management
- * \brief Migrates an agent to another location.
- *
- * This function changes the value of the host on which \a process is running.
- *
- * \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)
-{
- 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);
}
*
* \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);
}
-/**
- * \ingroup simix_process_management
- * \brief Resumes a suspended process.
- *
- * This function resumes a suspended process by resuming the synchro
- * it was waiting for completion.
- *
- * \param process a SIMIX process
- */
-void simcall_process_resume(smx_process_t process)
-{
- simcall_BODY_process_resume(process);
-}
-
/**
* \ingroup simix_process_management
* \brief Returns the amount of SIMIX processes in the system
*
* Maestro internal process is not counted, only user code processes are
*/
-int simcall_process_count(void)
+int simcall_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.
- * \param process a SIMIX process
- * \return the user data of this process
- */
-void* simcall_process_get_data(smx_process_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)
+void simcall_process_set_data(smx_actor_t process, void *data)
{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data));
+ simgrid::simix::kernelImmediate([process, data] { process->setUserData(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() || 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));
+ XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->getCname());
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) {
- 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 .
- *
- * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion.
- * \param process SIMIX process
- * \return 1, if the process is suspended, else 0.
- */
-int simcall_process_is_suspended(smx_process_t process)
-{
- return simcall_BODY_process_is_suspended(process);
-}
/**
* \ingroup simix_process_management
* \brief Return the properties
*
- * This functions returns the properties associated with this process
+ * This function 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);
+ return process->properties;
}
/**
* \ingroup simix_process_management
* \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);
}
-/**
- * \ingroup simix_process_management
- * \brief Sets the process to be auto-restarted or not by SIMIX when its host comes back up.
- * 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)
-{
- simcall_BODY_process_auto_restart_set(process, auto_restart);
-}
/**
* \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
return (e_smx_state_t) simcall_BODY_process_sleep(duration);
}
-/**
- * \ingroup simix_mbox_management
- * \brief Creates a new rendez-vous point
- * \param name The name of the rendez-vous point
- * \return The created rendez-vous point
- */
-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 nullptr if empty
- */
-smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
-{
-
- return mbox->comm_queue->empty()? nullptr:mbox->comm_queue->front();
-}
-
-void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
-{
- simcall_BODY_mbox_set_receiver(mbox, process);
-}
-
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_send(smx_process_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,
- double timeout)
+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*, simgrid::kernel::activity::CommImpl*),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout)
{
/* checking for infinite values */
xbt_assert(std::isfinite(task_size), "task_size is not finite!");
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr 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, nullptr, copy_data_fun, data, 0);
simcall_comm_wait(comm, timeout);
/**
* \ingroup simix_comm_management
*/
-smx_synchro_t simcall_comm_isend(smx_process_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 (*clean_fun)(void *),
- void (*copy_data_fun)(smx_synchro_t, void*, size_t),
- void *data,
- int detached)
+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*, simgrid::kernel::activity::CommImpl*),
+ void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t),
+ void* data, int detached)
{
/* checking for infinite values */
xbt_assert(std::isfinite(task_size), "task_size is not finite!");
/**
* \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 *data, double timeout, double rate)
+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*, simgrid::kernel::activity::CommImpl*),
+ 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!");
xbt_assert(mbox, "No rendez-vous point defined for recv");
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr 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);
/**
* \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),
- void *data, double rate)
+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*, simgrid::kernel::activity::CommImpl*),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate)
{
xbt_assert(mbox, "No rendez-vous point defined for irecv");
/**
* \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 (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data)
{
xbt_assert(mbox, "No rendez-vous point defined for iprobe");
- return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data);
+ return simcall_BODY_comm_iprobe(mbox, type, match_fun, data);
}
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_cancel(smx_synchro_t synchro)
+void simcall_comm_cancel(smx_activity_t synchro)
{
- simgrid::simix::kernelImmediate([synchro]{
- simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+ simgrid::simix::kernelImmediate([synchro] {
+ simgrid::kernel::activity::CommImplPtr comm =
+ boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(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);
* \brief Set the category of an synchro.
*
* This functions changes the category only. It calls a surf function.
- * \param execution The execution synchro
+ * \param synchro 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 == nullptr) {
return;
* \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_synchro_management
*
*/
-smx_mutex_t simcall_mutex_init(void)
+smx_mutex_t simcall_mutex_init()
{
- if(!simix_global) {
+ if (not 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
xbt_abort();
}
* \ingroup simix_synchro_management
*
*/
-smx_cond_t simcall_cond_init(void)
+smx_cond_t simcall_cond_init()
{
return simcall_BODY_cond_init();
}
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
+sg_size_t simcall_file_read(surf_file_t fd, sg_size_t size)
{
- return simcall_BODY_file_read(fd, size, host);
+ return simcall_BODY_file_read(fd, size);
}
/**
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
+sg_size_t simcall_file_write(surf_file_t fd, sg_size_t size)
{
- return simcall_BODY_file_write(fd, size, host);
-}
-
-/**
- * \ingroup simix_file_management
- * \brief
- */
-smx_file_t simcall_file_open(const char* fullpath, sg_host_t host)
-{
- return simcall_BODY_file_open(fullpath, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_close(smx_file_t fd, sg_host_t host)
-{
- return simcall_BODY_file_close(fd, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_unlink(smx_file_t fd, sg_host_t host)
-{
- return simcall_BODY_file_unlink(fd, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_get_size(smx_file_t fd){
- return simcall_BODY_file_get_size(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_tell(smx_file_t fd){
- return simcall_BODY_file_tell(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-xbt_dynar_t simcall_file_get_info(smx_file_t fd)
-{
- return simcall_BODY_file_get_info(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){
- return simcall_BODY_file_seek(fd, offset, origin);
-}
-
-/**
- * \ingroup simix_file_management
- * \brief Move a file to another location on the *same mount point*.
- *
- */
-int simcall_file_move(smx_file_t fd, const char* fullpath)
-{
- return simcall_BODY_file_move(fd, fullpath);
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the free space size on a given storage element.
- * \param storage a storage
- * \return Return the free space size on a given storage element (as sg_size_t)
- */
-sg_size_t simcall_storage_get_free_size (smx_storage_t storage){
- return simcall_BODY_storage_get_free_size(storage);
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the used space size on a given storage element.
- * \param storage a storage
- * \return Return the used space size on a given storage element (as sg_size_t)
- */
-sg_size_t simcall_storage_get_used_size (smx_storage_t storage){
- return simcall_BODY_storage_get_used_size(storage);
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns a dict of the properties assigned to a storage element.
- *
- * \param storage A storage element
- * \return The properties of this storage element
- */
-xbt_dict_t simcall_storage_get_properties(smx_storage_t storage)
-{
- return simcall_BODY_storage_get_properties(storage);
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns a dict containing the content of a storage element.
- *
- * \param storage A storage element
- * \return The content of this storage element as a dict (full path file => size)
- */
-xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
-{
- return simcall_BODY_storage_get_content(storage);
+ return simcall_BODY_file_write(fd, size);
}
void simcall_run_kernel(std::function<void()> const& code)
namespace simgrid {
namespace simix {
-void unblock(smx_process_t process)
+void unblock(smx_actor_t process)
{
xbt_assert(SIMIX_is_maestro());
SIMIX_simcall_answer(&process->simcall);
}
}
-}
\ No newline at end of file
+}
