X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Fviewer-connection.c;h=34bac35afa0fd7c24c3f32b2c3a8b78167d659c9;hp=c4b29ed23e0cdc95d7af1e06f6c7a96e2ea23846;hb=1a25881946640f778a14e8f5491795193572d826;hpb=cefd84f8dac720dcbb07a551d3894d701d2515c9

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index c4b29ed2..34bac35a 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -1539,11 +1539,12 @@ enum lttng_live_iterator_status lttng_live_get_next_index(
 		index->ts_cycles.timestamp_end = be64toh(rp.timestamp_end);
 		stream->current_inactivity_ts = index->ts_cycles.timestamp_end;
 		ctf_stream_class_id = be64toh(rp.stream_id);
-		if (stream->ctf_stream_class_id != -1ULL) {
-			BT_ASSERT(stream->ctf_stream_class_id ==
+		if (stream->ctf_stream_class_id.is_set) {
+			BT_ASSERT(stream->ctf_stream_class_id.value==
 				ctf_stream_class_id);
 		} else {
-			stream->ctf_stream_class_id = ctf_stream_class_id;
+			stream->ctf_stream_class_id.value = ctf_stream_class_id;
+			stream->ctf_stream_class_id.is_set = true;
 		}
 		lttng_live_stream_iterator_set_state(stream, LTTNG_LIVE_STREAM_QUIESCENT);
 		status = LTTNG_LIVE_ITERATOR_STATUS_OK;
@@ -1555,11 +1556,12 @@ enum lttng_live_iterator_status lttng_live_get_next_index(
 
 		lttng_index_to_packet_index(&rp, index);
 		ctf_stream_class_id = be64toh(rp.stream_id);
-		if (stream->ctf_stream_class_id != -1ULL) {
-			BT_ASSERT(stream->ctf_stream_class_id ==
+		if (stream->ctf_stream_class_id.is_set) {
+			BT_ASSERT(stream->ctf_stream_class_id.value==
 				ctf_stream_class_id);
 		} else {
-			stream->ctf_stream_class_id = ctf_stream_class_id;
+			stream->ctf_stream_class_id.value = ctf_stream_class_id;
+			stream->ctf_stream_class_id.is_set = true;
 		}
 
 		lttng_live_stream_iterator_set_state(stream, LTTNG_LIVE_STREAM_ACTIVE_DATA);