X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=72a714639917b72780ee75115de709bb1ad39237;hb=HEAD;hp=b572c728ffdc45c74dbf9b6db08398b00ddd51d4;hpb=d9a27df87dad3d1d7727709b7515904b8860514b;p=babeltrace.git diff --git a/src/Makefile.am b/src/Makefile.am index b572c728..72a71463 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,52 +11,6 @@ if ENABLE_PYTHON_BINDINGS SUBDIRS += bindings/python/bt2 endif -noinst_HEADERS = \ - cpp-common/bt2/borrowed-object-iterator.hpp \ - cpp-common/bt2/borrowed-object-proxy.hpp \ - cpp-common/bt2/borrowed-object.hpp \ - cpp-common/bt2/clock-class.hpp \ - cpp-common/bt2/clock-snapshot.hpp \ - cpp-common/bt2/component-port.hpp \ - cpp-common/bt2/exc.hpp \ - cpp-common/bt2/field-class.hpp \ - cpp-common/bt2/field.hpp \ - cpp-common/bt2/field-path.hpp \ - cpp-common/bt2/integer-range.hpp \ - cpp-common/bt2/integer-range-set.hpp \ - cpp-common/bt2/internal/utils.hpp \ - cpp-common/bt2/logging.hpp \ - cpp-common/bt2/message-array.hpp \ - cpp-common/bt2/message-iterator.hpp \ - cpp-common/bt2/message.hpp \ - cpp-common/bt2/shared-object.hpp \ - cpp-common/bt2/raw-value-proxy.hpp \ - cpp-common/bt2/trace-ir.hpp \ - cpp-common/bt2/type-traits.hpp \ - cpp-common/bt2/value.hpp \ - cpp-common/align.hpp \ - cpp-common/cfg-error-reporting.hpp \ - cpp-common/cfg-error-reporting-throw.hpp \ - cpp-common/cfg-logging-error-reporting.hpp \ - cpp-common/cfg-logging-error-reporting-throw.hpp \ - cpp-common/cfg-logging.hpp \ - cpp-common/endian.hpp \ - cpp-common/exc.hpp \ - cpp-common/glib-up.hpp \ - cpp-common/libc-up.hpp \ - cpp-common/lib-str.hpp \ - cpp-common/log-cfg.hpp \ - cpp-common/make-unique.hpp \ - cpp-common/nlohmann/json.hpp \ - cpp-common/optional.hpp \ - cpp-common/read-fixed-len-int.hpp \ - cpp-common/safe-ops.hpp \ - cpp-common/std-int.hpp \ - cpp-common/string_view.hpp \ - cpp-common/uuid.hpp \ - cpp-common/uuid-view.hpp \ - cpp-common/vector.hpp - ## This target generates an include file that contains the git version ## string of the current branch, it must be continuously updated when ## we build in the git repo and shipped in dist tarballs to reflect the @@ -97,8 +51,11 @@ 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 \ + cpp-common/vendor/fmt/libfmt.la \ ctfser/libctfser.la \ fd-cache/libfd-cache.la \ logging/liblogging.la \ @@ -118,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 \ @@ -147,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 \ @@ -155,6 +117,101 @@ compat_libcompat_la_SOURCES = \ compat/unistd.h \ compat/utc.h +cpp_common_libcpp_common_la_SOURCES = \ + cpp-common/bt2/borrowed-object-iterator.hpp \ + cpp-common/bt2/borrowed-object-proxy.hpp \ + 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/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 \ + cpp-common/bt2/message-iterator.hpp \ + 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 \ + cpp-common/bt2/self-message-iterator-configuration.hpp \ + cpp-common/bt2/self-message-iterator.hpp \ + cpp-common/bt2/shared-object.hpp \ + cpp-common/bt2/trace-ir.hpp \ + cpp-common/bt2/type-traits.hpp \ + cpp-common/bt2/value.hpp \ + cpp-common/bt2/wrap.hpp \ + cpp-common/bt2c/align.hpp \ + cpp-common/bt2c/c-string-view.hpp \ + cpp-common/bt2c/call.hpp \ + 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/libc-up.hpp \ + cpp-common/bt2c/logging.hpp \ + cpp-common/bt2c/make-span.hpp \ + cpp-common/bt2c/prio-heap.hpp \ + cpp-common/bt2c/read-fixed-len-int.hpp \ + cpp-common/bt2c/safe-ops.hpp \ + cpp-common/bt2c/std-int.hpp \ + cpp-common/bt2c/type-traits.hpp \ + cpp-common/bt2c/uuid.hpp \ + cpp-common/bt2c/vector.hpp \ + cpp-common/bt2s/make-unique.hpp \ + cpp-common/bt2s/optional.hpp \ + cpp-common/bt2s/span.hpp \ + cpp-common/bt2s/string-view.hpp \ + 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/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 \ + cpp-common/vendor/fmt/chrono.h \ + cpp-common/vendor/fmt/color.h \ + cpp-common/vendor/fmt/compile.h \ + cpp-common/vendor/fmt/core.h \ + cpp-common/vendor/fmt/format-inl.h \ + cpp-common/vendor/fmt/format.cc \ + cpp-common/vendor/fmt/format.h \ + cpp-common/vendor/fmt/os.cc \ + cpp-common/vendor/fmt/os.h \ + cpp-common/vendor/fmt/ostream.h \ + cpp-common/vendor/fmt/printf.h \ + cpp-common/vendor/fmt/ranges.h \ + 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 @@ -165,7 +222,8 @@ fd_cache_libfd_cache_la_SOURCES = \ logging_liblogging_la_SOURCES = \ logging/comp-logging.h \ - logging/log.c \ + logging/log-api.c \ + logging/log-api.h \ logging/log.h param_parse_libparam_parse_la_SOURCES = \ @@ -195,14 +253,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. @@ -214,52 +272,51 @@ 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/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.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 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 @@ -346,7 +403,6 @@ lib_libbabeltrace2_la_SOURCES = \ lib/graph/message/event.h \ lib/graph/message-iterator-class.c \ lib/graph/message-iterator-class.h \ - lib/graph/message/iterator.h \ lib/graph/message/message.c \ lib/graph/message/message.h \ lib/graph/message/message-iterator-inactivity.c \ @@ -376,6 +432,7 @@ lib_libbabeltrace2_la_SOURCES = \ lib/graph/interrupter.c \ lib/graph/interrupter.h \ lib/graph/iterator.c \ + lib/graph/iterator.h \ lib/graph/mip.c \ lib/graph/port.c \ lib/graph/port.h \ @@ -385,8 +442,6 @@ lib_libbabeltrace2_la_SOURCES = \ lib/plugin/plugin.h \ lib/plugin/plugin-so.c \ lib/plugin/plugin-so.h \ - lib/prio-heap/prio-heap.c \ - lib/prio-heap/prio-heap.h \ lib/trace-ir/attributes.c \ lib/trace-ir/attributes.h \ lib/trace-ir/clock-class.c \ @@ -452,7 +507,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 \ @@ -569,11 +627,15 @@ plugins_utils_babeltrace_plugin_utils_la_SOURCES = \ plugins/utils/counter/counter.h \ plugins/utils/dummy/dummy.c \ plugins/utils/dummy/dummy.h \ - plugins/utils/muxer/muxer.c \ - plugins/utils/muxer/muxer.h \ + plugins/utils/muxer/comp.cpp \ + plugins/utils/muxer/comp.hpp \ + plugins/utils/muxer/msg-iter.cpp \ + plugins/utils/muxer/msg-iter.hpp \ + plugins/utils/muxer/upstream-msg-iter.cpp \ + plugins/utils/muxer/upstream-msg-iter.hpp \ plugins/utils/trimmer/trimmer.c \ plugins/utils/trimmer/trimmer.h \ - plugins/utils/plugin.c + plugins/utils/plugin.cpp plugins_utils_babeltrace_plugin_utils_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -587,17 +649,19 @@ if !ENABLE_BUILT_IN_PLUGINS plugins_utils_babeltrace_plugin_utils_la_LIBADD += \ lib/libbabeltrace2.la \ 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/src/bfcr/bfcr.cpp \ + plugins/ctf/common/src/bfcr/bfcr.hpp \ + plugins/ctf/common/src/clk-cls-cfg.hpp \ + plugins/ctf/common/src/msg-iter/msg-iter.cpp \ + plugins/ctf/common/src/msg-iter/msg-iter.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 +715,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 @@ -712,4 +777,7 @@ plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD += \ endif # !ENABLE_BUILT_IN_PLUGINS endif # ENABLE_DEBUG_INFO -EXTRA_DIST = cpp-common/optional.hpp.license +EXTRA_DIST = \ + cpp-common/vendor/optional-lite/optional.hpp.license \ + cpp-common/vendor/span-lite/span.hpp.license \ + cpp-common/vendor/string-view-lite/string_view.hpp.license