From 06a626b83f4426ea5b8d3199d1edf5a07594026e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 29 Aug 2016 23:30:35 -0400 Subject: [PATCH] Integrate ctf proto into the plugin build system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- Makefile.am | 2 +- configure.ac | 8 ++++---- ctf-reader-proto/ctf-btr/Makefile.am | 6 ------ plugins/ctf/Makefile.am | 2 +- plugins/ctf/common/Makefile.am | 11 +++++++++++ .../ctf-btr.c => plugins/ctf/common/btr/btr.c | 2 +- .../ctf/common/btr/btr.gdb | 0 .../ctf-btr.h => plugins/ctf/common/btr/btr.h | 0 .../ctf/common/btr}/print.h | 0 .../ctf/common/metadata}/Makefile.am | 19 ++++++++----------- .../ctf/common/metadata/ast.h | 0 .../ctf/common/metadata/lexer.l | 8 ++++---- .../ctf/common/metadata}/objstack.c | 0 .../ctf/common/metadata}/objstack.h | 0 .../ctf/common/metadata/parser.y | 6 +++--- .../ctf/common/metadata/scanner-symbols.h | 0 .../ctf/common/metadata/scanner.h | 2 +- .../ctf/common/metadata/visitor-generate-ir.c | 6 +++--- .../common/metadata/visitor-parent-links.c | 6 +++--- .../metadata/visitor-semantic-validator.c | 6 +++--- .../ctf/common/notif-iter}/Makefile.am | 2 +- .../ctf/common/notif-iter/notif-iter.c | 6 +++--- .../ctf/common/notif-iter/notif-iter.h | 0 .../ctf/common/notif-iter}/print.h | 0 24 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 ctf-reader-proto/ctf-btr/Makefile.am create mode 100644 plugins/ctf/common/Makefile.am rename ctf-reader-proto/ctf-btr/ctf-btr.c => plugins/ctf/common/btr/btr.c (99%) rename ctf-reader-proto/ctf-btr.gdb => plugins/ctf/common/btr/btr.gdb (100%) rename ctf-reader-proto/ctf-btr/ctf-btr.h => plugins/ctf/common/btr/btr.h (100%) rename {ctf-reader-proto/ctf-btr => plugins/ctf/common/btr}/print.h (100%) rename {ctf-reader-proto/metadata-parsing => plugins/ctf/common/metadata}/Makefile.am (64%) rename ctf-reader-proto/metadata-parsing/ctf-ast.h => plugins/ctf/common/metadata/ast.h (100%) rename ctf-reader-proto/metadata-parsing/ctf-lexer.l => plugins/ctf/common/metadata/lexer.l (98%) rename {ctf-reader-proto/metadata-parsing => plugins/ctf/common/metadata}/objstack.c (100%) rename {ctf-reader-proto/metadata-parsing => plugins/ctf/common/metadata}/objstack.h (100%) rename ctf-reader-proto/metadata-parsing/ctf-parser.y => plugins/ctf/common/metadata/parser.y (99%) rename ctf-reader-proto/metadata-parsing/ctf-scanner-symbols.h => plugins/ctf/common/metadata/scanner-symbols.h (100%) rename ctf-reader-proto/metadata-parsing/ctf-scanner.h => plugins/ctf/common/metadata/scanner.h (98%) rename ctf-reader-proto/metadata-parsing/ctf-visitor-generate-ir.c => plugins/ctf/common/metadata/visitor-generate-ir.c (99%) rename ctf-reader-proto/metadata-parsing/ctf-visitor-parent-links.c => plugins/ctf/common/metadata/visitor-parent-links.c (99%) rename ctf-reader-proto/metadata-parsing/ctf-visitor-semantic-validator.c => plugins/ctf/common/metadata/visitor-semantic-validator.c (99%) rename {ctf-reader-proto/ctf-notif-iter => plugins/ctf/common/notif-iter}/Makefile.am (70%) rename ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.c => plugins/ctf/common/notif-iter/notif-iter.c (99%) rename ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.h => plugins/ctf/common/notif-iter/notif-iter.h (100%) rename {ctf-reader-proto/ctf-notif-iter => plugins/ctf/common/notif-iter}/print.h (100%) diff --git a/Makefile.am b/Makefile.am index fab48f19..0544bd16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = include types compat lib formats plugins converter bindings tests doc extras ctf-reader-proto +SUBDIRS = include types compat lib formats plugins converter bindings tests doc extras dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \ std-ext-lib.txt README diff --git a/configure.ac b/configure.ac index c3809bee..01043fbd 100644 --- a/configure.ac +++ b/configure.ac @@ -343,10 +343,6 @@ AC_CONFIG_FILES([ Makefile types/Makefile compat/Makefile - ctf-reader-proto/Makefile - ctf-reader-proto/metadata-parsing/Makefile - ctf-reader-proto/ctf-notif-iter/Makefile - ctf-reader-proto/ctf-btr/Makefile formats/Makefile formats/ctf/Makefile formats/ctf/types/Makefile @@ -380,6 +376,10 @@ AC_CONFIG_FILES([ extras/valgrind/Makefile plugins/Makefile plugins/ctf/Makefile + plugins/ctf/common/Makefile + plugins/ctf/common/btr/Makefile + plugins/ctf/common/metadata/Makefile + plugins/ctf/common/notif-iter/Makefile plugins/ctf/fs/Makefile plugins/ctf/lttng-live/Makefile plugins/text/Makefile diff --git a/ctf-reader-proto/ctf-btr/Makefile.am b/ctf-reader-proto/ctf-btr/Makefile.am deleted file mode 100644 index 93dd221e..00000000 --- a/ctf-reader-proto/ctf-btr/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -AM_CPPFLAGS = -I$(top_srcdir)/include - -noinst_LTLIBRARIES = libctf-btr.la - -libctf_btr_la_SOURCES = ctf-btr.c diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am index f93e9de5..bd665a11 100644 --- a/plugins/ctf/Makefile.am +++ b/plugins/ctf/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -SUBDIRS = fs lttng-live +SUBDIRS = common fs lttng-live plugindir = "$(PLUGINSDIR)" plugin_LTLIBRARIES = libbabeltrace-plugin-ctf.la diff --git a/plugins/ctf/common/Makefile.am b/plugins/ctf/common/Makefile.am new file mode 100644 index 00000000..3c57f0a2 --- /dev/null +++ b/plugins/ctf/common/Makefile.am @@ -0,0 +1,11 @@ +SUBDIRS = btr notif-iter metadata + +AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include + +noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-common.la +libbabeltrace_plugin_ctf_common_la_SOURCES = +libbabeltrace_plugin_ctf_common_la_LIBADD = \ + $(builddir)/btr/libctf-btr.la \ + $(builddir)/metadata/libctf-parser.la \ + $(builddir)/metadata/libctf-ast.la \ + $(builddir)/notif-iter/libctf-notif-iter.la diff --git a/ctf-reader-proto/ctf-btr/ctf-btr.c b/plugins/ctf/common/btr/btr.c similarity index 99% rename from ctf-reader-proto/ctf-btr/ctf-btr.c rename to plugins/ctf/common/btr/btr.c index cb250f9f..a7486793 100644 --- a/ctf-reader-proto/ctf-btr/ctf-btr.c +++ b/plugins/ctf/common/btr/btr.c @@ -35,7 +35,7 @@ #include #include -#include "ctf-btr.h" +#include "btr.h" #define PRINT_ERR_STREAM btr->err_stream #define PRINT_PREFIX "ctf-btr" diff --git a/ctf-reader-proto/ctf-btr.gdb b/plugins/ctf/common/btr/btr.gdb similarity index 100% rename from ctf-reader-proto/ctf-btr.gdb rename to plugins/ctf/common/btr/btr.gdb diff --git a/ctf-reader-proto/ctf-btr/ctf-btr.h b/plugins/ctf/common/btr/btr.h similarity index 100% rename from ctf-reader-proto/ctf-btr/ctf-btr.h rename to plugins/ctf/common/btr/btr.h diff --git a/ctf-reader-proto/ctf-btr/print.h b/plugins/ctf/common/btr/print.h similarity index 100% rename from ctf-reader-proto/ctf-btr/print.h rename to plugins/ctf/common/btr/print.h diff --git a/ctf-reader-proto/metadata-parsing/Makefile.am b/plugins/ctf/common/metadata/Makefile.am similarity index 64% rename from ctf-reader-proto/metadata-parsing/Makefile.am rename to plugins/ctf/common/metadata/Makefile.am index 2195aff3..e29800b2 100644 --- a/ctf-reader-proto/metadata-parsing/Makefile.am +++ b/plugins/ctf/common/metadata/Makefile.am @@ -1,26 +1,23 @@ AM_CPPFLAGS = $(CPPFLAGS) -I$(top_srcdir)/include -I$(srcdir) AM_CFLAGS = $(PACKAGE_CFLAGS) -BUILT_SOURCES = ctf-parser.h ctf-parser.c ctf-lexer.c +BUILT_SOURCES = parser.h parser.c lexer.c AM_YFLAGS = -t -d -v noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la -noinst_HEADERS = \ - ctf-scanner.h \ - ctf-ast.h \ - ctf-scanner-symbols.h +noinst_HEADERS = scanner.h ast.h scanner-symbols.h -libctf_parser_la_SOURCES = ctf-lexer.l ctf-parser.y objstack.c +libctf_parser_la_SOURCES = lexer.l parser.y objstack.c # ctf-scanner-symbols.h is included to prefix generated yy_* symbols # with bt_. libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) \ - -include $(srcdir)/ctf-scanner-symbols.h + -include $(srcdir)/scanner-symbols.h libctf_ast_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir) libctf_ast_la_SOURCES = \ - ctf-visitor-generate-ir.c \ - ctf-visitor-semantic-validator.c \ - ctf-visitor-parent-links.c + visitor-generate-ir.c \ + visitor-semantic-validator.c \ + visitor-parent-links.c libctf_ast_la_LIBADD = $(top_builddir)/lib/libbabeltrace.la if BABELTRACE_BUILD_WITH_LIBUUID @@ -35,4 +32,4 @@ if BABELTRACE_BUILD_WITH_MINGW libctf_ast_la_LIBADD += -lrpcrt4 -lintl -liconv -lole32 -lpopt endif -CLEANFILES = $(BUILT_SOURCES) ctf-parser.output +CLEANFILES = $(BUILT_SOURCES) parser.output diff --git a/ctf-reader-proto/metadata-parsing/ctf-ast.h b/plugins/ctf/common/metadata/ast.h similarity index 100% rename from ctf-reader-proto/metadata-parsing/ctf-ast.h rename to plugins/ctf/common/metadata/ast.h diff --git a/ctf-reader-proto/metadata-parsing/ctf-lexer.l b/plugins/ctf/common/metadata/lexer.l similarity index 98% rename from ctf-reader-proto/metadata-parsing/ctf-lexer.l rename to plugins/ctf/common/metadata/lexer.l index 6b605a0f..b71308a1 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-lexer.l +++ b/plugins/ctf/common/metadata/lexer.l @@ -1,6 +1,6 @@ %{ /* - * ctf-lexer.l + * lexer.l * * Common Trace Formal Lexer * @@ -28,9 +28,9 @@ #include #include #include -#include "ctf-scanner.h" -#include "ctf-parser.h" -#include "ctf-ast.h" +#include "scanner.h" +#include "parser.h" +#include "ast.h" #define PARSE_INTEGER_LITERAL(base) \ do { \ diff --git a/ctf-reader-proto/metadata-parsing/objstack.c b/plugins/ctf/common/metadata/objstack.c similarity index 100% rename from ctf-reader-proto/metadata-parsing/objstack.c rename to plugins/ctf/common/metadata/objstack.c diff --git a/ctf-reader-proto/metadata-parsing/objstack.h b/plugins/ctf/common/metadata/objstack.h similarity index 100% rename from ctf-reader-proto/metadata-parsing/objstack.h rename to plugins/ctf/common/metadata/objstack.h diff --git a/ctf-reader-proto/metadata-parsing/ctf-parser.y b/plugins/ctf/common/metadata/parser.y similarity index 99% rename from ctf-reader-proto/metadata-parsing/ctf-parser.y rename to plugins/ctf/common/metadata/parser.y index 821f0f74..1934b24d 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-parser.y +++ b/plugins/ctf/common/metadata/parser.y @@ -36,9 +36,9 @@ #include #include #include -#include "ctf-scanner.h" -#include "ctf-parser.h" -#include "ctf-ast.h" +#include "scanner.h" +#include "parser.h" +#include "ast.h" #include "objstack.h" BT_HIDDEN diff --git a/ctf-reader-proto/metadata-parsing/ctf-scanner-symbols.h b/plugins/ctf/common/metadata/scanner-symbols.h similarity index 100% rename from ctf-reader-proto/metadata-parsing/ctf-scanner-symbols.h rename to plugins/ctf/common/metadata/scanner-symbols.h diff --git a/ctf-reader-proto/metadata-parsing/ctf-scanner.h b/plugins/ctf/common/metadata/scanner.h similarity index 98% rename from ctf-reader-proto/metadata-parsing/ctf-scanner.h rename to plugins/ctf/common/metadata/scanner.h index 51484a1d..a0b87158 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-scanner.h +++ b/plugins/ctf/common/metadata/scanner.h @@ -18,7 +18,7 @@ */ #include -#include "ctf-ast.h" +#include "ast.h" #ifndef YY_TYPEDEF_YY_SCANNER_T #define YY_TYPEDEF_YY_SCANNER_T diff --git a/ctf-reader-proto/metadata-parsing/ctf-visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c similarity index 99% rename from ctf-reader-proto/metadata-parsing/ctf-visitor-generate-ir.c rename to plugins/ctf/common/metadata/visitor-generate-ir.c index 3a28ca84..ec406bab 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-visitor-generate-ir.c +++ b/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -49,9 +49,9 @@ #include #include -#include "ctf-scanner.h" -#include "ctf-parser.h" -#include "ctf-ast.h" +#include "scanner.h" +#include "parser.h" +#include "ast.h" /* Bit value (left shift) */ #define _BV(_val) (1 << (_val)) diff --git a/ctf-reader-proto/metadata-parsing/ctf-visitor-parent-links.c b/plugins/ctf/common/metadata/visitor-parent-links.c similarity index 99% rename from ctf-reader-proto/metadata-parsing/ctf-visitor-parent-links.c rename to plugins/ctf/common/metadata/visitor-parent-links.c index 037496af..4a017fc8 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-visitor-parent-links.c +++ b/plugins/ctf/common/metadata/visitor-parent-links.c @@ -34,9 +34,9 @@ #include #include #include -#include "ctf-scanner.h" -#include "ctf-parser.h" -#include "ctf-ast.h" +#include "scanner.h" +#include "parser.h" +#include "ast.h" #define fprintf_dbg(fd, fmt, args...) fprintf(fd, "%s: " fmt, __func__, ## args) diff --git a/ctf-reader-proto/metadata-parsing/ctf-visitor-semantic-validator.c b/plugins/ctf/common/metadata/visitor-semantic-validator.c similarity index 99% rename from ctf-reader-proto/metadata-parsing/ctf-visitor-semantic-validator.c rename to plugins/ctf/common/metadata/visitor-semantic-validator.c index 96776a95..bf00008d 100644 --- a/ctf-reader-proto/metadata-parsing/ctf-visitor-semantic-validator.c +++ b/plugins/ctf/common/metadata/visitor-semantic-validator.c @@ -34,9 +34,9 @@ #include #include #include -#include "ctf-scanner.h" -#include "ctf-parser.h" -#include "ctf-ast.h" +#include "scanner.h" +#include "parser.h" +#include "ast.h" #define _bt_list_first_entry(ptr, type, member) \ bt_list_entry((ptr)->next, type, member) diff --git a/ctf-reader-proto/ctf-notif-iter/Makefile.am b/plugins/ctf/common/notif-iter/Makefile.am similarity index 70% rename from ctf-reader-proto/ctf-notif-iter/Makefile.am rename to plugins/ctf/common/notif-iter/Makefile.am index fe901365..e9c69311 100644 --- a/ctf-reader-proto/ctf-notif-iter/Makefile.am +++ b/plugins/ctf/common/notif-iter/Makefile.am @@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LTLIBRARIES = libctf-notif-iter.la -libctf_notif_iter_la_SOURCES = ctf-notif-iter.c +libctf_notif_iter_la_SOURCES = notif-iter.c diff --git a/ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c similarity index 99% rename from ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.c rename to plugins/ctf/common/notif-iter/notif-iter.c index 9fefbd8f..37b5da02 100644 --- a/ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -1,6 +1,6 @@ /* * Babeltrace - CTF notification iterator - * ¯¯¯¯¯ ¯¯¯¯ + * * Copyright (c) 2015-2016 EfficiOS Inc. and Linux Foundation * Copyright (c) 2015-2016 Philippe Proulx * @@ -45,8 +45,8 @@ #define PRINT_PREFIX "ctf-notif-iter" #include "print.h" -#include "ctf-notif-iter.h" -#include "../ctf-btr/ctf-btr.h" +#include "notif-iter.h" +#include "../btr/btr.h" #define BYTES_TO_BITS(x) ((x) * 8) diff --git a/ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.h b/plugins/ctf/common/notif-iter/notif-iter.h similarity index 100% rename from ctf-reader-proto/ctf-notif-iter/ctf-notif-iter.h rename to plugins/ctf/common/notif-iter/notif-iter.h diff --git a/ctf-reader-proto/ctf-notif-iter/print.h b/plugins/ctf/common/notif-iter/print.h similarity index 100% rename from ctf-reader-proto/ctf-notif-iter/print.h rename to plugins/ctf/common/notif-iter/print.h -- 2.34.1