the trie locking data structure (node field or global lock array) is now defined explicitly

This commit is contained in:
Ricardo Rocha
2011-11-16 11:42:04 +00:00
parent ec0fa8a2a3
commit e993c2473b
6 changed files with 145 additions and 125 deletions

View File

@@ -58,9 +58,9 @@ typedef struct subgoal_trie_node {
struct subgoal_trie_node *parent;
struct subgoal_trie_node *child;
struct subgoal_trie_node *next;
#ifdef SUBGOAL_TRIE_LOCK_AT_NODE_LEVEL
#ifdef SUBGOAL_TRIE_LOCK_USING_NODE_FIELD
lockvar lock;
#endif /* SUBGOAL_TRIE_LOCK_AT_NODE_LEVEL */
#endif /* SUBGOAL_TRIE_LOCK_USING_NODE_FIELD */
} *sg_node_ptr;
typedef struct answer_trie_node {
@@ -72,9 +72,9 @@ typedef struct answer_trie_node {
struct answer_trie_node *parent;
struct answer_trie_node *child;
struct answer_trie_node *next;
#ifdef ANSWER_TRIE_LOCK_AT_NODE_LEVEL
#ifdef ANSWER_TRIE_LOCK_USING_NODE_FIELD
lockvar lock;
#endif /* ANSWER_TRIE_LOCK_AT_NODE_LEVEL */
#endif /* ANSWER_TRIE_LOCK_USING_NODE_FIELD */
} *ans_node_ptr;
typedef struct global_trie_node {
@@ -82,9 +82,9 @@ typedef struct global_trie_node {
struct global_trie_node *parent;
struct global_trie_node *child;
struct global_trie_node *next;
#ifdef GLOBAL_TRIE_LOCK_AT_NODE_LEVEL
#ifdef GLOBAL_TRIE_LOCK_USING_NODE_FIELD
lockvar lock;
#endif /* GLOBAL_TRIE_LOCK_AT_NODE_LEVEL */
#endif /* GLOBAL_TRIE_LOCK_USING_NODE_FIELD */
} *gt_node_ptr;
#define TrNode_instr(X) ((X)->trie_instruction)