X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/919edbcd087b9ad979957ea49c05d1453bab8e69..9438858cc5e254b4b2c2a19bcc9b1e93302831ba:/src/surf/network_constant.c diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index b76ff47863..d395e73a6d 100644 --- 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); - free(action); + surf_action_free(&action); return 1; } return 0; @@ -139,6 +139,13 @@ static surf_action_t netcste_communicate(const char *src_name, 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) { @@ -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; +#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); @@ -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"); - routing_model_create(sizeof(double), NULL, (double_f_pvoid_t)netcste_get_link_latency); + routing_model_create(sizeof(double), NULL, netcste_get_link_latency); }