/* SimGrid Lua bindings */
-/* Copyright (c) 2010, the SimGrid team. All right reserved. */
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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 <stdio.h>
#include <lauxlib.h>
#include <lualib.h>
-
#include "msg/msg.h"
#include "xbt.h"
#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"
+#undef BYPASS_CPU
/* ********************************************************************************* */
/* helper functions */
char *p=buff;
int i;
int top = lua_gettop(L);
-// void *ptr;
+
fflush(stdout);
p+=sprintf(p,"STACK(top=%d): ",top);
-/* lua_getglobal(L,"vardump");
- xbt_assert0(lua_isfunction(L,-1), "Vardump not found");
-*/
for (i = 1; i <= top; i++) { /* repeat for each level */
-
int t = lua_type(L, i);
switch (t) {
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 */
-/*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;
-
-}*/
-
/* ********************************************************************************* */
/* 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.
+ *
*/
+/* * * *
+ * * 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);
- 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));
- *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 */
- /* remove the args from the stack */
- lua_remove(L,1);
- lua_remove(L,1);
- lua_remove(L,1);
- return 1;
+ 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));
+ *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 */
+ /* remove the args from the stack */
+ lua_remove(L,1);
+ lua_remove(L,1);
+ lua_remove(L,1);
+ return 1;
}
static int Task_get_name(lua_State *L) {
lua_pushnumber(L,res);
return 1;
}
+
static int Task_send(lua_State *L) {
- stackDump("send ",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_has_data(tk)) // Don't mess up with my stack: the receiver didn't copy the data yet
+ 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) {
}
return 0;
}
+
static int Task_recv(lua_State *L) {
m_task_t tk = NULL;
const char *mailbox = luaL_checkstring(L,-1);
return ht;
}
-
static int Host_get_by_name(lua_State *L)
{
const char *name=luaL_checkstring(L,1);
m_host_t msg_host = MSG_get_host_by_name(name);
if (!msg_host)
{
- //ERROR1("MSG_get_host_by_name(%s) failled",name);
luaL_error(L,"null Host : MSG_get_host_by_name failled");
- //return -1;
}
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));
return 1;
}
-static int Host_table(lua_State *L)
+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;
+
+}
+
+/*****************************************************************************************
+ * BYPASS XML SURF Methods *
+ ***************************
+ ***************************
+******************************************************************************************/
+#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
+#include "surf/surf_private.h"
+typedef struct t_host_attr
+{
+ //platform attribute
+ const char* id;
+ double power;
+ //deployment attribute
+ const char* function;
+ xbt_dynar_t args_list;
+}host_attr,*p_host_attr;
+
+typedef struct t_link_attr
+{
+ const char* id;
+ double bandwidth;
+ double latency;
+}link_attr,*p_link_attr;
+
+typedef struct t_route_attr
+{
+ const char *src_id;
+ const char *dest_id;
+ xbt_dynar_t links_id;
+
+}route_attr,*p_route_attr;
+
+//using xbt_dynar_t :
+static xbt_dynar_t host_list_d ;
+static xbt_dynar_t link_list_d ;
+static xbt_dynar_t route_list_d ;
+
+static int Host_new(lua_State *L) //(id,power)
+{
+ // if it's the first time ,instanciate the dynar
+ if(xbt_dynar_is_empty(host_list_d))
+ host_list_d = xbt_dynar_new(sizeof(p_host_attr), &xbt_free_ref);
+
+ p_host_attr host = malloc(sizeof(host_attr));
+ host->id = luaL_checkstring(L,1);
+ host->power = luaL_checknumber(L,2);
+ host->function = NULL;
+ xbt_dynar_push(host_list_d, &host);
+ return 0;
+}
+
+static int Link_new(lua_State *L) // (id,bandwidth,latency)
+{
+ if(xbt_dynar_is_empty(link_list_d))
+ link_list_d = xbt_dynar_new(sizeof(p_link_attr), &xbt_free_ref);
+
+ 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);
+ xbt_dynar_push(link_list_d,&link);
+ return 0;
+}
+
+static int Route_new(lua_State *L) // (src_id,dest_id,links_number,link_table)
+{
+ if(xbt_dynar_is_empty(route_list_d))
+ route_list_d = xbt_dynar_new(sizeof(p_route_attr), &xbt_free_ref);
+ int i;
+ const char * link_id;
+ p_route_attr route = malloc(sizeof(route_attr));
+ route->src_id = luaL_checkstring(L,1);
+ route->dest_id = luaL_checkstring(L,2);
+ route->links_id = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ lua_pushnil(L);
+ while (lua_next(L,3) != 0) {
+ link_id = lua_tostring(L, -1);
+ xbt_dynar_push(route->links_id, &link_id);
+ DEBUG2("index = %f , Link_id = %s \n",lua_tonumber(L, -2),lua_tostring(L, -1));
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 1);
+
+ //add route to platform's route list
+ xbt_dynar_push(route_list_d,&route);
+ 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);
+ const char* argument;
+ unsigned int i;
+ p_host_attr p_host;
+
+ xbt_dynar_foreach(host_list_d,i,p_host)
+ {
+ 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);
+ }
+ lua_pop(L, 1);
+ return 0;
+ }
+ }
+ ERROR1("Host : %s Not Fount !!",host_id);
+ return 1;
+}
+
+/*
+ * surf parse bypass platform
+ */
+static int surf_parse_bypass_platform()
{
- // FIXME
- int nb = MSG_get_host_number();
- m_host_t *msg_hosts = MSG_get_host_table();
- m_host_t *lua_hosts = (m_host_t*)lua_newuserdata(L,sizeof(m_host_t)*nb);
- *lua_hosts = msg_hosts;
+ char buffer[22];
+ unsigned int i,j;
+ char* link_id;
+
+ p_host_attr p_host;
+ p_link_attr p_link;
+ p_route_attr p_route;
+
+ 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");
+#ifndef BYPASS_CPU
+ SURFXML_START_TAG(platform);
+#endif
+
+ // Add Hosts
+ xbt_dynar_foreach(host_list_d,i,p_host)
+ {
+
+#ifdef BYPASS_CPU
+ INFO0("Bypass_Cpu");
+ surf_cpu_model_init_bypass_im(p_host->id,p_host->power);
+#else
+
+ SURFXML_BUFFER_SET(host_id,p_host->id);
+ sprintf(buffer,"%f",p_host->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);
+#endif
+ }
+
+ //add Links
+ xbt_dynar_foreach(link_list_d,i,p_link)
+ {
+#ifndef BYPASS_CPU
+
+ SURFXML_BUFFER_SET(link_id,p_link->id);
+ sprintf(buffer,"%f",p_link->bandwidth);
+ SURFXML_BUFFER_SET(link_bandwidth,buffer);
+ SURFXML_BUFFER_SET(link_bandwidth_file, "");
+ sprintf(buffer,"%f",p_link->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);
+#endif
+ }
+
+ // add route
+
+ xbt_dynar_foreach(route_list_d,i,p_route)
+ {
+#ifndef BYPASS_CPU
+
+ SURFXML_BUFFER_SET(route_src,p_route->src_id);
+ SURFXML_BUFFER_SET(route_dst,p_route->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);
+
+ xbt_dynar_foreach(p_route->links_id,j,link_id)
+ {
+ SURFXML_BUFFER_SET(link_c_ctn_id,link_id);
+ SURFXML_START_TAG(link_c_ctn);
+ SURFXML_END_TAG(link_c_ctn);
+ }
+
+ SURFXML_END_TAG(route);
+#endif
+ }
+ /* </platform> */
+#ifndef BYPASS_CPU
+ SURFXML_END_TAG(platform);
+#endif
+
+ free(surfxml_bufferstack);
+ return 0; // must return 0 ?!!
- lua_newtable (L);
- // TODO : fill the table <ith hosts
- return 1;
+}
+/*
+ * surf parse bypass application
+ */
+static int surf_parse_bypass_application()
+{
+ unsigned int i,j;
+ p_host_attr p_host;
+ char * arg;
+ 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);
+
+ xbt_dynar_foreach(host_list_d,i,p_host)
+ {
+ if(p_host->function)
+ {
+ SURFXML_BUFFER_SET(process_host, p_host->id);
+ SURFXML_BUFFER_SET(process_function, p_host->function);
+ SURFXML_BUFFER_SET(process_start_time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill_time, "-1.0");
+ SURFXML_START_TAG(process);
+ //args
+ xbt_dynar_foreach(p_host->args_list,j,arg)
+ {
+ SURFXML_BUFFER_SET(argument_value,arg);
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
+ }
+ SURFXML_END_TAG(process);
+ }
+ }
+ /* </platform> */
+ SURFXML_END_TAG(platform);
+ free(surfxml_bufferstack);
+ return 0;
}
+//***********Register Methods *******************************************//
+/*
+ * Host Methods
+ */
static const luaL_reg Host_methods[] = {
{"getByName", Host_get_by_name},
{"name", Host_get_name},
{"number", Host_number},
- {"list", Host_table},
+ {"at", Host_at},
+ // Bypass XML Methods
+ {"new", Host_new},
+ {"setFunction", Host_set_function},
{0,0}
};
{0,0}
};
+/*
+ * Link Methods
+ */
+static const luaL_reg Link_methods[] = {
+ {"new",Link_new},
+ {0,0}
+};
+/*
+ * Route Methods
+ */
+static const luaL_reg Route_methods[] ={
+ {"new",Route_new},
+};
+
/*
* Environment related
*/
+
extern lua_State *simgrid_lua_state;
static int run_lua_code(int argc,char **argv) {
DEBUG1("Run lua code %s",argv[0]);
-// fprintf(stderr,"Run lua code %s\n", (argv ? argv[0] : "(null)"));
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 res = 1;
return 0;
}
+
static int debug(lua_State *L) {
const char *str = luaL_checkstring(L,1);
DEBUG1("%s",str);
MSG_clean();
return 0;
}
+
+/*
+ * Bypass XML Pareser
+ */
+static int 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;
+}
+
+static int register_application(lua_State *L)
+{
+ MSG_function_register_default(run_lua_code);
+ surf_parse = surf_parse_bypass_application;
+ MSG_launch_application(NULL);
+ return 0;
+}
+
static const luaL_Reg simgrid_funcs[] = {
{ "create_environment", create_environment},
{ "launch_application", launch_application},
/* short names */
{ "platform", create_environment},
{ "application", launch_application},
+ /* methods to bypass XML parser*/
+ { "register_platform",register_platform},
+ { "register_application",register_application},
{ NULL, NULL }
};
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);
+
/* Keep the context mechanism informed of our lua world today */
simgrid_lua_state = L;
-
return 1;
}