X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49aa15c63b8823fd0fc084e9e86d2fbd5ca025b7..922b893e3976c3c0162c5b5beeba247ca26d0b5c:/examples/msg/properties/msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index 9706ed0d49..5f33de9313 100644
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -1,12 +1,11 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007. SimGrid Team. All rights reserved.                   */
+/* Copyright (c) 2007, 2008, 2009, 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h" /* calloc, printf */
+#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"
@@ -15,112 +14,101 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(test,"Property test");
+XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
 
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
+int alice(int argc, char *argv[]);
+int bob(int argc, char *argv[]);
+int carole(int argc, char *argv[]);
 int forwarder(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
+MSG_error_t test_all(const char *platform_file,
+                     const char *application_file);
 
-/** Emitter function  */
-int master(int argc, char *argv[])
+static void test_host(const char*hostname) 
 {
-  int slaves_count = 0;
-  m_host_t *slaves = NULL;
-
-  int i;
-
-  {                  /* Process organisation */
-    slaves_count = argc - 4;
-    slaves = xbt_new(m_host_t, sizeof(m_host_t) * slaves_count);
-    xbt_dict_t props;    
-    for (i = 4; i < argc; 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;
-      char *key,*data;
-
-      /* Print the properties of the host */
-      xbt_dict_foreach(props,cursor,key,data) {
-         INFO3("Property: %s for host: %s has value: %s",key,argv[i],data);
-      }
-
-     /* Try to get a property that does not exist */
-     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
-       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);
-    }
-  }
-  
-  free(slaves);
+  m_host_t thehost = MSG_get_host_by_name(hostname);
+  xbt_dict_t props = MSG_host_get_properties(thehost);
+  xbt_dict_cursor_t cursor = NULL;
+  char *key, *data;
+  const char *noexist = "Unknown";
+  const char *value;
+  char exist[] = "SG_TEST_Hdd";
+
+  XBT_INFO("== Print the properties of the host");
+  xbt_dict_foreach(props, cursor, key, data)
+      XBT_INFO("  Host property: '%s' -> '%s'", key, data);
+
+  XBT_INFO("== Try to get a host property that does not exist");
+  value = MSG_host_get_property_value(thehost, noexist);
+  xbt_assert(!value, "The key exists (it's not supposed to)");
+
+  XBT_INFO("== Try to get a host property that does exist");
+  value = MSG_host_get_property_value(thehost, exist);
+  xbt_assert(value, "\tProperty %s is undefined (where it should)",
+              exist);
+  xbt_assert(!strcmp(value, "180"),
+              "\tValue of property %s is defined to %s (where it should be 180)",
+              exist, value);
+  XBT_INFO("   Property: %s old value: %s", exist, value);
+
+  XBT_INFO("== Trying to modify a host property");
+  xbt_dict_set(props, exist, xbt_strdup("250"), NULL);
+
+  /* Test if we have changed the value */
+  value = MSG_host_get_property_value(thehost, exist);
+  xbt_assert(value, "Property %s is undefined (where it should)", exist);
+  xbt_assert(!strcmp(value, "250"),
+              "Value of property %s is defined to %s (where it should be 250)",
+              exist, value);
+  XBT_INFO("   Property: %s old value: %s", exist, value);
+   
+  /* Restore the value for the next test */
+  xbt_dict_set(props, exist, xbt_strdup("180"), NULL);
+}
+
+int alice(int argc, char *argv[]) { /* Dump what we have on the current host */
+  test_host("host1");
   return 0;
-} /* end_of_master */
+}
+int carole(int argc, char *argv[]) {/* Dump what we have on a remote host */
+  MSG_process_sleep(1); // Wait for alice to be done with its experiment
+  test_host("host1");
+  return 0;
+}
 
-/** Receiver function  */
-int slave(int argc, char *argv[])
+int bob(int argc, char *argv[])
 {
-  /* Get the property list of current slave process */
+  /* Get the property list of current bob process */
   xbt_dict_t props = MSG_process_get_properties(MSG_process_self());
-  xbt_dict_cursor_t cursor=NULL;
-  char *key,*data;
+  xbt_dict_cursor_t cursor = NULL;
+  char *key, *data;
+  const char *noexist = "UnknownProcessProp";
+  _XBT_GNUC_UNUSED const char *value;
 
-  /* 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);
-  }
+  XBT_INFO("== Print the properties of the process");
+  xbt_dict_foreach(props, cursor, key, data)
+      XBT_INFO("   Process property: %s -> %s", key, data);
 
-  /* 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);
+  XBT_INFO("== Try to get a process property that does not exist");
+
+  value = MSG_process_get_property_value(MSG_process_self(), noexist);
+  xbt_assert(!value, "The property is defined (it shouldnt)");
 
   return 0;
-} /* end_of_slave */
+}
 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,
-			    const char *application_file)
+                     const char *application_file)
 {
-  MSG_error_t res = MSG_OK;
+  MSG_function_register("alice", alice);
+  MSG_function_register("bob", bob);
+  MSG_function_register("carole", carole);
 
-  /* MSG_config("surf_workstation_model","KCCFLN05"); */
-  {				/*  Simulation setting */
-//    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_launch_application(application_file);
-  }
-  res = MSG_main();
-  
-  INFO1("Simulation time %g",MSG_get_clock());
-  return res;
-} /* end_of_test_all */
+  MSG_create_environment(platform_file);
+  MSG_launch_application(application_file);
+
+  return MSG_main();
+}                               /* end_of_test_all */
 
 
 /** Main function */
@@ -128,17 +116,17 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc,argv);
+  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);
+    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]);
+  res = test_all(argv[1], argv[2]);
   MSG_clean();
 
-  if(res==MSG_OK)
+  if (res == MSG_OK)
     return 0;
   else
     return 1;
-} /* end_of_main */
+}                               /* end_of_main */