#include "xbt/ex.h"
#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
-#include "src/simix/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
#include <simgrid/simix.hpp>
* \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)
{
* \param rate the SURF action rate
* \return A new SIMIX execution synchronization
*/
-smx_synchro_t simcall_execution_parallel_start(const char *name,
+smx_activity_t simcall_execution_parallel_start(const char *name,
int host_nb,
sg_host_t *host_list,
double *flops_amount,
* 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);
}
* \param host Host
* \param mask Affinity mask
*/
-void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
+void simcall_execution_set_affinity(smx_activity_t execution, sg_host_t host, unsigned long mask)
{
simcall_BODY_execution_set_affinity(execution, host, mask);
}
*
* \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);
}
*/
void simcall_vm_start(sg_host_t vm)
{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
}
/**
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
*
* 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.
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 .
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);
*/
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,
+ 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 */
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,
+smx_activity_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),
+ 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)
{
* \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),
+ 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!");
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),
+smx_activity_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_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");
/**
* \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");
/**
* \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::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(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);
* \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 == 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) {
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
* \ingroup simix_synchro_management
*
*/
-smx_cond_t simcall_cond_init(void)
+smx_cond_t simcall_cond_init()
{
return simcall_BODY_cond_init();
}
}
}
-}
\ No newline at end of file
+}
