Clean-up bt_put() implementation

[babeltrace.git] / lib / ref.c

diff --git a/lib/ref.c b/lib/ref.c
index e642e266de87543c24f9f3819e6c8b7a577c1b46..ac0580137a5ad959d25fbfa29b3a3dc0a7ffae19 100644 (file)
--- a/lib/ref.c
+++ b/lib/ref.c
@@ -27,21 +27,29 @@
 #include <babeltrace/ref-internal.h>
 #include <babeltrace/object-internal.h>
 
-void *bt_get(void *obj)
+void *bt_get(void *ptr)
 {
-       if (obj) {
-               struct bt_object *base = obj;
+       struct bt_object *obj = ptr;
 
-               bt_ref_get(&base->ref_count);
+       if (!obj) {
+               goto end;
        }
+
+       if (obj->parent && bt_object_get_ref_count(obj) == 0) {
+               bt_get(obj->parent);
+       }
+       bt_ref_get(&obj->ref_count);
+end:
        return obj;
 }
 
-void bt_put(void *obj)
+void bt_put(void *ptr)
 {
-       if (obj) {
-               struct bt_object *base = obj;
+       struct bt_object *obj = ptr;
 
-               bt_ref_put(&base->ref_count);
+       if (!obj) {
+               return;
        }
+
+       bt_ref_put(&obj->ref_count);
 }