[project @ 2001-05-18 16:54:04 by simonmar]

I/O library rewrite
-------------------

This commit replaces the old C/Haskell I/O implementation with a new
Haskell-only one using the new FFI & hsc2hs.

main points:

   - lots of code deleted: we're about 3000 lines of C lighter,
     but the amount of Haskell code is about the same.

   - performance is ok: some operations are faster, others are
     slower.  There's still some tuning to do, though.

   - the new library is designed to handle read/write streams
     much better: a read/write stream gets a special kind of
     handle internally called a "DuplexHandle", which actually
     contains two separate handles, one for writing and one for
     reading.  The upshot is that you can do simultaneous reading
     and writing to/from a socket or FIFO without any locking
     problems.  The effect is similar to calling socketToHandle
     twice, except that finalization works properly (creating
     two separate Handles could lead to the socket being closed
     too early when one of the Handles is GC'd).

   - hConnectTo and withHandleFor are gone (no one responded to
     my mail on GHC users, but we can always bring 'em back if
     necessary).

   - I made a half-hearted attempt at keeping the system-specific
     code in one place: see PrelPosix.hsc.

   - I've rearranged the I/O tests and added lots more.
     ghc/tests/lib/IO now contains Haskell 98-only IO tests,
     ghc/test/lib/{IOExts, Directory, Time} now contain tests for
     the relevant libraries.  I haven't quite finished in here yet,
     the IO tests work but the others don't yet.

   - I haven't done anything about Unicode yet, but now we can
     start to discuss what needs doing here.  The new library
     is using MutableByteArrays for its buffers because that
     turned out to be a *lot* easier (and quicker) than malloc'd
     buffers - I hope this won't cause trouble for unicode
     translations though.

WARNING: Windows users refrain from updating until we've had a chance
to fix any issues that arise.

Testing: the basic H98 stuff has been pretty thoroughly tested, but
the new duplex handle stuff is still a little green.

1 files changed, 5 insertions, 44 deletions

diff --git a/ghc/lib/std/cbits/system.c b/ghc/lib/std/cbits/system.c
index ed1b85a703..657866a7bb 100644
--- a/ghc/lib/std/cbits/system.c
+++ b/ghc/lib/std/cbits/system.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: system.c,v 1.11 2001/02/20 03:41:31 qrczak Exp $
+ * $Id: system.c,v 1.12 2001/05/18 16:54:06 simonmar Exp $
  *
  * system Runtime Support
  */
@@ -9,42 +9,10 @@
 /* The itimer stuff in this module is non-posix */
 #define NON_POSIX_SOURCE
 
-#include "Rts.h"
-#include "stgio.h"
+#include "HsStd.h"
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifndef mingw32_TARGET_OS
-# ifdef HAVE_SYS_WAIT_H
-#  include <sys/wait.h>
-# endif
-#else
-# include <windows.h> /* for Sleep */
-#endif
-
-#ifdef HAVE_VFORK_H
-#include <vfork.h>
-#endif
-
-#ifdef HAVE_VFORK
-#define fork vfork
-#endif
-
-StgInt
-systemCmd(StgByteArray cmd)
+HsInt
+systemCmd(HsAddr cmd)
 {
 #if defined(mingw32_TARGET_OS)
    /* There's no fork() under Windows, so we fall back on using libc's
@@ -65,8 +33,6 @@ systemCmd(StgByteArray cmd)
     switch(pid = fork()) {
     case -1:
 	if (errno != EINTR) {
-	    cvtErrno();
-	    stdErrno();
 	    return -1;
 	}
     case 0:
@@ -92,8 +58,6 @@ systemCmd(StgByteArray cmd)
 
     while (waitpid(pid, &wstat, 0) < 0) {
 	if (errno != EINTR) {
-	    cvtErrno();
-	    stdErrno();
 	    return -1;
 	}
     }
@@ -101,13 +65,10 @@ systemCmd(StgByteArray cmd)
     if (WIFEXITED(wstat))
 	return WEXITSTATUS(wstat);
     else if (WIFSIGNALED(wstat)) {
-	ghc_errtype = ERR_INTERRUPTED;
-	ghc_errstr = "system command interrupted";
+	errno = EINTR;
     }
     else {
 	/* This should never happen */
-	ghc_errtype = ERR_OTHERERROR;
-	ghc_errstr = "internal error (process neither exited nor signalled)";
     }
     return -1;
 #endif