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
As Arnaud said, one function to rule them all
[simgrid.git]
/
src
/
xbt
/
swag.c
diff --git
a/src/xbt/swag.c
b/src/xbt/swag.c
index
6af2554
..
873724b
100644
(file)
--- a/
src/xbt/swag.c
+++ b/
src/xbt/swag.c
@@
-29,10
+29,7
@@
xbt_swag_t xbt_swag_new(size_t offset)
{
xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
- swag->tail = NULL;
- swag->head = NULL;
- swag->offset = offset;
- swag->count = 0;
+ xbt_swag_init(swag, offset);
return swag;
}
@@
-229,3
+226,66
@@
int xbt_swag_belongs(void *obj, xbt_swag_t swag)
return ((NEXT(obj, swag->offset)) || (PREV(obj, swag->offset))
|| (swag->head == obj));
}
+
+
+#ifdef SIMGRID_TEST
+
+XBT_TEST_SUITE("swag","Swag data container");
+
+typedef struct {
+ s_xbt_swag_hookup_t setA;
+ s_xbt_swag_hookup_t setB;
+ const char *name;
+} shmurtz, s_shmurtz_t, *shmurtz_t;
+
+
+XBT_TEST_UNIT("basic",test_swag_basic,"Basic usage") {
+ shmurtz_t obj1, obj2, obj;
+ xbt_swag_t setA,setB;
+
+ obj1 = calloc(1,sizeof(s_shmurtz_t));
+ obj2 = calloc(1,sizeof(s_shmurtz_t));
+
+ obj1->name="Obj 1";
+ obj2->name="Obj 2";
+
+ xbt_test_add0("Basic usage");
+ xbt_test_log3("%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));
+
+ xbt_swag_insert(obj1, setA);
+ xbt_swag_insert(obj1, setB);
+ xbt_swag_insert(obj2, setA);
+ xbt_swag_insert(obj2, setB);
+
+ xbt_swag_remove(obj1, setB);
+ /* xbt_swag_remove(obj2, setB);*/
+
+ xbt_test_add0("Traverse set A");
+ xbt_swag_foreach(obj,setA) {
+ xbt_test_log1("Saw: %s",obj->name);
+ }
+
+ xbt_test_add0("Traverse set B");
+ xbt_swag_foreach(obj,setB) {
+ xbt_test_log1("Saw: %s",obj->name);
+ }
+
+ xbt_test_add0("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,setB));
+ xbt_test_assert( xbt_swag_belongs(obj2,setB));
+
+ xbt_test_assert(xbt_swag_size(setA) == 2);
+ xbt_test_assert(xbt_swag_size(setB) == 1);
+
+ xbt_swag_free(setA);
+ xbt_swag_free(setB);
+}
+
+#endif /* SIMGRID_TEST */