(bug) revert JOIN/LOCK simplification
authorBrian Norris <banorris@uci.edu>
Wed, 3 Oct 2012 01:48:05 +0000 (18:48 -0700)
committerBrian Norris <banorris@uci.edu>
Wed, 3 Oct 2012 01:50:53 +0000 (18:50 -0700)
commit381e2769f94f7e41c1c90d3ab633a37136fa24b0
tree936010dcaa49273b0a66721144cee428b7331ad7
parent7c77391dff9f4cf3166d47015494f0af276963f0
(bug) revert JOIN/LOCK simplification

A test case throws an assertion when these changes are included. Maybe
I'll make a proper fix later, but for now, I mostly revert these.

Revert "model: remove obsolete ModelChecker::do_complete_join()"
This reverts commit cef10a2b49af5da16ffe59c5b9ddd210c668fbac.

Revert "model: unify JOIN- and LOCK-related sleep/wake code"
This reverts commit 620ae95ce4fed006d18a41b6ccfd949d7e77f677.
model.cc
model.h