static random_data_t random_latency = NULL;
static int host_number_int = 0;
-static void netcste_count_hosts(void)
-{
+static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
host_number_int++;
}
-static void netcste_define_callbacks(const char *file)
-{
- surfxml_add_callback(STag_surfxml_host_cb_list, &netcste_count_hosts);
+static void netcste_define_callbacks(void) {
+ sg_platf_host_add_cb(netcste_count_hosts);
}
static int netcste_resource_used(void *resource_id)
static double netcste_share_resources(double now)
{
- surf_action_network_Constant_t action = NULL;
- xbt_swag_t running_actions =
- surf_network_model->states.running_action_set;
- double min = -1.0;
-
- xbt_swag_foreach(action, running_actions) {
- if (action->latency > 0) {
- if (min < 0)
- min = action->latency;
- else if (action->latency < min)
- min = action->latency;
- }
+ if (!xbt_swag_size(surf_network_model->states.running_action_set)) {
+ return -1.0;
}
-
- return min;
+ return sg_latency_factor;
}
static void netcste_update_actions_state(double now, double delta)
action->suspended = 0;
- action->latency = 1; //random_generate(random_latency);
+ action->latency = sg_latency_factor; //random_generate(random_latency);
action->lat_init = action->latency;
if (action->latency <= 0.0) {
}
#endif
-/* returns an array of link_Constant_t */
-static xbt_dynar_t netcste_get_route(void *src, void *dst)
-{
- xbt_die("Calling this function does not make any sense");
-}
-
static double netcste_get_link_bandwidth(const void *link)
{
DIE_IMPOSSIBLE;
-void surf_network_model_init_Constant(const char *filename)
+void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
if (surf_network_model)
if (!random_latency)
random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
- netcste_define_callbacks(filename);
+ netcste_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
- update_model_description(surf_network_model_description,
- "Constant", surf_network_model);
-
xbt_cfg_set_string(_surf_cfg_set, "routing", "none");
- routing_model_create(sizeof(double), NULL, netcste_get_link_latency);
+ routing_model_create(sizeof(double), NULL);
}