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

prints time required for setup

This commit is contained in:
h_vogt 2009-09-14 22:34:17 +00:00
parent c25d028cbf
commit c84522b842
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-09-15 Holger Vogt
* winmain.c: will output the time required for the setup stages,
if compiled with preprocessor flag NGDEBUG
2009-09-09 Holger Vogt 2009-09-09 Holger Vogt
* inp.c: comments added, .TEMP evaluation before numparam parsing * inp.c: comments added, .TEMP evaluation before numparam parsing
* inpcom.c: comments added, inp_casefix() bug removed * inpcom.c: comments added, inp_casefix() bug removed

28
src/winmain.c
View File

@ -99,6 +99,7 @@ int xmain( int argc, char * argv[]/*, char * env[]*/);
void DisplayText( void); void DisplayText( void);
char* rlead(char*); char* rlead(char*);
void winmessage(char*); void winmessage(char*);
int p_r_i_n_t_f(const char * __format, ...);
/* private heap for storing plot data */ /* private heap for storing plot data */
HANDLE outheap; HANDLE outheap;
@ -188,7 +189,7 @@ void ClearInput(void)
// ---------------------------<SourceFile-Fenster>----------------------------- // ---------------------------<SourceFile-Fenster>-----------------------------
// Neuer Text ins Sourcefile-Fenster /* New text to Source file window */
void SetSource( char * Name) void SetSource( char * Name)
{ {
if (hwSource) { if (hwSource) {
@ -207,14 +208,14 @@ void SetAnalyse(
int DecaPercent /*in: 10 times the progress [%]*/ int DecaPercent /*in: 10 times the progress [%]*/
/*HWND hwAnalyse, in: global handle to analysis window */ /*HWND hwAnalyse, in: global handle to analysis window */
) { ) {
static int OldPercent = -2; static int OldPercent = -2; /* Previous progress value */
static char Olds[128]; static char OldAn[128]; /* Previous analysis type */
char s[128], t[128]; char s[128], t[128]; /* outputs to analysis window and task bar */
static struct timeb timebefore; /* previous time stamp */ static struct timeb timebefore; /* previous time stamp */
struct timeb timenow; struct timeb timenow; /* actual time stamp */
int diffsec, diffmillisec; int diffsec, diffmillisec; /* differences actual minus prev. time stamp */
if ((DecaPercent == OldPercent) && !strcmp(Olds, Analyse)) return; if ((DecaPercent == OldPercent) && !strcmp(OldAn, Analyse)) return;
/* get actual time */ /* get actual time */
ftime(&timenow); ftime(&timenow);
timediff(&timenow, &timebefore, &diffsec, &diffmillisec); timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
@ -222,7 +223,7 @@ void SetAnalyse(
/* output only into correct window and if time elapsed is larger than /* output only into correct window and if time elapsed is larger than
given value, or if analysis has changed, else return */ given value, or if analysis has changed, else return */
if (hwAnalyse && ((diffsec > 0) || (diffmillisec > DELTATIME) || strcmp(Olds, Analyse))) { if (hwAnalyse && ((diffsec > 0) || (diffmillisec > DELTATIME) || strcmp(OldAn, Analyse))) {
if (DecaPercent < 0) { if (DecaPercent < 0) {
sprintf( s, "--ready--"); sprintf( s, "--ready--");
sprintf( t, "%s", PACKAGE_STRING); sprintf( t, "%s", PACKAGE_STRING);
@ -233,16 +234,19 @@ void SetAnalyse(
} }
else { else {
sprintf( s, "%s: %3.1f%%", Analyse, (double)DecaPercent/10.); sprintf( s, "%s: %3.1f%%", Analyse, (double)DecaPercent/10.);
// sprintf( t, "%s %s: %3.1f%%", PACKAGE_STRING, Analyse, (double)DecaPercent/10.);
sprintf( t, "%s %3.1f%%", PACKAGE_STRING, (double)DecaPercent/10.); sprintf( t, "%s %3.1f%%", PACKAGE_STRING, (double)DecaPercent/10.);
} }
/*sprintf( s, "%s : %3u%%", Analyse, (int)(DecaPercent/10));*/
timebefore.dstflag = timenow.dstflag; timebefore.dstflag = timenow.dstflag;
timebefore.millitm = timenow.millitm; timebefore.millitm = timenow.millitm;
timebefore.time = timenow.time; timebefore.time = timenow.time;
timebefore.timezone = timenow.timezone; timebefore.timezone = timenow.timezone;
strncpy(Olds, Analyse, 127); if (strcmp(OldAn, Analyse)) {
#if NGDEBUG
if (strcmp(OldAn, "") )
p_r_i_n_t_f("%s finished after %4.2f seconds.\n", OldAn, seconds());
#endif
strncpy(OldAn, Analyse, 127);
}
SetWindowText( hwAnalyse, s); SetWindowText( hwAnalyse, s);
SetWindowText( hwMain, t); SetWindowText( hwMain, t);
InvalidateRgn( hwAnalyse, NULL, TRUE); InvalidateRgn( hwAnalyse, NULL, TRUE);