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
[trace] cleaner instrumentation
[simgrid.git]
/
src
/
surf
/
network_constant.c
diff --git
a/src/surf/network_constant.c
b/src/surf/network_constant.c
index
b76ff47
..
d395e73
100644
(file)
--- a/
src/surf/network_constant.c
+++ b/
src/surf/network_constant.c
@@
-41,7
+41,7
@@
static int netcste_action_unref(surf_action_t action)
action->refcount--;
if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
action->refcount--;
if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
-
free(
action);
+
surf_action_free(&
action);
return 1;
}
return 0;
return 1;
}
return 0;
@@
-139,6
+139,13
@@
static surf_action_t netcste_communicate(const char *src_name,
return (surf_action_t) action;
}
return (surf_action_t) action;
}
+#ifdef HAVE_TRACING
+static void netcste_action_set_category(surf_action_t action, const char *category)
+{
+ //ignore completely the categories in constant model, they are not traced
+}
+#endif
+
/* returns an array of link_Constant_t */
static xbt_dynar_t netcste_get_route(void *src, void *dst)
{
/* returns an array of link_Constant_t */
static xbt_dynar_t netcste_get_route(void *src, void *dst)
{
@@
-220,6
+227,9
@@
void surf_network_model_init_Constant(const char *filename)
surf_network_model->extension.network.get_link_latency =
netcste_get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
surf_network_model->extension.network.get_link_latency =
netcste_get_link_latency;
surf_network_model->extension.network.link_shared = link_shared;
+#ifdef HAVE_TRACING
+ 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);
if (!random_latency)
random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
@@
-230,5
+240,5
@@
void surf_network_model_init_Constant(const char *filename)
"Constant", surf_network_model);
xbt_cfg_set_string(_surf_cfg_set, "routing", "none");
"Constant", surf_network_model);
xbt_cfg_set_string(_surf_cfg_set, "routing", "none");
- routing_model_create(sizeof(double), NULL,
(double_f_pvoid_t)
netcste_get_link_latency);
+ routing_model_create(sizeof(double), NULL, netcste_get_link_latency);
}
}