req->call = REQ_HOST_GET_BY_NAME;
req->host_get_by_name.name = name;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_by_name.result;
}
req->call = REQ_HOST_GET_NAME;
req->host_get_name.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_name.result;
}
req->call = REQ_HOST_GET_PROPERTIES;
req->host_get_properties.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_properties.result;
}
req->call = REQ_HOST_GET_SPEED;
req->host_get_speed.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_speed.result;
}
req->call = REQ_HOST_GET_AVAILABLE_SPEED;
req->host_get_available_speed.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_available_speed.result;
}
req->call = REQ_HOST_GET_STATE;
req->host_get_state.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_state.result;
}
req->call = REQ_HOST_GET_DATA;
req->host_get_data.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_data.result;
}
req->call = REQ_HOST_SET_DATA;
req->host_set_data.host = host;
req->host_set_data.data = data;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/** \brief Creates an action that executes some computation of an host.
req->host_execute.host = host;
req->host_execute.computation_amount = computation_amount;
req->host_execute.priority = priority;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execute.result;
}
req->host_parallel_execute.communication_amount = communication_amount;
req->host_parallel_execute.amount = amount;
req->host_parallel_execute.rate = rate;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_parallel_execute.result;
}
req->call = REQ_HOST_EXECUTION_DESTROY;
req->host_execution_destroy.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_HOST_EXECUTION_CANCEL;
req->host_execution_cancel.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_HOST_EXECUTION_GET_REMAINS;
req->host_execution_get_remains.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execution_get_remains.result;
}
req->call = REQ_HOST_EXECUTION_GET_STATE;
req->host_execution_get_state.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execution_get_state.result;
}
req->call = REQ_HOST_EXECUTION_SET_PRIORITY;
req->host_execution_set_priority.execution = execution;
req->host_execution_set_priority.priority = priority;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_HOST_EXECUTION_WAIT;
req->host_execution_wait.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execution_wait.result;
}
req->process_create.argc = argc;
req->process_create.argv = argv;
req->process_create.properties = properties;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/** \brief Kills a SIMIX process.
req->call = REQ_PROCESS_KILL;
req->process_kill.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/** \brief Kills all SIMIX processes.
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_KILLALL;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/** \brief Cleans up a SIMIX process.
req->call = REQ_PROCESS_CLEANUP;
req->process_cleanup.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_PROCESS_CHANGE_HOST;
req->process_change_host.process = process;
req->process_change_host.dest = dest;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_PROCESS_SUSPEND;
req->process_suspend.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_PROCESS_RESUME;
req->process_resume.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_COUNT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_count.result;
}
/**
* \brief Return the user data of a #smx_process_t.
- *
- * This functions checks whether \a process is a valid pointer or not and return the user data associated to \a process if it is possible.
- * \param process SIMIX process
- * \return A void pointer to the user data
+ * \param process a SIMIX process
+ * \return the user data of this process
*/
void* SIMIX_req_process_get_data(smx_process_t process)
{
if (process == SIMIX_process_self()) {
/* avoid a request if this function is called by the process itself */
- return SIMIX_process_self_get_data();
+ return SIMIX_process_get_data(process);
}
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_GET_DATA;
req->process_get_data.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_data.result;
}
{
if (process == SIMIX_process_self()) {
/* avoid a request if this function is called by the process itself */
- SIMIX_process_self_set_data(data);
+ SIMIX_process_self_set_data(process, data);
}
else {
req->call = REQ_PROCESS_SET_DATA;
req->process_set_data.process = process;
req->process_set_data.data = data;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
}
req->call = REQ_PROCESS_GET_HOST;
req->process_get_host.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_host.result;
}
req->call = REQ_PROCESS_GET_NAME;
req->process_get_name.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_name.result;
}
req->call = REQ_PROCESS_IS_SUSPENDED;
req->process_is_suspended.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_is_suspended.result;
}
req->call = REQ_PROCESS_GET_PROPERTIES;
req->process_get_properties.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_properties.result;
}
req->call = REQ_PROCESS_SLEEP;
req->process_sleep.duration = duration;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_sleep.result;
}
req->call = REQ_RDV_CREATE;
req->rdv_create.name = name;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_create.result;
}
req->call = REQ_RDV_DESTROY;
req->rdv_destroy.rdv = rdv;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name)
smx_req_t req = SIMIX_req_mine();
req->call = REQ_RDV_GEY_BY_NAME;
req->rdv_get_by_name.name = name;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_get_by_name.result;*/
return SIMIX_rdv_get_by_name(name);
req->rdv_comm_count_by_host.rdv = rdv;
req->rdv_comm_count_by_host.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_comm_count_by_host.result;
}
req->call = REQ_RDV_GET_HEAD;
req->rdv_get_head.rdv = rdv;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_get_head.result;
}
if (MC_IS_ENABLED) {
/* the model-checker wants two separate requests */
smx_action_t comm = SIMIX_req_comm_isend(rdv, task_size, rate,
- src_buff, src_buff_size, match_fun, data, 0);
+ src_buff, src_buff_size, match_fun, NULL, data, 0);
SIMIX_req_comm_wait(comm, timeout);
}
else {
req->comm_send.data = data;
req->comm_send.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
}
smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate,
void *src_buff, size_t src_buff_size,
- int (*match_fun)(void *, void *), void *data,
+ int (*match_fun)(void *, void *),
+ void (*clean_fun)(void *),
+ void *data,
int detached)
{
/* checking for infinite values */
req->comm_isend.src_buff = src_buff;
req->comm_isend.src_buff_size = src_buff_size;
req->comm_isend.match_fun = match_fun;
+ req->comm_isend.clean_fun = clean_fun;
req->comm_isend.data = data;
req->comm_isend.detached = detached;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_isend.result;
}
req->comm_recv.data = data;
req->comm_recv.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
}
req->comm_irecv.match_fun = match_fun;
req->comm_irecv.data = data;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_irecv.result;
}
{
xbt_assert(comm, "Invalid parameter");
- /* FIXME remove this request type: comms are auto-destroyed now,
- * but what happens with unfinished comms? */
+ /* FIXME remove this request type: comms are auto-destroyed now */
/*
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_DESTROY;
req->comm_destroy.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
*/
}
req->call = REQ_COMM_CANCEL;
req->comm_cancel.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
unsigned int SIMIX_req_comm_waitany(xbt_dynar_t comms)
req->call = REQ_COMM_WAITANY;
req->comm_waitany.comms = comms;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_waitany.result;
}
int SIMIX_req_comm_testany(xbt_dynar_t comms)
{
smx_req_t req = SIMIX_req_mine();
- if (xbt_dynar_length(comms)==0)
+ if (xbt_dynar_is_empty(comms))
return -1;
req->call = REQ_COMM_TESTANY;
req->comm_testany.comms = comms;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_testany.result;
}
req->comm_wait.comm = comm;
req->comm_wait.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
#ifdef HAVE_TRACING
req->set_category.action = action;
req->set_category.category = category;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
#endif
req->call = REQ_COMM_TEST;
req->comm_test.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_test.result;
}
req->call = REQ_COMM_GET_REMAINS;
req->comm_get_remains.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_remains.result;
}
req->call = REQ_COMM_GET_STATE;
req->comm_get_state.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_state.result;
}
req->call = REQ_COMM_GET_SRC_DATA;
req->comm_get_src_data.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_src_data.result;
}
req->call = REQ_COMM_GET_DST_DATA;
req->comm_get_dst_data.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_dst_data.result;
}
req->call = REQ_COMM_GET_SRC_PROC;
req->comm_get_src_proc.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_src_proc.result;
}
req->call = REQ_COMM_GET_DST_PROC;
req->comm_get_dst_proc.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_dst_proc.result;
}
req->call = REQ_COMM_IS_LATENCY_BOUNDED;
req->comm_is_latency_bounded.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_is_latency_bounded.result;
}
#endif
req->call = REQ_MUTEX_INIT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->mutex_init.result;
}
req->call = REQ_MUTEX_DESTROY;
req->mutex_destroy.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_mutex_lock(smx_mutex_t mutex)
req->call = REQ_MUTEX_LOCK;
req->mutex_lock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_mutex_trylock(smx_mutex_t mutex)
req->call = REQ_MUTEX_TRYLOCK;
req->mutex_trylock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->mutex_trylock.result;
}
req->call = REQ_MUTEX_UNLOCK;
req->mutex_unlock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
req->call = REQ_COND_INIT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->cond_init.result;
}
req->call = REQ_COND_DESTROY;
req->cond_destroy.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_signal(smx_cond_t cond)
req->call = REQ_COND_SIGNAL;
req->cond_signal.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
req->cond_wait.cond = cond;
req->cond_wait.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_wait_timeout(smx_cond_t cond,
req->cond_wait_timeout.mutex = mutex;
req->cond_wait_timeout.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_broadcast(smx_cond_t cond)
req->call = REQ_COND_BROADCAST;
req->cond_broadcast.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
req->call = REQ_SEM_INIT;
req->sem_init.capacity = capacity;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_init.result;
}
req->call = REQ_SEM_DESTROY;
req->sem_destroy.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_sem_release(smx_sem_t sem)
req->call = REQ_SEM_RELEASE;
req->sem_release.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_sem_would_block(smx_sem_t sem)
req->call = REQ_SEM_WOULD_BLOCK;
req->sem_would_block.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_would_block.result;
}
req->call = REQ_SEM_ACQUIRE;
req->sem_acquire.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_sem_acquire_timeout(smx_sem_t sem, double timeout)
req->sem_acquire_timeout.sem = sem;
req->sem_acquire_timeout.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_sem_get_capacity(smx_sem_t sem)
req->call = REQ_SEM_GET_CAPACITY;
req->sem_get_capacity.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_get_capacity.result;
}
+
+void SIMIX_req_file_read(char* name)
+{
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_FILE_READ;
+ req->file_read.name = name;
+ SIMIX_request_push(req->issuer);
+
+}
+
/* ************************************************************************** */
/** @brief returns a printable string representing the request kind */
