optimize: strings that are only used on debug should only get computed when debug...

[simgrid.git] / examples / msg / actions / actions.c

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 5034d09..e1a0a70 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -11,7 +11,7 @@
 #include "xbt.h"                /* calloc, printf */
 #include "simgrid_config.h"     /* getline */
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
+XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
                  "Messages specific for this msg example");
 int communicator_size=0;
 
@@ -36,17 +36,23 @@ static double parse_double(const char *string) {
 /* My actions */
 static void send(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name = NULL;
   char to[250];
   char *size = xbt_dynar_get_as(action, 3, char *);
   double clock = MSG_get_clock();
   sprintf (to,"%s_%s", MSG_process_get_name(MSG_process_self()),
           xbt_dynar_get_as(action, 2, char *));
   //  char *to =  xbt_dynar_get_as(action, 2, char *);
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
+
   DEBUG2("Entering Send: %s (size: %lg)", name, parse_double(size));
   MSG_task_send(MSG_task_create(name, 0, parse_double(size), NULL), to);
-  INFO2("%s %f", name, MSG_get_clock()-clock);
-  free(name);
+  DEBUG2("%s %f", name, MSG_get_clock()-clock);
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 }
 
 
@@ -84,13 +90,13 @@ static void Isend(xbt_dynar_t action)
   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);
+  DEBUG2("%s %f",xbt_str_join(action, " "), MSG_get_clock()-clock);
 }
 
 
 static void recv(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name = NULL;
     char mailbox_name[250];
   m_task_t task = NULL;
   double clock = MSG_get_clock();
@@ -98,12 +104,18 @@ static void recv(xbt_dynar_t action)
   //char *from=xbt_dynar_get_as(action,2,char*);
   sprintf (mailbox_name,"%s_%s", xbt_dynar_get_as(action, 2, char *),
           MSG_process_get_name(MSG_process_self()));
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
+
   DEBUG1("Receiving: %s", name);
   MSG_task_receive(&task, mailbox_name);
   //  MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
-  INFO2("%s %f", name, MSG_get_clock()-clock);
+  DEBUG2("%s %f", name, MSG_get_clock()-clock);
   MSG_task_destroy(task);
-  free(name);
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 }
 
 static int spawned_recv(int argc, char *argv[])
@@ -123,7 +135,7 @@ static int spawned_recv(int argc, char *argv[])
 
 static void Irecv(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name;
   m_process_t comm_helper;
   char mailbox_name[250];
   char **myargv;
@@ -133,7 +145,7 @@ static void Irecv(xbt_dynar_t action)
 
   sprintf (mailbox_name,"%s_%s", xbt_dynar_get_as(action, 2, char *),
           MSG_process_get_name(MSG_process_self()));
-  sprintf(name,"%s_wait",MSG_process_get_name(MSG_process_self()));
+  name = bprintf("%s_wait",MSG_process_get_name(MSG_process_self()));
   myargv = (char**) calloc (2, sizeof (char*));
   
   myargv[0] = xbt_strdup(mailbox_name);
@@ -142,8 +154,8 @@ static void Irecv(xbt_dynar_t action)
                                                  NULL, MSG_host_self(),
                                                  1, myargv);
 
-  INFO2("%s %f",  xbt_str_join(action, " "), 
-       MSG_get_clock()-clock);
+  DEBUG2("%s %f",  xbt_str_join(action, " "), 
+      MSG_get_clock()-clock);
  
   free(name);
 }
@@ -151,27 +163,37 @@ static void Irecv(xbt_dynar_t action)
 
 static void wait_action(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name = NULL;
   char task_name[80];
   m_task_t task = NULL;
   double clock = MSG_get_clock();
   
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
+
   DEBUG1("Entering %s", name);
   sprintf(task_name,"%s_wait",MSG_process_get_name(MSG_process_self()));
-  INFO1("wait: %s", task_name);
+  DEBUG1("wait: %s", task_name);
   MSG_task_receive(&task,task_name);
   MSG_task_destroy(task);
-  INFO2("%s %f", name, MSG_get_clock()-clock);
-  free(name);
+  DEBUG2("%s %f", name,        MSG_get_clock()-clock);
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 }
 
 static void barrier (xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
-  INFO1("barrier: %s", name);
-  
+  char *name = NULL;
 
-  free(name);
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
+
+  DEBUG1("barrier: %s", name);
+
+  THROW_UNIMPLEMENTED;
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 
 }
 
