niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

hurd: Simplify _hurd_critical_section_lock a bit

Browse source 
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>
This commit is contained in:
Sergey Bugaev 2023-04-29 16:13:48 +03:00 • committed by Samuel Thibault
parent a443bd3fb2
commit c287ecd991
1 changed files with 6 additions and 13 deletions

19
hurd/hurd/signal.h
View file

@ -170,6 +170,11 @@ _hurd_self_sigstate (void)
if (__glibc_unlikely (ss == NULL)) if (__glibc_unlikely (ss == NULL))
{ {
thread_t self = __mach_thread_self (); 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); ss = _hurd_thread_sigstate (self);
THREAD_SETMEM (THREAD_SELF, _hurd_sigstate, ss); THREAD_SETMEM (THREAD_SELF, _hurd_sigstate, ss);
__mach_port_deallocate (__mach_task_self (), self); __mach_port_deallocate (__mach_task_self (), self);
@ -218,19 +223,7 @@ _hurd_critical_section_lock (void)
return NULL; return NULL;
#endif #endif
ss = THREAD_GETMEM (THREAD_SELF, _hurd_sigstate); ss = _hurd_self_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);
}
if (! __spin_try_lock (&ss->critical_section_lock)) if (! __spin_try_lock (&ss->critical_section_lock))
/* We are already in a critical section, so do nothing. */ /* We are already in a critical section, so do nothing. */