#include <simgrid_config.h>
#include "src/simix/smx_private.h"
+#include "src/kernel/activity/SynchroIo.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/SynchroSleep.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/Transition.hpp"
namespace simgrid {
namespace mc {
-extern XBT_PRIVATE std::unique_ptr<s_mc_global_t> initial_global_state;
+enum class PatternCommunicationType {
+ none = 0,
+ send = 1,
+ receive = 2,
+};
struct PatternCommunication {
int num = 0;
- smx_synchro_t comm_addr;
- e_smx_comm_type_t type = SIMIX_COMM_SEND;
+ smx_activity_t comm_addr;
+ PatternCommunicationType type = PatternCommunicationType::send;
unsigned long src_proc = 0;
unsigned long dst_proc = 0;
const char *src_host = nullptr;
};
-/* Possible exploration status of a process in a state */
-enum class ProcessInterleaveState {
- no_interleave=0, /* Do not interleave (do not execute) */
- interleave, /* Interleave the process (one or more request) */
- more_interleave, /* Interleave twice the process (for mc_random simcall) */
- done /* Already interleaved */
-};
+/* On every state, each process has an entry of the following type.
+ * This represents both the process and its transition because
+ * a process cannot have more than one enabled transition at a given time.
+ */
+class ProcessState {
+ /* Possible exploration status of a process transition in a state.
+ * Either the checker did not consider the transition, or it was considered and to do, or considered and done.
+ */
+ enum class InterleavingType {
+ /** This process transition is not considered by the checker (yet?) */
+ disabled = 0,
+ /** The checker algorithm decided that this process transitions should be done at some point */
+ todo,
+ /** The checker algorithm decided that this should be done, but it was done in the meanwhile */
+ done,
+ };
-/* On every state, each process has an entry of the following type */
-struct ProcessState {
/** Exploration control information */
- ProcessInterleaveState state = ProcessInterleaveState::no_interleave;
- /** Number of times that the process was interleaved */
- unsigned int interleave_count;
-
- bool done() const
- {
- return this->state == ProcessInterleaveState::done;
+ InterleavingType state = InterleavingType::disabled;
+public:
+ /** Number of times that the process was considered to be executed */
+ // TODO, make this private
+ unsigned int times_considered = 0;
+
+ bool isDisabled() const {
+ return this->state == InterleavingType::disabled;
+ }
+ bool isDone() const {
+ return this->state == InterleavingType::done;
+ }
+ bool isTodo() const {
+ return this->state == InterleavingType::todo;
+ }
+ /** Mark that we should try executing this process at some point in the future of the checker algorithm */
+ void consider() {
+ this->state = InterleavingType::todo;
+ this->times_considered = 0;
}
- bool interleave() const {
- return this->state == ProcessInterleaveState::interleave
- || this->state == ProcessInterleaveState::more_interleave;
+ void setDone() {
+ this->state = InterleavingType::done;
}
};
-/* An exploration state.
- *
- * The `executed_state` is sometimes transformed into another `internal_req`.
- * For example WAITANY is transformes into a WAIT and TESTANY into TEST.
- * See `MC_state_get_request_for_process()`.
+/* A node in the exploration graph (kind-of)
*/
struct XBT_PRIVATE State {
/** Sequential state number (used for debugging) */
int num = 0;
- /* Next transition to explore for this communication
- *
- * Some transitions are not deterministic such as:
- *
- * * waitany which can receive different messages;
- *
- * * random which can produce different values.
- *
- * This variable is used to keep track of which transition
- * should be explored next for a given simcall.
- */
- int req_num = 0;
-
/** State's exploration status by process */
std::vector<ProcessState> processStates;
- /** The simcall */
+ Transition transition;
+
+ /** The simcall which was executed, going out of that state */
s_smx_simcall_t executed_req;
- /* Internal translation of the simcall
+ /* Internal translation of the executed_req simcall
*
- * IMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
+ * 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;
/* Can be used as a copy of the remote synchro object */
- s_smx_synchro_t internal_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> internal_comm;
/** Snapshot of system state (if needed) */
std::shared_ptr<simgrid::mc::Snapshot> system_state;
std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
std::vector<unsigned> communicationIndices;
- State();
+ State(unsigned long state_number);
std::size_t interleaveSize() const;
+ void interleave(smx_actor_t process) {
+ this->processStates[process->pid].consider();
+ }
+ Transition getTransition() const;
};
-XBT_PRIVATE void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack);
-
}
}
-XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
-XBT_PRIVATE void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process);
-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);
+XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);
#endif
