From 3507aa0f86b4306e340c024cf251349861e53a7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Wed, 2 Nov 2011 19:46:35 +0100 Subject: [PATCH] Optimize swags and save calls from Surf --- include/xbt/swag.h | 12 ++--- src/surf/maxmin_private.h | 4 +- src/xbt/swag.c | 103 ++++++++++++++++++-------------------- 3 files changed, 54 insertions(+), 65 deletions(-) diff --git a/include/xbt/swag.h b/include/xbt/swag.h index 9ebd506420..d6224e409e 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -105,15 +105,9 @@ XBT_PUBLIC(void *) xbt_swag_remove(void *obj, xbt_swag_t swag); XBT_PUBLIC(void *) xbt_swag_extract(xbt_swag_t swag); XBT_PUBLIC(int) xbt_swag_size(xbt_swag_t swag); -#define xbt_swag_getPrev(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev) -#define xbt_swag_getNext(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next) - -static XBT_INLINE int xbt_swag_belongs(void *obj, xbt_swag_t swag) -{ - return ((xbt_swag_getNext(obj, swag->offset)) - || (xbt_swag_getPrev(obj, swag->offset)) - || (swag->head == obj)); -} +#define xbt_swag_getPrev(obj, offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev) +#define xbt_swag_getNext(obj, offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next) +#define xbt_swag_belongs(obj, swag) (xbt_swag_getNext((obj), (swag)->offset) || (swag)->tail == (obj)) static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag) { diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 7b82d55a17..e4fe040a6d 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -80,8 +80,8 @@ typedef struct lmm_system { xbt_mallocator_t variable_mallocator; } s_lmm_system_t; -#define extract_variable(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set)) -#define extract_constraint(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set)) +#define extract_variable(sys) xbt_swag_extract(&(sys->variable_set)) +#define extract_constraint(sys) xbt_swag_extract(&(sys->constraint_set)) #define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set)) #define remove_variable(sys,var) do {xbt_swag_remove(var,&(sys->variable_set));\ xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0) diff --git a/src/xbt/swag.c b/src/xbt/swag.c index d64067f22e..1b1fc12671 100644 --- a/src/xbt/swag.c +++ b/src/xbt/swag.c @@ -65,21 +65,18 @@ XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset) */ XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag) { - - if (xbt_swag_belongs(obj, swag)) - return; - - (swag->count)++; - if (swag->head == NULL) { + if (!swag->head) { xbt_assert(!(swag->tail), "Inconsistent swag."); swag->head = obj; swag->tail = obj; - return; + swag->count++; + } + else if (obj != swag->head && !xbt_swag_getPrev(obj, swag->offset)) { + xbt_swag_getNext(obj, swag->offset) = swag->head; + xbt_swag_getPrev(swag->head, swag->offset) = obj; + swag->head = obj; + swag->count++; } - - xbt_swag_getNext(obj, swag->offset) = swag->head; - xbt_swag_getPrev(swag->head, swag->offset) = obj; - swag->head = obj; } /** @@ -91,21 +88,22 @@ XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag) */ XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag) { - - if (xbt_swag_belongs(obj, swag)) + if (xbt_swag_belongs(obj, swag)) { return; + } - (swag->count)++; - if (swag->head == NULL) { - xbt_assert(!(swag->tail), "Inconsistent swag."); + if (!swag->tail) { + xbt_assert(!(swag->head), "Inconsistent swag."); swag->head = obj; swag->tail = obj; - return; + swag->count++; + } + else if (obj != swag->tail && !xbt_swag_getNext(obj, swag->offset)) { + xbt_swag_getPrev(obj, swag->offset) = swag->tail; + xbt_swag_getNext(swag->tail, swag->offset) = obj; + swag->tail = obj; + swag->count++; } - - xbt_swag_getPrev(obj, swag->offset) = swag->tail; - xbt_swag_getNext(swag->tail, swag->offset) = obj; - swag->tail = obj; } /** @@ -117,36 +115,36 @@ XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag) */ XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag) { - size_t offset = swag->offset; - - if ((!obj) || (!swag)) - return NULL; - if (!xbt_swag_belongs(obj, swag)) /* Trying to remove an object that - was not in this swag */ + if (!obj) return NULL; - if (swag->head == swag->tail) { /* special case */ - if (swag->head != obj) /* Trying to remove an object that was not in this swag */ - return NULL; - swag->head = NULL; - swag->tail = NULL; - xbt_swag_getNext(obj, offset) = xbt_swag_getPrev(obj, offset) = NULL; - } else if (obj == swag->head) { /* It's the head */ - swag->head = xbt_swag_getNext(obj, offset); - xbt_swag_getPrev(swag->head, offset) = NULL; - xbt_swag_getNext(obj, offset) = NULL; - } else if (obj == swag->tail) { /* It's the tail */ - swag->tail = xbt_swag_getPrev(obj, offset); - xbt_swag_getNext(swag->tail, offset) = NULL; + size_t offset = swag->offset; + void* prev = xbt_swag_getPrev(obj, offset); + void* next = xbt_swag_getNext(obj, offset); + + if (prev) { + xbt_swag_getNext(prev, offset) = next; xbt_swag_getPrev(obj, offset) = NULL; - } else { /* It's in the middle */ - xbt_swag_getNext(xbt_swag_getPrev(obj, offset), offset) = - xbt_swag_getNext(obj, offset); - xbt_swag_getPrev(xbt_swag_getNext(obj, offset), offset) = - xbt_swag_getPrev(obj, offset); - xbt_swag_getPrev(obj, offset) = xbt_swag_getNext(obj, offset) = NULL; + if (next) { + xbt_swag_getPrev(next, offset) = prev; + xbt_swag_getNext(obj, offset) = NULL; + } + else { + swag->tail = prev; + } + swag->count--; } - (swag->count)--; + else if (next) { + xbt_swag_getPrev(next, offset) = NULL; + xbt_swag_getNext(obj, offset) = NULL; + swag->head = next; + swag->count--; + } + else if (obj == swag->head) { + swag->head = swag->tail = NULL; + swag->count--; + } + return obj; } @@ -156,17 +154,14 @@ XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag) */ void *xbt_swag_extract(xbt_swag_t swag) { - size_t offset = swag->offset; - void *obj = NULL; - - if ((!swag) || (!(swag->head))) + if (!swag->head) return NULL; - obj = swag->head; + size_t offset = swag->offset; + void* obj = swag->head; - if (swag->head == swag->tail) { /* special case */ + if (obj == swag->tail) { /* special case */ swag->head = swag->tail = NULL; - xbt_swag_getPrev(obj, offset) = xbt_swag_getNext(obj, offset) = NULL; } else { swag->head = xbt_swag_getNext(obj, offset); xbt_swag_getPrev(swag->head, offset) = NULL; -- 2.20.1