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

seconds() no longer supports a time difference, so create it locally.

This commit is contained in:
Holger Vogt 2024-11-04 13:02:50 +01:00
parent 821733a5f6
commit 26f2fec689
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sharedspice.c
View File

@ -1930,6 +1930,7 @@ void SetAnalyse(
static char OldAn2[128]; /* Previous analysis type */ static char OldAn2[128]; /* Previous analysis type */
static char olds2[128]; /* previous output */ static char olds2[128]; /* previous output */
static PerfTime timebefore2; /* previous time stamp */ static PerfTime timebefore2; /* previous time stamp */
int sdiffsec, sdiffmillisec; /* differences current time minus start time stamp */
/*set the two thread ids */ /*set the two thread ids */
unsigned int ng_idl = threadid_self(); unsigned int ng_idl = threadid_self();
@ -1969,9 +1970,11 @@ void SetAnalyse(
if ((DecaPercent == OldPercent) && !strcmp(OldAn, Analyse)) if ((DecaPercent == OldPercent) && !strcmp(OldAn, Analyse))
return; return;
/* get actual time */ /* get current time */
perf_timer_get_time(&timenow); perf_timer_get_time(&timenow);
timediff(&timenow, &timebefore, &diffsec, &diffmillisec); timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
timediff(&timenow, &timebegin, &sdiffsec, &sdiffmillisec);
s = TMALLOC(char, 128); s = TMALLOC(char, 128);
if (!strcmp(Analyse, "tran")) { if (!strcmp(Analyse, "tran")) {
@ -2030,8 +2033,8 @@ void SetAnalyse(
} }
/* info when previous analysis period has finished */ /* info when previous analysis period has finished */
if (strcmp(OldAn, Analyse)) { if (strcmp(OldAn, Analyse)) {
if (ft_ngdebug && (strcmp(OldAn, ""))) if ((ft_nginfo || ft_ngdebug) && (strcmp(OldAn, "")))
printf("%s finished after %4.2f seconds.\n", OldAn, seconds()); printf("%s finished after %5.3f seconds.\n", OldAn, (double)sdiffsec + (double)sdiffmillisec / 1000.);
if(thread1) if(thread1)
strncpy(OldAn1, Analyse, 127); strncpy(OldAn1, Analyse, 127);
else else

4
src/winmain.c
View File

@ -223,6 +223,7 @@ SetAnalyse(char *Analyse, /* in: analysis type */
static PerfTime timebefore; /* previous time stamp */ static PerfTime timebefore; /* previous time stamp */
PerfTime timenow; /* actual time stamp */ PerfTime timenow; /* actual time stamp */
int diffsec, diffmillisec; /* differences actual minus prev. time stamp */ int diffsec, diffmillisec; /* differences actual minus prev. time stamp */
int sdiffsec, sdiffmillisec; /* differences actual minus start time stamp */
WaitForIdle(); WaitForIdle();
@ -234,6 +235,7 @@ SetAnalyse(char *Analyse, /* in: analysis type */
/* get actual time */ /* get actual time */
perf_timer_get_time(&timenow); perf_timer_get_time(&timenow);
timediff(&timenow, &timebefore, &diffsec, &diffmillisec); timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
timediff(&timenow, &timebegin, &sdiffsec, &sdiffmillisec);
OldPercent = DecaPercent; OldPercent = DecaPercent;
/* output only into hwAnalyse window and if time elapsed is larger than /* output only into hwAnalyse window and if time elapsed is larger than
@ -260,7 +262,7 @@ SetAnalyse(char *Analyse, /* in: analysis type */
/* info when previous analysis period has finished */ /* info when previous analysis period has finished */
if (strcmp(OldAn, Analyse)) { if (strcmp(OldAn, Analyse)) {
if ((ft_nginfo || ft_ngdebug) && (strcmp(OldAn, ""))) if ((ft_nginfo || ft_ngdebug) && (strcmp(OldAn, "")))
win_x_printf("%s finished after %4.2f seconds.\n", OldAn, seconds()); win_x_printf("%s finished after %5.3f seconds.\n", OldAn, (double)sdiffsec + (double)sdiffmillisec / 1000.);
strncpy(OldAn, Analyse, 127); strncpy(OldAn, Analyse, 127);
} }