mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-18 13:01:05 +02:00
Code Releases Activity

43564: improve job control report about stopped subjob

Browse source
This commit is contained in:
Peter Stephenson 2018-09-26 16:23:00 +01:00
parent 3da60d2102
commit c2d65a3a6e
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2018-09-26 Peter Stephenson <p.stephenson@samsung.com> 2018-09-26 Peter Stephenson <p.stephenson@samsung.com>
* 43564: Better output concerning stopped subjob.
* 43542 (tweaked): Etc/FAQ.yo: further update about which output. * 43542 (tweaked): Etc/FAQ.yo: further update about which output.
2018-09-25 Daniel Shahaf <d.s@daniel.shahaf.name> 2018-09-25 Daniel Shahaf <d.s@daniel.shahaf.name>

42
Src/jobs.c
View file

@ -466,8 +466,10 @@ update_job(Job jn)
* or to exit. So we have to send it a SIGTSTP. */ * or to exit. So we have to send it a SIGTSTP. */
int i; int i;
jn->stat |= STAT_CHANGED | STAT_STOPPED;
if ((i = super_job(job))) { if ((i = super_job(job))) {
killpg(jobtab[i].gleader, SIGTSTP); Job sjn = &jobtab[i];
killpg(sjn->gleader, SIGTSTP);
/* /*
* Job may already be stopped if it consists of only the * Job may already be stopped if it consists of only the
* forked shell waiting for the subjob -- so mark as * forked shell waiting for the subjob -- so mark as
@ -475,9 +477,20 @@ update_job(Job jn)
* crucially, the subjob, as the visible job used with * crucially, the subjob, as the visible job used with
* fg/bg is the superjob) a SIGCONT if we need it. * fg/bg is the superjob) a SIGCONT if we need it.
*/ */
jobtab[i].stat |= STAT_CHANGED | STAT_STOPPED; sjn->stat |= STAT_CHANGED | STAT_STOPPED;
if (isset(NOTIFY) && (sjn->stat & STAT_LOCKED) &&
!(sjn->stat & STAT_NOPRINT)) {
/*
* Print the subjob state, which we don't usually
* do, so the user knows something has stopped.
* So as not to be confusing, we actually output
* the user-visible superjob.
*/
if (printjob(sjn, !!isset(LONGLISTJOBS), 0) &&
zleactive)
zleentry(ZLE_CMD_REFRESH);
}
} }
jn->stat |= STAT_CHANGED | STAT_STOPPED;
return; return;
} }
if (jn->stat & STAT_STOPPED) if (jn->stat & STAT_STOPPED)
@ -1035,15 +1048,34 @@ printjob(Job jn, int lng, int synch)
"bogus job number, jn = %L, jobtab = %L, oldjobtab = %L", "bogus job number, jn = %L, jobtab = %L, oldjobtab = %L",
(long)jn, (long)jobtab, (long)oldjobtab); (long)jn, (long)jobtab, (long)oldjobtab);
if (jn->stat & STAT_NOPRINT) { if (jn->stat & STAT_NOPRINT)
skip_print = 1; skip_print = 1;
}
if (lng < 0) { if (lng < 0) {
conted = 1; conted = 1;
lng = !!isset(LONGLISTJOBS); lng = !!isset(LONGLISTJOBS);
} }
if (jn->stat & STAT_SUPERJOB &&
jn->other)
{
Job sjn = &jobtab[jn->other];
if (sjn->stat & STAT_STOPPED)
{
/*
* A subjob is stopped, which will prevent further excution
* of the superjob, which the user wants to know about. So
* report the status of the subjob as if it were the
* user-visible superjob.
*
* TBD: there may be other times we want to do this
* which would, for example, remove the need for the
* hack at the top of the loop over processes just below.
*/
jn = sjn;
}
}
/* find length of longest signame, check to see */ /* find length of longest signame, check to see */
/* if we really need to print this job */ /* if we really need to print this job */