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: Fix some broken indentation

Browse source 
Also, fix a couple of typos. No functional change.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230301162355.426887-2-bugaevc@gmail.com>
This commit is contained in:
Sergey Bugaev 2023-03-01 19:23:55 +03:00 • committed by Samuel Thibault
parent 60b21327b1
commit 0d41182e0e
1 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
hurd/hurdsig.c
View file

@ -202,7 +202,7 @@ _hurd_sigstate_unlock (struct hurd_sigstate *ss)
} }
libc_hidden_def (_hurd_sigstate_set_global_rcv) libc_hidden_def (_hurd_sigstate_set_global_rcv)
/* Retreive a thread's full set of pending signals, including the global /* Retrieve a thread's full set of pending signals, including the global
ones if appropriate. SS must be locked. */ ones if appropriate. SS must be locked. */
sigset_t sigset_t
_hurd_sigstate_pending (const struct hurd_sigstate *ss) _hurd_sigstate_pending (const struct hurd_sigstate *ss)
@ -233,7 +233,7 @@ sigstate_clear_pending (struct hurd_sigstate *ss, int signo)
libc_hidden_def (_hurd_sigstate_lock) libc_hidden_def (_hurd_sigstate_lock)
libc_hidden_def (_hurd_sigstate_unlock) libc_hidden_def (_hurd_sigstate_unlock)
/* Retreive a thread's action vector. SS must be locked. */ /* Retrieve a thread's action vector. SS must be locked. */
struct sigaction * struct sigaction *
_hurd_sigstate_actions (struct hurd_sigstate *ss) _hurd_sigstate_actions (struct hurd_sigstate *ss)
{ {
@ -451,54 +451,55 @@ _hurdsig_abort_rpcs (struct hurd_sigstate *ss, int signo, int sigthread,
*state_change = 1; *state_change = 1;
} }
else if (state->basic.PC == (uintptr_t) &_hurd_intr_rpc_msg_in_trap else if (state->basic.PC == (uintptr_t) &_hurd_intr_rpc_msg_in_trap
/* The thread was blocked in the system call. After thread_abort, /* The thread was blocked in the system call. After thread_abort,
the return value register indicates what state the RPC was in the return value register indicates what state the RPC was in
when interrupted. */ when interrupted. */
&& state->basic.SYSRETURN == MACH_RCV_INTERRUPTED) && state->basic.SYSRETURN == MACH_RCV_INTERRUPTED)
{ {
/* The RPC request message was sent and the thread was waiting for /* The RPC request message was sent and the thread was waiting for the
the reply message; now the message receive has been aborted, so reply message; now the message receive has been aborted, so the
the mach_msg call will return MACH_RCV_INTERRUPTED. We must tell mach_msg call will return MACH_RCV_INTERRUPTED. We must tell the
the server to interrupt the pending operation. The thread must server to interrupt the pending operation. The thread must wait for
wait for the reply message before running the signal handler (to the reply message before running the signal handler (to guarantee that
guarantee that the operation has finished being interrupted), so the operation has finished being interrupted), so our nonzero return
our nonzero return tells the trampoline code to finish the message tells the trampoline code to finish the message receive operation
receive operation before running the handler. */ before running the handler. */
mach_port_t *reply = interrupted_reply_port_location (ss->thread, mach_port_t *reply = interrupted_reply_port_location (ss->thread,
state, state,
sigthread); sigthread);
error_t err = __interrupt_operation (intr_port, _hurdsig_interrupt_timeout); error_t err = __interrupt_operation (intr_port,
_hurdsig_interrupt_timeout);
if (err) if (err)
{ {
if (reply) if (reply)
{ {
/* The interrupt didn't work. /* The interrupt didn't work.
Destroy the receive right the thread is blocked on. */ Destroy the receive right the thread is blocked on. */
__mach_port_destroy (__mach_task_self (), *reply); __mach_port_destroy (__mach_task_self (), *reply);
*reply = MACH_PORT_NULL; *reply = MACH_PORT_NULL;
} }
/* The system call return value register now contains /* The system call return value register now contains
MACH_RCV_INTERRUPTED; when mach_msg resumes, it will retry the MACH_RCV_INTERRUPTED; when mach_msg resumes, it will retry the
call. Since we have just destroyed the receive right, the call. Since we have just destroyed the receive right, the retry
retry will fail with MACH_RCV_INVALID_NAME. Instead, just will fail with MACH_RCV_INVALID_NAME. Instead, just change the
change the return value here to EINTR so mach_msg will not return value here to EINTR so mach_msg will not retry and the
retry and the EINTR error code will propagate up. */ EINTR error code will propagate up. */
state->basic.SYSRETURN = EINTR; state->basic.SYSRETURN = EINTR;
*state_change = 1; *state_change = 1;
} }
else if (reply) else if (reply)
rcv_port = *reply; rcv_port = *reply;
/* All threads whose RPCs were interrupted by the interrupt_operation /* All threads whose RPCs were interrupted by the interrupt_operation
call above will retry their RPCs unless we clear SS->intr_port. call above will retry their RPCs unless we clear SS->intr_port. So we
So we clear it for the thread taking a signal when SA_RESTART is clear it for the thread taking a signal when SA_RESTART is clear, so
clear, so that its call returns EINTR. */ that its call returns EINTR. */
if (! signo || !(_hurd_sigstate_actions (ss) [signo].sa_flags & SA_RESTART)) if (! signo || !(_hurd_sigstate_actions (ss) [signo].sa_flags & SA_RESTART))
ss->intr_port = MACH_PORT_NULL; ss->intr_port = MACH_PORT_NULL;
} }
return rcv_port; return rcv_port;
} }