Merge remote-tracking branch 'origin/la/spider-fix' into philip/gall-vega

This commit is contained in:
Philip Monk 2020-12-18 17:04:02 -08:00
commit 598a46d1f7
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC

View File

@ -392,17 +392,20 @@
++ handle-stop-thread ++ handle-stop-thread
|= [=tid nice=?] |= [=tid nice=?]
^- (quip card ^state) ^- (quip card ^state)
=/ =yarn (~(got by tid.state) tid) =/ yarn=(unit yarn) (~(get by tid.state) tid)
?: (has-yarn running.state yarn) ?~ yarn
~& %stopping-nonexistent-thread
[~ state]
?: (has-yarn running.state u.yarn)
?: nice ?: nice
(thread-done yarn *vase) (thread-done u.yarn *vase)
(thread-fail yarn %cancelled ~) (thread-fail u.yarn %cancelled ~)
?: (~(has by starting.state) yarn) ?: (~(has by starting.state) u.yarn)
(thread-fail-not-running tid %stopped-before-started ~) (thread-fail-not-running tid %stopped-before-started ~)
~& [%thread-not-started yarn] ~& [%thread-not-started u.yarn]
?: nice ?: nice
(thread-done yarn *vase) (thread-done u.yarn *vase)
(thread-fail yarn %cancelled ~) (thread-fail u.yarn %cancelled ~)
:: ::
++ take-input ++ take-input
|= [=yarn input=(unit input:strand)] |= [=yarn input=(unit input:strand)]