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

fix ClSize for IDB

Browse Source 
fix error handling for binary cmps


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1020 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-03-06 00:31:48 +00:00
parent ad685b6e5b
commit cd3142c211
4 changed files with 73 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
C/absmi.c
View File

@ -9311,10 +9311,10 @@ Yap_absmi(int inp)
CmpPredicate f = PREG->u.llxx.p->cs.d_code; CmpPredicate f = PREG->u.llxx.p->cs.d_code;
saveregs(); saveregs();
d0 = (CELL) (f) (d0,d1); d0 = (CELL) (f) (d0,d1);
}
setregs(); setregs();
}
if (!d0) { if (!d0) {
if (PREG != FAILCODE)
PREG = PREG->u.llxx.f; PREG = PREG->u.llxx.f;
JMPNext(); JMPNext();
} }
@ -9383,9 +9383,10 @@ Yap_absmi(int inp)
CmpPredicate f = PREG->u.llxy.p->cs.d_code; CmpPredicate f = PREG->u.llxy.p->cs.d_code;
saveregs(); saveregs();
d0 = (CELL) (f) (d0,d1); d0 = (CELL) (f) (d0,d1);
}
setregs(); setregs();
}
if (!d0) { if (!d0) {
if (PREG != FAILCODE)
PREG = PREG->u.llxy.f; PREG = PREG->u.llxy.f;
JMPNext(); JMPNext();
} }
@ -9454,9 +9455,10 @@ Yap_absmi(int inp)
CmpPredicate f = PREG->u.llxy.p->cs.d_code; CmpPredicate f = PREG->u.llxy.p->cs.d_code;
saveregs(); saveregs();
d0 = (CELL) (f) (d0,d1); d0 = (CELL) (f) (d0,d1);
}
setregs(); setregs();
}
if (!d0) { if (!d0) {
if (PREG != FAILCODE)
PREG = PREG->u.llxy.f; PREG = PREG->u.llxy.f;
JMPNext(); JMPNext();
} }
@ -9531,6 +9533,7 @@ Yap_absmi(int inp)
} }
setregs(); setregs();
if (!d0) { if (!d0) {
if (PREG != FAILCODE)
PREG = PREG->u.llyy.f; PREG = PREG->u.llyy.f;
JMPNext(); JMPNext();
} }

10
C/cdmgr.c
View File

