X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d27a1e82ea26521deee4ab0bab6543ab4339da9..e2b930ee430830d0be797be083a0bdd124778e7f:/src/simix/smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 7c39d30260..033d4cabdf 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1,6 +1,14 @@
 #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.
  *
@@ -142,7 +150,8 @@ void SIMIX_req_host_set_data(smx_host_t host, void *data)
  * \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();
 
@@ -150,6 +159,7 @@ smx_action_t SIMIX_req_host_execute(const char *name, smx_host_t host,
   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;
 }
@@ -269,17 +279,18 @@ void SIMIX_req_host_execution_set_priority(smx_action_t execution, double priori
 }
 
 /**
- * \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;
 }
 
 /**
@@ -553,6 +564,7 @@ void SIMIX_req_rdv_destroy(smx_rdv_t rdv)
 
 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();
 
   req->call = REQ_RDV_GEY_BY_NAME;
@@ -700,6 +712,10 @@ void SIMIX_req_comm_wait(smx_action_t comm, double timeout)
  */
 void SIMIX_req_set_category(smx_action_t action, const char *category)
 {
+  if (category == NULL) {
+    return;
+  }
+
   smx_req_t req = SIMIX_req_mine();
 
   req->call = REQ_SET_CATEGORY;
@@ -1037,176 +1053,7 @@ int SIMIX_req_sem_get_capacity(smx_sem_t sem)
 }
 /* ************************************************************************** */
 
