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
Build ID are somewhat gnu/linux specific.
[simgrid.git]
/
src
/
mc
/
mc_state.h
diff --git
a/src/mc/mc_state.h
b/src/mc/mc_state.h
index
fbff700
..
371d248
100644
(file)
--- a/
src/mc/mc_state.h
+++ b/
src/mc/mc_state.h
@@
-15,18
+15,28
@@
#include <simgrid_config.h>
#include "src/simix/smx_private.h"
#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/mc_snapshot.h"
#include "src/mc/mc_record.h"
+#include "src/mc/Transition.hpp"
namespace simgrid {
namespace mc {
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;
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;
unsigned long src_proc = 0;
unsigned long dst_proc = 0;
const char *src_host = nullptr;
@@
-110,19
+120,11
@@
struct XBT_PRIVATE State {
/** Sequential state number (used for debugging) */
int num = 0;
/** Sequential state number (used for debugging) */
int num = 0;
- /* Which transition was executed for this simcall
- *
- * Some simcalls can lead to different transitions:
- *
- * * waitany/testany can trigger on different messages;
- *
- * * random can produce different values.
- */
- int req_num = 0;
-
/** State's exploration status by process */
std::vector<ProcessState> processStates;
/** State's exploration status by process */
std::vector<ProcessState> processStates;
+ Transition transition;
+
/** The simcall which was executed */
s_smx_simcall_t executed_req;
/** The simcall which was executed */
s_smx_simcall_t executed_req;
@@
-134,7
+136,7
@@
struct XBT_PRIVATE State {
s_smx_simcall_t internal_req;
/* Can be used as a copy of the remote synchro object */
s_smx_simcall_t internal_req;
/* Can be used as a copy of the remote synchro object */
- s
_smx_synchro_t
internal_comm;
+ s
imgrid::mc::Remote<simgrid::kernel::activity::Comm>
internal_comm;
/** Snapshot of system state (if needed) */
std::shared_ptr<simgrid::mc::Snapshot> system_state;
/** Snapshot of system state (if needed) */
std::shared_ptr<simgrid::mc::Snapshot> system_state;
@@
-146,19
+148,17
@@
struct XBT_PRIVATE State {
State();
std::size_t interleaveSize() const;
State();
std::size_t interleaveSize() const;
- void interleave(smx_
process
_t process)
+ void interleave(smx_
actor
_t process)
{
this->processStates[process->pid].interleave();
}
{
this->processStates[process->pid].interleave();
}
-
RecordTraceElement getRecordElement
() const;
+
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 simgrid::mc::State* MC_state_new(
unsigned long state_number
);
XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);
#endif
XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);
#endif