darwin: Fix build

cbits/fork-exec-ptrace.c

@@ -1,10 +1,26 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ptrace.h>
+#include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 
+// On Linux the request is `PTRACE_TRACEME`,
+// on other platforms it is `PT_TRACE_ME`.
+// (Although modern implementations of libc define both.)
+#ifndef PT_TRACE_ME
+  #define PT_TRACE_ME PTRACE_TRACEME
+#endif
+
+// On Linux the `data` parameter has type `void *`,
+// on other platforms it is an `int`.
+#if __linux__
+  #define PTRACE_EMPTY_DATA NULL
+#else
+  #define PTRACE_EMPTY_DATA 0
+#endif
+
 /* Like the fork() and it uses, on failure this function
    returns -1 and sets errno.
    On success it returns the PID of the child process.
@@ -34,7 +50,7 @@ pid_t fork_exec_with_ptrace(int argc, char **argv)
     args[argc] = NULL;
 
     // For PTRACE_TRACEME, all other arguments are ignored.
-    long ptrace_retval = ptrace(PTRACE_TRACEME, 0, NULL, NULL);
+    long ptrace_retval = ptrace(PT_TRACE_ME, 0, NULL, PTRACE_EMPTY_DATA);
     if (ptrace_retval != 0)
     {
       perror("ptrace(PTRACE_TRACEME)");

hatrace.cabal

@@ -29,6 +29,7 @@ library
   c-sources:           cbits/fork-exec-ptrace.c
   exposed-modules:     System.Hatrace
                        System.Hatrace.Main
+                       System.Hatrace.SignalMap
                        System.Hatrace.SyscallTables
                        System.Hatrace.SyscallTables.Generated
                        System.Hatrace.SyscallTables.Util

src/System/Hatrace.hs

@@ -113,12 +113,12 @@ import           System.Linux.Ptrace.X86Regs (X86Regs(..))
 import           System.Posix.Files (readSymbolicLink)
 import           System.Posix.Internals (withFilePath)
 import           System.Posix.Signals (Signal, sigTRAP, sigSTOP, sigTSTP, sigTTIN, sigTTOU)
-import qualified System.Posix.Signals as Signals
 import           System.Posix.Types (CPid(..), CMode(..))
 import           System.Posix.Waitpid (waitpid, waitpidFullStatus, Status(..), FullStatus(..), Flag(..))
 import           UnliftIO.Concurrent (runInBoundThread)
 import           UnliftIO.IORef (newIORef, writeIORef, readIORef)
 
+import           System.Hatrace.SignalMap (signalMap)
 import           System.Hatrace.SyscallTables.Generated (KnownSyscall(..), syscallName, syscallMap_i386, syscallMap_x64_64)
 import           System.Hatrace.Types
 
@@ -1561,41 +1561,6 @@ prettySignal s =
     Just (_longName, shortName) -> shortName
 
 
-signalMap :: Map Signal (String, String)
-signalMap =
-  Map.fromList $ map (\(s, long, short) -> (s, (long, short))) $
-    [ (Signals.nullSignal, "nullSignal", "NULL")
-    , (Signals.internalAbort, "internalAbort", "ABRT")
-    , (Signals.realTimeAlarm, "realTimeAlarm", "ALRM")
-    , (Signals.busError, "busError", "BUS")
-    , (Signals.processStatusChanged, "processStatusChanged", "CHLD")
-    , (Signals.continueProcess, "continueProcess", "CONT")
-    , (Signals.floatingPointException, "floatingPointException", "FPE")
-    , (Signals.lostConnection, "lostConnection", "HUP")
-    , (Signals.illegalInstruction, "illegalInstruction", "ILL")
-    , (Signals.keyboardSignal, "keyboardSignal", "INT")
-    , (Signals.killProcess, "killProcess", "KILL")
-    , (Signals.openEndedPipe, "openEndedPipe", "PIPE")
-    , (Signals.keyboardTermination, "keyboardTermination", "QUIT")
-    , (Signals.segmentationViolation, "segmentationViolation", "SEGV")
-    , (Signals.softwareStop, "softwareStop", "STOP")
-    , (Signals.softwareTermination, "softwareTermination", "TERM")
-    , (Signals.keyboardStop, "keyboardStop", "TSTP")
-    , (Signals.backgroundRead, "backgroundRead", "TTIN")
-    , (Signals.backgroundWrite, "backgroundWrite", "TTOU")
-    , (Signals.userDefinedSignal1, "userDefinedSignal1", "USR1")
-    , (Signals.userDefinedSignal2, "userDefinedSignal2", "USR2")
-    , (Signals.pollableEvent, "pollableEvent", "POLL")
-    , (Signals.profilingTimerExpired, "profilingTimerExpired", "PROF")
-    , (Signals.badSystemCall, "badSystemCall", "SYS")
-    , (Signals.breakpointTrap, "breakpointTrap", "TRAP")
-    , (Signals.urgentDataAvailable, "urgentDataAvailable", "URG")
-    , (Signals.virtualTimerExpired, "virtualTimerExpired", "VTALRM")
-    , (Signals.cpuTimeLimitExceeded, "cpuTimeLimitExceeded", "XCPU")
-    , (Signals.fileSizeLimitExceeded, "fileSizeLimitExceeded", "XFSZ")
-    ]
-
-
 data Syscall
   = KnownSyscall KnownSyscall
   | UnknownSyscall !Word64

src/System/Hatrace/SignalMap.hs

@@ -0,0 +1,51 @@
+{-# LANGUAGE CPP #-}
+
+-- We use the `CONST_*` constants from the `unix` package to know
+-- whether specific signals are supported on the current platform.
+#include <HsUnixConfig.h>
+
+module System.Hatrace.SignalMap
+  ( signalMap
+  ) where
+
+import           Data.Map (Map)
+import qualified Data.Map as Map
+import           System.Posix.Signals (Signal)
+import qualified System.Posix.Signals as Signals
+
+
+signalMap :: Map Signal (String, String)
+signalMap =
+  Map.fromList $ map (\(s, long, short) -> (s, (long, short))) $
+    [ (Signals.nullSignal, "nullSignal", "NULL")
+    , (Signals.internalAbort, "internalAbort", "ABRT")
+    , (Signals.realTimeAlarm, "realTimeAlarm", "ALRM")
+    , (Signals.busError, "busError", "BUS")
+    , (Signals.processStatusChanged, "processStatusChanged", "CHLD")
+    , (Signals.continueProcess, "continueProcess", "CONT")
+    , (Signals.floatingPointException, "floatingPointException", "FPE")
+    , (Signals.lostConnection, "lostConnection", "HUP")
+    , (Signals.illegalInstruction, "illegalInstruction", "ILL")
+    , (Signals.keyboardSignal, "keyboardSignal", "INT")
+    , (Signals.killProcess, "killProcess", "KILL")
+    , (Signals.openEndedPipe, "openEndedPipe", "PIPE")
+    , (Signals.keyboardTermination, "keyboardTermination", "QUIT")
+    , (Signals.segmentationViolation, "segmentationViolation", "SEGV")
+    , (Signals.softwareStop, "softwareStop", "STOP")
+    , (Signals.softwareTermination, "softwareTermination", "TERM")
+    , (Signals.keyboardStop, "keyboardStop", "TSTP")
+    , (Signals.backgroundRead, "backgroundRead", "TTIN")
+    , (Signals.backgroundWrite, "backgroundWrite", "TTOU")
+    , (Signals.userDefinedSignal1, "userDefinedSignal1", "USR1")
+    , (Signals.userDefinedSignal2, "userDefinedSignal2", "USR2")
+#if CONST_SIGPOLL != -1
+    , (Signals.pollableEvent, "pollableEvent", "POLL")
+#endif
+    , (Signals.profilingTimerExpired, "profilingTimerExpired", "PROF")
+    , (Signals.badSystemCall, "badSystemCall", "SYS")
+    , (Signals.breakpointTrap, "breakpointTrap", "TRAP")
+    , (Signals.urgentDataAvailable, "urgentDataAvailable", "URG")
+    , (Signals.virtualTimerExpired, "virtualTimerExpired", "VTALRM")
+    , (Signals.cpuTimeLimitExceeded, "cpuTimeLimitExceeded", "XCPU")
+    , (Signals.fileSizeLimitExceeded, "fileSizeLimitExceeded", "XFSZ")
+    ]