-/** @brief gets the result of previous syscall
- *
- * This function is only useful in state machine mechanism.
- *
- * In this case, the execution of every SIMIX_req_* function above was cut at
- *   SIMIX_request_push(), which calls yield() which calls suspend(), which longjmp
- *   to the point right before running the user code. When the control is passed
- *   back to the user, he needs to get the result of the syscall he did.
- * That is why this function is made for.
- *
- * To extend this function, simply make sure that the end of the SIMIX_req_*
- * function matches what is written in this big switch
- */
-void *SIMIX_request_get_result(int kind) {
-  smx_req_t req = SIMIX_req_mine();
-  switch ((e_smx_req_t) kind) {
-  case REQ_NO_REQ:
-    xbt_die("There is no request waiting, cannot provide the result");
-  case REQ_HOST_GET_BY_NAME:
-    return req->host_get_by_name.result;
-  case REQ_HOST_GET_NAME:
-    return (void*)req->host_get_name.result;
-  case REQ_HOST_GET_PROPERTIES:
-    return req->host_get_properties.result;
-  case REQ_HOST_GET_SPEED:
-    return &req->host_get_speed.result; /* double */
-  case REQ_HOST_GET_AVAILABLE_SPEED:
-    return &req->host_get_available_speed.result; /* double */
-  case REQ_HOST_GET_STATE:
-    return &req->host_get_state.result; /* int */
-  case REQ_HOST_GET_DATA:
-    return req->host_get_data.result;
-  case REQ_HOST_SET_DATA:
-    return NULL; /* void */
-  case REQ_HOST_EXECUTE:
-    return req->host_execute.result;
-  case REQ_HOST_PARALLEL_EXECUTE:
-    return req->host_parallel_execute.result;
-  case REQ_HOST_EXECUTION_DESTROY:
-    return NULL; /* void */
-  case REQ_HOST_EXECUTION_CANCEL:
-    return NULL; /* void */
-  case REQ_HOST_EXECUTION_GET_REMAINS:
-    return &req->host_execution_get_remains.result; /* double */
-  case REQ_HOST_EXECUTION_GET_STATE:
-    return &req->host_execution_get_state.result; /* e_smx_state_t */
-  case REQ_HOST_EXECUTION_SET_PRIORITY:
-    return NULL; /* void */
-  case REQ_HOST_EXECUTION_WAIT:
-    return NULL; /* void */
-  case REQ_PROCESS_CREATE:
-    return req->process_create.result;
-  case REQ_PROCESS_KILL:
-      return NULL; /* void */
-  case REQ_PROCESS_CHANGE_HOST:
-      return NULL; /* void */
-  case REQ_PROCESS_SUSPEND:
-      return NULL; /* void */
-  case REQ_PROCESS_RESUME:
-      return NULL; /* void */
-  case REQ_PROCESS_COUNT:
-    return &req->process_count.result; /* int */
-  case REQ_PROCESS_GET_DATA:
-    return req->process_get_data.result;
-  case REQ_PROCESS_SET_DATA:
-    return NULL; /* void */
-  case REQ_PROCESS_GET_HOST:
-    return req->process_get_host.result;
-  case REQ_PROCESS_GET_NAME:
-    return (void*)req->process_get_name.result;
-  case REQ_PROCESS_IS_SUSPENDED:
-    return &req->process_is_suspended.result; /* int */
-  case REQ_PROCESS_GET_PROPERTIES:
-    return req->process_get_properties.result;
-  case REQ_PROCESS_SLEEP:
-    return &req->process_sleep.result; /* e_smx_state_t */
-  case REQ_RDV_CREATE:
-    return req->rdv_create.result;
-  case REQ_RDV_DESTROY:
-    return NULL; /* void */
-  case REQ_RDV_GEY_BY_NAME:
-    return req->rdv_get_by_name.result;
-  case REQ_RDV_COMM_COUNT_BY_HOST:
-    return &req->rdv_comm_count_by_host.result; /* int */
-  case REQ_RDV_GET_HEAD:
-    return req->rdv_get_head.result;
-  case REQ_COMM_ISEND:
-    return req->comm_isend.result;
-  case REQ_COMM_IRECV:
-    return req->comm_irecv.result;
-  case REQ_COMM_DESTROY:
-  case REQ_COMM_CANCEL:
-    return NULL; /* void */
-  case REQ_COMM_WAITANY:
-    return &req->comm_waitany.result;
-  case REQ_COMM_TESTANY:
-    return &req->comm_testany.result;
-  case REQ_COMM_WAIT:
-    return NULL; /* void */
-
-#ifdef HAVE_TRACING
-  case REQ_SET_CATEGORY:
-    return NULL; /* void */
-#endif
-
-  case REQ_COMM_TEST:
-    return &req->comm_test.result; /* int */
-  case REQ_COMM_GET_REMAINS:
-    return &req->comm_get_remains.result; /* double */
-  case REQ_COMM_GET_STATE:
-    return &req->comm_get_state.result; /* e_smx_state_t */
-  case REQ_COMM_GET_SRC_DATA:
-    return req->comm_get_src_data.result;
-  case REQ_COMM_GET_DST_DATA:
-    return req->comm_get_dst_data.result;
-  case REQ_COMM_GET_SRC_BUFF:
-    return req->comm_get_src_buff.result;
-  case REQ_COMM_GET_DST_BUFF:
-    return req->comm_get_dst_buff.result;
-  case REQ_COMM_GET_SRC_BUFF_SIZE:
-    return &req->comm_get_src_buff_size.result; /* size_t */
-  case REQ_COMM_GET_DST_BUFF_SIZE:
-    return &req->comm_get_dst_buff_size.result; /* size_t */
-  case REQ_COMM_GET_SRC_PROC:
-    return req->comm_get_src_proc.result;
-  case REQ_COMM_GET_DST_PROC:
-    return req->comm_get_dst_proc.result;
-
-  #ifdef HAVE_LATENCY_BOUND_TRACKING
-  case REQ_COMM_IS_LATENCY_BOUNDED:
-    return &req->comm_is_latency_bounded.result; /* int */
-  #endif
-
-  case REQ_MUTEX_INIT:
-    return req->mutex_init.result;
-  case REQ_MUTEX_DESTROY:
-  case REQ_MUTEX_LOCK:
-  case REQ_MUTEX_UNLOCK:
-    return NULL; /* void */
-
-  case REQ_MUTEX_TRYLOCK:
-    return &req->mutex_trylock.result; /* int */
-
-  case REQ_COND_INIT:
-    return req->cond_init.result;
-  case REQ_COND_DESTROY:
-  case REQ_COND_SIGNAL:
-  case REQ_COND_WAIT:
-  case REQ_COND_WAIT_TIMEOUT:
-  case REQ_COND_BROADCAST:
-    return NULL; /* void */
-
-  case REQ_SEM_INIT:
-    return req->sem_init.result;
-  case REQ_SEM_DESTROY:
-  case REQ_SEM_RELEASE:
-  case REQ_SEM_ACQUIRE:
-  case REQ_SEM_ACQUIRE_TIMEOUT:
-    return NULL; /* void */
-
-  case REQ_SEM_WOULD_BLOCK:
-    return &req->sem_would_block.result; /* int */
-  case REQ_SEM_GET_CAPACITY:
-    return &req->sem_get_capacity.result; /* int */
-  }
-  THROW_IMPOSSIBLE;
-}
-/** @brief returns the id of the lastly done syscall
- * Mainly (only?) useful for statemachine contextes
- */
-int SIMIX_request_last_id() {
-  return SIMIX_req_mine()->call;
+/** @brief returns a printable string representing the request kind */
+const char *SIMIX_request_name(int kind) {
+  return request_names[kind];
 }