[pypy-commit] extradoc extradoc: fix

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r4069:94ccf2eee106
Date: 2012-01-29 19:14 +0100
http://bitbucket.org/pypy/extradoc/changeset/94ccf2eee106/

Log:	fix

diff --git a/planning/stm.txt b/planning/stm.txt
--- a/planning/stm.txt
+++ b/planning/stm.txt
@@ -191,8 +191,8 @@
 The major collection could be orchestrated by either the thread that
 noticed one should start, or by its own thread.  We first acquire all
 the LILs, and for every LIL, we ask the corresponding thread to do a
-local marking, starting from their own stacks.  Out of this, we obtain a
-list of global objects.
+local marking, starting from their own stacks and scanning their local
+nurseries.  Out of this, we obtain a list of global objects.
 
 Then we can resume running the threads while at the same time doing a
 mark-n-sweep collection of the global objects.  There is never any
@@ -215,8 +215,8 @@
   like scan the heap, and at the same time another thread changes
   some object from the heap.
 
-* Parallelism: there are multiple threads all going something GC-related,
-  like all scan the heap together.
+* Parallelism: there are multiple threads all doing something GC-related,
+  like all scanning the heap together.
 
 
 When not running transactively
@@ -257,9 +257,9 @@
 If we know statically that both copies are local copies, then we can
 just compare the pointers.  Otherwise we need to check their GC_GLOBAL
 and GC_WAS_COPIED flag, and potentially if they both have GC_WAS_COPIED
-but only one of them as GC_GLOBAL, we need to check in local dictionary
-if they map to each other.  And we need to take care of the cases of
-NULL pointers.
+but only one of them has GC_GLOBAL, we need to check in the local
+dictionary if they map to each other.  And we need to take care of the
+cases of NULL pointers.