X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a470bbfee8e031e6e21e4605d1d19a1a5eb1039b..f3882bfdbd3264807a5d3a9d1b05424f417f9d28:/src/bindings/lua/simgrid_lua.c

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 4b9ffd1686..915c5adf1b 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -11,7 +11,9 @@
 #include <lualib.h>
 #include "msg/msg.h"
 #include "simdag/simdag.h"
+#include <gras.h>
 #include "xbt.h"
+#include "lua_stub_generator.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings");
 
@@ -561,17 +563,20 @@ static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args)
 		if(p_host->id == host_id)
 		{
 			p_host->function = luaL_checkstring(L,2);
-			p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-			// fill the args list
-			lua_pushnil(L);
-			int j = 0;
-			while (lua_next(L,3) != 0) {
-					argument = lua_tostring(L, -1);
-					xbt_dynar_push(p_host->args_list, &argument);
-				    DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
-				    j++;
-				    lua_pop(L, 1);
-				}
+			if(lua_istable(L,3))
+			{
+				p_host->args_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+				// fill the args list
+				lua_pushnil(L);
+				int j = 0;
+				while (lua_next(L,3) != 0) {
+						argument = lua_tostring(L, -1);
+						xbt_dynar_push(p_host->args_list, &argument);
+						DEBUG2("index = %f , Arg_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
+						j++;
+						lua_pop(L, 1);
+					}
+			}
 			lua_pop(L, 1);
 			return 0;
 		}
@@ -677,6 +682,77 @@ static int surf_parse_bypass_application()
 	  return 0;
 }
 
+
+/**
+ *  Generate Gras Templates File from lua
+ */
+
+xbt_dict_t process_function_set;
+xbt_dynar_t process_list;
+xbt_dict_t machine_set;
+static s_process_t process;
+
+void s_process_free(void *process)
+{
+  s_process_t *p = (s_process_t *) process;
+  int i;
+  for (i = 0; i < p->argc; i++)
+    free(p->argv[i]);
+  free(p->argv);
+  free(p->host);
+}
+
+static int gras_add_process_function(lua_State *L)
+{
+	const char * arg;
+	const char* process_host = luaL_checkstring(L,1);
+	const char *process_function = luaL_checkstring(L,2);
+
+	if(xbt_dict_is_empty(machine_set) || xbt_dict_is_empty(process_function_set)
+			|| xbt_dynar_is_empty(process_list))
+		{
+		  process_function_set = xbt_dict_new();
+		  process_list = xbt_dynar_new(sizeof(s_process_t), s_process_free);
+		  machine_set = xbt_dict_new();
+		}
+
+	xbt_dict_set(machine_set,process_host, NULL, NULL);
+	xbt_dict_set(process_function_set,process_function, NULL, NULL);
+
+	process.argc = 1;
+	process.argv = xbt_new(char *, 1);
+	process.argv[0] = xbt_strdup(process_function);
+	process.host = strdup(process_host);
+
+	lua_pushnil(L);
+	while (lua_next(L,3) != 0) {
+		arg = lua_tostring(L, -1);
+		process.argc++;
+		process.argv = xbt_realloc(process.argv, (process.argc) * sizeof(char *));
+		process.argv[(process.argc) - 1] = xbt_strdup(arg);
+
+		DEBUG2("index = %f , arg = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
+		lua_pop(L, 1);
+		}
+	lua_pop(L, 1);
+	//add to the process list
+	xbt_dynar_push(process_list, &process);
+
+	return 0;
+
+}
+
+
+static int gras_generate(lua_State *L)
+{
+  const char *project_name = luaL_checkstring(L,1);
+  generate_sim(project_name);
+  generate_rl(project_name);
+  generate_makefile_local(project_name);
+
+  return 0;
+}
+
 //***********Register Methods *******************************************//
 /*
  * Host Methods
@@ -826,6 +902,17 @@ static int sd_register_platform(lua_State *L)
 	SD_create_environment(NULL);
 	return 0;
 }
+/*
+ * Register platform for gras
+ */
+static int gras_register_platform(lua_State *L)
+{
+	/* Tell Simgrid we dont wanna use surf parser*/
+	surf_parse = surf_parse_bypass_platform;
+	gras_create_environment(NULL);
+	return 0;
+}
+
 /**
  * Register applicaiton for MSG
  */
@@ -837,6 +924,16 @@ static int msg_register_application(lua_State *L)
 	 return 0;
 }
 
+/*
+ * Register application for gras
+ */
+static int gras_register_application(lua_State *L)
+{
+	gras_function_register_default(run_lua_code);
+	surf_parse = surf_parse_bypass_application;
+	gras_launch_application(NULL);
+	return 0;
+}
 static const luaL_Reg simgrid_funcs[] = {
     { "create_environment", create_environment},
     { "launch_application", launch_application},
@@ -851,6 +948,11 @@ static const luaL_Reg simgrid_funcs[] = {
     { "msg_register_platform",msg_register_platform},
     { "sd_register_platform",sd_register_platform},
     { "msg_register_application",msg_register_application},
+    { "gras_register_platform",gras_register_platform},
+    { "gras_register_application",gras_register_application},
+    /* gras sub generator method*/
+    {"gras_set_process_function",gras_add_process_function},
+    {"gras_generate",gras_generate},
     { NULL, NULL }
 };