From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id F2D693847824 for ; Wed, 26 May 2021 17:38:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F2D693847824 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-VglmUiL0NSmJOUcg1zAZoA-1; Wed, 26 May 2021 13:38:52 -0400 X-MC-Unique: VglmUiL0NSmJOUcg1zAZoA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B13B2800D55; Wed, 26 May 2021 17:38:51 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D74BE19D9D; Wed, 26 May 2021 17:38:50 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella via Libc-alpha Subject: Re: [PATCH 06/11] nptl: Install cancellation handler on pthread_cancel References: <20210526165728.1772546-1-adhemerval.zanella@linaro.org> <20210526165728.1772546-7-adhemerval.zanella@linaro.org> Date: Wed, 26 May 2021 19:38:48 +0200 In-Reply-To: <20210526165728.1772546-7-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Wed, 26 May 2021 13:57:23 -0300") Message-ID: <87bl8xqtsn.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 17:38:57 -0000 * Adhemerval Zanella via Libc-alpha: > @@ -134,7 +135,11 @@ __pthread_cancel (pthread_t th) > call pthread_cancel (pthread_self ()) without calling > pthread_create, so the signal handler may not have been > set up for a self-cancel. */ > - sigcancel_handler (); > + { > + THREAD_SETMEM (pd, result, PTHREAD_CANCELED); > + if ((newval & CANCELTYPE_BITMASK) != 0) > + __do_cancel (); > + } The comment is no longer up to date, I think. Rest of the change looks okay to me. Thanks, Florian