X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=cebaca7ac8f19c516876163c1108540dd958a898;hp=58352ef7b15a7bf4b39ba08842bcc3ff34543e1b;hb=90bf3cefc3f8799b3a822bf9123f21e81220574e;hpb=d199691ba17cc82d03b7c57a55a44d61f424f752

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 58352ef7..cebaca7a 100644
--- 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);
-	if (pos->offset == EOF)
+	if (unlikely(pos->offset == EOF))
 		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)
-		    	&& (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);
@@ -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)
 {
-	if (dummy->offset > dummy->packet_size)
+	if (unlikely(dummy->offset > dummy->packet_size))
 		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)
 {
-	if (pos->offset == EOF)
+	if (unlikely(pos->offset == EOF))
 		return 0;
-	if (pos->offset + bit_len > pos->packet_size)
+	if (unlikely(pos->offset + bit_len > pos->packet_size))
 		return 0;
 	return 1;
 }