X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c882e24932c718fad85c22cb546f30e158f1b31d..f914c94fcd14228f2b19d4bc29da518cad6755c0:/examples/msg/chainsend/peer.c

diff --git a/examples/msg/chainsend/peer.c b/examples/msg/chainsend/peer.c
index 5605c88dd8..4d0f9a07df 100644
--- a/examples/msg/chainsend/peer.c
+++ b/examples/msg/chainsend/peer.c
@@ -11,12 +11,13 @@ void peer_init_chain(peer_t peer, message_t msg)
 {
   peer->prev = msg->prev_hostname;
   peer->next = msg->next_hostname;
+  peer->total_pieces = msg->num_pieces;
   peer->init = 1;
 }
 
 static void peer_forward_msg(peer_t peer, message_t msg)
 {
-  msg_task_t task = task_message_data_new(peer->me, peer->next, NULL, 0);
+  msg_task_t task = task_message_data_new(peer->me, peer->next, NULL, msg->data_length);
   msg_comm_t comm = NULL;
   XBT_DEBUG("Sending (isend) from %s into mailbox %s", peer->me, peer->next);
   comm = MSG_task_isend(task, peer->next);
@@ -38,11 +39,11 @@ int peer_execute_task(peer_t peer, msg_task_t task)
       if (peer->next != NULL)
         peer_forward_msg(peer, msg);
       peer->pieces++;
-      break;
-    case MESSAGE_END_DATA:
-      xbt_assert(peer->init, "peer_execute_task() failed: got msg_type %d before initialization", msg->type);
-      done = 1;
-      XBT_DEBUG("%d pieces receieved", peer->pieces);
+      peer->bytes += msg->data_length;
+      if (peer->pieces >= peer->total_pieces) {
+        XBT_DEBUG("%d pieces receieved", peer->pieces);
+        done = 1;
+      }
       break;
   }
 
@@ -56,25 +57,28 @@ msg_error_t peer_wait_for_message(peer_t peer)
   msg_error_t status;
   msg_comm_t comm = NULL;
   msg_task_t task = NULL;
+  int idx = -1;
   int done = 0;
 
   while (!done) {
-    if (comm == NULL) // FIXME I should have a recv queue
-      comm = MSG_task_irecv(&task, peer->me);
+    comm = MSG_task_irecv(&task, peer->me);
+    queue_pending_connection(comm, peer->pending_recvs);
 
-    if (MSG_comm_test(comm)) {
+    if ((idx = MSG_comm_waitany(peer->pending_recvs)) != -1) {
+      comm = xbt_dynar_get_as(peer->pending_recvs, idx, msg_comm_t);
       status = MSG_comm_get_status(comm);
       XBT_DEBUG("peer_wait_for_message: error code = %d", status);
       xbt_assert(status == MSG_OK, "peer_wait_for_message() failed");
+
+      task = MSG_comm_get_task(comm);
       MSG_comm_destroy(comm);
-      comm = NULL;
+      xbt_dynar_cursor_rm(peer->pending_recvs, (unsigned int*)&idx);
       done = peer_execute_task(peer, task);
+
       task_message_delete(task);
       task = NULL;
-    } else {
-      process_pending_connections(peer->pending_sends);
-      MSG_process_sleep(0.01);
     }
+    process_pending_connections(peer->pending_sends);
   }
 
   return status;
@@ -86,7 +90,8 @@ void peer_init(peer_t p, int argc, char *argv[])
   p->prev = NULL;
   p->next = NULL;
   p->pieces = 0;
-  p->close_asap = 0;
+  p->bytes = 0;
+  p->pending_recvs = xbt_dynar_new(sizeof(msg_comm_t), NULL);
   p->pending_sends = xbt_dynar_new(sizeof(msg_comm_t), NULL);
   p->me = xbt_new(char, HOSTNAME_LENGTH);
   /* Set mailbox name: use host number from argv or hostname if no argument given */
@@ -99,35 +104,50 @@ void peer_init(peer_t p, int argc, char *argv[])
 
 void peer_shutdown(peer_t p)
 {
-  float start_time = MSG_get_clock();
-  float end_time = start_time + PEER_SHUTDOWN_DEADLINE;
+  unsigned int size = xbt_dynar_length(p->pending_sends);
+  unsigned int idx;
+  msg_comm_t *comms = xbt_new(msg_comm_t, size);
 
-  XBT_INFO("Waiting for sends to finish before shutdown...");
-  while (xbt_dynar_length(p->pending_sends) && MSG_get_clock() < end_time) {
-    process_pending_connections(p->pending_sends);
-    MSG_process_sleep(1);
+  for (idx = 0; idx < size; idx++) {
+    comms[idx] = xbt_dynar_get_as(p->pending_sends, idx, msg_comm_t);
   }
 
-  xbt_assert(xbt_dynar_length(p->pending_sends) == 0, "Shutdown failed, sends still pending after deadline");
+  XBT_DEBUG("Waiting for sends to finish before shutdown...");
+  MSG_comm_waitall(comms, size, PEER_SHUTDOWN_DEADLINE);
+
+  xbt_free(comms);
+}
+
+void peer_delete(peer_t p)
+{
+  xbt_dynar_free(&p->pending_recvs);
   xbt_dynar_free(&p->pending_sends);
   xbt_free(p->me);
 
   xbt_free(p);
 }
 
+void peer_print_stats(peer_t p, float elapsed_time)
+{
+  XBT_INFO("### %f %llu bytes (Avg %f MB/s); copy finished (simulated).", elapsed_time, p->bytes, p->bytes / 1024.0 / 1024.0 / elapsed_time); 
+}
+
 /** Peer function  */
 int peer(int argc, char *argv[])
 {
+  float start_time, end_time;
   peer_t p = xbt_new(s_peer_t, 1);
   msg_error_t status;
 
-  XBT_INFO("peer");
+  XBT_DEBUG("peer");
 
   peer_init(p, argc, argv);
+  start_time = MSG_get_clock();
   status = peer_wait_for_message(p);
   peer_shutdown(p);
+  end_time = MSG_get_clock();
+  peer_print_stats(p, end_time - start_time);
+  peer_delete(p);
 
   return status;
 }                               /* end_of_receiver */
-
-