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

change macro FOREIGN_WL to FOREIGN

Browse Source
This commit is contained in:
Joao 2011-03-25 15:21:02 +00:00
parent d6640260cc
commit 6b48f8949f
6 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C/init.c
View File

@ -1218,9 +1218,9 @@ InitFirstWorkerThreadHandle(void)
static void static void
InitScratchPad(int wid) InitScratchPad(int wid)
{ {
FOREIGN_WL(wid)->scratchpad.ptr = NULL; FOREIGN(wid)->scratchpad.ptr = NULL;
FOREIGN_WL(wid)->scratchpad.sz = SCRATCH_START_SIZE; FOREIGN(wid)->scratchpad.sz = SCRATCH_START_SIZE;
FOREIGN_WL(wid)->scratchpad.msz = SCRATCH_START_SIZE; FOREIGN(wid)->scratchpad.msz = SCRATCH_START_SIZE;
} }
void void

16
C/threads.c
View File

@ -92,9 +92,9 @@ store_specs(int new_worker_id, UInt ssize, UInt tsize, UInt sysize, Term *tpgoal
FOREIGN_ThreadHandle(new_worker_id).ssize = ssize; FOREIGN_ThreadHandle(new_worker_id).ssize = ssize;
FOREIGN_ThreadHandle(new_worker_id).tsize = tsize; FOREIGN_ThreadHandle(new_worker_id).tsize = tsize;
FOREIGN_ThreadHandle(new_worker_id).sysize = sysize; FOREIGN_ThreadHandle(new_worker_id).sysize = sysize;
FOREIGN_WL(new_worker_id)->c_input_stream = Yap_c_input_stream; FOREIGN(new_worker_id)->c_input_stream = Yap_c_input_stream;
FOREIGN_WL(new_worker_id)->c_output_stream = Yap_c_output_stream; FOREIGN(new_worker_id)->c_output_stream = Yap_c_output_stream;
FOREIGN_WL(new_worker_id)->c_error_stream = Yap_c_error_stream; FOREIGN(new_worker_id)->c_error_stream = Yap_c_error_stream;
pm = (ssize + tsize)*1024; pm = (ssize + tsize)*1024;
if (!(FOREIGN_ThreadHandle(new_worker_id).stack_address = malloc(pm))) { if (!(FOREIGN_ThreadHandle(new_worker_id).stack_address = malloc(pm))) {
return FALSE; return FALSE;
@ -140,8 +140,8 @@ kill_thread_engine (int wid, int always_die)
gl = gl->NextGE; gl = gl->NextGE;
} }
Yap_KillStacks(wid); Yap_KillStacks(wid);
FOREIGN_WL(wid)->active_signals = 0L; FOREIGN(wid)->active_signals = 0L;
free(FOREIGN_WL(wid)->scratchpad.ptr); free(FOREIGN(wid)->scratchpad.ptr);
free(FOREIGN_ThreadHandle(wid).default_yaam_regs); free(FOREIGN_ThreadHandle(wid).default_yaam_regs);
FOREIGN_ThreadHandle(wid).current_yaam_regs = NULL; FOREIGN_ThreadHandle(wid).current_yaam_regs = NULL;
free(FOREIGN_ThreadHandle(wid).start_of_timesp); free(FOREIGN_ThreadHandle(wid).start_of_timesp);
@ -814,11 +814,11 @@ p_thread_signal( USES_REGS1 )
pthread_mutex_unlock(&(FOREIGN_ThreadHandle(wid).tlock)); pthread_mutex_unlock(&(FOREIGN_ThreadHandle(wid).tlock));
return TRUE; return TRUE;
} }
LOCK(FOREIGN_WL(wid)->signal_lock); LOCK(FOREIGN(wid)->signal_lock);
FOREIGN_ThreadHandle(wid).current_yaam_regs->CreepFlag_ = FOREIGN_ThreadHandle(wid).current_yaam_regs->CreepFlag_ =
Unsigned(FOREIGN_ThreadHandle(wid).current_yaam_regs->LCL0_); Unsigned(FOREIGN_ThreadHandle(wid).current_yaam_regs->LCL0_);
FOREIGN_WL(wid)->active_signals |= YAP_ITI_SIGNAL; FOREIGN(wid)->active_signals |= YAP_ITI_SIGNAL;
UNLOCK(FOREIGN_WL(wid)->signal_lock); UNLOCK(FOREIGN(wid)->signal_lock);
DEBUG_TLOCK_ACCESS(18, wid); DEBUG_TLOCK_ACCESS(18, wid);
pthread_mutex_unlock(&(FOREIGN_ThreadHandle(wid).tlock)); pthread_mutex_unlock(&(FOREIGN_ThreadHandle(wid).tlock));
return TRUE; return TRUE;

