Plugins: rename reader -> fs, and symbols.c to plugin.c
authorPhilippe Proulx <eeppeliteloop@gmail.com>
Wed, 24 Feb 2016 08:52:08 +0000 (03:52 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Sat, 27 May 2017 16:57:26 +0000 (12:57 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
configure.ac
plugins/ctf/Makefile.am
plugins/ctf/fs/Makefile.am [new file with mode: 0644]
plugins/ctf/fs/fs-internal.h [new file with mode: 0644]
plugins/ctf/fs/fs.c [new file with mode: 0644]
plugins/ctf/plugin.c [new file with mode: 0644]
plugins/ctf/reader/Makefile.am [deleted file]
plugins/ctf/reader/reader-internal.h [deleted file]
plugins/ctf/reader/reader.c [deleted file]
plugins/ctf/symbols.c [deleted file]

index c4045cd773f636b04ca2e1da178de631942274d1..9e36c48e4d2d441bb33a63eaf00da91789a1a345 100644 (file)
@@ -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
index 5ad99a3653e63879a312ec19009d980174097ba9..46fe3ec4982161e2f33ca990cdac06524ee5ebda 100644 (file)
@@ -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 (file)
index 0000000..c36bd43
--- /dev/null
@@ -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/fs/fs-internal.h b/plugins/ctf/fs/fs-internal.h
new file mode 100644 (file)
index 0000000..3f87bd0
--- /dev/null
@@ -0,0 +1,41 @@
+#ifndef BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H
+#define BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H
+
+/*
+ * BabelTrace - CTF on File System Component
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/plugin/component.h>
+
+#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 fs_init(struct bt_component *source,
+               struct bt_value *params);
+
+#endif /* BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H */
diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
new file mode 100644 (file)
index 0000000..1142691
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * reader.c
+ *
+ * Babeltrace CTF Reader Component
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "fs-internal.h"
+#include <babeltrace/plugin/source.h>
+
+BT_HIDDEN
+enum bt_component_status fs_init(struct bt_component *component,
+               struct bt_value *params)
+{
+       return BT_COMPONENT_STATUS_OK;
+}
+
+
diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
new file mode 100644 (file)
index 0000000..16c2c5b
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * symbols.c
+ *
+ * Babeltrace CTF Plug-in Registration Symbols
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/plugin/plugin-macros.h>
+#include "fs/fs-internal.h"
+#include "lttng-live/lttng-live-internal.h"
+
+/* Initialize plug-in entry points. */
+BT_PLUGIN_NAME("ctf");
+BT_PLUGIN_DESCRIPTION("Babeltrace CTF plug-in.");
+BT_PLUGIN_AUTHOR("Jérémie Galarneau");
+BT_PLUGIN_LICENSE("MIT");
+
+BT_PLUGIN_COMPONENT_CLASSES_BEGIN
+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 (file)
index 4233d4a..0000000
+++ /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
diff --git a/plugins/ctf/reader/reader-internal.h b/plugins/ctf/reader/reader-internal.h
deleted file mode 100644 (file)
index 1ebae60..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H
-#define BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H
-
-/*
- * BabelTrace - CTF Reader Component
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
-
-#define READER_COMPONENT_NAME "ctf"
-#define READER_COMPONENT_DESCRIPTION "Component used to read on-disk CTF traces."
-
-BT_HIDDEN
-enum bt_component_status ctf_init(struct bt_component *source,
-               struct bt_value *params);
-
-#endif /* BABELTRACE_PLUGIN_CTF_READER_INTERNAL_H */
diff --git a/plugins/ctf/reader/reader.c b/plugins/ctf/reader/reader.c
deleted file mode 100644 (file)
index ccf860a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * reader.c
- *
- * Babeltrace CTF Reader Component
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "reader-internal.h"
-#include <babeltrace/plugin/source.h>
-
-BT_HIDDEN
-enum bt_component_status ctf_init(struct bt_component *component,
-               struct bt_value *params)
-{
-       return BT_COMPONENT_STATUS_OK;
-}
-
-
diff --git a/plugins/ctf/symbols.c b/plugins/ctf/symbols.c
deleted file mode 100644 (file)
index 2cc423e..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * symbols.c
- *
- * Babeltrace CTF Plug-in Registration Symbols
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/plugin-macros.h>
-#include "reader/reader-internal.h"
-#include "lttng-live/lttng-live-internal.h"
-
-/* Initialize plug-in entry points. */
-BT_PLUGIN_NAME("ctf");
-BT_PLUGIN_DESCRIPTION("Babeltrace CTF plug-in.");
-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(LTTNG_LIVE_COMPONENT_NAME,
-               LTTNG_LIVE_COMPONENT_DESCRIPTION, lttng_live_init);
-BT_PLUGIN_COMPONENT_CLASSES_END
-
This page took 0.029908 seconds and 4 git commands to generate.