Commit c6f8df08 authored by Robert Griesemer's avatar Robert Griesemer

fix for broken build (built-in new was invisible due to a parameter called 'new')

R=iant
https://golang.org/cl/160057
parent 2cbeb1db
...@@ -456,12 +456,12 @@ func (t *thread) wait() { ...@@ -456,12 +456,12 @@ func (t *thread) wait() {
// necessary, and invokes state transition handlers. // necessary, and invokes state transition handlers.
// //
// Must be called from the monitor thread. // Must be called from the monitor thread.
func (t *thread) setState(new threadState) { func (t *thread) setState(newState threadState) {
old := t.state; oldState := t.state;
t.state = new; t.state = newState;
t.logTrace("state %v -> %v", old, new); t.logTrace("state %v -> %v", oldState, newState);
if !old.isRunning() && (new.isRunning() || new.isZombie()) { if !oldState.isRunning() && (newState.isRunning() || newState.isZombie()) {
// Start waiting on this thread // Start waiting on this thread
go t.wait() go t.wait()
} }
...@@ -475,7 +475,7 @@ func (t *thread) setState(new threadState) { ...@@ -475,7 +475,7 @@ func (t *thread) setState(new threadState) {
t.proc.transitionHandlers = new(vector.Vector); t.proc.transitionHandlers = new(vector.Vector);
for _, h := range handlers.Data() { for _, h := range handlers.Data() {
h := h.(*transitionHandler); h := h.(*transitionHandler);
h.handle(t, old, new); h.handle(t, oldState, newState);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment