projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src.ctf.lttng-live: honor component's initial log level and query LL
[babeltrace.git]
/
src
/
plugins
/
ctf
/
lttng-live
/
data-stream.c
diff --git
a/src/plugins/ctf/lttng-live/data-stream.c
b/src/plugins/ctf/lttng-live/data-stream.c
index 25a8e4cf1e66bdea7b9c18d4a52f9ada2a381bfd..7e7250baf94b46922de642fc894c777908f5cffc 100644
(file)
--- a/
src/plugins/ctf/lttng-live/data-stream.c
+++ b/
src/plugins/ctf/lttng-live/data-stream.c
@@
-23,8
+23,9
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-LIVE-SRC-DS"
-#include "logging.h"
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
+#include "logging/log.h"
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
@@
-78,11
+79,12
@@
bt_stream *medop_borrow_stream(bt_stream_class *stream_class,
int64_t stream_id, void *data)
{
struct lttng_live_stream_iterator *lttng_live_stream = data;
int64_t stream_id, void *data)
{
struct lttng_live_stream_iterator *lttng_live_stream = data;
+ bt_logging_level log_level = lttng_live_stream->log_level;
if (!lttng_live_stream->stream) {
uint64_t stream_class_id = bt_stream_class_get_id(stream_class);
if (!lttng_live_stream->stream) {
uint64_t stream_class_id = bt_stream_class_get_id(stream_class);
- BT_LOG
D
("Creating stream %s (ID: %" PRIu64 ") out of stream "
+ BT_LOG
I
("Creating stream %s (ID: %" PRIu64 ") out of stream "
"class %" PRId64, lttng_live_stream->name->str,
stream_id, stream_class_id);
"class %" PRId64, lttng_live_stream->name->str,
stream_id, stream_class_id);
@@
-128,6
+130,7
@@
enum lttng_live_iterator_status lttng_live_lazy_msg_init(
struct lttng_live_component *lttng_live =
session->lttng_live_msg_iter->lttng_live_comp;
uint64_t trace_idx, stream_iter_idx;
struct lttng_live_component *lttng_live =
session->lttng_live_msg_iter->lttng_live_comp;
uint64_t trace_idx, stream_iter_idx;
+ bt_logging_level log_level = session->log_level;
if (!session->lazy_stream_msg_init) {
return LTTNG_LIVE_ITERATOR_STATUS_OK;
if (!session->lazy_stream_msg_init) {
return LTTNG_LIVE_ITERATOR_STATUS_OK;
@@
-152,7
+155,7
@@
enum lttng_live_iterator_status lttng_live_lazy_msg_init(
trace->metadata->decoder);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
lttng_live->max_query_size, medops,
trace->metadata->decoder);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
lttng_live->max_query_size, medops,
- stream_iter);
+ stream_iter
, log_level
);
if (!stream_iter->msg_iter) {
goto error;
}
if (!stream_iter->msg_iter) {
goto error;
}
@@
-176,10
+179,12
@@
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
struct lttng_live_stream_iterator *stream_iter;
struct lttng_live_component *lttng_live;
struct lttng_live_trace *trace;
struct lttng_live_stream_iterator *stream_iter;
struct lttng_live_component *lttng_live;
struct lttng_live_trace *trace;
+ bt_logging_level log_level;
BT_ASSERT(session);
BT_ASSERT(session->lttng_live_msg_iter);
BT_ASSERT(session->lttng_live_msg_iter->lttng_live_comp);
BT_ASSERT(session);
BT_ASSERT(session->lttng_live_msg_iter);
BT_ASSERT(session->lttng_live_msg_iter->lttng_live_comp);
+ log_level = session->log_level;
lttng_live = session->lttng_live_msg_iter->lttng_live_comp;
lttng_live = session->lttng_live_msg_iter->lttng_live_comp;
@@
-188,6
+193,7
@@
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
goto error;
}
goto error;
}
+ stream_iter->log_level = log_level;
trace = lttng_live_borrow_trace(session, ctf_trace_id);
if (!trace) {
goto error;
trace = lttng_live_borrow_trace(session, ctf_trace_id);
if (!trace) {
goto error;
@@
-206,7
+212,7
@@
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
BT_ASSERT(!stream_iter->msg_iter);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
lttng_live->max_query_size, medops,
BT_ASSERT(!stream_iter->msg_iter);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
lttng_live->max_query_size, medops,
- stream_iter);
+ stream_iter
, log_level
);
if (!stream_iter->msg_iter) {
goto error;
}
if (!stream_iter->msg_iter) {
goto error;
}
This page took
0.054281 seconds
and
4
git commands to generate.