There is something very suspicious happening with makeRestartFunction where the env and control are being munged, but I haven't been able to trace where yet.
This commit is contained in:
Danny Yoo
parent
7f0fe7516b
commit
23d4c27c2b
|
|
@ -194,9 +194,7 @@
|
||||||
|
|
||||||
var alreadyReleased = false;
|
var alreadyReleased = false;
|
||||||
|
|
||||||
// Allow for re-entrancy if the id is the same as the
|
if (this.locked === false) {
|
||||||
// entity who is locking.
|
|
||||||
if (this.locked === false || this.locked === id) {
|
|
||||||
this.locked = id;
|
this.locked = id;
|
||||||
onAcquire.call(
|
onAcquire.call(
|
||||||
that,
|
that,
|
||||||
|
|
@ -455,9 +453,8 @@
|
||||||
MACHINE.exclusiveLock.acquire(
|
MACHINE.exclusiveLock.acquire(
|
||||||
'scheduleTrampoline',
|
'scheduleTrampoline',
|
||||||
function(release) {
|
function(release) {
|
||||||
release();
|
|
||||||
if (before) { before(); }
|
if (before) { before(); }
|
||||||
MACHINE.trampoline(f);
|
MACHINE._trampoline(f, false, release);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
0);
|
0);
|
||||||
|
|
@ -468,8 +465,16 @@
|
||||||
// Meant to be used only by the trampoline.
|
// Meant to be used only by the trampoline.
|
||||||
var makeRestartFunction = function(MACHINE) {
|
var makeRestartFunction = function(MACHINE) {
|
||||||
var oldArgcount = MACHINE.a;
|
var oldArgcount = MACHINE.a;
|
||||||
|
var oldEnv = MACHINE.e.slice();
|
||||||
|
var oldControl = MACHINE.c.slice();
|
||||||
return function(f) {
|
return function(f) {
|
||||||
return scheduleTrampoline(MACHINE, f, function() { MACHINE.a = oldArgcount; });
|
MACHINE.exclusiveLock.acquire(undefined,
|
||||||
|
function(release) {
|
||||||
|
MACHINE.a = oldArgcount;
|
||||||
|
MACHINE.e = oldEnv;
|
||||||
|
MACHINE.c = oldControl;
|
||||||
|
MACHINE._trampoline(f, false, release);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -505,84 +510,91 @@
|
||||||
that.exclusiveLock.acquire(
|
that.exclusiveLock.acquire(
|
||||||
'trampoline',
|
'trampoline',
|
||||||
function(release) {
|
function(release) {
|
||||||
var thunk = initialJump;
|
that._trampoline(initialJump, noJumpingOff, release);
|
||||||
var startTime = (new Date()).valueOf();
|
|
||||||
that.cbt = STACK_LIMIT_ESTIMATE;
|
|
||||||
that.params.numBouncesBeforeYield =
|
|
||||||
that.params.maxNumBouncesBeforeYield;
|
|
||||||
that.running = true;
|
|
||||||
|
|
||||||
while(true) {
|
|
||||||
try {
|
|
||||||
thunk(that);
|
|
||||||
break;
|
|
||||||
} catch (e) {
|
|
||||||
// There are a few kinds of things that can get thrown
|
|
||||||
// during racket evaluation:
|
|
||||||
//
|
|
||||||
// functions: this gets thrown if the Racket code
|
|
||||||
// realizes that the number of bounces has grown too
|
|
||||||
// large. The thrown function represents a restarter
|
|
||||||
// function. The running flag remains true.
|
|
||||||
//
|
|
||||||
// Pause: causes the machine evaluation to pause, with
|
|
||||||
// the expectation that it will restart momentarily.
|
|
||||||
// The running flag on the machine will remain true.
|
|
||||||
//
|
|
||||||
// HaltError: causes evaluation to immediately halt.
|
|
||||||
// We schedule the onHalt function of the HaltError to
|
|
||||||
// call afterwards. The running flag on the machine
|
|
||||||
// is set to false.
|
|
||||||
//
|
|
||||||
// Everything else: otherwise, we send the exception value
|
|
||||||
// to the current error handler and exit.
|
|
||||||
// The running flag is set to false.
|
|
||||||
if (typeof(e) === 'function') {
|
|
||||||
thunk = e;
|
|
||||||
that.cbt = STACK_LIMIT_ESTIMATE;
|
|
||||||
|
|
||||||
|
|
||||||
// If we're running an a model that prohibits
|
|
||||||
// jumping off the trampoline, continue.
|
|
||||||
if (noJumpingOff) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (that.params.numBouncesBeforeYield-- < 0) {
|
|
||||||
recomputeMaxNumBouncesBeforeYield(
|
|
||||||
that,
|
|
||||||
(new Date()).valueOf() - startTime);
|
|
||||||
scheduleTrampoline(that, thunk);
|
|
||||||
release();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (e instanceof Pause) {
|
|
||||||
var restart = makeRestartFunction(that);
|
|
||||||
e.onPause(restart);
|
|
||||||
release();
|
|
||||||
return;
|
|
||||||
} else if (e instanceof HaltError) {
|
|
||||||
that.running = false;
|
|
||||||
e.onHalt(that);
|
|
||||||
release();
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
// General error condition: just exit out
|
|
||||||
// of the trampoline and call the current error handler.
|
|
||||||
that.running = false;
|
|
||||||
that.params.currentErrorHandler(that, e);
|
|
||||||
release();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
that.running = false;
|
|
||||||
that.params.currentSuccessHandler(that);
|
|
||||||
release();
|
|
||||||
return;
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Machine.prototype._trampoline = function(initialJump, noJumpingOff, release) {
|
||||||
|
var that = this;
|
||||||
|
var thunk = initialJump;
|
||||||
|
var startTime = (new Date()).valueOf();
|
||||||
|
that.cbt = STACK_LIMIT_ESTIMATE;
|
||||||
|
that.params.numBouncesBeforeYield =
|
||||||
|
that.params.maxNumBouncesBeforeYield;
|
||||||
|
that.running = true;
|
||||||
|
|
||||||
|
while(true) {
|
||||||
|
try {
|
||||||
|
thunk(that);
|
||||||
|
break;
|
||||||
|
} catch (e) {
|
||||||
|
// There are a few kinds of things that can get thrown
|
||||||
|
// during racket evaluation:
|
||||||
|
//
|
||||||
|
// functions: this gets thrown if the Racket code
|
||||||
|
// realizes that the number of bounces has grown too
|
||||||
|
// large. The thrown function represents a restarter
|
||||||
|
// function. The running flag remains true.
|
||||||
|
//
|
||||||
|
// Pause: causes the machine evaluation to pause, with
|
||||||
|
// the expectation that it will restart momentarily.
|
||||||
|
// The running flag on the machine will remain true.
|
||||||
|
//
|
||||||
|
// HaltError: causes evaluation to immediately halt.
|
||||||
|
// We schedule the onHalt function of the HaltError to
|
||||||
|
// call afterwards. The running flag on the machine
|
||||||
|
// is set to false.
|
||||||
|
//
|
||||||
|
// Everything else: otherwise, we send the exception value
|
||||||
|
// to the current error handler and exit.
|
||||||
|
// The running flag is set to false.
|
||||||
|
if (typeof(e) === 'function') {
|
||||||
|
thunk = e;
|
||||||
|
that.cbt = STACK_LIMIT_ESTIMATE;
|
||||||
|
|
||||||
|
|
||||||
|
// If we're running an a model that prohibits
|
||||||
|
// jumping off the trampoline, continue.
|
||||||
|
if (noJumpingOff) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (that.params.numBouncesBeforeYield-- < 0) {
|
||||||
|
recomputeMaxNumBouncesBeforeYield(
|
||||||
|
that,
|
||||||
|
(new Date()).valueOf() - startTime);
|
||||||
|
scheduleTrampoline(that, thunk);
|
||||||
|
release();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else if (e instanceof Pause) {
|
||||||
|
var restart = makeRestartFunction(that);
|
||||||
|
e.onPause(restart);
|
||||||
|
release();
|
||||||
|
return;
|
||||||
|
} else if (e instanceof HaltError) {
|
||||||
|
that.running = false;
|
||||||
|
e.onHalt(that);
|
||||||
|
release();
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
// General error condition: just exit out
|
||||||
|
// of the trampoline and call the current error handler.
|
||||||
|
that.running = false;
|
||||||
|
that.params.currentErrorHandler(that, e);
|
||||||
|
release();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
that.running = false;
|
||||||
|
that.params.currentSuccessHandler(that);
|
||||||
|
release();
|
||||||
|
return;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// recomputeGas: state number -> number
|
// recomputeGas: state number -> number
|
||||||
recomputeMaxNumBouncesBeforeYield = function(MACHINE, observedDelay) {
|
recomputeMaxNumBouncesBeforeYield = function(MACHINE, observedDelay) {
|
||||||
// We'd like to see a delay of DESIRED_DELAY_BETWEEN_BOUNCES so
|
// We'd like to see a delay of DESIRED_DELAY_BETWEEN_BOUNCES so
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,4 @@
|
||||||
(provide version)
|
(provide version)
|
||||||
(: version String)
|
(: version String)
|
||||||
|
|
||||||
(define version "1.101")
|
(define version "1.102")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user