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
Bug fix and add a xbt_swag_foreach_safe where you can remove objects from
[simgrid.git]
/
src
/
xbt
/
swag.c
diff --git
a/src/xbt/swag.c
b/src/xbt/swag.c
index
8759e67
..
42e70fd
100644
(file)
--- a/
src/xbt/swag.c
+++ b/
src/xbt/swag.c
@@
-22,7
+22,7
@@
xbt_swag_t xbt_swag_new(size_t offset)
{
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);
swag->offset = offset;
swag->offset = offset;
@@
-36,6
+36,10
@@
void xbt_swag_init(xbt_swag_t swag, size_t offset)
void xbt_swag_insert(void *obj, xbt_swag_t swag)
{
void xbt_swag_insert(void *obj, xbt_swag_t swag)
{
+
+ if (xbt_swag_belongs(obj, swag))
+ return;
+
(swag->count)++;
if (swag->head == NULL) {
swag->head = obj;
(swag->count)++;
if (swag->head == NULL) {
swag->head = obj;
@@
-53,9
+57,14
@@
void *xbt_swag_extract(void *obj, xbt_swag_t swag)
{
size_t offset = swag->offset;
{
size_t offset = swag->offset;
- if (!obj) return NULL;
+ if ((!obj) || (!swag))
+ return NULL;
+ if(!xbt_swag_belongs(obj, swag)) /* Trying to remove an object that
+ was not in this swag */
+ return NULL;
+
if (swag->head == swag->tail) { /* special case */
if (swag->head == swag->tail) { /* special case */
- if (swag->head != obj) /* Trying to remove an object that was not in this swag */
+ if (swag->head != obj)
/* Trying to remove an object that was not in this swag */
return NULL;
swag->head = NULL;
swag->tail = NULL;
return NULL;
swag->head = NULL;
swag->tail = NULL;
@@
-83,5
+92,6
@@
int xbt_swag_size(xbt_swag_t swag)
int xbt_swag_belongs(void *obj, xbt_swag_t swag)
{
int xbt_swag_belongs(void *obj, xbt_swag_t swag)
{
- return ((NEXT(obj, swag->offset)) || (PREV(obj, swag->offset)) || (swag->head==obj));
+ return ((NEXT(obj, swag->offset)) || (PREV(obj, swag->offset))
+ || (swag->head == obj));
}
}