58bae3d · streamly · git.iko.soy

src/Streamly/Internal/Data/Array/Foreign.hs+1−13

compare with master

unifiedsplit

@@ -92,7 +92,7 @@ module Streamly.Internal.Data.Array.Foreign

92 , cast

93 , asBytes

94 , unsafeCast -- castUnsafe?

95− , unsafeAsPtr -- asPtrUnsafe?

95+ , asPtrUnsafe

96 , unsafeAsCString -- asCStringUnsafe?

97 , A.unsafeFreeze -- asImmutableUnsafe?

98 , A.unsafeThaw -- asMutableUnsafe?

@@ -129,8 +129,6 @@ import Foreign.Ptr (plusPtr, castPtr)

129import Foreign.Storable (Storable(..))

130import Prelude hiding (length, null, last, map, (!!), read, concat)

131

132−import GHC.Ptr (Ptr(..))

133−

134import Streamly.Internal.Data.Array.Foreign.Mut.Type (ReadUState(..), touch)

132import Streamly.Internal.Data.Array.Foreign.Mut.Type (ReadUState(..), touch)

135import Streamly.Internal.Data.Array.Foreign.Type

133import Streamly.Internal.Data.Array.Foreign.Type

136 (Array(..), length, asPtrUnsafe)

134 (Array(..), length, asPtrUnsafe)

@@ -555,16 +553,6 @@ cast arr =

555 then Nothing

553 then Nothing

556 else Just $ unsafeCast arr

554 else Just $ unsafeCast arr

557

555

558−-- | Use an @Array a@ as @Ptr b@.

559−--

560−-- /Unsafe/

561−--

562−-- /Pre-release/

563−--

564−unsafeAsPtr :: Array a -> (Ptr b -> IO c) -> IO c

565−unsafeAsPtr arr act = do

566− asPtrUnsafe arr $ \ptr -> act (castPtr ptr)

567−

568-- | Convert an array of any type into a null terminated CString Ptr.

556-- | Convert an array of any type into a null terminated CString Ptr.

569--

557--

570-- /Unsafe/

558-- /Unsafe/

src/Streamly/Internal/FileSystem/Event/Darwin.hs+1−1

@@ -458,7 +458,7 @@ openWatch Config{..} paths = do

458

459 withPathName :: Array Word8 -> (PathName -> IO a) -> IO a

460 withPathName arr act = do

461− A.unsafeAsPtr arr $ \ptr ->

461+ A.asPtrUnsafe arr $ \ptr ->

462 let pname = PathName (castPtr ptr) (fromIntegral (A.length arr))

463 in act pname

464

src/Streamly/Internal/FileSystem/Event/Linux.hs+1−1

@@ -836,7 +836,7 @@ readOneEvent :: Config -> Watch -> Parser IO Word8 Event

836readOneEvent cfg wt@(Watch _ wdMap) = do

837 let headerLen = sizeOf (undefined :: CInt) + 12

838 arr <- PR.takeEQ headerLen (A.writeN headerLen)

839− (ewd, eflags, cookie, pathLen) <- PR.fromEffect $ A.unsafeAsPtr arr readHeader

839+ (ewd, eflags, cookie, pathLen) <- PR.fromEffect $ A.asPtrUnsafe arr readHeader

840 -- XXX need the "initial" in parsers to return a step type so that "take 0"

841 -- can return without an input. otherwise if pathLen is 0 we will keep

842 -- waiting to read one more char before we return this event.