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
We have status, return its value.
[simgrid.git]
/
examples
/
msg
/
chainsend
/
peer.c
diff --git
a/examples/msg/chainsend/peer.c
b/examples/msg/chainsend/peer.c
index
cc9723c
..
fa91a7b
100644
(file)
--- a/
examples/msg/chainsend/peer.c
+++ b/
examples/msg/chainsend/peer.c
@@
-14,12
+14,11
@@
void peer_init_chain(peer_t peer, message_t msg)
peer->init = 1;
}
peer->init = 1;
}
-void peer_forward_msg(peer_t peer, message_t msg)
+
static
void peer_forward_msg(peer_t peer, message_t msg)
{
{
- int status;
msg_task_t task = task_message_data_new(peer->me, peer->next, NULL, 0);
msg_comm_t comm = NULL;
msg_task_t task = task_message_data_new(peer->me, peer->next, NULL, 0);
msg_comm_t comm = NULL;
- XBT_
INFO
("Sending (isend) from %s into mailbox %s", peer->me, peer->next);
+ XBT_
DEBUG
("Sending (isend) from %s into mailbox %s", peer->me, peer->next);
comm = MSG_task_isend(task, peer->next);
queue_pending_connection(comm, peer->pending_sends);
}
comm = MSG_task_isend(task, peer->next);
queue_pending_connection(comm, peer->pending_sends);
}
@@
-29,21
+28,21
@@
int peer_execute_task(peer_t peer, msg_task_t task)
int done = 0;
message_t msg = MSG_task_get_data(task);
int done = 0;
message_t msg = MSG_task_get_data(task);
-
//XBT_INFO
("Peer %s got message of type %d\n", peer->me, msg->type);
+
XBT_DEBUG
("Peer %s got message of type %d\n", peer->me, msg->type);
switch (msg->type) {
case MESSAGE_BUILD_CHAIN:
peer_init_chain(peer, msg);
break;
case MESSAGE_SEND_DATA:
switch (msg->type) {
case MESSAGE_BUILD_CHAIN:
peer_init_chain(peer, msg);
break;
case MESSAGE_SEND_DATA:
- xbt_assert(peer->init,
__FILE__ ":
peer_execute_task() failed: got msg_type %d before initialization", msg->type);
+ xbt_assert(peer->init,
"
peer_execute_task() failed: got msg_type %d before initialization", msg->type);
if (peer->next != NULL)
peer_forward_msg(peer, msg);
peer->pieces++;
break;
case MESSAGE_END_DATA:
if (peer->next != NULL)
peer_forward_msg(peer, msg);
peer->pieces++;
break;
case MESSAGE_END_DATA:
- xbt_assert(peer->init,
__FILE__ ":
peer_execute_task() failed: got msg_type %d before initialization", msg->type);
+ xbt_assert(peer->init,
"
peer_execute_task() failed: got msg_type %d before initialization", msg->type);
done = 1;
done = 1;
- XBT_
INFO
("%d pieces receieved", peer->pieces);
+ XBT_
DEBUG
("%d pieces receieved", peer->pieces);
break;
}
break;
}
@@
-65,7
+64,7
@@
msg_error_t peer_wait_for_message(peer_t peer)
if (MSG_comm_test(comm)) {
status = MSG_comm_get_status(comm);
if (MSG_comm_test(comm)) {
status = MSG_comm_get_status(comm);
-
//XBT_INFO
("peer_wait_for_message: error code = %d", status);
+
XBT_DEBUG
("peer_wait_for_message: error code = %d", status);
xbt_assert(status == MSG_OK, "peer_wait_for_message() failed");
MSG_comm_destroy(comm);
comm = NULL;
xbt_assert(status == MSG_OK, "peer_wait_for_message() failed");
MSG_comm_destroy(comm);
comm = NULL;
@@
-128,7
+127,7
@@
int peer(int argc, char *argv[])
status = peer_wait_for_message(p);
peer_shutdown(p);
status = peer_wait_for_message(p);
peer_shutdown(p);
- return
MSG_OK
;
+ return
status
;
} /* end_of_receiver */
} /* end_of_receiver */