diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-10-10 00:51:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-10-10 00:51:29 +0000 |
| commit | 1100f84983f22e570a5081cbe79b0ef8fe4952d7 (patch) | |
| tree | 3472df1372abf7816fb10f02573ba114c5b5a003 /include/atomic.h | |
| parent | 7484f797e4d4f9c174d4391f59d208e83027b285 (diff) | |
| download | glibc-1100f84983f22e570a5081cbe79b0ef8fe4952d7.zip glibc-1100f84983f22e570a5081cbe79b0ef8fe4952d7.tar.gz glibc-1100f84983f22e570a5081cbe79b0ef8fe4952d7.tar.bz2 | |
Jakub Jelinek <jakub@redhat.com>
Implement reference counting of scope records.
* elf/dl-close.c (_dl_close): Remove all scopes from removed objects
from the list in objects which remain. Always allocate new scope
record.
* elf/dl-open.c (dl_open_worker): When growing array for scopes,
don't resize, allocate a new one.
* elf/dl-runtime.c: Update reference counters before using a scope
array.
* elf/dl-sym.c: Likewise.
* elf/dl-libc.c: Adjust for l_scope name change.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* include/link.h: Inlcude <rtld-lowlevel.h>. Define struct
r_scoperec. Replace r_scope with pointer to r_scoperec structure.
Add l_scoperec_lock.
* sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>.
* sysdeps/generic/rtld-lowlevel.h: New file.
* include/atomic.h: Rename atomic_and to atomic_and_val and
atomic_or to atomic_or_val. Define new macros atomic_and and
atomic_or which do not return values.
* sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or.
Various cleanups.
* sysdeps/i386/i486/bits/atomic.h: Likewise.
Diffstat (limited to 'include/atomic.h')
| -rw-r--r-- | include/atomic.h | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/include/atomic.h b/include/atomic.h index a1598e3..bd2e2f1 100644 --- a/include/atomic.h +++ b/include/atomic.h @@ -273,9 +273,27 @@ __oldval & __mask; }) #endif -/* Atomically *mem &= mask and return the old value of *mem. */ +/* Atomically *mem &= mask. */ #ifndef atomic_and # define atomic_and(mem, mask) \ + do { \ + __typeof (*(mem)) __oldval; \ + __typeof (mem) __memp = (mem); \ + __typeof (*(mem)) __mask = (mask); \ + \ + do \ + __oldval = (*__memp); \ + while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp, \ + __oldval \ + & __mask, \ + __oldval), \ + 0)); \ + } while (0) +#endif + +/* Atomically *mem &= mask and return the old value of *mem. */ +#ifndef atomic_and_val +# define atomic_and_val(mem, mask) \ ({ __typeof (*(mem)) __oldval; \ __typeof (mem) __memp = (mem); \ __typeof (*(mem)) __mask = (mask); \ @@ -294,6 +312,24 @@ /* Atomically *mem |= mask and return the old value of *mem. */ #ifndef atomic_or # define atomic_or(mem, mask) \ + do { \ + __typeof (*(mem)) __oldval; \ + __typeof (mem) __memp = (mem); \ + __typeof (*(mem)) __mask = (mask); \ + \ + do \ + __oldval = (*__memp); \ + while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp, \ + __oldval \ + | __mask, \ + __oldval), \ + 0)); \ + } while (0) +#endif + +/* Atomically *mem |= mask and return the old value of *mem. */ +#ifndef atomic_or_val +# define atomic_or_val(mem, mask) \ ({ __typeof (*(mem)) __oldval; \ __typeof (mem) __memp = (mem); \ __typeof (*(mem)) __mask = (mask); \ |