X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b594a866f10f658d725664edb02ab7c0994ae805..00d29bad30ebbbbcc85ddfbcfc2312883f6527f5:/src/simix/smx_smurf.c diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index 889543f810..60a1bb86ad 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -5,96 +5,241 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix, "Logging specific to SIMIX (SMURF)"); -static smx_req_t* req_vector=NULL; +/* Tables with the requests to handle at the end of this round of scheduling + * user processes. There is one for each thread of execution. */ +static xbt_swag_t *req_lists; void SIMIX_request_init(void) { - req_vector = xbt_new0(smx_req_t,1);/* enough room for maestro's requests */ + s_smx_req_t req; + int i, nthreads = SIMIX_context_get_nthreads(); + + req_lists = xbt_new0(xbt_swag_t, nthreads); + for(i=0; i < nthreads; i++) + req_lists[i] = xbt_swag_new(xbt_swag_offset(req, reqtable_hookup)); + } void SIMIX_request_destroy(void) { - free(req_vector); - req_vector = NULL; + int i, nthreads = SIMIX_context_get_nthreads(); + + for(i=0; i < nthreads; i++) + xbt_swag_free(req_lists[i]); + + xbt_free(req_lists); } -void SIMIX_request_push(smx_req_t req) +xbt_swag_t SIMIX_request_get_reqlist(int thread_pid) { - req->issuer = SIMIX_process_self(); - if (req->issuer != simix_global->maestro_process){ - req_vector[req->issuer->pid] = req; - req->issuer->request = req; - DEBUG2("Yield process '%s' on request of type %d", req->issuer->name, req->call); + return req_lists[thread_pid]; +} + +/* FIXME: we may want to save the initialization of issuer... */ +XBT_INLINE smx_req_t SIMIX_req_mine() { + smx_process_t issuer = SIMIX_process_self(); + return &issuer->request; +} + +void SIMIX_request_push() +{ + xbt_swag_t req_table; + smx_process_t issuer = SIMIX_process_self(); + + if (issuer != simix_global->maestro_process){ + issuer->request.issuer = issuer; + req_table = SIMIX_request_get_reqlist(SIMIX_context_get_thread_id()); + + xbt_swag_insert_at_tail(&issuer->request, req_table); + + DEBUG3("Pushed request %s (%d) of %s", + SIMIX_request_name(issuer->request.call), issuer->request.call, + issuer->name); + + DEBUG3("Yield process '%s' on request of type %s (%d)", issuer->name, + SIMIX_request_name(issuer->request.call), issuer->request.call); SIMIX_process_yield(); } else { - SIMIX_request_pre(req); + SIMIX_request_pre(&issuer->request, 0); } } smx_req_t SIMIX_request_pop(void) { - smx_req_t request = NULL; int i; - for (i=1;iissuer->request.call), + req->issuer->request.call, + req->issuer->name); + return req; } + } - return request; + return NULL; } void SIMIX_request_answer(smx_req_t req) { if (req->issuer != simix_global->maestro_process){ - req->issuer->request = NULL; - xbt_swag_insert(req->issuer, simix_global->process_to_run); + DEBUG2("Answer request %s (%d)", SIMIX_request_name(req->call), req->call); + req->issuer->request.call = REQ_NO_REQ; + xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer); } } -int SIMIX_request_is_visible(smx_req_t req) +void SIMIX_request_pre(smx_req_t req, int value) { - return req->call == REQ_COMM_ISEND - || req->call == REQ_COMM_IRECV - || req->call == REQ_COMM_WAIT - || req->call == REQ_COMM_WAITANY - || req->call == REQ_COMM_TEST; -} + switch (req->call) { -int SIMIX_request_is_enabled(smx_req_t req) -{ - unsigned int index = 0; - smx_action_t act; + case REQ_COMM_TEST: + SIMIX_pre_comm_test(req); + break; - switch (req->call) { + case REQ_COMM_TESTANY: + SIMIX_pre_comm_testany(req, value); + break; case REQ_COMM_WAIT: - /* FIXME: check also that src and dst processes are not suspended */ - if (req->comm_wait.comm->comm.src_proc - && req->comm_wait.comm->comm.dst_proc) - return TRUE; - return FALSE; + SIMIX_pre_comm_wait(req, value); break; case REQ_COMM_WAITANY: - xbt_dynar_foreach(req->comm_waitany.comms, index, act) { - if (act->comm.src_proc && act->comm.dst_proc){ - return TRUE; - } - } - return FALSE; + SIMIX_pre_comm_waitany(req, value); break; - default: - return TRUE; - } -} + case REQ_COMM_ISEND: + req->comm_isend.result = SIMIX_comm_isend( + req->issuer, + req->comm_isend.rdv, + req->comm_isend.task_size, + req->comm_isend.rate, + req->comm_isend.src_buff, + req->comm_isend.src_buff_size, + req->comm_isend.match_fun, + req->comm_isend.data, + req->comm_isend.detached); + SIMIX_request_answer(req); + break; + case REQ_COMM_IRECV: + req->comm_irecv.result = SIMIX_comm_irecv( + req->issuer, + req->comm_irecv.rdv, + req->comm_irecv.dst_buff, + req->comm_irecv.dst_buff_size, + req->comm_irecv.match_fun, + req->comm_irecv.data); + SIMIX_request_answer(req); + break; -void SIMIX_request_pre(smx_req_t req) -{ - switch (req->call) { + case REQ_COMM_DESTROY: + SIMIX_comm_destroy(req->comm_destroy.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_CANCEL: + SIMIX_comm_cancel(req->comm_cancel.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_REMAINS: + req->comm_get_remains.result = + SIMIX_comm_get_remains(req->comm_get_remains.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_STATE: + req->comm_get_state.result = + SIMIX_comm_get_state(req->comm_get_state.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_SRC_DATA: + req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_DST_DATA: + req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_SRC_BUFF: + req->comm_get_src_buff.result = + SIMIX_comm_get_src_buff(req->comm_get_src_buff.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_DST_BUFF: + req->comm_get_dst_buff.result = + SIMIX_comm_get_dst_buff(req->comm_get_dst_buff.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_SRC_BUFF_SIZE: + req->comm_get_src_buff_size.result = + SIMIX_comm_get_src_buff_size(req->comm_get_src_buff_size.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_DST_BUFF_SIZE: + req->comm_get_dst_buff_size.result = + SIMIX_comm_get_dst_buff_size(req->comm_get_dst_buff_size.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_SRC_PROC: + req->comm_get_src_proc.result = + SIMIX_comm_get_src_proc(req->comm_get_src_proc.comm); + SIMIX_request_answer(req); + break; + + case REQ_COMM_GET_DST_PROC: + req->comm_get_dst_proc.result = + SIMIX_comm_get_dst_proc(req->comm_get_dst_proc.comm); + SIMIX_request_answer(req); + break; + +#ifdef HAVE_LATENCY_BOUND_TRACKING + case REQ_COMM_IS_LATENCY_BOUNDED: + req->comm_is_latency_bounded.result = + SIMIX_comm_is_latency_bounded(req->comm_is_latency_bounded.comm); + SIMIX_request_answer(req); + break; +#endif + + case REQ_RDV_CREATE: + req->rdv_create.result = SIMIX_rdv_create(req->rdv_create.name); + SIMIX_request_answer(req); + break; + + case REQ_RDV_DESTROY: + SIMIX_rdv_destroy(req->rdv_destroy.rdv); + SIMIX_request_answer(req); + break; + + case REQ_RDV_GEY_BY_NAME: + req->rdv_get_by_name.result = + SIMIX_rdv_get_by_name(req->rdv_get_by_name.name); + SIMIX_request_answer(req); + break; + + case REQ_RDV_COMM_COUNT_BY_HOST: + req->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host( + req->rdv_comm_count_by_host.rdv, + req->rdv_comm_count_by_host.host); + SIMIX_request_answer(req); + break; + + case REQ_RDV_GET_HEAD: + req->rdv_get_head.result = SIMIX_rdv_get_head(req->rdv_get_head.rdv); + SIMIX_request_answer(req); + break; case REQ_HOST_GET_BY_NAME: req->host_get_by_name.result = @@ -145,7 +290,8 @@ void SIMIX_request_pre(smx_req_t req) req->host_execute.result = SIMIX_host_execute( req->host_execute.name, req->host_execute.host, - req->host_execute.computation_amount); + req->host_execute.computation_amount, + req->host_execute.priority); SIMIX_request_answer(req); break; @@ -195,8 +341,8 @@ void SIMIX_request_pre(smx_req_t req) break; case REQ_PROCESS_CREATE: - req_vector = xbt_realloc(req_vector,sizeof(smx_req_t)*(SIMIX_process_get_maxpid()+2)); - req->process_create.result = SIMIX_process_create( + SIMIX_process_create( + req->process_create.process, req->process_create.name, req->process_create.code, req->process_create.data, @@ -273,150 +419,6 @@ void SIMIX_request_pre(smx_req_t req) SIMIX_pre_process_sleep(req); break; - case REQ_RDV_CREATE: - req->rdv_create.result = SIMIX_rdv_create(req->rdv_create.name); - SIMIX_request_answer(req); - break; - - case REQ_RDV_DESTROY: - SIMIX_rdv_destroy(req->rdv_destroy.rdv); - SIMIX_request_answer(req); - break; - - case REQ_RDV_GEY_BY_NAME: - req->rdv_get_by_name.result = - SIMIX_rdv_get_by_name(req->rdv_get_by_name.name); - SIMIX_request_answer(req); - break; - - case REQ_RDV_COMM_COUNT_BY_HOST: - req->rdv_comm_count_by_host.result = SIMIX_rdv_comm_count_by_host( - req->rdv_comm_count_by_host.rdv, - req->rdv_comm_count_by_host.host); - SIMIX_request_answer(req); - break; - - case REQ_RDV_GET_HEAD: - req->rdv_get_head.result = SIMIX_rdv_get_head(req->rdv_get_head.rdv); - SIMIX_request_answer(req); - break; - - case REQ_COMM_ISEND: - req->comm_isend.result = SIMIX_comm_isend( - req->issuer, - req->comm_isend.rdv, - req->comm_isend.task_size, - req->comm_isend.rate, - req->comm_isend.src_buff, - req->comm_isend.src_buff_size, - req->comm_isend.match_fun, - req->comm_isend.data); - SIMIX_request_answer(req); - break; - - case REQ_COMM_IRECV: - req->comm_irecv.result = SIMIX_comm_irecv( - req->issuer, - req->comm_irecv.rdv, - req->comm_irecv.dst_buff, - req->comm_irecv.dst_buff_size, - req->comm_irecv.match_fun, - req->comm_irecv.data); - SIMIX_request_answer(req); - break; - - case REQ_COMM_DESTROY: - SIMIX_comm_destroy(req->comm_destroy.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_CANCEL: - SIMIX_comm_cancel(req->comm_cancel.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_WAITANY: - SIMIX_pre_comm_waitany(req); - break; - - case REQ_COMM_WAIT: - SIMIX_pre_comm_wait(req); - break; - - case REQ_COMM_TEST: - SIMIX_pre_comm_test(req); - break; - - case REQ_COMM_TESTANY: - SIMIX_pre_comm_testany(req); - break; - - case REQ_COMM_GET_REMAINS: - req->comm_get_remains.result = - SIMIX_comm_get_remains(req->comm_get_remains.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_STATE: - req->comm_get_state.result = - SIMIX_comm_get_state(req->comm_get_state.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_SRC_DATA: - req->comm_get_src_data.result = SIMIX_comm_get_src_data(req->comm_get_src_data.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_DST_DATA: - req->comm_get_dst_data.result = SIMIX_comm_get_dst_data(req->comm_get_dst_data.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_SRC_BUFF: - req->comm_get_src_buff.result = - SIMIX_comm_get_src_buff(req->comm_get_src_buff.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_DST_BUFF: - req->comm_get_dst_buff.result = - SIMIX_comm_get_dst_buff(req->comm_get_dst_buff.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_SRC_BUFF_SIZE: - req->comm_get_src_buff_size.result = - SIMIX_comm_get_src_buff_size(req->comm_get_src_buff_size.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_DST_BUFF_SIZE: - req->comm_get_dst_buff_size.result = - SIMIX_comm_get_dst_buff_size(req->comm_get_dst_buff_size.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_SRC_PROC: - req->comm_get_src_proc.result = - SIMIX_comm_get_src_proc(req->comm_get_src_proc.comm); - SIMIX_request_answer(req); - break; - - case REQ_COMM_GET_DST_PROC: - req->comm_get_dst_proc.result = - SIMIX_comm_get_dst_proc(req->comm_get_dst_proc.comm); - SIMIX_request_answer(req); - break; - -#ifdef HAVE_LATENCY_BOUND_TRACKING - case REQ_COMM_IS_LATENCY_BOUNDED: - req->comm_is_latency_bounded.result = - SIMIX_comm_is_latency_bounded(req->comm_is_latency_bounded.comm); - SIMIX_request_answer(req); - break; -#endif - #ifdef HAVE_TRACING case REQ_SET_CATEGORY: SIMIX_set_category( @@ -513,6 +515,13 @@ void SIMIX_request_pre(smx_req_t req) SIMIX_sem_get_capacity(req->sem_get_capacity.sem); SIMIX_request_answer(req); break; + + case REQ_NO_REQ: + THROW2(arg_error,0,"Asked to do the noop syscall on %s@%s", + SIMIX_process_get_name(req->issuer), + SIMIX_host_get_name(SIMIX_process_get_host(req->issuer)) + ); + break; } }