Attachment 1479172 Details for Bug 1622892 – ci/128bf385 adapted to el6

[patch] ci/128bf385 adapted to el6

yarace.patch (text/plain), 1.37 KB, created by Filip Krska on 2018-08-28 08:30:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Filip Krska

Created: 2018-08-28 08:30:40 UTC

Size: 1.37 KB

patch

obsolete

>diff -up zsh-4.3.11/Src/exec.c.yarace zsh-4.3.11/Src/exec.c
>--- zsh-4.3.11/Src/exec.c.yarace	2018-07-04 13:52:14.271772873 +0200
>+++ zsh-4.3.11/Src/exec.c	2018-07-04 14:09:15.769841463 +0200
>@@ -1504,8 +1504,11 @@ execpline(Estate state, wordcode slcode,
> 		if (!updated &&
> 		    list_pipe_job && hasprocs(list_pipe_job) &&
> 		    !(jobtab[list_pipe_job].stat & STAT_STOPPED)) {
>+		    int q = queue_signal_level();
> 		    child_unblock();
> 		    child_block();
>+		    dont_queue_signals();
>+		    restore_queue_signals(q);
> 		}
> 		if (list_pipe_child &&
> 		    jn->stat & STAT_DONE &&
>diff -up zsh-4.3.11/Src/jobs.c.yarace zsh-4.3.11/Src/jobs.c
>--- zsh-4.3.11/Src/jobs.c.yarace	2018-07-04 13:52:39.041774216 +0200
>+++ zsh-4.3.11/Src/jobs.c	2018-07-04 13:55:50.417788699 +0200
>@@ -1287,9 +1287,9 @@ zwaitjob(int job, int wait_cmd)
>     int q = queue_signal_level();
>     Job jn = jobtab + job;
> 
>-    dont_queue_signals();
>     child_block();		 /* unblocked during signal_suspend() */
>     queue_traps(wait_cmd);
>+    dont_queue_signals();
>     if (jn->procs || jn->auxprocs) { /* if any forks were done         */
> 	jn->stat |= STAT_LOCKED;
> 	if (jn->stat & STAT_CHANGED)
>@@ -1325,9 +1325,9 @@ zwaitjob(int job, int wait_cmd)
> 	pipestats[0] = lastval;
> 	numpipestats = 1;
>     }
>+    restore_queue_signals(q);
>     unqueue_traps();
>     child_unblock();
>-    restore_queue_signals(q);
> 
>     return 0;
> }

Flags:

kdudka: review+

Actions: View | Diff

Attachments on bug 1622892: 1479172