fix the memory leak when create link resources and complet the lua binding layer...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8063 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 7326253..683b3cf 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(lua,bindings,"Lua Bindings");
 // Surf ( bypass XML )
 #define LINK_MODULE_NAME "simgrid.Link"
 #define ROUTE_MODULE_NAME "simgrid.Route"
-#undef BYPASS_MODEL
+#define BYPASS_MODEL
 
 /* ********************************************************************************* */
 /*                            helper functions                                       */
@@ -440,7 +440,6 @@ static int Host_new(lua_State *L)
                xbt_dynar_push(host_list_d, &host);
 
     return 0;
-
 }
 
 static int Link_new(lua_State *L) // (id,bandwidth,latency)

diff --git a/src/surf/network.c b/src/surf/network.c
index 80a4868..0acac74 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -595,7 +595,7 @@ void network_create_resource(char *name,
         double initial_bandwidth,double initial_latency)
 {
 
-       char *name_link;
+       char* name_link;
        double bw_initial;
        tmgr_trace_t bw_trace;
        double lat_initial;
@@ -604,15 +604,14 @@ void network_create_resource(char *name,
        e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
        tmgr_trace_t state_trace;
 
-
-       name_link = (char*)name;
+       name_link = xbt_strdup(name);
        bw_initial = initial_bandwidth;
        bw_trace = tmgr_trace_new("");
        lat_initial = initial_latency;
        lat_trace = tmgr_trace_new("");
        // FIXME Hard Coded Values
-       state_initial_link = SURF_RESOURCE_ON;
-       policy_initial_link = SURF_LINK_SHARED;
+       //state_initial_link = SURF_RESOURCE_ON;
+       //policy_initial_link = SURF_LINK_SHARED;
        state_trace = tmgr_trace_new("");
 
        net_link_new(name_link, bw_initial, bw_trace,