change macros GLOBAL to Yap
This commit is contained in:
Joao
@@ -223,73 +223,120 @@ struct optyap_global_data{
|
||||
#endif /* TABLING */
|
||||
};
|
||||
|
||||
#define GLOBAL_MAX_PAGES (GLOBAL.pages.max_pages)
|
||||
#define GLOBAL_PAGES_void (GLOBAL.pages.void_pages)
|
||||
#define GLOBAL_PAGES_or_fr (GLOBAL.pages.or_frame_pages)
|
||||
#define GLOBAL_PAGES_qg_sol_fr (GLOBAL.pages.query_goal_solution_frame_pages)
|
||||
#define GLOBAL_PAGES_qg_ans_fr (GLOBAL.pages.query_goal_answer_frame_pages)
|
||||
#define GLOBAL_PAGES_tg_sol_fr (GLOBAL.pages.table_subgoal_solution_frame_pages)
|
||||
#define GLOBAL_PAGES_tg_ans_fr (GLOBAL.pages.table_subgoal_answer_frame_pages)
|
||||
#define GLOBAL_PAGES_tab_ent (GLOBAL.pages.table_entry_pages)
|
||||
#define GLOBAL_PAGES_sg_fr (GLOBAL.pages.subgoal_frame_pages)
|
||||
#define GLOBAL_PAGES_dep_fr (GLOBAL.pages.dependency_frame_pages)
|
||||
#define GLOBAL_PAGES_sg_node (GLOBAL.pages.subgoal_trie_node_pages)
|
||||
#define GLOBAL_PAGES_ans_node (GLOBAL.pages.answer_trie_node_pages)
|
||||
#define GLOBAL_PAGES_gt_node (GLOBAL.pages.global_trie_node_pages)
|
||||
#define GLOBAL_PAGES_sg_hash (GLOBAL.pages.subgoal_trie_hash_pages)
|
||||
#define GLOBAL_PAGES_ans_hash (GLOBAL.pages.answer_trie_hash_pages)
|
||||
#define GLOBAL_PAGES_gt_hash (GLOBAL.pages.global_trie_hash_pages)
|
||||
#define GLOBAL_PAGES_susp_fr (GLOBAL.pages.suspension_frame_pages)
|
||||
#define SCHEDULER_LOOP (GLOBAL.scheduler_loop)
|
||||
#define DELAYED_RELEASE_LOAD (GLOBAL.delayed_release_load)
|
||||
#define number_workers (GLOBAL.number_workers)
|
||||
#define worker_pid(worker) (GLOBAL.worker_pid[worker])
|
||||
#define GLOBAL_master_worker (GLOBAL.master_worker)
|
||||
#define GLOBAL_execution_time (GLOBAL.execution_time)
|
||||
#define GLOBAL_best_times(time) (GLOBAL.best_execution_times[time])
|
||||
#define GLOBAL_number_goals (GLOBAL.number_of_executed_goals)
|
||||
#define GLOBAL_performance_mode (GLOBAL.performance_mode)
|
||||
#define Yap_max_pages (Yap_optyap_data.pages.max_pages)
|
||||
#define Yap_pages_void (Yap_optyap_data.pages.void_pages)
|
||||
#define Yap_pages_or_fr (Yap_optyap_data.pages.or_frame_pages)
|
||||
#define Yap_pages_qg_sol_fr (Yap_optyap_data.pages.query_goal_solution_frame_pages)
|
||||
#define Yap_pages_qg_ans_fr (Yap_optyap_data.pages.query_goal_answer_frame_pages)
|
||||
#define Yap_pages_tg_sol_fr (Yap_optyap_data.pages.table_subgoal_solution_frame_pages)
|
||||
#define Yap_pages_tg_ans_fr (Yap_optyap_data.pages.table_subgoal_answer_frame_pages)
|
||||
#define Yap_pages_tab_ent (Yap_optyap_data.pages.table_entry_pages)
|
||||
#define Yap_pages_sg_fr (Yap_optyap_data.pages.subgoal_frame_pages)
|
||||
#define Yap_pages_dep_fr (Yap_optyap_data.pages.dependency_frame_pages)
|
||||
#define Yap_pages_sg_node (Yap_optyap_data.pages.subgoal_trie_node_pages)
|
||||
#define Yap_pages_ans_node (Yap_optyap_data.pages.answer_trie_node_pages)
|
||||
#define Yap_pages_gt_node (Yap_optyap_data.pages.global_trie_node_pages)
|
||||
#define Yap_pages_sg_hash (Yap_optyap_data.pages.subgoal_trie_hash_pages)
|
||||
#define Yap_pages_ans_hash (Yap_optyap_data.pages.answer_trie_hash_pages)
|
||||
#define Yap_pages_gt_hash (Yap_optyap_data.pages.global_trie_hash_pages)
|
||||
#define Yap_pages_susp_fr (Yap_optyap_data.pages.suspension_frame_pages)
|
||||
#define Yap_scheduler_loop (Yap_optyap_data.scheduler_loop)
|
||||
#define Yap_delayed_release_load (Yap_optyap_data.delayed_release_load)
|
||||
#define Yap_number_workers (Yap_optyap_data.number_workers)
|
||||
#define Yap_worker_pid(worker) (Yap_optyap_data.worker_pid[worker])
|
||||
#define Yap_master_worker (Yap_optyap_data.master_worker)
|
||||
#define Yap_execution_time (Yap_optyap_data.execution_time)
|
||||
#define Yap_best_times(time) (Yap_optyap_data.best_execution_times[time])
|
||||
#define Yap_number_goals (Yap_optyap_data.number_of_executed_goals)
|
||||
#define Yap_performance_mode (Yap_optyap_data.performance_mode)
|
||||
#if THREADS
|
||||
#define Get_GLOBAL_root_cp() offset_to_cptr(GLOBAL.root_choice_point_offset)
|
||||
#define Set_GLOBAL_root_cp(bptr) (GLOBAL.root_choice_point_offset = cptr_to_offset(bptr))
|
||||
#define Get_Yap_root_cp() offset_to_cptr(Yap_optyap_data.root_choice_point_offset)
|
||||
#define Set_Yap_root_cp(bptr) (Yap_optyap_data.root_choice_point_offset = cptr_to_offset(bptr))
|
||||
#else
|
||||
#define GLOBAL_root_cp (GLOBAL.root_choice_point)
|
||||
#define Get_GLOBAL_root_cp() (GLOBAL.root_choice_point)
|
||||
#define Set_GLOBAL_root_cp(bptr) (GLOBAL.root_choice_point = (bptr))
|
||||
#define Yap_root_cp (Yap_optyap_data.root_choice_point)
|
||||
#define Get_Yap_root_cp() (Yap_optyap_data.root_choice_point)
|
||||
#define Set_Yap_root_cp(bptr) (Yap_optyap_data.root_choice_point = (bptr))
|
||||
#endif
|
||||
#define GLOBAL_root_or_fr (GLOBAL.root_or_frame)
|
||||
#define GLOBAL_bm_present_workers (GLOBAL.present_workers)
|
||||
#define GLOBAL_bm_idle_workers (GLOBAL.idle_workers)
|
||||
#define GLOBAL_bm_root_cp_workers (GLOBAL.root_cp_workers)
|
||||
#define GLOBAL_bm_invisible_workers (GLOBAL.invisible_workers)
|
||||
#define GLOBAL_bm_requestable_workers (GLOBAL.requestable_workers)
|
||||
#define GLOBAL_bm_executing_workers (GLOBAL.executing_workers)
|
||||
#define GLOBAL_bm_finished_workers (GLOBAL.finished_workers)
|
||||
#define GLOBAL_bm_pruning_workers (GLOBAL.pruning_workers)
|
||||
#define GLOBAL_LOCKS_bm_idle_workers (GLOBAL.locks.bitmap_idle_workers)
|
||||
#define GLOBAL_LOCKS_bm_root_cp_workers (GLOBAL.locks.bitmap_root_cp_workers)
|
||||
#define GLOBAL_LOCKS_bm_invisible_workers (GLOBAL.locks.bitmap_invisible_workers)
|
||||
#define GLOBAL_LOCKS_bm_requestable_workers (GLOBAL.locks.bitmap_requestable_workers)
|
||||
#define GLOBAL_LOCKS_bm_executing_workers (GLOBAL.locks.bitmap_executing_workers)
|
||||
#define GLOBAL_LOCKS_bm_finished_workers (GLOBAL.locks.bitmap_finished_workers)
|
||||
#define GLOBAL_LOCKS_bm_pruning_workers (GLOBAL.locks.bitmap_pruning_workers)
|
||||
#define GLOBAL_LOCKS_who_locked_heap (GLOBAL.locks.who_locked_heap)
|
||||
#define GLOBAL_LOCKS_heap_access (GLOBAL.locks.heap_access)
|
||||
#define GLOBAL_LOCKS_alloc_block (GLOBAL.locks.alloc_block)
|
||||
#define GLOBAL_branch(worker, depth) (GLOBAL.branch[worker][depth])
|
||||
#define PARALLEL_EXECUTION_MODE (GLOBAL.parallel_execution_mode)
|
||||
#define GLOBAL_answers (GLOBAL.answers)
|
||||
#define GLOBAL_root_gt (GLOBAL.root_global_trie)
|
||||
#define GLOBAL_root_tab_ent (GLOBAL.root_table_entry)
|
||||
#define GLOBAL_first_sg_fr (GLOBAL.first_subgoal_frame)
|
||||
#define GLOBAL_last_sg_fr (GLOBAL.last_subgoal_frame)
|
||||
#define GLOBAL_check_sg_fr (GLOBAL.check_subgoal_frame)
|
||||
#define GLOBAL_root_dep_fr (GLOBAL.root_dependency_frame)
|
||||
#define GLOBAL_table_var_enumerator(index) (GLOBAL.table_var_enumerator[index])
|
||||
#define GLOBAL_table_var_enumerator_addr(index) (GLOBAL.table_var_enumerator + (index))
|
||||
#define GLOBAL_table_lock(index) (GLOBAL.table_lock[index])
|
||||
#define GLOBAL_timestamp (GLOBAL.timestamp)
|
||||
#define Yap_root_or_fr (Yap_optyap_data.root_or_frame)
|
||||
#define Yap_bm_present_workers (Yap_optyap_data.present_workers)
|
||||
#define Yap_bm_idle_workers (Yap_optyap_data.idle_workers)
|
||||
#define Yap_bm_root_cp_workers (Yap_optyap_data.root_cp_workers)
|
||||
#define Yap_bm_invisible_workers (Yap_optyap_data.invisible_workers)
|
||||
#define Yap_bm_requestable_workers (Yap_optyap_data.requestable_workers)
|
||||
#define Yap_bm_executing_workers (Yap_optyap_data.executing_workers)
|
||||
#define Yap_bm_finished_workers (Yap_optyap_data.finished_workers)
|
||||
#define Yap_bm_pruning_workers (Yap_optyap_data.pruning_workers)
|
||||
#define Yap_locks_bm_idle_workers (Yap_optyap_data.locks.bitmap_idle_workers)
|
||||
#define Yap_locks_bm_root_cp_workers (Yap_optyap_data.locks.bitmap_root_cp_workers)
|
||||
#define Yap_locks_bm_invisible_workers (Yap_optyap_data.locks.bitmap_invisible_workers)
|
||||
#define Yap_locks_bm_requestable_workers (Yap_optyap_data.locks.bitmap_requestable_workers)
|
||||
#define Yap_locks_bm_executing_workers (Yap_optyap_data.locks.bitmap_executing_workers)
|
||||
#define Yap_locks_bm_finished_workers (Yap_optyap_data.locks.bitmap_finished_workers)
|
||||
#define Yap_locks_bm_pruning_workers (Yap_optyap_data.locks.bitmap_pruning_workers)
|
||||
#define Yap_locks_who_locked_heap (Yap_optyap_data.locks.who_locked_heap)
|
||||
#define Yap_locks_heap_access (Yap_optyap_data.locks.heap_access)
|
||||
#define Yap_locks_alloc_block (Yap_optyap_data.locks.alloc_block)
|
||||
#define Yap_branch(worker, depth) (Yap_optyap_data.branch[worker][depth])
|
||||
#define Yap_parallel_execution_mode (Yap_optyap_data.parallel_execution_mode)
|
||||
#define Yap_answers (Yap_optyap_data.answers)
|
||||
#define Yap_root_gt (Yap_optyap_data.root_global_trie)
|
||||
#define Yap_root_tab_ent (Yap_optyap_data.root_table_entry)
|
||||
#define Yap_first_sg_fr (Yap_optyap_data.first_subgoal_frame)
|
||||
#define Yap_last_sg_fr (Yap_optyap_data.last_subgoal_frame)
|
||||
#define Yap_check_sg_fr (Yap_optyap_data.check_subgoal_frame)
|
||||
#define Yap_root_dep_fr (Yap_optyap_data.root_dependency_frame)
|
||||
#define Yap_table_var_enumerator(index) (Yap_optyap_data.table_var_enumerator[index])
|
||||
#define Yap_table_var_enumerator_addr(index) (Yap_optyap_data.table_var_enumerator + (index))
|
||||
#define Yap_table_lock(index) (Yap_optyap_data.table_lock[index])
|
||||
#define Yap_time_stamp (Yap_optyap_data.timestamp)
|
||||
|
||||
/*
|
||||
#define Yap_master_worker (Yap_optyap_data.master_worker)
|
||||
#define Yap_execution_time (Yap_optyap_data.execution_time)
|
||||
#define Yap_best_times(time) (Yap_optyap_data.best_execution_times[time])
|
||||
#define Yap_number_goals (Yap_optyap_data.number_of_executed_goals)
|
||||
#define Yap_performance_mode (Yap_optyap_data.performance_mode)
|
||||
#if THREADS
|
||||
#define Get_Yap_root_cp() offset_to_cptr(Yap_optyap_data.root_choice_point_offset)
|
||||
#define Set_Yap_root_cp(bptr) (Yap_optyap_data.root_choice_point_offset = cptr_to_offset(bptr))
|
||||
#else
|
||||
#define Yap_root_cp (Yap_optyap_data.root_choice_point)
|
||||
#define Get_Yap_root_cp() (Yap_optyap_data.root_choice_point)
|
||||
#define Set_Yap_root_cp(bptr) (Yap_optyap_data.root_choice_point = (bptr))
|
||||
#endif
|
||||
#define Yap_root_or_fr (Yap_optyap_data.root_or_frame)
|
||||
#define Yap_bm_present_workers (Yap_optyap_data.present_workers)
|
||||
#define Yap_bm_idle_workers (Yap_optyap_data.idle_workers)
|
||||
#define Yap_bm_root_cp_workers (Yap_optyap_data.root_cp_workers)
|
||||
#define Yap_bm_invisible_workers (Yap_optyap_data.invisible_workers)
|
||||
#define Yap_bm_requestable_workers (Yap_optyap_data.requestable_workers)
|
||||
#define Yap_bm_executing_workers (Yap_optyap_data.executing_workers)
|
||||
#define Yap_bm_finished_workers (Yap_optyap_data.finished_workers)
|
||||
#define Yap_bm_pruning_workers (Yap_optyap_data.pruning_workers)
|
||||
#define Yap_locks_bm_idle_workers (Yap_optyap_data.locks.bitmap_idle_workers)
|
||||
#define Yap_locks_bm_root_cp_workers (Yap_optyap_data.locks.bitmap_root_cp_workers)
|
||||
#define Yap_locks_bm_invisible_workers (Yap_optyap_data.locks.bitmap_invisible_workers)
|
||||
#define Yap_locks_bm_requestable_workers (Yap_optyap_data.locks.bitmap_requestable_workers)
|
||||
#define Yap_locks_bm_executing_workers (Yap_optyap_data.locks.bitmap_executing_workers)
|
||||
#define Yap_locks_bm_finished_workers (Yap_optyap_data.locks.bitmap_finished_workers)
|
||||
#define Yap_locks_bm_pruning_workers (Yap_optyap_data.locks.bitmap_pruning_workers)
|
||||
#define Yap_locks_who_locked_heap (Yap_optyap_data.locks.who_locked_heap)
|
||||
#define Yap_locks_heap_access (Yap_optyap_data.locks.heap_access)
|
||||
#define Yap_locks_alloc_block (Yap_optyap_data.locks.alloc_block)
|
||||
#define Yap_branch(worker, depth) (Yap_optyap_data.branch[worker][depth])
|
||||
#define Yap_parallel_execution_mode (Yap_optyap_data.parallel_execution_mode)
|
||||
#define Yap_answers (Yap_optyap_data.answers)
|
||||
#define Yap_root_gt (Yap_optyap_data.root_global_trie)
|
||||
#define Yap_root_tab_ent (Yap_optyap_data.root_table_entry)
|
||||
#define Yap_first_sg_fr (Yap_optyap_data.first_subgoal_frame)
|
||||
#define Yap_last_sg_fr (Yap_optyap_data.last_subgoal_frame)
|
||||
#define Yap_check_sg_fr (Yap_optyap_data.check_subgoal_frame)
|
||||
#define Yap_root_dep_fr (Yap_optyap_data.root_dependency_frame)
|
||||
#define Yap_table_var_enumerator(index) (Yap_optyap_data.table_var_enumerator[index])
|
||||
#define Yap_table_var_enumerator_addr(index) (Yap_optyap_data.table_var_enumerator + (index))
|
||||
#define Yap_table_lock(index) (Yap_optyap_data.table_lock[index])
|
||||
#define Yap_timestamp (Yap_optyap_data.timestamp)
|
||||
*/
|
||||
|
||||
|
||||
/***********************************
|
||||
|
||||
Reference in New Issue
Block a user