projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: make graph API const-correct
[babeltrace.git]
/
plugins
/
lttng-utils
/
plugin.c
diff --git
a/plugins/lttng-utils/plugin.c
b/plugins/lttng-utils/plugin.c
index 355384369c00c6c83d0bb7a533cd335c4380808c..c3b24f3f5eea0e33fc85d6665f7c0e8117f0d5d1 100644
(file)
--- a/
plugins/lttng-utils/plugin.c
+++ b/
plugins/lttng-utils/plugin.c
@@
-31,7
+31,7
@@
#include <babeltrace/babeltrace.h>
#include <plugins-common.h>
#include <babeltrace/babeltrace.h>
#include <plugins-common.h>
-#include <
assert
.h>
+#include <
babeltrace/assert-internal
.h>
#include "debug-info.h"
#include "copy.h"
#include "debug-info.h"
#include "copy.h"
@@
-54,9
+54,9
@@
void destroy_debug_info_data(struct debug_info_component *debug_info)
}
static
}
static
-void destroy_debug_info_component(struct bt_
private
_component *component)
+void destroy_debug_info_component(struct bt_
self
_component *component)
{
{
- void *data = bt_
private
_component_get_user_data(component);
+ void *data = bt_
self
_component_get_user_data(component);
destroy_debug_info_data(data);
}
destroy_debug_info_data(data);
}
@@
-78,17
+78,17
@@
end:
static
void unref_trace(struct debug_info_trace *di_trace)
{
static
void unref_trace(struct debug_info_trace *di_trace)
{
- bt_
put
(di_trace->writer_trace);
+ bt_
object_put_ref
(di_trace->writer_trace);
g_free(di_trace);
}
static
g_free(di_trace);
}
static
-void debug_info_iterator_destroy(struct bt_
private_connection_private
_notification_iterator *it)
+void debug_info_iterator_destroy(struct bt_
self
_notification_iterator *it)
{
struct debug_info_iterator *it_data;
{
struct debug_info_iterator *it_data;
- it_data = bt_
private_connection_private
_notification_iterator_get_user_data(it);
-
assert
(it_data);
+ it_data = bt_
self
_notification_iterator_get_user_data(it);
+
BT_ASSERT
(it_data);
if (it_data->input_iterator_group) {
g_ptr_array_free(it_data->input_iterator_group, TRUE);
if (it_data->input_iterator_group) {
g_ptr_array_free(it_data->input_iterator_group, TRUE);
@@
-98,63
+98,63
@@
void debug_info_iterator_destroy(struct bt_private_connection_private_notificati
empty_trace_map, it_data);
g_hash_table_destroy(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);
+ bt_
object_put_ref
(it_data->current_notification);
+ bt_
object_put_ref
(it_data->input_iterator);
g_free(it_data);
}
static
g_free(it_data);
}
static
-struct bt_notification *handle_notification(FILE *err,
+
const
struct bt_notification *handle_notification(FILE *err,
struct debug_info_iterator *debug_it,
struct debug_info_iterator *debug_it,
- struct bt_notification *notification)
+
const
struct bt_notification *notification)
{
{
- struct bt_notification *new_notification = NULL;
+
const
struct bt_notification *new_notification = NULL;
switch (bt_notification_get_type(notification)) {
case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
{
switch (bt_notification_get_type(notification)) {
case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
{
-
struct bt_ctf
_packet *packet =
+
const struct bt
_packet *packet =
bt_notification_packet_begin_get_packet(notification);
bt_notification_packet_begin_get_packet(notification);
-
struct bt_ctf
_packet *writer_packet;
+
const struct bt
_packet *writer_packet;
if (!packet) {
goto end;
}
writer_packet = debug_info_new_packet(debug_it, packet);
if (!packet) {
goto end;
}
writer_packet = debug_info_new_packet(debug_it, packet);
-
assert
(writer_packet);
+
BT_ASSERT
(writer_packet);
new_notification = bt_notification_packet_begin_create(
writer_packet);
new_notification = bt_notification_packet_begin_create(
writer_packet);
-
assert
(new_notification);
- bt_
put
(packet);
- bt_
put
(writer_packet);
+
BT_ASSERT
(new_notification);
+ bt_
object_put_ref
(packet);
+ bt_
object_put_ref
(writer_packet);
break;
}
case BT_NOTIFICATION_TYPE_PACKET_END:
{
break;
}
case BT_NOTIFICATION_TYPE_PACKET_END:
{
-
struct bt_ctf
_packet *packet =
+
const struct bt
_packet *packet =
bt_notification_packet_end_get_packet(notification);
bt_notification_packet_end_get_packet(notification);
-
struct bt_ctf
_packet *writer_packet;
+
const struct bt
_packet *writer_packet;
if (!packet) {
goto end;
}
writer_packet = debug_info_close_packet(debug_it, packet);
if (!packet) {
goto end;
}
writer_packet = debug_info_close_packet(debug_it, packet);
-
assert
(writer_packet);
+
BT_ASSERT
(writer_packet);
new_notification = bt_notification_packet_end_create(
writer_packet);
new_notification = bt_notification_packet_end_create(
writer_packet);
-
assert
(new_notification);
- bt_
put
(packet);
- bt_
put
(writer_packet);
+
BT_ASSERT
(new_notification);
+ bt_
object_put_ref
(packet);
+ bt_
object_put_ref
(writer_packet);
break;
}
case BT_NOTIFICATION_TYPE_EVENT:
{
break;
}
case BT_NOTIFICATION_TYPE_EVENT:
{
-
struct bt_ctf
_event *event = bt_notification_event_get_event(
+
const struct bt
_event *event = bt_notification_event_get_event(
notification);
notification);
-
struct bt_ctf
_event *writer_event;
+
const struct bt
_event *writer_event;
struct bt_clock_class_priority_map *cc_prio_map =
bt_notification_event_get_clock_class_priority_map(
notification);
struct bt_clock_class_priority_map *cc_prio_map =
bt_notification_event_get_clock_class_priority_map(
notification);
@@
-163,55
+163,55
@@
struct bt_notification *handle_notification(FILE *err,
goto end;
}
writer_event = debug_info_output_event(debug_it, event);
goto end;
}
writer_event = debug_info_output_event(debug_it, event);
-
assert
(writer_event);
+
BT_ASSERT
(writer_event);
new_notification = bt_notification_event_create(writer_event,
cc_prio_map);
new_notification = bt_notification_event_create(writer_event,
cc_prio_map);
- bt_
put
(cc_prio_map);
-
assert
(new_notification);
- bt_
put
(event);
- bt_
put
(writer_event);
+ bt_
object_put_ref
(cc_prio_map);
+
BT_ASSERT
(new_notification);
+ bt_
object_put_ref
(event);
+ bt_
object_put_ref
(writer_event);
break;
}
case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
{
break;
}
case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
{
-
struct bt_ctf
_stream *stream =
+
const struct bt
_stream *stream =
bt_notification_stream_begin_get_stream(notification);
bt_notification_stream_begin_get_stream(notification);
-
struct bt_ctf
_stream *writer_stream;
+
const struct bt
_stream *writer_stream;
if (!stream) {
goto end;
}
writer_stream = debug_info_stream_begin(debug_it, stream);
if (!stream) {
goto end;
}
writer_stream = debug_info_stream_begin(debug_it, stream);
-
assert
(writer_stream);
+
BT_ASSERT
(writer_stream);
new_notification = bt_notification_stream_begin_create(
writer_stream);
new_notification = bt_notification_stream_begin_create(
writer_stream);
-
assert
(new_notification);
- bt_
put
(stream);
- bt_
put
(writer_stream);
+
BT_ASSERT
(new_notification);
+ bt_
object_put_ref
(stream);
+ bt_
object_put_ref
(writer_stream);
break;
}
case BT_NOTIFICATION_TYPE_STREAM_END:
{
break;
}
case BT_NOTIFICATION_TYPE_STREAM_END:
{
-
struct bt_ctf
_stream *stream =
+
const struct bt
_stream *stream =
bt_notification_stream_end_get_stream(notification);
bt_notification_stream_end_get_stream(notification);
-
struct bt_ctf
_stream *writer_stream;
+
const struct bt
_stream *writer_stream;
if (!stream) {
goto end;
}
writer_stream = debug_info_stream_end(debug_it, stream);
if (!stream) {
goto end;
}
writer_stream = debug_info_stream_end(debug_it, stream);
-
assert
(writer_stream);
+
BT_ASSERT
(writer_stream);
new_notification = bt_notification_stream_end_create(
writer_stream);
new_notification = bt_notification_stream_end_create(
writer_stream);
-
assert
(new_notification);
- bt_
put
(stream);
- bt_
put
(writer_stream);
+
BT_ASSERT
(new_notification);
+ bt_
object_put_ref
(stream);
+ bt_
object_put_ref
(writer_stream);
break;
}
default:
break;
}
default:
- new_notification = bt_
get
(notification);
+ new_notification = bt_
object_get_ref
(notification);
break;
}
break;
}
@@
-221,25
+221,25
@@
end:
static
struct bt_notification_iterator_next_method_return debug_info_iterator_next(
static
struct bt_notification_iterator_next_method_return debug_info_iterator_next(
- struct bt_
private_connection_private
_notification_iterator *iterator)
+ struct bt_
self
_notification_iterator *iterator)
{
struct debug_info_iterator *debug_it = NULL;
{
struct debug_info_iterator *debug_it = NULL;
- struct bt_
private
_component *component = NULL;
+ struct bt_
self
_component *component = NULL;
struct debug_info_component *debug_info = NULL;
struct bt_notification_iterator *source_it = NULL;
struct debug_info_component *debug_info = NULL;
struct bt_notification_iterator *source_it = NULL;
- struct bt_notification *notification;
+
const
struct bt_notification *notification;
struct bt_notification_iterator_next_method_return ret = {
.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
.notification = NULL,
};
struct bt_notification_iterator_next_method_return ret = {
.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
.notification = NULL,
};
- debug_it = bt_
private_connection_private
_notification_iterator_get_user_data(iterator);
-
assert
(debug_it);
+ debug_it = bt_
self
_notification_iterator_get_user_data(iterator);
+
BT_ASSERT
(debug_it);
- component = bt_
private_connection_private
_notification_iterator_get_private_component(iterator);
-
assert
(component);
- debug_info = bt_
private
_component_get_user_data(component);
-
assert
(debug_info);
+ component = bt_
self
_notification_iterator_get_private_component(iterator);
+
BT_ASSERT
(component);
+ debug_info = bt_
self
_component_get_user_data(component);
+
BT_ASSERT
(debug_info);
source_it = debug_it->input_iterator;
source_it = debug_it->input_iterator;
@@
-257,17
+257,17
@@
struct bt_notification_iterator_next_method_return debug_info_iterator_next(
ret.notification = handle_notification(debug_info->err, debug_it,
notification);
ret.notification = handle_notification(debug_info->err, debug_it,
notification);
-
assert
(ret.notification);
- bt_
put
(notification);
+
BT_ASSERT
(ret.notification);
+ bt_
object_put_ref
(notification);
end:
end:
- bt_
put
(component);
+ bt_
object_put_ref
(component);
return ret;
}
static
enum bt_notification_iterator_status debug_info_iterator_init(
return ret;
}
static
enum bt_notification_iterator_status debug_info_iterator_init(
- struct bt_
private_connection_private
_notification_iterator *iterator,
+ struct bt_
self
_notification_iterator *iterator,
struct bt_private_port *port)
{
enum bt_notification_iterator_status ret =
struct bt_private_port *port)
{
enum bt_notification_iterator_status ret =
@@
-275,8
+275,8
@@
enum bt_notification_iterator_status debug_info_iterator_init(
enum bt_notification_iterator_status it_ret;
enum bt_connection_status conn_status;
struct bt_private_connection *connection = NULL;
enum bt_notification_iterator_status it_ret;
enum bt_connection_status conn_status;
struct bt_private_connection *connection = NULL;
- struct bt_
private
_component *component =
- bt_
private_connection_private
_notification_iterator_get_private_component(iterator);
+ struct bt_
self
_component *component =
+ bt_
self
_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;
struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
struct bt_private_port *input_port;
@@
-285,41
+285,41
@@
enum bt_notification_iterator_status debug_info_iterator_init(
goto end;
}
goto end;
}
- input_port = bt_
private_component_filter_get_input_private
_port_by_name(
+ input_port = bt_
self_component_filter_get_input
_port_by_name(
component, "in");
if (!input_port) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
component, "in");
if (!input_port) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
- connection = bt_private_port_get_
private_
connection(input_port);
- bt_
put
(input_port);
+ connection = bt_private_port_get_connection(input_port);
+ bt_
object_put_ref
(input_port);
if (!connection) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
conn_status = bt_private_connection_create_notification_iterator(
if (!connection) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
conn_status = bt_private_connection_create_notification_iterator(
- connection,
NULL,
&it_data->input_iterator);
+ connection, &it_data->input_iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
it_data->debug_info_component = (struct debug_info_component *)
if (conn_status != BT_CONNECTION_STATUS_OK) {
ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
goto end;
}
it_data->debug_info_component = (struct debug_info_component *)
- bt_
private
_component_get_user_data(component);
+ bt_
self
_component_get_user_data(component);
it_data->err = it_data->debug_info_component->err;
it_data->trace_map = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL, (GDestroyNotify) unref_trace);
it_data->err = it_data->debug_info_component->err;
it_data->trace_map = g_hash_table_new_full(g_direct_hash,
g_direct_equal, NULL, (GDestroyNotify) unref_trace);
- it_ret = bt_
private_connection_private
_notification_iterator_set_user_data(iterator, it_data);
+ it_ret = bt_
self
_notification_iterator_set_user_data(iterator, it_data);
if (it_ret) {
goto end;
}
end:
if (it_ret) {
goto end;
}
end:
- bt_
put
(connection);
- bt_
put
(component);
+ bt_
object_put_ref
(connection);
+ bt_
object_put_ref
(component);
return ret;
}
return ret;
}
@@
-331,21
+331,16
@@
enum bt_component_status init_from_params(
struct bt_value *value = NULL;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
struct bt_value *value = NULL;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
assert
(params);
+
BT_ASSERT
(params);
value = bt_value_map_get(params, "debug-info-field-name");
if (value) {
enum bt_value_status value_ret;
const char *tmp;
value = bt_value_map_get(params, "debug-info-field-name");
if (value) {
enum bt_value_status value_ret;
const char *tmp;
- value_ret = bt_value_string_get(value, &tmp);
- if (value_ret) {
- ret = BT_COMPONENT_STATUS_INVALID;
- BT_LOGE_STR("Failed to retrieve debug-info-field-name value. "
- "Expecting a string.");
- }
+ tmp = bt_value_string_get(value);
strcpy(debug_info_component->arg_debug_info_field_name, tmp);
strcpy(debug_info_component->arg_debug_info_field_name, tmp);
- bt_
put
(value);
+ bt_
object_put_ref
(value);
} else {
debug_info_component->arg_debug_info_field_name =
malloc(strlen("debug_info") + 1);
} else {
debug_info_component->arg_debug_info_field_name =
malloc(strlen("debug_info") + 1);
@@
-361,19
+356,13
@@
enum bt_component_status init_from_params(
goto end;
}
goto end;
}
- value = bt_value_map_get(params, "debug-dir");
+ value = bt_value_map_get(params, "debug-
info-
dir");
if (value) {
enum bt_value_status value_ret;
if (value) {
enum bt_value_status value_ret;
- value_ret = bt_value_string_get(value,
- &debug_info_component->arg_debug_dir);
- if (value_ret) {
- ret = BT_COMPONENT_STATUS_INVALID;
- BT_LOGE_STR("Failed to retrieve debug-dir value. "
- "Expecting a string.");
- }
+ debug_info_component->arg_debug_dir = bt_value_string_get(value);
}
}
- bt_
put
(value);
+ bt_
object_put_ref
(value);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
@@
-382,15
+371,9
@@
enum bt_component_status init_from_params(
if (value) {
enum bt_value_status value_ret;
if (value) {
enum bt_value_status value_ret;
- value_ret = bt_value_string_get(value,
- &debug_info_component->arg_target_prefix);
- if (value_ret) {
- ret = BT_COMPONENT_STATUS_INVALID;
- BT_LOGE_STR("Failed to retrieve target-prefix value. "
- "Expecting a string.");
- }
+ debug_info_component->arg_target_prefix = bt_value_string_get(value);
}
}
- bt_
put
(value);
+ bt_
object_put_ref
(value);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
@@
-400,17
+383,11
@@
enum bt_component_status init_from_params(
enum bt_value_status value_ret;
bt_bool bool_val;
enum bt_value_status value_ret;
bt_bool bool_val;
- value_ret = bt_value_bool_get(value,
- &bool_val);
- if (value_ret) {
- ret = BT_COMPONENT_STATUS_INVALID;
- BT_LOGE_STR("Failed to retrieve full-path value. "
- "Expecting a boolean.");
- }
+ bool_val = bt_value_bool_get(value);
debug_info_component->arg_full_path = bool_val;
}
debug_info_component->arg_full_path = bool_val;
}
- bt_
put
(value);
+ bt_
object_put_ref
(value);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
@@
-420,7
+397,7
@@
end:
}
enum bt_component_status debug_info_component_init(
}
enum bt_component_status debug_info_component_init(
- struct bt_
private
_component *component, struct bt_value *params,
+ struct bt_
self
_component *component, struct bt_value *params,
UNUSED_VAR void *init_method_data)
{
enum bt_component_status ret;
UNUSED_VAR void *init_method_data)
{
enum bt_component_status ret;
@@
-431,18
+408,18
@@
enum bt_component_status debug_info_component_init(
goto end;
}
goto end;
}
- ret = bt_
private
_component_set_user_data(component, debug_info);
+ ret = bt_
self
_component_set_user_data(component, debug_info);
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
}
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
}
- ret = bt_
private_component_filter_add_input_private
_port(
+ ret = bt_
self_component_filter_add_input
_port(
component, "in", NULL, NULL);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
component, "in", NULL, NULL);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
- ret = bt_
private_component_filter_add_output_private
_port(
+ ret = bt_
self_component_filter_add_output
_port(
component, "out", NULL, NULL);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
component, "out", NULL, NULL);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
This page took
0.031075 seconds
and
4
git commands to generate.