From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 17 Dec 2010 08:38:50 +0000 (+0000)
Subject: kill pimples in SIMIX intended to make the stack-free context factory working: this... 
X-Git-Tag: v3.6_beta2~641
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/44e27d4d66f84c93eeb048d127f6b341c222b1e0

kill pimples in SIMIX intended to make the stack-free context factory working: this attempt was abandoned

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9282 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/include/simix/simix.h b/include/simix/simix.h
index d44e91663d..d73f296c29 100644
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -232,9 +232,5 @@ XBT_PUBLIC(int) SIMIX_req_sem_get_capacity(smx_sem_t sem);
 
 const char *SIMIX_request_name(int kind);
 
-/* functions to let the state machine context factory mess with simix flow */
-XBT_PUBLIC(void*) SIMIX_request_get_result(int id);
-XBT_PUBLIC(int) SIMIX_request_last_id(void);
-
 SG_END_DECL()
 #endif                          /* _SIMIX_SIMIX_H */
diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 4c04a1527b..e8eacda7af 100644
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -1041,179 +1041,6 @@ 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) {
   switch ((e_smx_req_t) kind) {