From: sewardj Date: Tue, 12 Jan 1999 10:59:26 +0000 (+0000) Subject: [project @ 1999-01-12 10:59:26 by sewardj] X-Git-Tag: Approx_2487_patches~131 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4ee3389d5e475a0cd7578f80818facbc55210660;p=ghc-hetmet.git [project @ 1999-01-12 10:59:26 by sewardj] Disabled nonblocking IO (the +128 for file flags) until missing prims are implemented. --- diff --git a/ghc/lib/std/PrelHandle.lhs b/ghc/lib/std/PrelHandle.lhs index 9fbf883..3664332 100644 --- a/ghc/lib/std/PrelHandle.lhs +++ b/ghc/lib/std/PrelHandle.lhs @@ -177,7 +177,7 @@ stdout = unsafePerformIO (do #ifndef __CONCURRENT_HASKELL__ fo <- CCALL(openStdFile) 1 1{-flush on close-} 0{-writeable-} -- ConcHask: SAFE, won't block #else - fo <- CCALL(openStdFile) 1 (1{-flush on close-} + 128{-don't block on I/O-}) + fo <- CCALL(openStdFile) 1 (1{-flush on close-} {-+ 128 don't block on I/O-}) 0{-writeable-} -- ConcHask: SAFE, won't block #endif @@ -208,7 +208,7 @@ stdin = unsafePerformIO (do #ifndef __CONCURRENT_HASKELL__ fo <- CCALL(openStdFile) 0 0{-don't flush on close -} 1{-readable-} -- ConcHask: SAFE, won't block #else - fo <- CCALL(openStdFile) 0 (0{-flush on close-} + 128{-don't block on I/O-}) + fo <- CCALL(openStdFile) 0 (0{-flush on close-} {- + 128 don't block on I/O-}) 1{-readable-} -- ConcHask: SAFE, won't block #endif @@ -237,7 +237,7 @@ stderr = unsafePerformIO (do #ifndef __CONCURRENT_HASKELL__ fo <- CCALL(openStdFile) 2 1{-flush on close-} 0{-writeable-} -- ConcHask: SAFE, won't block #else - fo <- CCALL(openStdFile) 2 (1{-flush on close-} + 128{-don't block on I/O-}) + fo <- CCALL(openStdFile) 2 (1{-flush on close-} {- + 128 don't block on I/O-}) 0{-writeable-} -- ConcHask: SAFE, won't block #endif @@ -292,7 +292,7 @@ openFileEx f m = do #ifndef __CONCURRENT_HASKELL__ file_flags = file_flags' #else - file_flags = file_flags' + 128{-Don't block on I/O-} + file_flags = file_flags' {-+ 128 Don't block on I/O-} #endif (file_flags', file_mode) =