*** empty log message ***
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2215 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
ricroc
parent
516a349aad
commit
ddcd80d2a9
@ -10,8 +10,11 @@
|
||||
* File: c_interface.c *
|
||||
* comments: c_interface primitives definition *
|
||||
* *
|
||||
* Last rev: $Date: 2008-04-04 13:35:41 $,$Author: vsc $ *
|
||||
* Last rev: $Date: 2008-04-11 16:30:27 $,$Author: ricroc $ *
|
||||
* $Log: not supported by cvs2svn $
|
||||
* Revision 1.114 2008/04/04 13:35:41 vsc
|
||||
* fix duplicate dependency frame at entry
|
||||
*
|
||||
* Revision 1.113 2008/04/04 09:10:02 vsc
|
||||
* restore was restoring twice
|
||||
*
|
||||
@ -1763,11 +1766,7 @@ YAP_Init(YAP_init_args *yap_init)
|
||||
}
|
||||
yap_flags[FAST_BOOT_FLAG] = yap_init->FastBoot;
|
||||
#if defined(YAPOR) || defined(TABLING)
|
||||
#ifdef YAP_MEMORY_ALLOC_SCHEME
|
||||
if (restore_result != DO_ONLY_CODE &&
|
||||
restore_result != DO_EVERYTHING)
|
||||
#endif
|
||||
make_root_frames();
|
||||
make_root_frames();
|
||||
#ifdef YAPOR
|
||||
init_workers();
|
||||
#endif /* YAPOR */
|
||||
|
||||
@ -11,8 +11,11 @@
|
||||
* File: cdmgr.c *
|
||||
* comments: Code manager *
|
||||
* *
|
||||
* Last rev: $Date: 2008-04-01 22:28:41 $,$Author: vsc $ *
|
||||
* Last rev: $Date: 2008-04-11 16:30:27 $,$Author: ricroc $ *
|
||||
* $Log: not supported by cvs2svn $
|
||||
* Revision 1.226 2008/04/01 22:28:41 vsc
|
||||
* put YAPOR back to life.
|
||||
*
|
||||
* Revision 1.225 2008/04/01 08:42:45 vsc
|
||||
* fix restore and small VISTA thingies
|
||||
*
|
||||
@ -1585,9 +1588,6 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag)
|
||||
p->PredFlags |= ProfiledPredFlag;
|
||||
} else
|
||||
p->PredFlags &= ~ProfiledPredFlag;
|
||||
#ifdef YAPOR
|
||||
p->PredFlags |= SequentialPredFlag;
|
||||
#endif /* YAPOR */
|
||||
if (spy_flag) {
|
||||
p->OpcodeOfPred = Yap_opcode(_spy_pred);
|
||||
p->CodeOfPred = (yamop *)(&(p->OpcodeOfPred));
|
||||
|
||||
8
C/save.c
8
C/save.c
@ -471,7 +471,7 @@ save_heap(void)
|
||||
{
|
||||
int j;
|
||||
/* Then save the whole heap */
|
||||
#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
|
||||
#if defined(YAPOR) || (defined(TABLING) && !defined(YAP_MEMORY_ALLOC_SCHEME))
|
||||
/* skip the local and global data structures */
|
||||
j = Unsigned(&GLOBAL) - Unsigned(Yap_HeapBase);
|
||||
putout(j);
|
||||
@ -483,7 +483,7 @@ save_heap(void)
|
||||
j = Unsigned(HeapTop) - Unsigned(Yap_HeapBase);
|
||||
/* store 10 more cells because of the memory manager */
|
||||
mywrite(splfild, (char *) Yap_HeapBase, j);
|
||||
#endif /* YAPOR || TABLING */
|
||||
#endif /* YAPOR || (TABLING && !YAP_MEMORY_ALLOC_SCHEME) */
|
||||
}
|
||||
|
||||
static void
|
||||
@ -908,7 +908,7 @@ get_hash(void)
|
||||
static int
|
||||
CopyCode(void)
|
||||
{
|
||||
#if (defined(YAPOR) || defined(TABLING)) && !defined(YAP_MEMORY_ALLOC_SCHEME)
|
||||
#if defined(YAPOR) || (defined(TABLING) && !defined(YAP_MEMORY_ALLOC_SCHEME))
|
||||
/* skip the local and global data structures */
|
||||
CELL j = get_cell();
|
||||
if (Yap_ErrorMessage)
|
||||
@ -928,7 +928,7 @@ CopyCode(void)
|
||||
if (myread(splfild, (char *) Yap_HeapBase,
|
||||
(Unsigned(OldHeapTop) - Unsigned(OldHeapBase))) < 0)
|
||||
return -1;
|
||||
#endif /* YAPOR || TABLING */
|
||||
#endif /* YAPOR || (TABLING && !YAP_MEMORY_ALLOC_SCHEME) */
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
Copyright: R. Rocha and NCC - University of Porto, Portugal
|
||||
File: opt.init.c
|
||||
version: $Id: opt.init.c,v 1.15 2007-04-26 14:11:08 ricroc Exp $
|
||||
version: $Id: opt.init.c,v 1.16 2008-04-11 16:26:18 ricroc Exp $
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
@ -146,6 +146,7 @@ void Yap_init_global(int max_table_size, int n_workers, int sch_loop, int delay_
|
||||
GLOBAL_last_sg_fr = NULL;
|
||||
GLOBAL_check_sg_fr = NULL;
|
||||
#endif /* LIMIT_TABLING */
|
||||
GLOBAL_root_dep_fr = NULL;
|
||||
for (i = 0; i < MAX_TABLE_VARS; i++) {
|
||||
CELL *pt = GLOBAL_table_var_enumerator_addr(i);
|
||||
RESET_VARIABLE(pt);
|
||||
@ -219,7 +220,8 @@ void make_root_frames(void) {
|
||||
|
||||
#ifdef TABLING
|
||||
/* root dependency frame */
|
||||
new_dependency_frame(GLOBAL_root_dep_fr, FALSE, NULL, NULL, NULL, NULL, NULL);
|
||||
if (!GLOBAL_root_dep_fr)
|
||||
new_dependency_frame(GLOBAL_root_dep_fr, FALSE, NULL, NULL, NULL, NULL, NULL);
|
||||
#endif /* TABLING */
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
Copyright: R. Rocha and NCC - University of Porto, Portugal
|
||||
File: opt.preds.c
|
||||
version: $Id: opt.preds.c,v 1.28 2008-03-25 16:45:53 vsc Exp $
|
||||
version: $Id: opt.preds.c,v 1.29 2008-04-11 16:26:19 ricroc Exp $
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
@ -191,6 +191,7 @@ Int p_start_yapor(void) {
|
||||
BITMAP_clear(GLOBAL_bm_pruning_workers);
|
||||
#endif /* TABLING_INNER_CUTS */
|
||||
make_root_choice_point();
|
||||
GLOBAL_performance_mode &= ~PERFORMANCE_IN_EXECUTION;
|
||||
GLOBAL_execution_time = current_time();
|
||||
BITMAP_clear(GLOBAL_bm_finished_workers);
|
||||
PUT_IN_EXECUTING(worker_id);
|
||||
@ -423,9 +424,7 @@ void show_answers(void) {
|
||||
}
|
||||
fprintf(Yap_stderr, " (in %f seconds) ]\n\n", GLOBAL_execution_time);
|
||||
|
||||
if (GLOBAL_performance_mode & PERFORMANCE_IN_EXECUTION) {
|
||||
GLOBAL_performance_mode &= ~PERFORMANCE_IN_EXECUTION;
|
||||
} else if (GLOBAL_performance_mode == PERFORMANCE_ON) {
|
||||
if (GLOBAL_performance_mode == PERFORMANCE_ON) {
|
||||
for (i = GLOBAL_number_goals; i > 0; i--) {
|
||||
if (GLOBAL_best_times(i) > GLOBAL_execution_time) {
|
||||
if (i + 1 < MAX_BEST_TIMES)
|
||||
|
||||
@ -237,16 +237,16 @@ print_usage(void)
|
||||
#ifdef TABLING
|
||||
fprintf(stderr," -ts Maximum table space area in Mbytes (default: unlimited)\n");
|
||||
#endif /* TABLING */
|
||||
#ifdef YAPOR
|
||||
#if defined(ENV_COPY) || defined(ACOW) || defined(SBA)
|
||||
fprintf(stderr," -w Number of workers (default: %d)\n",
|
||||
DEFAULT_NUMBERWORKERS);
|
||||
fprintf(stderr," -sl Loop scheduler executions before look for hiden shared work (default: %d)\n",
|
||||
DEFAULT_SCHEDULERLOOP);
|
||||
fprintf(stderr," -d Value of delayed release of load (default: %d)\n",
|
||||
DEFAULT_DELAYEDRELEASELOAD);
|
||||
#endif /* ENV_COPY || ACOW || SBA */
|
||||
/* nf: Preprocessor */
|
||||
fprintf(stderr," -DVar=Name : persistent definition\n");
|
||||
#endif /* YAPOR */
|
||||
/* fprintf(stderr," -DVar=Name Persistent definition\n"); */
|
||||
fprintf(stderr,"\n");
|
||||
}
|
||||
|
||||
@ -288,12 +288,14 @@ parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap)
|
||||
case 'q':
|
||||
iap->QuietMode = TRUE;
|
||||
break;
|
||||
#if defined(ENV_COPY) || defined(ACOW) || defined(SBA)
|
||||
case 'w':
|
||||
ssize = &(iap->NumberWorkers);
|
||||
goto GetSize;
|
||||
case 'd':
|
||||
ssize = &(iap->DelayedReleaseLoad);
|
||||
goto GetSize;
|
||||
#endif /* ENV_COPY || ACOW || SBA */
|
||||
#ifdef USE_SOCKET
|
||||
case 'c': /* running as client */
|
||||
{
|
||||
@ -378,10 +380,12 @@ parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap)
|
||||
case 's':
|
||||
case 'S':
|
||||
ssize = &(iap->StackSize);
|
||||
#if defined(ENV_COPY) || defined(ACOW) || defined(SBA)
|
||||
if (p[1] == 'l') {
|
||||
p++;
|
||||
ssize = &(iap->SchedulerLoop);
|
||||
}
|
||||
#endif /* ENV_COPY || ACOW || SBA */
|
||||
goto GetSize;
|
||||
case 'h':
|
||||
case 'H':
|
||||
@ -390,10 +394,12 @@ parse_yap_arguments(int argc, char *argv[], YAP_init_args *iap)
|
||||
case 't':
|
||||
case 'T':
|
||||
ssize = &(iap->TrailSize);
|
||||
#ifdef TABLING
|
||||
if (p[1] == 's') {
|
||||
p++;
|
||||
ssize = &(iap->MaxTableSpaceSize);
|
||||
}
|
||||
#endif /* TABLING */
|
||||
GetSize:
|
||||
if (*++p == '\0')
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user