Skip to content

Commit d4a69ea

Browse files
committed
Remove skipMonitoringMappedFd
not necessary for serialization, as FdTable is separately restored.
1 parent 84ddf4f commit d4a69ea

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/PersistentCheckpointing.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ static void write_map(const WriteVmConfig& cfg,
180180
const auto isSysVSegment =
181181
cfg.clone_leader->vm()->has_shm_at(map.map) ||
182182
cfg.clone_leader->vm()->has_shm_at(map.recorded_map);
183-
shared_anon.setSkipMonitoringMappedFd(map.monitored_shared_memory ==
184-
nullptr);
185183
shared_anon.setContentsPath(contents_path);
186184
shared_anon.setIsSysVSegment(isSysVSegment);
187185
} else {

src/rr_pcp.capnp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,22 @@ struct KernelMapping {
5959
offset @7 :UInt64;
6060
mapType :union {
6161
file :group { # mapping of a file
62-
skipMonitoringMappedFd @8 :Bool; # unsure if needed, or how it's used
63-
contentsPath @9 :Path;
62+
contentsPath @8 :Path;
6463
}
65-
guardSegment @10 :Void; # Empty map segment, PROT NONE, no pages in physical memory, no fsname
64+
guardSegment @9 :Void; # Empty map segment, PROT NONE, no pages in physical memory, no fsname
6665
# Mapping types below can all be compressed, as they need to be copied into the mapping anyhow
6766
sharedAnon :group {
68-
skipMonitoringMappedFd @11 :Bool; # unsure if needed, or how it's used
69-
contentsPath @12 :Path;
70-
isSysVSegment @13 :Bool; # if we're a SysV, we need to set AddressSpace::shm_sizes[start] = size;
67+
contentsPath @10 :Path;
68+
isSysVSegment @11 :Bool; # if we're a SysV, we need to set AddressSpace::shm_sizes[start] = size;
7169
}
7270
privateAnon :group { # e.g. stack, heap, etc
73-
contentsPath @14 :Path;
71+
contentsPath @12 :Path;
7472
}
7573
syscallBuffer :group {
76-
contentsPath @15 :Path;
74+
contentsPath @13 :Path;
7775
}
7876
rrPage :group {
79-
contentsPath @16 :Path;
77+
contentsPath @14 :Path;
8078
}
8179
}
8280
}

0 commit comments

Comments
 (0)