diff options
| author | Sergey Bugaev <bugaevc@gmail.com> | 2023-04-29 16:13:48 +0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-04-29 16:50:14 +0200 |
| commit | c287ecd99133cd82413ad99f2f167628b2df670c (patch) | |
| tree | 5d7b166de7c1e5bb22c92f51d982aad0ecc20ec8 | |
| parent | a443bd3fb233186038b8b483959ecb7978d1abea (diff) | |
| download | glibc-c287ecd99133cd82413ad99f2f167628b2df670c.zip glibc-c287ecd99133cd82413ad99f2f167628b2df670c.tar.gz glibc-c287ecd99133cd82413ad99f2f167628b2df670c.tar.bz2 | |
hurd: Simplify _hurd_critical_section_lock a bit
This block of code was doing exactly what _hurd_self_sigstate does; so
just call that and let it do its job.
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230429131354.2507443-1-bugaevc@gmail.com>
| -rw-r--r-- | hurd/hurd/signal.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 662e955..b8af6f2 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -170,6 +170,11 @@ _hurd_self_sigstate (void) if (__glibc_unlikely (ss == NULL)) { thread_t self = __mach_thread_self (); + + /* The thread variable is unset; this must be the first time we've + asked for it. In this case, the critical section flag cannot + possible already be set. Look up our sigstate structure the slow + way. */ ss = _hurd_thread_sigstate (self); THREAD_SETMEM (THREAD_SELF, _hurd_sigstate, ss); __mach_port_deallocate (__mach_task_self (), self); @@ -218,19 +223,7 @@ _hurd_critical_section_lock (void) return NULL; #endif - ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); - if (ss == NULL) - { - thread_t self = __mach_thread_self (); - - /* The thread variable is unset; this must be the first time we've - asked for it. In this case, the critical section flag cannot - possible already be set. Look up our sigstate structure the slow - way. */ - ss = _hurd_thread_sigstate (self); - THREAD_SETMEM (THREAD_SELF, _hurd_sigstate, ss); - __mach_port_deallocate (__mach_task_self (), self); - } + ss = _hurd_self_sigstate (); if (! __spin_try_lock (&ss->critical_section_lock)) /* We are already in a critical section, so do nothing. */ |