diff options
| author | Florian Weimer <fweimer@redhat.com> | 2015-12-23 17:23:33 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2015-12-23 17:23:33 +0100 |
| commit | 7962541a32eff5597bc4207e781cfac8d1bb0d87 (patch) | |
| tree | 32d51de1baa5ff519f5b12c62230fd0d77c36688 | |
| parent | c676e659395f145e45b08fe3bba90c29ab44e8b8 (diff) | |
| download | glibc-7962541a32eff5597bc4207e781cfac8d1bb0d87.tar.gz glibc-7962541a32eff5597bc4207e781cfac8d1bb0d87.tar.xz glibc-7962541a32eff5597bc4207e781cfac8d1bb0d87.zip | |
malloc: Update comment for list_lock
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/arena.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index a32717ea05..9063848e27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-12-23 Florian Weimer <fweimer@redhat.com> + + * malloc/arena.c (list_lock): Update comment. + 2015-12-22 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com> * sysdeps/powerpc/hwcapinfo.c: Export symbol diff --git a/malloc/arena.c b/malloc/arena.c index 85f119474b..665be5ec35 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -85,9 +85,10 @@ static mstate free_list; _int_new_arena. This suffers from data races; see the FIXME comments in _int_new_arena and reused_arena. - list_lock also prevents concurrent forks. When list_lock is - acquired, no arena lock must be acquired, but it is permitted to - acquire arena locks after list_lock. */ + list_lock also prevents concurrent forks. At the time list_lock is + acquired, no arena lock must have been acquired, but it is + permitted to acquire arena locks subsequently, while list_lock is + acquired. */ static mutex_t list_lock = _LIBC_LOCK_INITIALIZER; /* Mapped memory in non-main arenas (reliable only for NO_THREADS). */ |