[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 21/21: Avoid ports_interrupt_rpcs cancel itself
From: |
Samuel Thibault |
Subject: |
[hurd] 21/21: Avoid ports_interrupt_rpcs cancel itself |
Date: |
Sat, 04 Mar 2017 21:10:59 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit db7dd39b84be0371536c9ccec907cd918476c0ea
Author: Samuel Thibault <address@hidden>
Date: Sat Mar 4 20:11:47 2017 +0100
Avoid ports_interrupt_rpcs cancel itself
While this does not hurt immediately, callers of ports_interrupt_rpcs
would themselves get canceled at the next cancelation point.
* libports/interrupt-rpcs.c (ports_interrupt_rpcs): Do not call
cancel ourself.
---
libports/interrupt-rpcs.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libports/interrupt-rpcs.c b/libports/interrupt-rpcs.c
index 42f51a5..7017548 100644
--- a/libports/interrupt-rpcs.c
+++ b/libports/interrupt-rpcs.c
@@ -26,13 +26,17 @@ ports_interrupt_rpcs (void *portstruct)
{
struct port_info *pi = portstruct;
struct rpc_info *rpc;
+ thread_t self = hurd_thread_self ();
pthread_mutex_lock (&_ports_lock);
for (rpc = pi->current_rpcs; rpc; rpc = rpc->next)
{
- hurd_thread_cancel (rpc->thread);
- _ports_record_interruption (rpc);
+ if (rpc->thread != self)
+ {
+ hurd_thread_cancel (rpc->thread);
+ _ports_record_interruption (rpc);
+ }
}
pthread_mutex_unlock (&_ports_lock);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 10/21: ext2fs: fix block reference, (continued)
- [hurd] 10/21: ext2fs: fix block reference, Samuel Thibault, 2017/03/04
- [hurd] 16/21: libshouldbeinlibc: Fix NDEBUG build., Samuel Thibault, 2017/03/04
- [hurd] 08/21: ext2fs: Fix block allocation., Samuel Thibault, 2017/03/04
- [hurd] 12/21: ext2fs: fix extended attribute retrieval, Samuel Thibault, 2017/03/04
- [hurd] 11/21: ext2fs: minor cleanup, Samuel Thibault, 2017/03/04
- [hurd] 15/21: Fix mig URL, Samuel Thibault, 2017/03/04
- [hurd] 19/21: boot: Fix failing device lookups in unprivileged mode., Samuel Thibault, 2017/03/04
- [hurd] 09/21: ext2fs: Fix potential block leak., Samuel Thibault, 2017/03/04
- [hurd] 14/21: Merge remote-tracking branch 'remotes/darnassus/ext2fs-xattrs', Samuel Thibault, 2017/03/04
- [hurd] 05/21: ext2fs: Fix block leak in xattr code., Samuel Thibault, 2017/03/04
- [hurd] 21/21: Avoid ports_interrupt_rpcs cancel itself,
Samuel Thibault <=
- [hurd] 07/21: ext2fs: Require users to opt-in for xattr-based translator records., Samuel Thibault, 2017/03/04
- [hurd] 20/21: boot: Make the halt message nicer., Samuel Thibault, 2017/03/04
- [hurd] 13/21: ext2fs: downgrade warnings about old translator records to debug messages, Samuel Thibault, 2017/03/04
- [hurd] 18/21: boot: Add a verbose option., Samuel Thibault, 2017/03/04
- [hurd] 04/21: ext2fs: Use correct type for sizes., Samuel Thibault, 2017/03/04
- [hurd] 02/21: ext2fs: Use xattr to store passive translator, Samuel Thibault, 2017/03/04
- [hurd] 17/21: boot: Cleanup Makefile., Samuel Thibault, 2017/03/04
- [hurd] 01/21: ext2fs: Add support for xattr, Samuel Thibault, 2017/03/04