scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 23:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

stop all removes threads from future execution

Browse source 
Stop all does not **stop** all threads. It stops the active thread and
removes all other threads from executing in the future.
This commit is contained in:
Michael "Z" Goddard 2018-10-09 10:45:56 -04:00
parent a996864cd9
commit 39b18fedde
No known key found for this signature in database
GPG key ID: 762CD40DD5349872
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/runtime.js
View file

@ -1853,8 +1853,12 @@ class Runtime extends EventEmitter {
} }
} }
this.targets = newTargets; this.targets = newTargets;
// Dispose all threads. // Dispose of the active thread.
this.threads.forEach(thread => this._stopThread(thread)); if (this.sequencer.activeThread !== null) {
this._stopThread(this.sequencer.activeThread);
}
// Remove all remaining threads from executing in the next tick.
this.threads = [];
} }
/** /**

9
src/engine/sequencer.js
View file

@ -51,6 +51,8 @@ class Sequencer {
* @type {!Runtime} * @type {!Runtime}
*/ */
this.runtime = runtime; this.runtime = runtime;
this.activeThread = null;
} }
/** /**
@ -97,8 +99,9 @@ class Sequencer {
numActiveThreads = 0; numActiveThreads = 0;
let stoppedThread = false; let stoppedThread = false;
// Attempt to run each thread one time. // Attempt to run each thread one time.
for (let i = 0; i < this.runtime.threads.length; i++) { const threads = this.runtime.threads;
const activeThread = this.runtime.threads[i]; for (let i = 0; i < threads.length; i++) {
const activeThread = this.activeThread = threads[i];
// Check if the thread is done so it is not executed. // Check if the thread is done so it is not executed.
if (activeThread.stack.length === 0 || if (activeThread.stack.length === 0 ||
activeThread.status === Thread.STATUS_DONE) { activeThread.status === Thread.STATUS_DONE) {
@ -165,6 +168,8 @@ class Sequencer {
} }
} }
this.activeThread = null;
return doneThreads; return doneThreads;
} }