#include <stdbool.h>
#include <glib.h>
#include "writer.h"
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
static
gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
static
void destroy_writer_component_data(struct writer_component *writer_component)
{
- bt_put(writer_component->input_iterator);
+ bt_object_put_ref(writer_component->input_iterator);
g_hash_table_foreach_remove(writer_component->trace_map,
empty_trace_map, writer_component);
static
void free_fs_writer(struct fs_writer *fs_writer)
{
- bt_put(fs_writer->writer);
+ bt_object_put_ref(fs_writer->writer);
g_free(fs_writer);
}
}
ret = writer_new_packet(writer_component, packet);
- bt_put(packet);
+ bt_object_put_ref(packet);
break;
}
case BT_NOTIFICATION_TYPE_PACKET_END:
goto end;
}
ret = writer_close_packet(writer_component, packet);
- bt_put(packet);
+ bt_object_put_ref(packet);
break;
}
case BT_NOTIFICATION_TYPE_EVENT:
goto end;
}
ret = writer_output_event(writer_component, event);
- bt_put(event);
+ bt_object_put_ref(event);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
goto end;
}
ret = writer_stream_begin(writer_component, stream);
- bt_put(stream);
+ bt_object_put_ref(stream);
break;
}
case BT_NOTIFICATION_TYPE_STREAM_END:
goto end;
}
ret = writer_stream_end(writer_component, stream);
- bt_put(stream);
+ bt_object_put_ref(stream);
break;
}
default:
- puts("Unhandled notification type");
+ break;
}
end:
return ret;
struct bt_private_connection *connection;
struct writer_component *writer;
enum bt_connection_status conn_status;
- static const enum bt_notification_type notif_types[] = {
- BT_NOTIFICATION_TYPE_EVENT,
- BT_NOTIFICATION_TYPE_PACKET_BEGIN,
- BT_NOTIFICATION_TYPE_PACKET_END,
- BT_NOTIFICATION_TYPE_STREAM_BEGIN,
- BT_NOTIFICATION_TYPE_STREAM_END,
- BT_NOTIFICATION_TYPE_SENTINEL,
- };
writer = bt_private_component_get_user_data(component);
- assert(writer);
- assert(!writer->input_iterator);
+ BT_ASSERT(writer);
+ BT_ASSERT(!writer->input_iterator);
connection = bt_private_port_get_private_connection(self_port);
- assert(connection);
+ BT_ASSERT(connection);
conn_status = bt_private_connection_create_notification_iterator(
- connection, notif_types, &writer->input_iterator);
+ connection, &writer->input_iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
writer->error = true;
}
- bt_put(connection);
+ bt_object_put_ref(connection);
}
BT_HIDDEN
}
it = writer_component->input_iterator;
- assert(it);
+ BT_ASSERT(it);
it_ret = bt_notification_iterator_next(it);
switch (it_ret) {
case BT_NOTIFICATION_ITERATOR_STATUS_END:
ret = BT_COMPONENT_STATUS_END;
- BT_PUT(writer_component->input_iterator);
+ BT_OBJECT_PUT_REF_AND_RESET(writer_component->input_iterator);
goto end;
case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
ret = BT_COMPONENT_STATUS_AGAIN;
}
notification = bt_notification_iterator_get_notification(it);
- assert(notification);
+ BT_ASSERT(notification);
ret = handle_notification(writer_component, notification);
end:
- bt_put(notification);
+ bt_object_put_ref(notification);
return ret;
}
*found = true;
}
end:
- bt_put(value);
+ bt_object_put_ref(value);
return ret;
}
ret = BT_COMPONENT_STATUS_INVALID;
goto error;
}
- bt_put(value);
+ bt_object_put_ref(value);
writer_component->base_path = g_string_new(path);
if (!writer_component->base_path) {