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
[simix] Create a (fake) simcall for creating a process directly from a simgrid::simix...
[simgrid.git]
/
src
/
mc
/
Client.cpp
diff --git
a/src/mc/Client.cpp
b/src/mc/Client.cpp
index
fbbbe92
..
cf7398d
100644
(file)
--- a/
src/mc/Client.cpp
+++ b/
src/mc/Client.cpp
@@
-14,6
+14,9
@@
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/mmalloc.h>
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/mmalloc.h>
+#include <xbt/swag.h>
+
+#include <simgrid/modelchecker.h>
#include "src/internal_config.h"
#include "src/internal_config.h"
@@
-43,10
+46,7
@@
Client* Client::initialize()
if (client_)
return client_.get();
if (client_)
return client_.get();
- // Check and set the mode:
- if (mc_mode != MC_MODE_NONE)
- abort();
- mc_mode = MC_MODE_CLIENT;
+ _sg_do_model_check = 1;
// Fetch socket from MC_ENV_SOCKET_FD:
char* fd_env = std::getenv(MC_ENV_SOCKET_FD);
// Fetch socket from MC_ENV_SOCKET_FD:
char* fd_env = std::getenv(MC_ENV_SOCKET_FD);
@@
-67,7
+67,7
@@
Client* Client::initialize()
client_ = std::unique_ptr<Client>(new simgrid::mc::Client(fd));
// Wait for the model-checker:
client_ = std::unique_ptr<Client>(new simgrid::mc::Client(fd));
// Wait for the model-checker:
- if (ptrace(PTRACE_TRACEME, 0, nullptr,
NULL
) == -1 || raise(SIGSTOP) != 0)
+ if (ptrace(PTRACE_TRACEME, 0, nullptr,
nullptr
) == -1 || raise(SIGSTOP) != 0)
xbt_die("Could not wait for the model-checker");
client_->handleMessages();
xbt_die("Could not wait for the model-checker");
client_->handleMessages();
@@
-143,8
+143,7
@@
void Client::handleMessages()
break;
default:
break;
default:
- xbt_die("%s received unexpected message %s (%i)",
- MC_mode_name(mc_mode),
+ xbt_die("Received unexpected message %s (%i)",
MC_message_type_name(message.type),
message.type
);
MC_message_type_name(message.type),
message.type
);
@@
-155,10
+154,10
@@
void Client::handleMessages()
void Client::mainLoop(void)
{
while (1) {
void Client::mainLoop(void)
{
while (1) {
+ simgrid::mc::wait_for_requests();
if (channel_.send(MC_MESSAGE_WAITING))
xbt_die("Could not send WAITING mesage to model-checker");
this->handleMessages();
if (channel_.send(MC_MESSAGE_WAITING))
xbt_die("Could not send WAITING mesage to model-checker");
this->handleMessages();
- simgrid::mc::wait_for_requests();
}
}
}
}