cleanups (among which example simplification)

[simgrid.git] / examples / msg / properties / msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index 3c6c176..9706ed0 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -1,6 +1,6 @@
-/*     $Id: msg_test.c,v 1.24 2007/03/16 13:18:24 cherierm Exp $        */
+/*     $Id$     */

 
 

-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007. 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. */
 
 /* 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. */


@@ -15,57 +15,29 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Property test");

 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 int forwarder(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file, const char *application_file);
 
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 int forwarder(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file, const char *application_file);
 

-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
-#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
-

 /** Emitter function  */
 int master(int argc, char *argv[])
 {
   int slaves_count = 0;
   m_host_t *slaves = NULL;
 /** Emitter function  */
 int master(int argc, char *argv[])
 {
   int slaves_count = 0;
   m_host_t *slaves = NULL;

-  m_task_t *todo = NULL;
-  int number_of_tasks = 0;
-  double task_comp_size = 0;
-  double task_comm_size = 0;
-

 
   int i;
 
 
   int i;
 

-  xbt_assert1(sscanf(argv[1],"%d", &number_of_tasks),
-        "Invalid argument %s\n",argv[1]);
-  xbt_assert1(sscanf(argv[2],"%lg", &task_comp_size),
-        "Invalid argument %s\n",argv[2]);
-  xbt_assert1(sscanf(argv[3],"%lg", &task_comm_size),
-        "Invalid argument %s\n",argv[3]);
-
-  {                  /*  Task creation */
-    char sprintf_buffer[64];
-
-    todo = calloc(number_of_tasks, sizeof(m_task_t));
-
-    for (i = 0; i < number_of_tasks; i++) {
-      sprintf(sprintf_buffer, "Task_%d", i);
-      todo[i] = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
-    }
-  }
-

   {                  /* Process organisation */
     slaves_count = argc - 4;
   {                  /* Process organisation */
     slaves_count = argc - 4;

-    slaves = calloc(slaves_count, sizeof(m_host_t));
+    slaves = xbt_new(m_host_t, sizeof(m_host_t) * slaves_count);

     xbt_dict_t props;    
     xbt_dict_t props;    

-    for (i = 4; i < argc; i++) {
+    for (i = 4; i < argc; i++) {     

       slaves[i-4] = MSG_get_host_by_name(argv[i]);
       slaves[i-4] = MSG_get_host_by_name(argv[i]);

+      xbt_assert1(slaves[i-4]!=NULL, "Unknown host %s. Stopping Now! ", argv[i]);
+

       /* Get the property list of the host */
       props = MSG_host_get_properties(slaves[i-4]);
       xbt_dict_cursor_t cursor=NULL;
       /* Get the property list of the host */
       props = MSG_host_get_properties(slaves[i-4]);
       xbt_dict_cursor_t cursor=NULL;


@@ -77,124 +49,55 @@ int master(int argc, char *argv[])
       }
 
      /* Try to get a property that does not exist */
       }
 
      /* Try to get a property that does not exist */

-     char *noexist=xbt_strdup("Unknown");
-     const char *value = MSG_host_get_property_value(slaves[i-4],noexist);
+     const char *noexist="Unknown";
+     const char*value = MSG_host_get_property_value(slaves[i-4], noexist);

      if ( value == NULL) 
        INFO2("Property: %s for host %s is undefined", noexist, argv[i]);
      else
      if ( value == NULL) 
        INFO2("Property: %s for host %s is undefined", noexist, argv[i]);
      else

-       INFO3("Property: %s for host %s has value: %s", noexist, argv[i], value);
-
-     if(slaves[i-4]==NULL) {
-        INFO1("Unknown host %s. Stopping Now! ", argv[i]);
-        abort();
-       }
-     }
-  }
-
-  for (i = 0; i < number_of_tasks; i++) {
-    if(MSG_host_self()==slaves[i % slaves_count]) {
+       INFO3("Property: %s for host %s has value: %s",(char*) noexist, argv[i], value);
+
+      /* Modify an existing property test. First check it exists */\
+      INFO0("Trying to modify a host property");
+      char exist[]="Hdd";
+      value = MSG_host_get_property_value(slaves[i-4],exist);
+      xbt_assert1(value,"\tProperty %s is undefined", exist);
+      INFO2("\tProperty: %s old value: %s", exist, value);
+      xbt_dict_set(props, exist, xbt_strdup("250"), free);  
+ 
+      /* Test if we have changed the value */
+      value = MSG_host_get_property_value(slaves[i-4],exist);
+      xbt_assert1(value,"\tProperty %s is undefined", exist);
+      INFO2("\tProperty: %s new value: %s", exist, value);

     }
     }

-
-    MSG_task_put(todo[i], slaves[i % slaves_count],
-                 PORT_22);

   }
   
   }
   

