fix new indexing code to actually recover space

fix predicate info to work for LUs


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1701 b08c6af1-5177-4d33-ba66-4b1c6b8b522a

C/absmi.c

@@ -10,8 +10,11 @@
 *									 *
 * File:		absmi.c							 *
 * comments:	Portable abstract machine interpreter                    *
-* Last rev:     $Date: 2006-10-10 14:08:15 $,$Author: vsc $						 *
+* Last rev:     $Date: 2006-10-10 20:21:42 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.206  2006/10/10 14:08:15  vsc
+* small fixes on threaded implementation.
+*
 * Revision 1.205  2006/09/28 16:15:54  vsc
 * make GMPless version compile.
 *
@@ -2157,13 +2160,16 @@ Yap_absmi(int inp)
 		LOCK(cl->ClLock);
 		DEC_CLREF_COUNT(cl);
 		cl->ClFlags &= ~InUseMask;
-		erase = (cl->ClFlags & ErasedMask) && !(cl->ClRefCount);
+		erase = (cl->ClFlags & (DirtyMask|ErasedMask)) && !(cl->ClRefCount);
 		UNLOCK(cl->ClLock);
 		if (erase) {
 		  /* at this point, we are the only ones accessing the clause,
 		     hence we don't need to have a lock it */
 		  saveregs();
-		  Yap_ErLogUpdIndex(cl);
+		  if (cl->ClFlags & ErasedMask) 
+		    Yap_ErLogUpdIndex(cl);
+		  else
+		    Yap_CleanUpIndex(cl);
 		  setregs();
 		}
 	      } else {

C/dbase.c

@@ -3625,6 +3625,31 @@ static UInt
 index_sz(LogUpdIndex *x)
 {
   UInt sz = x->ClSize;
+  yamop *start = x->ClCode;
+  op_numbers op = Yap_op_from_opcode(start->opc);
+
+  /* add try-retry-trust children */
+  while (op == _jump_if_nonvar) {
+    start = NEXTOP(start, xll);
+    op = Yap_op_from_opcode(start->opc);
+  }
+  if (op == _enter_lu_pred) {
+    PredEntry *ap = x->ClPred;
+    OPCODE endop, op1;
+
+    if (ap->PredFlags & CountPredFlag)
+      endop = Yap_opcode(_count_trust_logical);
+    else if (ap->PredFlags & ProfiledPredFlag)
+      endop = Yap_opcode(_profiled_trust_logical);
+    else
+      endop = Yap_opcode(_trust_logical);
+    start = start->u.Ill.l1;
+    do {
+      sz += (UInt)NEXTOP((yamop*)NULL,lld);
+      op1 = start->opc;
+      start = start->u.lld.n;
+    } while (op1 != endop);
+  }
   x = x->ChildIndex;
   while (x != NULL) {
     sz += index_sz(x);
@@ -3676,7 +3701,7 @@ p_key_statistics(void)
   if ((pe = find_lu_entry(twork)) != NULL) {
     return lu_statistics(pe);
   }
-  if (EndOfPAEntr(p = FetchDBPropFromKey(twork, 0, TRUE, "key_statistics/3"))) {
+  if (EndOfPAEntr(p = FetchDBPropFromKey(twork, 0, TRUE, "key_statistics/4"))) {
     /* This is not a key property */
     return(FALSE);
   }
@@ -3697,6 +3722,32 @@ p_key_statistics(void)
     Yap_unify(ARG4,MkIntTerm(0));
 }
 
+static Int
+p_lu_statistics(void)
+{
+  Term t = Deref(ARG1);
+  Term mod = Deref(ARG5);
+  PredEntry *pe;
+  if (IsVarTerm(t)) {
+    return (FALSE);
+  } else if (IsAtomTerm(t)) {
+    Atom at = AtomOfTerm(t);
+    pe = RepPredProp(Yap_GetPredPropByAtom(at, mod));
+  } else if (IsApplTerm(t)) {
+    Functor         fun = FunctorOfTerm(t);
+    pe = RepPredProp(Yap_GetPredPropByFunc(fun, mod));
+  } else
+    return FALSE;
+  if (pe == NIL)
+    return FALSE;
+  if (!(pe->PredFlags & LogUpdatePredFlag)) {
+    /* should use '$recordedp' in this case */
+    return FALSE;
+  }
+  return lu_statistics(pe);
+}
+
+
 #ifdef DEBUG
 static Int
 p_total_erased(void)
@@ -3725,18 +3776,13 @@ p_total_erased(void)
 }
 
 static Int
-p_key_erased_statistics(void)
+lu_erased_statistics(PredEntry *pe)
 {
   UInt sz = 0, cls = 0;
   UInt isz = 0, icls = 0;
-  Term twork = Deref(ARG1);
-  PredEntry *pe;
   LogUpdClause *cl = DBErasedList;
   LogUpdIndex *icl = DBErasedIList;
 
-  /* only for log upds */
-  if ((pe = find_lu_entry(twork)) == NULL) 
-    return FALSE;
   while (cl) {
     if (cl->ClPred == pe) {
       cls++;
@@ -3758,6 +3804,18 @@ p_key_erased_statistics(void)
     Yap_unify(ARG5,MkIntegerTerm(isz));
 }
 
+static Int
+p_key_erased_statistics(void)
+{
+  Term twork = Deref(ARG1);
+  PredEntry *pe;
+
+  /* only for log upds */
+  if ((pe = find_lu_entry(twork)) == NULL) 
+    return FALSE;
+  return lu_erased_statistics(pe);
+}
+
 static Int
 p_heap_space_info(void)
 {
@@ -5190,6 +5248,7 @@ Yap_InitDBPreds(void)
   Yap_InitCPred("$fetch_reference_from_index", 3, p_fetch_reference_from_index, SafePredFlag|SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$resize_int_keys", 1, p_resize_int_keys, SafePredFlag|SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("key_statistics", 4, p_key_statistics, SyncPredFlag);
+  Yap_InitCPred("$lu_statistics", 5, p_lu_statistics, SyncPredFlag);
 #ifdef DEBUG
   Yap_InitCPred("total_erased", 4, p_total_erased, SyncPredFlag);
   Yap_InitCPred("key_erased_statistics", 5, p_key_erased_statistics, SyncPredFlag);

pl/preds.yap

@@ -836,15 +836,17 @@ predicate_property(Pred,Prop) :-
 
 predicate_statistics(V,NCls,Sz,ISz) :- var(V), !,
 	'$do_error'(instantiation_error,predicate_statistics(V,NCls,Sz,ISz)).
-predicate_statistics(M:P,NCls,Sz,ISz) :-
+predicate_statistics(M:P,NCls,Sz,ISz) :- !,
 	'$predicate_statistics'(P,M,NCls,Sz,ISz).
 predicate_statistics(P,NCls,Sz,ISz) :-
 	'$current_module'(M),
 	'$predicate_statistics'(P,M,NCls,Sz,ISz).
 
+'$predicate_statistics'(M:P,_,NCls,Sz,ISz) :- !,
+	'$predicate_statistics'(P,M,NCls,Sz,ISz).
 '$predicate_statistics'(P,M,NCls,Sz,ISz) :-
-	'$is_dynamic'(P, M), !,
+	'$is_log_updatable'(P, M), !,
-	'$key_statistics'(M:P,NCls,Sz,ISz).
+	'$lu_statistics'(P,NCls,Sz,ISz,M).
 '$predicate_statistics'(P,M,_,_,_) :-
 	'$system_predicate'(P,M), !, fail.
 '$predicate_statistics'(P,M,_,_,_) :-