X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=3f31f1a004a894295f736f392339231ccad9b0ea;hb=5cf4fb3d26a1b3567c3dcb33f11584c90c02101a;hp=615373196063f1b9b53243a61412edf6cf609830;hpb=e1b15e554b760856b13a3e617999e21bb9e1ae7e;p=babeltrace.git

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index 61537319..3f31f1a0 100644
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -29,30 +29,21 @@
 #include "lib/trace-ir/clock-class.h"
 #include "lib/trace-ir/clock-snapshot.h"
 #include <babeltrace2/trace-ir/field.h>
-#include <babeltrace2/trace-ir/event-const.h>
+#include <babeltrace2/trace-ir/event.h>
 #include "lib/trace-ir/event.h"
-#include <babeltrace2/trace-ir/packet-const.h>
+#include <babeltrace2/trace-ir/packet.h>
 #include "lib/trace-ir/packet.h"
 #include "lib/trace-ir/stream.h"
-#include <babeltrace2/trace-ir/clock-class-const.h>
-#include <babeltrace2/trace-ir/stream-class-const.h>
-#include <babeltrace2/trace-ir/stream-const.h>
-#include <babeltrace2/graph/connection-const.h>
-#include <babeltrace2/graph/component-const.h>
-#include <babeltrace2/graph/component-sink-const.h>
-#include <babeltrace2/graph/message-const.h>
-#include <babeltrace2/graph/message-iterator.h>
-#include <babeltrace2/graph/message-event-const.h>
-#include <babeltrace2/graph/message-message-iterator-inactivity-const.h>
-#include <babeltrace2/graph/message-packet-beginning.h>
-#include <babeltrace2/graph/message-packet-beginning-const.h>
-#include <babeltrace2/graph/message-packet-end-const.h>
-#include <babeltrace2/graph/message-stream-beginning.h>
-#include <babeltrace2/graph/message-stream-beginning-const.h>
-#include <babeltrace2/graph/message-stream-end-const.h>
-#include <babeltrace2/graph/port-const.h>
+#include <babeltrace2/trace-ir/clock-class.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream.h>
+#include <babeltrace2/graph/connection.h>
+#include <babeltrace2/graph/component.h>
+#include <babeltrace2/graph/message.h>
+#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/port.h>
 #include <babeltrace2/graph/graph.h>
-#include <babeltrace2/graph/graph-const.h>
+#include <babeltrace2/graph/message-iterator.h>
 #include <babeltrace2/types.h>
 #include "common/assert.h"
 #include "lib/assert-pre.h"
@@ -563,7 +554,7 @@ bool clock_snapshots_are_monotonic_one(
 	{
 		struct bt_message_message_iterator_inactivity *inactivity_msg =
 			(struct bt_message_message_iterator_inactivity *) msg;
-		clock_snapshot = inactivity_msg->default_cs;
+		clock_snapshot = inactivity_msg->cs;
 		break;
 	}
 	case BT_MESSAGE_TYPE_PACKET_BEGINNING:
@@ -1261,7 +1252,7 @@ int auto_seek_handle_message(
 		const struct bt_message_message_iterator_inactivity *inactivity_msg =
 			(const void *) msg;
 
-		clk_snapshot = inactivity_msg->default_cs;
+		clk_snapshot = inactivity_msg->cs;
 		BT_ASSERT_DBG(clk_snapshot);
 		break;
 	}
@@ -1425,7 +1416,7 @@ skip_msg:
 		struct auto_seek_stream_state *stream_state;
 
 		stream_state = g_hash_table_lookup(stream_states,
-			event_msg->event->packet->stream);
+			event_msg->event->stream);
 		BT_ASSERT_DBG(stream_state);
 
 		// HELPME: are we sure that event messages have clock snapshots at this point?