X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fref.c;h=02d2c4e9bf914fe3467600d81ea4d5abd13058d9;hb=1b83271bb496e994fdb6ba4047e88824ec391d43;hp=d39a24d0c1bc5121f4082b5f3eb7ed039a4faae1;hpb=40547d22025f69fdefe35042a5babe8c04b6aa2a;p=babeltrace.git

diff --git a/lib/ref.c b/lib/ref.c
index d39a24d0..02d2c4e9 100644
--- a/lib/ref.c
+++ b/lib/ref.c
@@ -38,15 +38,22 @@ void *bt_get(void *ptr)
 		goto end;
 	}
 
+	if (unlikely(!obj->ref_count.release)) {
+		goto end;
+	}
+
 	if (unlikely(obj->parent && bt_object_get_ref_count(obj) == 0)) {
 		BT_LOGV("Incrementing object's parent's reference count: "
 			"addr=%p, parent-addr=%p", ptr, obj->parent);
 		bt_get(obj->parent);
 	}
+	BT_LOGV("Incrementing object's reference count: %lu -> %lu: "
+		"addr=%p, cur-count=%lu, new-count=%lu",
+		obj->ref_count.count, obj->ref_count.count + 1,
+		ptr,
+		obj->ref_count.count, obj->ref_count.count + 1);
 	bt_ref_get(&obj->ref_count);
-	BT_LOGV("Incremented object's reference count: %lu -> %lu: "
-		"addr=%p, new-count=%lu", obj->ref_count.count - 1,
-		obj->ref_count.count, ptr, obj->ref_count.count);
+
 end:
 	return obj;
 }
@@ -59,8 +66,19 @@ void bt_put(void *ptr)
 		return;
 	}
 
+	if (unlikely(!obj->ref_count.release)) {
+		return;
+	}
+
+	if (BT_LOG_ON_WARN && unlikely(bt_object_get_ref_count(obj) == 0)) {
+		BT_LOGW("Decrementing a reference count set to 0: addr=%p",
+			ptr);
+	}
+
 	BT_LOGV("Decrementing object's reference count: %lu -> %lu: "
-		"addr=%p, cur-count=%lu", obj->ref_count.count,
-		obj->ref_count.count - 1, ptr, obj->ref_count.count);
+		"addr=%p, cur-count=%lu, new-count=%lu",
+		obj->ref_count.count, obj->ref_count.count - 1,
+		ptr,
+		obj->ref_count.count, obj->ref_count.count - 1);
 	bt_ref_put(&obj->ref_count);
 }