mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-29 05:21:00 +01:00
Merge of SF bug #1262954: compilation problem.
This commit is contained in:
parent
0cdd7c451a
commit
d77e5bfd6c
1 changed files with 13 additions and 4 deletions
17
Src/jobs.c
17
Src/jobs.c
|
|
@ -271,7 +271,7 @@ get_usage(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifndef HAVE_GETRUSAGE
|
#if !defined HAVE_WAIT3 || !defined HAVE_GETRUSAGE
|
||||||
/* Update status of process that we have just WAIT'ed for */
|
/* Update status of process that we have just WAIT'ed for */
|
||||||
|
|
||||||
/**/
|
/**/
|
||||||
|
|
@ -279,17 +279,26 @@ void
|
||||||
update_process(Process pn, int status)
|
update_process(Process pn, int status)
|
||||||
{
|
{
|
||||||
struct timezone dummy_tz;
|
struct timezone dummy_tz;
|
||||||
long childs, childu;
|
#ifdef HAVE_GETRUSAGE
|
||||||
|
struct timeval childs = child_usage.ru_stime;
|
||||||
|
struct timeval childu = child_usage.ru_utime;
|
||||||
|
#else
|
||||||
|
long childs = shtms.tms_cstime;
|
||||||
|
long childu = shtms.tms_cutime;
|
||||||
|
#endif
|
||||||
|
|
||||||
childs = shtms.tms_cstime;
|
|
||||||
childu = shtms.tms_cutime;
|
|
||||||
/* get time-accounting info */
|
/* get time-accounting info */
|
||||||
get_usage();
|
get_usage();
|
||||||
gettimeofday(&pn->endtime, &dummy_tz); /* record time process exited */
|
gettimeofday(&pn->endtime, &dummy_tz); /* record time process exited */
|
||||||
|
|
||||||
pn->status = status; /* save the status returned by WAIT */
|
pn->status = status; /* save the status returned by WAIT */
|
||||||
|
#ifdef HAVE_GETRUSAGE
|
||||||
|
dtime(&pn->ti.ru_stime, &childs, &child_usage.ru_stime);
|
||||||
|
dtime(&pn->ti.ru_utime, &childu, &child_usage.ru_utime);
|
||||||
|
#else
|
||||||
pn->ti.st = shtms.tms_cstime - childs; /* compute process system space time */
|
pn->ti.st = shtms.tms_cstime - childs; /* compute process system space time */
|
||||||
pn->ti.ut = shtms.tms_cutime - childu; /* compute process user space time */
|
pn->ti.ut = shtms.tms_cutime - childu; /* compute process user space time */
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue