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

condor support.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2092 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2008-02-12 21:50:58 +00:00
parent 8ccc09d38f
commit efe6c4eaef
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C/sysbits.c
View File

@ -302,6 +302,7 @@ bla bla
#if THREADS #if THREADS
#define StartOfTimes (*(ThreadHandle[worker_id].start_of_timesp)) #define StartOfTimes (*(ThreadHandle[worker_id].start_of_timesp))
#define last_time (*(ThreadHandle[worker_id].last_timep)) #define last_time (*(ThreadHandle[worker_id].last_timep))
#else #else
/* since the point YAP was started */ /* since the point YAP was started */
static struct timeval StartOfTimes; static struct timeval StartOfTimes;
@ -2343,7 +2344,7 @@ p_alarm(void)
tout = MkIntegerTerm(0); tout = MkIntegerTerm(0);
return Yap_unify(ARG3,tout) && Yap_unify(ARG4,MkIntTerm(0)); return Yap_unify(ARG3,tout) && Yap_unify(ARG4,MkIntTerm(0));
} }
#elif HAVE_SETITIMER #elif HAVE_SETITIMER && !SUPPORT_CONDOR
{ {
struct itimerval new, old; struct itimerval new, old;
@ -2362,7 +2363,7 @@ p_alarm(void)
return Yap_unify(ARG3,MkIntegerTerm(old.it_value.tv_sec)) && return Yap_unify(ARG3,MkIntegerTerm(old.it_value.tv_sec)) &&
Yap_unify(ARG4,MkIntegerTerm(old.it_value.tv_usec)); Yap_unify(ARG4,MkIntegerTerm(old.it_value.tv_usec));
} }
#elif HAVE_ALARM #elif HAVE_ALARM && !SUPPORT_CONDOR
{ {
Int left; Int left;
Term tout; Term tout;
@ -2835,7 +2836,7 @@ rw_lock_voodoo(void) {
#endif /* sparc */ #endif /* sparc */
#ifdef i386 #if defined(i386) || defined(__x86_64__)
asm( asm(
".align 4\n" ".align 4\n"

1
CLPBN/clpbn/bnt.yap
View File

@ -68,6 +68,7 @@ bnt_path('$HOME/Yap/CLPBN/FullBNT-1.0.4/BNT').
% %
%bnt_model(propositional). %bnt_model(propositional).
bnt_model(tied). bnt_model(tied).
%bnt_model(dbn).
/***************************************** /*****************************************

4
H/Yap.h
View File

@ -10,7 +10,7 @@
* File: Yap.h.m4 * * File: Yap.h.m4 *
* mods: * * mods: *
* comments: main header file for YAP * * comments: main header file for YAP *
* version: $Id: Yap.h,v 1.26 2008-02-07 23:09:13 vsc Exp $ * * version: $Id: Yap.h,v 1.27 2008-02-12 21:50:58 vsc Exp $ *
*************************************************************************/ *************************************************************************/
#include "config.h" #include "config.h"
@ -326,7 +326,7 @@ typedef CELL Term;
typedef pthread_mutex_t lockvar; typedef pthread_mutex_t lockvar;
typedef pthread_rwlock_t rwlock_t; typedef pthread_rwlock_t rwlock_t;
#include <pthread_locks.h> #include <pthread_locks.h>
#elif defined(i386) #elif defined(i386) || defined(__x86_64__)
typedef volatile int lockvar; typedef volatile int lockvar;
#include <x86_locks.h> #include <x86_locks.h>
#elif defined(sparc) || defined(__sparc) #elif defined(sparc) || defined(__sparc)

4
library/yap2swi/yap2swi.c
View File

@ -16,6 +16,10 @@
#include <SWI-Prolog.h> #include <SWI-Prolog.h>
#ifdef USE_GMP
#include <gmp.h>
#endif
#define BUF_SIZE 256 #define BUF_SIZE 256
#define TMP_BUF_SIZE 2*BUF_SIZE #define TMP_BUF_SIZE 2*BUF_SIZE
#define BUF_RINGS 16 #define BUF_RINGS 16

1
pl/statistics.yap
View File

@ -132,7 +132,6 @@ key_statistics(Key, NOfEntries, TotalSize) :-
% Based on the SWI-Prolog definition minus reporting the number of inferences, % Based on the SWI-Prolog definition minus reporting the number of inferences,
% which YAP does not currently supports % which YAP does not currently supports
:- meta_predicate time(:). :- meta_predicate time(:).
time(Goal) :- time(Goal) :-