#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 <stdbool.h>
#include <glib.h>
#include <inttypes.h>
#include "compat/mman.h"
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;
- 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,
*buffer_addr = stream->buf;
*buffer_sz = recv_len;
stream->offset += recv_len;
+end:
return status;
}
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(
- trace->metadata->decoder);
+ trace->metadata->decoder);
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;
}
+
+ 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);
}
}
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,
- 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;
}
+
+ 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) {
}
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. */
if (stream_iter->msg_iter) {
bt_msg_iter_destroy(stream_iter->msg_iter);
}
- if (stream_iter->buf) {
- g_free(stream_iter->buf);
- }
+ g_free(stream_iter->buf);
if (stream_iter->name) {
g_string_free(stream_iter->name, TRUE);
}