projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document libbabeltrace2's C API
[babeltrace.git]
/
src
/
lib
/
graph
/
component-class-sink-simple.c
diff --git
a/src/lib/graph/component-class-sink-simple.c
b/src/lib/graph/component-class-sink-simple.c
index 27b32808b38e6e5a79e3cd5ee97c91a2b246f514..f8ac7ad1a2ff25b3dde46c5729a76946b29a005e 100644
(file)
--- a/
src/lib/graph/component-class-sink-simple.c
+++ b/
src/lib/graph/component-class-sink-simple.c
@@
-27,11
+27,10
@@
#include "common/common.h"
#include "lib/assert-pre.h"
#include "lib/object.h"
#include "common/common.h"
#include "lib/assert-pre.h"
#include "lib/object.h"
-#include <babeltrace2/graph/component-class-sink.h>
-#include <babeltrace2/graph/self-component-sink.h>
+#include <babeltrace2/graph/component-class.h>
#include <babeltrace2/graph/self-component-port.h>
#include <babeltrace2/graph/self-component-port.h>
-#include <babeltrace2/graph/self-component-port-input-message-iterator.h>
#include <babeltrace2/graph/self-component.h>
#include <babeltrace2/graph/self-component.h>
+#include <babeltrace2/graph/message-iterator.h>
#include <glib.h>
#include "component-class-sink-simple.h"
#include <glib.h>
#include "component-class-sink-simple.h"
@@
-46,7
+45,7
@@
static
struct bt_component_class_sink *simple_comp_cls;
struct simple_sink_data {
struct bt_component_class_sink *simple_comp_cls;
struct simple_sink_data {
- bt_
self_component_port_input_
message_iterator *msg_iter;
+ bt_message_iterator *msg_iter;
struct simple_sink_init_method_data init_method_data;
};
struct simple_sink_init_method_data init_method_data;
};
@@
-111,7
+110,7
@@
simple_sink_graph_is_configured(
bt_self_component_sink *self_comp)
{
bt_component_class_sink_graph_is_configured_method_status status;
bt_self_component_sink *self_comp)
{
bt_component_class_sink_graph_is_configured_method_status status;
- bt_
self_component_port_input_
message_iterator_create_from_sink_component_status
+ bt_message_iterator_create_from_sink_component_status
msg_iter_status;
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
msg_iter_status;
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
@@
-130,9
+129,9
@@
simple_sink_graph_is_configured(
}
BT_ASSERT(data);
}
BT_ASSERT(data);
- msg_iter_status = bt_
self_component_port_input_
message_iterator_create_from_sink_component(
+ msg_iter_status = bt_message_iterator_create_from_sink_component(
self_comp, self_port, &data->msg_iter);
self_comp, self_port, &data->msg_iter);
- if (msg_iter_status != BT_
SELF_COMPONENT_PORT_INPUT_
MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+ if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
BT_LIB_LOGE_APPEND_CAUSE(
"Cannot create input port message iterator: "
"%![comp-]+c, %![port-]+p", self_comp, self_port);
BT_LIB_LOGE_APPEND_CAUSE(
"Cannot create input port message iterator: "
"%![comp-]+c, %![port-]+p", self_comp, self_port);
@@
-171,14
+170,14
@@
enum bt_component_class_sink_consume_method_status simple_sink_consume(
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
struct simple_sink_data *data = bt_self_component_get_data(
bt_self_component_sink_as_self_component(self_comp));
- BT_ASSERT(data);
- BT_ASSERT(data->init_method_data.consume_func);
- BT_ASSERT(data->msg_iter);
+ BT_ASSERT
_DBG
(data);
+ BT_ASSERT
_DBG
(data->init_method_data.consume_func);
+ BT_ASSERT
_DBG
(data->msg_iter);
/* Call user's "consume" function */
status = data->init_method_data.consume_func(data->msg_iter,
data->init_method_data.user_data);
/* Call user's "consume" function */
status = data->init_method_data.consume_func(data->msg_iter,
data->init_method_data.user_data);
- if (status
!= BT_FUNC_STATUS_OK
) {
+ if (status
< 0
) {
BT_LIB_LOGW_APPEND_CAUSE(
"Simple sink component's user's \"consume\" function failed: "
"status=%s, %![comp-]+c",
BT_LIB_LOGW_APPEND_CAUSE(
"Simple sink component's user's \"consume\" function failed: "
"status=%s, %![comp-]+c",
@@
-192,6
+191,8
@@
struct bt_component_class_sink *bt_component_class_sink_simple_borrow(void)
{
enum bt_component_class_set_method_status set_method_status;
{
enum bt_component_class_set_method_status set_method_status;
+ BT_ASSERT_PRE_NO_ERROR();
+
if (simple_comp_cls) {
goto end;
}
if (simple_comp_cls) {
goto end;
}
This page took
0.032477 seconds
and
4
git commands to generate.