add get_child_refs, tests are ok

[protos/libecoli.git] / lib / ecoli_node.h

diff --git a/lib/ecoli_node.h b/lib/ecoli_node.h
index 63178f7..67652ab 100644 (file)
--- a/lib/ecoli_node.h
+++ b/lib/ecoli_node.h
@@ -82,6 +82,11 @@ typedef int (*ec_node_complete_t)(const struct ec_node *node,
 typedef const char * (*ec_node_desc_t)(const struct ec_node *);
 typedef int (*ec_node_init_priv_t)(struct ec_node *);
 typedef void (*ec_node_free_priv_t)(struct ec_node *);
+typedef size_t (*ec_node_get_children_count_t)(const struct ec_node *);
+typedef struct ec_node * (*ec_node_get_child_t)(const struct ec_node *,
+                                               size_t i);
+typedef unsigned int (*ec_node_get_child_refs_t)(const struct ec_node *,
+                                               size_t i);
 
 /**
  * A structure describing a node type.
@@ -99,6 +104,9 @@ struct ec_node_type {
        size_t size;
        ec_node_init_priv_t init_priv;
        ec_node_free_priv_t free_priv;
+       ec_node_get_children_count_t get_children_count;
+       ec_node_get_child_t get_child;
+       ec_node_get_child_refs_t get_child_refs;
 };
 
 /**
@@ -127,6 +135,14 @@ const struct ec_node_type *ec_node_type_lookup(const char *name);
  */
 void ec_node_type_dump(FILE *out);
 
+enum ec_node_free_state {
+       EC_NODE_FREE_STATE_NONE,
+       EC_NODE_FREE_STATE_TRAVERSED,
+       EC_NODE_FREE_STATE_FREEABLE,
+       EC_NODE_FREE_STATE_NOT_FREEABLE,
+       EC_NODE_FREE_STATE_FREEING,
+};
+
 struct ec_node {
        const struct ec_node_type *type;
        struct ec_config *config;    /**< Generic configuration. */
@@ -134,8 +150,11 @@ struct ec_node {
        char *desc;
        struct ec_keyval *attrs;
        unsigned int refcnt;
-       struct ec_node **children;   /* array of children */
-       size_t n_children;           /* number of children in the array */
+       struct {
+               enum ec_node_free_state state; /**< State of loop detection */
+               unsigned int refcnt;    /**< Number of reachable references
+                                        *   starting from node beeing freed */
+       } free; /**< Freeing state: used for loop detection */
 };
 
 /* create a new node when the type is known, typically called from the node
@@ -160,8 +179,8 @@ const struct ec_config *ec_node_get_config(struct ec_node *node);
 size_t ec_node_get_children_count(const struct ec_node *node);
 struct ec_node *
 ec_node_get_child(const struct ec_node *node, size_t i);
-int ec_node_add_child(struct ec_node *node, struct ec_node *child);
-int ec_node_del_child(struct ec_node *node, struct ec_node *child);
+unsigned int
+ec_node_get_child_refs(const struct ec_node *node, size_t i);
 
 /* XXX add more accessors */
 const struct ec_node_type *ec_node_type(const struct ec_node *node);