Move `src/plugins/comp-logging.h` -> `src/logging/comp-logging.h`

Move this file so that other parts of the project than plugins, namely
Python bindings, can use it.

Also: in `comp-logging.h`, the requirement that `BT_LOG_OUTPUT_LEVEL`
and `BT_COMP_LOG_SELF_COMP` are set is removed because they are not
needed to use the generic BT_COMP_LOG_CUR_LVL() macro.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ic961c3a97863dcef63fb7ee673841650cf9ca9e9
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1788
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index d5d86e54a2a9e4daa19b21d22de1edbbc4ce28be..be9688a313beeb2c256c066a9ae25cd8c132a374 100644 (file)
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -295,7 +295,7 @@ hidden symbol which is the library's current log level before including
 This header offers the <<lib-logging-statements,library-specific logging
 statement macros>>.
 
-`"plugins/comp-logging.h"`::
+`"logging/comp-logging.h"`::
     Specific internal header to use within a component class.
 +
 This header offers the <<comp-logging-statements,component-specific
@@ -1144,11 +1144,11 @@ variable:
 #define BT_COMP_LOG_SELF_COMP (my_comp->self_comp)
 ----
 
-. Include `"plugins/comp-logging.h"`:
+. Include `"logging/comp-logging.h"`:
 +
 [source,c]
 ----
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 ----
 
 . In the component initialization method, make sure to set the
