Add function MSG_comm_waitall for icomm and add one more example.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7999 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/.gitignore b/.gitignore
index dc5ffcb..16fcd3e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ examples/msg/mc/bugged3
 examples/msg/mc/random_test
 examples/simdag/ex_sd_seq_access
 examples/simdag/sd_seq_access
+examples/msg/icomms/peer
+examples/msg/icomms/peer2
 
 examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt

diff --git a/examples/msg/icomms/CMakeLists.txt b/examples/msg/icomms/CMakeLists.txt
index f3ec396..2ed45e8 100755 (executable)
--- a/examples/msg/icomms/CMakeLists.txt
+++ b/examples/msg/icomms/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 
-set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/irc_isend/")
+set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/examples/msg/icomms/")
 
 add_executable(peer peer.c)
-target_link_libraries(peer simgrid)
\ No newline at end of file
+target_link_libraries(peer simgrid)
+
+add_executable(peer2 peer2.c)
+target_link_libraries(peer2 simgrid)
\ No newline at end of file

diff --git a/examples/msg/icomms/deployment_peer.xml b/examples/msg/icomms/deployment_peer.xml
new file mode 100755 (executable)
index 0000000..b441518
--- /dev/null
+++ b/examples/msg/icomms/deployment_peer.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <!-- The master process (with some arguments) -->
+  <process host="Tremblay" function="sender">
+     <argument value="3"/>       <!-- Number of tasks -->
+     <argument value="50000000"/>  <!-- Computation size of tasks -->
+     <argument value="1000000"/>   <!-- Communication size of tasks -->
+     <argument value="1"/>         <!-- Number of receivers -->
+  </process>
+  <!-- The receiver processes -->
+  <process host="Ruby" function="receiver">
+    <argument value="0"/>
+  </process>
+</platform>

diff --git a/examples/msg/icomms/peer.tesh b/examples/msg/icomms/peer.tesh
index cd62f3f..393b0c1 100644 (file)
--- a/examples/msg/icomms/peer.tesh
+++ b/examples/msg/icomms/peer.tesh
@@ -1,60 +1,68 @@
 #! ./tesh
 
-p Testing an ireceive and isend application
 
-$ ./peer small_platform.xml deployment_peer01.xml 
+
+p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver
+
+$ ./peer small_platform.xml deployment_peer01.xml
 > [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.100000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 
+> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.100000
 > [Ruby:receiver:(2) 1.000000] [msg_test/INFO] Wait to receive a task
 > [Tremblay:sender:(1) 5.000000] [msg_test/INFO] Send to receiver-0 Task_0
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
+> [Ruby:receiver:(2) 5.100000] [msg_test/INFO] Received "Task_0"
+> [Ruby:receiver:(2) 5.100000] [msg_test/INFO] Processing "Task_0"
 > [Tremblay:sender:(1) 5.100000] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:sender:(1) 5.600000] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:sender:(1) 6.100000] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [Tremblay:sender:(1) 6.600000] [msg_test/INFO] Goodbye now!
-> [6.600000] [msg_test/INFO] Simulation time 6.6
+> [Ruby:receiver:(2) 5.609710] [msg_test/INFO] "Task_0" done
+> [Ruby:receiver:(2) 5.609710] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 5.700000] [msg_test/INFO] Send to receiver-0 Task_2
+> [Ruby:receiver:(2) 5.709710] [msg_test/INFO] Received "Task_1"
+> [Ruby:receiver:(2) 5.709710] [msg_test/INFO] Processing "Task_1"
+> [Ruby:receiver:(2) 6.219420] [msg_test/INFO] "Task_1" done
+> [Ruby:receiver:(2) 6.219420] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.300000] [msg_test/INFO] Send to receiver-0 finalize
+> [Ruby:receiver:(2) 6.319420] [msg_test/INFO] Received "Task_2"
+> [Ruby:receiver:(2) 6.319420] [msg_test/INFO] Processing "Task_2"
+> [Ruby:receiver:(2) 6.829130] [msg_test/INFO] "Task_2" done
+> [Ruby:receiver:(2) 6.829130] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.900000] [msg_test/INFO] Goodbye now!
+> [Ruby:receiver:(2) 6.929130] [msg_test/INFO] Received "finalize"
+> [Ruby:receiver:(2) 6.929130] [msg_test/INFO] I'm done. See you!
+> [6.929130] [msg_test/INFO] Simulation time 6.92913
 
