From 6a29d9fdf573e71039efd407da89e36f8c11ee42 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 24 Feb 2016 03:52:08 -0500 Subject: [PATCH] Plugins: rename reader -> fs, and symbols.c to plugin.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- configure.ac | 2 +- plugins/ctf/Makefile.am | 6 +++--- plugins/ctf/fs/Makefile.am | 8 ++++++++ .../reader-internal.h => fs/fs-internal.h} | 15 ++++++++------- plugins/ctf/{reader/reader.c => fs/fs.c} | 4 ++-- plugins/ctf/{symbols.c => plugin.c} | 6 +++--- plugins/ctf/reader/Makefile.am | 8 -------- 7 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 plugins/ctf/fs/Makefile.am rename plugins/ctf/{reader/reader-internal.h => fs/fs-internal.h} (78%) rename plugins/ctf/{reader/reader.c => fs/fs.c} (93%) rename plugins/ctf/{symbols.c => plugin.c} (92%) delete mode 100644 plugins/ctf/reader/Makefile.am diff --git a/configure.ac b/configure.ac index c4045cd7..9e36c48e 100644 --- a/configure.ac +++ b/configure.ac @@ -372,7 +372,7 @@ AC_CONFIG_FILES([ extras/valgrind/Makefile plugins/Makefile plugins/ctf/Makefile - plugins/ctf/reader/Makefile + plugins/ctf/fs/Makefile plugins/ctf/lttng-live/Makefile plugins/text/Makefile babeltrace.pc diff --git a/plugins/ctf/Makefile.am b/plugins/ctf/Makefile.am index 5ad99a36..46fe3ec4 100644 --- a/plugins/ctf/Makefile.am +++ b/plugins/ctf/Makefile.am @@ -1,11 +1,11 @@ AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -SUBDIRS = reader lttng-live +SUBDIRS = fs lttng-live lib_LTLIBRARIES = libbabeltrace-plugin-ctf.la # ctf plugin -libbabeltrace_plugin_ctf_la_SOURCES = symbols.c +libbabeltrace_plugin_ctf_la_SOURCES = plugin.c libbabeltrace_plugin_ctf_la_LDFLAGS = \ -version-info $(BABELTRACE_LIBRARY_VERSION) @@ -13,5 +13,5 @@ libbabeltrace_plugin_ctf_la_LDFLAGS = \ libbabeltrace_plugin_ctf_la_LIBADD = \ $(top_builddir)/lib/libbabeltrace.la \ $(top_builddir)/formats/ctf/libbabeltrace-ctf.la \ - $(top_builddir)/plugins/ctf/reader/libbabeltrace-plugin-ctf-reader.la \ + $(top_builddir)/plugins/ctf/fs/libbabeltrace-plugin-ctf-fs.la \ $(top_builddir)/plugins/ctf/lttng-live/libbabeltrace-plugin-ctf-lttng-live.la diff --git a/plugins/ctf/fs/Makefile.am b/plugins/ctf/fs/Makefile.am new file mode 100644 index 00000000..c36bd43d --- /dev/null +++ b/plugins/ctf/fs/Makefile.am @@ -0,0 +1,8 @@ +AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include + +noinst_HEADERS = fs-internal.h +noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-fs.la + +# Plug-in system library +libbabeltrace_plugin_ctf_fs_la_SOURCES = \ + fs.c diff --git a/plugins/ctf/reader/reader-internal.h b/plugins/ctf/fs/fs-internal.h similarity index 78% rename from plugins/ctf/reader/reader-internal.h rename to plugins/ctf/fs/fs-internal.h index 1ebae604..3f87bd0e 100644 --- a/plugins/ctf/reader/reader-internal.h +++ b/plugins/ctf/fs/fs-internal.h @@ -1,8 +1,8 @@ -#ifndef BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H -#define BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H +#ifndef BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H +#define BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H /* - * BabelTrace - CTF Reader Component + * BabelTrace - CTF on File System Component * * Copyright 2016 Jérémie Galarneau * @@ -30,11 +30,12 @@ #include #include -#define READER_COMPONENT_NAME "ctf" -#define READER_COMPONENT_DESCRIPTION "Component used to read on-disk CTF traces." +#define FS_COMPONENT_NAME "ctf" +#define FS_COMPONENT_DESCRIPTION \ + "Component used to read a CTF trace located on a file system." BT_HIDDEN -enum bt_component_status ctf_init(struct bt_component *source, +enum bt_component_status fs_init(struct bt_component *source, struct bt_value *params); -#endif /* BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H */ +#endif /* BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H */ diff --git a/plugins/ctf/reader/reader.c b/plugins/ctf/fs/fs.c similarity index 93% rename from plugins/ctf/reader/reader.c rename to plugins/ctf/fs/fs.c index ccf860ab..1142691e 100644 --- a/plugins/ctf/reader/reader.c +++ b/plugins/ctf/fs/fs.c @@ -26,11 +26,11 @@ * SOFTWARE. */ -#include "reader-internal.h" +#include "fs-internal.h" #include BT_HIDDEN -enum bt_component_status ctf_init(struct bt_component *component, +enum bt_component_status fs_init(struct bt_component *component, struct bt_value *params) { return BT_COMPONENT_STATUS_OK; diff --git a/plugins/ctf/symbols.c b/plugins/ctf/plugin.c similarity index 92% rename from plugins/ctf/symbols.c rename to plugins/ctf/plugin.c index 2cc423ea..16c2c5b6 100644 --- a/plugins/ctf/symbols.c +++ b/plugins/ctf/plugin.c @@ -27,7 +27,7 @@ */ #include -#include "reader/reader-internal.h" +#include "fs/fs-internal.h" #include "lttng-live/lttng-live-internal.h" /* Initialize plug-in entry points. */ @@ -37,8 +37,8 @@ BT_PLUGIN_AUTHOR("Jérémie Galarneau"); BT_PLUGIN_LICENSE("MIT"); BT_PLUGIN_COMPONENT_CLASSES_BEGIN -BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(READER_COMPONENT_NAME, - READER_COMPONENT_DESCRIPTION, ctf_init); +BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(FS_COMPONENT_NAME, + FS_COMPONENT_DESCRIPTION, fs_init); BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(LTTNG_LIVE_COMPONENT_NAME, LTTNG_LIVE_COMPONENT_DESCRIPTION, lttng_live_init); BT_PLUGIN_COMPONENT_CLASSES_END diff --git a/plugins/ctf/reader/Makefile.am b/plugins/ctf/reader/Makefile.am deleted file mode 100644 index 4233d4ae..00000000 --- a/plugins/ctf/reader/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - -noinst_HEADERS = reader-internal.h -noinst_LTLIBRARIES = libbabeltrace-plugin-ctf-reader.la - -# Plug-in system library -libbabeltrace_plugin_ctf_reader_la_SOURCES = \ - reader.c -- 2.34.1