=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/time.c,v retrieving revision 1.1 retrieving revision 1.3 diff -u -p -r1.1 -r1.3 --- OpenXM_contrib2/asir2018/builtin/time.c 2018/09/19 05:45:06 1.1 +++ OpenXM_contrib2/asir2018/builtin/time.c 2018/09/28 08:20:27 1.3 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM$ + * $OpenXM: OpenXM_contrib2/asir2018/builtin/time.c,v 1.2 2018/09/27 02:39:37 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -72,7 +72,7 @@ void Pcurrenttime(Z *rp) { int t; - t = (int)get_current_time(); STOQ(t,*rp); + t = (int)get_current_time(); STOZ(t,*rp); } void Pdcurrenttime(Real *rp) @@ -113,7 +113,7 @@ void Ptime(LIST *listp) rtime = get_rtime(); MKReal(rtime,rr); t = get_allocwords(); - STOQ(t,words); + STOZ(t,words); get_eg(&eg); MKReal(eg.exectime,re); MKReal(eg.gctime,rg); MKNODE(r,rr,0); MKNODE(w,words,r); MKNODE(a,rg,w); MKNODE(b,re,a); MKLIST(*listp,b); @@ -125,10 +125,6 @@ void printtime(struct oEGT *egt0,struct oEGT *egt1,dou e = egt1->exectime - egt0->exectime; if ( e < 0 ) e = 0; - g = egt1->gctime - egt0->gctime; - if ( g < 0 ) g = 0; - if ( g ) - fprintf(stderr,"%.4gsec + gc : %.4gsec(%.4gsec)\n",e,g,r); - else - fprintf(stderr,"%.4gsec(%.4gsec)\n",e,r); + g = 0; + fprintf(stderr,"%.4gsec(%.4gsec)\n",e,r); }