From bd2d90ecf47e1cbf84ebfcf5f43ce285056b52d1 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 17 Jun 2019 19:27:16 -0400 Subject: [PATCH] Remove unused `src/plugins/ctf/common/utils` Signed-off-by: Philippe Proulx Change-Id: Ia66dfc005c8091187c3883727bf7f68582a201da Reviewed-on: https://review.lttng.org/c/babeltrace/+/1491 Tested-by: jenkins Reviewed-by: Francis Deslauriers --- configure.ac | 1 - src/cli/babeltrace2.c | 1 - src/plugins/ctf/common/Makefile.am | 5 ++-- src/plugins/ctf/common/utils/Makefile.am | 6 ----- src/plugins/ctf/common/utils/logging.c | 26 -------------------- src/plugins/ctf/common/utils/logging.h | 31 ------------------------ src/plugins/ctf/common/utils/utils.c | 28 --------------------- src/plugins/ctf/common/utils/utils.h | 31 ------------------------ src/plugins/ctf/fs-src/fs.c | 1 - 9 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 src/plugins/ctf/common/utils/Makefile.am delete mode 100644 src/plugins/ctf/common/utils/logging.c delete mode 100644 src/plugins/ctf/common/utils/logging.h delete mode 100644 src/plugins/ctf/common/utils/utils.c delete mode 100644 src/plugins/ctf/common/utils/utils.h diff --git a/configure.ac b/configure.ac index 2f76b4ae..693fa641 100644 --- a/configure.ac +++ b/configure.ac @@ -760,7 +760,6 @@ AC_CONFIG_FILES([ src/plugins/ctf/common/Makefile src/plugins/ctf/common/metadata/Makefile src/plugins/ctf/common/msg-iter/Makefile - src/plugins/ctf/common/utils/Makefile src/plugins/ctf/fs-sink/Makefile src/plugins/ctf/fs-src/Makefile src/plugins/ctf/lttng-live/Makefile diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index 830ebf5a..fed54d9b 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -50,7 +50,6 @@ */ static const char* log_level_env_var_names[] = { "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL", "BABELTRACE_PYTHON_BT2_LOG_LEVEL", "BABELTRACE_SINK_CTF_FS_LOG_LEVEL", "BABELTRACE_SINK_TEXT_DETAILS_LOG_LEVEL", diff --git a/src/plugins/ctf/common/Makefile.am b/src/plugins/ctf/common/Makefile.am index 055355b1..88a38c37 100644 --- a/src/plugins/ctf/common/Makefile.am +++ b/src/plugins/ctf/common/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = metadata bfcr msg-iter utils +SUBDIRS = metadata bfcr msg-iter noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-common.la libbabeltrace2_plugin_ctf_common_la_SOURCES = print.h @@ -6,5 +6,4 @@ libbabeltrace2_plugin_ctf_common_la_LIBADD = \ $(builddir)/metadata/libctf-parser.la \ $(builddir)/metadata/libctf-ast.la \ $(builddir)/bfcr/libctf-bfcr.la \ - $(builddir)/msg-iter/libctf-msg-iter.la \ - $(builddir)/utils/libctf-utils.la + $(builddir)/msg-iter/libctf-msg-iter.la diff --git a/src/plugins/ctf/common/utils/Makefile.am b/src/plugins/ctf/common/utils/Makefile.am deleted file mode 100644 index c4b62ff5..00000000 --- a/src/plugins/ctf/common/utils/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libctf-utils.la -libctf_utils_la_SOURCES = \ - logging.c \ - logging.h \ - utils.c \ - utils.h diff --git a/src/plugins/ctf/common/utils/logging.c b/src/plugins/ctf/common/utils/logging.c deleted file mode 100644 index bd773eaf..00000000 --- a/src/plugins/ctf/common/utils/logging.c +++ /dev/null @@ -1,26 +0,0 @@ - /* - * Copyright (c) 2017 Jérémie Galarneau - * - * 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. - */ - -#define BT_LOG_OUTPUT_LEVEL utils_log_level -#include "logging/log.h" - -BT_LOG_INIT_LOG_LEVEL(utils_log_level, "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL"); diff --git a/src/plugins/ctf/common/utils/logging.h b/src/plugins/ctf/common/utils/logging.h deleted file mode 100644 index 2eeace49..00000000 --- a/src/plugins/ctf/common/utils/logging.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef CTF_UTILS_LOGGING_H -#define CTF_UTILS_LOGGING_H - -/* - * Copyright (c) 2017 Jérémie Galarneau - * - * 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. - */ - -#define BT_LOG_OUTPUT_LEVEL utils_log_level -#include "logging/log.h" - -BT_LOG_LEVEL_EXTERN_SYMBOL(utils_log_level); - -#endif /* CTF_UTILS_LOGGING_H */ diff --git a/src/plugins/ctf/common/utils/utils.c b/src/plugins/ctf/common/utils/utils.c deleted file mode 100644 index 3d82ad5c..00000000 --- a/src/plugins/ctf/common/utils/utils.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Babeltrace - CTF Utils - * - * Copyright (c) 2017 Jérémie Galarneau - * - * 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. - */ - -#define BT_LOG_TAG "PLUGIN/CTF/UTILS" -#include "logging.h" - -#include "utils.h" diff --git a/src/plugins/ctf/common/utils/utils.h b/src/plugins/ctf/common/utils/utils.h deleted file mode 100644 index 05e0a8dc..00000000 --- a/src/plugins/ctf/common/utils/utils.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef CTF_UTILS_H -#define CTF_UTILS_H - -/* - * Babeltrace - CTF Utilities - * - * Copyright (c) 2017 Jérémie Galarneau - * - * 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 -#include "common/macros.h" - -#endif /* CTF_UTILS_H */ diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index 7ea06e13..84745060 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -38,7 +38,6 @@ #include "file.h" #include "../common/metadata/decoder.h" #include "../common/msg-iter/msg-iter.h" -#include "../common/utils/utils.h" #include "query.h" #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS" -- 2.34.1