#include <functional>
+#include <xbt/functional.hpp>
+
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
void simcall_call(smx_process_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 {
/* 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);
}
-/**
- * \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);
-}
-
/**
* \ingroup simix_process_management
* \brief Cancels an execution synchro.
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.
*
* 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 name a name for the process. It is for user-level information and can be nullptr.
* \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.
+ * \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 nullptr.
* 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
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);
+ if (name == nullptr)
+ name = "";
+ auto wrapped_code = simgrid::xbt::wrapMain(code, argc, argv);
+ for (int i = 0; i != argc; ++i)
+ xbt_free(argv[i]);
+ xbt_free(argv);
+ smx_process_t res = simcall_process_create(name,
+ std::move(wrapped_code),
+ data, hostname, kill_time, properties, auto_restart);
+ return res;
}
/**
simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
}
-static void kill_process_from_timer(void* arg)
-{
- smx_process_t process = (smx_process_t) arg;
- simix_global->kill_process_function(process);
- process->kill_timer=NULL;
-}
-
/**
* \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)
{
- 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
* \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
+ * \return The communication or nullptr if empty
*/
-smx_synchro_t simcall_mbox_get_head(smx_mailbox_t mbox)
+smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
{
- return simcall_BODY_mbox_get_head(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);
}
-smx_process_t simcall_mbox_get_receiver(smx_mailbox_t mbox)
-{
- return simcall_BODY_mbox_get_receiver(mbox);
-}
-
/**
* \ingroup simix_comm_management
*/
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_synchro_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,
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_synchro_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,
*/
void simcall_set_category(smx_synchro_t synchro, const char *category)
{
- if (category == NULL) {
+ if (category == nullptr) {
return;
}
simcall_BODY_set_category(synchro, category);
return simcall_BODY_comm_test(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
*
void simcall_run_kernel(std::function<void()> const& code)
{
- return simcall_BODY_run_kernel((void*) &code);
+ return simcall_BODY_run_kernel(&code);
}
int simcall_mc_random(int min, int max) {
