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
Merge pull request #181 from bcamus/master
[simgrid.git]
/
src
/
xbt
/
swag.c
diff --git
a/src/xbt/swag.c
b/src/xbt/swag.c
index
1b1fc12
..
e10514e
100644
(file)
--- a/
src/xbt/swag.c
+++ b/
src/xbt/swag.c
@@
-1,4
+1,4
@@
-/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-14,14
+14,13
@@
#include "xbt/log.h"
#include "xbt/swag.h"
#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
*
* Usage : xbt_swag_new(&obj.setA-&obj);
*/
/** Creates a new swag.
* \param offset where the hookup is located in the structure
* \see xbt_swag_offset
*
* Usage : xbt_swag_new(&obj.setA-&obj);
*/
-
XBT_INLINE
xbt_swag_t xbt_swag_new(size_t offset)
+
inline
xbt_swag_t xbt_swag_new(size_t offset)
{
xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
{
xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
@@
-33,10
+32,10
@@
XBT_INLINE xbt_swag_t xbt_swag_new(size_t offset)
/**
* \param swag poor victim
*
/**
* \param swag poor victim
*
- * kilkil a swag but not it's content. If you do not understand why
- *
xbt_swag_free should not free its content,
don't use swags.
+ * kilkil a swag but not it's content. If you do not understand why
xbt_swag_free should not free its content,
+ * don't use swags.
*/
*/
-
XBT_INLINE
void xbt_swag_free(xbt_swag_t swag)
+
inline
void xbt_swag_free(xbt_swag_t swag)
{
free(swag);
}
{
free(swag);
}
@@
-48,7
+47,7
@@
XBT_INLINE void xbt_swag_free(xbt_swag_t swag)
*
* Usage : xbt_swag_init(swag,&obj.setA-&obj);
*/
*
* Usage : xbt_swag_init(swag,&obj.setA-&obj);
*/
-
XBT_INLINE
void xbt_swag_init(xbt_swag_t swag, size_t offset)
+
inline
void xbt_swag_init(xbt_swag_t swag, size_t offset)
{
swag->tail = NULL;
swag->head = NULL;
{
swag->tail = NULL;
swag->head = NULL;
@@
-60,18
+59,20
@@
XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset)
* \param obj the objet to insert in the swag
* \param swag a swag
*
* \param obj the objet to insert in the swag
* \param swag a swag
*
- * insert (at the head... you probably had a very good reason to do
- *
that, I hope you know what you're doing) \a obj in
\a swag
+ * insert (at the head... you probably had a very good reason to do
that, I hope you know what you're doing) \a obj in
+ * \a swag
*/
*/
-
XBT_INLINE
void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
+
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;
swag->tail = obj;
swag->count++;
if (!swag->head) {
xbt_assert(!(swag->tail), "Inconsistent swag.");
swag->head = obj;
swag->tail = obj;
swag->count++;
- }
- else if (obj != swag->head && !xbt_swag_getPrev(obj, swag->offset)) {
+ } 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;
xbt_swag_getNext(obj, swag->offset) = swag->head;
xbt_swag_getPrev(swag->head, swag->offset) = obj;
swag->head = obj;
@@
-83,22
+84,20
@@
XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
* \param obj the objet to insert in the swag
* \param swag a swag
*
* \param obj the objet to insert in the swag
* \param swag a swag
*
- * insert (at the tail... you probably had a very good reason to do
- *
that, I hope you know what you're doing) \a obj in
\a swag
+ * insert (at the tail... you probably had a very good reason to do
that, I hope you know what you're doing) \a obj in
+ * \a swag
*/
*/
-
XBT_INLINE
void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
+
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->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;
xbt_swag_getPrev(obj, swag->offset) = swag->tail;
xbt_swag_getNext(swag->tail, swag->offset) = obj;
swag->tail = obj;
@@
-113,7
+112,7
@@
XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
*
* removes \a obj from \a swag
*/
*
* removes \a obj from \a swag
*/
-
XBT_INLINE
void *xbt_swag_remove(void *obj, xbt_swag_t swag)
+
inline
void *xbt_swag_remove(void *obj, xbt_swag_t swag)
{
if (!obj)
return NULL;
{
if (!obj)
return NULL;
@@
-128,19
+127,16
@@
XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag)
if (next) {
xbt_swag_getPrev(next, offset) = prev;
xbt_swag_getNext(obj, offset) = NULL;
if (next) {
xbt_swag_getPrev(next, offset) = prev;
xbt_swag_getNext(obj, offset) = NULL;
- }
- else {
+ } else {
swag->tail = prev;
}
swag->count--;
swag->tail = prev;
}
swag->count--;
- }
- else if (next) {
+ } else if (next) {
xbt_swag_getPrev(next, offset) = NULL;
xbt_swag_getNext(obj, offset) = NULL;
swag->head = next;
swag->count--;
xbt_swag_getPrev(next, offset) = NULL;
xbt_swag_getNext(obj, offset) = NULL;
swag->head = next;
swag->count--;
- }
- else if (obj == swag->head) {
+ } else if (obj == swag->head) {
swag->head = swag->tail = NULL;
swag->count--;
}
swag->head = swag->tail = NULL;
swag->count--;
}
@@
-176,12
+172,11
@@
void *xbt_swag_extract(xbt_swag_t swag)
* \param swag a swag
* \return the number of objects in \a swag
*/
* \param swag a swag
* \return the number of objects in \a swag
*/
-
XBT_INLINE
int xbt_swag_size(xbt_swag_t swag)
+
inline
int xbt_swag_size(xbt_swag_t swag)
{
return (swag->count);
}
{
return (swag->count);
}
-
#ifdef SIMGRID_TEST
XBT_TEST_SUITE("swag", "Swag data container");
#ifdef SIMGRID_TEST
XBT_TEST_SUITE("swag", "Swag data container");
@@
-205,8
+200,7
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
obj2->name = "Obj 2";
xbt_test_add("Basic usage");
obj2->name = "Obj 2";
xbt_test_add("Basic usage");
- xbt_test_log("%p %p %ld\n", obj1, &(obj1->setB),
- (long) ((char *) &(obj1->setB) - (char *) obj1));
+ 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));
setB = xbt_swag_new(xbt_swag_offset(*obj1, setB));
setA = xbt_swag_new(xbt_swag_offset(*obj1, setA));
setB = xbt_swag_new(xbt_swag_offset(*obj1, setB));
@@
-216,8
+210,9
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
xbt_swag_insert(obj2, setA);
xbt_swag_insert(obj2, setB);
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) {
xbt_test_add("Traverse set A");
xbt_swag_foreach(obj, setA) {
@@
-245,5
+240,4
@@
XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
xbt_free(obj1);
xbt_free(obj2);
}
xbt_free(obj1);
xbt_free(obj2);
}
-
#endif /* SIMGRID_TEST */
#endif /* SIMGRID_TEST */