From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id A80B73861031 for ; Wed, 26 May 2021 17:52:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A80B73861031 Received: by mail-qk1-x736.google.com with SMTP id 124so1849615qkh.10 for ; Wed, 26 May 2021 10:52:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=m/zElWXo46uLAzp3fF5yuktHZzW+xJQywrlGW8ltYf0=; b=eZf43xF4f6LpH5OBUnWKnAgWpfbKPIE0mp+L1tMYJKENzm0jL8JA/9DePegL1IkTAd baNRtCBAdkko+NE/45t26NngHhm7E5Lw9KS63wJB/jOW0s7scZYKYR0s/bWBCFzLPc/T DQqV2ZoUX0Djw6LjzZtGWsBrTAdvx8qsy446ytwGklSpK+eyN3hXc5PdiyV+gScaMaps HcRFe76mjZ+nQEaa5+Z7NbAyjg417pJVthJtsm8KWNpWY/KiVsuBxdGT6lr/P0TIJJv/ jCMPSfRX/Vr/M7FdRTLgEkhr/CF+dgdSQiZuzkZuk0YBrfbUTcw1dP3vC+ighc1tRgzw pzXg== X-Gm-Message-State: AOAM5307wBk2KHN9l9L2SvwccjvnFU9DoaCwwmjLK2RWZTEsGRHuLzoc GriEHBubH2E/tTaSnkDbJDGKyfLIRrUCyw== X-Google-Smtp-Source: ABdhPJwEcZLkfUBqi5SkoLeJKLMmiMWpNmt381i5xaYf1geivv+fhGSCHzx2z3iW2PSvnJI94G5rxA== X-Received: by 2002:a05:620a:1021:: with SMTP id a1mr41553391qkk.399.1622051527135; Wed, 26 May 2021 10:52:07 -0700 (PDT) Received: from [192.168.1.4] ([177.194.37.86]) by smtp.gmail.com with ESMTPSA id t139sm1993500qka.85.2021.05.26.10.52.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 May 2021 10:52:06 -0700 (PDT) Subject: Re: [PATCH 06/11] nptl: Install cancellation handler on pthread_cancel To: Florian Weimer , Adhemerval Zanella via Libc-alpha References: <20210526165728.1772546-1-adhemerval.zanella@linaro.org> <20210526165728.1772546-7-adhemerval.zanella@linaro.org> <87bl8xqtsn.fsf@oldenburg.str.redhat.com> From: Adhemerval Zanella Message-ID: Date: Wed, 26 May 2021 14:52:04 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <87bl8xqtsn.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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:52:08 -0000 On 26/05/2021 14:38, Florian Weimer wrote: > * 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. Indeed, I will remove it.