-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
#include <list>
#include <memory>
-#include "src/mc/Transition.hpp"
#include "src/mc/mc_record.hpp"
-#include "src/mc/mc_snapshot.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
+
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/mc/Transition.hpp"
namespace simgrid {
namespace mc {
Transition transition;
/** The simcall which was executed, going out of that state */
- s_smx_simcall_t executed_req;
+ s_smx_simcall executed_req;
/* Internal translation of the executed_req simcall
*
* SIMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
* and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT.
*/
- s_smx_simcall_t internal_req;
+ s_smx_simcall internal_req;
/* Can be used as a copy of the remote synchro object */
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> internal_comm;
std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
std::vector<unsigned> communicationIndices;
- State(unsigned long state_number);
+ explicit State(unsigned long state_number);
std::size_t interleaveSize() const;
- void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->pid].consider(); }
+ void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->get_pid()].consider(); }
Transition getTransition() const;
};
}