diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-06-19 09:23:02 +0200 |
| commit | 8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5 (patch) | |
| tree | ba71646a10b518372d110532d86fcf0b98edc14f /src/pkg/runtime/sema.goc | |
| parent | 3bb719bbf3cdb97b3901f3baaa2da9d02a5c3cdb (diff) | |
| parent | 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 (diff) | |
| download | golang-8fcc691d6fa80c9ddf38bf0d34b803bab0e421d5.tar.gz | |
Merge tag 'upstream/1.3' into debian-sid
Upstream version 1.3
Diffstat (limited to 'src/pkg/runtime/sema.goc')
| -rw-r--r-- | src/pkg/runtime/sema.goc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pkg/runtime/sema.goc b/src/pkg/runtime/sema.goc index 57f32a0dd..c1e8e4e18 100644 --- a/src/pkg/runtime/sema.goc +++ b/src/pkg/runtime/sema.goc @@ -137,7 +137,7 @@ runtime·semacquire(uint32 volatile *addr, bool profile) // Any semrelease after the cansemacquire knows we're waiting // (we set nwait above), so go to sleep. semqueue(root, addr, &s); - runtime·park(runtime·unlock, root, "semacquire"); + runtime·parkunlock(root, "semacquire"); if(cansemacquire(addr)) { if(t0) runtime·blockevent(s.releasetime - t0, 3); @@ -254,7 +254,7 @@ func runtime_Syncsemacquire(s *SyncSema) { else s->tail->next = &w; s->tail = &w; - runtime·park(runtime·unlock, s, "semacquire"); + runtime·parkunlock(s, "semacquire"); if(t0) runtime·blockevent(w.releasetime - t0, 2); } @@ -288,7 +288,7 @@ func runtime_Syncsemrelease(s *SyncSema, n uint32) { else s->tail->next = &w; s->tail = &w; - runtime·park(runtime·unlock, s, "semarelease"); + runtime·parkunlock(s, "semarelease"); } else runtime·unlock(s); } |