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
Make xbt_swag_insert_at_head/tail uniform and check an error
[simgrid.git]
/
src
/
xbt
/
swag.c
diff --git
a/src/xbt/swag.c
b/src/xbt/swag.c
index
1b1fc12
..
70a8f08
100644
(file)
--- a/
src/xbt/swag.c
+++ b/
src/xbt/swag.c
@@
-65,6
+65,9
@@
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)
{
*/
XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
{
+ xbt_assert(!xbt_swag_belongs(obj, swag) || swag->tail,
+ "This object belongs to an empty swag! Did you correctly initialize the object's hookup?");
+
if (!swag->head) {
xbt_assert(!(swag->tail), "Inconsistent swag.");
swag->head = obj;
if (!swag->head) {
xbt_assert(!(swag->tail), "Inconsistent swag.");
swag->head = obj;
@@
-88,17
+91,16
@@
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)
{
*/
XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
{
- if (xbt_swag_belongs(obj, swag)) {
- return;
- }
+ xbt_assert(!xbt_swag_belongs(obj, swag) || swag->tail,
+ "This object belongs to an empty swag! Did you correctly initialize the object's hookup?");
- if (!swag->
tail
) {
- xbt_assert(!(swag->
head
), "Inconsistent swag.");
+ if (!swag->
head
) {
+ xbt_assert(!(swag->
tail
), "Inconsistent swag.");
swag->head = obj;
swag->tail = obj;
swag->count++;
}
swag->head = obj;
swag->tail = obj;
swag->count++;
}
- else if (obj != swag->
tail && !xbt_swag_getNext
(obj, swag->offset)) {
+ else if (obj != swag->
head && !xbt_swag_getPrev
(obj, swag->offset)) {
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
xbt_swag_getNext(swag->tail, swag->offset) = obj;
swag->tail = obj;
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
xbt_swag_getNext(swag->tail, swag->offset) = obj;
swag->tail = obj;