From a66bb361bd220a821b4f65bead824e459aa387aa Mon Sep 17 00:00:00 2001 From: alegrand Date: Mon, 27 Mar 2006 22:06:14 +0000 Subject: [PATCH 1/1] I'm so lazy... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2000 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/surf.c | 17 +++++++++-------- src/surf/surf_private.h | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/surf/surf.c b/src/surf/surf.c index 7e7e15b8f0..154ce3df76 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -21,6 +21,14 @@ xbt_dynar_t resource_list = NULL; tmgr_history_t history = NULL; lmm_system_t maxmin_system = NULL; xbt_dynar_t surf_path = NULL; +const char *surf_action_state_names[6] = { + "SURF_ACTION_READY", + "SURF_ACTION_RUNNING", + "SURF_ACTION_FAILED", + "SURF_ACTION_DONE", + "SURF_ACTION_TO_FREE", + "SURF_ACTION_NOT_IN_THE_SYSTEM" +}; double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset) @@ -101,14 +109,7 @@ void surf_action_change_state(surf_action_t action, { surf_action_state_t action_state = &(action->resource_type->common_public->states); - XBT_IN2("(%p,%s)", action, - (((state==SURF_ACTION_READY)?("SURF_ACTION_READY"): - ((state==SURF_ACTION_RUNNING)?("SURF_ACTION_RUNNING"): - ((state==SURF_ACTION_FAILED)?("SURF_ACTION_FAILED"): - ((state==SURF_ACTION_DONE)?("SURF_ACTION_DONE"): - ((state==SURF_ACTION_TO_FREE)?("SURF_ACTION_TO_FREE"): - ((state==SURF_ACTION_NOT_IN_THE_SYSTEM)?("SURF_ACTION_NOT_IN_THE_SYSTEM"): - "")))))))); + XBT_IN2("(%p,%s)", action, surf_action_state_names[state]); xbt_swag_remove(action, action->state_set); if (state == SURF_ACTION_READY) diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 1d6c56ffd9..270b889229 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -17,6 +17,8 @@ #define NO_MAX_DURATION -1.0 #define SG_TCP_CTE_GAMMA 20000.0 +extern const char *surf_action_state_names[6]; + typedef enum { SURF_NETWORK_LINK_ON = 1, /* Ready */ SURF_NETWORK_LINK_OFF = 0 /* Running */ -- 2.20.1