Add an example for isend and ireceive functions.

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

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 67417a7..1e7ce2f 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -172,6 +172,9 @@ ELSE(${ARCH_32_BITS})
 ENDIF(${ARCH_32_BITS})
 ADD_TEST(gras-properties-sg    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/properties test_sg)
 
+# isend ireceive
+add_test(irc_isend_peer ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/irc_isend peer.tesh)
+
 # amok examples
 ADD_TEST(amok-bandwidth-rl     ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/amok bandwidth/bandwidth_rl.tesh)
 ADD_TEST(amok-saturate-rl      ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/amok saturate/saturate_rl.tesh)

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 58046e1..ae81e3d 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -140,6 +140,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/tracing)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/irc_isend)
 
 if(HAVE_MC)
        add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/mc)

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

diff --git a/examples/msg/irc_isend/deployment_peer01.xml b/examples/msg/irc_isend/deployment_peer01.xml
new file mode 100755 (executable)
index 0000000..cb449e7
--- /dev/null
+++ b/examples/msg/irc_isend/deployment_peer01.xml
@@ -0,0 +1,18 @@
+<?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 -->
+     <argument value="5"/>         <!-- Sleep_start_time -->
+     <argument value="0.1"/>      <!-- Time for test -->
+  </process>
+  <!-- The receiver processes -->
+  <process host="Ruby" function="receiver">
+    <argument value="0"/>
+    <argument value="1"/>         <!-- Sleep_start_time -->
+  </process>
+</platform>

diff --git a/examples/msg/irc_isend/deployment_peer02.xml b/examples/msg/irc_isend/deployment_peer02.xml
new file mode 100755 (executable)
index 0000000..23cabf6
--- /dev/null
+++ b/examples/msg/irc_isend/deployment_peer02.xml
@@ -0,0 +1,18 @@
+<?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 -->
+     <argument value="1"/>         <!-- Sleep_start_time -->
+     <argument value="0.1"/>      <!-- Time for test -->
+  </process>
+  <!-- The receiver processes -->
+  <process host="Ruby" function="receiver">
+    <argument value="0"/>
+    <argument value="5"/>         <!-- Sleep_start_time -->
+  </process>
+</platform>

diff --git a/examples/msg/irc_isend/deployment_peer03.xml b/examples/msg/irc_isend/deployment_peer03.xml
new file mode 100755 (executable)
index 0000000..8ffcbb8
--- /dev/null
+++ b/examples/msg/irc_isend/deployment_peer03.xml
@@ -0,0 +1,18 @@
+<?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 -->
+     <argument value="5"/>         <!-- Sleep_start_time -->
+     <argument value="0"/>      <!-- Time for test -->
+  </process>
+  <!-- The receiver processes -->
+  <process host="Ruby" function="receiver">
+    <argument value="0"/>
+    <argument value="1"/>         <!-- Sleep_start_time -->
+  </process>
+</platform>

diff --git a/examples/msg/irc_isend/deployment_peer04.xml b/examples/msg/irc_isend/deployment_peer04.xml
new file mode 100755 (executable)
index 0000000..9df7712
--- /dev/null
+++ b/examples/msg/irc_isend/deployment_peer04.xml
@@ -0,0 +1,19 @@
+<?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 -->
+     <argument value="1"/>         <!-- Sleep_start_time -->
+     <argument value="0"/>      <!-- Time for test -->
+  </process>
+  <!-- The receiver processes -->
+  <process host="Ruby" function="receiver">
+    <argument value="0"/>
+    <argument value="5"/>         <!-- Sleep_start_time -->
+  </process>
+</platform>
+

