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
[mc] Simplify the control flow
[simgrid.git]
/
src
/
mc
/
Process.cpp
diff --git
a/src/mc/Process.cpp
b/src/mc/Process.cpp
index
c4c951a
..
5f52f50
100644
(file)
--- a/
src/mc/Process.cpp
+++ b/
src/mc/Process.cpp
@@
-130,9
+130,9
@@
static ssize_t pread_whole(int fd, void *buf, size_t count, std::uint64_t offset
count -= res;
buffer += res;
offset += res;
count -= res;
buffer += res;
offset += res;
- } else if (res==0)
{
+ } else if (res==0)
return -1;
return -1;
-
}
else if (errno != EINTR) {
+ else if (errno != EINTR) {
perror("pread_whole");
return -1;
}
perror("pread_whole");
return -1;
}
@@
-150,11
+150,10
@@
static ssize_t pwrite_whole(int fd, const void *buf, size_t count, off_t offset)
count -= res;
buffer += res;
offset += res;
count -= res;
buffer += res;
offset += res;
- } else if (res==0)
{
+ } else if (res==0)
return -1;
return -1;
- } else if (errno != EINTR) {
+ else if (errno != EINTR)
return -1;
return -1;
- }
}
return real_count;
}
}
return real_count;
}
@@
-389,34
+388,28
@@
void Process::init_memory_map_info()
std::shared_ptr<simgrid::mc::ObjectInformation> Process::find_object_info(RemotePtr<void> addr) const
{
std::shared_ptr<simgrid::mc::ObjectInformation> Process::find_object_info(RemotePtr<void> addr) const
{
- for (auto const& object_info : this->object_infos)
{
+ for (auto const& object_info : this->object_infos)
if (addr.address() >= (std::uint64_t)object_info->start
if (addr.address() >= (std::uint64_t)object_info->start
- && addr.address() <= (std::uint64_t)object_info->end)
{
+ && addr.address() <= (std::uint64_t)object_info->end)
return object_info;
return object_info;
- }
- }
return nullptr;
}
std::shared_ptr<ObjectInformation> Process::find_object_info_exec(RemotePtr<void> addr) const
{
return nullptr;
}
std::shared_ptr<ObjectInformation> Process::find_object_info_exec(RemotePtr<void> addr) const
{
- for (std::shared_ptr<ObjectInformation> const& info : this->object_infos)
{
+ for (std::shared_ptr<ObjectInformation> const& info : this->object_infos)
if (addr.address() >= (std::uint64_t) info->start_exec
if (addr.address() >= (std::uint64_t) info->start_exec
- && addr.address() <= (std::uint64_t) info->end_exec)
{
+ && addr.address() <= (std::uint64_t) info->end_exec)
return info;
return info;
- }
- }
return nullptr;
}
std::shared_ptr<ObjectInformation> Process::find_object_info_rw(RemotePtr<void> addr) const
{
return nullptr;
}
std::shared_ptr<ObjectInformation> Process::find_object_info_rw(RemotePtr<void> addr) const
{
- for (std::shared_ptr<ObjectInformation> const& info : this->object_infos)
{
+ for (std::shared_ptr<ObjectInformation> const& info : this->object_infos)
if (addr.address() >= (std::uint64_t)info->start_rw
if (addr.address() >= (std::uint64_t)info->start_rw
- && addr.address() <= (std::uint64_t)info->end_rw)
{
+ && addr.address() <= (std::uint64_t)info->end_rw)
return info;
return info;
- }
- }
return nullptr;
}
return nullptr;
}
@@
-589,16
+582,14
@@
void Process::ignore_region(std::uint64_t addr, std::size_t size)
std::size_t position;
if (current_region->addr == addr) {
std::size_t position;
if (current_region->addr == addr) {
- if (current_region->size < size)
{
+ if (current_region->size < size)
position = cursor + 1;
position = cursor + 1;
- } else {
+ else
position = cursor;
position = cursor;
- }
- } else if (current_region->addr < addr) {
+ } else if (current_region->addr < addr)
position = cursor + 1;
position = cursor + 1;
- } else {
+ else
position = cursor;
position = cursor;
- }
ignored_regions_.insert(
ignored_regions_.begin() + position, region);
}
ignored_regions_.insert(
ignored_regions_.begin() + position, region);
}
@@
-698,13
+689,11
@@
void Process::ignore_local_variable(const char *var_name, const char *frame_name
info->remove_local_variable(var_name, frame_name);
}
info->remove_local_variable(var_name, frame_name);
}
-
boost::iterator_range<s_mc_smx_process_info*>
Process::simix_processes()
+
std::vector<simgrid::mc::SimixProcessInformation>&
Process::simix_processes()
{
xbt_assert(mc_mode != MC_MODE_CLIENT);
MC_process_smx_refresh(&mc_model_checker->process());
{
xbt_assert(mc_mode != MC_MODE_CLIENT);
MC_process_smx_refresh(&mc_model_checker->process());
- return boost::iterator_range<s_mc_smx_process_info*>(
- &*smx_process_infos.begin(),
- &*smx_process_infos.end());
+ return smx_process_infos;
}
}
}
}