From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sun, 11 Dec 2016 08:56:56 +0000 (-0500)
Subject: Add branch prediction hints in ref count interface
X-Git-Tag: v2.0.0-pre1~625
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=a041af486dcba18b1fbd9a9e5d81730416f7ec52

Add branch prediction hints in ref count interface

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/babeltrace/ref-internal.h b/include/babeltrace/ref-internal.h
index cf1547da..c5d8143a 100644
--- a/include/babeltrace/ref-internal.h
+++ b/include/babeltrace/ref-internal.h
@@ -51,7 +51,7 @@ void bt_ref_get(struct bt_ref *ref)
 {
 	assert(ref);
 
-	if (!ref->release) {
+	if (unlikely(!ref->release)) {
 		return;
 	}
 
@@ -65,7 +65,7 @@ void bt_ref_put(struct bt_ref *ref)
 {
 	assert(ref);
 	/* Only assert if the object has opted-in for reference counting. */
-	if ((--ref->count) == 0 && ref->release) {
+	if (unlikely((--ref->count) == 0 && ref->release)) {
 		ref->release((struct bt_object *) ref);
 	}
 }
diff --git a/lib/ref.c b/lib/ref.c
index ac058013..4e245adf 100644
--- a/lib/ref.c
+++ b/lib/ref.c
@@ -31,11 +31,11 @@ void *bt_get(void *ptr)
 {
 	struct bt_object *obj = ptr;
 
-	if (!obj) {
+	if (unlikely(!obj)) {
 		goto end;
 	}
 
-	if (obj->parent && bt_object_get_ref_count(obj) == 0) {
+	if (unlikely(obj->parent && bt_object_get_ref_count(obj) == 0)) {
 		bt_get(obj->parent);
 	}
 	bt_ref_get(&obj->ref_count);
@@ -47,7 +47,7 @@ void bt_put(void *ptr)
 {
 	struct bt_object *obj = ptr;
 
-	if (!obj) {
+	if (unlikely(!obj)) {
 		return;
 	}