X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=72a714639917b72780ee75115de709bb1ad39237;hb=HEAD;hp=4cdbdd1b915afcb328058888749cd03175ee57a1;hpb=7cf8258bc7c82e1ef4745549d5a729c88f931b62;p=babeltrace.git diff --git a/src/Makefile.am b/src/Makefile.am index 4cdbdd1b..84826c2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ DISTCLEANFILES = common/version.i noinst_LTLIBRARIES = \ argpar/libargpar.la \ autodisc/libautodisc.la \ + clock-correlation-validator/libclock-correlation-validator.la \ common/libcommon.la \ compat/libcompat.la \ cpp-common/libcpp-common.la \ @@ -74,6 +75,11 @@ autodisc_libautodisc_la_SOURCES = \ autodisc/autodisc.c \ autodisc/autodisc.h +clock_correlation_validator_libclock_correlation_validator_la_SOURCES = \ + clock-correlation-validator/clock-correlation-validator.cpp \ + clock-correlation-validator/clock-correlation-validator.h \ + clock-correlation-validator/clock-correlation-validator.hpp + common_libcommon_la_SOURCES = \ common/align.h \ common/assert.c \ @@ -103,7 +109,7 @@ compat_libcompat_la_SOURCES = \ compat/memstream.h \ compat/mman.c \ compat/mman.h \ - compat/socket.h \ + compat/socket.hpp \ compat/stdio.h \ compat/stdlib.h \ compat/string.h \ @@ -117,13 +123,19 @@ cpp_common_libcpp_common_la_SOURCES = \ cpp-common/bt2/borrowed-object.hpp \ cpp-common/bt2/clock-class.hpp \ cpp-common/bt2/clock-snapshot.hpp \ + cpp-common/bt2/component-class-dev.hpp \ + cpp-common/bt2/component-class.hpp \ cpp-common/bt2/component-port.hpp \ + cpp-common/bt2/graph.hpp \ + cpp-common/bt2/error.hpp \ cpp-common/bt2/exc.hpp \ cpp-common/bt2/field-class.hpp \ cpp-common/bt2/field-path.hpp \ cpp-common/bt2/field.hpp \ + cpp-common/bt2/field-location.hpp \ cpp-common/bt2/integer-range-set.hpp \ cpp-common/bt2/integer-range.hpp \ + cpp-common/bt2/internal/comp-cls-bridge.hpp \ cpp-common/bt2/internal/utils.hpp \ cpp-common/bt2/logging.hpp \ cpp-common/bt2/message-array.hpp \ @@ -131,8 +143,11 @@ cpp_common_libcpp_common_la_SOURCES = \ cpp-common/bt2/message.hpp \ cpp-common/bt2/optional-borrowed-object.hpp \ cpp-common/bt2/plugin-dev.hpp \ + cpp-common/bt2/plugin-load.hpp \ + cpp-common/bt2/plugin-set.hpp \ cpp-common/bt2/plugin.hpp \ cpp-common/bt2/private-query-executor.hpp \ + cpp-common/bt2/query-executor.hpp \ cpp-common/bt2/raw-value-proxy.hpp \ cpp-common/bt2/self-component-class.hpp \ cpp-common/bt2/self-component-port.hpp \ @@ -143,22 +158,49 @@ cpp_common_libcpp_common_la_SOURCES = \ cpp-common/bt2/type-traits.hpp \ cpp-common/bt2/value.hpp \ cpp-common/bt2/wrap.hpp \ + cpp-common/bt2c/aliases.hpp \ cpp-common/bt2c/align.hpp \ + cpp-common/bt2c/bt2-value-from-json-val.cpp \ + cpp-common/bt2c/bt2-value-from-json-val.hpp \ cpp-common/bt2c/c-string-view.hpp \ cpp-common/bt2c/call.hpp \ - cpp-common/bt2c/dummy.cpp \ + cpp-common/bt2c/contains.hpp \ + cpp-common/bt2c/data-len.hpp \ cpp-common/bt2c/endian.hpp \ cpp-common/bt2c/exc.hpp \ + cpp-common/bt2c/file-utils.cpp \ + cpp-common/bt2c/file-utils.hpp \ cpp-common/bt2c/fmt.hpp \ cpp-common/bt2c/glib-up.hpp \ + cpp-common/bt2c/join.hpp \ + cpp-common/bt2c/json-val.cpp \ + cpp-common/bt2c/json-val.hpp \ + cpp-common/bt2c/json-val-req.cpp \ + cpp-common/bt2c/json-val-req.hpp \ cpp-common/bt2c/libc-up.hpp \ cpp-common/bt2c/logging.hpp \ + cpp-common/bt2c/make-span.hpp \ + cpp-common/bt2c/observable.hpp \ + cpp-common/bt2c/parse-json.hpp \ + cpp-common/bt2c/parse-json-as-val.cpp \ + cpp-common/bt2c/parse-json-as-val.hpp \ cpp-common/bt2c/prio-heap.hpp \ cpp-common/bt2c/read-fixed-len-int.hpp \ + cpp-common/bt2c/regex.hpp \ + cpp-common/bt2c/reverse-fixed-len-int-bits.hpp \ cpp-common/bt2c/safe-ops.hpp \ cpp-common/bt2c/std-int.hpp \ + cpp-common/bt2c/str-scanner.cpp \ + cpp-common/bt2c/str-scanner.hpp \ + cpp-common/bt2c/text-loc.cpp \ + cpp-common/bt2c/text-loc.hpp \ + cpp-common/bt2c/text-loc-str.cpp \ + cpp-common/bt2c/text-loc-str.hpp \ cpp-common/bt2c/type-traits.hpp \ + cpp-common/bt2c/unicode-conv.cpp \ + cpp-common/bt2c/unicode-conv.hpp \ cpp-common/bt2c/uuid.hpp \ + cpp-common/bt2c/val-req.hpp \ cpp-common/bt2c/vector.hpp \ cpp-common/bt2s/make-unique.hpp \ cpp-common/bt2s/optional.hpp \ @@ -167,7 +209,12 @@ cpp_common_libcpp_common_la_SOURCES = \ cpp-common/vendor/nlohmann/json.hpp \ cpp-common/vendor/optional-lite/optional.hpp \ cpp-common/vendor/span-lite/span.hpp \ - cpp-common/vendor/string_view-standalone/string_view.hpp + cpp-common/vendor/string-view-lite/string_view.hpp \ + cpp-common/vendor/wise-enum/optional.h \ + cpp-common/vendor/wise-enum/optional_common.h \ + cpp-common/vendor/wise-enum/wise_enum.h \ + cpp-common/vendor/wise-enum/wise_enum_detail.h \ + cpp-common/vendor/wise-enum/wise_enum_generated.h cpp_common_vendor_fmt_libfmt_la_SOURCES = \ cpp-common/vendor/fmt/args.h \ @@ -186,6 +233,9 @@ cpp_common_vendor_fmt_libfmt_la_SOURCES = \ cpp-common/vendor/fmt/std.h \ cpp-common/vendor/fmt/xchar.h +cpp_common_vendor_fmt_libfmt_la_CXXFLAGS = \ + $(AM_CXXFLAGS) -Wno-missing-noreturn + ctfser_libctfser_la_SOURCES = \ ctfser/ctfser.c \ ctfser/ctfser.h @@ -227,14 +277,14 @@ AM_YFLAGS = \ -t -d -v -Wno-yacc plugins_ctf_common_metadata_libctf_parser_la_SOURCES = \ - plugins/ctf/common/metadata/lexer.lpp \ - plugins/ctf/common/metadata/parser.ypp \ - plugins/ctf/common/metadata/objstack.cpp + plugins/ctf/common/src/metadata/tsdl/lexer.lpp \ + plugins/ctf/common/src/metadata/tsdl/parser.ypp \ + plugins/ctf/common/src/metadata/tsdl/objstack.cpp # scanner-symbols.h is included to prefix generated yy_* symbols with bt_. plugins_ctf_common_metadata_libctf_parser_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -include $(srcdir)/plugins/ctf/common/metadata/scanner-symbols.hpp + -include $(srcdir)/plugins/ctf/common/src/metadata/tsdl/scanner-symbols.hpp # This library contains (mostly) generated code, silence some warnings that it # produces. @@ -246,52 +296,43 @@ plugins_ctf_common_metadata_libctf_parser_la_CXXFLAGS = \ -Wno-unused-parameter plugins_ctf_common_metadata_libctf_ast_la_SOURCES = \ - plugins/ctf/common/metadata/visitor-generate-ir.cpp \ - plugins/ctf/common/metadata/visitor-semantic-validator.cpp \ - plugins/ctf/common/metadata/visitor-parent-links.cpp \ - plugins/ctf/common/metadata/ast.hpp \ - plugins/ctf/common/metadata/objstack.hpp \ - plugins/ctf/common/metadata/parser.hpp \ - plugins/ctf/common/metadata/parser-wrap.hpp \ - plugins/ctf/common/metadata/scanner.hpp \ - plugins/ctf/common/metadata/scanner-symbols.hpp \ - plugins/ctf/common/metadata/decoder.cpp \ - plugins/ctf/common/metadata/decoder.hpp \ - plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp \ - plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.hpp \ - plugins/ctf/common/metadata/logging.cpp \ - plugins/ctf/common/metadata/logging.hpp \ - plugins/ctf/common/metadata/ctf-meta.hpp \ - plugins/ctf/common/metadata/ctf-meta-visitors.hpp \ - plugins/ctf/common/metadata/ctf-meta-validate.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp \ - plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp \ - plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp \ - plugins/ctf/common/metadata/ctf-meta-translate.cpp \ - plugins/ctf/common/metadata/ctf-meta-resolve.cpp \ - plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp \ - plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp + plugins/ctf/common/src/metadata/tsdl/visitor-generate-ir.cpp \ + plugins/ctf/common/src/metadata/tsdl/visitor-semantic-validator.cpp \ + plugins/ctf/common/src/metadata/tsdl/visitor-parent-links.cpp \ + plugins/ctf/common/src/metadata/tsdl/ast.hpp \ + plugins/ctf/common/src/metadata/tsdl/objstack.hpp \ + plugins/ctf/common/src/metadata/tsdl/parser.hpp \ + plugins/ctf/common/src/metadata/tsdl/parser-wrap.hpp \ + plugins/ctf/common/src/metadata/tsdl/scanner.hpp \ + plugins/ctf/common/src/metadata/tsdl/scanner-symbols.hpp \ + plugins/ctf/common/src/metadata/tsdl/logging.hpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta.hpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-visitors.hpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-validate.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-update-meanings.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-update-default-clock-classes.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-update-text-array-sequence.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-update-alignments.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-warn-meaningless-header-fields.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-resolve.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp if BABELTRACE_BUILD_WITH_MINGW plugins_ctf_common_metadata_libctf_ast_la_LIBADD = -lintl -liconv -lole32 endif BUILT_SOURCES += \ - plugins/ctf/common/metadata/parser.hpp + plugins/ctf/common/src/metadata/tsdl/parser.hpp ALL_LOCAL = if HAVE_BISON # We have bison: we can clean the generated parser files CLEANFILES += \ - plugins/ctf/common/metadata/parser.cpp \ - plugins/ctf/common/metadata/parser.hpp \ - plugins/ctf/common/metadata/parser.output + plugins/ctf/common/src/metadata/tsdl/parser.cpp \ + plugins/ctf/common/src/metadata/tsdl/parser.hpp \ + plugins/ctf/common/src/metadata/tsdl/parser.output else # HAVE_BISON # Create target used to stop the build if we want to build the parser, # but we don't have the necessary tool to do so @@ -431,6 +472,8 @@ lib_libbabeltrace2_la_SOURCES = \ lib/trace-ir/field-class.c \ lib/trace-ir/field-class.h \ lib/trace-ir/field.h \ + lib/trace-ir/field-location.c \ + lib/trace-ir/field-location.h \ lib/trace-ir/field-path.c \ lib/trace-ir/field-path.h \ lib/trace-ir/field-wrapper.c \ @@ -439,6 +482,7 @@ lib_libbabeltrace2_la_SOURCES = \ lib/trace-ir/packet.h \ lib/trace-ir/resolve-field-path.c \ lib/trace-ir/resolve-field-path.h \ + lib/trace-ir/resolve-field-xref.h \ lib/trace-ir/stream.c \ lib/trace-ir/stream-class.c \ lib/trace-ir/stream-class.h \ @@ -482,7 +526,10 @@ lib_libbabeltrace2_la_CPPFLAGS = \ lib_libbabeltrace2_la_LIBADD = \ logging/liblogging.la \ common/libcommon.la \ - compat/libcompat.la + compat/libcompat.la \ + clock-correlation-validator/libclock-correlation-validator.la + +nodist_EXTRA_lib_libbabeltrace2_la_SOURCES = dummy.cpp ctf_writer_libbabeltrace2_ctf_writer_la_SOURCES = \ ctf-writer/assert-pre.h \ @@ -623,16 +670,64 @@ plugins_utils_babeltrace_plugin_utils_la_LIBADD += \ common/libcommon.la \ cpp-common/vendor/fmt/libfmt.la \ logging/liblogging.la \ - plugins/common/param-validation/libparam-validation.la + plugins/common/param-validation/libparam-validation.la \ + clock-correlation-validator/libclock-correlation-validator.la endif # ctf plugin plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \ - plugins/ctf/common/bfcr/bfcr.cpp \ - plugins/ctf/common/bfcr/bfcr.hpp \ - plugins/ctf/common/msg-iter/msg-iter.cpp \ - plugins/ctf/common/msg-iter/msg-iter.hpp \ - plugins/ctf/common/print.hpp \ + plugins/ctf/common/metadata/ctf-ir.hpp \ + plugins/ctf/common/metadata/ctf-ir.cpp \ + plugins/ctf/common/metadata/int-range.hpp \ + plugins/ctf/common/metadata/int-range-set.hpp \ + plugins/ctf/common/src/clk-cls-cfg.hpp \ + plugins/ctf/common/src/item-seq/item.cpp \ + plugins/ctf/common/src/item-seq/item.hpp \ + plugins/ctf/common/src/item-seq/item-seq-iter.cpp \ + plugins/ctf/common/src/item-seq/item-seq-iter.hpp \ + plugins/ctf/common/src/item-seq/item-visitor.cpp \ + plugins/ctf/common/src/item-seq/item-visitor.hpp \ + plugins/ctf/common/src/item-seq/logging-item-visitor.cpp \ + plugins/ctf/common/src/item-seq/logging-item-visitor.hpp \ + plugins/ctf/common/src/item-seq/medium.cpp \ + plugins/ctf/common/src/item-seq/medium.hpp \ + plugins/ctf/common/src/metadata/ctf-ir.cpp \ + plugins/ctf/common/src/metadata/ctf-ir.hpp \ + plugins/ctf/common/src/metadata/json/ctf-2-fc-builder.cpp \ + plugins/ctf/common/src/metadata/json/ctf-2-fc-builder.hpp \ + plugins/ctf/common/src/metadata/json/ctf-2-metadata-stream-parser.cpp \ + plugins/ctf/common/src/metadata/json/ctf-2-metadata-stream-parser.hpp \ + plugins/ctf/common/src/metadata/json/fcs-with-role.cpp \ + plugins/ctf/common/src/metadata/json/fcs-with-role.hpp \ + plugins/ctf/common/src/metadata/json/key-fc-types.cpp \ + plugins/ctf/common/src/metadata/json/key-fc-types.hpp \ + plugins/ctf/common/src/metadata/json/normalize-field-locs.cpp \ + plugins/ctf/common/src/metadata/json/normalize-field-locs.hpp \ + plugins/ctf/common/src/metadata/json/resolve-fcs-with-int-sel.cpp \ + plugins/ctf/common/src/metadata/json/resolve-fcs-with-int-sel.hpp \ + plugins/ctf/common/src/metadata/json/strings.cpp \ + plugins/ctf/common/src/metadata/json/strings.hpp \ + plugins/ctf/common/src/metadata/json/utils.cpp \ + plugins/ctf/common/src/metadata/json/utils.hpp \ + plugins/ctf/common/src/metadata/json/val-req.cpp \ + plugins/ctf/common/src/metadata/json/val-req.hpp \ + plugins/ctf/common/src/metadata/json/validate-scope-fc-roles.cpp \ + plugins/ctf/common/src/metadata/json/validate-scope-fc-roles.hpp \ + plugins/ctf/common/src/metadata/metadata-stream-parser.cpp \ + plugins/ctf/common/src/metadata/metadata-stream-parser.hpp \ + plugins/ctf/common/src/metadata/metadata-stream-parser-utils.cpp \ + plugins/ctf/common/src/metadata/metadata-stream-parser-utils.hpp \ + plugins/ctf/common/src/metadata/normalize-clk-offset.cpp \ + plugins/ctf/common/src/metadata/normalize-clk-offset.hpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-1-metadata-stream-parser.cpp \ + plugins/ctf/common/src/metadata/tsdl/ctf-1-metadata-stream-parser.hpp \ + plugins/ctf/common/src/metadata/tsdl/metadata-stream-decoder.cpp \ + plugins/ctf/common/src/metadata/tsdl/metadata-stream-decoder.hpp \ + plugins/ctf/common/src/msg-iter.cpp \ + plugins/ctf/common/src/msg-iter.hpp \ + plugins/ctf/common/src/null-cp-finder.hpp \ + plugins/ctf/common/src/pkt-props.cpp \ + plugins/ctf/common/src/pkt-props.hpp \ plugins/ctf/fs-sink/fs-sink.cpp \ plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp \ plugins/ctf/fs-sink/fs-sink.hpp \ @@ -651,7 +746,6 @@ plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \ plugins/ctf/fs-src/fs.cpp \ plugins/ctf/fs-src/fs.hpp \ plugins/ctf/fs-src/lttng-index.hpp \ - plugins/ctf/fs-src/metadata.cpp \ plugins/ctf/fs-src/metadata.hpp \ plugins/ctf/fs-src/query.cpp \ plugins/ctf/fs-src/query.hpp \ @@ -674,7 +768,8 @@ plugins_ctf_babeltrace_plugin_ctf_la_LDFLAGS = \ plugins_ctf_babeltrace_plugin_ctf_la_LIBADD = \ plugins/ctf/common/metadata/libctf-parser.la \ plugins/ctf/common/metadata/libctf-ast.la \ - plugins/common/param-validation/libparam-validation.la + plugins/common/param-validation/libparam-validation.la \ + cpp-common/libcpp-common.la if BABELTRACE_BUILD_WITH_MINGW plugins_ctf_babeltrace_plugin_ctf_la_LIBADD += -lws2_32 @@ -686,7 +781,8 @@ plugins_ctf_babeltrace_plugin_ctf_la_LIBADD += \ logging/liblogging.la \ plugins/common/muxing/libmuxing.la \ common/libcommon.la \ - ctfser/libctfser.la + ctfser/libctfser.la \ + cpp-common/vendor/fmt/libfmt.la endif # text plugin @@ -749,4 +845,5 @@ endif # ENABLE_DEBUG_INFO EXTRA_DIST = \ cpp-common/vendor/optional-lite/optional.hpp.license \ - cpp-common/vendor/span-lite/span.hpp.license + cpp-common/vendor/span-lite/span.hpp.license \ + cpp-common/vendor/string-view-lite/string_view.hpp.license