X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fcomponent-filter.c;h=b59543b8d95348cb4682a7109212be3db380d990;hb=8cc56726828daf6e193dc131435948d2c9a2cb4e;hp=869c3d778b6f4f313120c43e93501a9777284a9e;hpb=0d72b8c329ad51d14ab4e83330b38c2c8da69dd4;p=babeltrace.git

diff --git a/lib/graph/component-filter.c b/lib/graph/component-filter.c
index 869c3d77..b59543b8 100644
--- a/lib/graph/component-filter.c
+++ b/lib/graph/component-filter.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -25,17 +24,16 @@
 #define BT_LOG_TAG "COMP-FILTER"
 #include <babeltrace/lib-logging-internal.h>
 
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/values.h>
+#include <babeltrace/value.h>
 #include <babeltrace/graph/self-component-filter.h>
 #include <babeltrace/graph/component-filter-const.h>
 #include <babeltrace/graph/component-filter-internal.h>
 #include <babeltrace/graph/component-internal.h>
 #include <babeltrace/graph/component-class-internal.h>
 #include <babeltrace/graph/graph.h>
-#include <babeltrace/object.h>
-#include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
 
 BT_HIDDEN
 void bt_component_filter_destroy(struct bt_component *component)
@@ -58,6 +56,22 @@ end:
 	return (void *) filter;
 }
 
+const bt_component_class_filter *
+bt_component_filter_borrow_class_const(
+		const bt_component_filter *component)
+{
+	struct bt_component_class *cls;
+
+	BT_ASSERT_PRE_NON_NULL(component, "Component");
+
+	cls = component->parent.class;
+
+	BT_ASSERT(cls);
+	BT_ASSERT(cls->type == BT_COMPONENT_CLASS_TYPE_FILTER);
+
+	return (bt_component_class_filter *) cls;
+}
+
 uint64_t bt_component_filter_get_output_port_count(
 		const struct bt_component_filter *comp)
 {
@@ -102,13 +116,12 @@ enum bt_self_component_status bt_self_component_filter_add_output_port(
 		struct bt_self_component_port_output **self_port)
 {
 	struct bt_component *comp = (void *) self_comp;
-	int status = BT_SELF_COMPONENT_STATUS_OK;
+	enum bt_self_component_status status;
 	struct bt_port *port = NULL;
 
 	/* bt_component_add_output_port() logs details and errors */
-	port = (void *) bt_component_add_output_port(comp, name, user_data);
-	if (!port) {
-		status = BT_SELF_COMPONENT_STATUS_NOMEM;
+	status = bt_component_add_output_port(comp, name, user_data, &port);
+	if (status != BT_SELF_COMPONENT_STATUS_OK) {
 		goto end;
 	}
 
@@ -170,14 +183,13 @@ enum bt_self_component_status bt_self_component_filter_add_input_port(
 		const char *name, void *user_data,
 		struct bt_self_component_port_input **self_port)
 {
-	int status = BT_SELF_COMPONENT_STATUS_OK;
+	enum bt_self_component_status status;
 	struct bt_port *port = NULL;
 	struct bt_component *comp = (void *) self_comp;
 
 	/* bt_component_add_input_port() logs details/errors */
-	port = (void *) bt_component_add_input_port(comp, name, user_data);
-	if (!port) {
-		status = BT_SELF_COMPONENT_STATUS_NOMEM;
+	status = bt_component_add_input_port(comp, name, user_data, &port);
+	if (status != BT_SELF_COMPONENT_STATUS_OK) {
 		goto end;
 	}
 
@@ -191,3 +203,15 @@ end:
 	bt_object_put_ref(port);
 	return status;
 }
+
+void bt_component_filter_get_ref(
+		const struct bt_component_filter *component_filter)
+{
+	bt_object_get_ref(component_filter);
+}
+
+void bt_component_filter_put_ref(
+		const struct bt_component_filter *component_filter)
+{
+	bt_object_put_ref(component_filter);
+}