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

fix compilation of threads+tabling

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-12-18 00:19:49 -02:00
parent 79a1d3e13c
commit 5f0f91208d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OPTYap/opt.structs.h
View File

@ -287,9 +287,11 @@ struct local_signals{
** --------------------------- */ ** --------------------------- */
struct local_data{ struct local_data{
#if defined(YAPOR) || defined(THREADS)
lockvar lock;
#endif
#ifdef YAPOR #ifdef YAPOR
/* local data related to or-parallelism */ /* local data related to or-parallelism */
lockvar lock;
volatile int load; volatile int load;
choiceptr top_choice_point; choiceptr top_choice_point;
struct or_frame *top_or_frame; struct or_frame *top_or_frame;

10
OPTYap/tab.structs.h
View File

@ -54,7 +54,7 @@
** ---------------------------- */ ** ---------------------------- */
typedef struct table_entry { typedef struct table_entry {
#ifdef YAPOR #if defined(YAPOR) || defined(THREADS)
lockvar lock; lockvar lock;
#endif /* YAPOR */ #endif /* YAPOR */
struct pred_entry *pred_entry; struct pred_entry *pred_entry;
@ -187,8 +187,10 @@ typedef struct answer_trie_hash {
** ------------------------------ */ ** ------------------------------ */
typedef struct subgoal_frame { typedef struct subgoal_frame {
#ifdef YAPOR #if defined(YAPOR) || defined(THREADS)
lockvar lock; lockvar lock;
#endif
#ifdef YAPOR
int generator_worker; int generator_worker;
struct or_frame *top_or_frame_on_generator_branch; struct or_frame *top_or_frame_on_generator_branch;
#endif /* YAPOR */ #endif /* YAPOR */
@ -263,8 +265,10 @@ typedef struct subgoal_frame {
** --------------------------------- */ ** --------------------------------- */
typedef struct dependency_frame { typedef struct dependency_frame {
#ifdef YAPOR #if defined(YAPOR) || defined(THREADS)
lockvar lock; lockvar lock;
#endif
#ifdef YAPOR
int leader_dependency_is_on_stack; int leader_dependency_is_on_stack;
struct or_frame *top_or_frame; struct or_frame *top_or_frame;
#ifdef TIMESTAMP_CHECK #ifdef TIMESTAMP_CHECK