From 317f76798849bac85c692c76475a85be0f592dab Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Tue, 25 Jul 2000 22:34:00 +0000 Subject: * inhibit-all-rpcs.c (ports_inhibit_all_rpcs): Avoid calling hurd_thread_cancel on the current thread. * inhibit-class-rpcs.c (ports_inhibit_class_rpcs): Likewise. * inhibit-bucket-rpcs.c (ports_inhibit_bucket_rpcs): Likewise. * inhibit-port-rpcs.c (ports_inhibit_port_rpcs): Likewise. --- libports/inhibit-class-rpcs.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libports/inhibit-class-rpcs.c') diff --git a/libports/inhibit-class-rpcs.c b/libports/inhibit-class-rpcs.c index 00b9b361..951de4bf 100644 --- a/libports/inhibit-class-rpcs.c +++ b/libports/inhibit-class-rpcs.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc. Written by Michael I. Bushnell. This file is part of the GNU Hurd. @@ -39,8 +39,13 @@ ports_inhibit_class_rpcs (struct port_class *class) for (pi = class->ports; pi; pi = pi->next) for (rpc = pi->current_rpcs; rpc; rpc = rpc->next) - if (hurd_thread_cancel (rpc->thread) == EINTR) - this_one = 1; + { + /* Avoid cancelling the calling thread. */ + if (rpc->thread == hurd_thread_self ()) + this_one = 1; + else + hurd_thread_cancel (rpc->thread); + } while (class->rpcs > this_one) { -- cgit v1.2.3