lib: Reset libbabeltrace2 to SONANE 0

[babeltrace.git] / include / babeltrace / object-pool-internal.h

diff --git a/include/babeltrace/object-pool-internal.h b/include/babeltrace/object-pool-internal.h
index fc9d8c0a0df2f9359e2854cfa318aaaf6c2147fe..4cc5142c476623fbb2cfea2cab9fe5e1deea2bba 100644 (file)
--- a/include/babeltrace/object-pool-internal.h
+++ b/include/babeltrace/object-pool-internal.h
@@ -2,7 +2,6 @@
 #define BABELTRACE_OBJECT_POOL_INTERNAL_H
 
 /*
- * Copyright (c) 2018 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2018 Philippe Proulx <pproulx@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -119,11 +118,6 @@ void *bt_object_pool_create_object(struct bt_object_pool *pool)
                pool->size--;
                obj = pool->objects->pdata[pool->size];
                pool->objects->pdata[pool->size] = NULL;
-
-               if (obj->is_shared) {
-                       /* Object is shared: reset reference count to 1 */
-                       obj->ref_count.count = 1;
-               }
                goto end;
        }
 
@@ -152,6 +146,8 @@ end:
 static inline
 void bt_object_pool_recycle_object(struct bt_object_pool *pool, void *obj)
 {
+       struct bt_object *bt_obj = obj;
+
        BT_ASSERT(pool);
        BT_ASSERT(obj);
 
@@ -170,6 +166,10 @@ void bt_object_pool_recycle_object(struct bt_object_pool *pool, void *obj)
                g_ptr_array_set_size(pool->objects, pool->size + 1);
        }
 
+       /* Reset reference count to 1 since it could be 0 now */
+       bt_obj->ref_count = 1;
+
+       /* Back to the pool */
        pool->objects->pdata[pool->size] = obj;
        pool->size++;