6
H/YapHeap.h
View File

@ -191,16 +191,16 @@ extern struct worker_shared Yap_Global;
#if defined(THREADS) #if defined(THREADS)
extern struct worker_local *Yap_WLocal[MAX_THREADS]; extern struct worker_local *Yap_WLocal[MAX_THREADS];
#define WL (Yap_WLocal[worker_id]) #define WL (Yap_WLocal[worker_id])
#define FOREIGN_WL(wid) (Yap_WLocal[(wid)]) #define FOREIGN(wid) (Yap_WLocal[(wid)])
#else #else
extern struct worker_local *Yap_WLocal; extern struct worker_local *Yap_WLocal;
#define WL (Yap_WLocal+worker_id) #define WL (Yap_WLocal+worker_id)
#define FOREIGN_WL(wid) (Yap_WLocal+wid) #define FOREIGN(wid) (Yap_WLocal+wid)
#endif #endif
#else #else
extern struct worker_local Yap_WLocal; extern struct worker_local Yap_WLocal;
#define WL (&Yap_WLocal) #define WL (&Yap_WLocal)
#define FOREIGN_WL(wid) (&Yap_WLocal) #define FOREIGN(wid) (&Yap_WLocal)
#endif #endif

196
H/ilocals.h
View File

@ -5,134 +5,134 @@
static void InitWorker(int wid) { static void InitWorker(int wid) {
FOREIGN_WL(wid)->c_input_stream = 0; FOREIGN(wid)->c_input_stream = 0;
FOREIGN_WL(wid)->c_output_stream = 1; FOREIGN(wid)->c_output_stream = 1;
FOREIGN_WL(wid)->c_error_stream = 2; FOREIGN(wid)->c_error_stream = 2;
FOREIGN_WL(wid)->rinfo.old_ASP = NULL; FOREIGN(wid)->rinfo.old_ASP = NULL;
FOREIGN_WL(wid)->rinfo.old_LCL0 = NULL; FOREIGN(wid)->rinfo.old_LCL0 = NULL;
FOREIGN_WL(wid)->rinfo.old_TR = NULL; FOREIGN(wid)->rinfo.old_TR = NULL;
FOREIGN_WL(wid)->rinfo.old_GlobalBase = NULL; FOREIGN(wid)->rinfo.old_GlobalBase = NULL;
FOREIGN_WL(wid)->rinfo.old_H = NULL; FOREIGN(wid)->rinfo.old_H = NULL;
FOREIGN_WL(wid)->rinfo.old_H0 = NULL; FOREIGN(wid)->rinfo.old_H0 = NULL;
FOREIGN_WL(wid)->rinfo.old_TrailBase = NULL; FOREIGN(wid)->rinfo.old_TrailBase = NULL;
FOREIGN_WL(wid)->rinfo.old_TrailTop = NULL; FOREIGN(wid)->rinfo.old_TrailTop = NULL;
FOREIGN_WL(wid)->rinfo.old_HeapBase = NULL; FOREIGN(wid)->rinfo.old_HeapBase = NULL;
FOREIGN_WL(wid)->rinfo.old_HeapTop = NULL; FOREIGN(wid)->rinfo.old_HeapTop = NULL;
FOREIGN_WL(wid)->rinfo.cl_diff = 0L; FOREIGN(wid)->rinfo.cl_diff = 0L;
FOREIGN_WL(wid)->rinfo.g_diff = 0L; FOREIGN(wid)->rinfo.g_diff = 0L;
FOREIGN_WL(wid)->rinfo.h_diff = 0L; FOREIGN(wid)->rinfo.h_diff = 0L;
FOREIGN_WL(wid)->rinfo.g_diff0 = 0L; FOREIGN(wid)->rinfo.g_diff0 = 0L;
FOREIGN_WL(wid)->rinfo.g_split = NULL; FOREIGN(wid)->rinfo.g_split = NULL;
FOREIGN_WL(wid)->rinfo.l_diff = 0L; FOREIGN(wid)->rinfo.l_diff = 0L;
FOREIGN_WL(wid)->rinfo.tr_diff = 0L; FOREIGN(wid)->rinfo.tr_diff = 0L;
FOREIGN_WL(wid)->rinfo.x_diff = 0L; FOREIGN(wid)->rinfo.x_diff = 0L;
FOREIGN_WL(wid)->rinfo.delay_diff = 0L; FOREIGN(wid)->rinfo.delay_diff = 0L;
FOREIGN_WL(wid)->rinfo.base_diff = 0L; FOREIGN(wid)->rinfo.base_diff = 0L;
FOREIGN_WL(wid)->call_counters.reductions = 0L; FOREIGN(wid)->call_counters.reductions = 0L;
FOREIGN_WL(wid)->call_counters.reductions_retries = 0L; FOREIGN(wid)->call_counters.reductions_retries = 0L;
FOREIGN_WL(wid)->call_counters.retries = 0L; FOREIGN(wid)->call_counters.retries = 0L;
FOREIGN_WL(wid)->call_counters.reductions_on = 0L; FOREIGN(wid)->call_counters.reductions_on = 0L;
FOREIGN_WL(wid)->call_counters.reductions_retries_on = 0L; FOREIGN(wid)->call_counters.reductions_retries_on = 0L;
FOREIGN_WL(wid)->call_counters.retries_on = 0L; FOREIGN(wid)->call_counters.retries_on = 0L;
FOREIGN_WL(wid)->interrupts_disabled = FALSE; FOREIGN(wid)->interrupts_disabled = FALSE;
FOREIGN_WL(wid)->consultsp = NULL; FOREIGN(wid)->consultsp = NULL;
FOREIGN_WL(wid)->consultbase = NULL; FOREIGN(wid)->consultbase = NULL;
FOREIGN_WL(wid)->consultlow = NULL; FOREIGN(wid)->consultlow = NULL;
FOREIGN_WL(wid)->global_arena = 0L; FOREIGN(wid)->global_arena = 0L;
FOREIGN_WL(wid)->global_arena_overflows = 0L; FOREIGN(wid)->global_arena_overflows = 0L;
FOREIGN_WL(wid)->delay_arena_overflows = 0L; FOREIGN(wid)->delay_arena_overflows = 0L;
FOREIGN_WL(wid)->arena_overflows = 0L; FOREIGN(wid)->arena_overflows = 0L;
FOREIGN_WL(wid)->depth_arenas = 0; FOREIGN(wid)->depth_arenas = 0;
FOREIGN_WL(wid)->arith_error = FALSE; FOREIGN(wid)->arith_error = FALSE;
FOREIGN_WL(wid)->last_asserted_pred = NULL; FOREIGN(wid)->last_asserted_pred = NULL;
FOREIGN_WL(wid)->debug_on = FALSE; FOREIGN(wid)->debug_on = FALSE;
FOREIGN_WL(wid)->f_info = NULL; FOREIGN(wid)->f_info = NULL;
FOREIGN_WL(wid)->scanner_stack = NULL; FOREIGN(wid)->scanner_stack = NULL;
FOREIGN_WL(wid)->scanner_extra_blocks = NULL; FOREIGN(wid)->scanner_extra_blocks = NULL;
FOREIGN_WL(wid)->ball_term = NULL; FOREIGN(wid)->ball_term = NULL;
FOREIGN_WL(wid)->active_signals = 0L; FOREIGN(wid)->active_signals = 0L;
FOREIGN_WL(wid)->i_pred_arity = 0L; FOREIGN(wid)->i_pred_arity = 0L;
FOREIGN_WL(wid)->prof_end = NULL; FOREIGN(wid)->prof_end = NULL;
FOREIGN_WL(wid)->uncaught_throw = FALSE; FOREIGN(wid)->uncaught_throw = FALSE;
FOREIGN_WL(wid)->doing_undefp = FALSE; FOREIGN(wid)->doing_undefp = FALSE;
FOREIGN_WL(wid)->start_line = 0L; FOREIGN(wid)->start_line = 0L;
InitScratchPad(wid); InitScratchPad(wid);
#ifdef COROUTINING #ifdef COROUTINING
FOREIGN_WL(wid)->woken_goals = 0L; FOREIGN(wid)->woken_goals = 0L;
FOREIGN_WL(wid)->atts_mutable_list = 0L; FOREIGN(wid)->atts_mutable_list = 0L;
#endif #endif
FOREIGN_WL(wid)->gc_generation = 0L; FOREIGN(wid)->gc_generation = 0L;
FOREIGN_WL(wid)->gc_phase = 0L; FOREIGN(wid)->gc_phase = 0L;
FOREIGN_WL(wid)->gc_current_phase = 0L; FOREIGN(wid)->gc_current_phase = 0L;
FOREIGN_WL(wid)->gc_calls = 0L; FOREIGN(wid)->gc_calls = 0L;
FOREIGN_WL(wid)->tot_gc_time = 0L; FOREIGN(wid)->tot_gc_time = 0L;
FOREIGN_WL(wid)->tot_gc_recovered = 0L; FOREIGN(wid)->tot_gc_recovered = 0L;
FOREIGN_WL(wid)->last_gc_time = 0L; FOREIGN(wid)->last_gc_time = 0L;
FOREIGN_WL(wid)->last_ss_time = 0L; FOREIGN(wid)->last_ss_time = 0L;
#if LOW_LEVEL_TRACER #if LOW_LEVEL_TRACER
FOREIGN_WL(wid)->total_cps = 0; FOREIGN(wid)->total_cps = 0;
#endif #endif
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
INIT_LOCK(FOREIGN_WL(wid)->signal_lock); INIT_LOCK(FOREIGN(wid)->signal_lock);
FOREIGN_WL(wid)->wpp = NULL; FOREIGN(wid)->wpp = NULL;
FOREIGN_WL(wid)->tot_marked = 0L; FOREIGN(wid)->tot_marked = 0L;
FOREIGN_WL(wid)->tot_oldies = 0L; FOREIGN(wid)->tot_oldies = 0L;
#if DEBUG && COROUTINING #if DEBUG && COROUTINING
FOREIGN_WL(wid)->tot_smarked = 0L; FOREIGN(wid)->tot_smarked = 0L;
#endif #endif
FOREIGN_WL(wid)->wl_current_B = NULL; FOREIGN(wid)->wl_current_B = NULL;
FOREIGN_WL(wid)->wl_prev_HB = NULL; FOREIGN(wid)->wl_prev_HB = NULL;
FOREIGN_WL(wid)->hgen = NULL; FOREIGN(wid)->hgen = NULL;
FOREIGN_WL(wid)->ip_top = NULL; FOREIGN(wid)->ip_top = NULL;
#if GC_NO_TAGS #if GC_NO_TAGS
FOREIGN_WL(wid)->b_p = NULL; FOREIGN(wid)->b_p = NULL;
#endif #endif
#if defined(TABLING) || defined(SBA) #if defined(TABLING) || defined(SBA)
FOREIGN_WL(wid)->wl_sTR = NULL; FOREIGN(wid)->wl_sTR = NULL;
FOREIGN_WL(wid)->wl_sTR0 = NULL; FOREIGN(wid)->wl_sTR0 = NULL;
FOREIGN_WL(wid)->new_tr = NULL; FOREIGN(wid)->new_tr = NULL;
#else #else
FOREIGN_WL(wid)->wl_sTR = NULL; FOREIGN(wid)->wl_sTR = NULL;
FOREIGN_WL(wid)->wl_sTR0 = NULL; FOREIGN(wid)->wl_sTR0 = NULL;
FOREIGN_WL(wid)->new_tr = NULL; FOREIGN(wid)->new_tr = NULL;
#endif #endif
FOREIGN_WL(wid)->conttop0 = NULL; FOREIGN(wid)->conttop0 = NULL;
FOREIGN_WL(wid)->conttop = NULL; FOREIGN(wid)->conttop = NULL;
FOREIGN_WL(wid)->disc_trail_entries = 0; FOREIGN(wid)->disc_trail_entries = 0;
FOREIGN_WL(wid)->Gc_ma_h_top = NULL; FOREIGN(wid)->Gc_ma_h_top = NULL;
FOREIGN_WL(wid)->Gc_ma_h_list = NULL; FOREIGN(wid)->Gc_ma_h_list = NULL;
FOREIGN_WL(wid)->Gc_timestamp = 0L; FOREIGN(wid)->Gc_timestamp = 0L;
FOREIGN_WL(wid)->DB_vec = NULL; FOREIGN(wid)->DB_vec = NULL;
FOREIGN_WL(wid)->DB_vec0 = NULL; FOREIGN(wid)->DB_vec0 = NULL;
FOREIGN_WL(wid)->DB_root = NULL; FOREIGN(wid)->DB_root = NULL;
FOREIGN_WL(wid)->DB_nil = NULL; FOREIGN(wid)->DB_nil = NULL;
#endif /* defined(YAPOR) || defined(THREADS) */ #endif /* defined(YAPOR) || defined(THREADS) */
FOREIGN_WL(wid)->dynamic_arrays = NULL; FOREIGN(wid)->dynamic_arrays = NULL;
FOREIGN_WL(wid)->static_arrays = NULL; FOREIGN(wid)->static_arrays = NULL;
FOREIGN_WL(wid)->global_variables = NULL; FOREIGN(wid)->global_variables = NULL;
FOREIGN_WL(wid)->allow_restart = FALSE; FOREIGN(wid)->allow_restart = FALSE;
FOREIGN_WL(wid)->cmem_first_block = NULL; FOREIGN(wid)->cmem_first_block = NULL;
FOREIGN_WL(wid)->cmem_first_block_sz = 0L; FOREIGN(wid)->cmem_first_block_sz = 0L;
FOREIGN_WL(wid)->label_first_array = NULL; FOREIGN(wid)->label_first_array = NULL;
FOREIGN_WL(wid)->label_first_array_sz = 0L; FOREIGN(wid)->label_first_array_sz = 0L;
FOREIGN_WL(wid)->Yap_ld_ = Yap_InitThreadIO(wid); FOREIGN(wid)->Yap_ld_ = Yap_InitThreadIO(wid);
FOREIGN_WL(wid)->_execution = NULL; FOREIGN(wid)->_execution = NULL;
#if (defined(YAPOR) || defined(TABLING)) && defined(THREADS) #if (defined(YAPOR) || defined(TABLING)) && defined(THREADS)

18
H/rlocals.h
View File

@ -46,7 +46,7 @@ static void RestoreWorker(int wid USES_REGS) {
FOREIGN_WL(wid)->global_arena = TermToGlobalOrAtomAdjust(FOREIGN_WL(wid)->global_arena); FOREIGN(wid)->global_arena = TermToGlobalOrAtomAdjust(FOREIGN(wid)->global_arena);
@ -66,12 +66,12 @@ static void RestoreWorker(int wid USES_REGS) {
#ifdef COROUTINING #ifdef COROUTINING
FOREIGN_WL(wid)->woken_goals = TermToGlobalAdjust(FOREIGN_WL(wid)->woken_goals); FOREIGN(wid)->woken_goals = TermToGlobalAdjust(FOREIGN(wid)->woken_goals);
FOREIGN_WL(wid)->atts_mutable_list = TermToGlobalAdjust(FOREIGN_WL(wid)->atts_mutable_list); FOREIGN(wid)->atts_mutable_list = TermToGlobalAdjust(FOREIGN(wid)->atts_mutable_list);
#endif #endif
FOREIGN_WL(wid)->gc_generation = TermToGlobalAdjust(FOREIGN_WL(wid)->gc_generation); FOREIGN(wid)->gc_generation = TermToGlobalAdjust(FOREIGN(wid)->gc_generation);
FOREIGN_WL(wid)->gc_phase = TermToGlobalAdjust(FOREIGN_WL(wid)->gc_phase); FOREIGN(wid)->gc_phase = TermToGlobalAdjust(FOREIGN(wid)->gc_phase);
@ -83,7 +83,7 @@ static void RestoreWorker(int wid USES_REGS) {
#endif #endif
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
REINIT_LOCK(FOREIGN_WL(wid)->signal_lock); REINIT_LOCK(FOREIGN(wid)->signal_lock);
@ -120,9 +120,9 @@ static void RestoreWorker(int wid USES_REGS) {
#endif /* defined(YAPOR) || defined(THREADS) */ #endif /* defined(YAPOR) || defined(THREADS) */
FOREIGN_WL(wid)->dynamic_arrays = PtoArrayEAdjust(FOREIGN_WL(wid)->dynamic_arrays); FOREIGN(wid)->dynamic_arrays = PtoArrayEAdjust(FOREIGN(wid)->dynamic_arrays);
FOREIGN_WL(wid)->static_arrays = PtoArraySAdjust(FOREIGN_WL(wid)->static_arrays); FOREIGN(wid)->static_arrays = PtoArraySAdjust(FOREIGN(wid)->static_arrays);
FOREIGN_WL(wid)->global_variables = PtoGlobalEAdjust(FOREIGN_WL(wid)->global_variables); FOREIGN(wid)->global_variables = PtoGlobalEAdjust(FOREIGN(wid)->global_variables);

2
misc/buildheap
View File

@ -122,7 +122,7 @@ fetch_name(Global) :-
Global = "WL->". Global = "WL->".
fetch_name(Global) :- fetch_name(Global) :-
globals(worker_init), !, globals(worker_init), !,
Global = "FOREIGN_WL(wid)->". Global = "FOREIGN(wid)->".
fetch_name(Global) :- fetch_name(Global) :-
Global = "Yap_heap_regs->". Global = "Yap_heap_regs->".