X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1679193978528bbb628e0f3a7853cddf4f3cfe0d..def75190166f07cc72917cb15535b660aa976e7f:/src/mc/mc_request.cpp diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 962e954162..cf8a8bfae4 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -142,7 +142,7 @@ bool request_depend(smx_simcall_t r1, smx_simcall_t r2) if (r1->issuer == r2->issuer) return false; - /* Wait with timeout transitions are not considered by the independance theorem, thus we consider them as dependant with all other transitions */ + /* Wait with timeout transitions are not considered by the independence theorem, thus we consider them as dependant with all other transitions */ if ((r1->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r1) > 0) || (r2->call == SIMCALL_COMM_WAIT && simcall_comm_wait__get__timeout(r2) > 0)) @@ -387,8 +387,8 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid else type = "Mutex TRYLOCK"; - s_smx_mutex_t mutex; - mc_model_checker->process().read_bytes(&mutex, sizeof(mutex), + simgrid::mc::Remote mutex; + mc_model_checker->process().read_bytes(mutex.getBuffer(), sizeof(mutex), remote( req->call == SIMCALL_MUTEX_LOCK ? simcall_mutex_lock__get__mutex(req) @@ -396,12 +396,12 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid )); s_xbt_swag_t mutex_sleeping; mc_model_checker->process().read_bytes(&mutex_sleeping, sizeof(mutex_sleeping), - remote(mutex.sleeping)); + remote(mutex.getBuffer()->sleeping)); args = bprintf("locked = %d, owner = %d, sleeping = %d", - mutex.locked, - mutex.owner != nullptr ? (int) mc_model_checker->process().resolveProcess( - simgrid::mc::remote(mutex.owner))->pid : -1, + mutex.getBuffer()->locked, + mutex.getBuffer()->owner != nullptr ? (int) mc_model_checker->process().resolveProcess( + simgrid::mc::remote(mutex.getBuffer()->owner))->pid : -1, mutex_sleeping.count); break; }