#include "surf_private.h"
#include "xbt/dict.h"
#include "maxmin_private.h"
+#include "surf/surf_resource_lmm.h"
+
#undef GENERIC_ACTION
#define GENERIC_ACTION(action) action->generic_action
&im_constant_bandwidth_constraint;
-static void* im_net_create_resource(char *name,
+static void* im_net_create_resource(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
return nw_link;
}
-static void im_net_parse_link_init(void)
+static void im_net_parse_link_init(sg_platf_link_cbarg_t link)
{
- if(struct_lnk->V_policy_initial_link == SURF_LINK_FULLDUPLEX)
+ if(link->policy == SURF_LINK_FULLDUPLEX)
{
- im_net_create_resource(bprintf("%s_UP",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, xbt_dict_new());
- im_net_create_resource(bprintf("%s_DOWN",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, xbt_dict_new());
+ im_net_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace,
+ link->latency, link->latency_trace, link->state, link->state_trace,
+ link->policy, link->properties);
+ im_net_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace,
+ link->latency, link->latency_trace, link->state, link->state_trace,
+ link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it
}
else
{
- im_net_create_resource(xbt_strdup(struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, xbt_dict_new());
+ im_net_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace,
+ link->latency, link->latency_trace, link->state, link->state_trace,
+ link->policy, link->properties);
}
}
}
}
-static void im_net_define_callbacks(const char *file)
+static void im_net_define_callbacks(void)
{
/* Figuring out the network links */
- surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &im_net_add_traces);
+ sg_platf_link_add_cb(im_net_parse_link_init);
+ sg_platf_postparse_add_cb(im_net_add_traces);
}
static int im_net_resource_used(void *resource_id)
#ifdef HAVE_TRACING
xbt_free(((surf_action_network_CM02_im_t) action)->src_name);
xbt_free(((surf_action_network_CM02_im_t) action)->dst_name);
- if (action->category)
- xbt_free(action->category);
+ xbt_free(action->category);
#endif
surf_action_free(&action);
return 1;
XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
update_action_remaining(now);
+ keep_track = im_net_modified_set;
lmm_solve(network_im_maxmin_system);
+ keep_track = NULL;
XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
im_net_create_resource(xbt_strdup("__loopback__"),
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- im_net_get_link_latency);
+ SURF_LINK_FATPIPE, NULL));
im_net_modified_set =
xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
- keep_track = im_net_modified_set;
}
/************************************************************************/
/* New model based on optimizations discussed during this thesis */
/************************************************************************/
-void im_surf_network_model_init_LegrandVelho(const char *filename)
+void im_surf_network_model_init_LegrandVelho(void)
{
if (surf_network_model)
return;
im_surf_network_model_init_internal();
- im_net_define_callbacks(filename);
+ im_net_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
network_im_solve = lmm_solve;
xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
0.92);
xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
-
- update_model_description(surf_network_model_description,
- "LV08", surf_network_model);
}