diff options
author | Robert Griesemer <gri@golang.org> | 2009-11-24 14:11:53 -0800 |
---|---|---|
committer | Robert Griesemer <gri@golang.org> | 2009-11-24 14:11:53 -0800 |
commit | 3eaef4f9f635491675e00f1ae56fad7353d577e6 (patch) | |
tree | 0536c9ed1795957e66e6c665d22b5a971bf54885 | |
parent | 3f71ec4dcae29997d2690d4cab4beb741851f620 (diff) | |
download | golang-3eaef4f9f635491675e00f1ae56fad7353d577e6.tar.gz |
fix for broken build (built-in new was invisible due to a parameter called 'new')
R=iant
http://codereview.appspot.com/160057
-rw-r--r-- | src/pkg/debug/proc/proc_linux.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/debug/proc/proc_linux.go b/src/pkg/debug/proc/proc_linux.go index 28b85dcdf..c17e6855b 100644 --- a/src/pkg/debug/proc/proc_linux.go +++ b/src/pkg/debug/proc/proc_linux.go @@ -456,12 +456,12 @@ func (t *thread) wait() { // necessary, and invokes state transition handlers. // // Must be called from the monitor thread. -func (t *thread) setState(new threadState) { - old := t.state; - t.state = new; - t.logTrace("state %v -> %v", old, new); +func (t *thread) setState(newState threadState) { + oldState := t.state; + t.state = newState; + 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 go t.wait() } @@ -475,7 +475,7 @@ func (t *thread) setState(new threadState) { t.proc.transitionHandlers = new(vector.Vector); for _, h := range handlers.Data() { h := h.(*transitionHandler); - h.handle(t, old, new); + h.handle(t, oldState, newState); } } |