<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 10pt;
font-family:Verdana
}
--></style>
</head>
<body class='hmmessage'>
Tony, which versions do you prefer in which branch?<BR>
<BR>
<BR>C:\dev2\cm3.release_branch_cm3_5_8\m3-libs\m3core\src\runtime\common>diff -u C:\dev2\cm3.2\m3-libs\m3core\src\runtime\common\RTHeapStats.m3 RTHeapStats.m3<BR>--- C:\dev2\cm3.2\m3-libs\m3core\src\runtime\common\RTHeapStats.m3 2009-12-<BR>10 09:04:05.546875000 -0800<BR>+++ RTHeapStats.m3 2009-12-11 02:51:53.468750000 -0800<BR>@@ -330,7 +330,7 @@<BR> VAR fp: UNTRACED REF ADDRESS := start;<BR> BEGIN<BR> (* scan the stack or registers *)<BR>- WHILE fp < stop DO<BR>+ WHILE fp <= stop DO<BR> WITH page = RTHeapRep.AddressToPage(fp^), d = page.desc DO<BR> IF page # NIL AND d.space = RTHeapRep.Space.Current THEN<BR> VisitPage(page);<BR>
<BR>
<BR>
C:\dev2\cm3.release_branch_cm3_5_8\m3-libs\m3core\src\runtime\common>diff -u C:\dev2\cm3.2\m3-libs\m3core\src\runtime\common\RTCollector.m3 RTCollector.m3<BR>--- C:\dev2\cm3.2\m3-libs\m3core\src\runtime\common\RTCollector.m3 2009-12-<BR>11 02:50:02.234375000 -0800<BR>+++ RTCollector.m3 2009-12-11 02:51:44.781250000 -0800<BR>@@ -519,7 +519,9 @@<BR> PROCEDURE NoteStackLocations (start, stop: ADDRESS) =<BR> VAR fp : UNTRACED REF ADDRESS := start;<BR> BEGIN<BR>- IF NOT (start < stop) THEN RETURN END;<BR>+ IF start = NIL AND stop = NIL THEN<BR>+ RETURN;<BR>+ END;<BR> stop := stop - ADRSIZE (ADDRESS); (* so we don't overrun the valid addresses *)<BR> WHILE fp <= stop DO (* with the memory read on the next line. *)<BR> WITH page = AddressToPage(fp^) DO<BR>@@ -2210,7 +2212,7 @@<BR> END;<BR> END WeakCleaner;<BR>
<BR> <BR>
There are also a bunch of user thread diffs I haven't looked at closely.<BR>And a bunch of diffs I understand.<BR>
<BR>
<BR>
I think off by one thing in NoteStackLocations is subtle.<BR>
The ranges come from code that might not be so precise or might be themselves off by one.<BR>
I believe in Win32 I pass in for stop the "just past the end" value.<BR>
In which case you want "<".<BR>
<BR>
<BR> - Jay<BR><BR> </body>
</html>