From c2dac31fa9471182b2ccaa7beed07b6227a743fb Mon Sep 17 00:00:00 2001 From: Ehsan Azimi Date: Mon, 30 Nov 2020 11:21:17 +0100 Subject: [PATCH] more cleanups --- src/mc/checker/CommunicationDeterminismChecker.cpp | 4 ++-- src/mc/checker/SafetyChecker.cpp | 12 ++++++------ src/mc/mc_api.cpp | 4 ++-- src/mc/mc_api.hpp | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index f4795c7a77..241732d2eb 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -170,7 +170,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(int process, co void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking) { - const smx_actor_t issuer = mcapi::get().mc_smx_simcall_get_issuer(request); + const smx_actor_t issuer = mcapi::get().simcall_get_issuer(request); const mc::PatternCommunicationList& initial_pattern = initial_communications_pattern[issuer->get_pid()]; const std::vector& incomplete_pattern = incomplete_communications_pattern[issuer->get_pid()]; @@ -366,7 +366,7 @@ void CommunicationDeterminismChecker::restoreState() /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ - const smx_actor_t issuer = mcapi::get().mc_smx_simcall_get_issuer(saved_req); + const smx_actor_t issuer = mcapi::get().simcall_get_issuer(saved_req); smx_simcall_t req = &issuer->simcall_; /* TODO : handle test and testany simcalls */ diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 19a3d16c72..b61c26c555 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -199,7 +199,7 @@ void SafetyChecker::backtrack() if (req->call_ == simix::Simcall::MUTEX_LOCK || req->call_ == simix::Simcall::MUTEX_TRYLOCK) xbt_die("Mutex is currently not supported with DPOR, use --cfg=model-check/reduction:none"); - const kernel::actor::ActorImpl* issuer = mcapi::get().mc_smx_simcall_get_issuer(req); + const kernel::actor::ActorImpl* issuer = mcapi::get().simcall_get_issuer(req); for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) { State* prev_state = i->get(); if (mcapi::get().request_depend(req, &prev_state->internal_req_)) { @@ -221,14 +221,14 @@ void SafetyChecker::backtrack() XBT_DEBUG("Process %p is in done set", req->issuer_); break; } else if (req->issuer_ == prev_state->internal_req_.issuer_) { - XBT_DEBUG("Simcall %s and %s with same issuer", mcapi::get().simix_simcall_name(req->call_), - mcapi::get().simix_simcall_name(prev_state->internal_req_.call_)); + XBT_DEBUG("Simcall %s and %s with same issuer", mcapi::get().simcall_get_name(req->call_), + mcapi::get().simcall_get_name(prev_state->internal_req_.call_)); break; } else { - const kernel::actor::ActorImpl* previous_issuer = mcapi::get().mc_smx_simcall_get_issuer(&prev_state->internal_req_); + const kernel::actor::ActorImpl* previous_issuer = mcapi::get().simcall_get_issuer(&prev_state->internal_req_); XBT_DEBUG("Simcall %s, process %ld (state %d) and simcall %s, process %ld (state %d) are independent", - mcapi::get().simix_simcall_name(req->call_), issuer->get_pid(), state->num_, - mcapi::get().simix_simcall_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); + mcapi::get().simcall_get_name(req->call_), issuer->get_pid(), state->num_, + mcapi::get().simcall_get_name(prev_state->internal_req_.call_), previous_issuer->get_pid(), prev_state->num_); } } } diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp index 3d37b20d42..a69b4fd4b8 100644 --- a/src/mc/mc_api.cpp +++ b/src/mc/mc_api.cpp @@ -367,7 +367,7 @@ void mc_api::mc_show_deadlock() const MC_show_deadlock(); } -smx_actor_t mc_api::mc_smx_simcall_get_issuer(s_smx_simcall const* req) const +smx_actor_t mc_api::simcall_get_issuer(s_smx_simcall const* req) const { return MC_smx_simcall_get_issuer(req); } @@ -442,7 +442,7 @@ std::string mc_api::request_get_dot_output(smx_simcall_t req, int value) const return simgrid::mc::request_get_dot_output(req, value); } -const char* mc_api::simix_simcall_name(simgrid::simix::Simcall kind) const +const char* mc_api::simcall_get_name(simgrid::simix::Simcall kind) const { return SIMIX_simcall_name(kind); } diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp index f4aeb89d06..32eadc27f5 100644 --- a/src/mc/mc_api.hpp +++ b/src/mc/mc_api.hpp @@ -69,7 +69,6 @@ public: unsigned long mc_get_executed_trans() const; bool mc_check_deadlock() const; void mc_show_deadlock() const; - smx_actor_t mc_smx_simcall_get_issuer(s_smx_simcall const* req) const; bool mc_is_null() const; Checker* mc_get_checker() const; RemoteSimulation& mc_get_remote_simulation() const; @@ -84,7 +83,8 @@ public: bool request_depend(smx_simcall_t req1, smx_simcall_t req2) const; std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const; std::string request_get_dot_output(smx_simcall_t req, int value) const; - const char *simix_simcall_name(simgrid::simix::Simcall kind) const; + const char *simcall_get_name(simgrid::simix::Simcall kind) const; + smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const; #if HAVE_SMPI int get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const; #endif -- 2.20.1