#define BT_COMP_LOG_SELF_COMP (stream->trace->fs_sink->self_comp)
#define BT_LOG_OUTPUT_LEVEL (stream->log_level)
#define BT_LOG_TAG "PLUGIN/SINK.CTF.FS/STREAM"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
#include <babeltrace2/babeltrace.h>
#include <stdio.h>
stream->prev_packet_state.discarded_events_counter = UINT64_C(-1);
stream->prev_packet_state.seq_num = UINT64_C(-1);
ret = try_translate_stream_class_trace_ir_to_ctf_ir(trace->fs_sink,
- trace->tc, bt_stream_borrow_class_const(ir_stream),
+ trace->trace, bt_stream_borrow_class_const(ir_stream),
&stream->sc);
if (ret) {
goto error;
if (fc->is_signed) {
ret = bt_ctfser_write_signed_int(&stream->ctfser,
- bt_field_signed_integer_get_value(field),
+ bt_field_integer_signed_get_value(field),
fc->base.base.alignment, fc->base.size, BYTE_ORDER);
} else {
ret = bt_ctfser_write_unsigned_int(&stream->ctfser,
- bt_field_unsigned_integer_get_value(field),
+ bt_field_integer_unsigned_get_value(field),
fc->base.base.alignment, fc->base.size, BYTE_ORDER);
}
/* Other members */
if (stream->sc->packet_context_fc) {
- const bt_field *packet_context_field =
- bt_packet_borrow_context_field_const(
- stream->packet_state.packet);
+ const bt_field *packet_context_field;
+ BT_ASSERT(stream->packet_state.packet);
+ packet_context_field = bt_packet_borrow_context_field_const(
+ stream->packet_state.packet);
BT_ASSERT(packet_context_field);
ret = write_struct_field(stream,
(void *) stream->sc->packet_context_fc,
}
/* Packet header: UUID */
- for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
+ for (i = 0; i < BT_UUID_LEN; i++) {
ret = bt_ctfser_write_byte_aligned_unsigned_int(&stream->ctfser,
- (uint64_t) stream->sc->tc->uuid[i], 8, 8, BYTE_ORDER);
+ (uint64_t) stream->sc->trace->uuid[i], 8, 8, BYTE_ORDER);
if (ret) {
BT_COMP_LOGE("Error writing packet header UUID: stream-file-name=%s",
stream->file_name->str);