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
Do not require doxygen in maintainer mode
[simgrid.git]
/
src
/
surf
/
network_constant.c
diff --git
a/src/surf/network_constant.c
b/src/surf/network_constant.c
index
83cef7c
..
1f06f33
100644
(file)
--- a/
src/surf/network_constant.c
+++ b/
src/surf/network_constant.c
@@
-80,17
+80,8
@@
static void define_callbacks(const char *file)
{
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
- surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
- surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
- surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
- surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
- surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
- surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
- surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
- surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
}
static void *name_service(const char *name)
@@
-111,8
+102,8
@@
static int resource_used(void *resource_id)
static int action_free(surf_action_t action)
{
- action->
using
--;
- if (!action->
using
) {
+ action->
refcount
--;
+ if (!action->
refcount
) {
xbt_swag_remove(action, action->state_set);
free(action);
return 1;
@@
-122,7
+113,7
@@
static int action_free(surf_action_t action)
static void action_use(surf_action_t action)
{
- action->
using
++;
+ action->
refcount
++;
}
static void action_cancel(surf_action_t action)
@@
-212,7
+203,7
@@
static surf_action_t communicate(void *src, void *dst, double size,
action = xbt_new0(s_surf_action_network_Constant_t, 1);
- action->generic_action.
using
= 1;
+ action->generic_action.
refcount
= 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
@@
-268,6
+259,11
@@
static double get_link_latency(const void *link)
DIE_IMPOSSIBLE;
}
+static int link_shared(const void *link)
+{
+ DIE_IMPOSSIBLE;
+}
+
static xbt_dict_t get_properties(void *link)
{
DIE_IMPOSSIBLE;
@@
-378,6
+374,8
@@
static void surf_network_model_init_internal(void)
get_link_bandwidth;
surf_network_model->extension_public->get_link_latency =
get_link_latency;
+ surf_network_model->extension_public->link_shared =
+ link_shared;
surf_network_model->common_public->get_properties = get_properties;