#include <simgrid_config.h>
#include "src/simix/smx_private.h"
#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_record.h"
namespace simgrid {
namespace mc {
};
-/* 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 */
-struct ProcessState {
+class ProcessState {
+ /* Possible exploration status of a process in a state */
+ enum class InterleavingType {
+ /** We do not have to execute this process transitions */
+ disabled = 0,
+ /** We still have to execute (some of) this process transitions */
+ interleave,
+ /** We have already executed this process transitions */
+ done,
+ };
+
/** Exploration control information */
- ProcessInterleaveState state = ProcessInterleaveState::no_interleave;
+ InterleavingType state = InterleavingType::disabled;
+public:
+
/** Number of times that the process was interleaved */
- unsigned int interleave_count;
+ // TODO, make this private
+ unsigned int interleave_count = 0;
- bool done() const
+ bool isDisabled() const
{
- return this->state == ProcessInterleaveState::done;
+ return this->state == InterleavingType::disabled;
}
- bool interleave() const {
- return this->state == ProcessInterleaveState::interleave
- || this->state == ProcessInterleaveState::more_interleave;
+ bool isDone() const
+ {
+ return this->state == InterleavingType::done;
+ }
+ bool isToInterleave() const
+ {
+ return this->state == InterleavingType::interleave;
+ }
+ void interleave()
+ {
+ this->state = InterleavingType::interleave;
+ this->interleave_count = 0;
+ }
+ void setDone()
+ {
+ this->state = InterleavingType::done;
}
};
*
* 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_set_executed_request()`.
+ * See `MC_state_get_request_for_process()`.
*/
struct XBT_PRIVATE State {
State();
std::size_t interleaveSize() const;
+ void interleave(smx_process_t process)
+ {
+ this->processStates[process->pid].interleave();
+ }
+ RecordTraceElement getRecordElement() 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 void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req, int value);
-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