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
kill the s_surf_parsing_link_up_down_t datatype
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
d8c9343
..
d6e234c
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-527,7
+527,7
@@
static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)
// We don't handle them.
// It does not mean we should silently ignore them however.
// We don't handle them.
// It does not mean we should silently ignore them however.
- if (strncmp(link, "pipe:",
5) == 0 || strncmp(link, "socket:", 7
) == 0)
+ if (strncmp(link, "pipe:",
std::strlen("pipe:")) == 0 || strncmp(link, "socket:", std::strlen("socket:")
) == 0)
continue;
// If dot_output enabled, do not handle the corresponding file
continue;
// If dot_output enabled, do not handle the corresponding file
@@
-541,7
+541,7
@@
static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)
}
// This is probably a shared memory used by lttng-ust:
}
// This is probably a shared memory used by lttng-ust:
- if(strncmp("/dev/shm/ust-shm-tmp-", link,
21
)==0)
+ if(strncmp("/dev/shm/ust-shm-tmp-", link,
std::strlen("/dev/shm/ust-shm-tmp-")
)==0)
continue;
// Add an entry for this FD in the snapshot:
continue;
// Add an entry for this FD in the snapshot:
@@
-569,7
+569,7
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
snapshot->num_state = num_state;
for (auto& p : mc_model_checker->process().simix_processes())
snapshot->num_state = num_state;
for (auto& p : mc_model_checker->process().simix_processes())
- snapshot->enabled_processes.insert(p.copy.pid);
+ snapshot->enabled_processes.insert(p.copy.
getBuffer()->
pid);
snapshot_handle_ignore(snapshot.get());
snapshot_handle_ignore(snapshot.get());
@@
-618,8
+618,7
@@
void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
static inline
void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot)
{
static inline
void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot)
{
- if (mc_mode == MC_MODE_SERVER)
- xbt_die("FD snapshot not implemented in client/server mode.");
+ xbt_die("FD snapshot not implemented in client/server mode.");
for (auto const& fd : snapshot->current_fds) {
for (auto const& fd : snapshot->current_fds) {