diff options
Diffstat (limited to 'src/runtime/rt1_amd64_linux.c')
| -rw-r--r-- | src/runtime/rt1_amd64_linux.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/src/runtime/rt1_amd64_linux.c b/src/runtime/rt1_amd64_linux.c index c0c203805..5b3e45809 100644 --- a/src/runtime/rt1_amd64_linux.c +++ b/src/runtime/rt1_amd64_linux.c @@ -301,13 +301,11 @@ futexwakeup(uint32 *addr) // else return 0; // but atomically. -void -lock(Lock *l) +static void +futexlock(Lock *l) { uint32 v; - m->locks++; - again: v = l->key; if((v&1) == 0){ @@ -346,13 +344,11 @@ again: goto again; } -void -unlock(Lock *l) +static void +futexunlock(Lock *l) { uint32 v; - m->locks--; - // Atomically get value and clear lock bit. again: v = l->key; @@ -366,6 +362,24 @@ again: futexwakeup(&l->key); } +void +lock(Lock *l) +{ + if(m->locks < 0) + throw("lock count"); + m->locks++; + futexlock(l); +} + +void +unlock(Lock *l) +{ + m->locks--; + if(m->locks < 0) + throw("lock count"); + futexunlock(l); +} + // One-time notifications. // @@ -383,20 +397,20 @@ void noteclear(Note *n) { n->lock.key = 0; // memset(n, 0, sizeof *n) - lock(&n->lock); + futexlock(&n->lock); } void notewakeup(Note *n) { - unlock(&n->lock); + futexunlock(&n->lock); } void notesleep(Note *n) { - lock(&n->lock); - unlock(&n->lock); // Let other sleepers find out too. + futexlock(&n->lock); + futexunlock(&n->lock); // Let other sleepers find out too. } |