From: cristianrosa Date: Wed, 26 Jan 2011 13:53:55 +0000 (+0000) Subject: Improve independence detection and request pretty printing. X-Git-Tag: v3.6_beta2~429 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/030a05a00b073b9a464a4f508d0991cf983ea0df?ds=sidebyside Improve independence detection and request pretty printing. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9500 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c index ee8abeb784..b16f19fba3 100644 --- a/src/mc/mc_dpor.c +++ b/src/mc/mc_dpor.c @@ -53,7 +53,7 @@ void MC_dpor(void) { char *req_str; int value; - smx_req_t req = NULL; + smx_req_t req = NULL, prev_req = NULL; mc_state_t state = NULL, prev_state = NULL, next_state = NULL; smx_process_t process = NULL; xbt_fifo_item_t item = NULL; @@ -79,7 +79,7 @@ void MC_dpor(void) /* Debug information */ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req); + req_str = MC_request_to_string(req, value); if(req->call == REQ_COMM_WAITANY) DEBUG3("Execute: %s (%u of %lu)", req_str, value, xbt_dynar_length(req->comm_waitany.comms)); else if(req->call == REQ_COMM_TESTANY) @@ -147,10 +147,12 @@ void MC_dpor(void) if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){ if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){ DEBUG0("Dependent Transitions:"); - req_str = MC_request_to_string(MC_state_get_executed_request(prev_state, &value)); + prev_req = MC_state_get_executed_request(prev_state, &value); + req_str = MC_request_to_string(prev_req, value); DEBUG2("%s (state=%p)", req_str, prev_state); xbt_free(req_str); - req_str = MC_request_to_string(MC_state_get_executed_request(state, &value)); + prev_req = MC_state_get_executed_request(state, &value); + req_str = MC_request_to_string(prev_req, value); DEBUG2("%s (state=%p)", req_str, state); xbt_free(req_str); } diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index fec467e3aa..22b30584e1 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -75,7 +75,6 @@ int MC_random(int min, int max) */ void MC_wait_for_requests(void) { - char *req_str = NULL; smx_req_t req = NULL; do { @@ -83,11 +82,6 @@ void MC_wait_for_requests(void) while((req = SIMIX_request_pop())){ if(!MC_request_is_visible(req)) SIMIX_request_pre(req, 0); - else if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req); - DEBUG1("Got: %s", req_str); - xbt_free(req_str); - } } } while (xbt_dynar_length(simix_global->process_to_run)); } @@ -145,7 +139,7 @@ void MC_replay(xbt_fifo_t stack) /* Debug information */ if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req); + req_str = MC_request_to_string(req, value); DEBUG2("Replay: %s (%p)", req_str, state); xbt_free(req_str); } @@ -191,14 +185,9 @@ void MC_show_stack(xbt_fifo_t stack) : (NULL)); item = xbt_fifo_get_prev_item(item)) { req = MC_state_get_executed_request(state, &value); if(req){ - if(req->call == REQ_COMM_WAIT && value == -1) - INFO3("[(%lu)%s] Wait Timeout (comm=%p)", - req->issuer->pid, req->issuer->name, req->comm_wait.comm); - else{ - req_str = MC_request_to_string(req); - INFO1("%s", req_str); - xbt_free(req_str); - } + req_str = MC_request_to_string(req, value); + INFO1("%s", req_str); + xbt_free(req_str); } } } diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c index c10b192194..3645c41e32 100644 --- a/src/mc/mc_request.c +++ b/src/mc/mc_request.c @@ -11,19 +11,55 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) if(r1->call == REQ_COMM_IRECV && r2->call == REQ_COMM_ISEND) return FALSE; + if( (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV) + && r2->call == REQ_COMM_WAIT){ + + if(r2->comm_wait.comm->comm.rdv == NULL) + return FALSE; + + smx_rdv_t rdv = r1->call == REQ_COMM_ISEND ? r1->comm_isend.rdv : r1->comm_irecv.rdv; + + if(r2->comm_wait.comm->comm.rdv != rdv) + return FALSE; + + if(r2->comm_wait.comm->type == SIMIX_COMM_SEND && r1->call == REQ_COMM_ISEND) + return FALSE; + + if(r2->comm_wait.comm->type == SIMIX_COMM_RECEIVE && r1->call == REQ_COMM_IRECV) + return FALSE; + } + + if( (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV) + && r1->call == REQ_COMM_WAIT){ + + if(r1->comm_wait.comm->comm.rdv == NULL) + return FALSE; + + smx_rdv_t rdv = r2->call == REQ_COMM_ISEND ? r2->comm_isend.rdv : r2->comm_irecv.rdv; + + if(r1->comm_wait.comm->comm.rdv != rdv) + return FALSE; + + if(r1->comm_wait.comm->type == SIMIX_COMM_SEND && r2->call == REQ_COMM_ISEND) + return FALSE; + + if(r1->comm_wait.comm->type == SIMIX_COMM_RECEIVE && r2->call == REQ_COMM_IRECV) + return FALSE; + } + /* FIXME: the following rule assumes that the result of the * isend/irecv call is not stored in a buffer used in the - * wait/test call. + * test call. */ if( (r1->call == REQ_COMM_ISEND || r1->call == REQ_COMM_IRECV) - && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST)) - return FALSE;*/ + && r2->call == REQ_COMM_TEST) + return FALSE; /* FIXME: the following rule assumes that the result of the * isend/irecv call is not stored in a buffer used in the - * wait/test call. + * test call.*/ if( (r2->call == REQ_COMM_ISEND || r2->call == REQ_COMM_IRECV) - && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST)) - return FALSE;*/ + && r1->call == REQ_COMM_TEST) + return FALSE; if(r1->call == REQ_COMM_ISEND && r2->call == REQ_COMM_ISEND && r1->comm_isend.rdv != r2->comm_isend.rdv) @@ -33,6 +69,18 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) && r1->comm_irecv.rdv != r2->comm_irecv.rdv) return FALSE; + /* If any of the request is a timeout wait, and it reached + * this point, it won't be dependent with any other request. */ + if(r1->call == REQ_COMM_WAIT && (r2->call == REQ_COMM_WAIT || r2->call == REQ_COMM_TEST) + && (r1->comm_wait.comm->comm.src_proc == NULL + || r1->comm_wait.comm->comm.dst_proc == NULL)) + return FALSE; + + if(r2->call == REQ_COMM_WAIT && (r1->call == REQ_COMM_WAIT || r1->call == REQ_COMM_TEST) + && (r2->comm_wait.comm->comm.src_proc == NULL + || r2->comm_wait.comm->comm.dst_proc == NULL)) + return FALSE; + if(r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_WAIT && r1->comm_wait.comm->comm.src_buff == r2->comm_wait.comm->comm.src_buff && r1->comm_wait.comm->comm.dst_buff == r2->comm_wait.comm->comm.dst_buff) @@ -70,10 +118,30 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) && r1->comm_wait.comm->comm.dst_buff == r2->comm_test.comm->comm.dst_buff) return FALSE; + if (r1->call == REQ_COMM_WAIT && r2->call == REQ_COMM_TEST + && r1->comm_wait.comm->comm.src_buff != NULL + && r1->comm_wait.comm->comm.dst_buff != NULL + && r2->comm_test.comm->comm.src_buff != NULL + && r2->comm_test.comm->comm.dst_buff != NULL + && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.src_buff + && r1->comm_wait.comm->comm.dst_buff != r2->comm_test.comm->comm.dst_buff + && r2->comm_test.comm->comm.dst_buff != r1->comm_wait.comm->comm.src_buff) + return FALSE; + + if (r1->call == REQ_COMM_TEST && r2->call == REQ_COMM_WAIT + && r1->comm_test.comm->comm.src_buff != NULL + && r1->comm_test.comm->comm.dst_buff != NULL + && r2->comm_wait.comm->comm.src_buff != NULL + && r2->comm_wait.comm->comm.dst_buff != NULL + && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.src_buff + && r1->comm_test.comm->comm.dst_buff != r2->comm_wait.comm->comm.dst_buff + && r2->comm_wait.comm->comm.dst_buff != r1->comm_test.comm->comm.src_buff) + return FALSE; + return TRUE; } -char *MC_request_to_string(smx_req_t req) +char *MC_request_to_string(smx_req_t req, int value) { char *type = NULL, *args = NULL, *str = NULL; smx_action_t act = NULL; @@ -93,19 +161,29 @@ char *MC_request_to_string(smx_req_t req) break; case REQ_COMM_WAIT: act = req->comm_wait.comm; - type = bprintf("Wait"); - args = bprintf("comm=%p [%s(%lu) -> %s(%lu)]", act, - act->comm.src_proc ? act->comm.src_proc->name : "", - act->comm.src_proc ? act->comm.src_proc->pid : 0, - act->comm.dst_proc ? act->comm.dst_proc->name : "", - act->comm.dst_proc ? act->comm.dst_proc->pid : 0); + if(value == -1){ + type = bprintf("Wait Timeout"); + args = bprintf("comm=%p", act); + }else{ + type = bprintf("Wait"); + args = bprintf("comm=%p [%s(%lu) -> %s(%lu)]", act, + act->comm.src_proc ? act->comm.src_proc->name : "", + act->comm.src_proc ? act->comm.src_proc->pid : 0, + act->comm.dst_proc ? act->comm.dst_proc->name : "", + act->comm.dst_proc ? act->comm.dst_proc->pid : 0); + } break; case REQ_COMM_TEST: act = req->comm_test.comm; - type = bprintf("Test"); - args = bprintf("comm=%p [%s -> %s]", act, - act->comm.src_proc ? act->comm.src_proc->name : "", - act->comm.dst_proc ? act->comm.dst_proc->name : ""); + if(act->comm.src_proc == NULL || act->comm.src_proc == NULL){ + type = bprintf("Test FALSE"); + args = bprintf("comm=%p", act); + }else{ + type = bprintf("Test TRUE"); + args = bprintf("comm=%p [%s -> %s]", act, + act->comm.src_proc ? act->comm.src_proc->name : "", + act->comm.dst_proc ? act->comm.dst_proc->name : ""); + } break; case REQ_COMM_WAITANY: diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c index bb47a1c452..46f6d6c93f 100644 --- a/src/mc/mc_state.c +++ b/src/mc/mc_state.c @@ -51,6 +51,9 @@ int MC_state_process_is_done(mc_state_t state, smx_process_t process){ void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value) { + state->executed_req = *req; + state->req_num = value; + /* The waitany and testany request are transformed into a wait or test request over the * corresponding communication action so it can be treated later by the dependence * function. */ @@ -76,13 +79,15 @@ void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value) case REQ_COMM_WAIT: state->internal_req = *req; - state->internal_comm = *req->comm_wait.comm; + state->internal_comm = *(req->comm_wait.comm); + state->executed_req.comm_wait.comm = &state->internal_comm; state->internal_req.comm_wait.comm = &state->internal_comm; break; case REQ_COMM_TEST: state->internal_req = *req; state->internal_comm = *req->comm_test.comm; + state->executed_req.comm_test.comm = &state->internal_comm; state->internal_req.comm_test.comm = &state->internal_comm; break; @@ -90,9 +95,6 @@ void MC_state_set_executed_request(mc_state_t state, smx_req_t req, int value) state->internal_req = *req; break; } - - state->executed_req = *req; - state->req_num = value; } smx_req_t MC_state_get_executed_request(mc_state_t state, int *value) diff --git a/src/mc/private.h b/src/mc/private.h index 733a7269a6..7b4acca159 100644 --- a/src/mc/private.h +++ b/src/mc/private.h @@ -52,7 +52,7 @@ void MC_dump_stack(xbt_fifo_t stack); /********************************* Requests ***********************************/ int MC_request_depend(smx_req_t req1, smx_req_t req2); -char* MC_request_to_string(smx_req_t req); +char* MC_request_to_string(smx_req_t req, int value); unsigned int MC_request_testany_fail(smx_req_t req); /*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/ int MC_request_is_visible(smx_req_t req);