X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsUtils.h;h=96a5f0d82f9b11077f165db43fceee06891d20a3;hb=e6218fe7eff4e34e1a3c823cd4b7aebe09d2d4fb;hp=dd036a9e933be3cbae03c576ce95b20ba77c6846;hpb=6a79e0681b336383d71a7b377ad244794dcb7c30;p=ghc-hetmet.git diff --git a/ghc/rts/RtsUtils.h b/ghc/rts/RtsUtils.h index dd036a9..96a5f0d 100644 --- a/ghc/rts/RtsUtils.h +++ b/ghc/rts/RtsUtils.h @@ -1,7 +1,6 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsUtils.h,v 1.21 2004/03/23 10:04:18 simonmar Exp $ * - * (c) The GHC Team, 1998-1999 + * (c) The GHC Team, 1998-2005 * * General utility functions used in the RTS. * @@ -10,17 +9,26 @@ #ifndef RTSUTILS_H #define RTSUTILS_H -/* (Checked) dynamic allocation: */ -extern void *stgMallocBytes(int n, char *msg) GNUC3_ATTRIBUTE(__malloc__); +/* ----------------------------------------------------------------------------- + * (Checked) dynamic allocation + * -------------------------------------------------------------------------- */ + +extern void *stgMallocBytes(int n, char *msg) + GNUC3_ATTRIBUTE(__malloc__); + +extern void* stgMallocBytesRWX(int len) + GNUC3_ATTRIBUTE(__malloc__); + extern void *stgReallocBytes(void *p, int n, char *msg); -extern void *stgCallocBytes(int n, int m, char *msg) GNUC3_ATTRIBUTE(__malloc__); -extern void stgFree(void* p); -extern void barf(char *s, ...) GNU_ATTRIBUTE(__noreturn__); -extern void belch(char *s, ...); -extern void prog_belch(char *s, ...); +extern void *stgCallocBytes(int n, int m, char *msg) + GNUC3_ATTRIBUTE(__malloc__); + +extern void stgFree(void* p); -extern void _stgAssert (char *filename, unsigned int linenum); +/* ----------------------------------------------------------------------------- + * Misc other utilities + * -------------------------------------------------------------------------- */ extern void heapOverflow(void); @@ -29,11 +37,11 @@ extern void resetNonBlockingFd(int fd); extern nat stg_strlen(char *str); -char *time_str(void); -char *ullong_format_string(ullong, char *, rtsBool); +extern char *time_str(void); +extern char *ullong_format_string(ullong, char *, rtsBool); #ifdef PAR -ullong msTime(void); +extern ullong msTime(void); #endif #ifdef DEBUG @@ -43,4 +51,4 @@ extern void heapCheckFail( void ); extern void* __hscore_get_saved_termios(int fd); extern void __hscore_set_saved_termios(int fd, void* ts); -#endif // RTSUTILS_H +#endif /* RTSUTILS_H */