Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Avoid a name conflict with /usr/include/sys/wait.h on mac (at least)
[simgrid.git] / examples / msg / actions / actions.c
index 9f79b73..41d35f9 100644 (file)
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
 #include "xbt.h"                /* calloc, printf */
-
+#include "simgrid_config.h"     /* getline */
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                  "Messages specific for this msg example");
@@ -18,6 +18,7 @@ int communicator_size=0;
 typedef struct coll_ctr_t{
   int bcast_counter;
   int reduce_counter;
+  int allReduce_counter;
 } *coll_ctr;
 
 /* Helper function */
@@ -38,16 +39,17 @@ static void send(xbt_dynar_t action)
   char *name = xbt_str_join(action, " ");
   char *to = xbt_dynar_get_as(action, 2, char *);
   char *size = xbt_dynar_get_as(action, 3, char *);
-  INFO2("Send: %s (size: %lg)", name, parse_double(size));
+  double clock = MSG_get_clock();
+  DEBUG2("Entering Send: %s (size: %lg)", name, parse_double(size));
   MSG_task_send(MSG_task_create(name, 0, parse_double(size), NULL), to);
-  INFO1("Sent %s", name);
+  INFO2("%s %f", name, MSG_get_clock()-clock);
   free(name);
 }
 
 
 static int spawned_send(int argc, char *argv[])
 {
-  INFO3("%s: Sending %s on %s", MSG_process_self()->name, 
+  DEBUG3("%s: Sending %s on %s", MSG_process_self()->name, 
        argv[1],argv[0]);
   MSG_task_send(MSG_task_create(argv[0], 0, parse_double(argv[1]), NULL), 
                argv[0]);
@@ -61,9 +63,9 @@ static void Isend(xbt_dynar_t action)
   char *size = xbt_dynar_get_as(action, 3, char *);
   char **myargv;
   m_process_t comm_helper;
-
-  INFO1("Isend on %s: spawn process ", 
-        MSG_process_self()->name);
+  double clock = MSG_get_clock();
+  DEBUG1("Isend on %s: spawn process ", 
+        MSG_process_get_name(MSG_process_self()));
 
   myargv = (char**) calloc (3, sizeof (char*));
   
@@ -71,10 +73,11 @@ static void Isend(xbt_dynar_t action)
   myargv[1] = xbt_strdup(size);
   myargv[2] = NULL;
 
-  sprintf(spawn_name,"%s_wait",MSG_process_self()->name);
+  sprintf(spawn_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
   comm_helper =
     MSG_process_create_with_arguments(spawn_name, spawned_send, 
                                      NULL, MSG_host_self(), 2, myargv);
+  INFO2("%s %f",xbt_str_join(action, " "), MSG_get_clock()-clock);
 }
 
 
@@ -82,11 +85,13 @@ static void recv(xbt_dynar_t action)
 {
   char *name = xbt_str_join(action, " ");
   m_task_t task = NULL;
-  INFO1("Receiving: %s", name);
+  double clock = MSG_get_clock();
   //FIXME: argument of action ignored so far; semantic not clear
   //char *from=xbt_dynar_get_as(action,2,char*);
+
+  DEBUG1("Receiving: %s", name);
   MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
-  INFO1("Received %s", MSG_task_get_name(task));
+  INFO2("%s %f", name, MSG_get_clock()-clock);
   MSG_task_destroy(task);
   free(name);
 }
@@ -94,12 +99,12 @@ static void recv(xbt_dynar_t action)
 static int spawned_recv(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  char* name = (char *) MSG_process_self()->data;
-  INFO1("Receiving on %s", name);
+  char* name = (char *) MSG_process_get_data(MSG_process_self());
+  DEBUG1("Receiving on %s", name);
   MSG_task_receive(&task, name);
-  INFO1("Received %s", MSG_task_get_name(task));
-  INFO1("waiter on %s", MSG_process_self()->name);
-  MSG_task_send(MSG_task_create("waiter",0,0,NULL),MSG_process_self()->name); 
+  DEBUG1("Received %s", MSG_task_get_name(task));
+  DEBUG1("waiter on %s", MSG_process_get_name(MSG_process_self()));
+  MSG_task_send(MSG_task_create("waiter",0,0,NULL),MSG_process_get_name(MSG_process_self())); 
   
   MSG_task_destroy(task);
   return 0;
@@ -110,31 +115,34 @@ static void Irecv(xbt_dynar_t action)
 {
   char *name = xbt_str_join(action, " ");
   m_process_t comm_helper;
-
-  INFO1("Irecv on %s: spawn process ", 
+  double clock = MSG_get_clock();
+  DEBUG1("Irecv on %s: spawn process ", 
         MSG_process_get_name(MSG_process_self()));
 
-  sprintf(name,"%s_wait",MSG_process_self()->name);
+  sprintf(name,"%s_wait",MSG_process_get_name(MSG_process_self()));
   comm_helper = MSG_process_create(name,spawned_recv,
-                 (void *) MSG_process_self()->name,
+                 (void *) MSG_process_get_name(MSG_process_self()),
                  MSG_host_self());
 
-
+  INFO2("%s %f",  xbt_str_join(action, " "), 
+       MSG_get_clock()-clock);
   free(name);
 }
 
 
-static void wait(xbt_dynar_t action)
+static void wait_action(xbt_dynar_t action)
 {
   char *name = xbt_str_join(action, " ");
   char task_name[80];
   m_task_t task = NULL;
+  double clock = MSG_get_clock();
   
-  INFO1("wait: %s", name);
-  sprintf(task_name,"%s_wait",MSG_process_self()->name);
+  DEBUG1("Entering %s", name);
+  sprintf(task_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
   MSG_task_receive(&task,task_name);
   MSG_task_destroy(task);
-  INFO1("waited: %s", name);
+  INFO2("%s %f", name, MSG_get_clock()-clock);
   free(name);
 }
 
@@ -159,15 +167,14 @@ static void reduce(xbt_dynar_t action)
   m_process_t comm_helper=NULL;
   m_task_t task=NULL, comp_task=NULL;
   const char* process_name;
+  double clock = MSG_get_clock();
   
   coll_ctr counters =  (coll_ctr) MSG_process_get_data(MSG_process_self());
 
   xbt_assert0(communicator_size, "Size of Communicator is not defined"
              ", can't use collective operations");
 
-  MSG_process_self()->data=NULL;
-
-  process_name = MSG_process_self()->name;
+  process_name = MSG_process_get_name(MSG_process_self());
 
   if (!counters){
     DEBUG0("Initialize the counters");
@@ -177,7 +184,7 @@ static void reduce(xbt_dynar_t action)
   name = bprintf("reduce_%d", counters->reduce_counter++);
 
   if (!strcmp(process_name, "process0")){
-    INFO2("%s: %s is the Root",name, process_name);
+    DEBUG2("%s: %s is the Root",name, process_name);
     for(i=1;i<communicator_size;i++){
       sprintf(spawn_name,"%s_process%d", name, i);
       sprintf(task_name,"%s_wait", spawn_name);
@@ -196,19 +203,20 @@ static void reduce(xbt_dynar_t action)
 
     comp_task = 
       MSG_task_create("reduce_comp", parse_double(comp_size), 0, NULL);
-    INFO1("%s: computing 'reduce_comp'", name);
+    DEBUG1("%s: computing 'reduce_comp'", name);
     MSG_task_execute(comp_task);
     MSG_task_destroy(comp_task);
-    INFO1("%s: computed", name);
+    DEBUG1("%s: computed", name);
   } else {
-    INFO2("%s: %s sends", name, process_name);
+    DEBUG2("%s: %s sends", name, process_name);
     sprintf(task_name,"%s_%s", name, process_name);
-    INFO1("put on %s", task_name);
+    DEBUG1("put on %s", task_name);
     MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
                  task_name);
   }
 
   MSG_process_set_data(MSG_process_self(), (void*)counters);
+  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
@@ -224,13 +232,13 @@ static void bcast (xbt_dynar_t action)
   m_task_t task=NULL;
   char *size = xbt_dynar_get_as(action, 2, char *);
   coll_ctr counters =  (coll_ctr) MSG_process_get_data(MSG_process_self());
-
+  double clock = MSG_get_clock();
+  
   xbt_assert0(communicator_size, "Size of Communicator is not defined"
              ", can't use collective operations");
 
-  MSG_process_self()->data=NULL;
 
-  process_name = MSG_process_self()->name;
+  process_name = MSG_process_get_name(MSG_process_self());
   if (!counters){
     DEBUG0("Initialize the counters");
     counters = (coll_ctr) calloc (1, sizeof(struct coll_ctr_t));
@@ -238,7 +246,7 @@ static void bcast (xbt_dynar_t action)
 
   name = bprintf("bcast_%d", counters->bcast_counter++);
   if (!strcmp(process_name, "process0")){
-    INFO2("%s: %s is the Root",name, process_name);
+    DEBUG2("%s: %s is the Root",name, process_name);
 
     for(i=1;i<communicator_size;i++){
       myargv = (char**) calloc (3, sizeof (char*));
@@ -259,19 +267,20 @@ static void bcast (xbt_dynar_t action)
       MSG_task_destroy(task);
       task=NULL;
     }
-    INFO2("%s: all messages sent by %s have been received",
+    DEBUG2("%s: all messages sent by %s have been received",
          name, process_name);
   } else {
-    INFO2("%s: %s receives", name, process_name);
+    DEBUG2("%s: %s receives", name, process_name);
     MSG_task_receive(&task, name);
     MSG_task_destroy(task);
-    INFO2("%s: %s has received", name,process_name);
+    DEBUG2("%s: %s has received", name,process_name);
     sprintf(task_name,"%s_wait", process_name);
     DEBUG1("put on %s", task_name);
     MSG_task_send(MSG_task_create("waiter",0,0,NULL),task_name);
   }
 
   MSG_process_set_data(MSG_process_self(), (void*)counters);
+  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
@@ -280,9 +289,106 @@ static void sleep(xbt_dynar_t action)
 {
   char *name = xbt_str_join(action, " ");
   char *duration = xbt_dynar_get_as(action, 2, char *);
-  INFO1("sleep: %s", name);
+  double clock = MSG_get_clock();
+  DEBUG1("Entering %s", name);
   MSG_process_sleep(parse_double(duration));
-  INFO1("sleept: %s", name);
+  INFO2("%s %f ", name, MSG_get_clock()-clock);
+  free(name);
+}
+
+static void allReduce(xbt_dynar_t action)
+{
+  int i;
+  char *name;
+  char task_name[80];
+  char spawn_name[80];
+  char **myargv;
+  char *comm_size = xbt_dynar_get_as(action, 2, char *);
+  char *comp_size = xbt_dynar_get_as(action, 3, char *);
+  m_process_t comm_helper=NULL;
+  m_task_t task=NULL, comp_task=NULL;
+  const char* process_name;
+  double clock = MSG_get_clock();
+  coll_ctr counters =  (coll_ctr) MSG_process_get_data(MSG_process_self());
+
+  xbt_assert0(communicator_size, "Size of Communicator is not defined"
+             ", can't use collective operations");
+
+  process_name = MSG_process_get_name(MSG_process_self());
+
+  if (!counters){
+    DEBUG0("Initialize the counters");
+    counters = (coll_ctr) calloc (1, sizeof(struct coll_ctr_t));
+  }
+
+  name = bprintf("allReduce_%d", counters->allReduce_counter++);
+
+  if (!strcmp(process_name, "process0")){
+    DEBUG2("%s: %s is the Root",name, process_name);
+    for(i=1;i<communicator_size;i++){
+      sprintf(spawn_name,"%s_process%d", name, i);
+      sprintf(task_name,"%s_wait", spawn_name);
+      comm_helper = 
+       MSG_process_create(task_name, spawned_recv, 
+                          (void *) xbt_strdup(spawn_name),
+                          MSG_host_self());      
+    }
+
+    for(i=1;i<communicator_size;i++){
+      sprintf(task_name,"%s_process%d_wait", name, i);
+      MSG_task_receive(&task,task_name);
+      MSG_task_destroy(task);
+      task=NULL;
+    }
+
+    comp_task = 
+      MSG_task_create("allReduce_comp", parse_double(comp_size), 0, NULL);
+    DEBUG1("%s: computing 'reduce_comp'", name);
+    MSG_task_execute(comp_task);
+    MSG_task_destroy(comp_task);
+    DEBUG1("%s: computed", name);
+
+    for(i=1;i<communicator_size;i++){
+      myargv = (char**) calloc (3, sizeof (char*));
+      myargv[0] = xbt_strdup(name);
+      myargv[1] = xbt_strdup(comm_size);
+      myargv[2] = NULL;
+
+      sprintf(spawn_name,"%s_%d", myargv[0], i);
+      comm_helper = 
+       MSG_process_create_with_arguments(spawn_name, spawned_send, 
+                                         NULL, MSG_host_self(), 2, myargv);
+    }
+    
+    for(i=1;i<communicator_size;i++){
+      sprintf(task_name,"process%d_wait", i);
+      DEBUG1("get on %s", task_name);
+      MSG_task_receive(&task,task_name);      
+      MSG_task_destroy(task);
+      task=NULL;
+    }
+    DEBUG2("%s: all messages sent by %s have been received",
+         name, process_name);
+
+  } else {
+    DEBUG2("%s: %s sends", name, process_name);
+    sprintf(task_name,"%s_%s", name, process_name);
+    DEBUG1("put on %s", task_name);
+    MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
+                 task_name);
+
+    MSG_task_receive(&task, name);
+    MSG_task_destroy(task);
+    DEBUG2("%s: %s has received", name,process_name);
+    sprintf(task_name,"%s_wait", process_name);
+    DEBUG1("put on %s", task_name);
+    MSG_task_send(MSG_task_create("waiter",0,0,NULL),task_name);
+
+  }
+
+  MSG_process_set_data(MSG_process_self(), (void*)counters);
+  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
@@ -297,10 +403,12 @@ static void compute(xbt_dynar_t action)
   char *name = xbt_str_join(action, " ");
   char *amout = xbt_dynar_get_as(action, 2, char *);
   m_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL);
-  INFO1("computing: %s", name);
+  double clock = MSG_get_clock();
+
+  DEBUG1("Entering %s", name);
   MSG_task_execute(task);
   MSG_task_destroy(task);
-  INFO1("computed: %s", name);
+  INFO2("%s %f", name, MSG_get_clock()-clock);
   free(name);
 }
 
@@ -330,10 +438,11 @@ int main(int argc, char *argv[])
   MSG_action_register("Isend", Isend);
   MSG_action_register("recv", recv);
   MSG_action_register("Irecv", Irecv);
-  MSG_action_register("wait", wait);
+  MSG_action_register("wait", wait_action);
   MSG_action_register("barrier", barrier);
   MSG_action_register("bcast", bcast);
   MSG_action_register("reduce", reduce);
+  MSG_action_register("allReduce", allReduce);
   MSG_action_register("sleep", sleep);
   MSG_action_register("compute", compute);