Changeset 87d13cd for doc

Timestamp:

Mar 21, 2017, 10:07:52 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

cb91437

Parents:

829c907 (diff), a53e10a (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:

fix conflicit in iostream.c

Location:

doc

Files:

• generic_types/.gitignore (added)
• generic_types/ACM-Reference-Format.bst (added)
• generic_types/acmart-pacmpl-template.tex (added)
• generic_types/acmart.cls (added)
• generic_types/generic_types.bib (added)
• generic_types/generic_types.tex (added)
• proposals/concurrency/thePlan.md (modified) (1 diff)

doc/proposals/concurrency/thePlan.md

@@ -8 +8 @@
 _Phase 2_ : Minimum Viable Product
 done - Monitor type and enter/leave mutex member routines
-Monitors as a language feature (not calling enter/leave by hand)
+done - Multi monitors calls,
+done - Monitors as a language feature (not calling enter/leave by hand)
 Internal scheduling
 
 _Phase 3_ : Kernel features
+Preemption
 Detach thread
 Cluster migration
-Preemption
 
 _Phase 4_ : Monitor features
-Multi monitors calls,
 External scheduling