epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Applied fix for logging supplied by Dietmar Warning (src/main.c). 

Miscellaneous tidying for format, indentation, #include style ("" vis-a-vis <>). Also removal of some compile time warnings.
pre-master-46
sjborley 21 years ago
parent
c8babc9450
commit
1f33b1ee02
2 changed files with 141 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ChangeLog
  2. 271
      src/main.c

10
ChangeLog
View File

@ -1,4 +1,12 @@
2005-05-30
2005-06-31 Steven Borley <steven.borley@virgin.net>
* Applied fix for logging supplied by Dietmar Warning (src/main.c)
* Miscellaneous tidying in src.main.c for format, indentation, #include
style ("" vis-a-vis <>) and removal of some compile time warnings.
2005-05-30 Steven Borley <steven.borley@virgin.net>
* Corrected return types (where necessary) for the functions that make up the * Corrected return types (where necessary) for the functions that make up the
devices[] array initialised in src/frontend/display.c, and used specific devices[] array initialised in src/frontend/display.c, and used specific

271
src/main.c
View File

@ -11,40 +11,22 @@
#include <ngspice.h> #include <ngspice.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif /* HAVE_STRING_H */ #endif /* HAVE_STRING_H */
#ifdef __MINGW32__ #ifdef __MINGW32__
#define srandom(a) srand(a) /* srandom */ #define srandom(a) srand(a) /* srandom */
#endif /* __MINGW32__ */ #endif /* __MINGW32__ */
#include <setjmp.h> #include <setjmp.h>
#include <signal.h> #include <signal.h>
#include <sys/types.h> #include <sys/types.h>
#include <iferrmsg.h>
#include <ftedefs.h>
#include <devdefs.h>
#include "spicelib/devices/dev.h"
#include "spicelib/analysis/analysis.h"
#include "misc/ivars.h"
#include "misc/getopt.h"
#include "frontend/resource.h"
#include "frontend/variable.h"
#include "frontend/display.h" /* added by SDB to pick up Input() fcn */
#include "frontend/signal_handler.h"
/* saj xspice headers */
#ifdef XSPICE
#include "ipctiein.h"
#include "mif.h"
#include "enh.h"
#endif
#ifdef HAVE_PWD_H #ifdef HAVE_PWD_H
#include <pwd.h> #include <pwd.h>
#endif #endif
#ifdef HAVE_GNUREADLINE #ifdef HAVE_GNUREADLINE
/* Added GNU Readline Support 11/3/97 -- Andrew Veliath <veliaa@rpi.edu> */ /* Added GNU Readline Support 11/3/97 -- Andrew Veliath <veliaa@rpi.edu> */
/* from spice3f4 patch to ng-spice. jmr */ /* from spice3f4 patch to ng-spice. jmr */
@ -59,27 +41,45 @@ extern VFunction *rl_event_hook; /* missing from editline/readline.h */
extern int rl_catch_signals; /* missing from editline/readline.h */ extern int rl_catch_signals; /* missing from editline/readline.h */
#endif /* HAVE_BSDEDITLINE */ #endif /* HAVE_BSDEDITLINE */
#if defined(HAVE_GNUREADLINE) || defined(HAVE_BSDEDITLINE)
char history_file[512];
static char *application_name;
#endif /* HAVE_GNUREADLINE || HAVE_BSDEDITLINE */
#ifndef HAVE_GETRUSAGE #ifndef HAVE_GETRUSAGE
#ifdef HAVE_FTIME #ifdef HAVE_FTIME
#include <sys/timeb.h> #include <sys/timeb.h>
#endif #endif
#endif #endif
#include "iferrmsg.h"
#include "ftedefs.h"
#include "devdefs.h"
#include "spicelib/devices/dev.h"
#include "spicelib/analysis/analysis.h"
#include "misc/ivars.h"
#include "misc/getopt.h"
#include "frontend/resource.h"
#include "frontend/variable.h"
#include "frontend/display.h" /* added by SDB to pick up Input() fcn */
#include "frontend/signal_handler.h"
/* saj xspice headers */
#ifdef XSPICE
#include "ipctiein.h"
#include "mif.h"
#include "enh.h"
#endif
#ifdef CIDER #ifdef CIDER
#include "numenum.h" #include "numenum.h"
#include "maths/misc/accuracy.h"
#endif #endif
#if defined(HAVE_GNUREADLINE) || defined(HAVE_BSDEDITLINE)
char history_file[512];
static char *application_name;
#endif /* HAVE_GNUREADLINE || HAVE_BSDEDITLINE */
/* Undefine this next line for dubug tracing */ /* Undefine this next line for dubug tracing */
/* #define TRACE */ /* #define TRACE */
extern void DevInit(void);
/* Main options */ /* Main options */
static bool ft_servermode = FALSE; static bool ft_servermode = FALSE;
static bool ft_batchmode = FALSE; static bool ft_batchmode = FALSE;
@ -89,18 +89,22 @@ bool ft_intrpt = FALSE; /* Set by the (void) signal handlers. TRUE = we've b
bool ft_setflag = FALSE; /* TRUE = Don't abort simulation after an interrupt. */ bool ft_setflag = FALSE; /* TRUE = Don't abort simulation after an interrupt. */
char *ft_rawfile = "rawspice.raw"; char *ft_rawfile = "rawspice.raw";
#ifdef HAS_WINDOWS
bool oflag = FALSE; /* Output over redefined I/O functions */ bool oflag = FALSE; /* Output over redefined I/O functions */
FILE *flogp; /* hvogt 15.12.2001 */ FILE *flogp; /* hvogt 15.12.2001 */
#endif /* HAS_WINDOWS */
/* Frontend and circuit options */ /* Frontend and circuit options */
IFsimulator *ft_sim = NULL; IFsimulator *ft_sim = NULL;
/* (Virtual) Machine architecture parameters */ /* (Virtual) Machine architecture parameters */
int ARCHme; int ARCHme;
int ARCHsize; int ARCHsize;
char *errRtn;
char *errMsg;
char *cp_program;
#ifdef CIDER #ifdef CIDER
/* Globals definitions for Machine Accuracy Limits /* Globals definitions for Machine Accuracy Limits
* (needed by CIDER) * (needed by CIDER)
@ -110,13 +114,8 @@ double BMax; /* upper limit for B(x) */
double ExpLim; /* limit for exponential */ double ExpLim; /* limit for exponential */
double Accuracy; /* accuracy of the machine */ double Accuracy; /* accuracy of the machine */
double Acc, MuLim, MutLim; double Acc, MuLim, MutLim;
#endif
char *errRtn;
char *errMsg;
char *cp_program;
#ifdef CIDER
/* Global debug flags from CIDER, soon they will become /* Global debug flags from CIDER, soon they will become
* spice variables :) * spice variables :)
*/ */
@ -192,7 +191,7 @@ bool ft_nutmeg = FALSE;
extern struct comm spcp_coms[ ]; extern struct comm spcp_coms[ ];
struct comm *cp_coms = spcp_coms; struct comm *cp_coms = spcp_coms;
#else
#else /* SIMULATOR */
bool ft_nutmeg = TRUE; bool ft_nutmeg = TRUE;
extern struct comm nutcp_coms[ ]; extern struct comm nutcp_coms[ ];
@ -301,7 +300,7 @@ void EVTprint(wordlist *wl){
struct dvec *EVTfindvec(char *node){ struct dvec *EVTfindvec(char *node){
return NULL; return NULL;
} }
#endif
#endif /* XSPICE */
#endif /* SIMULATOR */ #endif /* SIMULATOR */
@ -383,31 +382,31 @@ prompt(void)
s = "->"; s = "->";
while (*s) { while (*s) {
switch (strip(*s)) {
case '!':
switch (strip(*s)) {
case '!':
#ifdef HAVE_BSDEDITLINE #ifdef HAVE_BSDEDITLINE
{
/* SJB In the present version of editline (v2.9)
it seems that where_history() is broken.
This is a hack that works round this problem.
WARNING: It may fail to work in the future
as it relies on undocumented structure */
int where = 0;
HIST_ENTRY * he = current_history();
if(he!=NULL) where = *(int*)(he->data);
p += sprintf(p, "%d", where + 1);
}
{
/* SJB In the present version of editline (v2.9)
it seems that where_history() is broken.
This is a hack that works round this problem.
WARNING: It may fail to work in the future
as it relies on undocumented structure */
int where = 0;
HIST_ENTRY * he = current_history();
if(he!=NULL) where = *(int*)(he->data);
p += sprintf(p, "%d", where + 1);
}
#else #else
p += sprintf(p, "%d", where_history() + 1);
p += sprintf(p, "%d", where_history() + 1);
#endif /* HAVE_BSDEDITLINE*/ #endif /* HAVE_BSDEDITLINE*/
break;
case '\\':
if (*(s + 1))
p += sprintf(p, "%c", strip(*++s));
default:
*p = strip(*s); ++p;
break;
}
break;
case '\\':
if (*(s + 1))
p += sprintf(p, "%c", strip(*++s));
default:
*p = strip(*s); ++p;
break;
}
s++; s++;
} }
*p = 0; *p = 0;
@ -632,7 +631,6 @@ main(int argc, char **argv)
char* copystring;/*DG*/ char* copystring;/*DG*/
#ifdef SIMULATOR #ifdef SIMULATOR
int error2; int error2;
static IFfrontEnd nutmeginfo = { static IFfrontEnd nutmeginfo = {
IFnewUid, IFnewUid,
@ -655,7 +653,6 @@ main(int argc, char **argv)
bool gdata = TRUE; bool gdata = TRUE;
#endif /* ~ SIMULATOR */ #endif /* ~ SIMULATOR */
char buf[BSIZE_SP]; char buf[BSIZE_SP];
bool readinit = TRUE; bool readinit = TRUE;
bool rflag = FALSE; bool rflag = FALSE;
@ -665,8 +662,6 @@ main(int argc, char **argv)
FILE *fp; FILE *fp;
FILE *circuit_file; FILE *circuit_file;
#ifdef TRACE #ifdef TRACE
/* this is used to detect memory leaks during debugging */ /* this is used to detect memory leaks during debugging */
/* added by SDB during debug . . . . */ /* added by SDB during debug . . . . */
@ -706,7 +701,6 @@ main(int argc, char **argv)
ARCHsize = 1; ARCHsize = 1;
#endif /* PARALLEL_ARCH */ #endif /* PARALLEL_ARCH */
ivars( ); ivars( );
cp_in = stdin; cp_in = stdin;
@ -715,8 +709,6 @@ main(int argc, char **argv)
circuit_file = stdin; circuit_file = stdin;
#ifdef MALLOCTRACE #ifdef MALLOCTRACE
mallocTraceInit("malloc.out"); mallocTraceInit("malloc.out");
#endif #endif
@ -724,8 +716,6 @@ main(int argc, char **argv)
istty = (bool) isatty(fileno(stdin)); istty = (bool) isatty(fileno(stdin));
#endif #endif
init_time( ); init_time( );
err = SIMinit(&nutmeginfo,&ft_sim); err = SIMinit(&nutmeginfo,&ft_sim);
@ -761,91 +751,95 @@ main(int argc, char **argv)
break; break;
switch (c) { switch (c) {
case 'h': /* Help */
show_help();
shutdown (EXIT_NORMAL);
break;
case 'h': /* Help */
show_help();
shutdown (EXIT_NORMAL);
break;
case 'v': /* Version info */
show_version();
shutdown (EXIT_NORMAL);
break;
case 'v': /* Version info */
show_version();
shutdown (EXIT_NORMAL);
break;
case 'b': /* Batch mode */
ft_batchmode = TRUE;
break;
case 'b': /* Batch mode */
ft_batchmode = TRUE;
break;
case 'c': /* Circuit file */
if (optarg) {
if (!(circuit_file = fopen(optarg, "r"))) {
perror("circuit file not available");
shutdown(EXIT_BAD);
case 'c': /* Circuit file */
if (optarg) {
if (!(circuit_file = fopen(optarg, "r"))) {
perror("circuit file not available");
shutdown(EXIT_BAD);
}
istty = FALSE;
} }
istty = FALSE;
}
break;
break;
case 'i': /* Interactive mode */
iflag = TRUE;
break;
case 'i': /* Interactive mode */
iflag = TRUE;
break;
case 'n': /* Don't read initialisation file */
readinit = FALSE;
break;
case 'n': /* Don't read initialisation file */
readinit = FALSE;
break;
case 'o': /* Output file */
if (optarg) {
case 'o': /* Output file */
if (optarg) {
#ifdef PARALLEL_ARCH #ifdef PARALLEL_ARCH
sprintf (buf, "%s%03d", optarg, ARCHme);
sprintf (buf, "%s%03d", optarg, ARCHme);
#else
sprintf (buf, "%s", optarg);
#endif
/* Open the log file */
#ifdef HAS_WINDOWS
/* flogp goes to winmain's putc and writes to file buf */
if (!(flogp = fopen(buf, "w"))) {
#else #else
sprintf (buf, "%s", optarg);
/* Connect stdout to file buf and log stdout */
if (!(freopen (buf, "w", stdout))) {
#endif
perror (buf);
shutdown (EXIT_BAD);
}
#ifdef HAS_WINDOWS
com_version(NULL); /* hvogt 11.11.2001 */
#endif
fprintf(stdout, "\nBatch mode\n\n");
fprintf(stdout, "Simulation output goes to rawfile: %s\n\n", ft_rawfile);
fprintf(stdout, "Comments and warnings go to log-file: %s\n", buf);
#ifdef HAS_WINDOWS
oflag = TRUE;
#endif #endif
#ifndef HAS_WINDOWS
if (!(freopen (buf, "w", stdout))) {
perror (buf);
shutdown (EXIT_BAD);
} }
#endif /* HAS_WINDOWS */
/* *** Open the Log-File ******* */
if (!(flogp = fopen(buf, "w"))) {
perror(buf);
shutdown(EXIT_BAD);
}
/* *************************** */
com_version(NULL); /* hvogt 11.11.2001 */
fprintf(stdout, "\nBatch mode\n\n");
fprintf(stdout, "Simulation output goes to rawfile: %s\n\n", ft_rawfile);
fprintf(stdout, "Comments and warnings go to log-file: %s\n", buf);
oflag = TRUE;
}
break;
break;
case 'q': /* Command completion */
qflag = TRUE;
break;
case 'q': /* Command completion */
qflag = TRUE;
break;
case 'r': /* The raw file */
if (optarg) {
cp_vset("rawfile", VT_STRING, optarg);
}
rflag = TRUE;
break;
case 'r': /* The raw file */
if (optarg) {
cp_vset("rawfile", VT_STRING, optarg);
}
rflag = TRUE;
break;
case 's': /* Server mode */
ft_servermode = TRUE;
break;
case 's': /* Server mode */
ft_servermode = TRUE;
break;
case 't':
if (optarg) {
cp_vset("term", VT_STRING, optarg);
}
break;
case 't':
if (optarg) {
cp_vset("term", VT_STRING, optarg);
}
break;
case '?':
break;
case '?':
break;
default:
printf ("?? getopt returned character code 0%o ??\n", c);
default:
printf ("?? getopt returned character code 0%o ??\n", c);
} }
} /* --- End of command line option processing --- */ } /* --- End of command line option processing --- */
@ -1077,6 +1071,5 @@ evl:
#endif /* ~ SIMULATOR */ #endif /* ~ SIMULATOR */
shutdown(EXIT_NORMAL);
return EXIT_NORMAL;
return shutdown(EXIT_NORMAL);
} }
Write Preview
Loading…
Cancel
Save