X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-internal.h;h=65f5e4d82bac46e1fded9cf378f7e17078d8ea7c;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=d67dd54f0dd930a79b3330ec2951a7015fe3cf33;hpb=4dc8c91f3abc56eaae51b8aa698e4bc5817ca4ff;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace/graph/component-internal.h
index d67dd54f..65f5e4d8 100644
--- a/include/babeltrace/graph/component-internal.h
+++ b/include/babeltrace/graph/component-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
-#define BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
+#define BABELTRACE_GRAPH_COMPONENT_INTERNAL_H
 
 /*
  * BabelTrace - Component internal
@@ -33,6 +33,7 @@
 #include <babeltrace/graph/port-internal.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/types.h>
+#include <babeltrace/assert-internal.h>
 #include <glib.h>
 #include <stdio.h>
 
@@ -64,14 +65,9 @@ struct bt_component {
 
 	/* Array of struct bt_component_destroy_listener */
 	GArray *destroy_listeners;
-};
 
-static inline
-struct bt_component *bt_component_from_private(
-		struct bt_private_component *private_component)
-{
-	return (void *) private_component;
-}
+	bool initialized;
+};
 
 static inline
 struct bt_private_component *bt_private_component_from_component(
@@ -80,12 +76,10 @@ struct bt_private_component *bt_private_component_from_component(
 	return (void *) component;
 }
 
-static inline
-struct bt_graph *bt_component_borrow_graph(struct bt_component *comp)
-{
-	assert(comp);
-	return (void *) comp->base.parent;
-}
+BT_HIDDEN
+enum bt_component_status bt_component_create(
+		struct bt_component_class *component_class,
+		const char *name, struct bt_component **component);
 
 BT_HIDDEN
 enum bt_component_status bt_component_accept_port_connection(
@@ -170,9 +164,11 @@ const char *bt_component_status_string(enum bt_component_status status)
 		return "BT_COMPONENT_STATUS_NOMEM";
 	case BT_COMPONENT_STATUS_NOT_FOUND:
 		return "BT_COMPONENT_STATUS_NOT_FOUND";
+	case BT_COMPONENT_STATUS_GRAPH_IS_CANCELED:
+		return "BT_COMPONENT_STATUS_GRAPH_IS_CANCELED";
 	default:
 		return "(unknown)";
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */