author | Rich Felker <dalias@aerifal.cx> | 2013年09月20日 02:00:27 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2013年09月20日 02:00:27 -0400 |
commit | e803829e6b087c0ed91adc11f87185109bc59b31 (patch) | |
tree | ad2fdda58fbba2c542785d9cc8babcd5f7d001ec /src/malloc/malloc.c | |
parent | d8e283df58eb8bff1aa2f8a99347e294c7f67cb9 (diff) | |
download | musl-e803829e6b087c0ed91adc11f87185109bc59b31.tar.gz |
-rw-r--r-- | src/malloc/malloc.c | 15 |
diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c index 4044eb2a..fb65ab5b 100644 --- a/src/malloc/malloc.c +++ b/src/malloc/malloc.c @@ -64,28 +64,27 @@ static struct { static inline void lock(volatile int *lk) { - if (!libc.threads_minus_1) return; - while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); + if (libc.threads_minus_1) + while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); } static inline void unlock(volatile int *lk) { - if (!libc.threads_minus_1) return; - a_store(lk, 0); - if (lk[1]) __wake(lk, 1, 1); + if (lk[0]) { + a_store(lk, 0); + if (lk[1]) __wake(lk, 1, 1); + } } static inline void lock_bin(int i) { - if (libc.threads_minus_1) - lock(mal.bins[i].lock); + lock(mal.bins[i].lock); if (!mal.bins[i].head) mal.bins[i].head = mal.bins[i].tail = BIN_TO_CHUNK(i); } static inline void unlock_bin(int i) { - if (!libc.threads_minus_1) return; unlock(mal.bins[i].lock); } |