X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=d4ec925e5e4fe7f4e53c26fd23d181a753eeb85c;hb=04297e7fd3ac772a72c6920b3e7f06054355075c;hp=da92f90bc2eb449ab741053456eaa4f20eb62ca5;hpb=3b4c8c4337718252108994f0a3bdba0c8c65963b;p=deliverable%2Fbabeltrace.git diff --git a/include/Makefile.am b/include/Makefile.am index da92f90bc..d4ec925e5 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -73,11 +73,11 @@ babeltraceincludedir = "$(includedir)/babeltrace" babeltraceinclude_HEADERS = \ babeltrace/babeltrace.h \ babeltrace/logging.h \ - babeltrace/object.h \ babeltrace/property.h \ babeltrace/types.h \ - babeltrace/values-const.h \ - babeltrace/values.h \ + babeltrace/util.h \ + babeltrace/value-const.h \ + babeltrace/value.h \ babeltrace/version.h # Legacy API (for CTF writer) @@ -90,10 +90,11 @@ babeltracectfwriterincludedir = "$(includedir)/babeltrace/ctf-writer" babeltracectfwriterinclude_HEADERS = \ babeltrace/ctf-writer/clock.h \ babeltrace/ctf-writer/event-fields.h \ - babeltrace/ctf-writer/event.h \ babeltrace/ctf-writer/event-types.h \ - babeltrace/ctf-writer/fields.h \ + babeltrace/ctf-writer/event.h \ babeltrace/ctf-writer/field-types.h \ + babeltrace/ctf-writer/fields.h \ + babeltrace/ctf-writer/object.h \ babeltrace/ctf-writer/stream-class.h \ babeltrace/ctf-writer/stream.h \ babeltrace/ctf-writer/trace.h \ @@ -120,20 +121,18 @@ babeltracetraceirincludedir = "$(includedir)/babeltrace/trace-ir" babeltracetraceirinclude_HEADERS = \ babeltrace/trace-ir/clock-class-const.h \ babeltrace/trace-ir/clock-class.h \ - babeltrace/trace-ir/clock-value-const.h \ + babeltrace/trace-ir/clock-snapshot-const.h \ babeltrace/trace-ir/event-class-const.h \ babeltrace/trace-ir/event-class.h \ babeltrace/trace-ir/event-const.h \ - babeltrace/trace-ir/event-header-field.h \ babeltrace/trace-ir/event.h \ - babeltrace/trace-ir/field-classes-const.h \ - babeltrace/trace-ir/field-classes.h \ + babeltrace/trace-ir/field-class-const.h \ + babeltrace/trace-ir/field-class.h \ babeltrace/trace-ir/field-path-const.h \ - babeltrace/trace-ir/fields-const.h \ - babeltrace/trace-ir/fields.h \ + babeltrace/trace-ir/field-const.h \ + babeltrace/trace-ir/field.h \ babeltrace/trace-ir/packet-const.h \ babeltrace/trace-ir/packet-context-field.h \ - babeltrace/trace-ir/packet-header-field.h \ babeltrace/trace-ir/packet.h \ babeltrace/trace-ir/stream-class-const.h \ babeltrace/trace-ir/stream-class.h \ @@ -151,7 +150,7 @@ babeltraceplugininclude_HEADERS = \ babeltrace/plugin/plugin-const.h \ babeltrace/plugin/plugin-set-const.h -# Graph, component, and notification API +# Graph, component, and message API babeltracegraphincludedir = "$(includedir)/babeltrace/graph" babeltracegraphinclude_HEADERS = \ babeltrace/graph/component-class-const.h \ @@ -169,33 +168,47 @@ babeltracegraphinclude_HEADERS = \ babeltrace/graph/connection-const.h \ babeltrace/graph/graph-const.h \ babeltrace/graph/graph.h \ - babeltrace/graph/notification-const.h \ - babeltrace/graph/notification-event-const.h \ - babeltrace/graph/notification-event.h \ - babeltrace/graph/notification-inactivity-const.h \ - babeltrace/graph/notification-inactivity.h \ - babeltrace/graph/notification-packet-const.h \ - babeltrace/graph/notification-packet.h \ - babeltrace/graph/notification-stream-const.h \ - babeltrace/graph/notification-stream.h \ + babeltrace/graph/message-const.h \ + babeltrace/graph/message-discarded-events-const.h \ + babeltrace/graph/message-discarded-events.h \ + babeltrace/graph/message-discarded-packets-const.h \ + babeltrace/graph/message-discarded-packets.h \ + babeltrace/graph/message-event-const.h \ + babeltrace/graph/message-event.h \ + babeltrace/graph/message-message-iterator-inactivity-const.h \ + babeltrace/graph/message-message-iterator-inactivity.h \ + babeltrace/graph/message-iterator-const.h \ + babeltrace/graph/message-packet-beginning-const.h \ + babeltrace/graph/message-packet-beginning.h \ + babeltrace/graph/message-packet-end-const.h \ + babeltrace/graph/message-packet-end.h \ + babeltrace/graph/message-stream-activity-beginning-const.h \ + babeltrace/graph/message-stream-activity-beginning.h \ + babeltrace/graph/message-stream-activity-const.h \ + babeltrace/graph/message-stream-activity-end-const.h \ + babeltrace/graph/message-stream-activity-end.h \ + babeltrace/graph/message-stream-beginning-const.h \ + babeltrace/graph/message-stream-beginning.h \ + babeltrace/graph/message-stream-end-const.h \ + babeltrace/graph/message-stream-end.h \ babeltrace/graph/port-const.h \ babeltrace/graph/port-input-const.h \ babeltrace/graph/port-output-const.h \ - babeltrace/graph/port-output-notification-iterator.h \ + babeltrace/graph/port-output-message-iterator.h \ babeltrace/graph/query-executor-const.h \ babeltrace/graph/query-executor.h \ babeltrace/graph/self-component-class-filter.h \ babeltrace/graph/self-component-class-sink.h \ babeltrace/graph/self-component-class-source.h \ babeltrace/graph/self-component-filter.h \ - babeltrace/graph/self-component-port-input-notification-iterator.h \ + babeltrace/graph/self-component-port-input-message-iterator.h \ babeltrace/graph/self-component-port-input.h \ babeltrace/graph/self-component-port-output.h \ babeltrace/graph/self-component-port.h \ babeltrace/graph/self-component-sink.h \ babeltrace/graph/self-component-source.h \ babeltrace/graph/self-component.h \ - babeltrace/graph/self-notification-iterator.h + babeltrace/graph/self-message-iterator.h noinst_HEADERS = \ babeltrace/compat/stdlib-internal.h \ @@ -212,6 +225,7 @@ noinst_HEADERS = \ babeltrace/compat/mman-internal.h \ babeltrace/compat/socket-internal.h \ babeltrace/common-internal.h \ + babeltrace/ctfser-internal.h \ babeltrace/bitfield-internal.h \ babeltrace/object-internal.h \ babeltrace/object-pool-internal.h \ @@ -219,7 +233,7 @@ noinst_HEADERS = \ babeltrace/plugin/plugin-so-internal.h \ babeltrace/plugin/python-plugin-provider-internal.h \ babeltrace/assert-internal.h \ - babeltrace/values-internal.h \ + babeltrace/value-internal.h \ babeltrace/ctf-writer/attributes-internal.h \ babeltrace/ctf-writer/clock-class-internal.h \ babeltrace/ctf-writer/clock-internal.h \ @@ -231,7 +245,6 @@ noinst_HEADERS = \ babeltrace/ctf-writer/field-wrapper-internal.h \ babeltrace/ctf-writer/functor-internal.h \ babeltrace/ctf-writer/resolve-internal.h \ - babeltrace/ctf-writer/serialize-internal.h \ babeltrace/ctf-writer/stream-class-internal.h \ babeltrace/ctf-writer/stream-internal.h \ babeltrace/ctf-writer/trace-internal.h \ @@ -245,13 +258,13 @@ noinst_HEADERS = \ babeltrace/endian-internal.h \ babeltrace/trace-ir/attributes-internal.h \ babeltrace/trace-ir/clock-class-internal.h \ - babeltrace/trace-ir/clock-value-internal.h \ - babeltrace/trace-ir/clock-value-set-internal.h \ + babeltrace/trace-ir/clock-snapshot-internal.h \ + babeltrace/trace-ir/clock-snapshot-set-internal.h \ babeltrace/trace-ir/event-class-internal.h \ babeltrace/trace-ir/event-internal.h \ - babeltrace/trace-ir/field-classes-internal.h \ + babeltrace/trace-ir/field-class-internal.h \ babeltrace/trace-ir/field-path-internal.h \ - babeltrace/trace-ir/fields-internal.h \ + babeltrace/trace-ir/field-internal.h \ babeltrace/trace-ir/field-wrapper-internal.h \ babeltrace/trace-ir/packet-internal.h \ babeltrace/trace-ir/resolve-field-path-internal.h \ @@ -272,12 +285,13 @@ noinst_HEADERS = \ babeltrace/graph/component-source-internal.h \ babeltrace/graph/connection-internal.h \ babeltrace/graph/graph-internal.h \ - babeltrace/graph/notification-event-internal.h \ - babeltrace/graph/notification-inactivity-internal.h \ - babeltrace/graph/notification-internal.h \ - babeltrace/graph/notification-iterator-internal.h \ - babeltrace/graph/notification-packet-internal.h \ - babeltrace/graph/notification-stream-internal.h \ + babeltrace/graph/message-discarded-items-internal.h \ + babeltrace/graph/message-event-internal.h \ + babeltrace/graph/message-message-iterator-inactivity-internal.h \ + babeltrace/graph/message-internal.h \ + babeltrace/graph/message-iterator-internal.h \ + babeltrace/graph/message-packet-internal.h \ + babeltrace/graph/message-stream-internal.h \ babeltrace/graph/port-internal.h \ babeltrace/graph/query-executor-internal.h \ babeltrace/list-internal.h \