diff options
| author | simonmar <unknown> | 2000-04-12 17:33:17 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2000-04-12 17:33:17 +0000 |
| commit | 313a61d546f55bb2c098ecd0ebb42e15d943201e (patch) | |
| tree | 313c27ee549972fb4d9ef886e27c1708d45af9a0 /ghc/lib/std/cbits/openFile.c | |
| parent | f016aea1357b8ce5a4f3cd866b32761cfd25f841 (diff) | |
| download | haskell-313a61d546f55bb2c098ecd0ebb42e15d943201e.tar.gz | |
[project @ 2000-04-12 17:33:16 by simonmar]
This commit fixes the trace/stderr problem, and also fixes some other
problems with the I/O library.
- handles now contain a list of free buffers, which are
guaranteed to be the same size as the primary handle buffer.
- hPutStr now doesn't evaluate any part of the input string with
the handle locked. Instead, it acquires a buffer from the handle
copies characters into it, then commits the buffer. This is
better for concurrency too, because the handle is only locked
while we're actually reading/writing, not while evaluating.
- there were an even number of off-by-one errors in the I/O system
which compensated for each other. This has been fixed.
- made the I/O subsystem a little more exception-safe. It still
isn't totally exception-safe, but I can't face doing that
without a complete rewrite of this thing in Haskell.
- add hPutBufFull and hGetBufFull. The compiler probably needs to
be updated to use these too.
Diffstat (limited to 'ghc/lib/std/cbits/openFile.c')
| -rw-r--r-- | ghc/lib/std/cbits/openFile.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ghc/lib/std/cbits/openFile.c b/ghc/lib/std/cbits/openFile.c index 3b827e5a53..8930fe568d 100644 --- a/ghc/lib/std/cbits/openFile.c +++ b/ghc/lib/std/cbits/openFile.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: openFile.c,v 1.15 1999/12/14 14:26:14 simonmar Exp $ + * $Id: openFile.c,v 1.16 2000/04/12 17:33:16 simonmar Exp $ * * openFile Runtime Support */ @@ -44,7 +44,6 @@ openStdFile(StgInt fd, StgInt rd) fo->buf = NULL; fo->bufWPtr = 0; fo->bufRPtr = 0; - fo->bufStart = 0; fo->flags = FILEOBJ_STD | ( rd ? FILEOBJ_READ : FILEOBJ_WRITE); fo->connectedTo = NULL; @@ -281,7 +280,6 @@ openFile(StgByteArray file, StgInt how, StgInt binary) fo->fd = fd; fo->buf = NULL; - fo->bufStart = 0; fo->bufWPtr = 0; fo->bufRPtr = 0; fo->flags = flags; @@ -318,7 +316,6 @@ openFd(StgInt fd, StgInt oflags, StgInt flags) return NULL; fo->fd = fd; fo->buf = NULL; - fo->bufStart = 0; fo->bufWPtr = 0; fo->bufRPtr = 0; fo->flags = flags | ( oflags & O_RDONLY ? FILEOBJ_READ |