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
Make ns3 compile with new communicate (network_element_t)
[simgrid.git]
/
src
/
surf
/
network_constant.c
diff --git
a/src/surf/network_constant.c
b/src/surf/network_constant.c
index
c733bc8
..
fc5580d
100644
(file)
--- a/
src/surf/network_constant.c
+++ b/
src/surf/network_constant.c
@@
-109,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,
+static surf_action_t netcste_communicate(
void *src
,
+
void *dst
, double size,
double rate)
{
surf_action_network_Constant_t action = NULL;
double rate)
{
surf_action_network_Constant_t action = NULL;
+ char *src_name = ((network_element_t)src)->name;
+ char *dst_name = ((network_element_t)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 =
@@
-144,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;
}
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;
}
static int link_shared(const void *link)
{
DIE_IMPOSSIBLE;
}
static int link_shared(const void *link)
{
DIE_IMPOSSIBLE;
+ return -1;
}
static void netcste_action_suspend(surf_action_t action)
}
static void netcste_action_suspend(surf_action_t action)
@@
-234,9
+234,5
@@
void surf_network_model_init_Constant()
netcste_define_callbacks();
xbt_dynar_push(model_list, &surf_network_model);
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);
}
}