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
Integrate properties into surf_resource_t
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
a5edbe0
..
d55e71b
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-25,11
+25,6
@@
int host_count = 0;
double sg_tcp_gamma = 0.0;
double sg_tcp_gamma = 0.0;
-static void link_free(void *nw_link)
-{
- xbt_dict_free(&(((link_CM02_t) nw_link)->properties));
- surf_resource_free(nw_link);
-}
static link_CM02_t link_new(char *name,
double bw_initial,
static link_CM02_t link_new(char *name,
double bw_initial,
@@
-48,6
+43,7
@@
static link_CM02_t link_new(char *name,
nw_link->generic_resource.model = surf_network_model;
nw_link->generic_resource.name = name;
nw_link->generic_resource.model = surf_network_model;
nw_link->generic_resource.name = name;
+ current_property_set = nw_link->generic_resource.properties = properties;
nw_link->bw_current = bw_initial;
if (bw_trace)
nw_link->bw_event =
nw_link->bw_current = bw_initial;
if (bw_trace)
nw_link->bw_event =
@@
-68,11
+64,7
@@
static link_CM02_t link_new(char *name,
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
- nw_link->properties = properties;
-
- current_property_set = properties;
-
- xbt_dict_set(surf_network_model->resource_set, name, nw_link, link_free);
+ xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free);
return nw_link;
}
return nw_link;
}
@@
-464,11
+456,6
@@
static int link_shared(const void *link)
return lmm_constraint_is_shared(((link_CM02_t) link)->constraint);
}
return lmm_constraint_is_shared(((link_CM02_t) link)->constraint);
}
-static xbt_dict_t get_properties(void *link)
-{
- return ((link_CM02_t) link)->properties;
-}
-
static void action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
static void action_suspend(surf_action_t action)
{
((surf_action_network_CM02_t) action)->suspended = 1;
@@
-537,8
+524,6
@@
static void surf_network_model_init_internal(void)
surf_network_model->extension.network.get_link_latency = get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
surf_network_model->extension.network.get_link_latency = get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
- surf_network_model->get_properties = get_properties;
-
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new();
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new();