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
Use new macros THROWF and RETHROWF.
[simgrid.git]
/
src
/
xbt
/
swag.c
diff --git
a/src/xbt/swag.c
b/src/xbt/swag.c
index
f6e7107
..
441023f
100644
(file)
--- a/
src/xbt/swag.c
+++ b/
src/xbt/swag.c
@@
-78,9
+78,7
@@
XBT_INLINE void xbt_swag_insert(void *obj, xbt_swag_t swag)
}
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
}
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
- xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) =
- obj;
-
+ xbt_swag_getNext(swag->tail, swag->offset) = obj;
swag->tail = obj;
}
swag->tail = obj;
}
@@
-106,9
+104,7
@@
XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
}
xbt_swag_getNext(obj, swag->offset) = swag->head;
}
xbt_swag_getNext(obj, swag->offset) = swag->head;
- xbt_swag_getPrev(xbt_swag_getNext(obj, swag->offset), swag->offset) =
- obj;
-
+ xbt_swag_getPrev(swag->head, swag->offset) = obj;
swag->head = obj;
}
swag->head = obj;
}
@@
-134,9
+130,7
@@
XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
}
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
}
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
- xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) =
- obj;
-
+ xbt_swag_getNext(swag->tail, swag->offset) = obj;
swag->tail = obj;
}
swag->tail = obj;
}
@@
-241,8
+235,8
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
obj1->name = "Obj 1";
obj2->name = "Obj 2";
obj1->name = "Obj 1";
obj2->name = "Obj 2";
- xbt_test_add
0
("Basic usage");
- xbt_test_log
3
("%p %p %ld\n", obj1, &(obj1->setB),
+ xbt_test_add("Basic usage");
+ xbt_test_log("%p %p %ld\n", obj1, &(obj1->setB),
(long) ((char *) &(obj1->setB) - (char *) obj1));
setA = xbt_swag_new(xbt_swag_offset(*obj1, setA));
(long) ((char *) &(obj1->setB) - (char *) obj1));
setA = xbt_swag_new(xbt_swag_offset(*obj1, setA));
@@
-256,17
+250,17
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
xbt_swag_remove(obj1, setB);
/* xbt_swag_remove(obj2, setB); */
xbt_swag_remove(obj1, setB);
/* xbt_swag_remove(obj2, setB); */
- xbt_test_add
0
("Traverse set A");
+ xbt_test_add("Traverse set A");
xbt_swag_foreach(obj, setA) {
xbt_swag_foreach(obj, setA) {
- xbt_test_log
1
("Saw: %s", obj->name);
+ xbt_test_log("Saw: %s", obj->name);
}
}
- xbt_test_add
0
("Traverse set B");
+ xbt_test_add("Traverse set B");
xbt_swag_foreach(obj, setB) {
xbt_swag_foreach(obj, setB) {
- xbt_test_log
1
("Saw: %s", obj->name);
+ xbt_test_log("Saw: %s", obj->name);
}
}
- xbt_test_add
0
("Ensure set content and length");
+ xbt_test_add("Ensure set content and length");
xbt_test_assert(xbt_swag_belongs(obj1, setA));
xbt_test_assert(xbt_swag_belongs(obj2, setA));
xbt_test_assert(xbt_swag_belongs(obj1, setA));
xbt_test_assert(xbt_swag_belongs(obj2, setA));
@@
-278,6
+272,9
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
xbt_swag_free(setA);
xbt_swag_free(setB);
xbt_swag_free(setA);
xbt_swag_free(setB);
+
+ xbt_free(obj1);
+ xbt_free(obj2);
}
#endif /* SIMGRID_TEST */
}
#endif /* SIMGRID_TEST */