mirror of
https://git.freebsd.org/ports.git
synced 2025-06-01 19:06:28 -04:00
3dc4928b6c
Update FoundationDB to both main supported versions, and also split between server and client builds for convenience. PR: 277262 Reviewed by: dch Sponsored by: SkunkWerks, GmbH
42 lines
1.3 KiB
C++
42 lines
1.3 KiB
C++
--- fdbmonitor/fdbmonitor.cpp.orig 2022-09-19 11:42:41 UTC
|
|
+++ fdbmonitor/fdbmonitor.cpp
|
|
@@ -27,6 +27,8 @@
|
|
|
|
#ifdef __linux__
|
|
#include <sys/prctl.h>
|
|
+#elif defined(__FreeBSD__)
|
|
+#include <sys/procctl.h>
|
|
#endif
|
|
|
|
#include <sys/wait.h>
|
|
@@ -751,6 +753,10 @@ void start_process(Command* cmd, ProcessID id, uid_t u
|
|
signal(SIGHUP, SIG_DFL);
|
|
signal(SIGINT, SIG_DFL);
|
|
signal(SIGTERM, SIG_DFL);
|
|
+#ifdef __linux__
|
|
+ signal(SIGCHLD, SIG_DFL);
|
|
+#endif
|
|
+ sigprocmask(SIG_SETMASK, mask, nullptr);
|
|
|
|
/* All output in this block should be to stdout (for SevInfo messages) or stderr (for SevError messages) */
|
|
/* Using log_msg() or log_err() from the child will cause the logs to be written incorrectly */
|
|
@@ -780,13 +786,15 @@ void start_process(Command* cmd, ProcessID id, uid_t u
|
|
}
|
|
|
|
#ifdef __linux__
|
|
- signal(SIGCHLD, SIG_DFL);
|
|
-
|
|
- sigprocmask(SIG_SETMASK, mask, nullptr);
|
|
-
|
|
/* death of our parent raises SIGHUP */
|
|
prctl(PR_SET_PDEATHSIG, SIGHUP);
|
|
if (getppid() == 1) /* parent already died before prctl */
|
|
+ exit(0);
|
|
+#elif defined(__FreeBSD__)
|
|
+ /* death of our parent raises SIGHUP */
|
|
+ const int sig = SIGHUP;
|
|
+ procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
|
|
+ if (getppid() == 1) /* parent already died before procctl */
|
|
exit(0);
|
|
#endif
|
|
|