From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 16 Aug 2011 19:05:17 +0000 (-0400)
Subject: Annotate branches in ctf.c event reading/writing code
X-Git-Tag: v0.7~21
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=7f3f572b0f2d5405e9a020fe1069f429ba878bfd

Annotate branches in ctf.c event reading/writing code

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 95a581fa..0d1418c1 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -97,7 +97,7 @@ void ctf_update_timestamp(struct ctf_stream *stream,
 		integer_definition->declaration;
 	uint64_t oldval, newval, updateval;
 
-	if (integer_declaration->len == 64) {
+	if (unlikely(integer_declaration->len == 64)) {
 		stream->timestamp = integer_definition->value._unsigned;
 		return;
 	}
@@ -127,17 +127,17 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 
 	ctf_pos_get_event(pos);
 
-	if (pos->offset == EOF)
+	if (unlikely(pos->offset == EOF))
 		return EOF;
 	assert(pos->offset < pos->content_size);
 
 	/* Read event header */
-	if (stream->stream_event_header) {
+	if (likely(stream->stream_event_header)) {
 		struct definition_integer *integer_definition;
 		struct definition *variant;
 
 		ret = generic_rw(ppos, &stream->stream_event_header->p);
-		if (ret)
+		if (unlikely(ret))
 			goto error;
 		/* lookup event id */
 		integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE);
@@ -185,12 +185,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 			goto error;
 	}
 
-	if (id >= stream_class->events_by_id->len) {
+	if (unlikely(id >= stream_class->events_by_id->len)) {
 		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
 		return -EINVAL;
 	}
 	event = g_ptr_array_index(stream->events_by_id, id);
-	if (!event) {
+	if (unlikely(!event)) {
 		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
@@ -203,7 +203,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 	}
 
 	/* Read event payload */
-	if (event->event_fields) {
+	if (likely(event->event_fields)) {
 		ret = generic_rw(ppos, &event->event_fields->p);
 		if (ret)
 			goto error;
@@ -227,7 +227,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 	id = stream->event_id;
 
 	/* print event header */
-	if (stream->stream_event_header) {
+	if (likely(stream->stream_event_header)) {
 		ret = generic_rw(pos, &stream->stream_event_header->p);
 		if (ret)
 			goto error;
@@ -240,12 +240,12 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 			goto error;
 	}
 
-	if (id >= stream_class->events_by_id->len) {
+	if (unlikely(id >= stream_class->events_by_id->len)) {
 		fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
 		return -EINVAL;
 	}
 	event = g_ptr_array_index(stream->events_by_id, id);
-	if (!event) {
+	if (unlikely(!event)) {
 		fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
 		return -EINVAL;
 	}
@@ -258,7 +258,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 	}
 
 	/* Read and print event payload */
-	if (event->event_fields) {
+	if (likely(event->event_fields)) {
 		ret = generic_rw(pos, &event->event_fields->p);
 		if (ret)
 			goto error;