-  for (i = 0; i < slaves_count; i++) 
-    MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE),
-                slaves[i], PORT_22);
-  

   free(slaves);
   free(slaves);

-  free(todo);

   return 0;
 } /* end_of_master */
 
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
   return 0;
 } /* end_of_master */
 
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {

-  while(1) {
-    m_task_t task = NULL;
-    int a;
-    a = MSG_task_get(&(task), PORT_22);
-    if (a == MSG_OK) {
-      INFO1("Received \"%s\" ", MSG_task_get_name(task));
-      if(MSG_task_get_data(task)==FINALIZE) {
-       MSG_task_destroy(task);
-       break;
-      }
-
-      /* Get the property list of current slave process */
-      xbt_dict_t props = MSG_process_get_properties(MSG_process_self());
-      xbt_dict_cursor_t cursor=NULL;
-      char *key,*data;
-
-      /* Print the properties of the process */
-      xbt_dict_foreach(props,cursor,key,data) {
-         INFO3("Property: %s for process %s has value: %s",key,MSG_process_get_name(MSG_process_self()),data);
-      }
-
-      /* Try to get a property that does not exist */
-      char *noexist=xbt_strdup("UnknownProcessProp");
-      const char *value = MSG_process_get_property_value(MSG_process_self(),noexist);
-      if ( value == NULL) 
-        INFO2("Property: %s for process %s is undefined", noexist, MSG_process_get_name(MSG_process_self()));
-      else
-        INFO3("Property: %s for process %s has value: %s", noexist, MSG_process_get_name(MSG_process_self()), value);
-
-      MSG_task_execute(task);
-      MSG_task_destroy(task);
-    } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0,"Unexpected behavior");
-    }
+  /* Get the property list of current slave process */
+  xbt_dict_t props = MSG_process_get_properties(MSG_process_self());
+  xbt_dict_cursor_t cursor=NULL;
+  char *key,*data;
+
+  /* Print the properties of the process */
+  xbt_dict_foreach(props,cursor,key,data) {
+     INFO3("Property: %s for process %s has value: %s",key,MSG_process_get_name(MSG_process_self()),data);

   }
   }

-  return 0;
-} /* end_of_slave */
-
-/** Forwarder function */
-int forwarder(int argc, char *argv[])
-{
-  int i;
-  int slaves_count;
-  m_host_t *slaves;

 
 

-  {                  /* Process organisation */
-    slaves_count = argc - 1;
-    slaves = calloc(slaves_count, sizeof(m_host_t));
-    
-    for (i = 1; i < argc; i++) {
-      slaves[i-1] = MSG_get_host_by_name(argv[i]);
-      if(slaves[i-1]==NULL) {
-       INFO1("Unknown host %s. Stopping Now! ", argv[i]);
-       abort();
-      }
-    }
-  }
+  /* Try to get a property that does not exist */
+  const char *noexist="UnknownProcessProp";
+  const char *value = MSG_process_get_property_value(MSG_process_self(),noexist);
+  if ( value == NULL) 
+    INFO2("Property: %s for process %s is undefined", noexist, MSG_process_get_name(MSG_process_self()));
+  else
+    INFO3("Property: %s for process %s has value: %s", noexist, MSG_process_get_name(MSG_process_self()), value);

 
 

-  i=0;
-  while(1) {
-    m_task_t task = NULL;
-    int a;
-    a = MSG_task_get(&(task), PORT_22);
-    if (a == MSG_OK) {
-      INFO1("Received \"%s\" ", MSG_task_get_name(task));
-      if(MSG_task_get_data(task)==FINALIZE) {
-       INFO0("All tasks have been dispatched. Let's tell everybody the computation is over.");
-       for (i = 0; i < slaves_count; i++) 
-         MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE),
-                      slaves[i], PORT_22);
-       MSG_task_destroy(task);
-       break;
-      }
-      MSG_task_put(task, slaves[i % slaves_count],
-                  PORT_22);
-      i++;
-    } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0,"Unexpected behavior");
-    }
-  }

   return 0;
   return 0;

-} /* end_of_forwarder */
+} /* end_of_slave */

 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,
 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,


@@ -204,14 +107,13 @@ MSG_error_t test_all(const char *platform_file,
 
   /* MSG_config("surf_workstation_model","KCCFLN05"); */
   {                            /*  Simulation setting */
 
   /* MSG_config("surf_workstation_model","KCCFLN05"); */
   {                            /*  Simulation setting */

-    MSG_set_channel_number(MAX_CHANNEL);
+//    MSG_set_channel_number(MAX_CHANNEL);

     MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                            /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
     MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                            /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);

-    MSG_function_register("forwarder", forwarder);

     MSG_launch_application(application_file);
   }
   res = MSG_main();
     MSG_launch_application(application_file);
   }
   res = MSG_main();