emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: make dowait() a bit more readable. Logic is unchanged

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-10-09 15:40:13 +02:00
parent e1603156ff
commit 4700fb5bea
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
shell/ash.c
View File

@ -3919,19 +3919,15 @@ sprint_status48(char *s, int status, int sigonly)
col = 0; col = 0;
if (!WIFEXITED(status)) { if (!WIFEXITED(status)) {
#if JOBS if (JOBS && WIFSTOPPED(status))
if (WIFSTOPPED(status))
st = WSTOPSIG(status); st = WSTOPSIG(status);
else else
#endif
st = WTERMSIG(status); st = WTERMSIG(status);
if (sigonly) { if (sigonly) {
if (st == SIGINT || st == SIGPIPE) if (st == SIGINT || st == SIGPIPE)
goto out; goto out;
#if JOBS if (JOBS && WIFSTOPPED(status))
if (WIFSTOPPED(status))
goto out; goto out;
#endif
} }
st &= 0x7f; st &= 0x7f;
//TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata //TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata
@ -3955,7 +3951,6 @@ dowait(int wait_flags, struct job *job)
int status; int status;
struct job *jp; struct job *jp;
struct job *thisjob; struct job *thisjob;
int state;
TRACE(("dowait(0x%x) called\n", wait_flags)); TRACE(("dowait(0x%x) called\n", wait_flags));
@ -3973,11 +3968,12 @@ dowait(int wait_flags, struct job *job)
INT_OFF; INT_OFF;
thisjob = NULL; thisjob = NULL;
for (jp = curjob; jp; jp = jp->prev_job) { for (jp = curjob; jp; jp = jp->prev_job) {
int jobstate;
struct procstat *ps; struct procstat *ps;
struct procstat *psend; struct procstat *psend;
if (jp->state == JOBDONE) if (jp->state == JOBDONE)
continue; continue;
state = JOBDONE; jobstate = JOBDONE;
ps = jp->ps; ps = jp->ps;
psend = ps + jp->nprocs; psend = ps + jp->nprocs;
do { do {
@ -3989,41 +3985,41 @@ dowait(int wait_flags, struct job *job)
thisjob = jp; thisjob = jp;
} }
if (ps->ps_status == -1) if (ps->ps_status == -1)
state = JOBRUNNING; jobstate = JOBRUNNING;
#if JOBS #if JOBS
if (state == JOBRUNNING) if (jobstate == JOBRUNNING)
continue; continue;
if (WIFSTOPPED(ps->ps_status)) { if (WIFSTOPPED(ps->ps_status)) {
jp->stopstatus = ps->ps_status; jp->stopstatus = ps->ps_status;
state = JOBSTOPPED; jobstate = JOBSTOPPED;
} }
#endif #endif
} while (++ps < psend); } while (++ps < psend);
if (thisjob) if (!thisjob)
goto gotjob; continue;
}
#if JOBS
if (!WIFSTOPPED(status))
#endif
jobless--;
goto out;
gotjob: /* Found the job where one of its processes changed its state.
if (state != JOBRUNNING) { * Is there at least one live and running process in this job? */
if (jobstate != JOBRUNNING) {
/* No. All live processes in the job are stopped
* (JOBSTOPPED) or there are no live processes (JOBDONE)
*/
thisjob->changed = 1; thisjob->changed = 1;
if (thisjob->state != jobstate) {
if (thisjob->state != state) {
TRACE(("Job %d: changing state from %d to %d\n", TRACE(("Job %d: changing state from %d to %d\n",
jobno(thisjob), thisjob->state, state)); jobno(thisjob), thisjob->state, jobstate));
thisjob->state = state; thisjob->state = jobstate;
#if JOBS #if JOBS
if (state == JOBSTOPPED) { if (jobstate == JOBSTOPPED)
set_curjob(thisjob, CUR_STOPPED); set_curjob(thisjob, CUR_STOPPED);
}
#endif #endif
} }
} }
goto out;
}
/* The process wasn't found in job list */
if (JOBS && !WIFSTOPPED(status))
jobless--;
out: out:
INT_ON; INT_ON;