From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13504 Path: news.gmane.org!.POSTED!not-for-mail From: Orivej Desh Newsgroups: gmane.linux.lib.musl.general Subject: Re: sem_wait and EINTR Date: Thu, 6 Dec 2018 02:43:11 +0000 Message-ID: <20181206024311.3eee9b16@orivej.orivej.org> References: <20181205191605.72492698@orivej.orivej.org> <20181205220337.GY23599@brightrain.aerifal.cx> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1544064084 20194 195.159.176.226 (6 Dec 2018 02:41:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 6 Dec 2018 02:41:24 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-13520-gllmg-musl=m.gmane.org@lists.openwall.com Thu Dec 06 03:41:20 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1gUjbM-000598-Cx for gllmg-musl@m.gmane.org; Thu, 06 Dec 2018 03:41:20 +0100 Original-Received: (qmail 14319 invoked by uid 550); 6 Dec 2018 02:43:29 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 14296 invoked from network); 6 Dec 2018 02:43:28 -0000 In-Reply-To: <20181205220337.GY23599@brightrain.aerifal.cx> X-Mailer: Claws Mail 3.17.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) X-Provags-ID: V03:K1:hGTdePRICsX0nyqJ5Cba+fi2itpxQ7DzzxsMt1k05ud8VHn4SoS /p8LyZdZqIlVdIEEp8/bPxHTmXNFDIhsr9YhG6hdgjkIv/CISUwgiSLkVAOZMEYZtTVU7/I AiXOZkxCwkMCxPeFFfAZtY5/IZfCuz5dq3PH1jgD8/33A4dMRjf2ktnoy2K5n4UPHImG4K5 QzZvXbm1b3hhlBR5BnSCA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DLF+H8TnLEY=:2L6rr9glBNXAe7xoUsBBpH gF5AZBCxypXe7mojcMpyu/MmtD8NnVHmvWntp6EluFb/Yi5RKuWh5YtUYz5eA4v2VgitlTFOa MCRzGoGRVTskwJVC05GVUgpmQvuS/xrDGMyElqa7bOZvtByxTSgW9aMJvjvmPQp9Vf4TWwUIm 54v8Tei3N9YCDYTel3gfhpg84PRyyGOTuqNpEtHE5unNPhgKwf9zhR98N3zjCeg7gYHWlLhGz UHtqKqEbpAhkKfC9E0lJoATJt4l2orlmd5OCmT++yFbo9nW6eN+q5s+xQebObex3sgl+lXKDJ rZ2ozLjRDZaVhRabcPbeP+YWI0YL8jJo6Mj5pXfEK5x3GeC4t9U22ByX1Ia+TePTdf09ZIJFs HNkdaIW/7oZW5MpE4l1tlcX1xi7sGgXVtlF8eRfYJR9qFc/s/hsV16smIOcS+59OAETMzHFXn y/M+XkpnrWNh/KdPQ+f5iy1AtrzzruseS3y/x47kSefqw9WZqnrlC2qoTGI3UbhIPWhpQXjBB juWej3oznrKDtsBugtgrR2QzO8IB6ntYhIlUyIm7ST2l9x6vo3mEQiN+YmXougixELWLA94c0 v24HqzzEX6Y3dDb+gDfUIhk3PQgAVT5XvrBHW/tB1O8n8IaaOLrIbRDYwrGcHV8VLH3tVE9Bb w1IUKWCZdcirbxwgIwiIqgsY8zqN8p3qBV4y6HCwpbXf4j/gETbj8PF2aOqYI+k/9uZHPaMxv uphnQFZy13fEJH4nzNWpi+cFViB/PS693xDdJZIE0mPIYM+7MJ4pbcDn8ypXuiuB54EwecMQ Xref: news.gmane.org gmane.linux.lib.musl.general:13504 Archived-At: * Rich Felker [2018-12-05] > On Wed, Dec 05, 2018 at 07:16:05PM +0000, Orivej Desh wrote: > > [3] https://github.com/orivej/musl/commit/c4c38aaab4fc55c23669f7b81386b615609cc3e1 > > > > diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c > > index 8132eb1b..58d3ebfe 100644 > > --- a/src/thread/sem_timedwait.c > > +++ b/src/thread/sem_timedwait.c > > @@ -22,7 +22,7 @@ int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at) > > pthread_cleanup_push(cleanup, (void *)(sem->__val+1)); > > r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]); > > pthread_cleanup_pop(1); > > - if (r && r != EINTR) { > > + if (r) { > > errno = r; > > return -1; > > } > > diff --git a/src/thread/synccall.c b/src/thread/synccall.c > > index cc66bd24..d9ab40cb 100644 > > --- a/src/thread/synccall.c > > +++ b/src/thread/synccall.c > > @@ -37,10 +37,10 @@ static void handler(int sig) > > if (a_cas(&target_tid, ch.tid, 0) == (ch.tid | 0x80000000)) > > __syscall(SYS_futex, &target_tid, FUTEX_UNLOCK_PI|FUTEX_PRIVATE); > > > > - sem_wait(&ch.target_sem); > > + while (sem_wait(&ch.target_sem) && errno != EINTR); > > callback(context); > > sem_post(&ch.caller_sem); > > - sem_wait(&ch.target_sem); > > + while (sem_wait(&ch.target_sem) && errno != EINTR); > > > > errno = old_errno; > > } > > @@ -153,7 +153,7 @@ void __synccall(void (*func)(void *), void *ctx) > > /* Serialize execution of callback in caught threads. */ > > for (cp=head; cp; cp=cp->next) { > > sem_post(&cp->target_sem); > > - sem_wait(&cp->caller_sem); > > + while (sem_wait(&cp->caller_sem) && errno != EINTR); > > } > > > > sa.sa_handler = SIG_IGN; > > I think the changes to __synccall are unnecessary noise. It > necessarily runs with all signals, even implementation-internal ones, > blocked. Did you just miss this or do you think there's a reason the > checks need to be added? You are right, I did not notice that. There is no need to change synccall.c.