-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
} s_surf_action_network_Constant_t, *surf_action_network_Constant_t;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static random_data_t random_latency = NULL;
static int host_number_int = 0;
static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
DIE_IMPOSSIBLE;
}
-static surf_action_t netcste_communicate(const char *src_name,
- const char *dst_name, double size,
- double rate)
+static surf_action_t netcste_communicate(sg_routing_edge_t src,
+ sg_routing_edge_t dst,
+ double size, double rate)
{
surf_action_network_Constant_t action = NULL;
+ char *src_name = src->name;
+ char *dst_name = dst->name;
+
XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
action =
action->suspended = 0;
- action->latency = sg_latency_factor; //random_generate(random_latency);
+ action->latency = sg_latency_factor;
action->lat_init = action->latency;
if (action->latency <= 0.0) {
static double netcste_get_link_bandwidth(const void *link)
{
DIE_IMPOSSIBLE;
- return -1.0;
+ return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
}
static double netcste_get_link_latency(const void *link)
{
DIE_IMPOSSIBLE;
- return -1.0;
+ return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
}
static int link_shared(const void *link)
{
DIE_IMPOSSIBLE;
- return -1;
+ return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
}
static void netcste_action_suspend(surf_action_t action)
surf_network_model->action_unref = netcste_action_unref;
surf_network_model->action_cancel = netcste_action_cancel;
surf_network_model->action_recycle = net_action_recycle;
- surf_network_model->get_remains = net_action_get_remains;
+ surf_network_model->get_remains = surf_action_get_remains;
#ifdef HAVE_LATENCY_BOUND_TRACKING
surf_network_model->get_latency_limited = net_get_link_latency_limited;
#endif
surf_network_model->suspend = netcste_action_suspend;
surf_network_model->resume = netcste_action_resume;
surf_network_model->is_suspended = netcste_action_is_suspended;
- surf_cpu_model->set_max_duration = net_action_set_max_duration;
+ surf_cpu_model->set_max_duration = surf_action_set_max_duration;
surf_network_model->extension.network.communicate = netcste_communicate;
surf_network_model->extension.network.get_link_bandwidth =
surf_network_model->set_category = netcste_action_set_category;
#endif
- if (!random_latency)
- random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
netcste_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
- routing_model_create(sizeof(double), NULL);
+ routing_model_create(NULL);
}