Component class API: use status

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/include/babeltrace/graph/component-class-const.h b/include/babeltrace/graph/component-class-const.h
index 1c54f6e9ce3d8c3501c78d4a81c035680a6e3735..be76e85e387a473f74835c36fb4ceaa0e5c1a661 100644 (file)
--- a/include/babeltrace/graph/component-class-const.h
+++ b/include/babeltrace/graph/component-class-const.h
@@ -31,6 +31,11 @@
 extern "C" {
 #endif
 
+typedef enum bt_component_class_status {
+       BT_COMPONENT_CLASS_STATUS_OK = 0,
+       BT_COMPONENT_CLASS_STATUS_NOMEM = -12,
+} bt_component_class_status;
+
 typedef enum bt_component_class_type {
        BT_COMPONENT_CLASS_TYPE_SOURCE = 0,
        BT_COMPONENT_CLASS_TYPE_FILTER = 1,

diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h
index 56d0443717cd4015fd2f9b38aec512ee14eca2c3..f0f9958209be9c5317283277231fe491e8912dad 100644 (file)
--- a/include/babeltrace/graph/component-class-filter.h
+++ b/include/babeltrace/graph/component-class-filter.h
@@ -35,6 +35,9 @@
 /* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 /*
  * For bt_component_class, bt_component_class_filter, bt_port_input,
  * bt_port_output, bt_query_executor, bt_self_component_class_filter,
@@ -124,47 +127,58 @@ bt_component_class_filter *bt_component_class_filter_create(
                const char *name,
                bt_component_class_filter_message_iterator_next_method method);
 
-extern int bt_component_class_filter_set_init_method(
+extern bt_component_class_status
+bt_component_class_filter_set_init_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_init_method method);
 
-extern int bt_component_class_filter_set_finalize_method(
+extern bt_component_class_status
+bt_component_class_filter_set_finalize_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_finalize_method method);
 
-extern int bt_component_class_filter_set_accept_input_port_connection_method(
+extern bt_component_class_status
+bt_component_class_filter_set_accept_input_port_connection_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_accept_input_port_connection_method method);
 
-extern int bt_component_class_filter_set_accept_output_port_connection_method(
+extern bt_component_class_status
+bt_component_class_filter_set_accept_output_port_connection_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_accept_output_port_connection_method method);
 
-extern int bt_component_class_filter_set_input_port_connected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_input_port_connected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_input_port_connected_method method);
 
-extern int bt_component_class_filter_set_output_port_connected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_output_port_connected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_output_port_connected_method method);
 
-extern int bt_component_class_filter_set_input_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_input_port_disconnected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_input_port_disconnected_method method);
 
-extern int bt_component_class_filter_set_output_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_filter_set_output_port_disconnected_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_output_port_disconnected_method method);
 
-extern int bt_component_class_filter_set_query_method(
+extern bt_component_class_status
+bt_component_class_filter_set_query_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_query_method method);
 
-extern int bt_component_class_filter_set_message_iterator_init_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_init_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_message_iterator_init_method method);
 
-extern int bt_component_class_filter_set_message_iterator_finalize_method(
+extern bt_component_class_status
+bt_component_class_filter_set_message_iterator_finalize_method(
                bt_component_class_filter *comp_class,
                bt_component_class_filter_message_iterator_finalize_method method);
 

diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index 6ed027512033e56aeff3d5f162aac75694afa426..3ad4d285106d2a56d51f375e4eeb890565c0c3e9 100644 (file)
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -32,6 +32,9 @@
 /* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 /*
  * For bt_component_class, bt_component_class_sink, bt_port_output,
  * bt_query_executor, bt_self_component_class_sink,
@@ -89,27 +92,30 @@ bt_component_class_sink *bt_component_class_sink_create(
                const char *name,
                bt_component_class_sink_consume_method method);
 
-extern int bt_component_class_sink_set_init_method(
+extern bt_component_class_status bt_component_class_sink_set_init_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_init_method method);
 
-extern int bt_component_class_sink_set_finalize_method(
+extern bt_component_class_status bt_component_class_sink_set_finalize_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_finalize_method method);
 
-extern int bt_component_class_sink_set_accept_input_port_connection_method(
+extern bt_component_class_status
+bt_component_class_sink_set_accept_input_port_connection_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_accept_input_port_connection_method method);
 
-extern int bt_component_class_sink_set_input_port_connected_method(
+extern bt_component_class_status
+bt_component_class_sink_set_input_port_connected_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_input_port_connected_method method);
 
-extern int bt_component_class_sink_set_input_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_sink_set_input_port_disconnected_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_input_port_disconnected_method method);
 
-extern int bt_component_class_sink_set_query_method(
+extern bt_component_class_status bt_component_class_sink_set_query_method(
                bt_component_class_sink *comp_class,
                bt_component_class_sink_query_method method);
 

diff --git a/include/babeltrace/graph/component-class-source.h b/include/babeltrace/graph/component-class-source.h
index 4c94918194e6ccd5fad9d88fc880394a5982f106..000164c03f827b34925c21054a2f1d60cd4999e1 100644 (file)
--- a/include/babeltrace/graph/component-class-source.h
+++ b/include/babeltrace/graph/component-class-source.h
@@ -35,6 +35,9 @@
 /* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 /*
  * For bt_component_class, bt_component_class_source, bt_port_input,
  * bt_query_executor, bt_self_component_class_source,
@@ -105,35 +108,43 @@ bt_component_class_source *bt_component_class_source_create(
                const char *name,
                bt_component_class_source_message_iterator_next_method method);
 
-extern int bt_component_class_source_set_init_method(
+extern bt_component_class_status
+bt_component_class_source_set_init_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_init_method method);
 
-extern int bt_component_class_source_set_finalize_method(
+extern bt_component_class_status
+bt_component_class_source_set_finalize_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_finalize_method method);
 
-extern int bt_component_class_source_set_accept_output_port_connection_method(
+extern bt_component_class_status
+bt_component_class_source_set_accept_output_port_connection_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_accept_output_port_connection_method method);
 
-extern int bt_component_class_source_set_output_port_connected_method(
+extern bt_component_class_status
+bt_component_class_source_set_output_port_connected_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_output_port_connected_method method);
 
-extern int bt_component_class_source_set_output_port_disconnected_method(
+extern bt_component_class_status
+bt_component_class_source_set_output_port_disconnected_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_output_port_disconnected_method method);
 
-extern int bt_component_class_source_set_query_method(
+extern bt_component_class_status
+bt_component_class_source_set_query_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_query_method method);
 
-extern int bt_component_class_source_set_message_iterator_init_method(
+extern bt_component_class_status
+bt_component_class_source_set_message_iterator_init_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_message_iterator_init_method method);
 
-extern int bt_component_class_source_set_message_iterator_finalize_method(
+extern bt_component_class_status
+bt_component_class_source_set_message_iterator_finalize_method(
                bt_component_class_source *comp_class,
                bt_component_class_source_message_iterator_finalize_method method);
 

diff --git a/include/babeltrace/graph/component-class.h b/include/babeltrace/graph/component-class.h
index bfd2d08f697c326ae65ac52c12d869502148532d..0765293d45c95358fe0be58d48cd172537405f58 100644 (file)
--- a/include/babeltrace/graph/component-class.h
+++ b/include/babeltrace/graph/component-class.h
@@ -30,6 +30,9 @@
 /* For bt_component_class */
 #include <babeltrace/types.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -43,11 +46,11 @@ typedef enum bt_query_status {
        BT_QUERY_STATUS_INVALID_PARAMS = BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS,
 } bt_query_status;
 
-extern int bt_component_class_set_description(
+extern bt_component_class_status bt_component_class_set_description(
                bt_component_class *component_class,
                const char *description);
 
-extern int bt_component_class_set_help(
+extern bt_component_class_status bt_component_class_set_help(
                bt_component_class *component_class,
                const char *help);
 

diff --git a/lib/graph/component-class.c b/lib/graph/component-class.c
index 7ecf6a18a2f1f93d5e2c00f8e0ea437785d644ca..165816bafe7d3ac0821b3d1ba930cf064e7be0c9 100644 (file)
--- a/lib/graph/component-class.c
+++ b/lib/graph/component-class.c
@@ -255,7 +255,7 @@ int bt_component_class_source_set_init_method(
        comp_cls->methods.init = method;
        BT_LIB_LOGV("Set source component class's initialization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_init_method(
@@ -268,7 +268,7 @@ int bt_component_class_filter_set_init_method(
        comp_cls->methods.init = method;
        BT_LIB_LOGV("Set filter component class's initialization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_init_method(
@@ -281,7 +281,7 @@ int bt_component_class_sink_set_init_method(
        comp_cls->methods.init = method;
        BT_LIB_LOGV("Set sink component class's initialization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_finalize_method(
@@ -294,7 +294,7 @@ int bt_component_class_source_set_finalize_method(
        comp_cls->methods.finalize = method;
        BT_LIB_LOGV("Set source component class's finalization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_finalize_method(
@@ -307,7 +307,7 @@ int bt_component_class_filter_set_finalize_method(
        comp_cls->methods.finalize = method;
        BT_LIB_LOGV("Set filter component class's finalization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_finalize_method(
@@ -320,7 +320,7 @@ int bt_component_class_sink_set_finalize_method(
        comp_cls->methods.finalize = method;
        BT_LIB_LOGV("Set sink component class's finalization method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_query_method(
@@ -333,7 +333,7 @@ int bt_component_class_source_set_query_method(
        comp_cls->methods.query = method;
        BT_LIB_LOGV("Set source component class's query method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_query_method(
@@ -346,7 +346,7 @@ int bt_component_class_filter_set_query_method(
        comp_cls->methods.query = method;
        BT_LIB_LOGV("Set filter component class's query method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_query_method(
@@ -359,7 +359,7 @@ int bt_component_class_sink_set_query_method(
        comp_cls->methods.query = method;
        BT_LIB_LOGV("Set sink component class's query method: "
                "%!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_accept_input_port_connection_method(
@@ -372,7 +372,7 @@ int bt_component_class_filter_set_accept_input_port_connection_method(
        comp_cls->methods.accept_input_port_connection = method;
        BT_LIB_LOGV("Set filter component class's \"accept input port connection\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_accept_input_port_connection_method(
@@ -385,7 +385,7 @@ int bt_component_class_sink_set_accept_input_port_connection_method(
        comp_cls->methods.accept_input_port_connection = method;
        BT_LIB_LOGV("Set sink component class's \"accept input port connection\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_accept_output_port_connection_method(
@@ -398,7 +398,7 @@ int bt_component_class_source_set_accept_output_port_connection_method(
        comp_cls->methods.accept_output_port_connection = method;
        BT_LIB_LOGV("Set source component class's \"accept output port connection\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_accept_output_port_connection_method(
@@ -411,7 +411,7 @@ int bt_component_class_filter_set_accept_output_port_connection_method(
        comp_cls->methods.accept_output_port_connection = method;
        BT_LIB_LOGV("Set filter component class's \"accept output port connection\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_input_port_connected_method(
@@ -424,7 +424,7 @@ int bt_component_class_filter_set_input_port_connected_method(
        comp_cls->methods.input_port_connected = method;
        BT_LIB_LOGV("Set filter component class's \"input port connected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_input_port_connected_method(
@@ -437,7 +437,7 @@ int bt_component_class_sink_set_input_port_connected_method(
        comp_cls->methods.input_port_connected = method;
        BT_LIB_LOGV("Set sink component class's \"input port connected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_output_port_connected_method(
@@ -450,7 +450,7 @@ int bt_component_class_source_set_output_port_connected_method(
        comp_cls->methods.output_port_connected = method;
        BT_LIB_LOGV("Set source component class's \"output port connected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_output_port_connected_method(
@@ -463,7 +463,7 @@ int bt_component_class_filter_set_output_port_connected_method(
        comp_cls->methods.output_port_connected = method;
        BT_LIB_LOGV("Set filter component class's \"output port connected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_input_port_disconnected_method(
@@ -476,7 +476,7 @@ int bt_component_class_filter_set_input_port_disconnected_method(
        comp_cls->methods.input_port_disconnected = method;
        BT_LIB_LOGV("Set filter component class's \"input port disconnected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_sink_set_input_port_disconnected_method(
@@ -489,7 +489,7 @@ int bt_component_class_sink_set_input_port_disconnected_method(
        comp_cls->methods.input_port_disconnected = method;
        BT_LIB_LOGV("Set sink component class's \"input port disconnected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_output_port_disconnected_method(
@@ -502,7 +502,7 @@ int bt_component_class_source_set_output_port_disconnected_method(
        comp_cls->methods.output_port_disconnected = method;
        BT_LIB_LOGV("Set source component class's \"output port disconnected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_output_port_disconnected_method(
@@ -515,7 +515,7 @@ int bt_component_class_filter_set_output_port_disconnected_method(
        comp_cls->methods.output_port_disconnected = method;
        BT_LIB_LOGV("Set filter component class's \"output port disconnected\" method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_message_iterator_init_method(
@@ -528,7 +528,7 @@ int bt_component_class_source_set_message_iterator_init_method(
        comp_cls->methods.msg_iter_init = method;
        BT_LIB_LOGV("Set source component class's message iterator initialization method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_message_iterator_init_method(
@@ -541,7 +541,7 @@ int bt_component_class_filter_set_message_iterator_init_method(
        comp_cls->methods.msg_iter_init = method;
        BT_LIB_LOGV("Set filter component class's message iterator initialization method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_source_set_message_iterator_finalize_method(
@@ -554,7 +554,7 @@ int bt_component_class_source_set_message_iterator_finalize_method(
        comp_cls->methods.msg_iter_finalize = method;
        BT_LIB_LOGV("Set source component class's message iterator finalization method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 int bt_component_class_filter_set_message_iterator_finalize_method(
@@ -567,10 +567,10 @@ int bt_component_class_filter_set_message_iterator_finalize_method(
        comp_cls->methods.msg_iter_finalize = method;
        BT_LIB_LOGV("Set filter component class's message iterator finalization method"
                ": %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
-int bt_component_class_set_description(
+bt_component_class_status bt_component_class_set_description(
                struct bt_component_class *comp_cls,
                const char *description)
 {
@@ -583,10 +583,10 @@ int bt_component_class_set_description(
                comp_cls,
                bt_component_class_get_name(comp_cls),
                bt_component_class_type_string(comp_cls->type));
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
-int bt_component_class_set_help(
+bt_component_class_status bt_component_class_set_help(
                struct bt_component_class *comp_cls,
                const char *help)
 {
@@ -595,7 +595,7 @@ int bt_component_class_set_help(
        BT_ASSERT_PRE_COMP_CLS_HOT(comp_cls);
        g_string_assign(comp_cls->help, help);
        BT_LIB_LOGV("Set component class's help text: %!+C", comp_cls);
-       return 0;
+       return BT_COMPONENT_CLASS_STATUS_OK;
 }
 
 const char *bt_component_class_get_name(const struct bt_component_class *comp_cls)