X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/873fe7743b2a9f2eddc53ed3383bdd74bb3fe226..39657d7de68ca06c1c3064d52c025aacdd8a9add:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 1404c21e6f..fe69f83243 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" @@ -100,13 +101,15 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) /* FIXME: the following rule assumes that the result of the * isend/irecv call is not stored in a buffer used in the * test call. */ - /*if( (r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV) +#if 0 + if((r1->call == SIMCALL_COMM_ISEND || r1->call == SIMCALL_COMM_IRECV) && r2->call == SIMCALL_COMM_TEST) - return FALSE; */ + return FALSE; +#endif if (r1->call == SIMCALL_COMM_WAIT && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST) - && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL)) + && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == nullptr)) return false; if (r1->call == SIMCALL_COMM_TEST && @@ -133,7 +136,7 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) return true; } -// Those are MC_state_get_internal_request(state) +// Those are internal_req bool request_depend(smx_simcall_t r1, smx_simcall_t r2) { if (r1->issuer == r2->issuer) @@ -200,8 +203,10 @@ static char *buff_size_to_string(size_t buff_size) } -char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) +std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type) { + xbt_assert(mc_mode == MC_MODE_SERVER); + bool use_remote_comm = true; switch(request_type) { case simgrid::mc::RequestType::simix: @@ -287,8 +292,10 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: } else act = remote_act; - smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc); + smx_process_t src_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(act->comm.src_proc)); + smx_process_t dst_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(act->comm.dst_proc)); args = bprintf("comm=%s [(%lu)%s (%s)-> (%lu)%s (%s)]", p, src_proc ? src_proc->pid : 0, src_proc ? MC_smx_process_get_host_name(src_proc) : "", @@ -313,7 +320,7 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: act = remote_act; char* p; - if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) { + if (act->comm.src_proc == nullptr || act->comm.dst_proc == nullptr) { type = "Test FALSE"; p = pointer_to_string(remote_act); args = bprintf("comm=%s", p); @@ -321,8 +328,10 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: type = "Test TRUE"; p = pointer_to_string(remote_act); - smx_process_t src_proc = MC_smx_resolve_process(act->comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(act->comm.dst_proc); + smx_process_t src_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(act->comm.src_proc)); + smx_process_t dst_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(act->comm.dst_proc)); args = bprintf("comm=%s [(%lu)%s (%s) -> (%lu)%s (%s)]", p, src_proc->pid, MC_smx_process_get_name(src_proc), @@ -387,7 +396,8 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: args = bprintf("locked = %d, owner = %d, sleeping = %d", mutex.locked, - mutex.owner != nullptr ? (int) MC_smx_resolve_process(mutex.owner)->pid : -1, + mutex.owner != nullptr ? (int) mc_model_checker->process().resolveProcess( + simgrid::mc::remote(mutex.owner))->pid : -1, mutex_sleeping.count); break; } @@ -401,16 +411,14 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc:: THROW_UNIMPLEMENTED; } - char* str; + std::string str; if (args != nullptr) - str = - bprintf("[(%lu)%s (%s)] %s(%s)", issuer->pid, + str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s(%s)", issuer->pid, MC_smx_process_get_host_name(issuer), MC_smx_process_get_name(issuer), type, args); else - str = - bprintf("[(%lu)%s (%s)] %s ", issuer->pid, + str = simgrid::xbt::string_printf("[(%lu)%s (%s)] %s ", issuer->pid, MC_smx_process_get_host_name(issuer), MC_smx_process_get_name(issuer), type); @@ -483,17 +491,16 @@ static inline const char* get_color(int id) return colors[id % (sizeof(colors) / sizeof(colors[0])) ]; } -char *request_get_dot_output(smx_simcall_t req, int value) +std::string request_get_dot_output(smx_simcall_t req, int value) { - char *label = nullptr; + std::string label; const smx_process_t issuer = MC_smx_simcall_get_issuer(req); switch (req->call) { case SIMCALL_COMM_ISEND: if (issuer->host) - label = - bprintf("[(%lu)%s] iSend", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] iSend", issuer->pid, MC_smx_process_get_host_name(issuer)); else label = bprintf("[(%lu)] iSend", issuer->pid); @@ -501,38 +508,38 @@ char *request_get_dot_output(smx_simcall_t req, int value) case SIMCALL_COMM_IRECV: if (issuer->host) - label = - bprintf("[(%lu)%s] iRecv", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] iRecv", issuer->pid, MC_smx_process_get_host_name(issuer)); else - label = bprintf("[(%lu)] iRecv", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] iRecv", issuer->pid); break; case SIMCALL_COMM_WAIT: { if (value == -1) { if (issuer->host) - label = - bprintf("[(%lu)%s] WaitTimeout", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] WaitTimeout", issuer->pid, MC_smx_process_get_host_name(issuer)); else - label = bprintf("[(%lu)] WaitTimeout", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] WaitTimeout", issuer->pid); } else { smx_synchro_t remote_act = simcall_comm_wait__get__comm(req); s_smx_synchro_t synchro; mc_model_checker->process().read_bytes(&synchro, sizeof(synchro), remote(remote_act)); - smx_process_t src_proc = MC_smx_resolve_process(synchro.comm.src_proc); - smx_process_t dst_proc = MC_smx_resolve_process(synchro.comm.dst_proc); + smx_process_t src_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(synchro.comm.src_proc)); + smx_process_t dst_proc = mc_model_checker->process().resolveProcess( + simgrid::mc::remote(synchro.comm.dst_proc)); if (issuer->host) - label = - bprintf("[(%lu)%s] Wait [(%lu)->(%lu)]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] Wait [(%lu)->(%lu)]", + issuer->pid, MC_smx_process_get_host_name(issuer), src_proc ? src_proc->pid : 0, dst_proc ? dst_proc->pid : 0); else - label = - bprintf("[(%lu)] Wait [(%lu)->(%lu)]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)] Wait [(%lu)->(%lu)]", + issuer->pid, src_proc ? src_proc->pid : 0, dst_proc ? dst_proc->pid : 0); } @@ -544,20 +551,19 @@ char *request_get_dot_output(smx_simcall_t req, int value) s_smx_synchro_t synchro; mc_model_checker->process().read_bytes(&synchro, sizeof(synchro), remote(remote_act)); - if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) { + if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == nullptr) { if (issuer->host) - label = - bprintf("[(%lu)%s] Test FALSE", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE", + issuer->pid, MC_smx_process_get_host_name(issuer)); else label = bprintf("[(%lu)] Test FALSE", issuer->pid); } else { if (issuer->host) - label = - bprintf("[(%lu)%s] Test TRUE", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] Test TRUE", issuer->pid, MC_smx_process_get_host_name(issuer)); else - label = bprintf("[(%lu)] Test TRUE", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Test TRUE", issuer->pid); } break; } @@ -566,54 +572,51 @@ char *request_get_dot_output(smx_simcall_t req, int value) unsigned long comms_size = read_length( mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(req))); if (issuer->host) - label = - bprintf("[(%lu)%s] WaitAny [%d of %lu]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] WaitAny [%d of %lu]", + issuer->pid, MC_smx_process_get_host_name(issuer), value + 1, comms_size); else - label = - bprintf("[(%lu)] WaitAny [%d of %lu]", issuer->pid, value + 1, - comms_size); + label = simgrid::xbt::string_printf("[(%lu)] WaitAny [%d of %lu]", + issuer->pid, value + 1, comms_size); break; } case SIMCALL_COMM_TESTANY: if (value == -1) { if (issuer->host) - label = - bprintf("[(%lu)%s] TestAny FALSE", issuer->pid, - MC_smx_process_get_host_name(issuer)); + label = simgrid::xbt::string_printf("[(%lu)%s] TestAny FALSE", + issuer->pid, MC_smx_process_get_host_name(issuer)); else - label = bprintf("[(%lu)] TestAny FALSE", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] TestAny FALSE", issuer->pid); } else { if (issuer->host) - label = - bprintf("[(%lu)%s] TestAny TRUE [%d of %lu]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)%s] TestAny TRUE [%d of %lu]", + issuer->pid, MC_smx_process_get_host_name(issuer), value + 1, xbt_dynar_length(simcall_comm_testany__get__comms(req))); else - label = - bprintf("[(%lu)] TestAny TRUE [%d of %lu]", issuer->pid, + label = simgrid::xbt::string_printf("[(%lu)] TestAny TRUE [%d of %lu]", + issuer->pid, value + 1, xbt_dynar_length(simcall_comm_testany__get__comms(req))); } break; case SIMCALL_MUTEX_TRYLOCK: - label = bprintf("[(%lu)] Mutex TRYLOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Mutex TRYLOCK", issuer->pid); break; case SIMCALL_MUTEX_LOCK: - label = bprintf("[(%lu)] Mutex LOCK", issuer->pid); + label = simgrid::xbt::string_printf("[(%lu)] Mutex LOCK", issuer->pid); break; case SIMCALL_MC_RANDOM: if (issuer->host) - label = - bprintf("[(%lu)%s] MC_RANDOM (%d)", issuer->pid, - MC_smx_process_get_host_name(issuer), value); + label = simgrid::xbt::string_printf("[(%lu)%s] MC_RANDOM (%d)", + issuer->pid, MC_smx_process_get_host_name(issuer), value); else - label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value); + label = simgrid::xbt::string_printf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value); break; default: @@ -621,12 +624,9 @@ char *request_get_dot_output(smx_simcall_t req, int value) } const char* color = get_color(issuer->pid - 1); - char* str = - bprintf("label = \"%s\", color = %s, fontcolor = %s", label, - color, color); - xbt_free(label); - return str; - + return simgrid::xbt::string_printf( + "label = \"%s\", color = %s, fontcolor = %s", label.c_str(), + color, color); } }