X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52900c044364c36cf24bc401ed0aa3d208f71b34..fec43de0a32ebea77563d441cdf9b888667da722:/src/bindings/lua/lua_console.c

diff --git a/src/bindings/lua/lua_console.c b/src/bindings/lua/lua_console.c
index 30c9d6b0e0..1e8880fff1 100644
--- a/src/bindings/lua/lua_console.c
+++ b/src/bindings/lua/lua_console.c
@@ -22,7 +22,7 @@ static xbt_dynar_t as_list_d;
 
 static void create_AS(const char *id, const char *mode)
 {
-  surf_AS_new(id, mode);
+  routing_AS_init(id, mode);
 }
 
 /**
@@ -31,7 +31,7 @@ static void create_AS(const char *id, const char *mode)
 
 static void create_host(const char *id, double power_peak, double power_sc,
                         const char *power_tr,int core,int state_init,
-                        const char *state_tr)
+                        const char *state_tr,xbt_dict_t properties)
 {
   double power_scale = 1.0;
   int core_nb = 1; //default value
@@ -57,8 +57,7 @@ static void create_host(const char *id, double power_peak, double power_sc,
 
   surf_host_create_resource(xbt_strdup(id), power_peak, power_scale,
                             power_trace, core_nb, state_initial, state_trace,
-                            current_property_set);
-  current_property_set = NULL;
+                            properties);
 }
 
 /**
@@ -349,6 +348,7 @@ static int Host_new(lua_State * L)
   host->state_initial = state_initial;
   host->state_trace = state_trace;
   host->function = NULL;
+  host->properties = xbt_dict_new();
   xbt_dynar_push(current_as->host_list_d, &host);
 
   return 0;
@@ -604,22 +604,22 @@ static int Host_set_function(lua_State * L)     //(host,function,nb_args,list_ar
 {
 	p_AS_attr p_as;
 	p_host_attr p_host;
-	const char *host;
-	const char *function;
+	unsigned int i,j;
+	const char *host_id ;
+	const char *function_id;
 	const char *args;
 	char * tmp_arg;
-	unsigned int i,j;
 
    if (lua_istable(L, -1)) {
 	 // get Host id
 	 lua_pushstring(L, "host");
 	 lua_gettable(L, -2);
-	 host = lua_tostring(L, -1);
+	 host_id = lua_tostring(L, -1);
 	 lua_pop(L, 1);
 	 // get Function Name
 	 lua_pushstring(L, "fct");
 	 lua_gettable(L, -2);
-     function = lua_tostring(L, -1);
+     function_id = lua_tostring(L, -1);
      lua_pop(L, 1);
      //get args
      lua_pushstring(L,"args");
@@ -636,8 +636,8 @@ static int Host_set_function(lua_State * L)     //(host,function,nb_args,list_ar
    xbt_dynar_foreach(as_list_d, i, p_as)
    {
 	   xbt_dynar_foreach(p_as->host_list_d, j, p_host) {
-		   if (p_host->id == host) {
-			   p_host->function = function;
+		   if (p_host->id == host_id) {
+			   p_host->function = function_id;
 			   p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 			   // split & fill the args list
 			   tmp_arg = strtok((char*)args,",");
@@ -649,9 +649,46 @@ static int Host_set_function(lua_State * L)     //(host,function,nb_args,list_ar
 		   }
       	}
    }
-	  XBT_ERROR("Host : %s Not Found !!", host);
+	  XBT_ERROR("Host : %s Not Found !!", host_id);
 	  return 1;
 
+}
+
+static int Host_set_property(lua_State* L)
+{
+	p_AS_attr p_as;
+	p_host_attr p_host;
+	unsigned int i,j;
+	const char* host_id ="";
+	const char* prop_id = "";
+	const char* prop_value = "";
+	if (lua_istable(L, -1)) {
+		 // get Host id
+		 lua_pushstring(L, "host");
+		 lua_gettable(L, -2);
+		 host_id = lua_tostring(L, -1);
+		 lua_pop(L, 1);
+		 // get Function Name
+		 lua_pushstring(L, "prop_id");
+		 lua_gettable(L, -2);
+	     prop_id = lua_tostring(L, -1);
+	     lua_pop(L, 1);
+	     //get args
+	     lua_pushstring(L,"prop_value");
+	     lua_gettable(L, -2);
+	     prop_value = lua_tostring(L,-1);
+	     lua_pop(L, 1);
+	 }
+	xbt_dynar_foreach(as_list_d, i, p_as)
+	   {
+		   xbt_dynar_foreach(p_as->host_list_d, j, p_host) {
+			   if (p_host->id == host_id) {
+				   xbt_dict_set(p_host->properties, prop_id, xbt_strdup(prop_value), free);
+			   }
+		   }
+      }
+	return 1;
+
 }
 /*
  * surf parse bypass platform
@@ -675,9 +712,11 @@ static int surf_parse_bypass_platform()
 	  xbt_dynar_foreach(p_as->host_list_d, j, p_host){
 		  create_host(p_host->id, p_host->power_peak, p_host->power_scale,
 		                  p_host->power_trace, p_host->core, p_host->state_initial,
-		                  p_host->state_trace);
-		      //add to routing model host list
-		      surf_route_add_host((char *) p_host->id);
+		                  p_host->state_trace, p_host->properties);
+
+
+		   //add to routing model host list
+		   surf_route_add_host((char *) p_host->id);
 	  }
 	  // add associated Links
 	  xbt_dynar_foreach(p_as->link_list_d, j, p_link){
@@ -693,7 +732,7 @@ static int surf_parse_bypass_platform()
 	  }
 
 	  // Finalize AS
-	  surf_AS_finalize(p_as->id);
+	  routing_AS_end(p_as->id);
   }
 
   // add traces
@@ -750,7 +789,7 @@ static int surf_wsL07_parse_bypass_platform()
 	      }
 	  /* </AS> */
 	  // Finalize AS
-	  surf_AS_finalize(p_as->id);
+	  routing_AS_end(p_as->id);
   }
   // add traces
   surf_wsL07_add_traces();
@@ -803,6 +842,11 @@ int console_set_function(lua_State *L)
 	return Host_set_function(L);
 }
 
+int console_host_set_property(lua_State *L)
+{
+	return Host_set_property(L);
+}
+
 int console_parse_platform()
 {
 	return surf_parse_bypass_platform();