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] Make Process:cache_flags private
[simgrid.git]
/
src
/
mc
/
ModelChecker.cpp
diff --git
a/src/mc/ModelChecker.cpp
b/src/mc/ModelChecker.cpp
index
9289500
..
6ff138a
100644
(file)
--- a/
src/mc/ModelChecker.cpp
+++ b/
src/mc/ModelChecker.cpp
@@
-32,12
+32,8
@@
#include "src/mc/mc_exit.h"
#include "src/mc/mc_liveness.h"
#include "src/mc/mc_exit.h"
#include "src/mc/mc_liveness.h"
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
-}
-
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
using simgrid::mc::remote;
::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
using simgrid::mc::remote;
@@
-92,7
+88,7
@@
void ModelChecker::start()
// Prepare data for poll:
struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX];
// Prepare data for poll:
struct pollfd* socket_pollfd = &fds_[SOCKET_FD_INDEX];
- socket_pollfd->fd = process_->
socket();
;
+ socket_pollfd->fd = process_->
getChannel().getSocket()
;
socket_pollfd->events = POLLIN;
socket_pollfd->revents = 0;
socket_pollfd->events = POLLIN;
socket_pollfd->revents = 0;
@@
-177,10
+173,10
@@
void ModelChecker::shutdown()
void ModelChecker::resume(simgrid::mc::Process& process)
{
void ModelChecker::resume(simgrid::mc::Process& process)
{
- int res = process.
send_message
(MC_MESSAGE_CONTINUE);
+ int res = process.
getChannel().send
(MC_MESSAGE_CONTINUE);
if (res)
throw simgrid::xbt::errno_error(res);
if (res)
throw simgrid::xbt::errno_error(res);
- process.c
ache_flags = (mc_process_cache_flags_t) 0
;
+ process.c
lear_cache()
;
}
static
}
static
@@
-259,13
+255,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); }
);
@@
-314,14
+310,13
@@
bool ModelChecker::handle_events()
if (socket_pollfd->revents) {
if (socket_pollfd->revents & POLLIN) {
if (socket_pollfd->revents) {
if (socket_pollfd->revents & POLLIN) {
- ssize_t size =
MC_receive_message(socket_pollfd->fd, buffer, sizeof(buffer), MSG_DONTWAIT
);
+ ssize_t size =
process_->getChannel().receive(buffer, sizeof(buffer), false
);
if (size == -1 && errno != EAGAIN)
throw simgrid::xbt::errno_error(errno);
return handle_message(buffer, size);
}
if (size == -1 && errno != EAGAIN)
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
+326,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
+421,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)
@@
-440,12
+433,11
@@
void ModelChecker::simcall_handle(simgrid::mc::Process& process, unsigned long p
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = pid;
m.value = value;
m.type = MC_MESSAGE_SIMCALL_HANDLE;
m.pid = pid;
m.value = value;
- process.
send_message
(m);
- process.c
ache_flags = (mc_process_cache_flags_t) 0
;
- while (process.running())
{
+ process.
getChannel().send
(m);
+ process.c
lear_cache()
;
+ while (process.running())
if (!this->handle_events())
return;
if (!this->handle_events())
return;
- }
}
}
}
}