@ -2652,16 +2652,6 @@ code_in_pred(PredEntry *pp, Atom *pat, UInt *parity, yamop *codeptr) {
} }
clcode = pp->cs.p_code.FirstClause; clcode = pp->cs.p_code.FirstClause;
if (clcode != NULL) { if (clcode != NULL) {
char *code_end;
if (pp->PredFlags & LogUpdatePredFlag) {
LogUpdClause *cl = ClauseCodeToLogUpdClause(pp->cs.p_code.TrueCodeOfPred);
code_end = (char *)cl + cl->ClSize;
} else if (!(pp->PredFlags & DynamicPredFlag)) {
code_end = NULL;
} else {
StaticClause *cl = ClauseCodeToStaticClause(pp->cs.p_code.TrueCodeOfPred);
code_end = (char *)cl + cl->ClSize;
}
if (pp->PredFlags & LogUpdatePredFlag) { if (pp->PredFlags & LogUpdatePredFlag) {
LogUpdClause *cl = ClauseCodeToLogUpdClause(clcode); LogUpdClause *cl = ClauseCodeToLogUpdClause(clcode);
do { do {

1
C/dbase.c
View File

@ -1830,6 +1830,7 @@ record_lu(PredEntry *pe, Term t, int position)
cl->ClPred = pe; cl->ClPred = pe;
cl->ClExt = NULL; cl->ClExt = NULL;
cl->ClPrev = cl->ClNext = NULL; cl->ClPrev = cl->ClNext = NULL;
cl->ClSize = ((CODEADDR)&(x->Contents)-(CODEADDR)cl)+x->NOfCells*sizeof(CELL);
#if defined(YAPOR) || defined(THREADS) #if defined(YAPOR) || defined(THREADS)
INIT_LOCK(cl->ClLock); INIT_LOCK(cl->ClLock);
INIT_CLREF_COUNT(cl); INIT_CLREF_COUNT(cl);

111
docs/yap.tex
View File

@ -12147,7 +12147,7 @@ Subnodes of Threads
@end menu @end menu
\node Creating and destroying Prolog threads, , ,Threads @node Creating and destroying Prolog threads, Monitoring Threads, ,Threads
@section Creating and destroying Prolog threads @section Creating and destroying Prolog threads
@table @code @table @code
@ -12163,26 +12163,22 @@ thread-identifier of the created thread is unified to @var{Id}.
@var{Options} is a list of options. Currently defined options are: @var{Options} is a list of options. Currently defined options are:
@table @code @table @code
@item{stack} @item stack
Set the limit in K-Bytes to which the local stack of this thread may grow. If Set the limit in K-Bytes to which the Prolog stacks of
omited, the limit of the calling thread is used. See also the this thread may grow. If omited, the limit of the calling thread is
\cmdlineoption{-s} commandline option. used. See also the \cmdlineoption{-s} commandline option.
@item{trail} @item trail
Set the limit in K-Bytes to which the trail stack of this thread may Set the limit in K-Bytes to which the trail stack of this thread may
grow. If omited, the limit of the calling thread is used. See also the grow. If omited, the limit of the calling thread is used. See also the
\cmdlineoption{-t} commandline option. \cmdlineoption{-t} commandline option.
@item{stack} @item alias
Set the limit in K-Bytes to which the system stack of this thread may
grow. The default, mimimum and maximum values are system-dependant.
@item{alias}
Associate an alias-name with the thread. This named may be used to Associate an alias-name with the thread. This named may be used to
refer to the thread and remains valid until the thread is joined refer to the thread and remains valid until the thread is joined
(see @code{thread_join/2}). (see @code{thread_join/2}).
@item{detached} @item detached
If @code{false} (default), the thread can be waited for using If @code{false} (default), the thread can be waited for using
@code{thread_join/2}. @code{thread_join/2} must be called on this thread @code{thread_join/2}. @code{thread_join/2} must be called on this thread
to reclaim the all resources associated to the thread. If @code{true}, to reclaim the all resources associated to the thread. If @code{true},
@ -12221,17 +12217,18 @@ exit-status of the thread is retained until @code{thread_join/2} is called on
the thread. Defined values for @var{Status} are: the thread. Defined values for @var{Status} are:
@table @code @table @code
@item{true}{} @item true
The goal has been proven successfully. The goal has been proven successfully.
@item{false}{} @item false
The goal has failed. The goal has failed.
@item{exception}{@var{Term}} The thread is terminated on an @item exception(@var{Term})
The thread is terminated on an
exception. See @code{print_message/2} to turn system exceptions into exception. See @code{print_message/2} to turn system exceptions into
readable messages. readable messages.
@item{exited}{@var{Term}} @item exited(@var{Term)
The thread is terminated on thread_exit/1 using the argument @var{Term}. The thread is terminated on thread_exit/1 using the argument @var{Term}.
@end table @end table
@ -12262,82 +12259,95 @@ result-state for @code{thread_join/2}. If the thread has the attribute
retrieved using @code{thread_join/2} making the value of @var{Term} retrieved using @code{thread_join/2} making the value of @var{Term}
irrelevant. The Prolog stacks and C-thread are reclaimed. irrelevant. The Prolog stacks and C-thread are reclaimed.
\predicate{thread_at_exit}{1}{:Goal} @item thread_at_exit(:@var{Term})
Run @var{Goal} just before releasing the thread resources. This is to be @findex thread_at_exit/1
compared to at_halt/1, but only for the current thread. These hooks are @snindex thread_at_exit/1
ran regardless of why the execution of the thread has been completed. As @cnindex thread_at_exit/1
these hooks are run, the return-code is already available through Run @var{Goal} just before releasing the thread resources. This is to
current_thread/2 using the result of thread_self/1 as thread-identifier. be compared to @code{at_halt/1}, but only for the current
thread. These hooks are ran regardless of why the execution of the
thread has been completed. As these hooks are run, the return-code is
already available through @code{current_thread/2} using the result of
@code{thread_self/1} as thread-identifier.
\predicate{thread_setconcurrency}{2}{-Old, +New} @item thread_setconcurrency(+@var{Old}, -@var{New})
\index{Solaris}% @findex thread_setconcurrency/2
@snindex thread_setconcurrency/2
@cnindex thread_setconcurrency/2
Determine the concurrency of the process, which is defined as the Determine the concurrency of the process, which is defined as the
maximum number of concurrently active threads. `Active' here means they maximum number of concurrently active threads. `Active' here means
are using CPU time. This option is provided if the thread-implementation they are using CPU time. This option is provided if the
provides pthread_setconcurrency(). Solaris is a typical example of this thread-implementation provides
@code{pthread_setconcurrency()}. Solaris is a typical example of this
family. On other systems this predicate unifies @var{Old} to 0 (zero) family. On other systems this predicate unifies @var{Old} to 0 (zero)
and succeeds silently. and succeeds silently.
@end table @end table
\section{Monitoring threads} \label{sec:thmonitor} @node Monitoring threads, Thread Communication,Creating and destroying Prolog threads,Threads
@section Monitoring threads
Normal multi-threaded applications should not need these the predicates Normal multi-threaded applications should not need these the predicates
from this section because almost any usage of these predicates is from this section because almost any usage of these predicates is
unsafe. For example checking the existence of a thread before signalling unsafe. For example checking the existence of a thread before signalling
it is of no use as it may vanish between the two calls. Catching it is of no use as it may vanish between the two calls. Catching
exceptions using catch/3 is the only safe way to deal with exceptions using @code{catch/3} is the only safe way to deal with
thread-existence errors. thread-existence errors.
These predicates are provided for diagnosis and monitoring tasks. See These predicates are provided for diagnosis and monitoring tasks.
also \secref{thutil}, describing more high-level primitives.
@table @code @table @code
@item current_thread(+@var{Id}, -@var{Status})
@findex current_thread/2
@snindex current_thread/2
@cnindex current_thread/2
\predicate{current_thread}{2}{?Id, ?Status} \predicate{current_thread}{2}{?Id, ?Status}
Enumerates identifiers and status of all currently known threads. Enumerates identifiers and status of all currently known threads.
Calling current_thread/2 does not influence any thread. See also Calling current_thread/2 does not influence any thread. See also
thread_join/2. For threads that have an alias-name, this name is @code{thread_join/2}. For threads that have an alias-name, this name is
returned in @var{Id} instead of the numerical thread identifier. returned in @var{Id} instead of the numerical thread identifier.
@var{Status} is one of: @var{Status} is one of:
@table @code @table @code
@item{running}{} @item running
The thread is running. This is the initial status of a thread. Please The thread is running. This is the initial status of a thread. Please
note that threads waiting for something are considered running too. note that threads waiting for something are considered running too.
@item{false}{} @item false
The @var{Goal} of the thread has been completed and failed. The @var{Goal} of the thread has been completed and failed.
@item{true}{} @item true
The @var{Goal} of the thread has been completed and succeeded. The @var{Goal} of the thread has been completed and succeeded.
@item{exited}{Term} @item exited(@var{Term})
The @var{Goal} of the thread has been terminated using thread_exit/1 The @var{Goal} of the thread has been terminated using @code{thread_exit/1}
with @var{Term} as argument. If the underlying native thread has with @var{Term} as argument. If the underlying native thread has
exited (using pthread_exit()) @var{Term} is unbound. exited (using pthread_exit()) @var{Term} is unbound.
@item{exception}{Term} @item exception(@var{Term})
The @var{Goal} of the thread has been terminated due to an uncaught The @var{Goal} of the thread has been terminated due to an uncaught
exception (see throw/1 and catch/3). exception (see @code{throw/1} and @code{catch/3}).
@end table @end table
\predicate{thread_statistics}{3}{+Id, +Key, -Value} @item thread_statistics(+@var{Id}, +@var{Key}, -@var{Value})
Obtains statistical information on thread @var{Id} as statistics/2 @findex thread_statistics/3
@snindex thread_statistics/3
@cnindex thread_statistics/3
Obtains statistical information on thread @var{Id} as @code{statistics/2}
does in single-threaded applications. This call returns all keys does in single-threaded applications. This call returns all keys
of statistics/2, although only information statistics about the of @code{statistics/2}, although only information statistics about the
stacks and CPU time yield different values for each thread.% stacks and CPU time yield different values for each thread.
\footnote{Getting the CPU-time of a different thread is
not supported on all platforms. For Microsoft,
it does not work in 95/98/ME. For POSIX systems
it requires times() to return values specific for
the calling thread.}
@item mutex_statistics
@findex mutex_statistics/0
@snindex mutex_statistics/0
@cnindex mutex_statistics/0
\predicate{mutex_statistics}{0}{} \predicate{mutex_statistics}{0}{}
Print usage statistics on internal mutexes and mutexes associated Print usage statistics on internal mutexes and mutexes associated
with dynamic predicates. For each mutex two numbers are printed: with dynamic predicates. For each mutex two numbers are printed:
the number of times the mutex was acquired and the number of the number of times the mutex was acquired and the number of
\jargon{collisions}: the number times the calling thread has to collisions: the number times the calling thread has to
wait for the mutex. The collistion-count is not available on wait for the mutex. The collistion-count is not available on
Windows as this would break portability to Windows-95/98/ME or Windows as this would break portability to Windows-95/98/ME or
significantly harm performance. Generally collision count is significantly harm performance. Generally collision count is
@ -12345,7 +12355,8 @@ close to zero on single-CPU hardware.
@end table @end table
\section{Thread communication} \label{sec:threadcom} @node Thread Communication, ,Monitoring threads, Threads
@section Thread communication
\subsection{Message queues} \label{sec:msgqueue} \subsection{Message queues} \label{sec:msgqueue}