@@ -1189,7 +1189,7 @@ bt_self_component_status my_comp_init(
 To instrument a component class C header file (`.h`), if you have
 `static inline` functions in it:
 
-. Do not include `"plugins/comp-logging.h"`!
+. Do not include `"logging/comp-logging.h"`!
 
 . Require that component logging be enabled:
 +
@@ -1197,7 +1197,7 @@ To instrument a component class C header file (`.h`), if you have
 ----
 /* Protection: this file uses BT_COMP_LOG*() macros directly */
 #ifndef BT_COMP_LOG_SUPPORTED
-# error Please include "plugins/comp-logging.h" before including this file.
+# error Please include "logging/comp-logging.h" before including this file.
 #endif
 ----
 

diff --git a/src/logging/Makefile.am b/src/logging/Makefile.am
index fd6c6b648c1eb07e132e58259102575cf8bfc07c..69217b7580e3140c8067347823e704faa974d875 100644 (file)
--- a/src/logging/Makefile.am
+++ b/src/logging/Makefile.am
@@ -1,3 +1,3 @@
 noinst_LTLIBRARIES = libbabeltrace2-logging.la
 
-libbabeltrace2_logging_la_SOURCES = log.c log.h
+libbabeltrace2_logging_la_SOURCES = log.c log.h comp-logging.h

diff --git a/src/logging/comp-logging.h b/src/logging/comp-logging.h
new file mode 100644 (file)
index 0000000..22e9bda
--- /dev/null
+++ b/src/logging/comp-logging.h
@@ -0,0 +1,134 @@
+#ifndef BABELTRACE_LOGGING_COMP_LOGGING_H
+#define BABELTRACE_LOGGING_COMP_LOGGING_H
+
+/*
+ * Copyright 2019 Philippe Proulx <pproulx@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.
+ */
+
+#ifndef BT_LOG_TAG
+# error Please define a tag with BT_LOG_TAG before including this file.
+#endif
+
+#include <stdlib.h>
+#include <babeltrace2/babeltrace.h>
+#include "logging/log.h"
+
+#define _BT_COMP_LOG_COMP_PREFIX       "[%s] "
+#define _BT_COMP_LOG_COMP_NA_STR       "N/A"
+
+/* Logs with level `_lvl` for self component `_self_comp` */
+#define BT_COMP_LOG(_lvl, _self_comp, _fmt, ...)                       \
+       BT_LOG_WRITE((_lvl), BT_LOG_TAG, _BT_COMP_LOG_COMP_PREFIX _fmt, \
+               (_self_comp) ?                                          \
+                       bt_component_get_name(                          \
+                               bt_self_component_as_component(_self_comp)) : \
+                       _BT_COMP_LOG_COMP_NA_STR,                       \
+               ##__VA_ARGS__)
+
+#define BT_COMP_LOG_CUR_LVL(_lvl, _cur_lvl, _self_comp, _fmt, ...)     \
+       BT_LOG_WRITE_CUR_LVL((_lvl), (_cur_lvl), BT_LOG_TAG,            \
+               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
+               (_self_comp) ?                                          \
+                       bt_component_get_name(                          \
+                               bt_self_component_as_component(_self_comp)) : \
+                       _BT_COMP_LOG_COMP_NA_STR,                       \
+               ##__VA_ARGS__)
+
+#define BT_COMP_LOG_ERRNO(_lvl, _self_comp, _msg, _fmt, ...)           \
+       BT_LOG_WRITE_ERRNO((_lvl), BT_LOG_TAG, _msg,                    \
+               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
+               (_self_comp) ?                                          \
+                       bt_component_get_name(                          \
+                               bt_self_component_as_component(_self_comp)) : \
+                       _BT_COMP_LOG_COMP_NA_STR,                       \
+               ##__VA_ARGS__)
+
+#define BT_COMP_LOG_ERRNO_CUR_LVL(_lvl, _cur_lvl, _self_comp, _msg, _fmt, ...) \
+       BT_LOG_WRITE_ERRNO_CUR_LVL((_lvl), (_cur_lvl), BT_LOG_TAG, _msg, \
+               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
+               (_self_comp) ?                                          \
+                       bt_component_get_name(                          \
+                               bt_self_component_as_component(_self_comp)) : \
+                       _BT_COMP_LOG_COMP_NA_STR,                       \
+               ##__VA_ARGS__)
+
+#define BT_COMP_LOG_MEM(_lvl, _self_comp, _data_ptr, _data_sz, _fmt, ...) \
+       BT_LOG_WRITE_MEM((_lvl), BT_LOG_TAG, (_data_ptr), (_data_sz),   \
+               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
+               (_self_comp) ?                                          \
+                       bt_component_get_name(                          \
+                               bt_self_component_as_component(_self_comp)) : \
+                       _BT_COMP_LOG_COMP_NA_STR,                       \
+               ##__VA_ARGS__)
+
+/* Specific per-level logging macros; they use `BT_COMP_LOG_SELF_COMP` */
+#define BT_COMP_LOGF(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGE(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGW(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGI(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGD(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGT(_fmt, ...) \
+       BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGF_STR(_str) \
+       BT_COMP_LOG(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGE_STR(_str) \
+       BT_COMP_LOG(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGW_STR(_str) \
+       BT_COMP_LOG(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGI_STR(_str) \
+       BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGD_STR(_str) \
+       BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGT_STR(_str) \
+       BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
+#define BT_COMP_LOGF_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGE_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGW_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGI_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGD_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGT_ERRNO(_msg, _fmt, ...) \
+       BT_COMP_LOG_ERRNO(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGF_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGE_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGW_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGI_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGD_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+#define BT_COMP_LOGT_MEM(_data_ptr, _data_sz, _fmt, ...) \
+       BT_COMP_LOG_MEM(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
+
+#define BT_COMP_LOG_SUPPORTED
+
+#endif /* BABELTRACE_LOGGING_COMP_LOGGING_H */

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index aa0c6dba15b82512635946e2dd816bb9016f810e..0c53f76492667303b6b82022719c9ba8c3bdf757 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -3,5 +3,3 @@ SUBDIRS = utils text ctf
 if ENABLE_DEBUG_INFO
 SUBDIRS += lttng-utils
 endif
-
-EXTRA_DIST = comp-logging.h

diff --git a/src/plugins/comp-logging.h b/src/plugins/comp-logging.h
deleted file mode 100644 (file)
index 6e55c67..0000000
--- a/src/plugins/comp-logging.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef BABELTRACE_PLUGINS_COMP_LOGGING_H
-#define BABELTRACE_PLUGINS_COMP_LOGGING_H
-
-/*
- * Copyright 2019 Philippe Proulx <pproulx@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.
- */
-
-#ifndef BT_LOG_TAG
-# error Please define a tag with BT_LOG_TAG before including this file.
-#endif
-
-#ifndef BT_LOG_OUTPUT_LEVEL
-# error Please define a log level expression with BT_LOG_OUTPUT_LEVEL before including this file.
-#endif
-
-#ifndef BT_COMP_LOG_SELF_COMP
-# error Please define a self component address expression with BT_COMP_LOG_SELF_COMP before including this file.
-#endif
-
-#include <stdlib.h>
-#include <babeltrace2/babeltrace.h>
-#include "logging/log.h"
-
-#define _BT_COMP_LOG_COMP_PREFIX       "[%s] "
-#define _BT_COMP_LOG_COMP_NA_STR       "N/A"
-
-/* Logs with level `_lvl` for self component `_self_comp` */
-#define BT_COMP_LOG(_lvl, _self_comp, _fmt, ...)                       \
-       BT_LOG_WRITE((_lvl), BT_LOG_TAG, _BT_COMP_LOG_COMP_PREFIX _fmt, \
-               (_self_comp) ?                                          \
-                       bt_component_get_name(                          \
-                               bt_self_component_as_component(_self_comp)) : \
-                       _BT_COMP_LOG_COMP_NA_STR,                       \
-               ##__VA_ARGS__)
-
-#define BT_COMP_LOG_CUR_LVL(_lvl, _cur_lvl, _self_comp, _fmt, ...)     \
-       BT_LOG_WRITE_CUR_LVL((_lvl), (_cur_lvl), BT_LOG_TAG,            \
-               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
-               (_self_comp) ?                                          \
-                       bt_component_get_name(                          \
-                               bt_self_component_as_component(_self_comp)) : \
-                       _BT_COMP_LOG_COMP_NA_STR,                       \
-               ##__VA_ARGS__)
-
-#define BT_COMP_LOG_ERRNO(_lvl, _self_comp, _msg, _fmt, ...)           \
-       BT_LOG_WRITE_ERRNO((_lvl), BT_LOG_TAG, _msg,                    \
-               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
-               (_self_comp) ?                                          \
-                       bt_component_get_name(                          \
-                               bt_self_component_as_component(_self_comp)) : \
-                       _BT_COMP_LOG_COMP_NA_STR,                       \
-               ##__VA_ARGS__)
-
-#define BT_COMP_LOG_ERRNO_CUR_LVL(_lvl, _cur_lvl, _self_comp, _msg, _fmt, ...) \
-       BT_LOG_WRITE_ERRNO_CUR_LVL((_lvl), (_cur_lvl), BT_LOG_TAG, _msg, \
-               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
-               (_self_comp) ?                                          \
-                       bt_component_get_name(                          \
-                               bt_self_component_as_component(_self_comp)) : \
-                       _BT_COMP_LOG_COMP_NA_STR,                       \
-               ##__VA_ARGS__)
-
-#define BT_COMP_LOG_MEM(_lvl, _self_comp, _data_ptr, _data_sz, _fmt, ...) \
-       BT_LOG_WRITE_MEM((_lvl), BT_LOG_TAG, (_data_ptr), (_data_sz),   \
-               _BT_COMP_LOG_COMP_PREFIX _fmt,                          \
-               (_self_comp) ?                                          \
-                       bt_component_get_name(                          \
-                               bt_self_component_as_component(_self_comp)) : \
-                       _BT_COMP_LOG_COMP_NA_STR,                       \
-               ##__VA_ARGS__)
-
-/* Specific per-level logging macros; they use `BT_COMP_LOG_SELF_COMP` */
-#define BT_COMP_LOGF(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGE(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGW(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGI(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGD(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGT(_fmt, ...) \
-       BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGF_STR(_str) \
-       BT_COMP_LOG(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGE_STR(_str) \
-       BT_COMP_LOG(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGW_STR(_str) \
-       BT_COMP_LOG(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGI_STR(_str) \
-       BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGD_STR(_str) \
-       BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGT_STR(_str) \
-       BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), "%s", (_str))
-#define BT_COMP_LOGF_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGE_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGW_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGI_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGD_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGT_ERRNO(_msg, _fmt, ...) \
-       BT_COMP_LOG_ERRNO(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGF_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGE_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_ERROR, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGW_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_WARNING, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGI_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGD_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-#define BT_COMP_LOGT_MEM(_data_ptr, _data_sz, _fmt, ...) \
-       BT_COMP_LOG_MEM(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__)
-
-#define BT_COMP_LOG_SUPPORTED
-
-#endif /* BABELTRACE_PLUGINS_COMP_LOGGING_H */

diff --git a/src/plugins/ctf/common/bfcr/bfcr.c b/src/plugins/ctf/common/bfcr/bfcr.c
index 4aedabc54c22e4149e36042c5c12c5b98b7681cb..fc9b6699797f3e9719b8c4cfd64ceaa85d74d7c3 100644 (file)
--- a/src/plugins/ctf/common/bfcr/bfcr.c
+++ b/src/plugins/ctf/common/bfcr/bfcr.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP (bfcr->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (bfcr->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/BFCR"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdlib.h>
 #include <stdint.h>

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
index 6666d9eb05cb6b19c22fd89f6e55cf12bf6660c5..e2e5b3f2a786ef834e97054af6ef81e4db84f8ce 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c
@@ -16,7 +16,7 @@
 #define BT_COMP_LOG_SELF_COMP (ctx->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ctx->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/RESOLVE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
index 85575c0a24f8f7543d958676027aa46701a58c1c..db5762cf420fd3c19edca1b049a9082e26fe8cac 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-DEF-CC"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-validate.c b/src/plugins/ctf/common/metadata/ctf-meta-validate.c
index 997deb48981fd61a1c79666358f7f505a10f67fd..8f7b4790c7e61dd95863f34f88aebc1bad58d25a 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-validate.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-validate.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/VALIDATE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
index e8a9022028bb1506ecf0bf4b5f681588e25f8040..ebd995f62ecf71a677ea3c5ee1d7dec7c1fd5154 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/WARN-MEANINGLESS-HEADER-FIELDS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.c b/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.c
index bf735827b180ff2ad2b90e44ca45eb1601edfa55..07ddca858cf96c0d1958fbc6e3ab37f9befff84d 100644 (file)
--- a/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.c
+++ b/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/CTF/META/DECODER-DECODE-PACKET"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdbool.h>

diff --git a/src/plugins/ctf/common/metadata/decoder.c b/src/plugins/ctf/common/metadata/decoder.c
index 4f4092de55f278bb47ebc654de543c1a541a3c97..a422ad433c4a2261cb7dc7626201bec6ebdd86e8 100644 (file)
--- a/src/plugins/ctf/common/metadata/decoder.c
+++ b/src/plugins/ctf/common/metadata/decoder.c
@@ -15,7 +15,7 @@
 #define BT_COMP_LOG_SELF_COMP (mdec->config.self_comp)
 #define BT_LOG_OUTPUT_LEVEL (mdec->config.log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/DECODER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdbool.h>

diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
index 26e11290c60a1080b95cdff21e14daa94a89d93f..b7831a86019e1a2510392e8ba9b77839ea070e97 100644 (file)
--- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c
+++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c
@@ -30,7 +30,7 @@
 #define BT_COMP_LOG_SELF_COMP (ctx->log_cfg.self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ctx->log_cfg.log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/IR-VISITOR"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/plugins/ctf/common/metadata/visitor-parent-links.c b/src/plugins/ctf/common/metadata/visitor-parent-links.c
index bfa3f0cf8c322066ed3f26f4c1fdd4ccfa4b10a6..af549b8a1afb3f345dceb2dbf98d7a7ff751b5de 100644 (file)
--- a/src/plugins/ctf/common/metadata/visitor-parent-links.c
+++ b/src/plugins/ctf/common/metadata/visitor-parent-links.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/PARENT-LINKS-VISITOR"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/plugins/ctf/common/metadata/visitor-semantic-validator.c b/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
index 8e732997cb53a62d45688339ed6325c6cdd42dd3..32cff557037aaf2d823411067884785ba642aeec 100644 (file)
--- a/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
+++ b/src/plugins/ctf/common/metadata/visitor-semantic-validator.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/META/SEMANTIC-VALIDATOR-VISITOR"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c
index f7d474995084c227647c14cc5c825b687a926c3e..78a65f1adb631c1cfef61f3c79feca79b1dc5436 100644 (file)
--- a/src/plugins/ctf/common/msg-iter/msg-iter.c
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP (notit->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (notit->log_level)
 #define BT_LOG_TAG "PLUGIN/CTF/MSG-ITER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdint.h>
 #include <inttypes.h>

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c
index a8628998536414dc24e7046b9d64fa9450718b2a..a8bf2dc73b848d8c93af460ae3d0daba184b198c 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (stream->trace->fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (stream->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>

diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.c b/src/plugins/ctf/fs-sink/fs-sink-trace.c
index e2be329b53d2f067e8a3c85e3c940d2d6d3c2c7e..d41e1d9f31a4c2ed3fe47f0f24539a3a2d498b3c 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-trace.c
+++ b/src/plugins/ctf/fs-sink/fs-sink-trace.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (trace->fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (trace->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRACE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>

diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c
index 172e5b4f1f933be394e46c2ae8853ea435eb6c2d..077a08b29522bd866d8d085e49c3b658cea0fee5 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink.c
+++ b/src/plugins/ctf/fs-sink/fs-sink.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (fs_sink->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include <stdio.h>

diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
index 980e5503ad115c5da64a44fe21e2f9aa7d35ed8a..1679440955044139485dd469a8fa78accff7a4b1 100644 (file)
--- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
+++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (ctx->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ctx->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/TRANSLATE-TRACE-IR-TO-CTF-IR"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c
index 929e96bffc3d9b92bdd1e36b41005a0f889daeb6..3a82da3046ffdf62d1c6d85d074c6a4c0316a074 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.c
+++ b/src/plugins/ctf/fs-src/data-stream-file.c
@@ -25,7 +25,7 @@
 #define BT_COMP_LOG_SELF_COMP (ds_file->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ds_file->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/plugins/ctf/fs-src/file.c b/src/plugins/ctf/fs-src/file.c
index 84d85cc29ba4f1a27565bcbf9b5939ce97737d6a..9c116782299c0d3c5fc4d2c15a4c8c28ee0bcc59 100644 (file)
--- a/src/plugins/ctf/fs-src/file.c
+++ b/src/plugins/ctf/fs-src/file.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (file->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (file->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/FILE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <sys/types.h>

diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c
index 965a9ee8782ea6f66d4eea64e4fed19f04b3313d..398708db8e0eef24cc5427efc929fef12d3c2337 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.c
+++ b/src/plugins/ctf/fs-src/fs.c
@@ -28,7 +28,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "common/common.h"
 #include <babeltrace2/babeltrace.h>

diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c
index 8a1d98284525358dafbda9afa9b8747d452d1b9a..42e0532414f0d65670ce7898994f2ff0d9eea37e 100644 (file)
--- a/src/plugins/ctf/fs-src/metadata.c
+++ b/src/plugins/ctf/fs-src/metadata.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/META"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index c89cba5210d0ec0dc89c0f135f4e12900e782f72..1c89a87ae1a524c5baebb0a6b45b1b3a51a61764 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 124b9d120b5ec95116490b67d021875c8f4aa6ee..7b5eddbde167b71bac624e9b4671630bd1de33a3 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -31,7 +31,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <glib.h>
 #include <inttypes.h>

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index b31cd96adbabfcdd2d254ae7988eb58a8b28a9ab..910bbf0c3696f3b9207d49747cbf83bc8a8ff4e0 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/META"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index 42ea78c0ad7fd9cca3d4287fff86c91e22960cbd..8c02be02faf4091cd35e8df27e015589334ea324 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (viewer_connection->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (viewer_connection->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c
index 3d46a54f2ee9afd205ddea386e0ff55347d43640..149236e8bea6be74dd57c500d0ec432c3ab26c5f 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/bin-info.c
+++ b/src/plugins/lttng-utils/debug-info/bin-info.c
@@ -29,7 +29,7 @@
 #define BT_COMP_LOG_SELF_COMP (bin->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (bin->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/BIN-INFO"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/logging.h>
 #include <dwarf.h>

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index f3ba254f58be5cb9923336d2aecfd9d8ec89b299..545a4eee8c1c929ad6aef23a1d5605998c3fb6a2 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/debug-info.c
+++ b/src/plugins/lttng-utils/debug-info/debug-info.c
@@ -29,7 +29,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <glib.h>
 

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
index 274c3170ee2b9f19b901a3b09370250827d29db3..3bb1fba17fa73426cebb6f156b42fbba7c336265 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
@@ -26,7 +26,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-DATA-COPY"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <inttypes.h>
 #include <stdint.h>

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
index dfef517f16e827eb124180335013c6e7a0699332..67f7a2db937a7d2de97c383956d4da11724cd4f4 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c
@@ -28,7 +28,7 @@
 #define BT_COMP_LOG_SELF_COMP (ir_maps->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (ir_maps->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-MAPPING"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
index 60ef68bcee2395b3f076805179b684681020e65d..0bc9194fc4f6a38ee7859cbc3f3a3588fbfabb84 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-COPY"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <inttypes.h>
 #include <stdint.h>

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
index d1d852be19c49ecdafe7d3c93bf3a53c2536edec..0b0d4d4c7a3289da015b611b782d94179f96fbff 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP (md_maps->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (md_maps->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-FC-COPY"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "common/assert.h"
 #include "common/common.h"

diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c
index 34410187cb384adf6234ff6c6ba69af5770280c9..85cfb017534bfefef6aed7e0a06918619889c997 100644 (file)
--- a/src/plugins/text/details/details.c
+++ b/src/plugins/text/details/details.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (details_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (details_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SINK.TEXT.DETAILS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 49fba13f80221c9522aa033024017df7932beb93..e8317d47a50bc5e3a29409f388e6b7f9e3230a1d 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (dmesg_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 #include <string.h>

diff --git a/src/plugins/utils/counter/counter.c b/src/plugins/utils/counter/counter.c
index f61ee043b0fb26ec99cc49c2d3b37af7a5d838ee..6284438f1fe120d5866228d9946b05f4876d3fb4 100644 (file)
--- a/src/plugins/utils/counter/counter.c
+++ b/src/plugins/utils/counter/counter.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (counter->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (counter->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.UTILS.COUNTER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index 31d374fc0fcf4b242e1001c75a727a0408323b64..dd18d98a7023d9ba306067180c7ffefaa07193be 100644 (file)
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -23,7 +23,7 @@
 #define BT_COMP_LOG_SELF_COMP (muxer_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (muxer_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.UTILS.MUXER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "common/macros.h"
 #include "common/uuid.h"

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index 5c7ec431cc9ec64ff78157d477682173b7eb0fd3..0658cc953038406643908b68f323bb4e0b2fce9d 100644 (file)
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (trimmer_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (trimmer_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.UTILS.TRIMMER"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "compat/utc.h"
 #include "compat/time.h"