simdata->setUsed();
if (simdata->host_nb > 0) {
- simdata->compute = static_cast<simgrid::simix::Exec*>(
+ simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
simcall_execution_parallel_start(task->name, simdata->host_nb,simdata->host_list,
simdata->flops_parallel_amount, simdata->bytes_parallel_amount,
1.0, -1.0));
XBT_DEBUG("execute %s@%s with affinity(0x%04lx)",
MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask);
- simdata->compute = static_cast<simgrid::simix::Exec*>(
+ simdata->compute = static_cast<simgrid::kernel::activity::Exec*>(
simcall_execution_start(task->name, simdata->flops_amount, simdata->priority,
simdata->bound, affinity_mask));
}
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
- smx_synchro_t act = simcall_comm_isend(myself, mailbox, t_simdata->bytes_amount, t_simdata->rate,
+ smx_synchro_t act = simcall_comm_isend(myself, mailbox->getImpl(), t_simdata->bytes_amount, t_simdata->rate,
task, sizeof(void *), match_fun, cleanup, nullptr, match_data,detached);
- t_simdata->comm = static_cast<simgrid::simix::Comm*>(act);
+ t_simdata->comm = static_cast<simgrid::kernel::activity::Comm*>(act);
msg_comm_t comm = nullptr;
if (! detached) {
*/
msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rate)
{
- smx_mailbox_t rdv = MSG_mailbox_get_by_alias(name);
+ msg_mailbox_t mbox = MSG_mailbox_get_by_alias(name);
/* FIXME: these functions are not traceable */
/* Sanity check */
comm->task_sent = nullptr;
comm->task_received = task;
comm->status = MSG_OK;
- comm->s_comm = simcall_comm_irecv(MSG_process_self(), rdv, task, nullptr, nullptr, nullptr, nullptr, rate);
+ comm->s_comm = simcall_comm_irecv(MSG_process_self(), mbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, rate);
return comm;
}
int finished_index = -1;
/* Create the equivalent array with SIMIX objects: */
- std::vector<simgrid::simix::Synchro*> s_comms;
+ std::vector<simgrid::kernel::activity::Synchro*> s_comms;
s_comms.reserve(xbt_dynar_length(comms));
msg_comm_t comm;
unsigned int cursor;
*/
void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buff_size)
{
- simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
+ simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);
/* Try to send it by calling SIMIX network layer */
try {
smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */
- comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
+ comm = simcall_comm_isend(SIMIX_process_self(), mailbox->getImpl(),t_simdata->bytes_amount,
t_simdata->rate, task, sizeof(void *), nullptr, nullptr, nullptr, task, 0);
if (TRACE_is_enabled())
simcall_set_category(comm, task->category);
- t_simdata->comm = static_cast<simgrid::simix::Comm*>(comm);
+ t_simdata->comm = static_cast<simgrid::kernel::activity::Comm*>(comm);
simcall_comm_wait(comm, timeout);
}
catch (xbt_ex& e) {
*/
int MSG_task_listen(const char *alias)
{
- smx_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
+ msg_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
return !MSG_mailbox_is_empty(mbox) ||
- (mbox->permanent_receiver && !mbox->done_comm_queue.empty());
+ (mbox->getImpl()->permanent_receiver && !mbox->getImpl()->done_comm_queue.empty());
}
/** \ingroup msg_task_usage
int MSG_task_listen_from(const char *alias)
{
msg_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
- simgrid::simix::Comm* comm = static_cast<simgrid::simix::Comm*>(simcall_mbox_front(mbox));
+ simgrid::kernel::activity::Comm* comm = static_cast<simgrid::kernel::activity::Comm*>(simcall_mbox_front(mbox->getImpl()));
if (!comm)
return -1;