X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/521daa8271ac2778d8b2944be25daae65d3540a1..d4d7b77c8e455e5f7c80bc22b136a48c107aaf11:/src/surf/surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 01d41de6a3..9244f2da95 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -16,6 +16,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
 #undef CLEANUP
 #include "simgrid_dtd.c"
 
+char *platform_filename;
+
 /* Initialize the parsing globals */
 xbt_dict_t traces_set_list = NULL;
 xbt_dict_t trace_connect_list_host_avail = NULL;
@@ -454,7 +456,8 @@ void surfxml_del_callback(xbt_dynar_t cb_list, void_f_void_t function)
 
   TRY {
     it = xbt_dynar_search(cb_list,&function);
-  } CATCH(e) {
+  }
+  CATCH(e) {
     if (e.category == not_found_error) {
       xbt_ex_free(e);
       xbt_die("Trying to remove a callback that is not here! This should not happen");
@@ -524,25 +527,41 @@ void parse_platform_file(const char *file)
 
 /* Prop tag functions */
 
-void parse_properties(void)
-{
-  char *value = NULL;
-  if (!current_property_set)
-    current_property_set = xbt_dict_new();      // Maybe, it should be make a error
-  if(!strcmp(A_surfxml_prop_id,"coordinates")){
-	  if(!strcmp(A_surfxml_prop_value,"yes") && !COORD_HOST_LEVEL)
-	  {
-		    XBT_INFO("Configuration change: Set '%s' to '%s'", A_surfxml_prop_id, A_surfxml_prop_value);
-			COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
-			COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+void parse_properties(const char* prop_id, const char* prop_value)
+{
+    char *value = NULL;
+	if (!current_property_set)
+	    current_property_set = xbt_dict_new();      // Maybe, it should be make a error
+	if(!strcmp(prop_id,"coordinates")){
+		if(!strcmp(prop_value,"yes") && !COORD_HOST_LEVEL)
+		  {
+			    XBT_INFO("Configuration change: Set '%s' to '%s'", prop_id, prop_value);
+				COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+				COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+		  }
+		if(strcmp(A_surfxml_prop_value,"yes"))
+			  xbt_die("Setting XML prop coordinates must be \"yes\"");
 	  }
-	  if(strcmp(A_surfxml_prop_value,"yes"))
-		  xbt_die("Setting XML prop coordinates must be \"yes\"");
-  }
-  else{
-	  value = xbt_strdup(A_surfxml_prop_value);
-	  xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free);
-  }
+	else{
+		  value = xbt_strdup(prop_value);
+		  xbt_dict_set(current_property_set, prop_id, value, free);
+	 }
+}
+
+/**
+ * With XML parser
+ */
+void parse_properties_XML(void)
+{
+  parse_properties(A_surfxml_prop_id, A_surfxml_prop_value);
+}
+
+/*
+ * With lua console
+ */
+void parse_properties_lua(const char* prop_id, const char* prop_value)
+{
+	 parse_properties(prop_id, prop_value);
 }
 
 /* Trace management functions */