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/fileObject.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/fileObject.c')
-rw-r--r-- | ghc/lib/std/cbits/fileObject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ghc/lib/std/cbits/fileObject.c b/ghc/lib/std/cbits/fileObject.c index 30bfe1715c..617fca2ed9 100644 --- a/ghc/lib/std/cbits/fileObject.c +++ b/ghc/lib/std/cbits/fileObject.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: fileObject.c,v 1.8 1999/11/26 16:25:56 simonmar Exp $ + * $Id: fileObject.c,v 1.9 2000/04/12 17:33:16 simonmar Exp $ * * hPutStr Runtime Support */ @@ -155,5 +155,6 @@ fill_up_line_buffer(IOFileObject* fo) } } fo->bufWPtr += count; +/* TODO: ipos doesn't change???? what's it for??? --SDM */ return (fo->bufWPtr - ipos); } |