X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00d29bad30ebbbbcc85ddfbcfc2312883f6527f5..2a3f4b595b2fe9181ce2d338f0234f84b7aff58d:/src/simix/smx_smurf.c diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c index 60a1bb86ad..bd82cea5d6 100644 --- a/src/simix/smx_smurf.c +++ b/src/simix/smx_smurf.c @@ -5,58 +5,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_smurf, simix, "Logging specific to SIMIX (SMURF)"); -/* 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) -{ - 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) -{ - int i, nthreads = SIMIX_context_get_nthreads(); - - for(i=0; i < nthreads; i++) - xbt_swag_free(req_lists[i]); - - xbt_free(req_lists); -} - -xbt_swag_t SIMIX_request_get_reqlist(int thread_pid) -{ - return req_lists[thread_pid]; -} - /* FIXME: we may want to save the initialization of issuer... */ -XBT_INLINE smx_req_t SIMIX_req_mine() { +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, + XBT_DEBUG("Yield process '%s' on request of type %s (%d)", issuer->name, SIMIX_request_name(issuer->request.call), issuer->request.call); SIMIX_process_yield(); } else { @@ -64,29 +26,11 @@ void SIMIX_request_push() } } -smx_req_t SIMIX_request_pop(void) -{ - int i; - smx_req_t req = NULL; - int nthreads = SIMIX_context_get_nthreads(); - - for(i=0; i < nthreads; i++){ - if((req = xbt_swag_extract(req_lists[i]))){ - DEBUG3("Popped request %s (%d) of %s", - SIMIX_request_name(req->issuer->request.call), - req->issuer->request.call, - req->issuer->name); - return req; - } - } - - return NULL; -} - void SIMIX_request_answer(smx_req_t req) { if (req->issuer != simix_global->maestro_process){ - DEBUG2("Answer request %s (%d)", SIMIX_request_name(req->call), req->call); + XBT_DEBUG("Answer request %s (%d) issued by %s (%p)", SIMIX_request_name(req->call), req->call, + req->issuer->name, req->issuer); req->issuer->request.call = REQ_NO_REQ; xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer); } @@ -94,8 +38,8 @@ void SIMIX_request_answer(smx_req_t req) void SIMIX_request_pre(smx_req_t req, int value) { - switch (req->call) { + switch (req->call) { case REQ_COMM_TEST: SIMIX_pre_comm_test(req); break; @@ -105,13 +49,32 @@ void SIMIX_request_pre(smx_req_t req, int value) break; case REQ_COMM_WAIT: - SIMIX_pre_comm_wait(req, value); + SIMIX_pre_comm_wait(req, + req->comm_wait.comm, + req->comm_wait.timeout, + value); break; case REQ_COMM_WAITANY: SIMIX_pre_comm_waitany(req, value); break; + case REQ_COMM_SEND: + { + smx_action_t comm = SIMIX_comm_isend( + req->issuer, + req->comm_send.rdv, + req->comm_send.task_size, + req->comm_send.rate, + req->comm_send.src_buff, + req->comm_send.src_buff_size, + req->comm_send.match_fun, + req->comm_send.data, + 0); + SIMIX_pre_comm_wait(req, comm, req->comm_send.timeout, 0); + break; + } + case REQ_COMM_ISEND: req->comm_isend.result = SIMIX_comm_isend( req->issuer, @@ -126,6 +89,19 @@ void SIMIX_request_pre(smx_req_t req, int value) SIMIX_request_answer(req); break; + case REQ_COMM_RECV: + { + smx_action_t comm = SIMIX_comm_irecv( + req->issuer, + req->comm_recv.rdv, + req->comm_recv.dst_buff, + req->comm_recv.dst_buff_size, + req->comm_recv.match_fun, + req->comm_recv.data); + SIMIX_pre_comm_wait(req, comm, req->comm_recv.timeout, 0); + break; + } + case REQ_COMM_IRECV: req->comm_irecv.result = SIMIX_comm_irecv( req->issuer, @@ -169,30 +145,6 @@ void SIMIX_request_pre(smx_req_t req, int value) 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); @@ -354,14 +306,23 @@ void SIMIX_request_pre(smx_req_t req, int value) break; case REQ_PROCESS_KILL: - SIMIX_process_kill(req->process_kill.process, req->issuer); + SIMIX_process_kill(req->process_kill.process); + SIMIX_request_answer(req); + break; + + case REQ_PROCESS_KILLALL: + SIMIX_process_killall(req->issuer); + SIMIX_request_answer(req); + break; + + case REQ_PROCESS_CLEANUP: + SIMIX_process_cleanup(req->process_cleanup.process); SIMIX_request_answer(req); break; case REQ_PROCESS_CHANGE_HOST: - SIMIX_process_change_host( + SIMIX_pre_process_change_host( req->process_change_host.process, - req->process_change_host.source, req->process_change_host.dest); SIMIX_request_answer(req); break; @@ -517,7 +478,7 @@ void SIMIX_request_pre(smx_req_t req, int value) break; case REQ_NO_REQ: - THROW2(arg_error,0,"Asked to do the noop syscall on %s@%s", + THROWF(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)) );