A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really remove deleted file.
[simgrid.git]
/
src
/
surf
/
network_constant.c
diff --git
a/src/surf/network_constant.c
b/src/surf/network_constant.c
index 066cd014dc2f20bf5ab8b7db2838c19fc6f5fe84..5dcff1b9f9512a757e8dbe65564cb118280248fe 100644
(file)
--- a/
src/surf/network_constant.c
+++ b/
src/surf/network_constant.c
@@
-21,14
+21,12
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static random_data_t random_latency = NULL;
static int host_number_int = 0;
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++;
}
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 int netcste_resource_used(void *resource_id)
@@
-111,12
+109,15
@@
static void netcste_update_resource_state(void *id,
DIE_IMPOSSIBLE;
}
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;
{
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 =
XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
action =
@@
-125,7
+126,7
@@
static surf_action_t netcste_communicate(const char *src_name,
action->suspended = 0;
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) {
action->lat_init = action->latency;
if (action->latency <= 0.0) {
@@
-146,25
+147,22
@@
static void netcste_action_set_category(surf_action_t action, const char *catego
}
#endif
}
#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;
static double netcste_get_link_bandwidth(const void *link)
{
DIE_IMPOSSIBLE;
+ 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;
}
static double netcste_get_link_latency(const void *link)
{
DIE_IMPOSSIBLE;
+ 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;
}
static int link_shared(const void *link)
{
DIE_IMPOSSIBLE;
+ 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)
}
static void netcste_action_suspend(surf_action_t action)
@@
-191,7
+189,7
@@
static void netcste_finalize(void)
-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)
{
xbt_assert(surf_network_model == NULL);
if (surf_network_model)
@@
-202,7
+200,7
@@
void surf_network_model_init_Constant(const char *filename)
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->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
#ifdef HAVE_LATENCY_BOUND_TRACKING
surf_network_model->get_latency_limited = net_get_link_latency_limited;
#endif
@@
-219,7
+217,7
@@
void surf_network_model_init_Constant(const char *filename)
surf_network_model->suspend = netcste_action_suspend;
surf_network_model->resume = netcste_action_resume;
surf_network_model->is_suspended = netcste_action_is_suspended;
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->extension.network.communicate = netcste_communicate;
surf_network_model->extension.network.get_link_bandwidth =
@@
-233,12
+231,8
@@
void surf_network_model_init_Constant(const char *filename)
if (!random_latency)
random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
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);
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(NULL);
}
}