Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
move e_surf_link_sharing_policy_t structure to surf.h and fix the way to create link...
[simgrid.git] / src / bindings / lua / simgrid_lua.c
index 4b9ffd1..79f09ec 100644 (file)
@@ -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");
 
@@ -322,9 +324,16 @@ typedef struct t_host_attr
 
 typedef struct t_link_attr
 {
+       //mandatory attributes
        const char* id;
        double bandwidth;
        double latency;
+       // Optional attributes
+       const char* bandwidth_trace;
+       const char* latency_trace;
+       const char*     state_trace;
+       int state_initial;
+       int policy;
 }link_attr,*p_link_attr;
 
 typedef struct t_route_attr
@@ -374,6 +383,44 @@ static void create_host(const char* id,double power_peak,double power_sc,
 
 }
 
+/**
+ * create link resource via network model
+ */
+static void create_link(const char *name,
+        double bw_initial,const char *trace,double lat_initial,
+        const char* latency_trace,int state_init, const char* state_trace,int policy)
+{
+       tmgr_trace_t bw_trace;
+       tmgr_trace_t lat_trace;
+       e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
+       e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
+       tmgr_trace_t st_trace;
+       if(trace)
+               bw_trace = tmgr_trace_new(trace);
+       else
+               bw_trace = tmgr_trace_new("");
+
+       if(latency_trace)
+               lat_trace = tmgr_trace_new(latency_trace);
+       else
+               lat_trace = tmgr_trace_new("");
+
+       if(state_trace)
+               st_trace = tmgr_trace_new(state_trace);
+       else
+               st_trace = tmgr_trace_new("");
+
+       if(state_init == -1)
+               state_initial_link = SURF_RESOURCE_OFF;
+       if(policy == -1)
+               policy_initial_link = SURF_LINK_FATPIPE;
+
+       surf_link_create_resource(xbt_strdup(name), bw_initial, bw_trace,
+                  lat_initial, lat_trace, state_initial_link, st_trace,
+                  policy_initial_link, xbt_dict_new());
+}
+
+
 /*
  *create host resource via workstation_ptask_L07 model [for SimDag]
  */
@@ -486,6 +533,11 @@ static int Link_new(lua_State *L) // (id,bandwidth,latency)
 
        const char* id;
        double bandwidth,latency;
+       const char* bandwidth_trace;
+       const char* latency_trace;
+       const char* state_trace;
+       int state_initial,policy;
+
        //get values from the table passed as argument
        if (lua_istable(L,-1)) {
                    // get Id Value
@@ -506,6 +558,39 @@ static int Link_new(lua_State *L) // (id,bandwidth,latency)
                    latency = lua_tonumber(L,-1);
                    lua_pop(L,1);
 
+                   /*Optional Arguments  */
+
+                   //get bandwidth_trace value
+                   lua_pushstring(L,"bandwidth_trace");
+                   lua_gettable(L, -2 );
+                   bandwidth_trace = lua_tostring(L,-1);
+                   lua_pop(L,1);
+
+                   //get latency_trace value
+                   lua_pushstring(L,"latency_trace");
+                   lua_gettable(L, -2 );
+                   latency_trace = lua_tostring(L,-1);
+                   lua_pop(L,1);
+
+                   //get state_trace value
+                   lua_pushstring(L,"state_trace");
+                   lua_gettable(L, -2 );
+                   state_trace = lua_tostring(L,-1);
+                   lua_pop(L,1);
+
+                               //get state_initial value
+                   lua_pushstring(L,"state_initial");
+                   lua_gettable(L, -2 );
+                   state_initial = lua_tonumber(L,-1);
+                   lua_pop(L,1);
+
+
+                               //get policy value
+                   lua_pushstring(L,"policy");
+                   lua_gettable(L, -2 );
+                   policy = lua_tonumber(L,-1);
+                   lua_pop(L,1);
+
            } else {
                    ERROR0("Bad Arguments to create link, Should be a table with named arguments");
                    return -1;
@@ -515,6 +600,11 @@ static int Link_new(lua_State *L) // (id,bandwidth,latency)
        link->id = id;
        link->bandwidth = bandwidth;
        link->latency = latency;
+       link->bandwidth_trace = bandwidth_trace;
+       link->latency_trace = latency_trace;
+       link->state_trace = state_trace;
+       link->state_initial= state_initial;
+       link->policy = policy;
        xbt_dynar_push(link_list_d,&link);
        return 0;
 }
@@ -561,17 +651,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;
                }
@@ -604,7 +697,11 @@ static int surf_parse_bypass_platform()
        //add Links
        xbt_dynar_foreach(link_list_d,i,p_link)
        {
-               surf_link_create_resource((char*)p_link->id,p_link->bandwidth,p_link->latency);
+               /*(const char *name,
+        double bw_initial,const char *trace,double lat_initial,
+        const char* latency_trace,int state_init, const char* state_trace,int policy)*/
+               create_link(p_link->id,p_link->bandwidth,p_link->bandwidth_trace,p_link->latency,
+                               p_link->latency_trace,p_link->state_initial,p_link->state_trace,p_link->policy);
        }
        // add route
        xbt_dynar_foreach(route_list_d,i,p_route)
@@ -677,6 +774,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 +994,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 +1016,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 +1040,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 }
 };