projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ust comm: more resilient handle table, fix size of reply
[lttng-ust.git]
/
libust
/
lttng-ust-abi.c
diff --git
a/libust/lttng-ust-abi.c
b/libust/lttng-ust-abi.c
index dca010c9f97353c68011eac4cab506f23d089804..01512128f24b478e9bea2bef795ba89eb04e97b7 100644
(file)
--- a/
libust/lttng-ust-abi.c
+++ b/
libust/lttng-ust-abi.c
@@
-100,7
+100,8
@@
int objd_alloc(void *private_data, const struct objd_ops *ops)
end:
obj->u.s.private_data = private_data;
obj->u.s.ops = ops;
end:
obj->u.s.private_data = private_data;
obj->u.s.ops = ops;
- obj->u.s.f_count = 1;
+ obj->u.s.f_count = 2; /* count == 1 : object is allocated */
+ /* count == 2 : allocated + hold ref */
return obj - objd_table.array;
}
return obj - objd_table.array;
}
@@
-109,6
+110,8
@@
struct obj *_objd_get(int id)
{
if (id >= objd_table.len)
return NULL;
{
if (id >= objd_table.len)
return NULL;
+ if (!objd_table.array[id].u.s.f_count)
+ return NULL;
return &objd_table.array[id];
}
return &objd_table.array[id];
}
@@
-132,7
+135,8
@@
static
const struct objd_ops *objd_ops(int id)
{
struct obj *obj = _objd_get(id);
const struct objd_ops *objd_ops(int id)
{
struct obj *obj = _objd_get(id);
- assert(obj);
+ if (!obj)
+ return NULL;
return obj->u.s.ops;
}
return obj->u.s.ops;
}
@@
-144,6
+148,8
@@
void objd_free(int id)
assert(obj);
obj->u.freelist_next = objd_table.freelist_head;
objd_table.freelist_head = obj - objd_table.array;
assert(obj);
obj->u.freelist_next = objd_table.freelist_head;
objd_table.freelist_head = obj - objd_table.array;
+ assert(obj->u.s.f_count == 1);
+ obj->u.s.f_count = 0; /* deallocated */
}
static
}
static
@@
-159,9
+165,13
@@
int objd_unref(int id)
if (!obj)
return -EINVAL;
if (!obj)
return -EINVAL;
- if (!(--obj->u.s.f_count)) {
+ if (obj->u.s.f_count == 1) {
+ ERR("Reference counting error\n");
+ return -EINVAL;
+ }
+ if ((--obj->u.s.f_count) == 1) {
const struct objd_ops *ops = objd_ops(id);
const struct objd_ops *ops = objd_ops(id);
-
+
if (ops->release)
ops->release(id);
objd_free(id);
if (ops->release)
ops->release(id);
objd_free(id);
@@
-172,6
+182,18
@@
int objd_unref(int id)
static
void objd_table_destroy(void)
{
static
void objd_table_destroy(void)
{
+ int i;
+
+ for (i = 0; i < objd_table.allocated_len; i++) {
+ struct obj *obj = _objd_get(i);
+ const struct objd_ops *ops;
+
+ if (!obj)
+ continue;
+ ops = obj->u.s.ops;
+ if (ops->release)
+ ops->release(i);
+ }
free(objd_table.array);
}
free(objd_table.array);
}
This page took
0.025471 seconds
and
4
git commands to generate.