*/
#include "compat/memstream.h"
+#include "cpp-common/bt2c/libc-up.hpp"
+#include "cpp-common/bt2s/make-unique.hpp"
#include "../common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp"
#include "../common/src/metadata/tsdl/decoder.hpp"
enum lttng_live_iterator_status lttng_live_metadata_update(struct lttng_live_trace *trace)
{
struct lttng_live_session *session = trace->session;
- struct lttng_live_metadata *metadata = trace->metadata;
- size_t size, len_read = 0;
- char *metadata_buf = NULL;
+ struct lttng_live_metadata *metadata = trace->metadata.get();
+ std::vector<char> metadataBuf;
bool keep_receiving;
- FILE *fp = NULL;
+ bt2c::FileUP fp;
enum ctf_metadata_decoder_status decoder_status;
enum lttng_live_iterator_status status = LTTNG_LIVE_ITERATOR_STATUS_OK;
enum lttng_live_get_one_metadata_status metadata_status;
goto end;
}
- /*
- * Open a new write only file handle to populate the `metadata_buf`
- * memory buffer so we can write in loop in it easily.
- */
- fp = bt_open_memstream(&metadata_buf, &size);
- if (!fp) {
- if (errno == EINTR && lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
- session->lttng_live_msg_iter->was_interrupted = true;
- status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
- } else {
- BT_CPPLOGE_ERRNO_APPEND_CAUSE_SPEC(metadata->logger, "Metadata open_memstream", ".");
- status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
- }
- goto end;
- }
-
keep_receiving = true;
/* Grab all available metadata. */
while (keep_receiving) {
- size_t reply_len = 0;
/*
* lttng_live_get_one_metadata_packet() asks the Relay Daemon
* for new metadata. If new metadata is received, the function
* If we receive an _ERROR status, it means there was a
* networking, allocating, or some other unrecoverable error.
*/
- metadata_status = lttng_live_get_one_metadata_packet(trace, fp, &reply_len);
+ metadata_status = lttng_live_get_one_metadata_packet(trace, metadataBuf);
switch (metadata_status) {
case LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK:
- len_read += reply_len;
break;
case LTTNG_LIVE_GET_ONE_METADATA_STATUS_END:
keep_receiving = false;
}
}
- /* The memory buffer `metadata_buf` contains all the metadata. */
- if (bt_close_memstream(&metadata_buf, &size, fp)) {
- BT_CPPLOGW_ERRNO_SPEC(metadata->logger, "Metadata bt_close_memstream", ".");
- }
-
- fp = NULL;
-
- if (len_read == 0) {
+ if (metadataBuf.empty()) {
if (!trace->trace) {
status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
goto end;
* Open a new reading file handle on the `metadata_buf` and pass it to
* the metadata decoder.
*/
- fp = bt_fmemopen(metadata_buf, len_read, "rb");
+ fp.reset(bt_fmemopen(metadataBuf.data(), metadataBuf.size(), "rb"));
if (!fp) {
if (errno == EINTR && lttng_live_graph_is_canceled(session->lttng_live_msg_iter)) {
session->lttng_live_msg_iter->was_interrupted = true;
* new metadata to our current trace class.
*/
BT_CPPLOGD_SPEC(metadata->logger, "Appending new metadata to the ctf_trace class");
- decoder_status = ctf_metadata_decoder_append_content(metadata->decoder.get(), fp);
+ decoder_status = ctf_metadata_decoder_append_content(metadata->decoder.get(), fp.get());
switch (decoder_status) {
case CTF_METADATA_DECODER_STATUS_OK:
if (!trace->trace_class) {
struct ctf_trace_class *tc =
ctf_metadata_decoder_borrow_ctf_trace_class(metadata->decoder.get());
- trace->trace_class = ctf_metadata_decoder_get_ir_trace_class(metadata->decoder.get())
- .release()
- .libObjPtr();
- trace->trace = bt_trace_create(trace->trace_class);
+ trace->trace_class = ctf_metadata_decoder_get_ir_trace_class(metadata->decoder.get());
+ trace->trace = trace->trace_class->instantiate();
if (!trace->trace) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger, "Failed to create bt_trace");
goto error;
}
- if (ctf_trace_class_configure_ir_trace(tc, trace->trace)) {
- BT_CPPLOGE_APPEND_CAUSE_SPEC(metadata->logger,
- "Failed to configure ctf trace class");
- goto error;
- }
- if (!stream_classes_all_have_default_clock_class(trace->trace_class,
+
+ ctf_trace_class_configure_ir_trace(tc, *trace->trace);
+
+ if (!stream_classes_all_have_default_clock_class(trace->trace_class->libObjPtr(),
metadata->logger)) {
/* Error logged in function. */
goto error;
}
- trace->clock_class = borrow_any_clock_class(trace->trace_class);
+ trace->clock_class = borrow_any_clock_class(trace->trace_class->libObjPtr());
}
/* The metadata was updated successfully. */
error:
status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
end:
- if (fp) {
- int closeret;
-
- closeret = fclose(fp);
- if (closeret) {
- BT_CPPLOGW_ERRNO_SPEC(metadata->logger, "Error on fclose", ".");
- }
- }
- free(metadata_buf);
return status;
}
cfg.self_comp = session->self_comp;
cfg.create_trace_class = true;
- lttng_live_metadata *metadata = new lttng_live_metadata {session->logger};
+ auto metadata = bt2s::make_unique<lttng_live_metadata>(session->logger);
metadata->stream_id = stream_id;
metadata->decoder = ctf_metadata_decoder_create(&cfg);
if (!metadata->decoder) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(session->logger, "Failed to create CTF metadata decoder");
- goto error;
+ return -1;
}
+
trace = lttng_live_session_borrow_or_create_trace_by_id(session, ctf_trace_id);
if (!trace) {
BT_CPPLOGE_APPEND_CAUSE_SPEC(session->logger, "Failed to borrow trace");
- goto error;
+ return -1;
}
- trace->metadata = metadata;
- return 0;
-error:
- delete metadata;
- return -1;
-}
-
-void lttng_live_metadata_fini(struct lttng_live_trace *trace)
-{
- struct lttng_live_metadata *metadata = trace->metadata;
-
- if (!metadata) {
- return;
- }
- trace->metadata = NULL;
- delete metadata;
+ trace->metadata = std::move(metadata);
+ return 0;
}
projects / babeltrace.git / blobdiff