-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/log.h"
#include "xbt/swag.h"
-
/** Creates a new swag.
* \param offset where the hookup is located in the structure
* \see xbt_swag_offset
*/
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;
*/
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++;
xbt_swag_insert(obj2, setA);
xbt_swag_insert(obj2, setB);
- xbt_swag_remove(obj1, setB);
- /* xbt_swag_remove(obj2, setB); */
+ xbt_test_assert(xbt_swag_remove(NULL, setB) == NULL);
+ xbt_test_assert(xbt_swag_remove(obj1, setB) == obj1);
+ /* xbt_test_assert(xbt_swag_remove(obj2, setB) == obj2); */
xbt_test_add("Traverse set A");
xbt_swag_foreach(obj, setA) {