Annotate likely/unlikely branches in headers

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 7c02948ac1ff56fda5e016204a834dbf59f41f0b..0b7b1eee860d04831cfd9e77e8b334f435e9813b 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -18,6 +18,9 @@ extern int babeltrace_verbose, babeltrace_debug;
                        printf("[debug] " fmt, ## args);        \
        } while (0)
 
                        printf("[debug] " fmt, ## args);        \
        } while (0)
 

+#define likely(x)      __builtin_expect(!!(x), 1)
+#define unlikely(x)    __builtin_expect(!!(x), 0)
+

 struct trace_descriptor;
 struct trace_collection {
        GPtrArray *array;
 struct trace_descriptor;
 struct trace_collection {
        GPtrArray *array;

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 58352ef7b15a7bf4b39ba08842bcc3ff34543e1b..cebaca7ac8f19c516876163c1108540dd958a898 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -97,7 +97,7 @@ static inline
 void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
        printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);
 void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
 {
        printf_debug("ctf_move_pos test EOF: %zd\n", pos->offset);

-       if (pos->offset == EOF)
+       if (unlikely(pos->offset == EOF))

                return;
 
        if (pos->fd >= 0) {
                return;
 
        if (pos->fd >= 0) {


@@ -108,7 +108,7 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
                 * packet.
                 */
                if ((pos->prot == PROT_WRITE)
                 * packet.
                 */
                if ((pos->prot == PROT_WRITE)

-                       && (pos->offset + bit_offset >= pos->packet_size)) {
+                       && (unlikely(pos->offset + bit_offset >= pos->packet_size))) {

                        printf_debug("ctf_move_pos_slow (before call): %zd\n",
                                     pos->offset);
                        ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
                        printf_debug("ctf_move_pos_slow (before call): %zd\n",
                                     pos->offset);
                        ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);


@@ -155,7 +155,7 @@ void ctf_dummy_pos(struct ctf_stream_pos *pos, struct ctf_stream_pos *dummy)
 static inline
 int ctf_pos_packet(struct ctf_stream_pos *dummy)
 {
 static inline
 int ctf_pos_packet(struct ctf_stream_pos *dummy)
 {

-       if (dummy->offset > dummy->packet_size)
+       if (unlikely(dummy->offset > dummy->packet_size))

                return -ENOSPC;
        return 0;
 }
                return -ENOSPC;
        return 0;
 }


@@ -169,9 +169,9 @@ void ctf_pos_pad_packet(struct ctf_stream_pos *pos)
 static inline
 int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
 {
 static inline
 int ctf_pos_access_ok(struct ctf_stream_pos *pos, size_t bit_len)
 {

-       if (pos->offset == EOF)
+       if (unlikely(pos->offset == EOF))

                return 0;
                return 0;

-       if (pos->offset + bit_len > pos->packet_size)
+       if (unlikely(pos->offset + bit_len > pos->packet_size))

                return 0;
        return 1;
 }
                return 0;
        return 1;
 }