{
std::vector<std::string> trace;
for (auto const& state : stack_) {
- int value;
- smx_simcall_t req = MC_state_get_executed_request(state.get(), &value);
+ int value = state->req_num;
+ smx_simcall_t req = &state->executed_req;
if (req)
trace.push_back(simgrid::mc::request_to_string(
req, value, simgrid::mc::RequestType::executed));
if (pair->exploration_started) {
- int value;
- smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
+ int value = state->req_num;
+ smx_simcall_t saved_req = &state->executed_req;
smx_simcall_t req = nullptr;
{
std::vector<std::string> trace;
for (std::shared_ptr<Pair> const& pair : explorationStack_) {
- int value;
- smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value);
+ int value = pair->graph_state->req_num;
+ smx_simcall_t req = &pair->graph_state->executed_req;
if (req && req->call != SIMCALL_NONE)
trace.push_back(simgrid::mc::request_to_string(
req, value, simgrid::mc::RequestType::executed));
{
std::vector<std::string> trace;
for (auto const& state : stack_) {
- int value;
- smx_simcall_t req = MC_state_get_executed_request(state.get(), &value);
+ int value = state->req_num;
+ smx_simcall_t req = &state->executed_req;
if (req)
trace.push_back(simgrid::mc::request_to_string(
req, value, simgrid::mc::RequestType::executed));
&& simgrid::mc::request_depend(req, MC_state_get_internal_request(prev_state))) {
if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
XBT_DEBUG("Dependent Transitions:");
- int value;
- smx_simcall_t prev_req = MC_state_get_executed_request(prev_state, &value);
+ int value = prev_state->req_num;
+ smx_simcall_t prev_req = &prev_state->executed_req;
XBT_DEBUG("%s (state=%d)",
simgrid::mc::request_to_string(
prev_req, value, simgrid::mc::RequestType::internal).c_str(),
prev_state->num);
- prev_req = MC_state_get_executed_request(state.get(), &value);
+ value = state->req_num;
+ prev_req = &state->executed_req;
XBT_DEBUG("%s (state=%d)",
simgrid::mc::request_to_string(
prev_req, value, simgrid::mc::RequestType::executed).c_str(),
if (state == stack.back())
break;
- int value;
- smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
+ int value = state->req_num;
+ smx_simcall_t saved_req = &state->executed_req;
if (saved_req) {
/* because we got a copy of the executed request, we have to fetch the
}
}
-smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value)
-{
- *value = state->req_num;
- return &state->executed_req;
-}
-
smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state)
{
return &state->internal_req;
}
XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
-XBT_PRIVATE smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value);
XBT_PRIVATE smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state);
XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value);