Porting GHC to Barrelfish: unix.2.patch

cbits/execvpe.c

@@ -9 +9 @@
 #include "Rts.h"
 #endif
 
-#if !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)) /* to the end */
+#if !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) || defined(barrelfish_HOST_OS)) /* to the end */
 
 /* Evidently non-Posix. */
 /* #include "PosixSource.h" */

cbits/HsUnix.c

@@ -8 +8 @@
 
 #include "HsUnix.h"
 
+#ifdef barrelfish_HOST_OS
+int __hsunix_wifexited   (int stat) { 
+    printf("NYI __hsunix_wifexited\n");
+    return -1; 
+}
+int __hsunix_wexitstatus (int stat) { 
+    printf("NYI __hsunix_wexitstatus\n");
+    return -1; 
+}
+int __hsunix_wifsignaled (int stat) { 
+    printf("NYI __hsunix_wifsignaled\n");
+    return -1; 
+}
+int __hsunix_wtermsig    (int stat) { 
+    printf("NYI __hsunix_wtermsig\n");
+    return -1; 
+}
+int __hsunix_wifstopped  (int stat) { 
+    printf("NYI __hsunix_wifstopped\n");
+    return -1; 
+}
+int __hsunix_wstopsig    (int stat) { 
+    printf("NYI __hsunix_wstopsig\n");
+    return -1; 
+}
+#else
 int __hsunix_wifexited   (int stat) { return WIFEXITED(stat); }
 int __hsunix_wexitstatus (int stat) { return WEXITSTATUS(stat); }
 int __hsunix_wifsignaled (int stat) { return WIFSIGNALED(stat); }
 int __hsunix_wtermsig    (int stat) { return WTERMSIG(stat); }
 int __hsunix_wifstopped  (int stat) { return WIFSTOPPED(stat); }
 int __hsunix_wstopsig    (int stat) { return WSTOPSIG(stat); }
+#endif
 
 #ifdef HAVE_RTLDNEXT
 void *__hsunix_rtldNext (void) {return RTLD_NEXT;} 
@@ -30 +57 @@
 int __hsunix_SIGWINCH() { return SIGWINCH; }
 #endif
 
+#ifndef barrelfish_HOST_OS
 // lstat is a macro on some platforms, so we need a wrapper:
 int __hsunix_lstat(const char *path, struct stat *buf) 
 { 
@@ -41 +69 @@
 { 
     return mknod(pathname,mode,dev);
 }
+#endif
 
 #ifdef HAVE_GETPWENT
 // getpwent is a macro on some platforms, so we need a wrapper:
@@ -88 +117 @@
     return time(tloc);
 }
 
+#ifndef barrelfish_HOST_OS
 // times is a macro on some platforms, so we need a wrapper:
 clock_t __hsunix_times(struct tms *tp)
 {
     return times(tp);
 }
+#endif
 
 #ifdef HAVE_PTSNAME
 // I cannot figure out how to make the definitions of the following
@@ -128 +159 @@
 #endif
 }
 
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && !defined(barrrelfish_HOST_OS)
 int __hscore_mkstemp(char *filetemplate) {
     return (mkstemp(filetemplate));
 }
 #endif
 
-#if !defined(__MINGW32__) && !defined(irix_HOST_OS)
+#if !defined(__MINGW32__) && !defined(irix_HOST_OS) && !defined(barrelfish_HOST_OS)
 int __hscore_getrlimit(int resource, struct rlimit *rlim) {
     return (getrlimit(resource, rlim));
 }

config.sub

@@ -4 +4 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2010-08-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1344 +1344 @@
         -zvmoe)
                 os=-zvmoe
                 ;;
+        -barrelfish)
+                os=-barrelfish
+                ;;
         -none)
                 ;;
         *)

include/execvpe.h

@@ -14 +14 @@
 
 #include <errno.h>
 #include <sys/types.h>
-#if HAVE_SYS_WAIT_H
+#if HAVE_SYS_WAIT_H && !defined(BARRELFISH)
 #include <sys/wait.h>
 #endif
 
-#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32)
+#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) && !defined(BARRELFISH)
 extern int execvpe(char *name, char *const argv[], char **envp);
 extern void pPrPr_disableITimers (void);
 #endif

include/HsUnix.h

@@ -121 +121 @@
 int __hsunix_SIGWINCH();
 #endif
 
+#ifndef barrelfish_HOST_OS
 // lstat is a macro on some platforms, so we need a wrapper:
 int __hsunix_lstat(const char *path, struct stat *buf);
 
 // lstat is a macro on some platforms, so we need a wrapper:
 int __hsunix_mknod(const char *pathname, mode_t mode, dev_t dev);
+#endif 
 
 #ifdef HAVE_GETPWENT
 // getpwent is a macro on some platforms, so we need a wrapper:
