[gs-cvs] rev 8496 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2008-01-21 12:59:55 -0800 (Mon, 21 Jan 2008)
New Revision: 8496

Modified:
   trunk/gs/src/gsalloc.c
   trunk/gs/src/gxalloc.h
   trunk/gs/src/igc.c
   trunk/gs/src/isave.c
Log:
Fix (save/restore) : Remove gs_ref_memory_s::inherited.

DETAILS :

It is not used since revision 5250.

EXPECTED DIFFERENCES :

None.      


Modified: trunk/gs/src/gsalloc.c
===================================================================
--- trunk/gs/src/gsalloc.c	2008-01-20 22:23:07 UTC (rev 8495)
+++ trunk/gs/src/gsalloc.c	2008-01-21 20:59:55 UTC (rev 8496)
@@ -322,7 +322,6 @@
     mem->cc.rtop = 0;
     mem->cc.has_refs = false;
     mem->allocated = 0;
-    mem->inherited = 0;
     mem->changes = 0;
     mem->scan_limit = 0;
     mem->total_scanned = 0;

Modified: trunk/gs/src/gxalloc.h
===================================================================
--- trunk/gs/src/gxalloc.h	2008-01-20 22:23:07 UTC (rev 8495)
+++ trunk/gs/src/gxalloc.h	2008-01-21 20:59:55 UTC (rev 8496)
@@ -353,11 +353,6 @@
     chunk_locator_t cfreed;	/* chunk where last object freed */
     ulong allocated;		/* total size of all chunks */
 				/* allocated at this save level */
-    long inherited;		/* chunks allocated at outer save */
-				/* levels that should be counted */
-				/* towards the GC threshold */
-				/* (may be negative, but allocated + */
-				/* inherited >= 0 always) */
     ulong gc_allocated;		/* value of (allocated + */
 				/* previous_status.allocated) after last GC */
     struct lost_ {		/* space freed and 'lost' (not put on a */

Modified: trunk/gs/src/igc.c
===================================================================
--- trunk/gs/src/igc.c	2008-01-20 22:23:07 UTC (rev 8495)
+++ trunk/gs/src/igc.c	2008-01-21 20:59:55 UTC (rev 8496)
@@ -521,7 +521,6 @@
 		      (ulong) mem, total.allocated, total.used);
 	    gs_memory_status((gs_memory_t *) mem, &total);
 	    mem->gc_allocated = mem->allocated + total.allocated;
-	    mem->inherited = -(int)mem->allocated;
 	}
 	mem = space_memories[ispace];
 	mem->previous_status = total;

Modified: trunk/gs/src/isave.c
===================================================================
--- trunk/gs/src/isave.c	2008-01-20 22:23:07 UTC (rev 8495)
+++ trunk/gs/src/isave.c	2008-01-21 20:59:55 UTC (rev 8496)
@@ -392,14 +392,9 @@
 #endif
 		/* Inherit the allocated space count -- */
 		/* we need this for triggering a GC. */
-		rsave->state.inherited =
-		    lsave->state.allocated + lsave->state.inherited;
-		lmem->inherited = rsave->state.inherited;
 		print_save("save", lmem->space, lsave);
 	    }
 	}
-#else
-	lmem->inherited = lsave->state.allocated + lsave->state.inherited;
 #endif
     }
     alloc_set_in_save(dmem);