X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=2d8cb55499507b1e8d0426f1ae53f3674211b5f8;hb=7e69c04f557e46fb50e5a888a3bc3451afbd3b8e;hp=a310b37ba30f2b2ea2cec561f500aa820f2ff255;hpb=464ebc311d460b29f681703aea0aa00eef9e6475;p=babeltrace.git diff --git a/include/Makefile.am b/include/Makefile.am index a310b37b..2d8cb554 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -73,9 +73,11 @@ babeltraceincludedir = "$(includedir)/babeltrace" babeltraceinclude_HEADERS = \ babeltrace/babeltrace.h \ babeltrace/logging.h \ - babeltrace/ref.h \ + babeltrace/property.h \ babeltrace/types.h \ - babeltrace/values.h \ + babeltrace/util.h \ + babeltrace/value-const.h \ + babeltrace/value.h \ babeltrace/version.h # Legacy API (for CTF writer) @@ -86,117 +88,200 @@ babeltracectfinclude_HEADERS = \ # CTF writer API babeltracectfwriterincludedir = "$(includedir)/babeltrace/ctf-writer" babeltracectfwriterinclude_HEADERS = \ + babeltrace/ctf-writer/clock-class.h \ babeltrace/ctf-writer/clock.h \ babeltrace/ctf-writer/event-fields.h \ babeltrace/ctf-writer/event-types.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 \ + babeltrace/ctf-writer/utils.h \ + babeltrace/ctf-writer/visitor.h \ babeltrace/ctf-writer/writer.h -# CTF IR API +# Legacy API (for CTF writer) babeltracectfirincludedir = "$(includedir)/babeltrace/ctf-ir" babeltracectfirinclude_HEADERS = \ - babeltrace/ctf-ir/clock-class.h \ - babeltrace/ctf-ir/clock-value.h \ babeltrace/ctf-ir/clock.h \ - babeltrace/ctf-ir/event-class.h \ + babeltrace/ctf-ir/event-fields.h \ + babeltrace/ctf-ir/event-types.h \ babeltrace/ctf-ir/event.h \ - babeltrace/ctf-ir/field-path.h \ babeltrace/ctf-ir/field-types.h \ babeltrace/ctf-ir/fields.h \ - babeltrace/ctf-ir/packet.h \ babeltrace/ctf-ir/stream-class.h \ babeltrace/ctf-ir/stream.h \ babeltrace/ctf-ir/trace.h \ - babeltrace/ctf-ir/utils.h \ - babeltrace/ctf-ir/visitor.h + babeltrace/ctf-ir/utils.h + +# Trace IR API +babeltracetraceirincludedir = "$(includedir)/babeltrace/trace-ir" +babeltracetraceirinclude_HEADERS = \ + babeltrace/trace-ir/clock-class-const.h \ + babeltrace/trace-ir/clock-class.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.h \ + babeltrace/trace-ir/field-class-const.h \ + babeltrace/trace-ir/field-class.h \ + babeltrace/trace-ir/field-path-const.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.h \ + babeltrace/trace-ir/stream-class-const.h \ + babeltrace/trace-ir/stream-class.h \ + babeltrace/trace-ir/stream-const.h \ + babeltrace/trace-ir/stream.h \ + babeltrace/trace-ir/trace-class-const.h \ + babeltrace/trace-ir/trace-class.h \ + babeltrace/trace-ir/trace-const.h \ + babeltrace/trace-ir/trace.h # Plugin and plugin development API babeltracepluginincludedir = "$(includedir)/babeltrace/plugin" babeltraceplugininclude_HEADERS = \ babeltrace/plugin/plugin-dev.h \ - babeltrace/plugin/plugin.h + 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/clock-class-priority-map.h \ + babeltrace/graph/component-class-const.h \ + babeltrace/graph/component-class-filter-const.h \ babeltrace/graph/component-class-filter.h \ + babeltrace/graph/component-class-sink-const.h \ babeltrace/graph/component-class-sink.h \ + babeltrace/graph/component-class-source-const.h \ babeltrace/graph/component-class-source.h \ babeltrace/graph/component-class.h \ - babeltrace/graph/component-filter.h \ - babeltrace/graph/component-sink.h \ - babeltrace/graph/component-source.h \ - babeltrace/graph/component-status.h \ - babeltrace/graph/component.h \ - babeltrace/graph/connection.h \ + babeltrace/graph/component-const.h \ + babeltrace/graph/component-filter-const.h \ + babeltrace/graph/component-sink-const.h \ + babeltrace/graph/component-source-const.h \ + babeltrace/graph/connection-const.h \ + babeltrace/graph/graph-const.h \ babeltrace/graph/graph.h \ - babeltrace/graph/notification-discarded-events.h \ - babeltrace/graph/notification-discarded-packets.h \ - babeltrace/graph/notification-event.h \ - babeltrace/graph/notification-heap.h \ - babeltrace/graph/notification-inactivity.h \ - babeltrace/graph/notification-iterator.h \ - babeltrace/graph/notification-packet.h \ - babeltrace/graph/notification-stream.h \ - babeltrace/graph/notification.h \ - babeltrace/graph/output-port-notification-iterator.h \ - babeltrace/graph/port.h \ - babeltrace/graph/private-component-filter.h \ - babeltrace/graph/private-component-sink.h \ - babeltrace/graph/private-component-source.h \ - babeltrace/graph/private-component.h \ - babeltrace/graph/private-connection-notification-iterator.h \ - babeltrace/graph/private-connection-private-notification-iterator.h \ - babeltrace/graph/private-connection.h \ - babeltrace/graph/private-port.h \ - babeltrace/graph/query-executor.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-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-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-message-iterator.h noinst_HEADERS = \ - babeltrace/align-internal.h \ - babeltrace/assert-internal.h \ - babeltrace/assert-pre-internal.h \ - babeltrace/babeltrace-internal.h \ - babeltrace/bitfield-internal.h \ - babeltrace/common-internal.h \ + babeltrace/compat/stdlib-internal.h \ babeltrace/compat/fcntl-internal.h \ babeltrace/compat/glib-internal.h \ - babeltrace/compat/limits-internal.h \ - babeltrace/compat/memstream-internal.h \ - babeltrace/compat/mman-internal.h \ - babeltrace/compat/socket-internal.h \ + babeltrace/compat/uuid-internal.h \ + babeltrace/compat/unistd-internal.h \ babeltrace/compat/stdio-internal.h \ - babeltrace/compat/stdlib-internal.h \ - babeltrace/compat/string-internal.h \ babeltrace/compat/time-internal.h \ - babeltrace/compat/unistd-internal.h \ babeltrace/compat/utc-internal.h \ - babeltrace/compat/uuid-internal.h \ - babeltrace/compiler-internal.h \ - babeltrace/ctf-ir/attributes-internal.h \ - babeltrace/ctf-ir/clock-class-internal.h \ - babeltrace/ctf-ir/clock-value-internal.h \ - babeltrace/ctf-ir/event-class-internal.h \ - babeltrace/ctf-ir/event-internal.h \ - babeltrace/ctf-ir/field-path-internal.h \ - babeltrace/ctf-ir/field-types-internal.h \ - babeltrace/ctf-ir/fields-internal.h \ - babeltrace/ctf-ir/packet-internal.h \ - babeltrace/ctf-ir/resolve-internal.h \ - babeltrace/ctf-ir/stream-class-internal.h \ - babeltrace/ctf-ir/stream-internal.h \ - babeltrace/ctf-ir/trace-internal.h \ - babeltrace/ctf-ir/validation-internal.h \ - babeltrace/ctf-ir/visitor-internal.h \ - babeltrace/ctf-ir/utils-internal.h \ + babeltrace/compat/memstream-internal.h \ + babeltrace/compat/string-internal.h \ + babeltrace/compat/limits-internal.h \ + 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 \ + babeltrace/plugin/plugin-internal.h \ + babeltrace/plugin/plugin-so-internal.h \ + babeltrace/plugin/python-plugin-provider-internal.h \ + babeltrace/assert-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 \ + babeltrace/ctf-writer/event-class-internal.h \ + babeltrace/ctf-writer/event-internal.h \ + babeltrace/ctf-writer/field-path-internal.h \ + babeltrace/ctf-writer/fields-internal.h \ + babeltrace/ctf-writer/field-types-internal.h \ + babeltrace/ctf-writer/field-wrapper-internal.h \ babeltrace/ctf-writer/functor-internal.h \ - babeltrace/ctf-writer/serialize-internal.h \ + babeltrace/ctf-writer/object-internal.h \ + babeltrace/ctf-writer/object-pool-internal.h \ + babeltrace/ctf-writer/resolve-internal.h \ + babeltrace/ctf-writer/stream-class-internal.h \ + babeltrace/ctf-writer/stream-internal.h \ + babeltrace/ctf-writer/trace-internal.h \ + babeltrace/ctf-writer/utils-internal.h \ + babeltrace/ctf-writer/validation-internal.h \ + babeltrace/ctf-writer/values-internal.h \ + babeltrace/ctf-writer/visitor-internal.h \ babeltrace/ctf-writer/writer-internal.h \ + babeltrace/mmap-align-internal.h \ + babeltrace/align-internal.h \ + babeltrace/logging-internal.h \ babeltrace/endian-internal.h \ - babeltrace/graph/clock-class-priority-map-internal.h \ + babeltrace/trace-ir/attributes-internal.h \ + babeltrace/trace-ir/clock-class-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-class-internal.h \ + babeltrace/trace-ir/field-path-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 \ + babeltrace/trace-ir/stream-class-internal.h \ + babeltrace/trace-ir/stream-internal.h \ + babeltrace/trace-ir/trace-class-internal.h \ + babeltrace/trace-ir/trace-internal.h \ + babeltrace/trace-ir/utils-internal.h \ + babeltrace/prio-heap-internal.h \ + babeltrace/lib-logging-internal.h \ + babeltrace/compiler-internal.h \ + babeltrace/babeltrace-internal.h \ + babeltrace/assert-pre-internal.h \ babeltrace/graph/component-class-internal.h \ babeltrace/graph/component-class-sink-colander-internal.h \ babeltrace/graph/component-filter-internal.h \ @@ -205,25 +290,18 @@ noinst_HEADERS = \ babeltrace/graph/component-source-internal.h \ babeltrace/graph/connection-internal.h \ babeltrace/graph/graph-internal.h \ - babeltrace/graph/notification-discarded-elements-internal.h \ - babeltrace/graph/notification-event-internal.h \ - babeltrace/graph/notification-heap-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-activity-internal.h \ + babeltrace/graph/message-stream-internal.h \ babeltrace/graph/port-internal.h \ babeltrace/graph/query-executor-internal.h \ - babeltrace/lib-logging-internal.h \ babeltrace/list-internal.h \ - babeltrace/logging-internal.h \ - babeltrace/mmap-align-internal.h \ - babeltrace/object-internal.h \ - babeltrace/plugin/plugin-internal.h \ - babeltrace/plugin/plugin-so-internal.h \ - babeltrace/prio-heap-internal.h \ - babeltrace/ref-internal.h \ - babeltrace/values-internal.h \ + babeltrace/fd-cache-internal.h \ + babeltrace/property-internal.h \ version.h \ version.i