=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/init.c,v retrieving revision 1.27 retrieving revision 1.30 diff -u -p -r1.27 -r1.30 --- OpenXM_contrib2/asir2000/engine/init.c 2007/01/25 16:19:41 1.27 +++ OpenXM_contrib2/asir2000/engine/init.c 2013/06/13 18:40:31 1.30 @@ -45,9 +45,10 @@ * 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.26 2006/02/25 06:33:31 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/init.c,v 1.29 2012/12/17 07:20:44 noro Exp $ */ #include "ca.h" +#include "parse.h" #include "version.h" #include "prime.h" @@ -190,12 +191,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; } @@ -287,7 +289,7 @@ void init_lprime() int s,i; s = sizeof(lprime_init); - lprime = (int *)GC_malloc_atomic(s); + lprime = (int *)MALLOC_ATOMIC(s); lprime_size = s/sizeof(int); for ( i = 0; i < lprime_size; i++ ) lprime[i] = lprime_init[lprime_size-i-1];