diff options
| -rw-r--r-- | src/stdio/getc.h | 10 | ||||
| -rw-r--r-- | src/stdio/putc.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/stdio/getc.h b/src/stdio/getc.h index 0657ab6f..e24f9905 100644 --- a/src/stdio/getc.h +++ b/src/stdio/getc.h @@ -4,9 +4,9 @@ #ifdef __GNUC__ __attribute__((__noinline__)) #endif -static int locking_getc(FILE *f, int tid) +static int locking_getc(FILE *f) { - if (a_cas(&f->lock, 0, tid)) __lockfile(f); + if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f); int c = getc_unlocked(f); if (a_swap(&f->lock, 0) & MAYBE_WAITERS) __wake(&f->lock, 1, 1); @@ -15,8 +15,8 @@ static int locking_getc(FILE *f, int tid) static inline int do_getc(FILE *f) { - int tid, l = f->lock; - if (l < 0 || (l & ~MAYBE_WAITERS) == (tid=__pthread_self()->tid)) + int l = f->lock; + if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid) return getc_unlocked(f); - return locking_getc(f, tid); + return locking_getc(f); } diff --git a/src/stdio/putc.h b/src/stdio/putc.h index a37937e8..2014c4ec 100644 --- a/src/stdio/putc.h +++ b/src/stdio/putc.h @@ -4,9 +4,9 @@ #ifdef __GNUC__ __attribute__((__noinline__)) #endif -static int locking_putc(int c, FILE *f, int tid) +static int locking_putc(int c, FILE *f) { - if (a_cas(&f->lock, 0, tid)) __lockfile(f); + if (a_cas(&f->lock, 0, MAYBE_WAITERS-1)) __lockfile(f); c = putc_unlocked(c, f); if (a_swap(&f->lock, 0) & MAYBE_WAITERS) __wake(&f->lock, 1, 1); @@ -15,8 +15,8 @@ static int locking_putc(int c, FILE *f, int tid) static inline int do_putc(int c, FILE *f) { - int tid, l = f->lock; - if (l < 0 || (l & ~MAYBE_WAITERS) == (tid=__pthread_self()->tid)) + int l = f->lock; + if (l < 0 || l && (l & ~MAYBE_WAITERS) == __pthread_self()->tid) return putc_unlocked(c, f); - return locking_putc(c, f, tid); + return locking_putc(c, f); } |