A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
week-end cleanups in ActorImpl
[simgrid.git]
/
src
/
mc
/
mc_state.cpp
diff --git
a/src/mc/mc_state.cpp
b/src/mc/mc_state.cpp
index
3fce2df
..
7095aa9
100644
(file)
--- a/
src/mc/mc_state.cpp
+++ b/
src/mc/mc_state.cpp
@@
-1,23
+1,15
@@
-/* Copyright (c) 2008-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <cassert>
-
-#include <boost/range/algorithm.hpp>
-
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#include "src/mc/Transition.hpp"
#include "src/mc/mc_comm_pattern.hpp"
#include "src/mc/mc_comm_pattern.hpp"
-#include "src/mc/mc_private.hpp"
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_smx.hpp"
#include "src/mc/mc_state.hpp"
#include "src/mc/mc_xbt.hpp"
#include "src/mc/mc_request.hpp"
#include "src/mc/mc_smx.hpp"
#include "src/mc/mc_state.hpp"
#include "src/mc/mc_xbt.hpp"
-#include "src/simix/smx_private.hpp"
+
+#include <boost/range/algorithm.hpp>
using simgrid::mc::remote;
using simgrid::mc::remote;
@@
-71,7
+63,7
@@
Transition State::getTransition() const
static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
{
/* reset the outgoing transition */
static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
{
/* reset the outgoing transition */
- simgrid::mc::ProcessState* procstate = &state->actorStates[actor->
pid
];
+ simgrid::mc::ProcessState* procstate = &state->actorStates[actor->
get_pid()
];
state->transition.pid = -1;
state->transition.argument = -1;
state->executed_req.call = SIMCALL_NONE;
state->transition.pid = -1;
state->transition.argument = -1;
state->executed_req.call = SIMCALL_NONE;
@@
-123,9
+115,10
@@
static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
mc_model_checker->process().read(temp_act, remote_act);
simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_act;
mc_model_checker->process().read(temp_act, remote_act);
simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer();
- if (act->src_
proc && act->dst_proc
)
+ if (act->src_
actor_.get() && act->dst_actor_.get()
)
state->transition.argument = 0;
state->transition.argument = 0;
- else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY && act->detached == 1)
+ else if (act->src_actor_.get() == nullptr && act->type == simgrid::kernel::activity::CommImpl::Type::READY &&
+ act->detached == 1)
state->transition.argument = 0;
else
state->transition.argument = -1;
state->transition.argument = 0;
else
state->transition.argument = -1;
@@
-153,7
+146,7
@@
static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State*
if (not req)
return nullptr;
if (not req)
return nullptr;
- state->transition.pid = actor->
pid
;
+ state->transition.pid = actor->
get_pid()
;
state->executed_req = *req;
// Fetch the data of the request and translate it:
state->internal_req = *req;
state->executed_req = *req;
// Fetch the data of the request and translate it:
state->internal_req = *req;
@@
-213,7
+206,7
@@
smx_simcall_t MC_state_get_request(simgrid::mc::State* state)
{
for (auto& actor : mc_model_checker->process().actors()) {
/* Only consider the actors that were marked as interleaving by the checker algorithm */
{
for (auto& actor : mc_model_checker->process().actors()) {
/* Only consider the actors that were marked as interleaving by the checker algorithm */
- if (not state->actorStates[actor.copy.getBuffer()->
pid
].isTodo())
+ if (not state->actorStates[actor.copy.getBuffer()->
get_pid()
].isTodo())
continue;
smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.getBuffer());
continue;
smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.getBuffer());