/* -----------------------------------------------------------------------------
- * $Id: RtsUtils.c,v 1.30 2003/03/19 18:41:19 sof Exp $
+ * $Id: RtsUtils.c,v 1.36 2003/10/21 11:51:15 stolz Exp $
*
* (c) The GHC Team, 1998-2002
*
va_list ap;
va_start(ap,s);
/* don't fflush(stdout); WORKAROUND bug in Linux glibc */
- if (prog_argv != NULL && prog_argv[0] != NULL) {
- fprintf(stderr, "%s: internal error: ", prog_argv[0]);
+ if (prog_argv != NULL && prog_name != NULL) {
+ fprintf(stderr, "%s: internal error: ", prog_name);
} else {
fprintf(stderr, "internal error: ");
}
va_list ap;
va_start(ap,s);
/* don't fflush(stdout); WORKAROUND bug in Linux glibc */
- if (prog_argv != NULL && prog_argv[0] != NULL) {
- fprintf(stderr, "%s: ", prog_argv[0]);
+ if (prog_argv != NULL && prog_name != NULL) {
+ fprintf(stderr, "%s: ", prog_name);
}
vfprintf(stderr, s, ap);
fprintf(stderr, "\n");
}
void *
-stgMallocWords (int n, char *msg)
-{
- return(stgMallocBytes(n * sizeof(W_), msg));
-}
-
-void *
-stgReallocWords (void *p, int n, char *msg)
-{
- return(stgReallocBytes(p, n * sizeof(W_), msg));
-}
-
-void *
stgCallocBytes (int n, int m, char *msg)
{
int i;
return p;
}
+/* To simplify changing the underlying allocator used
+ * by stgMallocBytes(), provide stgFree() as well.
+ */
+void
+stgFree(void* p)
+{
+ free(p);
+}
+
void
_stgAssert (char *filename, unsigned int linenum)
{
/* clear the non-blocking flag on this file descriptor */
fd_flags = fcntl(fd, F_GETFL);
- fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK);
+ if (!(fd_flags & O_NONBLOCK)) {
+ fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK);
+ }
}
#else
-/* Don't support non-blocking FDs (yet) on mingw */
+/* Stub defns -- async / non-blocking IO is not done
+ * via O_NONBLOCK and select() under Win32.
+ */
void resetNonBlockingFd(int fd STG_UNUSED) {}
void setNonBlockingFd(int fd STG_UNUSED) {}
#endif
+#ifdef PAR
static ullong startTime = 0;
/* used in a parallel setup */
return t * LL(1000) - startTime;
# endif
}
+#endif /* PAR */
/* -----------------------------------------------------------------------------
Print large numbers, with punctuation.