-$ ./peer small_platform.xml deployment_peer02.xml 
+
+p Test2 MSG_comm_test() with Sleep_sender < Sleep_receiver
+
+$ ./peer small_platform.xml deployment_peer02.xml
 > [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.100000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 
+> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.100000
 > [Tremblay:sender:(1) 1.000000] [msg_test/INFO] Send to receiver-0 Task_0
 > [Ruby:receiver:(2) 5.000000] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
-> [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Processing "Task_0"
 > [Tremblay:sender:(1) 5.100000] [msg_test/INFO] Send to receiver-0 Task_1
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] "Task_0" done
-> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
-> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:sender:(1) 5.600000] [msg_test/INFO] Send to receiver-0 Task_2
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
-> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
-> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:sender:(1) 6.100000] [msg_test/INFO] Send to receiver-0 finalize
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
-> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
-> [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [Tremblay:sender:(1) 6.600000] [msg_test/INFO] Goodbye now!
-> [6.600000] [msg_test/INFO] Simulation time 6.6
+> [Ruby:receiver:(2) 5.100000] [msg_test/INFO] Received "Task_0"
+> [Ruby:receiver:(2) 5.100000] [msg_test/INFO] Processing "Task_0"
+> [Ruby:receiver:(2) 5.609710] [msg_test/INFO] "Task_0" done
+> [Ruby:receiver:(2) 5.609710] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 5.700000] [msg_test/INFO] Send to receiver-0 Task_2
+> [Ruby:receiver:(2) 5.709710] [msg_test/INFO] Received "Task_1"
+> [Ruby:receiver:(2) 5.709710] [msg_test/INFO] Processing "Task_1"
+> [Ruby:receiver:(2) 6.219420] [msg_test/INFO] "Task_1" done
+> [Ruby:receiver:(2) 6.219420] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.300000] [msg_test/INFO] Send to receiver-0 finalize
+> [Ruby:receiver:(2) 6.319420] [msg_test/INFO] Received "Task_2"
+> [Ruby:receiver:(2) 6.319420] [msg_test/INFO] Processing "Task_2"
+> [Ruby:receiver:(2) 6.829130] [msg_test/INFO] "Task_2" done
+> [Ruby:receiver:(2) 6.829130] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.900000] [msg_test/INFO] Goodbye now!
+> [Ruby:receiver:(2) 6.929130] [msg_test/INFO] Received "finalize"
+> [Ruby:receiver:(2) 6.929130] [msg_test/INFO] I'm done. See you!
+> [6.929130] [msg_test/INFO] Simulation time 6.92913
 
