=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/init.c,v retrieving revision 1.23 retrieving revision 1.28 diff -u -p -r1.23 -r1.28 --- OpenXM_contrib2/asir2000/engine/init.c 2005/07/03 10:19:22 1.23 +++ OpenXM_contrib2/asir2000/engine/init.c 2009/02/06 08:58:28 1.28 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.22 2004/12/02 13:48:43 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.27 2007/01/25 16:19:41 saito Exp $ */ #include "ca.h" #include "version.h" @@ -85,6 +85,7 @@ int nez = 1; int current_mod = 0; int StrassenSize = 0; int outputstyle = 0; +int Itvplot = 33; static int *lprime; static int lprime_size; @@ -189,12 +190,13 @@ void nglob_init() { init_lprime(); } -extern double gctime; +extern double GC_get_gctime(); double suspend_start; double suspended_time=0; void get_eg(struct oEGT *p) { + double gctime = GC_get_gctime(); p->exectime = get_clock() - gctime - suspended_time; p->gctime = gctime; } @@ -260,21 +262,24 @@ char *get_asir_distribution() { } -void create_error(ERR *err,unsigned int serial,char *msg) +void create_error(ERR *err,unsigned int serial,char *msg,LIST trace) { int len; - USINT ui; + USINT ui,notsupp; NODE n,n1; LIST list; char *msg1; STRING errmsg; MKUSINT(ui,serial); + MKUSINT(notsupp,-1); len = strlen(msg); msg1 = (char *)MALLOC(len+1); strcpy(msg1,msg); MKSTR(errmsg,msg1); - MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n); + if ( !trace ) + MKLIST(trace,0); + n = mknode(4,ui,notsupp,errmsg,trace); MKLIST(list,n); MKERR(*err,list); }