summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2d5d8c7)
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I944475345ed8dd5b1ae2824eb86cf9ead56cd92f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8456
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12371
Tested-by: jenkins <jenkins@lttng.org>
- read_len = MIN(request_sz, stream->buflen);
+ read_len = MIN(request_sz, stream->buf.size());
read_len = MIN(read_len, len_left);
read_len = MIN(read_len, len_left);
- status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf, stream->offset,
+ status = lttng_live_get_stream_bytes(live_msg_iter, stream, stream->buf.data(), stream->offset,
- *buffer_addr = stream->buf;
+ *buffer_addr = stream->buf.data();
*buffer_sz = recv_len;
stream->offset += recv_len;
end:
*buffer_sz = recv_len;
stream->offset += recv_len;
end:
- stream_iter->buf = g_new0(uint8_t, lttng_live->max_query_size);
- if (!stream_iter->buf) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
- "Failed to allocate live stream iterator buffer");
- goto error;
- }
-
- stream_iter->buflen = lttng_live->max_query_size;
+ stream_iter->buf.resize(lttng_live->max_query_size);
stream_iter->name = g_string_new(NULL);
if (!stream_iter->name) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
stream_iter->name = g_string_new(NULL);
if (!stream_iter->name) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(stream_iter->logger,
- g_free(stream_iter->buf);
if (stream_iter->name) {
g_string_free(stream_iter->name, TRUE);
}
if (stream_iter->name) {
g_string_free(stream_iter->name, TRUE);
}
/* Timestamp in nanoseconds of the current message (current_msg). */
int64_t current_msg_ts_ns = 0;
/* Timestamp in nanoseconds of the current message (current_msg). */
int64_t current_msg_ts_ns = 0;
- /* Owned by this. */
- uint8_t *buf = nullptr;
- size_t buflen = 0;
+ std::vector<uint8_t> buf;
/* Owned by this. */
GString *name = nullptr;
/* Owned by this. */
GString *name = nullptr;