#include "private.h"
+#include "mc/mc.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
static const char* request_names[] = {
+#undef SIMIX_REQ_ENUM_ELEMENT
#define SIMIX_REQ_ENUM_ELEMENT(x) #x /* generate strings from the enumeration values */
-#include "smx_req_enum.h"
+SIMIX_REQ_LIST
#undef SIMIX_REQ_ENUM_ELEMENT
};
* \return A new SIMIX execution action
*/
smx_action_t SIMIX_req_host_execute(const char *name, smx_host_t host,
- double computation_amount)
+ double computation_amount,
+ double priority)
{
smx_req_t req = SIMIX_req_mine();
req->host_execute.name = name;
req->host_execute.host = host;
req->host_execute.computation_amount = computation_amount;
+ req->host_execute.priority = priority;
SIMIX_request_push();
return req->host_execute.result;
}
}
/**
- * \brief Waits for the completion of an execution action.
+ * \brief Waits for the completion of an execution action and destroy it.
*
* \param execution The execution action
*/
-void SIMIX_req_host_execution_wait(smx_action_t execution)
+e_smx_state_t SIMIX_req_host_execution_wait(smx_action_t execution)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_HOST_EXECUTION_WAIT;
req->host_execution_wait.execution = execution;
SIMIX_request_push();
+ return req->host_execution_wait.result;
}
/**
* \brief Creates and runs a new SIMIX process.
*
- * The structure and the corresponding threada are created and put in the list of ready processes.
+ * The structure and the corresponding thread are created and put in the list of ready processes.
*
+ * \param process the process created will be stored in this pointer
* \param name a name for the process. It is for user-level information and can be NULL.
* \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 argc first argument passed to \a code
* \param argv second argument passed to \a code
* \param properties the properties of the process
- * \return The new process
*/
-smx_process_t SIMIX_req_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- int argc, char **argv,
- xbt_dict_t properties)
+void SIMIX_req_process_create(smx_process_t *process, const char *name,
+ xbt_main_func_t code,
+ void *data,
+ const char *hostname,
+ int argc, char **argv,
+ xbt_dict_t properties)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_CREATE;
+ req->process_create.process = process;
req->process_create.name = name;
req->process_create.code = code;
req->process_create.data = data;
req->process_create.argv = argv;
req->process_create.properties = properties;
SIMIX_request_push();
- return req->process_create.result;
}
/** \brief Kills a SIMIX process.
*/
void SIMIX_req_process_suspend(smx_process_t process)
{
+ xbt_assert0(process, "Invalid parameters");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_SUSPEND;
smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name)
{
xbt_assert0(name != NULL, "Invalid parameter for SIMIX_req_rdv_get_by_name (name is NULL)");
- smx_req_t req = SIMIX_req_mine();
+ /* FIXME: this is a horrible lost of performance, so we hack it out by
+ * skipping the request (for now). It won't work on distributed but
+ * probably we will change MSG for that. */
+/*
+ smx_req_t req = SIMIX_req_mine();
req->call = REQ_RDV_GEY_BY_NAME;
req->rdv_get_by_name.name = name;
SIMIX_request_push();
- return req->rdv_get_by_name.result;
+ return req->rdv_get_by_name.result;*/
+
+ return SIMIX_rdv_get_by_name(name);
}
/**
return req->rdv_get_head.result;
}
+void SIMIX_req_comm_send(smx_rdv_t rdv, double task_size, double rate,
+ void *src_buff, size_t src_buff_size,
+ int (*match_fun)(void *, void *), void *data,
+ double timeout)
+{
+ xbt_assert0(rdv, "No rendez-vous point defined for send");
+
+ 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);
+ SIMIX_req_comm_wait(comm, timeout);
+ }
+ else {
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_COMM_SEND;
+ req->comm_send.rdv = rdv;
+ req->comm_send.task_size = task_size;
+ req->comm_send.rate = rate;
+ req->comm_send.src_buff = src_buff;
+ req->comm_send.src_buff_size = src_buff_size;
+ req->comm_send.match_fun = match_fun;
+ req->comm_send.data = data;
+ req->comm_send.timeout = timeout;
+
+ SIMIX_request_push();
+ }
+}
+
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 *data,
+ int detached)
{
- smx_req_t req = SIMIX_req_mine();
-
xbt_assert0(rdv, "No rendez-vous point defined for isend");
+ smx_req_t req = SIMIX_req_mine();
+
req->call = REQ_COMM_ISEND;
req->comm_isend.rdv = rdv;
req->comm_isend.task_size = task_size;
req->comm_isend.src_buff_size = src_buff_size;
req->comm_isend.match_fun = match_fun;
req->comm_isend.data = data;
+ req->comm_isend.detached = detached;
SIMIX_request_push();
return req->comm_isend.result;
}
+void SIMIX_req_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
+ int (*match_fun)(void *, void *), void *data, double timeout)
+{
+ xbt_assert0(rdv, "No rendez-vous point defined for recv");
+
+ if (MC_IS_ENABLED) {
+ /* the model-checker wants two separate requests */
+ smx_action_t comm = SIMIX_req_comm_irecv(rdv, dst_buff, dst_buff_size,
+ match_fun, data);
+ SIMIX_req_comm_wait(comm, timeout);
+ }
+ else {
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_COMM_RECV;
+ req->comm_recv.rdv = rdv;
+ req->comm_recv.dst_buff = dst_buff;
+ req->comm_recv.dst_buff_size = dst_buff_size;
+ req->comm_recv.match_fun = match_fun;
+ req->comm_recv.data = data;
+ req->comm_recv.timeout = timeout;
+
+ SIMIX_request_push();
+ }
+}
+
smx_action_t SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
- int (*match_fun)(void *, void *), void *data)
+ int (*match_fun)(void *, void *), void *data)
{
- smx_req_t req = SIMIX_req_mine();
+ xbt_assert0(rdv, "No rendez-vous point defined for irecv");
- xbt_assert0(rdv, "No rendez-vous point defined for isend");
+ smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_IRECV;
req->comm_irecv.rdv = rdv;
void SIMIX_req_comm_destroy(smx_action_t comm)
{
+ xbt_assert0(comm, "Invalid parameter");
+
+ /* FIXME remove this request type: comms are auto-destroyed now,
+ * but what happens with unfinished comms? */
+
+ /*
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_DESTROY;
req->comm_destroy.comm = comm;
SIMIX_request_push();
+ */
}
void SIMIX_req_comm_cancel(smx_action_t comm)
return req->comm_get_dst_data.result;
}
-void *SIMIX_req_comm_get_src_buff(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_SRC_BUFF;
- req->comm_get_src_buff.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_src_buff.result;
-}
-
-void *SIMIX_req_comm_get_dst_buff(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_DST_BUFF;
- req->comm_get_dst_buff.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_dst_buff.result;
-}
-
-size_t SIMIX_req_comm_get_src_buff_size(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_SRC_BUFF_SIZE;
- req->comm_get_src_buff_size.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_src_buff_size.result;
-}
-
-size_t SIMIX_req_comm_get_dst_buff_size(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_DST_BUFF_SIZE;
- req->comm_get_dst_buff_size.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_dst_buff_size.result;
-}
-
smx_process_t SIMIX_req_comm_get_src_proc(smx_action_t comm)
{
smx_req_t req = SIMIX_req_mine();
