X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace.h;h=ecf70b3f818ad7f5ac695eb8c944704a7c6f85d6;hb=25f741168b45db9dd975136cfd3f66dbd9af39d0;hp=67e2fac93bf90e34996fa8edca1c8701b80ea4c0;hpb=40f4ba76dd6f9508ca51b6220eaed57632281a07;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index 67e2fac9..ecf70b3f 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -27,11 +27,11 @@
 
 /* Core API */
 #include <babeltrace/logging.h>
-#include <babeltrace/object.h>
 #include <babeltrace/property.h>
 #include <babeltrace/types.h>
-#include <babeltrace/values-const.h>
-#include <babeltrace/values.h>
+#include <babeltrace/util.h>
+#include <babeltrace/value-const.h>
+#include <babeltrace/value.h>
 #include <babeltrace/version.h>
 
 /* Legacy API (for CTF writer) */
@@ -44,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>
@@ -66,77 +67,89 @@
 /* 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-classes-const.h>
-#include <babeltrace/trace-ir/field-classes.h>
+#include <babeltrace/trace-ir/field-class-const.h>
+#include <babeltrace/trace-ir/field-class.h>
+#include <babeltrace/trace-ir/field-const.h>
 #include <babeltrace/trace-ir/field-path-const.h>
-#include <babeltrace/trace-ir/fields-const.h>
-#include <babeltrace/trace-ir/fields.h>
+#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>
 #include <babeltrace/trace-ir/stream-const.h>
 #include <babeltrace/trace-ir/stream.h>
+#include <babeltrace/trace-ir/trace-class-const.h>
+#include <babeltrace/trace-ir/trace-class.h>
 #include <babeltrace/trace-ir/trace-const.h>
 #include <babeltrace/trace-ir/trace.h>
 
 /* Plugin and plugin development API */
+#include <babeltrace/plugin/plugin-const.h>
 #include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/plugin/plugin-set.h>
-#include <babeltrace/plugin/plugin.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>
+#include <babeltrace/graph/component-class-sink-const.h>
 #include <babeltrace/graph/component-class-sink.h>
+#include <babeltrace/graph/component-class-source-const.h>
 #include <babeltrace/graph/component-class-source.h>
 #include <babeltrace/graph/component-class.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/component-source.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/connection.h>
+#include <babeltrace/graph/component-const.h>
+#include <babeltrace/graph/component-filter-const.h>
+#include <babeltrace/graph/component-sink-const.h>
+#include <babeltrace/graph/component-source-const.h>
+#include <babeltrace/graph/connection-const.h>
+#include <babeltrace/graph/graph-const.h>
 #include <babeltrace/graph/graph.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/port-input.h>
-#include <babeltrace/graph/port-output-notification-iterator.h>
-#include <babeltrace/graph/port-output.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-component-class-filter.h>
-#include <babeltrace/graph/private-component-class-sink.h>
-#include <babeltrace/graph/private-component-class-source.h>
-#include <babeltrace/graph/private-component-class.h>
-#include <babeltrace/graph/private-graph.h>
-#include <babeltrace/graph/private-notification-event.h>
-#include <babeltrace/graph/private-notification-inactivity.h>
-#include <babeltrace/graph/private-notification-packet.h>
-#include <babeltrace/graph/private-notification-stream.h>
-#include <babeltrace/graph/private-notification.h>
-#include <babeltrace/graph/private-query-executor.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-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 */