Changeset 3a48e283 for doc/proposals/concurrency/glossary.tex

Timestamp:

Apr 7, 2017, 2:32:07 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a0ad7dc

Parents:

122aecd (diff), 3db60cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/proposals/concurrency/glossary.tex (modified) (1 diff)

doc/proposals/concurrency/glossary.tex

@@ -14 +14 @@
 
 \longnewglossaryentry{group-acquire}
-{name={bulked acquiring}}
+{name={bulk acquiring}}
 {
 Implicitly acquiring several monitors when entering a monitor.
+}
+
+\longnewglossaryentry{mon-ctx}
+{name={monitor context}}
+{
+The state of the current thread regarding which monitors are owned.
 }