scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't copy threads in step; stable restartThread (#331)

Browse source
This commit is contained in:
Tim Mickel 2016-11-10 15:05:49 -05:00 committed by GitHub
parent 867c08b495
commit 4deee071b2
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/runtime.js
View file

@ -329,6 +329,24 @@ Runtime.prototype._removeThread = function (thread) {
} }
}; };
/**
* Restart a thread in place, maintaining its position in the list of threads.
* This is used by `startHats` to and is necessary to ensure 2.0-like execution order.
* Test project: https://scratch.mit.edu/projects/130183108/
* @param {!Thread} thread Thread object to restart.
*/
Runtime.prototype._restartThread = function (thread) {
var newThread = new Thread(thread.topBlock);
newThread.target = thread.target;
newThread.pushStack(thread.topBlock);
var i = this.threads.indexOf(thread);
if (i > -1) {
this.threads[i] = newThread;
} else {
this.threads.push(thread);
}
};
/** /**
* Return whether a thread is currently active/running. * Return whether a thread is currently active/running.
* @param {?Thread} thread Thread object to check. * @param {?Thread} thread Thread object to check.
@ -422,7 +440,8 @@ Runtime.prototype.startHats = function (requestedHatOpcode,
for (var i = 0; i < instance.threads.length; i++) { for (var i = 0; i < instance.threads.length; i++) {
if (instance.threads[i].topBlock === topBlockId && if (instance.threads[i].topBlock === topBlockId &&
instance.threads[i].target === target) { instance.threads[i].target === target) {
instance._removeThread(instance.threads[i]); instance._restartThread(instance.threads[i]);
return;
} }
} }
} else { } else {

6
src/engine/sequencer.js
View file

@ -45,11 +45,9 @@ Sequencer.prototype.stepThreads = function () {
this.timer.timeElapsed() < WORK_TIME && this.timer.timeElapsed() < WORK_TIME &&
(this.runtime.turboMode || !this.runtime.redrawRequested)) { (this.runtime.turboMode || !this.runtime.redrawRequested)) {
numActiveThreads = 0; numActiveThreads = 0;
// Inline copy of the threads, updated on each step.
var threadsCopy = this.runtime.threads.slice();
// Attempt to run each thread one time. // Attempt to run each thread one time.
for (var i = 0; i < threadsCopy.length; i++) { for (var i = 0; i < this.runtime.threads.length; i++) {
var activeThread = threadsCopy[i]; var activeThread = this.runtime.threads[i];
if (activeThread.stack.length === 0 || if (activeThread.stack.length === 0 ||
activeThread.status === Thread.STATUS_DONE) { activeThread.status === Thread.STATUS_DONE) {
// Finished with this thread. // Finished with this thread.