X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.c;h=69a1450aea0d3ab1b30863beb22dc2815df69329;hb=452deb2604c18ae9c1531a4eb33796e2d4aa6b67;hp=24ef889808444484b7a6313c647b59e9e3aa56bf;hpb=b933b46923f9e67fbb20a62b9ccde5a9a3e8fb7e;p=ghc-hetmet.git diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c index 24ef889..69a1450 100644 --- a/ghc/rts/RtsUtils.c +++ b/ghc/rts/RtsUtils.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsUtils.c,v 1.11 2000/01/12 15:15:17 simonmar Exp $ + * $Id: RtsUtils.c,v 1.28 2002/10/05 22:31:04 panne Exp $ * * (c) The GHC Team, 1998-1999 * @@ -7,7 +7,11 @@ * * ---------------------------------------------------------------------------*/ +/* gettimeofday isn't POSIX */ +/* #include "PosixSource.h" */ + #include "Rts.h" +#include "RtsTypes.h" #include "RtsAPI.h" #include "RtsFlags.h" #include "Hooks.h" @@ -23,6 +27,12 @@ #include #endif +#ifdef HAVE_GETTIMEOFDAY +#include +#endif + +#include +#include #include /* variable-argument error function. */ @@ -40,7 +50,8 @@ void barf(char *s, ...) vfprintf(stderr, s, ap); fprintf(stderr, "\n"); fflush(stderr); - stg_exit(EXIT_FAILURE); + stg_exit(EXIT_INTERNAL_ERROR); + va_end(ap); } void prog_belch(char *s, ...) @@ -53,6 +64,7 @@ void prog_belch(char *s, ...) } vfprintf(stderr, s, ap); fprintf(stderr, "\n"); + va_end(ap); } void belch(char *s, ...) @@ -62,6 +74,7 @@ void belch(char *s, ...) /* don't fflush(stdout); WORKAROUND bug in Linux glibc */ vfprintf(stderr, s, ap); fprintf(stderr, "\n"); + va_end(ap); } /* result-checking malloc wrappers. */ @@ -73,8 +86,8 @@ stgMallocBytes (int n, char *msg) if ((space = (char *) malloc((size_t) n)) == NULL) { /* don't fflush(stdout); WORKAROUND bug in Linux glibc */ - MallocFailHook((W_) n, msg); /*msg*/ - stg_exit(EXIT_FAILURE); + MallocFailHook((W_) n, msg); /*msg*/ + stg_exit(EXIT_INTERNAL_ERROR); } return space; } @@ -86,8 +99,8 @@ stgReallocBytes (void *p, int n, char *msg) if ((space = (char *) realloc(p, (size_t) n)) == NULL) { /* don't fflush(stdout); WORKAROUND bug in Linux glibc */ - MallocFailHook((W_) n, msg); /*msg*/ - exit(EXIT_FAILURE); + MallocFailHook((W_) n, msg); /*msg*/ + stg_exit(EXIT_INTERNAL_ERROR); } return space; } @@ -104,11 +117,22 @@ stgReallocWords (void *p, int n, char *msg) return(stgReallocBytes(p, n * sizeof(W_), msg)); } +void * +stgCallocBytes (int n, int m, char *msg) +{ + int i; + int sz = n * m; + char* p = stgMallocBytes(sz, msg); + for (i = 0; i < sz; i++) p[i] = 0; + return p; +} + void -_stgAssert (char *filename, nat linenum) +_stgAssert (char *filename, unsigned int linenum) { - /* don't fflush(stdout); WORKAROUND bug in Linux glibc */ + fflush(stdout); fprintf(stderr, "ASSERTION FAILED: file %s, line %u\n", filename, linenum); + fflush(stderr); abort(); } @@ -139,7 +163,7 @@ heapOverflow(void) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif - stg_exit(EXIT_FAILURE); + stg_exit(EXIT_HEAPOVERFLOW); } /* ----------------------------------------------------------------------------- @@ -164,7 +188,7 @@ nat stg_strlen(char *s) ToDo: put this somewhere sensible. ------------------------------------------------------------------------- */ -I_ __GenSymCounter = 0; +static I_ __GenSymCounter = 0; I_ genSymZh(void) @@ -182,7 +206,7 @@ resetGenSymZh(void) /* it's your funeral */ Get the current time as a string. Used in profiling reports. -------------------------------------------------------------------------- */ -#if defined(PROFILING) || defined(DEBUG) +#if defined(PROFILING) || defined(DEBUG) || defined(PAR) || defined(GRAN) char * time_str(void) { @@ -205,18 +229,67 @@ time_str(void) * clean up for us. * -------------------------------------------------------------------------- */ +#if !defined(mingw32_TARGET_OS) void resetNonBlockingFd(int fd) { long fd_flags; -#if !defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__) /* clear the non-blocking flag on this file descriptor */ fd_flags = fcntl(fd, F_GETFL); if (fd_flags & O_NONBLOCK) { fcntl(fd, F_SETFL, fd_flags & ~O_NONBLOCK); } +} + +void +setNonBlockingFd(int fd) +{ + long fd_flags; + + /* clear the non-blocking flag on this file descriptor */ + fd_flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK); +} +#else +/* Don't support non-blocking FDs (yet) on mingw */ +void resetNonBlockingFd(int fd STG_UNUSED) {} +void setNonBlockingFd(int fd STG_UNUSED) {} #endif + +static ullong startTime = 0; + +/* used in a parallel setup */ +ullong +msTime(void) +{ +# if defined(HAVE_GETCLOCK) && !defined(alpha_TARGET_ARCH) && !defined(hppa1_1_TARGET_ARCH) + struct timespec tv; + + if (getclock(TIMEOFDAY, &tv) != 0) { + fflush(stdout); + fprintf(stderr, "Clock failed\n"); + stg_exit(EXIT_FAILURE); + } + return tv.tv_sec * LL(1000) + tv.tv_nsec / LL(1000000) - startTime; +# elif HAVE_GETTIMEOFDAY && !defined(alpha_TARGET_ARCH) + struct timeval tv; + + if (gettimeofday(&tv, NULL) != 0) { + fflush(stdout); + fprintf(stderr, "Clock failed\n"); + stg_exit(EXIT_FAILURE); + } + return tv.tv_sec * LL(1000) + tv.tv_usec / LL(1000) - startTime; +# else + time_t t; + if ((t = time(NULL)) == (time_t) -1) { + fflush(stdout); + fprintf(stderr, "Clock failed\n"); + stg_exit(EXIT_FAILURE); + } + return t * LL(1000) - startTime; +# endif } /* ----------------------------------------------------------------------------- @@ -227,21 +300,21 @@ char * ullong_format_string(ullong x, char *s, rtsBool with_commas) { if (x < (ullong)1000) - sprintf(s, "%d", (nat)x); + sprintf(s, "%lu", (lnat)x); else if (x < (ullong)1000000) - sprintf(s, (with_commas) ? "%ld,%3.3ld" : "%ld%3.3ld", - (nat)((x)/(ullong)1000), - (nat)((x)%(ullong)1000)); + sprintf(s, (with_commas) ? "%lu,%3.3lu" : "%lu%3.3lu", + (lnat)((x)/(ullong)1000), + (lnat)((x)%(ullong)1000)); else if (x < (ullong)1000000000) - sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld" : "%ld%3.3ld%3.3ld", - (nat)((x)/(ullong)1000000), - (nat)((x)/(ullong)1000%(ullong)1000), - (nat)((x)%(ullong)1000)); + sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu" : "%lu%3.3lu%3.3lu", + (lnat)((x)/(ullong)1000000), + (lnat)((x)/(ullong)1000%(ullong)1000), + (lnat)((x)%(ullong)1000)); else - sprintf(s, (with_commas) ? "%ld,%3.3ld,%3.3ld,%3.3ld" : "%ld%3.3ld%3.3ld%3.3ld", - (nat)((x)/(ullong)1000000000), - (nat)((x)/(ullong)1000000%(ullong)1000), - (nat)((x)/(ullong)1000%(ullong)1000), - (nat)((x)%(ullong)1000)); + sprintf(s, (with_commas) ? "%lu,%3.3lu,%3.3lu,%3.3lu" : "%lu%3.3lu%3.3lu%3.3lu", + (lnat)((x)/(ullong)1000000000), + (lnat)((x)/(ullong)1000000%(ullong)1000), + (lnat)((x)/(ullong)1000%(ullong)1000), + (lnat)((x)%(ullong)1000)); return s; }