luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend/resource.c, fix bizarre time mathematics

This commit is contained in:
rlar 2016-03-13 18:41:42 +01:00
parent 36064b624a
commit 4b5669a51c
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/frontend/resource.c
View File

@ -213,15 +213,17 @@ printres(char *name)
if (ret == -1)
perror("getrusage(): ");
total_sec = ruse.ru_utime.tv_sec + ruse.ru_stime.tv_sec;
total_msec = (ruse.ru_utime.tv_usec + ruse.ru_stime.tv_usec) / 1000;
total_sec = (int) (ruse.ru_utime.tv_sec + ruse.ru_stime.tv_sec);
total_msec = (int) (ruse.ru_utime.tv_usec + ruse.ru_stime.tv_usec) / 1000;
cpu_elapsed = "CPU";
# else
# ifdef HAVE_TIMES
struct tms ruse;
realt = times(&ruse);
total_sec = (ruse.tms_utime + ruse.tms_stime)/ HZ;
total_msec = (ruse.tms_utime + ruse.tms_utime) * 1000 / HZ;
times(&ruse);
clock_t x = ruse.tms_utime + ruse.tms_stime;
clock_t hz = (clock_t) sysconf(_SC_CLK_TCK);
total_sec = x / hz;
total_msec = ((x % hz) * 1000) / hz;
cpu_elapsed = "CPU";
# else
# ifdef HAVE_FTIME
@ -237,21 +239,21 @@ printres(char *name)
#ifndef NO_RUDATA
if (total_msec >= 1000) {
total_msec -= 1000;
total_sec += 1;
}
if (!name || eq(name, "totalcputime")) {
total_sec += total_msec / 1000;
total_msec %= 1000;
fprintf(cp_out, "Total %s time: %u.%03u seconds.\n",
cpu_elapsed, total_sec, total_msec);
}
if (!name || eq(name, "cputime")) {
last_msec = total_msec - last_msec;
last_sec = total_sec - last_sec;
while (last_msec < 0) {
last_msec += 1000;
last_sec -= 1;
}
while (last_msec > 1000) {
last_msec = 1000 + total_msec - last_msec;
last_sec = total_sec - last_sec - 1;
if (last_msec >= 1000) {
last_msec -= 1000;
last_sec += 1;
}

4
src/misc/misc_time.c
View File

@ -75,8 +75,8 @@ struct timeb timebegin;
void timediff(struct timeb *now, struct timeb *begin, int *sec, int *msec)
{
*msec = now->millitm - begin->millitm;
*sec = (int)(now->time - begin->time);
*msec = (int) now->millitm - (int) begin->millitm;
*sec = (int) now->time - (int) begin->time;
if (*msec < 0) {
*msec += 1000;
(*sec)--;