-$ ./peer small_platform.xml deployment_peer03.xml 
+
+p Test1 MSG_comm_wait() with Sleep_sender > Sleep_receiver
+
+$ ./peer small_platform.xml deployment_peer03.xml
 > [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.000000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 
+> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.000000
 > [Ruby:receiver:(2) 1.000000] [msg_test/INFO] Wait to receive a task
 > [Tremblay:sender:(1) 5.000000] [msg_test/INFO] Send to receiver-0 Task_0
 > [Ruby:receiver:(2) 5.016560] [msg_test/INFO] Received "Task_0"
@@ -77,9 +85,12 @@ $ ./peer small_platform.xml deployment_peer03.xml
 > [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
 > [6.580370] [msg_test/INFO] Simulation time 6.58037
 
-$ ./peer small_platform.xml deployment_peer04.xml 
+
+p Test2 MSG_comm_wait() with Sleep_sender < Sleep_receiver
+
+$ ./peer small_platform.xml deployment_peer04.xml
 > [Tremblay:sender:(1) 0.000000] [msg_test/INFO] sleep_start_time : 1.000000 , sleep_test_time : 0.000000
-> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 
+> [Ruby:receiver:(2) 0.000000] [msg_test/INFO] sleep_start_time : 5.000000 , sleep_test_time : 0.000000
 > [Tremblay:sender:(1) 1.000000] [msg_test/INFO] Send to receiver-0 Task_0
 > [Ruby:receiver:(2) 5.000000] [msg_test/INFO] Wait to receive a task
 > [Tremblay:sender:(1) 5.016560] [msg_test/INFO] Send to receiver-0 Task_1
@@ -100,4 +111,33 @@ $ ./peer small_platform.xml deployment_peer04.xml
 > [Tremblay:sender:(1) 6.580370] [msg_test/INFO] Goodbye now!
 > [Ruby:receiver:(2) 6.580370] [msg_test/INFO] Received "finalize"
 > [Ruby:receiver:(2) 6.580370] [msg_test/INFO] I'm done. See you!
-> [6.580370] [msg_test/INFO] Simulation time 6.58037
\ No newline at end of file
+> [6.580370] [msg_test/INFO] Simulation time 6.58037
+
+
+p Test1 MSG_comm_waitall() for sender 
+
+$ ./peer2 small_platform.xml deployment_peer.xml
+> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] Send to receiver-0 Task_0
+> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] Send to receiver-0 Task_1
+> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] Send to receiver-0 Task_2
+> [Tremblay:sender:(1) 0.000000] [msg_test/INFO] Send to receiver-0 finalize
+> [Tremblay:sender:(1) 0.000000] [msg_gos/INFO] NB_WAIT_TO_DO : 4
+> [Ruby:receiver:(2) 10.000000] [msg_test/INFO] Wait to receive a task
+> [Ruby:receiver:(2) 10.016560] [msg_test/INFO] Received "Task_0"
+> [Ruby:receiver:(2) 10.016560] [msg_test/INFO] Processing "Task_0"
+> [Ruby:receiver:(2) 10.526270] [msg_test/INFO] "Task_0" done
+> [Ruby:receiver:(2) 10.526270] [msg_test/INFO] Wait to receive a task
+> [Ruby:receiver:(2) 10.542830] [msg_test/INFO] Received "Task_1"
+> [Ruby:receiver:(2) 10.542830] [msg_test/INFO] Processing "Task_1"
+> [Ruby:receiver:(2) 11.052540] [msg_test/INFO] "Task_1" done
+> [Ruby:receiver:(2) 11.052540] [msg_test/INFO] Wait to receive a task
+> [Ruby:receiver:(2) 11.069100] [msg_test/INFO] Received "Task_2"
+> [Ruby:receiver:(2) 11.069100] [msg_test/INFO] Processing "Task_2"
+> [Ruby:receiver:(2) 11.578810] [msg_test/INFO] "Task_2" done
+> [Ruby:receiver:(2) 11.578810] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 11.580370] [msg_test/INFO] Goodbye now!
+> [Ruby:receiver:(2) 11.580370] [msg_test/INFO] Received "finalize"
+> [Ruby:receiver:(2) 11.580370] [msg_test/INFO] I'm done. See you!
+> [11.580370] [msg_test/INFO] Simulation time 11.5804
+
+

diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c
new file mode 100755 (executable)
index 0000000..0625a15
--- /dev/null
+++ b/examples/msg/icomms/peer2.c
@@ -0,0 +1,133 @@
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <stdio.h>
+#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h" /* calloc, printf */
+
+/* Create a log channel to have nice outputs. */
+#include "xbt/log.h"
+#include "xbt/asserts.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+
+int sender(int argc, char *argv[]);
+int receiver(int argc, char *argv[]);
+
+MSG_error_t test_all(const char *platform_file, const char *application_file);
+
+/** Sender function  */
+int sender(int argc, char *argv[])
+{
+  long number_of_tasks = atol(argv[1]);
+  double task_comp_size = atof(argv[2]);
+  double task_comm_size = atof(argv[3]);
+  long receivers_count = atol(argv[4]);
+
+  msg_comm_t *comm = malloc((number_of_tasks+receivers_count)*sizeof(msg_comm_t));
+  int i;
+  m_task_t task = NULL;
+  for (i = 0; i < number_of_tasks; i++)
+  {
+       char mailbox[256];
+       char sprintf_buffer[256];
+    sprintf(mailbox,"receiver-%ld",i % receivers_count);
+    sprintf(sprintf_buffer, "Task_%d", i);
+    task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
+    comm[i]=MSG_task_isend(task, mailbox);
+    INFO2("Send to receiver-%ld Task_%d",i % receivers_count,i);
+  }
+  for (i = 0; i < receivers_count; i++)
+  {
+    char mailbox[80];
+    sprintf(mailbox,"receiver-%ld",i % receivers_count);
+    task = MSG_task_create ("finalize", 0, 0, 0);
+    comm[i+number_of_tasks]=MSG_task_isend(task, mailbox);
+    INFO1("Send to receiver-%ld finalize",i % receivers_count);
+
+  }
+  /* Here we are waiting for the completion of all communications*/
+  MSG_comm_waitall(comm,(number_of_tasks+receivers_count),-1);
+
+  INFO0("Goodbye now!");
+  return 0;
+} /* end_of_sender */
+
+/** Receiver function  */
+int receiver(int argc, char *argv[])
+{
+  m_task_t task = NULL;
+  MSG_error_t res;
+  int id = -1;
+  char mailbox[80];
+  msg_comm_t res_irecv;
+  xbt_assert1(sscanf(argv[1],"%d", &id),
+        "Invalid argument %s\n",argv[1]);
+  MSG_process_sleep (10);
+  sprintf(mailbox,"receiver-%d",id);
+  while(1) {
+       res_irecv = MSG_task_irecv(&(task), mailbox);
+       INFO0("Wait to receive a task");
+       res = MSG_comm_wait(res_irecv,-1);
+       xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+       INFO1("Received \"%s\"", MSG_task_get_name(task));
+       if (!strcmp(MSG_task_get_name(task),"finalize")) {
+         MSG_task_destroy(task);
+         break;
+    }
+
+    INFO1("Processing \"%s\"", MSG_task_get_name(task));
+    MSG_task_execute(task);
+    INFO1("\"%s\" done", MSG_task_get_name(task));
+    MSG_task_destroy(task);
+    task = NULL;
+  }
+  INFO0("I'm done. See you!");
+  return 0;
+} /* end_of_receiver */
+
+/** Test function */
+MSG_error_t test_all(const char *platform_file,
+                           const char *application_file)
+{
+  MSG_error_t res = MSG_OK;
+
+  /* MSG_config("workstation/model","KCCFLN05"); */
+  {                            /*  Simulation setting */
+    MSG_set_channel_number(0);
+    MSG_create_environment(platform_file);
+  }
+  {                            /*   Application deployment */
+    MSG_function_register("sender", sender);
+    MSG_function_register("receiver", receiver);
+    MSG_launch_application(application_file);
+  }
+  res = MSG_main();
+  
+  INFO1("Simulation time %g",MSG_get_clock());
+  return res;
+} /* end_of_test_all */
+
+
+/** Main function */
+int main(int argc, char *argv[])
+{
+  MSG_error_t res = MSG_OK;
+
+  MSG_global_init(&argc,argv);
+  if (argc < 3) {
+     printf ("Usage: %s platform_file deployment_file\n",argv[0]);
+     printf ("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]);
+     exit(1);
+  }
+  res = test_all(argv[1],argv[2]);
+   SIMIX_message_sizes_output("toto.txt");
+  MSG_clean();
+
+  if(res==MSG_OK)
+    return 0;
+  else
+    return 1;
+} /* end_of_main */

diff --git a/include/msg/msg.h b/include/msg/msg.h
index afab0af..18c749f 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -170,6 +170,7 @@ XBT_PUBLIC(msg_comm_t)   MSG_task_irecv(m_task_t * task, const char *alias);
 XBT_PUBLIC(int)               MSG_comm_test(msg_comm_t comm);
 XBT_PUBLIC(void)              MSG_comm_destroy(msg_comm_t comm);
 XBT_PUBLIC(MSG_error_t) MSG_comm_wait(msg_comm_t comm,double timeout);
+XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t *comm,int nb_elem, double timeout);
 
 
 XBT_PUBLIC(int) MSG_task_listen(const char *alias);

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 6ad4005..b7a99af 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -514,6 +514,23 @@ MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout) {
        return res;
 }
 
+
+/* This function is called by a sender and permit to wait for each communication
+ *
+ * Param:
+ * - msg_comm_t *comm a vector of communication
+ * - int nb_elem is th esize of the comm vector
+ * - timeout for each call of  MSG_comm_wait
+ */
+
+void MSG_comm_waitall(msg_comm_t *comm,int nb_elem, double timeout) {
+       int i=0;
+       for(i=0; i<nb_elem; i++)
+       {
+               MSG_comm_wait(comm[i],timeout);
+       }
+}
+
 /** \ingroup msg_gos_functions
  * \brief Put a task on a channel of an host and waits for the end of the
  * transmission.