X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-stream-internal.h;h=2cfe26870ee28e87b81ca4e69f970ec63fbda4f8;hb=c8db321922f3730c70628a5e452baf8a046e70fd;hp=5c0f72260c3c50e1ce2d8bfd07c2ec38ad8e3eab;hpb=f6ccaed94e575af57fe6bf38154771bee4871a2a;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h
index 5c0f7226..2cfe2687 100644
--- a/include/babeltrace/graph/notification-stream-internal.h
+++ b/include/babeltrace/graph/notification-stream-internal.h
@@ -1,13 +1,10 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H
 
 /*
- * BabelTrace - Stream-related Notifications
- *
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -28,42 +25,21 @@
  */
 
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/trace-ir/packet.h>
 #include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/trace-ir/clock-value-internal.h>
 #include <babeltrace/assert-internal.h>
 
-struct bt_notification_stream_begin {
+struct bt_notification_stream_beginning {
 	struct bt_notification parent;
 	struct bt_stream *stream;
+	struct bt_clock_value *default_cv;
 };
 
 struct bt_notification_stream_end {
 	struct bt_notification parent;
 	struct bt_stream *stream;
+	struct bt_clock_value *default_cv;
 };
 
-static inline
-struct bt_stream *bt_notification_stream_begin_borrow_stream(
-		struct bt_notification *notif)
-{
-	struct bt_notification_stream_begin *notif_stream_begin =
-		container_of(notif,
-			struct bt_notification_stream_begin, parent);
-
-	BT_ASSERT(notif_stream_begin);
-	return notif_stream_begin->stream;
-}
-
-static inline
-struct bt_stream *bt_notification_stream_end_borrow_stream(
-		struct bt_notification *notif)
-{
-	struct bt_notification_stream_end *notif_stream_end =
-		container_of(notif,
-			struct bt_notification_stream_end, parent);
-
-	BT_ASSERT(notif_stream_end);
-	return notif_stream_end->stream;
-}
-
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_STREAM_INTERNAL_H */