Merge branch 'master' of ../yap-6.2

C/load_foreign.c

@@ -111,10 +111,10 @@ p_load_foreign(void)
 
 static Int
 p_open_shared_object(void) {
-  StringList ofiles = NULL;
   Term t = Deref(ARG1);
   Term tflags = Deref(ARG2);
-  void *ptr;
+  char *s;
+  void *handle;
 
   if (IsVarTerm(t)) {
     Yap_Error(INSTANTIATION_ERROR,t,"open_shared_object/3");
@@ -129,35 +129,22 @@ p_open_shared_object(void) {
     Yap_Error(INSTANTIATION_ERROR,tflags,"open_shared_object/3");
     return FALSE;
   } 
-  if (!IsIntTerm(tflags)) {
+  if (!IsIntegerTerm(tflags)) {
     Yap_Error(TYPE_ERROR_INTEGER,tflags,"open_shared_object/3");
     return FALSE;
   }
   
-  ofiles = (StringList) Yap_AllocCodeSpace(sizeof(StringListItem));
+  s = RepAtom(AtomOfTerm(t))->StrOfAE;
-  ofiles->next = NULL;
+  if ((handle = Yap_LoadForeignFile(s, IntegerOfTerm(tflags)))==NULL) {
-  ofiles->s = RepAtom(AtomOfTerm(t))->StrOfAE;
+    return FALSE;
-  if ((ptr = Yap_LoadForeignFile(ofiles->s, IntOfTerm(tflags)))==NULL) {
-      return FALSE;
   } else {
-    ForeignObj *f_code = (ForeignObj *)Yap_AllocCodeSpace(sizeof(ForeignObj));
+    return Yap_unify(MkIntegerTerm((Int)handle),ARG3);
-    ofiles->handle = ptr;
-
-    f_code->objs = ofiles;
-    f_code->libs = NULL;
-    f_code->f = NULL;
-    f_code->next = ForeignCodeLoaded;
-    f_code->module = CurrentModule;
-    ForeignCodeLoaded = f_code;
-
-    return Yap_unify(MkIntegerTerm((Int)f_code),ARG3);
   }
 }
 
 static Int
 p_close_shared_object(void) {
   Term t = Deref(ARG1);
-  ForeignObj *f, *f0 = NULL, *fi = ForeignCodeLoaded;
   void *handle;
 
   if (IsVarTerm(t)) {
@@ -168,30 +155,15 @@ p_close_shared_object(void) {
     Yap_Error(TYPE_ERROR_INTEGER,t,"open_shared_object/3");
     return FALSE;
   }
-  f = (ForeignObj *)IntegerOfTerm(t);
+  handle = (char *)IntegerOfTerm(t);
  
-  while (fi != f && fi) {
+  return Yap_CloseForeignFile(handle);
-    f0 = fi;
-    fi = f->next;
-  }
-  if (!fi)
-    return FALSE;
-  if (f0) {
-    f0->next = f->next;
-  } else {
-    ForeignCodeLoaded = f->next;
-  }
-  handle = f->objs->handle;
-  Yap_FreeCodeSpace((ADDR)f->objs);
-  Yap_FreeCodeSpace((ADDR)f);
-  return Yap_CloseForeignFile(f->f);
 }
 
 static Int
 p_call_shared_object_function(void) {
   Term t = Deref(ARG1);
   Term tfunc = Deref(ARG2);
-  ForeignObj *f, *f0 = NULL, *fi = ForeignCodeLoaded;
   void *handle;
 
   if (IsVarTerm(t)) {
@@ -202,7 +174,7 @@ p_call_shared_object_function(void) {
     Yap_Error(TYPE_ERROR_INTEGER,t,"open_shared_object/3");
     return FALSE;
   }
-  f = (ForeignObj *)IntegerOfTerm(t);
+  handle = (void *)IntegerOfTerm(t);
   if (IsVarTerm(tfunc)) {
     Yap_Error(INSTANTIATION_ERROR,t,"open_shared_object/3");
     return FALSE;
@@ -212,13 +184,6 @@ p_call_shared_object_function(void) {
     return FALSE;
   }
  
-  while (fi != f && fi) {
-    f0 = fi;
-    fi = f->next;
-  }
-  if (!fi)
-    return FALSE;
-  handle = f->objs->handle;
   return Yap_CallForeignFile(handle, RepAtom(AtomOfTerm(tfunc))->StrOfAE);
 }
 

Makefile.in

@@ -260,7 +260,9 @@ PL_SOURCES= \
 	$(srcdir)/pl/load_foreign.yap \
 	$(srcdir)/pl/modules.yap $(srcdir)/pl/preds.yap \
 	$(srcdir)/pl/profile.yap \
-	$(srcdir)/pl/protect.yap $(srcdir)/pl/setof.yap \
+	$(srcdir)/pl/protect.yap \
+	$(srcdir)/pl/save.yap \
+	$(srcdir)/pl/setof.yap \
 	$(srcdir)/pl/signals.yap \
 	$(srcdir)/pl/sockets.yap $(srcdir)/pl/sort.yap \
 	$(srcdir)/pl/statistics.yap \

pl/boot.yap

@@ -159,6 +159,13 @@ true :- true.
 '$enter_top_level' :-
 	'$clean_up_dead_clauses',
 	fail.
+% use if we come from a save_program and we have SWI's shlib
+'$enter_top_level' :-
+	recorded('$reload_foreign_libraries',G,R),
+	erase(R),
+	shlib:reload_foreign_libraries,
+	fail.
+% use if we come from a save_program and we have a goal to execute
 '$enter_top_level' :-
 	recorded('$restore_goal',G,R),
 	erase(R),

pl/init.yap

@@ -72,6 +72,7 @@ otherwise.
 	 'profile.yap',
 	 'callcount.yap',
 	 'load_foreign.yap',
+	 'save.yap',
 	 'sockets.yap',
 	 'sort.yap',
 	 'setof.yap',

pl/save.yap

@@ -0,0 +1,83 @@
+ /*************************************************************************
+ *									 *
+ *	 YAP Prolog 							 *
+ *									 *
+ *	Yap Prolog was developed at NCCUP - Universidade do Porto	 *
+ *									 *
+ * Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-2010	 *
+ *									 *
+ **************************************************************************
+ *									 *
+ * File:		save.yap					 *
+ * Last rev:	11/29/10						 *
+ * mods:								 *
+ * comments:	Some utility predicates to support save/restore in yap	 *
+ *									 *
+ *************************************************************************/
+
+%%% Saving and restoring a computation
+
+save(A) :- save(A,_).
+
+save(A,_) :- var(A), !,
+	'$do_error'(instantiation_error,save(A)).
+save(A,OUT) :- atom(A), !, atom_codes(A,S), '$save'(S,OUT).
+save(S,OUT) :- '$save'(S,OUT).
+
+save_program(A) :- var(A), !,
+	'$do_error'(instantiation_error,save_program(A)).
+save_program(A) :- atom(A), !, 
+	atom_codes(A,S),
+	'$save_program2'(S, true).
+save_program(S) :- '$save_program2'(S, true).
+
+save_program(A, G) :- var(A), !,
+	'$do_error'(instantiation_error, save_program(A,G)).
+save_program(A, G) :- var(G), !,
+	'$do_error'(instantiation_error, save_program(A,G)).
+save_program(A, G) :- \+ callable(G), !,
+	'$do_error'(type_error(callable,G), save_program(A,G)).
+save_program(A, G) :-
+	( atom(A) -> atom_codes(A,S) ; A = S),
+	'$save_program2'(S, G),
+	fail.
+save_program(_,_).
+
+'$save_program2'(S,G) :-
+	(
+	    G == true
+        ->
+	     true
+	 ;
+	     recorda('$restore_goal', G ,R)
+	),
+	(
+	    '$undefined'(reload_foreign_libraries, shlib)
+        ->
+	     true
+	 ;
+	     recorda('$reload_foreign_libraries', true, R1)
+	),
+	'$save_program'(S),
+	(
+	    var(R1)
+        ->
+	     true
+	 ;
+	     erase(R1)
+	),
+	(
+	    var(R)
+        ->
+	     true
+	 ;
+	     erase(R)
+	),
+	fail.
+'$save_program2'(_,_).
+
+restore(A) :- var(A), !,
+	'$do_error'(instantiation_error,restore(A)).
+restore(A) :- atom(A), !, name(A,S), '$restore'(S).
+restore(S) :- '$restore'(S).
+

pl/udi.yap

@@ -4,14 +4,14 @@
 *									 *
 *	Yap Prolog was developed at NCCUP - Universidade do Porto	 *
 *									 *
-* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997	 *
+* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-2010	 *
 *									 *
 **************************************************************************
 *									 *
-* File:		tabling.yap						 *
+* File:		udi.yap							 *
 * Last rev:	8/2/88							 *
 * mods:									 *
-* comments:	support tabling predicates				 *
+* comments:	support user defined indexing				 *
 *									 *
 *************************************************************************/
 

pl/utils.yap

@@ -316,23 +316,56 @@ save(S,OUT) :- '$save'(S,OUT).
 
 save_program(A) :- var(A), !,
 	'$do_error'(instantiation_error,save_program(A)).
-save_program(A) :- atom(A), !, atom_codes(A,S), '$save_program'(S).
+save_program(A) :- atom(A), !, 
-save_program(S) :- '$save_program'(S).
+	atom_codes(A,S),
+	'$save_program2'(S, true).
+save_program(S) :- '$save_program2'(S, true).
 
 save_program(A, G) :- var(A), !,
-	'$do_error'(instantiation_error,save_program(A,G)).
+	'$do_error'(instantiation_error, save_program(A,G)).
 save_program(A, G) :- var(G), !,
-	'$do_error'(instantiation_error,save_program(A,G)).
+	'$do_error'(instantiation_error, save_program(A,G)).
 save_program(A, G) :- \+ callable(G), !,
-	'$do_error'(type_error(callable,G),save_program(A,G)).
+	'$do_error'(type_error(callable,G), save_program(A,G)).
 save_program(A, G) :-
-	( atom(A) -> name(A,S) ; A = S),
+	( atom(A) -> atom_codes(A,S) ; A = S),
-	recorda('$restore_goal',G,R),
+	'$save_program2'(S, G),
-	'$save_program'(S),
-	erase(R),
 	fail.
 save_program(_,_).
 
+'$save_program2'(S,G) :-
+	(
+	    G == true
+        ->
+	     true
+	 ;
+	     recorda('$restore_goal', G ,R)
+	),
+	(
+	    '$undefined'(reload_foreign_libraries, shlib)
+        ->
+	     true
+	 ;
+	     recorda('$reload_foreign_libraries', true, R1)
+	),
+	'$save_program'(S),
+	(
+	    var(R1)
+        ->
+	     true
+	 ;
+	     erase(R1)
+	),
+	(
+	    var(R)
+        ->
+	     true
+	 ;
+	     erase(R)
+	),
+	fail.
+'$save_program2'(_,_).
+
 restore(A) :- var(A), !,
 	'$do_error'(instantiation_error,restore(A)).
 restore(A) :- atom(A), !, name(A,S), '$restore'(S).