hg/stx-libtool: comparison MemMonitor.st

equal deleted inserted replaced

-:a936f81cc162
+:c23841df3616
 MemoryMonitor comment:'
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.17 1995-07-23 03:19:24 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.18 1995-08-03 01:37:52 claus Exp $
 '!
 !MemoryMonitor class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.17 1995-07-23 03:19:24 claus Exp $
+$Header: /cvs/stx/stx/libtool/Attic/MemMonitor.st,v 1.18 1995-08-03 01:37:52 claus Exp $
 "
 !
 documentation
 "
 	t       tenure threshold
 	I       incremental GC state
+	weak    number of weak objects
 	rem     size of rememberedSet
 	minsc:  percent of newspace remaining after scavenge (worst case)
 		(i.e. the minimum %% of scavenged objects)
 ! !
 !MemoryMonitor class methodsFor:'defaults'!
 defaultExtent
-^ (200 @ 250)
+^ (200 @ 280)
 !
 defaultLabel
 ^ 'Memory Monitor'
 !
 !MemoryMonitor methodsFor:'drawing'!
 updateDisplay
 "update picture; trigger next update"
-|total oldSpaceUsed newSpaceUsed freeMem
+|total oldSpaceUsed newSpaceUsed freeMem oldSpaceSize
 gWidth shift scaleChange margin mustWait|
 shown ifTrue:[
 	oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory symSpaceUsed.
 	newSpaceUsed := ObjectMemory newSpaceUsed.
-	freeMem := ObjectMemory freeListSpace.
+	freeMem := ObjectMemory freeListSpace + (ObjectMemory oldSpaceSize - ObjectMemory oldSpaceUsed).
-	total := oldSpaceUsed + newSpaceUsed.
+	oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory symSpaceSize.
+	total := oldSpaceSize + ObjectMemory newSpaceSize.
 	scaleChange := false.
 	((total - freeMem) < minTotal) ifTrue:[
 	    minTotal := total - freeMem.
 	(total > maxTotal) ifTrue:[
 	    maxTotal := total.
 	    scaleChange := true
 	].
-	oldData at:updateIndex put:oldSpaceUsed.
+	oldData at:updateIndex put:oldSpaceSize. "/ oldSpaceUsed.
 	newData at:updateIndex put:newSpaceUsed.
 	freeData at:updateIndex put:freeMem.
 	updateIndex := updateIndex + 1.
 	scaleChange ifTrue:[
 	    mustWait := true.
 	].
 	self updateLineX:(updateIndex - 1 + org - 1)
 		   total:total
-		   old:oldSpaceUsed
+		   old:oldSpaceSize "/ oldSpaceUsed
 		   new:newSpaceUsed
 		   free:freeMem.
 	self updateNumbers.
 	mustWait ifTrue:[
 	self updateNumbers.
 ]
 !
-updateLineX:x total:total old:oldSpaceUsed new:newSpaceUsed free:freeMem
+updateLineX:x total:total old:oldSpaceSize new:newSpaceUsed free:freeMem
-|hNew hOld hFree y1 y2|
+|hNew hOld hFree y1 y2 y3|
 hNew := (newSpaceUsed * scale) asInteger.
-hOld := (oldSpaceUsed * scale) // 2.
+hOld := (oldSpaceSize * scale) // 2.
-hFree := (freeMem * scale) asInteger.
+hFree := (freeMem * scale) // 2.
 y1 := height - 1.
 y2 := y1 - hOld.
 self paint:oldColor.
 self displayLineFromX:x y:y1 toX:x y:y2.
-y1 := y2.
+y3 := y1 - hFree.
-y2 := y1 - hFree.
 self paint:freeColor.
-self displayLineFromX:x y:y1 toX:x y:y2.
+self displayLineFromX:x y:y1 toX:x y:y3.
-y1 := y2.
+y1 := y2 - hNew.
-y2 := y1 - hNew.
 self paint:newColor.
 self displayLineFromX:x y:y1 toX:x y:y2.
 !
 updateNumbers
 	old:    current oldSpace in use
 	minsc:  percent of newspace remaining after scavenge (worst case)
 	t       current tenure age
 	I       IGC state
 	rem     remembered set size
+	lrem    lifo remembered set size
 	count of scavenges
 	last scavenge survivor rate
 "
 |oldSpaceSize newSpaceSize memUsed oldMemUsed newMemUsed freeMem free2
 self paint:White on:Black.
 fontHeight := font height + font descent.
 half := height // 2 + font descent.
-y := half - (fontHeight * 4).
+y := half - (fontHeight * 5).
 total ~~ prevTotal ifTrue:[
 	((total - freeMem) < minTotal) ifTrue:[
 	    minTotal := total - freeMem.
 	].
 s := 't:' , (ObjectMemory tenureAge printStringLeftPaddedTo:2) , ' '.
 s := s , ' I:' , (ObjectMemory incrementalGCPhase printStringLeftPaddedTo:2) , ' '.
 self displayOpaqueString:s x:0 y:y.
 y := y + fontHeight.
+s := 'weak: ' , (ObjectMemory numberOfWeakObjects printStringLeftPaddedTo:4).
+self displayOpaqueString:s x:0 y:y.
+y := y + fontHeight.
 s := 'rem: ' , (ObjectMemory rememberedSetSize printStringLeftPaddedTo:5).
+self displayOpaqueString:s x:0 y:y.
+y := y + fontHeight.
+s := 'lrem: ' , (ObjectMemory lifoRememberedSetSize printStringLeftPaddedTo:4 ifLarger:['****']).
 self displayOpaqueString:s x:0 y:y.
 "/ does no longer make sense to show ....
 "/    y := y + fontHeight.
 "/    ObjectMemory runsSingleOldSpace ifTrue:[
 device ctrlDown ifTrue:[
 	labels :=    #(
 			'scavenge'
 			'tenure'
+			'incremental collect'
 			'-'
 			'cleanup memory'
 			'-'
 			'compress sources'
 		      ).
 	selectors := #(
 			scavenge
 			tenure
+			incrementalCollect
 			nil
 			cleanupMemory
 			nil
 			compressSources
 		      ).
 			    + ObjectMemory newSpaceSize.
 viewBackground := Black.
 device hasColors ifTrue:[
-	newColor := Color yellow.
+	newColor := Color orange. "/ yellow.
 	freeColor := Color green.
 	oldColor := Color white.
 ] ifFalse:[
 	newColor := Color grey:67.
 	freeColor := Color grey:33.
 compressSources
 Smalltalk compressSources.
 ObjectMemory markAndSweep
 !
+incrementalCollect
+[
+	[ObjectMemory gcStep] whileFalse:[(Delay forMilliseconds:1) wait]
+] forkAt:Processor highestPriority
+!
 backgroundCollect
 [ObjectMemory incrementalGC] forkAt:5
 ! !

changeset 109	c23841df3616
parent 108	a936f81cc162
child 110	570a38362ae1