projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: add `#include <stdbool.h>` whenever `bool` type is used
[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 c89cba5210d0ec0dc89c0f135f4e12900e782f72..ee351648a417880411bc24f8355af9898a98599c 100644
(file)
--- a/
src/plugins/ctf/lttng-live/data-stream.c
+++ b/
src/plugins/ctf/lttng-live/data-stream.c
@@
-26,12
+26,11
@@
#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"
#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>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
-#include <stdbool.h>
#include <glib.h>
#include <inttypes.h>
#include "compat/mman.h"
#include <glib.h>
#include <inttypes.h>
#include "compat/mman.h"
@@
-58,12
+57,18
@@
enum bt_msg_iter_medium_status medop_request_bytes(
uint64_t len_left;
uint64_t read_len;
uint64_t len_left;
uint64_t read_len;
+ if (stream->has_stream_hung_up) {
+ status = BT_MSG_ITER_MEDIUM_STATUS_EOF;
+ goto end;
+ }
+
len_left = stream->base_offset + stream->len - stream->offset;
if (!len_left) {
stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA;
status = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
len_left = stream->base_offset + stream->len - stream->offset;
if (!len_left) {
stream->state = LTTNG_LIVE_STREAM_ACTIVE_NO_DATA;
status = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
-
return status
;
+
goto end
;
}
}
+
read_len = MIN(request_sz, stream->buflen);
read_len = MIN(read_len, len_left);
status = lttng_live_get_stream_bytes(live_msg_iter,
read_len = MIN(request_sz, stream->buflen);
read_len = MIN(read_len, len_left);
status = lttng_live_get_stream_bytes(live_msg_iter,
@@
-72,6
+77,7
@@
enum bt_msg_iter_medium_status medop_request_bytes(
*buffer_addr = stream->buf;
*buffer_sz = recv_len;
stream->offset += recv_len;
*buffer_addr = stream->buf;
*buffer_sz = recv_len;
stream->offset += recv_len;
+end:
return status;
}
return status;
}
@@
-152,19
+158,24
@@
enum lttng_live_iterator_status lttng_live_lazy_msg_init(
struct ctf_trace_class *ctf_tc;
struct lttng_live_stream_iterator *stream_iter =
g_ptr_array_index(trace->stream_iterators,
struct ctf_trace_class *ctf_tc;
struct lttng_live_stream_iterator *stream_iter =
g_ptr_array_index(trace->stream_iterators,
-
stream_iter_idx);
+ stream_iter_idx);
if (stream_iter->msg_iter) {
continue;
}
ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class(
if (stream_iter->msg_iter) {
continue;
}
ctf_tc = ctf_metadata_decoder_borrow_ctf_trace_class(
-
trace->metadata->decoder);
+ trace->metadata->decoder);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
-
lttng_live->max_query_size, medops
,
-
stream_iter,
log_level, self_comp);
+
lttng_live->max_query_size, medops, stream_iter
,
+ log_level, self_comp);
if (!stream_iter->msg_iter) {
goto error;
}
if (!stream_iter->msg_iter) {
goto error;
}
+
+ bt_msg_iter_set_emit_stream_end_message(
+ stream_iter->msg_iter, true);
+ bt_msg_iter_set_emit_stream_beginning_message(
+ stream_iter->msg_iter, true);
}
}
}
}
@@
-217,14
+228,19
@@
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
if (trace->trace) {
struct ctf_trace_class *ctf_tc =
ctf_metadata_decoder_borrow_ctf_trace_class(
if (trace->trace) {
struct ctf_trace_class *ctf_tc =
ctf_metadata_decoder_borrow_ctf_trace_class(
-
trace->metadata->decoder);
+ trace->metadata->decoder);
BT_ASSERT(!stream_iter->msg_iter);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
BT_ASSERT(!stream_iter->msg_iter);
stream_iter->msg_iter = bt_msg_iter_create(ctf_tc,
-
lttng_live->max_query_size, medops
,
-
stream_iter,
log_level, self_comp);
+
lttng_live->max_query_size, medops, stream_iter
,
+ log_level, self_comp);
if (!stream_iter->msg_iter) {
goto error;
}
if (!stream_iter->msg_iter) {
goto error;
}
+
+ bt_msg_iter_set_emit_stream_end_message(
+ stream_iter->msg_iter, true);
+ bt_msg_iter_set_emit_stream_beginning_message(
+ stream_iter->msg_iter, true);
}
stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size);
if (!stream_iter->buf) {
}
stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size);
if (!stream_iter->buf) {
@@
-238,7
+254,7
@@
struct lttng_live_stream_iterator *lttng_live_stream_iterator_create(
}
g_string_printf(stream_iter->name, STREAM_NAME_PREFIX "%" PRIu64,
}
g_string_printf(stream_iter->name, STREAM_NAME_PREFIX "%" PRIu64,
-
stream_iter->viewer_stream_id);
+ stream_iter->viewer_stream_id);
g_ptr_array_add(trace->stream_iterators, stream_iter);
/* Track the number of active stream iterator. */
g_ptr_array_add(trace->stream_iterators, stream_iter);
/* Track the number of active stream iterator. */
This page took
0.036356 seconds
and
4
git commands to generate.