/* 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 "simgrid_lua.h"
-#include <stdio.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#include "msg/msg.h"
-#include "xbt.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua, bindings, "Lua Bindings");
#define TASK_MODULE_NAME "simgrid.Task"
#define HOST_MODULE_NAME "simgrid.Host"
// Surf ( bypass XML )
#define LINK_MODULE_NAME "simgrid.Link"
#define ROUTE_MODULE_NAME "simgrid.Route"
+#define AS_MODULE_NAME "simgrid.AS"
+#define TRACE_MODULE_NAME "simgrid.Trace"
/* ********************************************************************************* */
/* helper functions */
/* ********************************************************************************* */
-
-static void stackDump (const char *msg, lua_State *L) {
+static void stackDump(const char *msg, lua_State * L)
+{
char buff[2048];
- char *p=buff;
+ char *p = buff;
int i;
int top = lua_gettop(L);
fflush(stdout);
- p+=sprintf(p,"STACK(top=%d): ",top);
+ p += sprintf(p, "STACK(top=%d): ", top);
for (i = 1; i <= top; i++) { /* repeat for each level */
int t = lua_type(L, i);
switch (t) {
- case LUA_TSTRING: /* strings */
- p+=sprintf(p,"`%s'", lua_tostring(L, i));
+ case LUA_TSTRING: /* strings */
+ p += sprintf(p, "`%s'", lua_tostring(L, i));
break;
- case LUA_TBOOLEAN: /* booleans */
- p+=sprintf(p,lua_toboolean(L, i) ? "true" : "false");
+ case LUA_TBOOLEAN: /* booleans */
+ p += sprintf(p, lua_toboolean(L, i) ? "true" : "false");
break;
- case LUA_TNUMBER: /* numbers */
- p+=sprintf(p,"%g", lua_tonumber(L, i));
+ case LUA_TNUMBER: /* numbers */
+ p += sprintf(p, "%g", lua_tonumber(L, i));
break;
case LUA_TTABLE:
- p+=sprintf(p, "Table");
+ p += sprintf(p, "Table");
break;
- default: /* other values */
- p+=sprintf(p, "???");
+ default: /* other values */
+ p += sprintf(p, "???");
/* if ((ptr = luaL_checkudata(L,i,TASK_MODULE_NAME))) {
p+=sprintf(p,"task");
} else {
break;
}
- p+=sprintf(p," "); /* put a separator */
+ p += sprintf(p, " "); /* put a separator */
}
- INFO2("%s%s",msg,buff);
+ INFO2("%s%s", msg, buff);
}
/** @brief ensures that a userdata on the stack is a task and returns the pointer inside the userdata */
-static m_task_t checkTask (lua_State *L,int index) {
- m_task_t *pi,tk;
- luaL_checktype(L,index,LUA_TTABLE);
- lua_getfield(L,index,"__simgrid_task");
- pi = (m_task_t*)luaL_checkudata(L,-1,TASK_MODULE_NAME);
- if(pi == NULL)
- luaL_typerror(L,index,TASK_MODULE_NAME);
+static m_task_t checkTask(lua_State * L, int index)
+{
+ m_task_t *pi, tk;
+ luaL_checktype(L, index, LUA_TTABLE);
+ lua_getfield(L, index, "__simgrid_task");
+ pi = (m_task_t *) luaL_checkudata(L, -1, TASK_MODULE_NAME);
+ if (pi == NULL)
+ luaL_typerror(L, index, TASK_MODULE_NAME);
tk = *pi;
- if(!tk)
- luaL_error(L,"null Task");
- lua_pop(L,1);
- return tk;
-}
-
-/** @brief leaves a new userdata on top of the stack, sets its metatable, and sets the Task pointer inside the userdata */
-// NOT USED
-/*static m_task_t *pushTask (lua_State *L,m_task_t tk) {
- m_task_t *pi = NULL;
- pi = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
- *pi=tk;
- DEBUG1("push lua task with Name : %s \n",MSG_task_get_name(*pi));
- luaL_getmetatable(L,TASK_MODULE_NAME);
- lua_setmetatable(L,-2);
- return pi;
-}*/
+ if (!tk)
+ luaL_error(L, "null Task");
+ lua_pop(L, 1);
+ return tk;
+}
/* ********************************************************************************* */
/* wrapper functions */
/* ********************************************************************************* */
/**
- * Task
+ * A task is either something to compute somewhere, or something to exchange between two hosts (or both).
+ * It is defined by a computing amount and a message size.
+ *
*/
-static int Task_new(lua_State* L) {
- const char *name=luaL_checkstring(L,1);
- int comp_size = luaL_checkint(L,2);
- int msg_size = luaL_checkint(L,3);
- INFO0("Creating task");
- m_task_t msg_task = MSG_task_create(name,comp_size,msg_size,NULL);
- lua_newtable (L); /* create a table, put the userdata on top of it */
- m_task_t *lua_task = (m_task_t*)lua_newuserdata(L,sizeof(m_task_t));
+/* * * *
+ * * Constructors * *
+ * * * */
+/**
+ * Construct an new task with the specified processing amount and amount
+ * of data needed.
+ *
+ * @param name Task's name
+ *
+ * @param computeDuration A value of the processing amount (in flop) needed to process the task.
+ * If 0, then it cannot be executed with the execute() method.
+ * This value has to be >= 0.
+ *
+ * @param messageSize A value of amount of data (in bytes) needed to transfert this task.
+ * If 0, then it cannot be transfered with the get() and put() methods.
+ * This value has to be >= 0.
+ */
+static int Task_new(lua_State * L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ int comp_size = luaL_checkint(L, 2);
+ int msg_size = luaL_checkint(L, 3);
+ m_task_t msg_task = MSG_task_create(name, comp_size, msg_size, NULL);
+ lua_newtable(L); /* create a table, put the userdata on top of it */
+ m_task_t *lua_task = (m_task_t *) lua_newuserdata(L, sizeof(m_task_t));
*lua_task = msg_task;
- luaL_getmetatable(L,TASK_MODULE_NAME);
- lua_setmetatable(L,-2);
- lua_setfield (L, -2, "__simgrid_task"); /* put the userdata as field of the table */
+ luaL_getmetatable(L, TASK_MODULE_NAME);
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__simgrid_task"); /* put the userdata as field of the table */
/* remove the args from the stack */
- lua_remove(L,1);
- lua_remove(L,1);
- lua_remove(L,1);
+ lua_remove(L, 1);
+ lua_remove(L, 1);
+ lua_remove(L, 1);
return 1;
}
-static int Task_get_name(lua_State *L) {
- m_task_t tk = checkTask(L,-1);
- lua_pushstring(L,MSG_task_get_name(tk));
+static int Task_get_name(lua_State * L)
+{
+ m_task_t tk = checkTask(L, -1);
+ lua_pushstring(L, MSG_task_get_name(tk));
return 1;
}
-static int Task_computation_duration(lua_State *L){
- m_task_t tk = checkTask(L,-1);
- lua_pushnumber(L,MSG_task_get_compute_duration (tk));
+static int Task_computation_duration(lua_State * L)
+{
+ m_task_t tk = checkTask(L, -1);
+ lua_pushnumber(L, MSG_task_get_compute_duration(tk));
return 1;
}
-static int Task_execute(lua_State *L){
- m_task_t tk = checkTask(L,-1);
+static int Task_execute(lua_State * L)
+{
+ m_task_t tk = checkTask(L, -1);
int res = MSG_task_execute(tk);
- lua_pushnumber(L,res);
+ lua_pushnumber(L, res);
return 1;
}
-static int Task_destroy(lua_State *L) {
- m_task_t tk = checkTask(L,-1);
+static int Task_destroy(lua_State * L)
+{
+ m_task_t tk = checkTask(L, -1);
int res = MSG_task_destroy(tk);
- lua_pushnumber(L,res);
+ lua_pushnumber(L, res);
return 1;
}
-static int Task_send(lua_State *L) {
+static int Task_send(lua_State * L)
+{
//stackDump("send ",L);
- m_task_t tk = checkTask(L,-2);
- const char *mailbox = luaL_checkstring(L,-1);
- lua_pop(L,1); // remove the string so that the task is on top of it
- MSG_task_set_data(tk,L); // Copy my stack into the task, so that the receiver can copy the lua task directly
- MSG_error_t res = MSG_task_send(tk,mailbox);
- while (MSG_task_get_data(tk)!=NULL) // Don't mess up with my stack: the receiver didn't copy the data yet
- MSG_process_sleep(0); // yield
-
- if (res != MSG_OK) switch(res) {
- case MSG_TIMEOUT :
+ m_task_t tk = checkTask(L, -2);
+ const char *mailbox = luaL_checkstring(L, -1);
+ lua_pop(L, 1); // remove the string so that the task is on top of it
+ MSG_task_set_data(tk, L); // Copy my stack into the task, so that the receiver can copy the lua task directly
+ MSG_error_t res = MSG_task_send(tk, mailbox);
+ while (MSG_task_get_data(tk) != NULL) // Don't mess up with my stack: the receiver didn't copy the data yet
+ MSG_process_sleep(0); // yield
+
+ if (res != MSG_OK)
+ switch (res) {
+ case MSG_TIMEOUT:
ERROR0("MSG_task_send failed : Timeout");
break;
- case MSG_TRANSFER_FAILURE :
+ case MSG_TRANSFER_FAILURE:
ERROR0("MSG_task_send failed : Transfer Failure");
break;
- case MSG_HOST_FAILURE :
+ case MSG_HOST_FAILURE:
ERROR0("MSG_task_send failed : Host Failure ");
break;
- default :
- ERROR0("MSG_task_send failed : Unexpected error , please report this bug");
+ default:
+ ERROR0
+ ("MSG_task_send failed : Unexpected error , please report this bug");
break;
}
return 0;
}
-static int Task_recv(lua_State *L) {
+static int Task_recv(lua_State * L)
+{
m_task_t tk = NULL;
- const char *mailbox = luaL_checkstring(L,-1);
- MSG_error_t res = MSG_task_receive(&tk,mailbox);
+ const char *mailbox = luaL_checkstring(L, -1);
+ MSG_error_t res = MSG_task_receive(&tk, mailbox);
lua_State *sender_stack = MSG_task_get_data(tk);
- lua_xmove(sender_stack,L,1); // copy the data directly from sender's stack
- MSG_task_set_data(tk,NULL);
-
- if(res != MSG_OK) switch(res){
- case MSG_TIMEOUT :
- ERROR0("MSG_task_receive failed : Timeout");
- break;
- case MSG_TRANSFER_FAILURE :
- ERROR0("MSG_task_receive failed : Transfer Failure");
- break;
- case MSG_HOST_FAILURE :
- ERROR0("MSG_task_receive failed : Host Failure ");
- break;
- default :
- ERROR0("MSG_task_receive failed : Unexpected error , please report this bug");
- break;
- }
+ lua_xmove(sender_stack, L, 1); // copy the data directly from sender's stack
+ MSG_task_set_data(tk, NULL);
+
+ if (res != MSG_OK)
+ switch (res) {
+ case MSG_TIMEOUT:
+ ERROR0("MSG_task_receive failed : Timeout");
+ break;
+ case MSG_TRANSFER_FAILURE:
+ ERROR0("MSG_task_receive failed : Transfer Failure");
+ break;
+ case MSG_HOST_FAILURE:
+ ERROR0("MSG_task_receive failed : Host Failure ");
+ break;
+ default:
+ ERROR0
+ ("MSG_task_receive failed : Unexpected error , please report this bug");
+ break;
+ }
return 1;
}
static const luaL_reg Task_methods[] = {
- {"new", Task_new},
- {"name", Task_get_name},
- {"computation_duration", Task_computation_duration},
- {"execute", Task_execute},
- {"destroy", Task_destroy},
- {"send", Task_send},
- {"recv", Task_recv},
- {0,0}
+ {"new", Task_new},
+ {"name", Task_get_name},
+ {"computation_duration", Task_computation_duration},
+ {"execute", Task_execute},
+ {"destroy", Task_destroy},
+ {"send", Task_send},
+ {"recv", Task_recv},
+ {0, 0}
};
-static int Task_gc(lua_State *L) {
- m_task_t tk=checkTask(L,-1);
- if (tk) MSG_task_destroy(tk);
+
+static int Task_gc(lua_State * L)
+{
+ m_task_t tk = checkTask(L, -1);
+ if (tk)
+ MSG_task_destroy(tk);
return 0;
}
-static int Task_tostring(lua_State *L) {
- lua_pushfstring(L, "Task :%p",lua_touserdata(L,1));
+static int Task_tostring(lua_State * L)
+{
+ lua_pushfstring(L, "Task :%p", lua_touserdata(L, 1));
return 1;
}
static const luaL_reg Task_meta[] = {
- {"__gc", Task_gc},
- {"__tostring", Task_tostring},
- {0,0}
+ {"__gc", Task_gc},
+ {"__tostring", Task_tostring},
+ {0, 0}
};
/**
* Host
*/
-static m_host_t checkHost (lua_State *L,int index) {
- m_host_t *pi,ht;
- luaL_checktype(L,index,LUA_TTABLE);
- lua_getfield(L,index,"__simgrid_host");
- pi = (m_host_t*)luaL_checkudata(L,-1,HOST_MODULE_NAME);
- if(pi == NULL)
- luaL_typerror(L,index,HOST_MODULE_NAME);
+static m_host_t checkHost(lua_State * L, int index)
+{
+ m_host_t *pi, ht;
+ luaL_checktype(L, index, LUA_TTABLE);
+ lua_getfield(L, index, "__simgrid_host");
+ pi = (m_host_t *) luaL_checkudata(L, -1, HOST_MODULE_NAME);
+ if (pi == NULL)
+ luaL_typerror(L, index, HOST_MODULE_NAME);
ht = *pi;
- if(!ht)
- luaL_error(L,"null Host");
- lua_pop(L,1);
- return ht;
-}
-
-static int Host_get_by_name(lua_State *L)
-{
- const char *name=luaL_checkstring(L,1);
- DEBUG0("Getting Host from name...");
- m_host_t msg_host = MSG_get_host_by_name(name);
- if (!msg_host)
- {
- luaL_error(L,"null Host : MSG_get_host_by_name failled");
- }
- lua_newtable (L); /* create a table, put the userdata on top of it */
- m_host_t *lua_host = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t));
- *lua_host = msg_host;
- luaL_getmetatable(L,HOST_MODULE_NAME);
- lua_setmetatable(L,-2);
- lua_setfield (L, -2, "__simgrid_host"); /* put the userdata as field of the table */
- /* remove the args from the stack */
- lua_remove(L,1);
- return 1;
+ if (!ht)
+ luaL_error(L, "null Host");
+ lua_pop(L, 1);
+ return ht;
+}
+
+static int Host_get_by_name(lua_State * L)
+{
+ const char *name = luaL_checkstring(L, 1);
+ DEBUG0("Getting Host from name...");
+ m_host_t msg_host = MSG_get_host_by_name(name);
+ if (!msg_host) {
+ luaL_error(L, "null Host : MSG_get_host_by_name failled");
+ }
+ lua_newtable(L); /* create a table, put the userdata on top of it */
+ m_host_t *lua_host = (m_host_t *) lua_newuserdata(L, sizeof(m_host_t));
+ *lua_host = msg_host;
+ luaL_getmetatable(L, HOST_MODULE_NAME);
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__simgrid_host"); /* put the userdata as field of the table */
+ /* remove the args from the stack */
+ lua_remove(L, 1);
+ return 1;
}
-static int Host_get_name(lua_State *L) {
- m_host_t ht = checkHost(L,-1);
- lua_pushstring(L,MSG_host_get_name(ht));
+static int Host_get_name(lua_State * L)
+{
+ m_host_t ht = checkHost(L, -1);
+ lua_pushstring(L, MSG_host_get_name(ht));
+ return 1;
+}
+
+static int Host_number(lua_State * L)
+{
+ lua_pushnumber(L, MSG_get_host_number());
return 1;
}
-static int Host_number(lua_State *L) {
- lua_pushnumber(L,MSG_get_host_number());
+static int Host_at(lua_State * L)
+{
+ int index = luaL_checkinteger(L, 1);
+ m_host_t host = MSG_get_host_table()[index - 1]; // lua indexing start by 1 (lua[1] <=> C[0])
+ lua_newtable(L); /* create a table, put the userdata on top of it */
+ m_host_t *lua_host = (m_host_t *) lua_newuserdata(L, sizeof(m_host_t));
+ *lua_host = host;
+ luaL_getmetatable(L, HOST_MODULE_NAME);
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__simgrid_host"); /* put the userdata as field of the table */
return 1;
+
}
-static int Host_at(lua_State *L)
+static int Host_self(lua_State * L)
{
- int index = luaL_checkinteger(L,1);
- m_host_t host = MSG_get_host_table()[index-1]; // lua indexing start by 1 (lua[1] <=> C[0])
- lua_newtable (L); /* create a table, put the userdata on top of it */
- m_host_t *lua_host = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t));
+ m_host_t host = MSG_host_self();
+ lua_newtable(L);
+ m_host_t *lua_host =(m_host_t *)lua_newuserdata(L,sizeof(m_host_t));
*lua_host = host;
- luaL_getmetatable(L,HOST_MODULE_NAME);
- lua_setmetatable(L,-2);
- lua_setfield (L, -2, "__simgrid_host"); /* put the userdata as field of the table */
+ luaL_getmetatable(L, HOST_MODULE_NAME);
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__simgrid_host");
return 1;
}
-/*****************************************************************************************
- * BYPASS XML SURF Methods *
- ***************************
- ***************************
-******************************************************************************************/
-#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
-typedef struct t_host_attr
+static int Host_get_property_value(lua_State * L)
{
- //platform attribute
- const char* id;
- double power;
- //deployment attribute
- const char* function;
- int args_nb;
- const char ** args_list;
-}host_attr,*p_host_attr;
+ m_host_t ht = checkHost(L, -2);
+ const char *prop = luaL_checkstring(L, -1);
+ lua_pushstring(L,MSG_host_get_property_value(ht,prop));
+ return 1;
+}
-typedef struct t_link_attr
-{
- const char* id;
- double bandwidth;
- double latency;
-}link_attr,*p_link_attr;
+/* ********************************************************************************* */
+/* lua_stub_generator functions */
+/* ********************************************************************************* */
-typedef struct t_route_attr
+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)
{
- const char *src_id;
- const char *dest_id;
- int links_nb;
- const char **links_id;
+ 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);
+}
-}route_attr,*p_route_attr;
+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);
-static int host_index = 0;
-static int link_index = 0;
-static int route_index = 0;
+ return 0;
-static int max_host_number = 0;
-static int max_link_number = 0;
-static int max_route_number = 0;
-
-static p_host_attr* host_list;
-static p_link_attr* link_list;
-static p_route_attr* route_list;
-
-static int Host_set_number(lua_State *L)
-{
- max_host_number = luaL_checkint(L,1);
- host_list = malloc(sizeof(host_attr)*max_host_number);
- return 0;
-}
-
-static int Link_set_number(lua_State *L)
-{
- max_link_number = luaL_checkint(L,1);
- link_list = malloc(sizeof(link_attr)*max_link_number);
- return 0;
-}
-
-static int Route_set_number(lua_State *L)
-{
- max_route_number = luaL_checkint(L,1);
- route_list = malloc(sizeof(route_attr)*max_link_number);
- return 0;
-}
-
-static int Host_new(lua_State *L) //(id,power)
-{
- p_host_attr host = malloc(sizeof(host_attr));
- host->id = luaL_checkstring(L,1);
- host->power = luaL_checknumber(L,2);
- if(host_index >= max_host_number)
- ERROR1("max host number:%d reached !!!",max_host_number);
- host_list[host_index] = host;
- host_list[host_index]->function = NULL;
- host_index++;
- return 0;
-}
-
-static int Link_new(lua_State *L) // (id,bandwidth,latency)
-{
-
- p_link_attr link = malloc(sizeof(link_attr));
- link->id = luaL_checkstring(L,1);
- link->bandwidth = luaL_checknumber(L,2);
- link->latency = luaL_checknumber(L,3);
- if(link_index >= max_link_number)
- ERROR1("max link number: %d reached !!!",max_link_number);
- link_list[link_index] = link;
- link_index++;
- return 0;
-}
-
-static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table)
-{
- int i=0;
- p_route_attr route = malloc(sizeof(route_attr));
- route->src_id = luaL_checkstring(L,1);
- route->dest_id = luaL_checkstring(L,2);
- route->links_nb = luaL_checkint(L,3);
- route->links_id = malloc(sizeof(char*)*route->links_nb);
- lua_pushnil(L);
- while (lua_next(L,4) != 0) {
- if(i >= route->links_nb)
- ERROR1("Number of links should be less than %d",route->links_nb+1);
- route->links_id[i] = lua_tostring(L, -1);
- DEBUG2("index = %f , Link_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
- i++;
- lua_pop(L, 1);
- }
- lua_pop(L, 1);
-
- //add route to platform's route list
- if(route_index >= max_route_number)
- ERROR1("max route number: %d reached !!!",max_route_number);
- route_list[route_index] = route;
- route_index++;
- return 0;
-}
-
-static int Host_set_function(lua_State *L) //(host,function,nb_args,list_args)
-{
- // look for the index of host in host_list
- const char *host_id = luaL_checkstring(L,1);
- int i;
- for(i=0;i< host_index;i++)
- {
- if(host_list[i]->id == host_id)
- {
- host_list[i]->function = luaL_checkstring(L,2);
- host_list[i]->args_nb = luaL_checkint(L,3);
- host_list[i]->args_list = malloc(sizeof(char*)*host_list[i]->args_nb);
- // fill the args list
- lua_pushnil(L);
- int j = 0;
- while (lua_next(L,4) != 0) {
- if(j >= host_list[i]->args_nb)
- ERROR1("Number of args should be less than %d",host_list[i]->args_nb+1);
- host_list[i]->args_list[j] = lua_tostring(L, -1);
- 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;
- }
- }
- ERROR1("Host : %s Not Fount !!",host_id);
- return 1;
}
+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;
+}
-/*
- * surf parse bypass platform
- */
-static int surf_parse_bypass_platform()
-{
- static int AX_ptr = 0;
- static int surfxml_bufferstack_size = 2048;
- /* FIXME allocating memory for the buffer, I think 2kB should be enough */
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- /* <platform> */
- SURFXML_BUFFER_SET(platform_version, "2");
- SURFXML_START_TAG(platform);
- char buffer[22];
- int i;
-
- // Add Host
- for(i=0;i<host_index;i++)
- {
- SURFXML_BUFFER_SET(host_id,host_list[i]->id);
- sprintf(buffer, "%f", host_list[i]->power);
- SURFXML_BUFFER_SET(host_power,buffer);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
- SURFXML_BUFFER_SET(host_interference_send, "1.0");
- SURFXML_BUFFER_SET(host_interference_recv, "1.0");
- SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
- }
-
- //add Host
- for (i = 0;i<link_index;i++)
- {
- SURFXML_BUFFER_SET(link_id,link_list[i]->id);
- sprintf(buffer,"%f",link_list[i]->bandwidth);
- SURFXML_BUFFER_SET(link_bandwidth,buffer);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- sprintf(buffer,"%f",link_list[i]->latency);
- SURFXML_BUFFER_SET(link_latency,buffer);
- SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
- SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
- }
-
- // add route
-
- for (i = 0;i<route_index;i++)
- {
- SURFXML_BUFFER_SET(route_src,route_list[i]->src_id);
- SURFXML_BUFFER_SET(route_dst,route_list[i]->dest_id);
- SURFXML_BUFFER_SET(route_impact_on_src, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0");
- SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0");
- SURFXML_START_TAG(route);
- int j;
-
- for(j=0; j < route_list[i]->links_nb;j++)
- {
- SURFXML_BUFFER_SET(link_c_ctn_id,route_list[i]->links_id[j]);
- SURFXML_START_TAG(link_c_ctn);
- SURFXML_END_TAG(link_c_ctn);
- }
-
- SURFXML_END_TAG(route);
- }
- /* </platform> */
-
- SURFXML_END_TAG(platform);
- free(surfxml_bufferstack);
- return 0; // must return 0 ?!!
+/***********************************
+ * Tracing
+ **********************************/
+static int trace_start(lua_State *L)
+{
+ TRACE_start();
+ return 1;
+}
+static int trace_category(lua_State * L)
+{
+ TRACE_category(luaL_checkstring(L, 1));
+ return 1;
}
-/*
- * surf parse bypass application
- */
-static int surf_parse_bypass_application()
-{
- int i;
- static int AX_ptr;
- static int surfxml_bufferstack_size = 2048;
- /* FIXME ( should be manual )allocating memory to the buffer, I think 2MB should be enough */
- surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- /* <platform> */
-
- SURFXML_BUFFER_SET(platform_version, "2");
-
- SURFXML_START_TAG(platform);
-
- for(i=0 ; i< host_index ;i++)
- {
- if(host_list[i]->function)
- {
- SURFXML_BUFFER_SET(process_host, host_list[i]->id);
- SURFXML_BUFFER_SET(process_function, host_list[i]->function);
- SURFXML_BUFFER_SET(process_start_time, "-1.0");
- SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- SURFXML_START_TAG(process);
-
- //args
- int j;
- for(j=0 ;j<host_list[i]->args_nb;j++)
- {
- SURFXML_BUFFER_SET(argument_value, host_list[i]->args_list[j]);
- SURFXML_START_TAG(argument);
- SURFXML_END_TAG(argument);
- }
- SURFXML_END_TAG(process);
- }
-
- }
- /* </platform> */
- SURFXML_END_TAG(platform);
- free(surfxml_bufferstack);
- return 0;
-}
-
-// Free Allocated Memory
-static void clean_attr()
-{
- // free hosts
- int i;
- for(i = 0;i<host_index;i++)
- free(host_list[i]->args_list);
-
- free(host_list);
- free(link_list);
-
- for(i=0;i<route_index;i++)
- free(route_list[i]->links_id);
-
- free(route_list);
+static int trace_set_task_category(lua_State *L)
+{
+ TRACE_msg_set_task_category(checkTask(L, -2), luaL_checkstring(L, -1));
+ return 1;
+}
+
+static int trace_end(lua_State *L)
+{
+ TRACE_end();
+ return 1;
}
//***********Register Methods *******************************************//
/*
* Host Methods
*/
static const luaL_reg Host_methods[] = {
- {"getByName", Host_get_by_name},
- {"name", Host_get_name},
- {"number", Host_number},
- {"at", Host_at},
- // Bypass XML Methods
- {"new", Host_new},
- {"setNumber", Host_set_number},
- {"setFunction", Host_set_function},
- {0,0}
+ {"getByName", Host_get_by_name},
+ {"name", Host_get_name},
+ {"number", Host_number},
+ {"at", Host_at},
+ {"self",Host_self},
+ {"getPropValue",Host_get_property_value},
+ // Bypass XML Methods
+ {"new", console_add_host},
+ {"setFunction", console_set_function},
+ {0, 0}
};
-static int Host_gc(lua_State *L)
+static int Host_gc(lua_State * L)
{
- m_host_t ht = checkHost(L,-1);
- if (ht) ht = NULL;
+ m_host_t ht = checkHost(L, -1);
+ if (ht)
+ ht = NULL;
return 0;
}
-static int Host_tostring(lua_State *L)
+static int Host_tostring(lua_State * L)
{
- lua_pushfstring(L,"Host :%p",lua_touserdata(L,1));
+ lua_pushfstring(L, "Host :%p", lua_touserdata(L, 1));
return 1;
}
static const luaL_reg Host_meta[] = {
- {"__gc", Host_gc},
- {"__tostring", Host_tostring},
- {0,0}
+ {"__gc", Host_gc},
+ {"__tostring", Host_tostring},
+ {0, 0}
+};
+
+/*
+ * AS Methods
+ */
+static const luaL_reg AS_methods[] = {
+ {"new", console_add_AS},
+ {0, 0}
};
+
/*
* Link Methods
*/
static const luaL_reg Link_methods[] = {
- {"new",Link_new},
- {"setNumber", Link_set_number },
- {0,0}
+ {"new", console_add_link},
+ {0, 0}
};
+
/*
* Route Methods
*/
-static const luaL_reg Route_methods[] ={
- {"new",Route_new},
- {"setNumber",Route_set_number}
+static const luaL_reg Route_methods[] = {
+ {"new", console_add_route},
+ {0, 0}
};
+/**
+ * Tracing Functions
+ */
+static const luaL_reg Trace_methods[] = {
+ {"start",trace_start},
+ {"category",trace_category},
+ {"setTaskCategory",trace_set_task_category},
+ {"finish",trace_end},
+ {0,0}
+};
/*
* Environment related
*/
extern lua_State *simgrid_lua_state;
-static int run_lua_code(int argc,char **argv) {
- DEBUG1("Run lua code %s",argv[0]);
+static int run_lua_code(int argc, char **argv)
+{
+ DEBUG1("Run lua code %s", argv[0]);
lua_State *L = lua_newthread(simgrid_lua_state);
- int ref = luaL_ref(simgrid_lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
+ int ref = luaL_ref(simgrid_lua_state, LUA_REGISTRYINDEX); // protect the thread from being garbage collected
int res = 1;
/* Start the co-routine */
- lua_getglobal(L,argv[0]);
- xbt_assert1(lua_isfunction(L,-1),
- "The lua function %s does not seem to exist",argv[0]);
+ lua_getglobal(L, argv[0]);
+ xbt_assert1(lua_isfunction(L, -1),
+ "The lua function %s does not seem to exist", argv[0]);
// push arguments onto the stack
int i;
- for(i=1;i<argc;i++)
- lua_pushstring(L,argv[i]);
+ for (i = 1; i < argc; i++)
+ lua_pushstring(L, argv[i]);
// Call the function (in resume)
- xbt_assert2(lua_pcall(L, argc-1, 1, 0) == 0,
- "error running function `%s': %s",argv[0], lua_tostring(L, -1));
+ xbt_assert2(lua_pcall(L, argc - 1, 1, 0) == 0,
+ "error running function `%s': %s", argv[0], lua_tostring(L,
+ -1));
/* retrieve result */
if (lua_isnumber(L, -1)) {
res = lua_tonumber(L, -1);
- lua_pop(L, 1); /* pop returned value */
+ lua_pop(L, 1); /* pop returned value */
}
-
// cleanups
- luaL_unref(simgrid_lua_state,LUA_REGISTRYINDEX,ref );
+ luaL_unref(simgrid_lua_state, LUA_REGISTRYINDEX, ref);
DEBUG1("Execution of lua code %s is over", (argv ? argv[0] : "(null)"));
return res;
}
-static int launch_application(lua_State *L) {
- const char * file = luaL_checkstring(L,1);
+
+static int launch_application(lua_State * L)
+{
+ const char *file = luaL_checkstring(L, 1);
MSG_function_register_default(run_lua_code);
MSG_launch_application(file);
return 0;
}
-#include "simix/simix.h" //FIXME: KILLME when debugging on simix internals become useless
-static int create_environment(lua_State *L) {
- const char *file = luaL_checkstring(L,1);
- DEBUG1("Loading environment file %s",file);
+
+#include "simix/simix.h" //FIXME: KILLME when debugging on simix internals become useless
+static int create_environment(lua_State * L)
+{
+ const char *file = luaL_checkstring(L, 1);
+ DEBUG1("Loading environment file %s", file);
MSG_create_environment(file);
smx_host_t *hosts = SIMIX_host_get_table();
int i;
- for (i=0;i<SIMIX_host_get_number();i++) {
+ for (i = 0; i < SIMIX_host_get_number(); i++) {
DEBUG1("We have an host %s", SIMIX_host_get_name(hosts[i]));
}
return 0;
}
-static int debug(lua_State *L) {
- const char *str = luaL_checkstring(L,1);
- DEBUG1("%s",str);
+static int debug(lua_State * L)
+{
+ const char *str = luaL_checkstring(L, 1);
+ DEBUG1("%s", str);
return 0;
}
-static int info(lua_State *L) {
- const char *str = luaL_checkstring(L,1);
- INFO1("%s",str);
+
+static int info(lua_State * L)
+{
+ const char *str = luaL_checkstring(L, 1);
+ INFO1("%s", str);
return 0;
}
-static int run(lua_State *L) {
+
+static int run(lua_State * L)
+{
MSG_main();
return 0;
}
-static int clean(lua_State *L) {
- clean_attr(); // in case of using "bypass xml" methods
+
+static int clean(lua_State * L)
+{
MSG_clean();
return 0;
}
/*
- * Bypass XML Pareser
+ * Bypass XML Parser (lua console)
+ */
+
+/*
+ * Register platform for MSG
+ */
+static int msg_register_platform(lua_State * L)
+{
+ /* Tell Simgrid we dont wanna use its parser */
+ surf_parse = console_parse_platform;
+ MSG_create_environment(NULL);
+ return 0;
+}
+
+/*
+ * Register platform for Simdag
*/
-static int register_platform(lua_State *L)
+
+static int sd_register_platform(lua_State * L)
{
- /* Tell Simgrid we dont wanna use its parser*/
- surf_parse = surf_parse_bypass_platform;
- MSG_create_environment(NULL);
- return 0;
+ surf_parse = console_parse_platform_wsL07;
+ SD_create_environment(NULL);
+ return 0;
}
-static int register_application(lua_State *L)
+/*
+ * Register platform for gras
+ */
+static int gras_register_platform(lua_State * L)
{
- MSG_function_register_default(run_lua_code);
- surf_parse = surf_parse_bypass_application;
- MSG_launch_application(NULL);
- return 0;
+ /* Tell Simgrid we dont wanna use surf parser */
+ surf_parse = console_parse_platform;
+ gras_create_environment(NULL);
+ return 0;
+}
+
+/**
+ * Register applicaiton for MSG
+ */
+static int msg_register_application(lua_State * L)
+{
+ MSG_function_register_default(run_lua_code);
+ surf_parse = console_parse_application;
+ MSG_launch_application(NULL);
+ return 0;
+}
+
+/*
+ * Register application for gras
+ */
+static int gras_register_application(lua_State * L)
+{
+ gras_function_register_default(run_lua_code);
+ surf_parse = console_parse_application;
+ gras_launch_application(NULL);
+ return 0;
}
static const luaL_Reg simgrid_funcs[] = {
- { "create_environment", create_environment},
- { "launch_application", launch_application},
- { "debug", debug},
- { "info", info},
- { "run", run},
- { "clean", clean},
- /* short names */
- { "platform", create_environment},
- { "application", launch_application},
- /* methods to bypass XML parser*/
- { "register_platform",register_platform},
- { "register_application",register_application},
- { NULL, NULL }
+ {"create_environment", create_environment},
+ {"launch_application", launch_application},
+ {"debug", debug},
+ {"info", info},
+ {"run", run},
+ {"clean", clean},
+ /* short names */
+ {"platform", create_environment},
+ {"application", launch_application},
+ /* methods to bypass XML parser */
+ {"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}
};
/* ********************************************************************************* */
/* module management functions */
/* ********************************************************************************* */
-extern const char*xbt_ctx_factory_to_use; /*Hack: let msg load directly the right factory */
-
-#define LUA_MAX_ARGS_COUNT 10 /* maximum amount of arguments we can get from lua on command line */
-int luaopen_simgrid(lua_State* L); // Fuck gcc: we don't need that prototype
-int luaopen_simgrid(lua_State* L) {
- //xbt_ctx_factory_to_use = "lua";
+#define LUA_MAX_ARGS_COUNT 10 /* maximum amount of arguments we can get from lua on command line */
+#define TEST
+int luaopen_simgrid(lua_State * L); // Fuck gcc: we don't need that prototype
+int luaopen_simgrid(lua_State * L)
+{
- char **argv=malloc(sizeof(char*)*LUA_MAX_ARGS_COUNT);
- int argc=1;
- argv[0] = (char*)"/usr/bin/lua"; /* Lie on the argv[0] so that the stack dumping facilities find the right binary. FIXME: what if lua is not in that location? */
+ char **argv = malloc(sizeof(char *) * LUA_MAX_ARGS_COUNT);
+ int argc = 1;
+ argv[0] = (char *) "/usr/bin/lua"; /* Lie on the argv[0] so that the stack dumping facilities find the right binary. FIXME: what if lua is not in that location? */
/* Get the command line arguments from the lua interpreter */
- lua_getglobal(L,"arg");
- xbt_assert1(lua_istable(L,-1),"arg parameter is not a table but a %s",lua_typename(L,-1));
- int done=0;
- while (!done) {
- argc++;
- lua_pushinteger(L,argc-2);
- lua_gettable(L,-2);
- if (lua_isnil(L,-1)) {
- done = 1;
- } else {
- xbt_assert1(lua_isstring(L,-1),"argv[%d] got from lua is no string",argc-1);
- xbt_assert2(argc<LUA_MAX_ARGS_COUNT,
- "Too many arguments, please increase LUA_MAX_ARGS_COUNT in %s before recompiling SimGrid if you insist on having more than %d args on command line",
- __FILE__,LUA_MAX_ARGS_COUNT-1);
- argv[argc-1] = (char*)luaL_checkstring(L,-1);
- lua_pop(L,1);
- DEBUG1("Got command line argument %s from lua",argv[argc-1]);
+ lua_getglobal(L, "arg");
+ /* if arg is a null value, it means we use lua only as a script to init platform
+ * else it should be a table and then take arg in consideration
+ */
+ if (lua_istable(L, -1)) {
+ int done = 0;
+ while (!done) {
+ argc++;
+ lua_pushinteger(L, argc - 2);
+ lua_gettable(L, -2);
+ if (lua_isnil(L, -1)) {
+ done = 1;
+ } else {
+ xbt_assert1(lua_isstring(L, -1),
+ "argv[%d] got from lua is no string", argc - 1);
+ xbt_assert2(argc < LUA_MAX_ARGS_COUNT,
+ "Too many arguments, please increase LUA_MAX_ARGS_COUNT in %s before recompiling SimGrid if you insist on having more than %d args on command line",
+ __FILE__, LUA_MAX_ARGS_COUNT - 1);
+ argv[argc - 1] = (char *) luaL_checkstring(L, -1);
+ lua_pop(L, 1);
+ DEBUG1("Got command line argument %s from lua", argv[argc - 1]);
+ }
}
- }
- argv[argc--]=NULL;
-
- /* Initialize the MSG core */
- MSG_global_init(&argc,argv);
- DEBUG1("Still %d arguments on command line",argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+ argv[argc--] = NULL;
+ /* Initialize the MSG core */
+ MSG_global_init(&argc, argv);
+ DEBUG1("Still %d arguments on command line", argc); // FIXME: update the lua's arg table to reflect the changes from SimGrid
+ }
/* register the core C functions to lua */
luaL_register(L, "simgrid", simgrid_funcs);
/* register the task methods to lua */
- luaL_openlib(L,TASK_MODULE_NAME,Task_methods,0); //create methods table,add it to the globals
- luaL_newmetatable(L,TASK_MODULE_NAME); //create metatable for Task,add it to the Lua registry
- luaL_openlib(L,0,Task_meta,0);// fill metatable
- lua_pushliteral(L,"__index");
- lua_pushvalue(L,-3); //dup methods table
- lua_rawset(L,-3); //matatable.__index = methods
- lua_pushliteral(L,"__metatable");
- lua_pushvalue(L,-3); //dup methods table
- lua_rawset(L,-3); //hide metatable:metatable.__metatable = methods
- lua_pop(L,1); //drop metatable
-
- /* register the hosts methods to lua*/
- luaL_openlib(L,HOST_MODULE_NAME,Host_methods,0);
- luaL_newmetatable(L,HOST_MODULE_NAME);
- luaL_openlib(L,0,Host_meta,0);
- lua_pushliteral(L,"__index");
- lua_pushvalue(L,-3);
- lua_rawset(L,-3);
- lua_pushliteral(L,"__metatable");
- lua_pushvalue(L,-3);
- lua_rawset(L,-3);
- lua_pop(L,1);
-
- /* register the links methods to lua*/
- luaL_openlib(L,LINK_MODULE_NAME,Link_methods,0);
- luaL_newmetatable(L,LINK_MODULE_NAME);
- lua_pop(L,1);
-
- /*register the routes methods to lua*/
- luaL_openlib(L,ROUTE_MODULE_NAME,Route_methods,0);
- luaL_newmetatable(L,LINK_MODULE_NAME);
- lua_pop(L,1);
+ luaL_openlib(L, TASK_MODULE_NAME, Task_methods, 0); //create methods table,add it to the globals
+ luaL_newmetatable(L, TASK_MODULE_NAME); //create metatable for Task,add it to the Lua registry
+ luaL_openlib(L, 0, Task_meta, 0); // fill metatable
+ lua_pushliteral(L, "__index");
+ lua_pushvalue(L, -3); //dup methods table
+ lua_rawset(L, -3); //matatable.__index = methods
+ lua_pushliteral(L, "__metatable");
+ lua_pushvalue(L, -3); //dup methods table
+ lua_rawset(L, -3); //hide metatable:metatable.__metatable = methods
+ lua_pop(L, 1); //drop metatable
+
+ /* register the hosts methods to lua */
+ luaL_openlib(L, HOST_MODULE_NAME, Host_methods, 0);
+ luaL_newmetatable(L, HOST_MODULE_NAME);
+ luaL_openlib(L, 0, Host_meta, 0);
+ lua_pushliteral(L, "__index");
+ lua_pushvalue(L, -3);
+ lua_rawset(L, -3);
+ lua_pushliteral(L, "__metatable");
+ lua_pushvalue(L, -3);
+ lua_rawset(L, -3);
+ lua_pop(L, 1);
+
+ /* register the links methods to lua */
+ luaL_openlib(L, AS_MODULE_NAME, AS_methods, 0);
+ luaL_newmetatable(L, AS_MODULE_NAME);
+ lua_pop(L, 1);
+
+ /* register the links methods to lua */
+ luaL_openlib(L, LINK_MODULE_NAME, Link_methods, 0);
+ luaL_newmetatable(L, LINK_MODULE_NAME);
+ lua_pop(L, 1);
+
+ /*register the routes methods to lua */
+ luaL_openlib(L, ROUTE_MODULE_NAME, Route_methods, 0);
+ luaL_newmetatable(L, ROUTE_MODULE_NAME);
+ lua_pop(L, 1);
+
+ /*register the Tracing functions to lua */
+ luaL_openlib(L, TRACE_MODULE_NAME, Trace_methods, 0);
+ luaL_newmetatable(L, TRACE_MODULE_NAME);
+ lua_pop(L, 1);
/* Keep the context mechanism informed of our lua world today */
simgrid_lua_state = L;
