#include "private.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 */
+SIMIX_REQ_LIST
+#undef SIMIX_REQ_ENUM_ELEMENT
+};
+
/**
* \brief Returns a host given its name.
*
* \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;
}
*
* \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 returns a printable string representing the request kind */
const char *SIMIX_request_name(int kind) {
- switch ((e_smx_req_t) kind) {
- case REQ_NO_REQ: return "REQ_NO_REQ";
- case REQ_HOST_GET_BY_NAME: return "REQ_HOST_GET_BY_NAME";
- case REQ_HOST_GET_NAME: return "REQ_HOST_GET_NAME";
- case REQ_HOST_GET_PROPERTIES: return "REQ_HOST_GET_PROPERTIES";
- case REQ_HOST_GET_SPEED: return "REQ_HOST_GET_SPEED";
- case REQ_HOST_GET_AVAILABLE_SPEED: return "REQ_HOST_GET_AVAILABLE_SPEED";
- case REQ_HOST_GET_STATE: return "REQ_HOST_GET_STATE";
- case REQ_HOST_GET_DATA: return "REQ_HOST_GET_DATA";
- case REQ_HOST_SET_DATA: return "REQ_HOST_SET_DATA";
- case REQ_HOST_EXECUTE: return "REQ_HOST_EXECUTE";
- case REQ_HOST_PARALLEL_EXECUTE: return "REQ_HOST_PARALLEL_EXECUTE";
- case REQ_HOST_EXECUTION_DESTROY: return "REQ_HOST_EXECUTION_DESTROY";
- case REQ_HOST_EXECUTION_CANCEL: return "REQ_HOST_EXECUTION_CANCEL";
- case REQ_HOST_EXECUTION_GET_REMAINS: return "REQ_HOST_EXECUTION_GET_REMAINS";
- case REQ_HOST_EXECUTION_GET_STATE: return "REQ_HOST_EXECUTION_GET_STATE";
- case REQ_HOST_EXECUTION_SET_PRIORITY: return "REQ_HOST_EXECUTION_SET_PRIORITY";
- case REQ_HOST_EXECUTION_WAIT: return "REQ_HOST_EXECUTION_WAIT";
- case REQ_PROCESS_CREATE: return "REQ_PROCESS_CREATE";
- case REQ_PROCESS_KILL: return "REQ_PROCESS_KILL";
- case REQ_PROCESS_CHANGE_HOST: return "REQ_PROCESS_CHANGE_HOST";
- case REQ_PROCESS_SUSPEND: return "REQ_PROCESS_SUSPEND";
- case REQ_PROCESS_RESUME: return "REQ_PROCESS_RESUME";
- case REQ_PROCESS_COUNT: return "REQ_PROCESS_COUNT";
- case REQ_PROCESS_GET_DATA: return "REQ_PROCESS_GET_DATA";
- case REQ_PROCESS_SET_DATA: return "REQ_PROCESS_SET_DATA";
- case REQ_PROCESS_GET_HOST: return "REQ_PROCESS_GET_HOST";
- case REQ_PROCESS_GET_NAME: return "REQ_PROCESS_GET_NAME";
- case REQ_PROCESS_IS_SUSPENDED: return "REQ_PROCESS_IS_SUSPENDED";
- case REQ_PROCESS_GET_PROPERTIES: return "REQ_PROCESS_GET_PROPERTIES";
- case REQ_PROCESS_SLEEP: return "REQ_PROCESS_SLEEP";
- case REQ_RDV_CREATE: return "REQ_RDV_CREATE";
- case REQ_RDV_DESTROY: return "REQ_RDV_DESTROY";
- case REQ_RDV_GEY_BY_NAME: return "REQ_RDV_GEY_BY_NAME";
- case REQ_RDV_COMM_COUNT_BY_HOST: return "REQ_RDV_COMM_COUNT_BY_HOST";
- case REQ_RDV_GET_HEAD: return "REQ_RDV_GET_HEAD";
- case REQ_COMM_ISEND: return "REQ_COMM_ISEND";
- case REQ_COMM_IRECV: return "REQ_COMM_IRECV";
- case REQ_COMM_DESTROY: return "REQ_COMM_DESTROY";
- case REQ_COMM_CANCEL: return "REQ_COMM_CANCEL";
- case REQ_COMM_WAITANY: return "REQ_COMM_WAITANY";
- case REQ_COMM_TESTANY: return "REQ_COMM_TESTANY";
- case REQ_COMM_WAIT: return "REQ_COMM_WAIT";
-
-#ifdef HAVE_TRACING
- case REQ_SET_CATEGORY: return "REQ_SET_CATEGORY";
-#endif
-
- case REQ_COMM_TEST: return "REQ_COMM_TEST";
- case REQ_COMM_GET_REMAINS: return "REQ_COMM_GET_REMAINS";
- case REQ_COMM_GET_STATE: return "REQ_COMM_GET_STATE";
- case REQ_COMM_GET_SRC_DATA: return "REQ_COMM_GET_SRC_DATA";
- case REQ_COMM_GET_DST_DATA: return "REQ_COMM_GET_DST_DATA";
- case REQ_COMM_GET_SRC_BUFF: return "REQ_COMM_GET_SRC_BUFF";
- case REQ_COMM_GET_DST_BUFF: return "REQ_COMM_GET_DST_BUFF";
- case REQ_COMM_GET_SRC_BUFF_SIZE: return "REQ_COMM_GET_SRC_BUFF_SIZE";
- case REQ_COMM_GET_DST_BUFF_SIZE: return "REQ_COMM_GET_DST_BUFF_SIZE";
- case REQ_COMM_GET_SRC_PROC: return "REQ_COMM_GET_SRC_PROC";
- case REQ_COMM_GET_DST_PROC: return "REQ_COMM_GET_DST_PROC";
-
- #ifdef HAVE_LATENCY_BOUND_TRACKING
- case REQ_COMM_IS_LATENCY_BOUNDED: return "REQ_COMM_IS_LATENCY_BOUNDED";
- #endif
-
- case REQ_MUTEX_INIT: return "REQ_MUTEX_INIT";
- case REQ_MUTEX_DESTROY: return "REQ_MUTEX_DESTROY";
- case REQ_MUTEX_LOCK: return "REQ_MUTEX_LOCK";
- case REQ_MUTEX_UNLOCK: return "REQ_MUTEX_UNLOCK";
- case REQ_MUTEX_TRYLOCK: return "REQ_MUTEX_TRYLOCK";
-
- case REQ_COND_INIT: return "REQ_COND_INIT";
- case REQ_COND_DESTROY: return "REQ_COND_DESTROY";
- case REQ_COND_SIGNAL: return "REQ_COND_SIGNAL";
- case REQ_COND_WAIT: return "REQ_COND_WAIT";
- case REQ_COND_WAIT_TIMEOUT: return "REQ_COND_WAIT_TIMEOUT";
- case REQ_COND_BROADCAST: return "REQ_COND_BROADCAST";
-
- case REQ_SEM_INIT: return "REQ_SEM_INIT";
- case REQ_SEM_DESTROY: return "REQ_SEM_DESTROY";
- case REQ_SEM_RELEASE: return "REQ_SEM_RELEASE";
- case REQ_SEM_ACQUIRE: return "REQ_SEM_ACQUIRE";
- case REQ_SEM_ACQUIRE_TIMEOUT: return "REQ_SEM_ACQUIRE_TIMEOUT";
- case REQ_SEM_WOULD_BLOCK: return "REQ_SEM_WOULD_BLOCK";
- case REQ_SEM_GET_CAPACITY: return "REQ_SEM_GET_CAPACITY";
- }
- THROW_IMPOSSIBLE;
+ return request_names[kind];
}
