src.ctf.fs: use BT_COMP_LOG*() instead of BT_LOG*()

[babeltrace.git] / src / plugins / ctf / fs-src / query.c

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index 3fa28b86e8eceb5a1346d879d9cff0f9b8034637..a32f1bbdbcd08c7f9014400f99daf984905cb594 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -24,19 +24,20 @@
  * SOFTWARE.
  */
 
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/QUERY"
+#include "logging/log.h"
+
 #include "query.h"
 #include <stdbool.h>
 #include "common/assert.h"
 #include "metadata.h"
 #include "../common/metadata/decoder.h"
 #include "common/common.h"
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 #include "fs.h"
 
-#define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC"
-#include "logging.h"
-
 #define METADATA_TEXT_SIG      "/* CTF 1.8"
 
 struct range {
@@ -48,7 +49,7 @@ struct range {
 BT_HIDDEN
 bt_query_status metadata_info_query(
                bt_self_component_class_source *comp_class,
-               const bt_value *params,
+               const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
 {
        bt_query_status status = BT_QUERY_STATUS_OK;
@@ -99,11 +100,11 @@ bt_query_status metadata_info_query(
        }
 
        is_packetized = ctf_metadata_decoder_is_packetized(metadata_fp,
-               &bo);
+               &bo, log_level, NULL);
 
        if (is_packetized) {
                ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
-                       metadata_fp, &metadata_text, bo);
+                       metadata_fp, &metadata_text, bo, log_level, NULL);
                if (ret) {
                        BT_LOGE("Cannot decode packetized metadata file: path=\"%s\"",
                                path);
@@ -427,15 +428,15 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
                }
 
                if (group_range.set) {
-                       trace_range.begin_ns = min(trace_range.begin_ns,
+                       trace_range.begin_ns = MIN(trace_range.begin_ns,
                                        group_range.begin_ns);
-                       trace_range.end_ns = max(trace_range.end_ns,
+                       trace_range.end_ns = MAX(trace_range.end_ns,
                                        group_range.end_ns);
                        trace_range.set = true;
 
-                       trace_intersection.begin_ns = max(trace_intersection.begin_ns,
+                       trace_intersection.begin_ns = MAX(trace_intersection.begin_ns,
                                        group_range.begin_ns);
-                       trace_intersection.end_ns = min(trace_intersection.end_ns,
+                       trace_intersection.end_ns = MIN(trace_intersection.end_ns,
                                        group_range.end_ns);
                        trace_intersection.set = true;
                }
@@ -470,7 +471,7 @@ end:
 BT_HIDDEN
 bt_query_status trace_info_query(
                bt_self_component_class_source *comp_class,
-               const bt_value *params,
+               const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
 {
        struct ctf_fs_component *ctf_fs = NULL;
@@ -488,7 +489,7 @@ bt_query_status trace_info_query(
                goto error;
        }
 
-       ctf_fs = ctf_fs_component_create();
+       ctf_fs = ctf_fs_component_create(log_level, NULL);
        if (!ctf_fs) {
                goto error;
        }