struct debug_info_trace *di_trace)
{
struct bt_ctf_packet *writer_packet;
+ int ret;
writer_packet = bt_ctf_packet_create(writer_stream);
if (!writer_packet) {
fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
__FILE__, __LINE__);
- goto end;
+ goto error;
}
- g_hash_table_insert(di_trace->packet_map, (gpointer) packet, writer_packet);
+ ret = ctf_packet_copy_header(debug_it->err, packet, writer_packet);
+ if (ret) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ g_hash_table_insert(di_trace->packet_map, (gpointer) packet,
+ writer_packet);
+ goto end;
+
+error:
+ BT_PUT(writer_packet);
end:
return writer_packet;
}
name = NULL;
}
- writer_stream_class = bt_ctf_stream_class_create(name);
+ writer_stream_class = bt_ctf_stream_class_create_empty(name);
if (!writer_stream_class) {
fprintf(err, "[error] %s in %s:%d\n",
__func__, __FILE__, __LINE__);
}
type = bt_ctf_stream_class_get_packet_context_type(stream_class);
- if (!type) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
- }
-
- ret_int = bt_ctf_stream_class_set_packet_context_type(
- writer_stream_class, type);
- if (ret_int < 0) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
+ if (type) {
+ ret_int = bt_ctf_stream_class_set_packet_context_type(
+ writer_stream_class, type);
+ if (ret_int < 0) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+ __LINE__);
+ goto error;
+ }
+ BT_PUT(type);
}
- BT_PUT(type);
type = bt_ctf_stream_class_get_event_header_type(stream_class);
if (type) {
struct bt_ctf_packet *packet)
{
struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
- struct bt_ctf_field *writer_packet_context = NULL;
struct bt_ctf_packet *writer_packet = NULL;
+ struct bt_ctf_field *packet_context = NULL;
struct debug_info_trace *di_trace;
int int_ret;
goto error;
}
- writer_packet_context = ctf_copy_packet_context(debug_it->err, packet,
- writer_stream);
- if (!writer_packet_context) {
- fprintf(debug_it->err, "[error] %s in %s:%d\n",
- __func__, __FILE__, __LINE__);
- goto error;
- }
-
- int_ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context);
- if (int_ret) {
- fprintf(debug_it->err, "[error] %s in %s:%d\n",
- __func__, __FILE__, __LINE__);
- goto error;
+ packet_context = bt_ctf_packet_get_context(packet);
+ if (packet_context) {
+ int_ret = ctf_packet_copy_context(debug_it->err,
+ packet, writer_stream, writer_packet);
+ if (int_ret < 0) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
+ }
+ BT_PUT(packet_context);
}
bt_get(writer_packet);
error:
end:
- bt_put(writer_packet_context);
+ bt_put(packet_context);
bt_put(writer_stream);
bt_put(stream);
return writer_packet;