--- a/MemoryMonitor.st Mon Nov 28 22:11:47 1994 +0100
+++ b/MemoryMonitor.st Mon Feb 06 02:01:18 1995 +0100
@@ -24,7 +24,7 @@
COPYRIGHT (c) 1991 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.5 1994-11-28 21:11:38 claus Exp $
+$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.6 1995-02-06 01:00:07 claus Exp $
'!
!MemoryMonitor class methodsFor:'documentation'!
@@ -45,7 +45,7 @@
version
"
-$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.5 1994-11-28 21:11:38 claus Exp $
+$Header: /cvs/stx/stx/libtool/MemoryMonitor.st,v 1.6 1995-02-06 01:00:07 claus Exp $
"
!
@@ -131,7 +131,9 @@
lx := org
].
- total := ObjectMemory oldSpaceSize + ObjectMemory newSpaceSize.
+ total := ObjectMemory fixSpaceSize
+ + ObjectMemory oldSpaceSize
+ + ObjectMemory newSpaceSize.
startIdx := (lx-org+1).
startIdx < 1 ifTrue:[
@@ -205,10 +207,10 @@
|oldSpaceSize newSpaceSize memUsed oldMemUsed newMemUsed freeMem free2
x y half s thisStringLen fontHeight total n|
- oldMemUsed := ObjectMemory oldSpaceUsed.
+ oldMemUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
newMemUsed := ObjectMemory newSpaceUsed.
freeMem := ObjectMemory freeListSpace.
- oldSpaceSize := ObjectMemory oldSpaceSize.
+ oldSpaceSize := ObjectMemory oldSpaceSize + ObjectMemory fixSpaceSize.
newSpaceSize := ObjectMemory newSpaceSize.
memUsed := oldMemUsed + newMemUsed "- freeMem".
@@ -304,7 +306,7 @@
gWidth shift scaleChange margin mustWait|
shown ifTrue:[
- oldSpaceUsed := ObjectMemory oldSpaceUsed.
+ oldSpaceUsed := ObjectMemory oldSpaceUsed + ObjectMemory fixSpaceUsed.
newSpaceUsed := ObjectMemory newSpaceUsed.
freeMem := ObjectMemory freeListSpace.
total := oldSpaceUsed + newSpaceUsed.
@@ -485,7 +487,9 @@
org := font widthOf:'max 99999k'.
level := 0.
- maxTotal := minTotal := ObjectMemory oldSpaceSize + ObjectMemory newSpaceSize.
+ maxTotal := minTotal := ObjectMemory oldSpaceSize
+ + ObjectMemory fixSpaceSize
+ + ObjectMemory newSpaceSize.
viewBackground := Black.