Merge pull request from mzgoddard/broadcast-and-wait-promise

yield a tick if broadcastandwait is waiting on threads waiting for a future tick
This commit is contained in:
Ray Schamp 2018-06-13 15:58:37 -04:00 committed by GitHub
commit f5234c777a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 8 deletions

View file

@ -57,6 +57,13 @@ class BlockUtility {
this.thread.status = Thread.STATUS_YIELD;
}
/**
* Set the thread to yield until the next tick of the runtime.
*/
yieldTick () {
this.thread.status = Thread.STATUS_YIELD_TICK;
}
/**
* Start a branch in the current block.
* @param {number} branchNum Which branch to step to (i.e., 1, 2).

View file

@ -1017,6 +1017,19 @@ class Runtime extends EventEmitter {
this.threads.indexOf(thread) > -1);
}
/**
* Return whether a thread is waiting for more information or done.
* @param {?Thread} thread Thread object to check.
* @return {boolean} True if the thread is waiting
*/
isWaitingThread (thread) {
return (
thread.status === Thread.STATUS_PROMISE_WAIT ||
thread.status === Thread.STATUS_YIELD_TICK ||
!this.isActiveThread(thread)
);
}
/**
* Toggle a script.
* @param {!string} topBlockId ID of block that starts the script.