diff options
| author | Rich Felker <dalias@aerifal.cx> | 2018-04-18 00:16:12 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2018-04-18 14:22:49 -0400 |
| commit | c1014a812c90bab3c9c989863e4ebb129e987de6 (patch) | |
| tree | 2b089a4629af56487c15a96e833814623b63ec52 /src/stdio/ftrylockfile.c | |
| parent | c21f750727515602a9e84f2a190ee8a0a2aeb2a1 (diff) | |
| download | musl-c1014a812c90bab3c9c989863e4ebb129e987de6.tar.gz musl-c1014a812c90bab3c9c989863e4ebb129e987de6.tar.bz2 musl-c1014a812c90bab3c9c989863e4ebb129e987de6.tar.xz musl-c1014a812c90bab3c9c989863e4ebb129e987de6.zip | |
refactor flockfile not to duplicate lock mechanism logic
Diffstat (limited to 'src/stdio/ftrylockfile.c')
| -rw-r--r-- | src/stdio/ftrylockfile.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c index 3b1d5f20..3b97807a 100644 --- a/src/stdio/ftrylockfile.c +++ b/src/stdio/ftrylockfile.c @@ -20,6 +20,15 @@ void __unlist_locked_file(FILE *f) } } +void __register_locked_file(FILE *f, pthread_t self) +{ + f->lockcount = 1; + f->prev_locked = 0; + f->next_locked = self->stdio_locks; + if (f->next_locked) f->next_locked->prev_locked = f; + self->stdio_locks = f; +} + int ftrylockfile(FILE *f) { pthread_t self = __pthread_self(); @@ -34,10 +43,6 @@ int ftrylockfile(FILE *f) if (owner < 0) f->lock = owner = 0; if (owner || a_cas(&f->lock, 0, tid)) return -1; - f->lockcount = 1; - f->prev_locked = 0; - f->next_locked = self->stdio_locks; - if (f->next_locked) f->next_locked->prev_locked = f; - self->stdio_locks = f; + __register_locked_file(f, self); return 0; } |