X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=ecf70b3f818ad7f5ac695eb8c944704a7c6f85d6;hb=7f140ae8b9d8fe9a9df9451ef86eebdbbd62a1f1;hp=0d3499951a0cfb7504d434134eea65e945459992;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 0d349995..ecf70b3f 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -29,6 +29,7 @@
 #include <babeltrace/logging.h>
 #include <babeltrace/property.h>
 #include <babeltrace/types.h>
+#include <babeltrace/util.h>
 #include <babeltrace/value-const.h>
 #include <babeltrace/value.h>
 #include <babeltrace/version.h>
@@ -43,6 +44,7 @@
 #include <babeltrace/ctf-writer/event.h>
 #include <babeltrace/ctf-writer/field-types.h>
 #include <babeltrace/ctf-writer/fields.h>
+#include <babeltrace/ctf-writer/object.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 #include <babeltrace/ctf-writer/stream.h>
 #include <babeltrace/ctf-writer/trace.h>
@@ -65,11 +67,10 @@
 /* Trace IR API */
 #include <babeltrace/trace-ir/clock-class-const.h>
 #include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/clock-value-const.h>
+#include <babeltrace/trace-ir/clock-snapshot-const.h>
 #include <babeltrace/trace-ir/event-class-const.h>
 #include <babeltrace/trace-ir/event-class.h>
 #include <babeltrace/trace-ir/event-const.h>
-#include <babeltrace/trace-ir/event-header-field.h>
 #include <babeltrace/trace-ir/event.h>
 #include <babeltrace/trace-ir/field-class-const.h>
 #include <babeltrace/trace-ir/field-class.h>
@@ -78,7 +79,6 @@
 #include <babeltrace/trace-ir/field.h>
 #include <babeltrace/trace-ir/packet-const.h>
 #include <babeltrace/trace-ir/packet-context-field.h>
-#include <babeltrace/trace-ir/packet-header-field.h>
 #include <babeltrace/trace-ir/packet.h>
 #include <babeltrace/trace-ir/stream-class-const.h>
 #include <babeltrace/trace-ir/stream-class.h>
@@ -94,7 +94,7 @@
 #include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/plugin/plugin-set-const.h>
 
-/* Graph, component, and notification API */
+/* Graph, component, and message API */
 #include <babeltrace/graph/component-class-const.h>
 #include <babeltrace/graph/component-class-filter-const.h>
 #include <babeltrace/graph/component-class-filter.h>
@@ -110,32 +110,46 @@
 #include <babeltrace/graph/connection-const.h>
 #include <babeltrace/graph/graph-const.h>
 #include <babeltrace/graph/graph.h>
-#include <babeltrace/graph/notification-const.h>
-#include <babeltrace/graph/notification-event-const.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity-const.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-packet-const.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream-const.h>
-#include <babeltrace/graph/notification-stream.h>
+#include <babeltrace/graph/message-const.h>
+#include <babeltrace/graph/message-discarded-events-const.h>
+#include <babeltrace/graph/message-discarded-events.h>
+#include <babeltrace/graph/message-discarded-packets-const.h>
+#include <babeltrace/graph/message-discarded-packets.h>
+#include <babeltrace/graph/message-event-const.h>
+#include <babeltrace/graph/message-event.h>
+#include <babeltrace/graph/message-iterator-const.h>
+#include <babeltrace/graph/message-message-iterator-inactivity-const.h>
+#include <babeltrace/graph/message-message-iterator-inactivity.h>
+#include <babeltrace/graph/message-packet-beginning-const.h>
+#include <babeltrace/graph/message-packet-beginning.h>
+#include <babeltrace/graph/message-packet-end-const.h>
+#include <babeltrace/graph/message-packet-end.h>
+#include <babeltrace/graph/message-stream-activity-beginning-const.h>
+#include <babeltrace/graph/message-stream-activity-beginning.h>
+#include <babeltrace/graph/message-stream-activity-const.h>
+#include <babeltrace/graph/message-stream-activity-end-const.h>
+#include <babeltrace/graph/message-stream-activity-end.h>
+#include <babeltrace/graph/message-stream-beginning-const.h>
+#include <babeltrace/graph/message-stream-beginning.h>
+#include <babeltrace/graph/message-stream-end-const.h>
+#include <babeltrace/graph/message-stream-end.h>
 #include <babeltrace/graph/port-const.h>
 #include <babeltrace/graph/port-input-const.h>
 #include <babeltrace/graph/port-output-const.h>
-#include <babeltrace/graph/port-output-notification-iterator.h>
+#include <babeltrace/graph/port-output-message-iterator.h>
 #include <babeltrace/graph/query-executor-const.h>
 #include <babeltrace/graph/query-executor.h>
 #include <babeltrace/graph/self-component-class-filter.h>
 #include <babeltrace/graph/self-component-class-sink.h>
 #include <babeltrace/graph/self-component-class-source.h>
 #include <babeltrace/graph/self-component-filter.h>
-#include <babeltrace/graph/self-component-port-input-notification-iterator.h>
+#include <babeltrace/graph/self-component-port-input-message-iterator.h>
 #include <babeltrace/graph/self-component-port-input.h>
 #include <babeltrace/graph/self-component-port-output.h>
 #include <babeltrace/graph/self-component-port.h>
 #include <babeltrace/graph/self-component-sink.h>
 #include <babeltrace/graph/self-component-source.h>
 #include <babeltrace/graph/self-component.h>
-#include <babeltrace/graph/self-notification-iterator.h>
+#include <babeltrace/graph/self-message-iterator.h>
 
 #endif /* BABELTRACE_BABELTRACE_H */