git.droids-corp.org
/
protos
/
libecoli.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename __ec_node
[protos/libecoli.git]
/
lib
/
ecoli_node.h
diff --git
a/lib/ecoli_node.h
b/lib/ecoli_node.h
index
6fede59
..
3501361
100644
(file)
--- a/
lib/ecoli_node.h
+++ b/
lib/ecoli_node.h
@@
-83,8
+83,8
@@
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 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
int
(*ec_node_get_child_t)(const struct ec_node *,
+
size_t i, struct ec_node **child, unsigned int *refs
);
/**
* A structure describing a node type.
/**
* A structure describing a node type.
@@
-132,6
+132,14
@@
const struct ec_node_type *ec_node_type_lookup(const char *name);
*/
void ec_node_type_dump(FILE *out);
*/
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. */
struct ec_node {
const struct ec_node_type *type;
struct ec_config *config; /**< Generic configuration. */
@@
-139,11
+147,16
@@
struct ec_node {
char *desc;
struct ec_keyval *attrs;
unsigned int refcnt;
char *desc;
struct ec_keyval *attrs;
unsigned int refcnt;
+ 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
* code */
};
/* create a new node when the type is known, typically called from the node
* code */
-struct ec_node *
__ec_nod
e(const struct ec_node_type *type, const char *id);
+struct ec_node *
ec_node_from_typ
e(const struct ec_node_type *type, const char *id);
/* create a new node */
struct ec_node *ec_node(const char *typename, const char *id);
/* create a new node */
struct ec_node *ec_node(const char *typename, const char *id);
@@
-161,10
+174,9
@@
int ec_node_set_config(struct ec_node *node, struct ec_config *config);
const struct ec_config *ec_node_get_config(struct ec_node *node);
size_t ec_node_get_children_count(const struct ec_node *node);
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);
+int
+ec_node_get_child(const struct ec_node *node, size_t i,
+ struct ec_node **child, unsigned int *refs);
/* XXX add more accessors */
const struct ec_node_type *ec_node_type(const struct ec_node *node);
/* XXX add more accessors */
const struct ec_node_type *ec_node_type(const struct ec_node *node);