X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fcomponent%2Fsink.c;h=1f01d3191e3b9a9e436531732bfd19a91dcd825e;hb=b2e0c9076135f47110af2d96dfaee397c597bc90;hp=43f5680740a45edd7e37cd31971191df5366d574;hpb=366e034f3d491ee6774a2aeb864067582e0da557;p=babeltrace.git diff --git a/lib/component/sink.c b/lib/component/sink.c index 43f56807..1f01d319 100644 --- a/lib/component/sink.c +++ b/lib/component/sink.c @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include BT_HIDDEN enum bt_component_status bt_component_sink_validate( @@ -56,15 +56,9 @@ end: return ret; } -static +BT_HIDDEN void bt_component_sink_destroy(struct bt_component *component) { - struct bt_component_sink *sink = container_of(component, - struct bt_component_sink, parent); - - if (sink->input_ports) { - g_ptr_array_free(sink->input_ports, TRUE); - } } BT_HIDDEN @@ -72,39 +66,17 @@ struct bt_component *bt_component_sink_create( struct bt_component_class *class, struct bt_value *params) { struct bt_component_sink *sink = NULL; - enum bt_component_status ret; sink = g_new0(struct bt_component_sink, 1); if (!sink) { goto end; } - sink->parent.class = bt_get(class); - ret = bt_component_init(&sink->parent, bt_component_sink_destroy); - if (ret != BT_COMPONENT_STATUS_OK) { - goto error; - } - -/* - ret = bt_component_sink_register_notification_type(&sink->parent, - BT_NOTIFICATION_TYPE_EVENT); - if (ret != BT_COMPONENT_STATUS_OK) { - goto error; - } -*/ - ret = bt_component_init_input_ports(&sink->parent, - &sink->input_ports); - if (ret) { - goto error; - } - end: return sink ? &sink->parent : NULL; -error: - BT_PUT(sink); - return NULL; } +BT_HIDDEN enum bt_component_status bt_component_sink_consume( struct bt_component *component) { @@ -123,96 +95,53 @@ enum bt_component_status bt_component_sink_consume( sink_class = container_of(component->class, struct bt_component_class_sink, parent); assert(sink_class->methods.consume); - ret = sink_class->methods.consume(component); + ret = sink_class->methods.consume(bt_private_component_from_component(component)); end: return ret; } -/* -static -enum bt_component_status bt_component_sink_register_notification_type( - struct bt_component *component, enum bt_notification_type type) -{ - enum bt_component_status ret = BT_COMPONENT_STATUS_OK; - struct bt_component_sink *sink = NULL; - if (!component) { - ret = BT_COMPONENT_STATUS_INVALID; - goto end; - } - - if (bt_component_get_class_type(component) != BT_COMPONENT_CLASS_TYPE_SINK) { - ret = BT_COMPONENT_STATUS_UNSUPPORTED; - goto end; - } - - if (type <= BT_NOTIFICATION_TYPE_UNKNOWN || - type >= BT_NOTIFICATION_TYPE_NR) { - ret = BT_COMPONENT_STATUS_INVALID; - goto end; - } - sink = container_of(component, struct bt_component_sink, parent); - if (type == BT_NOTIFICATION_TYPE_ALL) { - sink->registered_notifications_mask = ~(notification_mask_t) 0; - } else { - sink->registered_notifications_mask |= - (notification_mask_t) 1 << type; - } -end: - return ret; -} -*/ - -int bt_component_sink_get_input_port_count(struct bt_component *component) +enum bt_component_status bt_component_sink_get_input_port_count( + struct bt_component *component, uint64_t *count) { - int ret; - struct bt_component_sink *sink; - - if (!component) { - ret = -1; - goto end; - } + enum bt_component_status status = BT_COMPONENT_STATUS_OK; - if (component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { - ret = -1; + if (!component || !count || + component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { + status = BT_COMPONENT_STATUS_INVALID; goto end; } - sink = container_of(component, struct bt_component_sink, parent); - ret = sink->input_ports->len; + *count = bt_component_get_input_port_count(component); end: - return ret; + return status; } struct bt_port *bt_component_sink_get_input_port( struct bt_component *component, const char *name) { - struct bt_component_sink *sink; - struct bt_port *ret_port = NULL; + struct bt_port *port = NULL; if (!component || !name || component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { goto end; } - sink = container_of(component, struct bt_component_sink, parent); - ret_port = bt_component_get_port(sink->input_ports, name); + port = bt_component_get_input_port(component, name); end: - return ret_port; + return port; } struct bt_port *bt_component_sink_get_input_port_at_index( struct bt_component *component, int index) { struct bt_port *port = NULL; - struct bt_component_sink *sink; if (!component || component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { goto end; } - sink = container_of(component, struct bt_component_sink, parent); - port = bt_component_get_port_at_index(sink->input_ports, index); + port = bt_component_get_input_port_at_index(component, index); end: return port; } @@ -224,40 +153,37 @@ struct bt_port *bt_component_sink_get_default_input_port( DEFAULT_INPUT_PORT_NAME); } -struct bt_port *bt_component_sink_add_input_port( - struct bt_component *component, const char *name) +struct bt_private_port * +bt_private_component_sink_get_input_private_port_at_index( + struct bt_private_component *private_component, int index) { - struct bt_port *port; - struct bt_component_sink *sink; - - if (!component || - component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { - port = NULL; - goto end; - } + return bt_private_port_from_port( + bt_component_sink_get_input_port_at_index( + bt_component_from_private(private_component), index)); +} - sink = container_of(component, struct bt_component_sink, parent); - port = bt_component_add_port(component, sink->input_ports, - BT_PORT_TYPE_INPUT, name); -end: - return port; +struct bt_private_port *bt_private_component_sink_get_default_private_input_port( + struct bt_private_component *private_component) +{ + return bt_private_port_from_port( + bt_component_sink_get_default_input_port( + bt_component_from_private(private_component))); } -enum bt_component_status bt_component_sink_remove_input_port( - struct bt_component *component, const char *name) +struct bt_private_port *bt_private_component_sink_add_input_private_port( + struct bt_private_component *private_component, + const char *name) { - enum bt_component_status status; - struct bt_component_sink *sink; + struct bt_port *port = NULL; + struct bt_component *component = + bt_component_from_private(private_component); if (!component || component->class->type != BT_COMPONENT_CLASS_TYPE_SINK) { - status = BT_COMPONENT_STATUS_INVALID; goto end; } - sink = container_of(component, struct bt_component_sink, parent); - status = bt_component_remove_port(component, sink->input_ports, - name); + port = bt_component_add_input_port(component, name); end: - return status; + return bt_private_port_from_port(port); }