projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-15 20:28:02 by panne]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsUtils.c
diff --git
a/ghc/rts/RtsUtils.c
b/ghc/rts/RtsUtils.c
index
64b7758
..
6ff4f72
100644
(file)
--- a/
ghc/rts/RtsUtils.c
+++ b/
ghc/rts/RtsUtils.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $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
*
*
* (c) The GHC Team, 1998-2002
*
@@
-42,8
+42,8
@@
barf(char *s, ...)
va_list ap;
va_start(ap,s);
/* don't fflush(stdout); WORKAROUND bug in Linux glibc */
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: ");
}
} else {
fprintf(stderr, "internal error: ");
}
@@
-61,8
+61,8
@@
prog_belch(char *s, ...)
va_list ap;
va_start(ap,s);
/* don't fflush(stdout); WORKAROUND bug in Linux glibc */
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");
}
vfprintf(stderr, s, ap);
fprintf(stderr, "\n");
@@
-109,18
+109,6
@@
stgReallocBytes (void *p, int n, char *msg)
}
void *
}
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;
stgCallocBytes (int n, int m, char *msg)
{
int i;
@@
-130,6
+118,15
@@
stgCallocBytes (int n, int m, char *msg)
return p;
}
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)
{
void
_stgAssert (char *filename, unsigned int linenum)
{
@@
-252,14
+249,19
@@
setNonBlockingFd(int fd)
/* clear the non-blocking flag on this file descriptor */
fd_flags = fcntl(fd, F_GETFL);
/* 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
}
#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
void resetNonBlockingFd(int fd STG_UNUSED) {}
void setNonBlockingFd(int fd STG_UNUSED) {}
#endif
+#ifdef PAR
static ullong startTime = 0;
/* used in a parallel setup */
static ullong startTime = 0;
/* used in a parallel setup */
@@
-294,6
+296,7
@@
msTime(void)
return t * LL(1000) - startTime;
# endif
}
return t * LL(1000) - startTime;
# endif
}
+#endif /* PAR */
/* -----------------------------------------------------------------------------
Print large numbers, with punctuation.
/* -----------------------------------------------------------------------------
Print large numbers, with punctuation.