From: velho Date: Fri, 10 Oct 2008 08:47:27 +0000 (+0000) Subject: Replaced the using field of surf_action to refcount because this name is not a C... X-Git-Tag: v3.3~138 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b208d7b845cfa73d1a9f70ebd7f1f9ce49bf787a Replaced the using field of surf_action to refcount because this name is not a C++ reserved word. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5982 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index df514d6933..2f41e65492 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -299,8 +299,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); /* KF: No explicit freeing needed for GTNeTS here */ free(action); @@ -311,7 +311,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) @@ -449,7 +449,7 @@ static surf_action_t communicate(void *src, void *dst, double size, action = xbt_new0(s_surf_action_network_GTNETS_t, 1); - action->generic_action.using = 1; + action->generic_action.refcount = 1; action->generic_action.cost = size; action->generic_action.remains = size; /* Max durations are not supported */