@@ -155 +157 @@
 // time is a macro on some platforms, so we need a wrapper:
 time_t __hsunix_time(time_t *);
 
+
+#ifndef barrelfish_HOST_OS
 // times is a macro on some platforms, so we need a wrapper:
 clock_t __hsunix_times(struct tms *);
+#endif 
 
 #ifdef HAVE_PTSNAME
 // I cannot figure out how to make the definitions of the following
@@ -171 +176 @@
 // push a SVR4 STREAMS module; do nothing if STREAMS not available
 int __hsunix_push_module(int fd, const char *module);
 
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && !defined(barrelfish_HOST_OS)
 int __hscore_mkstemp(char *filetemplate);
 #endif
 
-#if !defined(__MINGW32__) && !defined(irix_HOST_OS)
+#if !defined(__MINGW32__) && !defined(irix_HOST_OS) && !defined(barrelfish_HOST_OS)
 int __hscore_getrlimit(int resource, struct rlimit *rlim);
 int __hscore_setrlimit(int resource, struct rlimit *rlim);
 #endif

System/Posix/Files.hsc

@@ -321 +321 @@
   unsafePerformIO $ withForeignPtr stat $ (#peek struct stat, st_uid)
 fileGroup (FileStatus stat) =
   unsafePerformIO $ withForeignPtr stat $ (#peek struct stat, st_gid)
+#ifdef barrelfish_HOST_OS
+specialDeviceID (FileStatus stat) = 0
+#else
 specialDeviceID (FileStatus stat) =
   unsafePerformIO $ withForeignPtr stat $ (#peek struct stat, st_rdev)
+#endif
 fileSize (FileStatus stat) =
   unsafePerformIO $ withForeignPtr stat $ (#peek struct stat, st_size)
 accessTime (FileStatus stat) =
@@ -408 +412 @@
 --
 -- Note: calls @mkfifo@.
 createNamedPipe :: FilePath -> FileMode -> IO ()
+#ifdef barrelfish_HOST_OS
+createNamedPipe name mode = do
+    return ()
+#else
 createNamedPipe name mode = do
   withCString name $ \s -> 
     throwErrnoPathIfMinus1_ "createNamedPipe" name (c_mkfifo s mode)
+#endif
 
 -- | @createDevice path mode dev@ creates either a regular or a special file
 -- depending on the value of @mode@ (and @dev@).  @mode@ will normally be either
@@ -436 +445 @@
 --
 -- Note: calls @link@.
 createLink :: FilePath -> FilePath -> IO ()
+#ifdef barrelfish_HOST_OS
+createLink name1 name2 = do
+  return ()
+#else
 createLink name1 name2 =
   withCString name1 $ \s1 ->
   withCString name2 $ \s2 ->
   throwErrnoPathIfMinus1_ "createLink" name1 (c_link s1 s2)
+#endif
 
 -- | @removeLink path@ removes the link named @path@.
 --
@@ -551 +565 @@
 
 -- -----------------------------------------------------------------------------
 -- utime()
+#ifdef barrelfish_HOST_OS
+setFileTimes :: FilePath -> EpochTime -> EpochTime -> IO ()
+setFileTimes name atime mtime = do
+  return ()
 
+touchFile :: FilePath -> IO ()
+touchFile name = do
+  return ()
+
+#else
 -- | @setFileTimes path atime mtime@ sets the access and modification times
 -- associated with file @path@ to @atime@ and @mtime@, respectively.
 --
@@ -573 +596 @@
   withCString name $ \s ->
    throwErrnoPathIfMinus1_ "touchFile" name (c_utime s nullPtr)
 
+#endif
+
 -- -----------------------------------------------------------------------------
 -- Setting file sizes
 
@@ -621 +646 @@
   | SyncIOAvailable               {- _PC_SYNC_IO          -}
 
 pathVarConst :: PathVar -> CInt
+#ifdef barrelfish_HOST_OS
+pathVarConst v = 0
+#else
 pathVarConst v = case v of
         LinkLimit                       -> (#const _PC_LINK_MAX)
         InputLineLimit                  -> (#const _PC_MAX_CANON)
@@ -661 +689 @@
 #else
         SymbolicLinkLimit       -> error "_PC_SYMLINK_MAX not available"
 #endif
+#endif
 
 
 -- | @getPathVar var path@ obtains the dynamic value of the requested

System/Posix/IO.hsc

@@ -41 +41 @@
     fdSeek,
 
     -- ** File options
+#ifdef HAVE_FCNTL_H
     FdOption(..),
     queryFdOption,
     setFdOption,
+#endif
 
     -- ** Locking
+#ifndef barrelfish_HOST_OS
     FileLock,
     LockRequest(..),
     getLock,  setLock,
     waitToSetLock,
+#endif
 
     -- ** Pipes
     createPipe,
@@ -271 +275 @@
   -- state as a result. 
   let fd = haFD h_
   flushWriteBufferOnly h_
+#ifndef barrelfish_HOST_OS
   unlockFile (fromIntegral fd)
+#endif
     -- setting the Handle's fd to (-1) as well as its 'type'
     -- to closed, is enough to disable the finalizer that
     -- eventually is run on the Handle.
@@ -294 +300 @@
 -- -----------------------------------------------------------------------------
 -- Fd options
 
+#ifdef HAVE_FCNTL_H
+
 data FdOption = AppendOnWrite     -- ^O_APPEND
               | CloseOnExec       -- ^FD_CLOEXEC
               | NonBlockingRead   -- ^O_NONBLOCK
@@ -335 +343 @@
 foreign import ccall unsafe "HsBase.h fcntl_write"
    c_fcntl_write :: CInt -> CInt -> CLong -> IO CInt
 
+#endif 
+
 -- -----------------------------------------------------------------------------
 -- Seeking 
 
@@ -351 +361 @@
 -- -----------------------------------------------------------------------------
 -- Locking
 
+#ifndef barrelfish_HOST_OS
+
 data LockRequest = ReadLock
                  | WriteLock
                  | Unlock
@@ -421 +433 @@
     throwErrnoIfMinus1_ "waitToSetLock" 
         (c_fcntl_lock fd (#const F_SETLKW) p_flock)
 
+#endif
+
 -- -----------------------------------------------------------------------------
 -- fd{Read,Write}
 

System/Posix/Process.hsc

@@ -44 +44 @@
     getProcessTimes,
 
     -- ** Scheduling priority
+#ifndef barrelfish_HOST_OS
     nice,
     getProcessPriority,
     getProcessGroupPriority,
@@ -51 +52 @@
     setProcessPriority,
     setProcessGroupPriority,
     setUserPriority,
+#endif
 
     -- ** Process status
     ProcessStatus(..),
@@ -157 +159 @@
 -- | 'getProcessTimes' calls @times@ to obtain time-accounting
 --   information for the current process and its children.
 getProcessTimes :: IO ProcessTimes
+#ifdef barrelfish_HOST_OS
+getProcessTimes = do
+     return (ProcessTimes{ elapsedTime     = 0,
+                           userTime        = 0,
+                           systemTime      = 0,
+                           childUserTime   = 0,
+                           childSystemTime = 0
+                          })
+#else
 getProcessTimes = do
    allocaBytes (#const sizeof(struct tms)) $ \p_tms -> do
      elapsed <- throwErrnoIfMinus1 "getProcessTimes" (c_times p_tms)
@@ -170 +181 @@
                            childUserTime   = cut,
                            childSystemTime = cst
                           })
+#endif
 
 type CTms = ()
 
@@ -179 +191 @@
 -- -----------------------------------------------------------------------------
 -- Process scheduling priority
 
+#ifndef barrelfish_HOST_OS
+
 nice :: Int -> IO ()
 nice prio = do
   resetErrno
@@ -231 +245 @@
 foreign import ccall unsafe "setpriority"
   c_setpriority :: CInt -> CInt -> CInt -> IO CInt
 
+#endif
+
 -- -----------------------------------------------------------------------------
 -- Forking, execution
 
@@ -361 +377 @@
 
 waitOptions :: Bool -> Bool -> CInt
 --             block   stopped
+#ifdef barrelfish_HOST_OS
+waitOptions _ _ = 0
+#else
 waitOptions False False = (#const WNOHANG)
 waitOptions False True  = (#const (WNOHANG|WUNTRACED))
 waitOptions True  False = 0
 waitOptions True  True  = (#const WUNTRACED)
+#endif 
 
 -- Turn a (ptr to a) wait status into a ProcessStatus
 

System/Posix/Resource.hsc

@@ -19 +19 @@
 --
 -----------------------------------------------------------------------------
 
+#ifdef barrelfish_HOST_OS
+module System.Posix.Resource () where
+#else 
+
 module System.Posix.Resource (
     -- * Resource Limits
     ResourceLimit(..), ResourceLimits(..), Resource(..),
@@ -152 +156 @@
 showRLim ResourceLimitUnknown  = "unknown"
 showRLim (ResourceLimit other)  = show other
 -}
+
+#endif
+ No newline at end of file

System/Posix/Semaphore.hsc

@@ -14 +14 @@
 --
 -----------------------------------------------------------------------------
 
+#ifdef barrelfish_HOST_OS
+module System.Posix.Semaphore () where
+#else
+
 module System.Posix.Semaphore
     (OpenSemFlags(..), Semaphore(), 
      semOpen, semUnlink, semWait, semTryWait, semThreadWait, 
@@ -126 +130 @@
         sem_post :: Ptr () -> IO CInt
 foreign import ccall safe "sem_getvalue"
         sem_getvalue :: Ptr () -> Ptr CInt -> IO Int
+#endif
+ No newline at end of file

System/Posix/SharedMem.hsc

@@ -15 +15 @@
 --
 -----------------------------------------------------------------------------
 
+#ifdef barrelfish_HOST_OS
+module System.Posix.SharedMem () where
+#else
+
 module System.Posix.SharedMem
     (ShmOpenFlags(..), shmOpen, shmUnlink)
     where
@@ -84 +88 @@
 foreign import ccall unsafe "shm_unlink"
         shm_unlink :: CString -> IO CInt
 #endif
+
+#endif
+ No newline at end of file

System/Posix/Signals.hsc

@@ -71 +71 @@
 
   -- * Signal sets
   SignalSet,
+#ifndef barrelfish_HOST_OS
   emptySignalSet, fullSignalSet, 
   addSignal, deleteSignal, inSignalSet,
 
@@ -82 +83 @@
 
   -- * Waiting for signals
   getPendingSignals,
-#ifndef cygwin32_HOST_OS
+#endif
+#if !defined(cygwin32_HOST_OS) && !defined(barrelfish_HOST_OS)
   awaitSignal,
 #endif
 
@@ -348 +350 @@
                -> Maybe SignalSet       -- ^ other signals to block
                -> IO Handler            -- ^ old handler
 
-#ifdef __PARALLEL_HASKELL__
+#if defined (__PARALLEL_HASKELL__) || defined(barrelfish_HOST_OS)
 installHandler = 
   error "installHandler: not available for Parallel Haskell"
 #else
@@ -482 +484 @@
 
 newtype SignalSet = SignalSet (ForeignPtr CSigset)
 
+#ifndef barrelfish_HOST_OS
 emptySignalSet :: SignalSet
 emptySignalSet = unsafePerformIO $ do
   fp <- mallocForeignPtrBytes sizeof_sigset_t
@@ -558 +561 @@
   withForeignPtr fp $ \p -> 
    throwErrnoIfMinus1_ "getPendingSignals" (c_sigpending p)
   return (SignalSet fp)
+#endif
 
-#ifndef cygwin32_HOST_OS
+#if !defined(cygwin32_HOST_OS) && !defined(barrelfish_HOST_OS)
 
 -- | @awaitSignal iset@ suspends execution until an interrupt is received.
 -- If @iset@ is @Just s@, @awaitSignal@ calls @sigsuspend@, installing

System/Posix/Terminal.hsc

@@ -14 +14 @@
 --
 -----------------------------------------------------------------------------
 
+#ifdef barrelfish_HOST_OS
+module System.Posix.Terminal () where
+#else 
+
 module System.Posix.Terminal (
   -- * Terminal support
 
@@ -66 +70 @@
   -- ** Pseudoterminal operations
   openPseudoTerminal,
   getSlaveTerminalName
+
   ) where
 
 #include "HsUnix.h"
@@ -804 +809 @@
     _ <- action p1
     return ()
   return $ makeTerminalAttributes fp1
+
+#endif
+ No newline at end of file

System/Posix/Unistd.hsc

@@ -68 +68 @@
            }
 
 getSystemID :: IO SystemID
+#ifdef barrelfish_HOST_OS
+getSystemID = do
+    return (SystemID { systemName = "",
+                       nodeName   = "",
+                       release    = "",
+                       version    = "",
+                       machine    = ""
+                     })
+#else
 getSystemID = do
   allocaBytes (#const sizeof(struct utsname)) $ \p_sid -> do
     throwErrnoIfMinus1_ "getSystemID" (c_uname p_sid)
@@ -82 +91 @@
                        version    = ver,
                        machine    = mach
                      })
+#endif
 
 foreign import ccall unsafe "uname"
    c_uname :: Ptr CUtsname -> IO CInt
@@ -176 +186 @@
         -- ToDo: lots more
 
 getSysVar :: SysVar -> IO Integer
+#ifdef barrelfish_HOST_OS
+getSysVar v = return (-1)
+#else
 getSysVar v =
     case v of
       ArgumentLimit -> sysconf (#const _SC_ARG_MAX)
@@ -194 +207 @@
 
 foreign import ccall unsafe "sysconf"
   c_sysconf :: CInt -> IO CLong
+#endif
+ No newline at end of file

System/Posix/User.hsc

@@ -13 +13 @@
 --
 -----------------------------------------------------------------------------
 
+#ifdef barrelfish_HOST_OS
+module System.Posix.User () where
+#else
+
 module System.Posix.User (
     -- * User environment
     -- ** Querying the user environment
@@ -472 +476 @@
     if rc == nullPtr && errno /= eOK
        then throwErrno loc
        else return rc
+
+#endif
+ No newline at end of file