Skip to content

OpenBSD and newer base version #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BebeSparkelSparkel wants to merge 5 commits into
base: master
Choose a base branch
from
Open

OpenBSD and newer base version #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10d51f6
allow newer base version
BebeSparkelSparkel Dec 4, 2022
227a0c4
included sys/types.h
BebeSparkelSparkel Dec 4, 2022
29170b5
changes for compiling on OpenBSD
BebeSparkelSparkel Dec 5, 2022
1089eca
removed include sys/types.h
BebeSparkelSparkel Dec 5, 2022
c71b1ef
fixed alignment to a power of two
BebeSparkelSparkel Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kqueue.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Library
Hs-Source-Dirs: src
Exposed-modules: System.KQueue
System.KQueue.HighLevel
Build-depends: base >= 4.0 && < 4.15
Build-depends: base >= 4.0 && < 5
, directory >= 1.0 && < 1.4
, filepath >= 1.1 && < 1.5
, mtl >= 1.1 && < 2.3
Expand Down
26 changes: 17 additions & 9 deletions src/System/KQueue.chs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import Foreign.C ( CInt (..)
import Foreign.C ( CInt )
#endif
import Foreign.C ( CLong
, CLLong
, CTime
, CULong
)
Expand All @@ -76,7 +77,7 @@ data KEvent = KEvent
, evfilter :: Filter -- ^ The kernel filter (type of event).
, flags :: [Flag] -- ^ Actions to perform on the event.
, fflags :: [FFlag] -- ^ Filter-specific flags.
, data_ :: CLong -- ^ Filter-specific data value.
, data_ :: CLLong -- ^ Filter-specific data value.
, udata :: Ptr () -- ^ User-defined data, passed through unchanged.
} deriving (Show, Eq)

Expand All @@ -91,8 +92,9 @@ enum Filter
, EvfiltProc = EVFILT_PROC
, EvfiltSignal = EVFILT_SIGNAL
, EvfiltTimer = EVFILT_TIMER
// Not on Mac OS X
// , EvfiltUser = EVFILT_USER
#ifdef EVFILT_USER
, EvfiltUser = EVFILT_USER
#endif
};
#endc

Expand All @@ -104,8 +106,9 @@ enum Flag
{ EvAdd = EV_ADD
, EvEnable = EV_ENABLE
, EvDisable = EV_DISABLE
// Not on Mac OS X
// , EvDispatch = EV_DISPATCH
#ifdef EV_DISPATCH
, EvDispatch = EV_DISPATCH
#endif
, EvDelete = EV_DELETE
, EvReceipt = EV_RECEIPT
, EvOneshot = EV_ONESHOT
Expand All @@ -127,13 +130,18 @@ enum FFlag
, NoteLink = NOTE_LINK
, NoteRename = NOTE_RENAME
, NoteRevoke = NOTE_REVOKE
// Seems to have the same value as NoteDelete
// , NoteLowat = NOTE_LOWAT
#if NOTE_LOWA != NOTE_DELETE
, NoteLowat = NOTE_LOWAT
#endif
, NoteExit = NOTE_EXIT
, NoteFork = NOTE_FORK
, NoteExec = NOTE_EXEC
#ifdef NOTE_SIGNAL
, NoteSignal = NOTE_SIGNAL
// , NoteReap = NOTE_REAP
#endif
#ifdef NOTE_REAP
, NoteReap = NOTE_REAP
#endif
};
#endc

Expand All @@ -159,7 +167,7 @@ typedef struct kevent kevent_t;

instance Storable KEvent where
sizeOf _ = {#sizeof kevent_t #}
alignment _ = 24
alignment _ = 32
peek e = KEvent <$> ({#get kevent_t->ident #} e)
<*> fmap (toEnum . fromIntegral) ({#get kevent_t->filter #} e)
<*> fmap (bitmaskToEnum . fromIntegral) ({#get kevent_t->flags #} e)
Expand Down