@@ -181,6 +203,7 @@ static void reduce(xbt_dynar_t action)
   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;
@@ -202,19 +225,25 @@ static void reduce(xbt_dynar_t action)
 
   name = bprintf("reduce_%d", counters->reduce_counter++);
 
-  if (!strcmp(process_name, "process0")){
+  if (!strcmp(process_name, "p0")){
     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(spawn_name,"%s_p%d_%s", name, i,
+          MSG_process_get_name(MSG_process_self()));
       sprintf(task_name,"%s_wait", spawn_name);
+      myargv = (char**) calloc (2, sizeof (char*));
+      
+      myargv[0] = xbt_strdup(spawn_name);
+      myargv[1] = NULL;
+
       comm_helper = 
-       MSG_process_create(task_name, spawned_recv, 
-                          (void *) xbt_strdup(spawn_name),
-                          MSG_host_self());      
+       MSG_process_create_with_arguments(task_name, spawned_recv, 
+                                         NULL, MSG_host_self(),
+                                         1, myargv);
     }
 
     for(i=1;i<communicator_size;i++){
-      sprintf(task_name,"%s_process%d_wait", name, i);
+      sprintf(task_name,"%s_p%d_p0_wait", name, i);
       MSG_task_receive(&task,task_name);
       MSG_task_destroy(task);
       task=NULL;
@@ -228,14 +257,14 @@ static void reduce(xbt_dynar_t action)
     DEBUG1("%s: computed", name);
   } else {
     DEBUG2("%s: %s sends", name, process_name);
-    sprintf(task_name,"%s_%s", name, process_name);
+    sprintf(task_name,"%s_%s_p0", 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_process_set_data(MSG_process_self(), (void*)counters);
-  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+  DEBUG2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
@@ -264,7 +293,7 @@ static void bcast (xbt_dynar_t action)
   }
 
   name = bprintf("bcast_%d", counters->bcast_counter++);
-  if (!strcmp(process_name, "process0")){
+  if (!strcmp(process_name, "p0")){
     DEBUG2("%s: %s is the Root",name, process_name);
 
     for(i=1;i<communicator_size;i++){
@@ -280,7 +309,7 @@ static void bcast (xbt_dynar_t action)
     }
     
     for(i=1;i<communicator_size;i++){
-      sprintf(task_name,"process%d_wait", i);
+      sprintf(task_name,"p%d_wait", i);
       DEBUG1("get on %s", task_name);
       MSG_task_receive(&task,task_name);      
       MSG_task_destroy(task);
@@ -299,20 +328,26 @@ static void bcast (xbt_dynar_t action)
   }
 
   MSG_process_set_data(MSG_process_self(), (void*)counters);
-  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+  DEBUG2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
 
 static void sleep(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name = NULL;
   char *duration = xbt_dynar_get_as(action, 2, char *);
   double clock = MSG_get_clock();
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
+
   DEBUG1("Entering %s", name);
   MSG_process_sleep(parse_double(duration));
-  INFO2("%s %f ", name, MSG_get_clock()-clock);
-  free(name);
+  DEBUG2("%s %f ", name, MSG_get_clock()-clock);
+
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 }
 
 static void allReduce(xbt_dynar_t action)
@@ -343,19 +378,25 @@ static void allReduce(xbt_dynar_t action)
 
   name = bprintf("allReduce_%d", counters->allReduce_counter++);
 
-  if (!strcmp(process_name, "process0")){
+  if (!strcmp(process_name, "p0")){
     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(spawn_name,"%s_p%d_%s", name, i,
+          MSG_process_get_name(MSG_process_self()));
       sprintf(task_name,"%s_wait", spawn_name);
+      myargv = (char**) calloc (2, sizeof (char*));
+      
+      myargv[0] = xbt_strdup(spawn_name);
+      myargv[1] = NULL;
+
       comm_helper = 
-       MSG_process_create(task_name, spawned_recv, 
-                          (void *) xbt_strdup(spawn_name),
-                          MSG_host_self());      
+       MSG_process_create_with_arguments(task_name, spawned_recv, 
+                                         NULL, MSG_host_self(),
+                                         1, myargv);
     }
 
     for(i=1;i<communicator_size;i++){
-      sprintf(task_name,"%s_process%d_wait", name, i);
+      sprintf(task_name,"%s_p%d_p0_wait", name, i);
       MSG_task_receive(&task,task_name);
       MSG_task_destroy(task);
       task=NULL;
@@ -381,7 +422,7 @@ static void allReduce(xbt_dynar_t action)
     }
     
     for(i=1;i<communicator_size;i++){
-      sprintf(task_name,"process%d_wait", i);
+      sprintf(task_name,"p%d_wait", i);
       DEBUG1("get on %s", task_name);
       MSG_task_receive(&task,task_name);      
       MSG_task_destroy(task);
@@ -392,7 +433,7 @@ static void allReduce(xbt_dynar_t action)
 
   } else {
     DEBUG2("%s: %s sends", name, process_name);
-    sprintf(task_name,"%s_%s", name, process_name);
+    sprintf(task_name,"%s_%s_p0", name, process_name);
     DEBUG1("put on %s", task_name);
     MSG_task_send(MSG_task_create(name, 0, parse_double(comm_size), NULL),
                  task_name);
@@ -407,7 +448,7 @@ static void allReduce(xbt_dynar_t action)
   }
 
   MSG_process_set_data(MSG_process_self(), (void*)counters);
-  INFO2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
+  DEBUG2("%s %f", xbt_str_join(action, " "), MSG_get_clock()-clock);
   free(name);
 }
 
@@ -419,16 +460,19 @@ static void comm_size(xbt_dynar_t action)
 
 static void compute(xbt_dynar_t action)
 {
-  char *name = xbt_str_join(action, " ");
+  char *name=NULL;
   char *amout = xbt_dynar_get_as(action, 2, char *);
   m_task_t task = MSG_task_create(name, parse_double(amout), 0, NULL);
   double clock = MSG_get_clock();
 
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    name = xbt_str_join(action, " ");
   DEBUG1("Entering %s", name);
   MSG_task_execute(task);
   MSG_task_destroy(task);
-  INFO2("%s %f", name, MSG_get_clock()-clock);
-  free(name);
+  DEBUG2("%s %f", name, MSG_get_clock()-clock);
+  if (XBT_LOG_ISENABLED(actions,xbt_log_priority_debug))
+    free(name);
 }
 
 /** Main function */
@@ -438,9 +482,11 @@ int main(int argc, char *argv[])
   
   /* Check the given arguments */
   MSG_global_init(&argc, argv);
-  if (argc < 4) {
-    printf("Usage: %s platform_file deployment_file action_files\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml actions\n",
+  if (argc < 3) {
+    printf("Usage: %s platform_file deployment_file [action_files]\n", argv[0]);
+    printf("example: %s msg_platform.xml msg_deployment.xml actions # if all actions are in the same file\n",
+           argv[0]);
+    printf("example: %s msg_platform.xml msg_deployment.xml # if actions are in separate files, specified in deployment\n",
            argv[0]);
     exit(1);
   }
@@ -467,7 +513,7 @@ int main(int argc, char *argv[])
 
 
   /* Actually do the simulation using MSG_action_trace_run */
-  res = MSG_action_trace_run(argv[3]);
+  res = MSG_action_trace_run(argv[3]); // it's ok to pass a NULL argument here
 
   INFO1("Simulation time %g", MSG_get_clock());
   MSG_clean();