projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: rename "notification" -> "message"
[babeltrace.git]
/
plugins
/
lttng-utils
/
plugin.c
diff --git
a/plugins/lttng-utils/plugin.c
b/plugins/lttng-utils/plugin.c
index 6a4841e342e0929020b944625adac9693444728a..6654e76d68d6c129a03ed429058e7f49763b5b29 100644
(file)
--- a/
plugins/lttng-utils/plugin.c
+++ b/
plugins/lttng-utils/plugin.c
@@
-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(
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,16
+78,16
@@
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_
trace_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(
bt_self_message
_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);
+ it_data = bt_
self_message
_iterator_get_user_data(it);
BT_ASSERT(it_data);
if (it_data->input_iterator_group) {
BT_ASSERT(it_data);
if (it_data->input_iterator_group) {
@@
-98,25
+98,25
@@
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_
message_put_ref(it_data->current_message
);
+ 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 bt_message *handle_message
(FILE *err,
struct debug_info_iterator *debug_it,
struct debug_info_iterator *debug_it,
-
struct bt_notification *notification
)
+
const bt_message *message
)
{
{
-
struct bt_notification *new_notification
= NULL;
+
const bt_message *new_message
= NULL;
- switch (bt_
notification_get_type(notification
)) {
- case BT_
NOTIFICATION_TYPE_PACKET_BEGIN
:
+ switch (bt_
message_get_type(message
)) {
+ case BT_
MESSAGE_TYPE_PACKET_BEGINNING
:
{
{
-
struc
t bt_packet *packet =
- bt_
notification_packet_begin_get_packet(notification
);
-
struc
t bt_packet *writer_packet;
+
cons
t bt_packet *packet =
+ bt_
message_packet_beginning_get_packet(message
);
+
cons
t bt_packet *writer_packet;
if (!packet) {
goto end;
if (!packet) {
goto end;
@@
-124,18
+124,18
@@
struct bt_notification *handle_notification(FILE *err,
writer_packet = debug_info_new_packet(debug_it, packet);
BT_ASSERT(writer_packet);
writer_packet = debug_info_new_packet(debug_it, packet);
BT_ASSERT(writer_packet);
- new_
notification = bt_notification_packet_begin
_create(
+ new_
message = bt_message_packet_beginning
_create(
writer_packet);
writer_packet);
- BT_ASSERT(new_
notification
);
- bt_p
ut
(packet);
- bt_p
ut
(writer_packet);
+ BT_ASSERT(new_
message
);
+ bt_p
acket_put_ref
(packet);
+ bt_p
acket_put_ref
(writer_packet);
break;
}
break;
}
- case BT_
NOTIFICATION
_TYPE_PACKET_END:
+ case BT_
MESSAGE
_TYPE_PACKET_END:
{
{
-
struc
t bt_packet *packet =
- bt_
notification_packet_end_get_packet(notification
);
-
struc
t bt_packet *writer_packet;
+
cons
t bt_packet *packet =
+ bt_
message_packet_end_get_packet(message
);
+
cons
t bt_packet *writer_packet;
if (!packet) {
goto end;
if (!packet) {
goto end;
@@
-143,40
+143,40
@@
struct bt_notification *handle_notification(FILE *err,
writer_packet = debug_info_close_packet(debug_it, packet);
BT_ASSERT(writer_packet);
writer_packet = debug_info_close_packet(debug_it, packet);
BT_ASSERT(writer_packet);
- new_
notification = bt_notification
_packet_end_create(
+ new_
message = bt_message
_packet_end_create(
writer_packet);
writer_packet);
- BT_ASSERT(new_
notification
);
- bt_p
ut
(packet);
- bt_p
ut
(writer_packet);
+ BT_ASSERT(new_
message
);
+ bt_p
acket_put_ref
(packet);
+ bt_p
acket_put_ref
(writer_packet);
break;
}
break;
}
- case BT_
NOTIFICATION
_TYPE_EVENT:
+ case BT_
MESSAGE
_TYPE_EVENT:
{
{
-
struct bt_event *event = bt_notification
_event_get_event(
-
notification
);
-
struc
t bt_event *writer_event;
-
struct
bt_clock_class_priority_map *cc_prio_map =
- bt_
notification
_event_get_clock_class_priority_map(
-
notification
);
+
const bt_event *event = bt_message
_event_get_event(
+
message
);
+
cons
t bt_event *writer_event;
+ bt_clock_class_priority_map *cc_prio_map =
+ bt_
message
_event_get_clock_class_priority_map(
+
message
);
if (!event) {
goto end;
}
writer_event = debug_info_output_event(debug_it, event);
BT_ASSERT(writer_event);
if (!event) {
goto end;
}
writer_event = debug_info_output_event(debug_it, event);
BT_ASSERT(writer_event);
- new_
notification = bt_notification
_event_create(writer_event,
+ new_
message = bt_message
_event_create(writer_event,
cc_prio_map);
cc_prio_map);
- bt_
put
(cc_prio_map);
- BT_ASSERT(new_
notification
);
- bt_
put
(event);
- bt_
put
(writer_event);
+ bt_
object_put_ref
(cc_prio_map);
+ BT_ASSERT(new_
message
);
+ bt_
object_put_ref
(event);
+ bt_
object_put_ref
(writer_event);
break;
}
break;
}
- case BT_
NOTIFICATION_TYPE_STREAM_BEGIN
:
+ case BT_
MESSAGE_TYPE_STREAM_BEGINNING
:
{
{
-
struc
t bt_stream *stream =
- bt_
notification_stream_begin_get_stream(notification
);
-
struc
t bt_stream *writer_stream;
+
cons
t bt_stream *stream =
+ bt_
message_stream_beginning_get_stream(message
);
+
cons
t bt_stream *writer_stream;
if (!stream) {
goto end;
if (!stream) {
goto end;
@@
-184,18
+184,18
@@
struct bt_notification *handle_notification(FILE *err,
writer_stream = debug_info_stream_begin(debug_it, stream);
BT_ASSERT(writer_stream);
writer_stream = debug_info_stream_begin(debug_it, stream);
BT_ASSERT(writer_stream);
- new_
notification = bt_notification_stream_begin
_create(
+ new_
message = bt_message_stream_beginning
_create(
writer_stream);
writer_stream);
- BT_ASSERT(new_
notification
);
- bt_
put
(stream);
- bt_
put
(writer_stream);
+ BT_ASSERT(new_
message
);
+ bt_
stream_put_ref
(stream);
+ bt_
stream_put_ref
(writer_stream);
break;
}
break;
}
- case BT_
NOTIFICATION
_TYPE_STREAM_END:
+ case BT_
MESSAGE
_TYPE_STREAM_END:
{
{
-
struc
t bt_stream *stream =
- bt_
notification_stream_end_get_stream(notification
);
-
struc
t bt_stream *writer_stream;
+
cons
t bt_stream *stream =
+ bt_
message_stream_end_get_stream(message
);
+
cons
t bt_stream *writer_stream;
if (!stream) {
goto end;
if (!stream) {
goto end;
@@
-203,132
+203,132
@@
struct bt_notification *handle_notification(FILE *err,
writer_stream = debug_info_stream_end(debug_it, stream);
BT_ASSERT(writer_stream);
writer_stream = debug_info_stream_end(debug_it, stream);
BT_ASSERT(writer_stream);
- new_
notification = bt_notification
_stream_end_create(
+ new_
message = bt_message
_stream_end_create(
writer_stream);
writer_stream);
- BT_ASSERT(new_
notification
);
- bt_
put
(stream);
- bt_
put
(writer_stream);
+ BT_ASSERT(new_
message
);
+ bt_
stream_put_ref
(stream);
+ bt_
stream_put_ref
(writer_stream);
break;
}
default:
break;
}
default:
- new_
notification = bt_get(notification
);
+ new_
message = bt_message_get_ref(message
);
break;
}
end:
break;
}
end:
- return new_
notification
;
+ return new_
message
;
}
static
}
static
-
struct bt_notification
_iterator_next_method_return debug_info_iterator_next(
-
struct bt_private_connection_private_notification
_iterator *iterator)
+
bt_message
_iterator_next_method_return debug_info_iterator_next(
+
bt_self_message
_iterator *iterator)
{
struct debug_info_iterator *debug_it = NULL;
{
struct debug_info_iterator *debug_it = NULL;
-
struct bt_private
_component *component = NULL;
+
bt_self
_component *component = NULL;
struct debug_info_component *debug_info = NULL;
struct debug_info_component *debug_info = NULL;
-
struct bt_notification
_iterator *source_it = NULL;
-
struct bt_notification *notification
;
-
struct bt_notification
_iterator_next_method_return ret = {
- .status = BT_
NOTIFICATION
_ITERATOR_STATUS_OK,
- .
notification
= NULL,
+
bt_message
_iterator *source_it = NULL;
+
const bt_message *message
;
+
bt_message
_iterator_next_method_return ret = {
+ .status = BT_
MESSAGE
_ITERATOR_STATUS_OK,
+ .
message
= NULL,
};
};
- debug_it = bt_
private_connection_private_notification
_iterator_get_user_data(iterator);
+ debug_it = bt_
self_message
_iterator_get_user_data(iterator);
BT_ASSERT(debug_it);
BT_ASSERT(debug_it);
- component = bt_
private_connection_private_notification
_iterator_get_private_component(iterator);
+ component = bt_
self_message
_iterator_get_private_component(iterator);
BT_ASSERT(component);
BT_ASSERT(component);
- debug_info = bt_
private
_component_get_user_data(component);
+ debug_info = bt_
self
_component_get_user_data(component);
BT_ASSERT(debug_info);
source_it = debug_it->input_iterator;
BT_ASSERT(debug_info);
source_it = debug_it->input_iterator;
- ret.status = bt_
notification
_iterator_next(source_it);
- if (ret.status != BT_
NOTIFICATION
_ITERATOR_STATUS_OK) {
+ ret.status = bt_
message
_iterator_next(source_it);
+ if (ret.status != BT_
MESSAGE
_ITERATOR_STATUS_OK) {
goto end;
}
goto end;
}
-
notification = bt_notification_iterator_get_notification
(
+
message = bt_message_iterator_get_message
(
source_it);
source_it);
- if (!
notification
) {
- ret.status = BT_
NOTIFICATION
_ITERATOR_STATUS_ERROR;
+ if (!
message
) {
+ ret.status = BT_
MESSAGE
_ITERATOR_STATUS_ERROR;
goto end;
}
goto end;
}
- ret.
notification = handle_notification
(debug_info->err, debug_it,
-
notification
);
- BT_ASSERT(ret.
notification
);
- bt_
put(notification
);
+ ret.
message = handle_message
(debug_info->err, debug_it,
+
message
);
+ BT_ASSERT(ret.
message
);
+ bt_
message_put_ref(message
);
end:
end:
- bt_
put
(component);
+ bt_
object_put_ref
(component);
return ret;
}
static
return ret;
}
static
-enum bt_
notification
_iterator_status debug_info_iterator_init(
-
struct bt_private_connection_private_notification
_iterator *iterator,
+enum bt_
message
_iterator_status debug_info_iterator_init(
+
bt_self_message
_iterator *iterator,
struct bt_private_port *port)
{
struct bt_private_port *port)
{
- enum bt_
notification
_iterator_status ret =
- BT_
NOTIFICATION
_ITERATOR_STATUS_OK;
- enum bt_
notification
_iterator_status it_ret;
+ enum bt_
message
_iterator_status ret =
+ BT_
MESSAGE
_ITERATOR_STATUS_OK;
+ enum bt_
message
_iterator_status it_ret;
enum bt_connection_status conn_status;
struct bt_private_connection *connection = NULL;
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);
+
bt_self
_component *component =
+ bt_
self_message
_iterator_get_private_component(iterator);
struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
struct bt_private_port *input_port;
if (!it_data) {
struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
struct bt_private_port *input_port;
if (!it_data) {
- ret = BT_
NOTIFICATION
_ITERATOR_STATUS_NOMEM;
+ ret = BT_
MESSAGE
_ITERATOR_STATUS_NOMEM;
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) {
component, "in");
if (!input_port) {
- ret = BT_
NOTIFICATION
_ITERATOR_STATUS_ERROR;
+ ret = BT_
MESSAGE
_ITERATOR_STATUS_ERROR;
goto end;
}
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) {
if (!connection) {
- ret = BT_
NOTIFICATION
_ITERATOR_STATUS_ERROR;
+ ret = BT_
MESSAGE
_ITERATOR_STATUS_ERROR;
goto end;
}
goto end;
}
- conn_status = bt_private_connection_create_
notification
_iterator(
- connection,
NULL,
&it_data->input_iterator);
+ conn_status = bt_private_connection_create_
message
_iterator(
+ connection, &it_data->input_iterator);
if (conn_status != BT_CONNECTION_STATUS_OK) {
if (conn_status != BT_CONNECTION_STATUS_OK) {
- ret = BT_
NOTIFICATION
_ITERATOR_STATUS_ERROR;
+ ret = BT_
MESSAGE
_ITERATOR_STATUS_ERROR;
goto end;
}
it_data->debug_info_component = (struct debug_info_component *)
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_message
_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;
}
static
enum bt_component_status init_from_params(
struct debug_info_component *debug_info_component,
return ret;
}
static
enum bt_component_status init_from_params(
struct debug_info_component *debug_info_component,
-
struct
bt_value *params)
+ bt_value *params)
{
{
-
struct
bt_value *value = NULL;
+ bt_value *value = NULL;
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
BT_ASSERT(params);
enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
BT_ASSERT(params);
@@
-338,14
+338,9
@@
enum bt_component_status init_from_params(
enum bt_value_status value_ret;
const char *tmp;
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_
value_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);
@@
-365,15
+360,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_debug_dir);
- if (value_ret) {
- ret = BT_COMPONENT_STATUS_INVALID;
- BT_LOGE_STR("Failed to retrieve debug-info-dir value. "
- "Expecting a string.");
- }
+ debug_info_component->arg_debug_dir = bt_value_string_get(value);
}
}
- bt_
put
(value);
+ bt_
value_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_
value_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_
value_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,
+
bt_self_component *component,
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;
@@
-474,7
+451,7
@@
BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD_WITH_ID(lttng_utils,
debug_info, debug_info_component_init);
BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(lttng_utils,
debug_info, destroy_debug_info_component);
debug_info, debug_info_component_init);
BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(lttng_utils,
debug_info, destroy_debug_info_component);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_
NOTIFICATION
_ITERATOR_INIT_METHOD_WITH_ID(
+BT_PLUGIN_FILTER_COMPONENT_CLASS_
MESSAGE
_ITERATOR_INIT_METHOD_WITH_ID(
lttng_utils, debug_info, debug_info_iterator_init);
lttng_utils, debug_info, debug_info_iterator_init);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_
NOTIFICATION
_ITERATOR_FINALIZE_METHOD_WITH_ID(
+BT_PLUGIN_FILTER_COMPONENT_CLASS_
MESSAGE
_ITERATOR_FINALIZE_METHOD_WITH_ID(
lttng_utils, debug_info, debug_info_iterator_destroy);
lttng_utils, debug_info, debug_info_iterator_destroy);
This page took
0.042111 seconds
and
4
git commands to generate.