diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ifixes for compilation under threads (no table sharing).

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-11-30 13:37:59 +00:00
parent 79d1bf5eec
commit 829f207307
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OPTYap/tab.structs.h
View File

@ -49,7 +49,7 @@ typedef struct table_entry {
#define TabEnt_mode_directed(X) ((X)->mode_directed_array) #define TabEnt_mode_directed(X) ((X)->mode_directed_array)
#ifdef THREADS_NO_SHARING #ifdef THREADS_NO_SHARING
#define TabEnt_subgoal_trie(X) ((X)->subgoal_trie[worker_id]) #define TabEnt_subgoal_trie(X) ((X)->subgoal_trie[worker_id])
#define TabEnt_subgoal_trie(X,I) ((X)->subgoal_trie[I]) //#define TabEnt_subgoal_trie(X,I) ((X)->subgoal_trie[I])
#else #else
#define TabEnt_subgoal_trie(X) ((X)->subgoal_trie) #define TabEnt_subgoal_trie(X) ((X)->subgoal_trie)
#endif /*THREADS_NO_SHARING */ #endif /*THREADS_NO_SHARING */
@ -242,7 +242,7 @@ typedef enum { /* do not change order !!! */
****************************/ ****************************/
typedef struct subgoal_entry { typedef struct subgoal_entry {
#if defined(YAPOR) || defined(THREADS_FULL_SHARING) || defined(THREADS_CONSUMER_SHARING) #if defined(YAPOR) || defined(THREADS)
lockvar lock; lockvar lock;
#endif /* YAPOR || THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */ #endif /* YAPOR || THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */
yamop *code_of_subgoal; yamop *code_of_subgoal;
@ -301,6 +301,8 @@ typedef struct subgoal_frame {
#ifdef THREADS #ifdef THREADS
#if defined(THREADS_FULL_SHARING) || defined(THREADS_CONSUMER_SHARING) #if defined(THREADS_FULL_SHARING) || defined(THREADS_CONSUMER_SHARING)
struct subgoal_entry *subgoal_entry; struct subgoal_entry *subgoal_entry;
#else
struct subgoal_entry subgoal_entry;
#endif /* THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */ #endif /* THREADS_FULL_SHARING || THREADS_CONSUMER_SHARING */
#ifdef THREADS_FULL_SHARING #ifdef THREADS_FULL_SHARING
struct answer_trie_node *batched_last_answer; struct answer_trie_node *batched_last_answer;
@ -315,7 +317,7 @@ typedef struct subgoal_frame {
} *sg_fr_ptr; } *sg_fr_ptr;
/* subgoal_entry fields */ /* subgoal_entry fields */
#ifdef THREADS #if defined(THREADS_FULL_SHARING) || defined(THREADS_CONSUMER_SHARING)
#define SUBGOAL_ENTRY(X) SgFr_subgoal_entry(X)-> #define SUBGOAL_ENTRY(X) SgFr_subgoal_entry(X)->
#else #else
#define SUBGOAL_ENTRY(X) (X)->subgoal_entry. #define SUBGOAL_ENTRY(X) (X)->subgoal_entry.
@ -385,7 +387,7 @@ typedef struct subgoal_frame {
*******************************/ *******************************/
typedef struct dependency_frame { typedef struct dependency_frame {
#ifdef YAPOR #if defined(YAPOR)||defined(THREADS)
lockvar lock; lockvar lock;
#endif /* YAPOR */ #endif /* YAPOR */
#ifdef YAPOR #ifdef YAPOR

1
OPTYap/tab.tries.c
View File

@ -1419,6 +1419,7 @@ void free_answer_hash_chain(ans_hash_ptr hash) {
void show_table(tab_ent_ptr tab_ent, int show_mode, IOSTREAM *out) { void show_table(tab_ent_ptr tab_ent, int show_mode, IOSTREAM *out) {
CACHE_REGS
sg_node_ptr sg_node; sg_node_ptr sg_node;
TrStat_out = out; TrStat_out = out;