diff --git a/examples/msg/irc_isend/peer.c b/examples/msg/irc_isend/peer.c
new file mode 100755 (executable)
index 0000000..9f7ed8c
--- /dev/null
+++ b/examples/msg/irc_isend/peer.c
@@ -0,0 +1,170 @@
+/* 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]);
+  double sleep_start_time = atof(argv[5]);
+  double sleep_test_time = atof(argv[6]);
+
+  INFO2("sleep_start_time : %f , sleep_test_time : %f",sleep_start_time,sleep_test_time);
+
+  msg_comm_t comm = NULL;
+  int i;
+  m_task_t task = NULL;
+  MSG_process_sleep (sleep_start_time);
+  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=MSG_task_isend(task, mailbox);
+    INFO2("Send to receiver-%ld Task_%d",i % receivers_count,i);
+
+    if(sleep_test_time == 0)
+    {
+       MSG_comm_wait(comm,-1);
+    }
+    else
+    {
+               while(MSG_comm_test(comm) == 0){
+                       MSG_process_sleep (sleep_test_time);
+               };
+               MSG_comm_destroy(comm);
+    }
+
+  }
+
+  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 = MSG_task_isend(task, mailbox);
+    INFO1("Send to receiver-%ld finalize",i % receivers_count);
+    if(sleep_test_time == 0)
+    {
+       MSG_comm_wait(comm,-1);
+    }
+    else
+    {
+               while(MSG_comm_test(comm) == 0){
+                       MSG_process_sleep (sleep_test_time);
+               };
+               MSG_comm_destroy(comm);
+    }
+
+  }
+
+  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;
+  int result=0;
+  double sleep_start_time = atof(argv[2]);
+  INFO1("sleep_start_time : %f ",sleep_start_time);
+
+  xbt_assert1(sscanf(argv[1],"%d", &id),
+        "Invalid argument %s\n",argv[1]);
+
+  MSG_process_sleep (sleep_start_time);
+
+  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/examples/msg/irc_isend/peer.tesh b/examples/msg/irc_isend/peer.tesh
new file mode 100644 (file)
index 0000000..cd62f3f
--- /dev/null
+++ b/examples/msg/irc_isend/peer.tesh
@@ -0,0 +1,103 @@
+#! ./tesh
+
+p Testing an ireceive and isend application
+
+$ ./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) 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"
+> [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
+
+$ ./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 
+> [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
+
+$ ./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) 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"
+> [Tremblay:sender:(1) 5.016560] [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
+> [Tremblay:sender:(1) 5.542830] [msg_test/INFO] Send to receiver-0 Task_2
+> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
+> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
+> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
+> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.069100] [msg_test/INFO] Send to receiver-0 finalize
+> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
+> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
+> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
+> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
+> [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
+
+$ ./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 
+> [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
+> [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.526270] [msg_test/INFO] "Task_0" done
+> [Ruby:receiver:(2) 5.526270] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 5.542830] [msg_test/INFO] Send to receiver-0 Task_2
+> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Received "Task_1"
+> [Ruby:receiver:(2) 5.542830] [msg_test/INFO] Processing "Task_1"
+> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] "Task_1" done
+> [Ruby:receiver:(2) 6.052540] [msg_test/INFO] Wait to receive a task
+> [Tremblay:sender:(1) 6.069100] [msg_test/INFO] Send to receiver-0 finalize
+> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Received "Task_2"
+> [Ruby:receiver:(2) 6.069100] [msg_test/INFO] Processing "Task_2"
+> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] "Task_2" done
+> [Ruby:receiver:(2) 6.578810] [msg_test/INFO] Wait to receive a task
+> [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

diff --git a/examples/msg/irc_isend/small_platform.xml b/examples/msg/irc_isend/small_platform.xml
new file mode 100755 (executable)
index 0000000..fb92722
--- /dev/null
+++ b/examples/msg/irc_isend/small_platform.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
+  <!-- ljlkj -->
+  <host id="Tremblay" power="98095000"/>
+  <host id="Ruby" power="98095000"/>
+  <host id="Perl" power="98095000"/>
+  <host id="Java" power="98095000"/>
+  <link id="1" bandwidth="498000000" latency="0.00015" sharing_policy="FATPIPE"/>
+  <link id="2" bandwidth="498000000" latency="0.00015" sharing_policy="FATPIPE"/>
+  <link id="3" bandwidth="498000000" latency="0.00015" sharing_policy="FATPIPE"/>
+  <route src="Tremblay" dst="Ruby"><link:ctn id="1"/></route>
+  <route src="Ruby" dst="Tremblay"><link:ctn id="1"/></route>
+  <route src="Tremblay" dst="Perl"><link:ctn id="2"/></route>
+  <route src="Perl" dst="Tremblay"><link:ctn id="2"/></route>
+  <route src="Tremblay" dst="Java"><link:ctn id="3"/></route>
+  <route src="Java" dst="Tremblay"><link:ctn id="3"/></route>
+</platform>