* SOFTWARE.
*/
+#define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
+#include "logging.h"
+
#include <babeltrace/graph/notification-iterator.h>
#include <babeltrace/graph/private-notification-iterator.h>
#include <babeltrace/graph/connection.h>
#include "debug-info.h"
#include "copy.h"
+static
+gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
+{
+ struct debug_info_trace *di_trace = value;
+
+ di_trace->trace_static = 1;
+ debug_info_close_trace(di_trace->debug_it, di_trace);
+
+ return TRUE;
+}
+
static
void destroy_debug_info_data(struct debug_info_component *debug_info)
{
static
void unref_trace(struct debug_info_trace *di_trace)
{
- bt_put(di_trace->trace);
+ bt_put(di_trace->writer_trace);
+ g_free(di_trace);
}
static
if (it_data->input_iterator_group) {
g_ptr_array_free(it_data->input_iterator_group, TRUE);
}
+
+ g_hash_table_foreach_remove(it_data->trace_map,
+ empty_trace_map, it_data);
+ g_hash_table_destroy(it_data->trace_map);
+
bt_put(it_data->current_notification);
bt_put(it_data->input_iterator);
- g_hash_table_destroy(it_data->trace_map);
- /*
- * TODO
- g_hash_table_destroy(it_data->stream_map);
- g_hash_table_destroy(it_data->stream_class_map);
- g_hash_table_destroy(it_data->packet_map);
- g_hash_table_destroy(it_data->trace_debug_map);
- */
+
g_free(it_data);
}
writer_packet);
assert(new_notification);
bt_put(packet);
+ bt_put(writer_packet);
break;
}
case BT_NOTIFICATION_TYPE_PACKET_END:
writer_packet);
assert(new_notification);
bt_put(packet);
+ bt_put(writer_packet);
break;
}
case BT_NOTIFICATION_TYPE_EVENT:
bt_put(writer_stream);
break;
}
- case BT_NOTIFICATION_TYPE_INACTIVITY:
- {
+ default:
new_notification = bt_get(notification);
break;
}
- default:
- puts("Unhandled notification type");
- }
end:
return new_notification;
bt_private_notification_iterator_get_private_component(iterator);
struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
struct bt_private_port *input_port;
- static const enum bt_notification_type notif_types[] = {
- BT_NOTIFICATION_TYPE_EVENT,
- BT_NOTIFICATION_TYPE_STREAM_BEGIN,
- BT_NOTIFICATION_TYPE_STREAM_END,
- BT_NOTIFICATION_TYPE_PACKET_BEGIN,
- BT_NOTIFICATION_TYPE_PACKET_END,
- BT_NOTIFICATION_TYPE_SENTINEL,
- };
if (!it_data) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
}
conn_status = bt_private_connection_create_notification_iterator(
- connection, notif_types, &it_data->input_iterator);
+ connection, NULL, &it_data->input_iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
value_ret = bt_value_string_get(value, &tmp);
if (value_ret) {
ret = BT_COMPONENT_STATUS_INVALID;
- printf_error("Failed to retrieve debug-info-field-name value. "
+ BT_LOGE_STR("Failed to retrieve debug-info-field-name value. "
"Expecting a string");
}
strcpy(debug_info_component->arg_debug_info_field_name, tmp);
malloc(strlen("debug_info") + 1);
if (!debug_info_component->arg_debug_info_field_name) {
ret = BT_COMPONENT_STATUS_NOMEM;
- printf_error();
+ BT_LOGE_STR("Missing field name.");
}
sprintf(debug_info_component->arg_debug_info_field_name,
"debug_info");
&debug_info_component->arg_debug_dir);
if (value_ret) {
ret = BT_COMPONENT_STATUS_INVALID;
- printf_error("Failed to retrieve debug-dir value. "
+ BT_LOGE_STR("Failed to retrieve debug-dir value. "
"Expecting a string");
}
}
&debug_info_component->arg_target_prefix);
if (value_ret) {
ret = BT_COMPONENT_STATUS_INVALID;
- printf_error("Failed to retrieve target-prefix value. "
+ BT_LOGE_STR("Failed to retrieve target-prefix value. "
"Expecting a string");
}
}
&bool_val);
if (value_ret) {
ret = BT_COMPONENT_STATUS_INVALID;
- printf_error("Failed to retrieve full-path value. "
+ BT_LOGE_STR("Failed to retrieve full-path value. "
"Expecting a boolean");
}
return ret;
}
+#ifndef BT_BUILT_IN_PLUGINS
+BT_PLUGIN_MODULE();
+#endif
+
/* Initialize plug-in entry points. */
BT_PLUGIN_WITH_ID(lttng_utils, "lttng-utils");
BT_PLUGIN_DESCRIPTION_WITH_ID(lttng_utils, "LTTng utilities");