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
attempt to replace internal dynar by std::vector
[simgrid.git]
/
src
/
mc
/
mc_state.h
diff --git
a/src/mc/mc_state.h
b/src/mc/mc_state.h
index
599b0cb
..
1e47840
100644
(file)
--- a/
src/mc/mc_state.h
+++ b/
src/mc/mc_state.h
@@
-15,6
+15,11
@@
#include <simgrid_config.h>
#include "src/simix/smx_private.h"
#include <simgrid_config.h>
#include "src/simix/smx_private.h"
+#include "src/simix/SynchroIo.hpp"
+#include "src/simix/SynchroComm.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroExec.hpp"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_record.h"
#include "src/mc/Transition.hpp"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_record.h"
#include "src/mc/Transition.hpp"
@@
-22,12
+27,16
@@
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;
smx_synchro_t comm_addr;
struct PatternCommunication {
int num = 0;
smx_synchro_t comm_addr;
-
e_smx_comm_type_t type = SIMIX_COMM_SEND
;
+
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;
@@
-127,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::simix::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,8
+155,6
@@
struct XBT_PRIVATE State {
Transition getTransition() const;
};
Transition getTransition() const;
};
-XBT_PRIVATE void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack);
-
}
}
}
}