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] Cleanup mc_hash
[simgrid.git]
/
src
/
mc
/
mc_global.cpp
diff --git
a/src/mc/mc_global.cpp
b/src/mc/mc_global.cpp
index
a307445
..
1df6abe
100644
(file)
--- a/
src/mc/mc_global.cpp
+++ b/
src/mc/mc_global.cpp
@@
-192,11
+192,10
@@
int MC_deadlock_check()
{
if (mc_mode == MC_MODE_SERVER) {
int res;
- if ((res = MC_protocol_send_simple_message(mc_model_checker->process().socket,
- MC_MESSAGE_DEADLOCK_CHECK)))
+ if ((res = mc_model_checker->process().send_message(MC_MESSAGE_DEADLOCK_CHECK)))
xbt_die("Could not check deadlock state");
s_mc_int_message_t message;
- ssize_t s =
MC_receive_message(mc_model_checker->process().socket, &message, sizeof(message), 0
);
+ ssize_t s =
mc_model_checker->process().receive_message(message
);
if (s == -1)
xbt_die("Could not receive message");
else if (s != sizeof(message) || message.type != MC_MESSAGE_DEADLOCK_CHECK_REPLY) {
@@
-411,8
+410,8
@@
void MC_show_stack_safety(xbt_fifo_t stack)
char *req_str = NULL;
for (item = xbt_fifo_get_last_item(stack);
- (item ? (state = (mc_state_t) (xbt_fifo_get_item_content(item)))
- : (NULL)); item = xbt_fifo_get_prev_item(item)) {
+ item; item = xbt_fifo_get_prev_item(item)) {
+ state = (mc_state_t)xbt_fifo_get_item_content(item);
req = MC_state_get_executed_request(state, &value);
if (req) {
req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED);
@@
-456,8
+455,8
@@
void MC_show_stack_liveness(xbt_fifo_t stack)
char *req_str = NULL;
for (item = xbt_fifo_get_last_item(stack);
- (item ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL));
- item = xbt_fifo_get_prev_item(item)) {
+ item; item = xbt_fifo_get_prev_item(item)) {
+ pair = (mc_pair_t) xbt_fifo_get_item_content(item);
req = MC_state_get_executed_request(pair->graph_state, &value);
if (req && req->call != SIMCALL_NONE) {
req_str = MC_request_to_string(req, value, MC_REQUEST_EXECUTED);