[Yap-commits] CVS: LGPL/JPL/src jpl.c,1.16,1.17

[Vitor S. C. <vs...@us...>]

Update of /cvsroot/yap/LGPL/JPL/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21137/LGPL/JPL/src

Modified Files:
	jpl.c 
Log Message:
MaxOS fixes
Avoid a thread deadlock
improvements to SWI predicates.
make variables_in_term system builtin.


Index: jpl.c
===================================================================
RCS file: /cvsroot/yap/LGPL/JPL/src/jpl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jpl.c	10 May 2008 23:24:12 -0000	1.16
+++ jpl.c	12 Aug 2008 01:27:22 -0000	1.17
@@ -1798,6 +1798,8 @@
  /* opt[optn++].optionString = "-Xcheck:jni";    // extra checking of JNI calls */
 #if __YAP_PROLOG__
     opt[optn++].optionString = "-Xmx1512m";    // give java enough space
+    opt[optn++].optionString = "-Djava.awt.headless=true";    // 
+    //    opt[optn++].optionString = "-XstartOnFirstThread";    // 
 #endif
  /* opt[optn++].optionString = "-Xnoclassgc";    // so method/field IDs remain valid (?) */
  /* opt[optn].optionString = "vfprintf"; */
@@ -1827,7 +1829,7 @@
 	? 2				    /* success (JVM already available) */
 	: ( (r=JNI_CreateJavaVM(&jvm,(void**)&env,&vm_args)) == 0
 	  ? 0				    /* success (JVM created OK) */
-	  : ( jvm=NULL, r)		    /* -ve, i.e. some create error */
+	    : ( jvm=NULL, r)		    /* -ve, i.e. some create error */
 	  )
 	);
     }
@@ -1857,7 +1859,7 @@
 	? 1				    /* already initialised */
 	: ( (r1=jni_create_jvm_c(cp)) < 0
 	    ? r1				    /* err code from JVM-specific routine */
-	  : ( (r2=jni_init()) < 0
+	    :  ( (r2=jni_init()) < 0
 	    ? r2			    /* err code from jni_init() */
 	    : ( r1 == 0			    /* success code from JVM-specific routine */
 	      ? ( DEBUG(0, Sdprintf("[JPL: Java VM created]\n")), r1)