X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f884c941c776c6be4e98fb19c75b056397f1c17..31b7fa457f9267af8eda2eee06aae74dd78eb412:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 4c04a1527b..309624688c 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,24 +279,26 @@ 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; } /** * \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. @@ -295,18 +307,18 @@ void SIMIX_req_host_execution_wait(smx_action_t execution) * \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; @@ -315,7 +327,6 @@ smx_process_t SIMIX_req_process_create(const char *name, req->process_create.argv = argv; req->process_create.properties = properties; SIMIX_request_push(); - return req->process_create.result; } /** \brief Kills a SIMIX process. @@ -363,6 +374,8 @@ void SIMIX_req_process_change_host(smx_process_t process, const char *source, co */ 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; @@ -553,12 +566,19 @@ void SIMIX_req_rdv_destroy(smx_rdv_t rdv) smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name) { - smx_req_t req = SIMIX_req_mine(); + xbt_assert0(name != NULL, "Invalid parameter for SIMIX_req_rdv_get_by_name (name is NULL)"); + /* 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); } /** @@ -598,7 +618,8 @@ smx_action_t SIMIX_req_rdv_get_head(smx_rdv_t rdv) 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(); @@ -612,6 +633,7 @@ smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate, 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; @@ -637,6 +659,9 @@ smx_action_t SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_bu void SIMIX_req_comm_destroy(smx_action_t comm) { + xbt_assert0(comm, "Invalid parameter"); + + /* FIXME remove this request type (auto-destroy finished comms) */ smx_req_t req = SIMIX_req_mine(); req->call = REQ_COMM_DESTROY; @@ -1041,265 +1066,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) { - 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]; }