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
empty portable.h and spread the include in files
[simgrid.git]
/
src
/
mc
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
9289500
..
636f3ec
100644
(file)
--- a/
src/mc/ModelChecker.cpp
+++ b/
src/mc/ModelChecker.cpp
@@
-259,13
+259,13
@@
bool ModelChecker::handle_message(char* buffer, ssize_t size)
xbt_die("Support for client-side function proposition is not implemented.");
XBT_DEBUG("Received symbol: %s", message.name);
xbt_die("Support for client-side function proposition is not implemented.");
XBT_DEBUG("Received symbol: %s", message.name);
- if (
_mc_
property_automaton == nullptr)
-
_mc_
property_automaton = xbt_automaton_new();
+ if (
simgrid::mc::
property_automaton == nullptr)
+
simgrid::mc::
property_automaton = xbt_automaton_new();
simgrid::mc::Process* process = &this->process();
simgrid::mc::Process* process = &this->process();
- simgrid::mc::
remote_p
tr<int> address
+ simgrid::mc::
RemoteP
tr<int> address
= simgrid::mc::remote((int*) message.data);
= simgrid::mc::remote((int*) message.data);
- simgrid::xbt::add_proposition(
_mc_
property_automaton,
+ simgrid::xbt::add_proposition(
simgrid::mc::
property_automaton,
message.name,
[process, address]() { return process->read(address); }
);
message.name,
[process, address]() { return process->read(address); }
);
@@
-319,9
+319,8
@@
bool ModelChecker::handle_events()
throw simgrid::xbt::errno_error(errno);
return handle_message(buffer, size);
}
throw simgrid::xbt::errno_error(errno);
return handle_message(buffer, size);
}
- if (socket_pollfd->revents & POLLERR)
{
+ if (socket_pollfd->revents & POLLERR)
throw_socket_error(socket_pollfd->fd);
throw_socket_error(socket_pollfd->fd);
- }
if (socket_pollfd->revents & POLLHUP)
xbt_die("Socket hang up?");
}
if (socket_pollfd->revents & POLLHUP)
xbt_die("Socket hang up?");
}
@@
-331,9
+330,8
@@
bool ModelChecker::handle_events()
this->handle_signals();
return true;
}
this->handle_signals();
return true;
}
- if (signalfd_pollfd->revents & POLLERR)
{
+ if (signalfd_pollfd->revents & POLLERR)
throw_socket_error(signalfd_pollfd->fd);
throw_socket_error(signalfd_pollfd->fd);
- }
if (signalfd_pollfd->revents & POLLHUP)
xbt_die("Signalfd hang up?");
}
if (signalfd_pollfd->revents & POLLHUP)
xbt_die("Signalfd hang up?");
}
@@
-427,10
+425,9
@@
void ModelChecker::on_signal(const struct signalfd_siginfo* info)
void ModelChecker::wait_client(simgrid::mc::Process& process)
{
this->resume(process);
void ModelChecker::wait_client(simgrid::mc::Process& process)
{
this->resume(process);
- while (this->process().running())
{
+ while (this->process().running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value)
}
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long pid, int value)
@@
-442,10
+439,9
@@
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long p
m.value = value;
process.send_message(m);
process.cache_flags = (mc_process_cache_flags_t) 0;
m.value = value;
process.send_message(m);
process.cache_flags = (mc_process_cache_flags_t) 0;
- while (process.running())
{
+ while (process.running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
}
}
}