X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=72a714639917b72780ee75115de709bb1ad39237;hb=HEAD;hp=b8eebe9fc9f4b9d35e8409feea5f47ba25e1f26c;hpb=5656cea5531432357cf7ca2a0be14adae5a1e3d3;p=babeltrace.git diff --git a/src/Makefile.am b/src/Makefile.am index b8eebe9f..84826c2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,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 \ @@ -132,6 +132,7 @@ cpp_common_libcpp_common_la_SOURCES = \ 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 \ @@ -157,24 +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/contains.hpp \ - cpp-common/bt2c/dummy.cpp \ + 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/span.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 \ @@ -183,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-lite/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 \ @@ -202,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 @@ -271,24 +305,15 @@ plugins_ctf_common_metadata_libctf_ast_la_SOURCES = \ 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/decoder.cpp \ - plugins/ctf/common/src/metadata/tsdl/decoder.hpp \ - plugins/ctf/common/src/metadata/tsdl/decoder-packetized-file-stream-to-buf.cpp \ - plugins/ctf/common/src/metadata/tsdl/decoder-packetized-file-stream-to-buf.hpp \ - plugins/ctf/common/src/metadata/tsdl/logging.cpp \ 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-in-ir.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-update-value-storing-indexes.cpp \ - plugins/ctf/common/src/metadata/tsdl/ctf-meta-update-stream-class-config.cpp \ plugins/ctf/common/src/metadata/tsdl/ctf-meta-warn-meaningless-header-fields.cpp \ - plugins/ctf/common/src/metadata/tsdl/ctf-meta-translate.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 @@ -447,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 \ @@ -455,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 \ @@ -648,10 +676,58 @@ endif # ctf plugin plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \ - plugins/ctf/common/src/bfcr/bfcr.cpp \ - plugins/ctf/common/src/bfcr/bfcr.hpp \ - plugins/ctf/common/src/msg-iter/msg-iter.cpp \ - plugins/ctf/common/src/msg-iter/msg-iter.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 \ @@ -670,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 \ @@ -693,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 @@ -705,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