diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp')
| -rw-r--r-- | databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp b/databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp deleted file mode 100644 index d4ee49741917..000000000000 --- a/databases/foundationdb71-server/files/patch-fdbserver_fdbserver.actor.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- fdbserver/fdbserver.actor.cpp.orig 2024-01-17 13:58:04 UTC -+++ fdbserver/fdbserver.actor.cpp -@@ -84,7 +84,11 @@ - #if defined(__linux__) || defined(__FreeBSD__) - #include <execinfo.h> - #include <signal.h> -+#if defined(__linux__) - #include <sys/prctl.h> -+#elif defined(__FreeBSD__) -+#include <sys/procctl.h> -+#endif - #ifdef ALLOC_INSTRUMENTATION - #include <cxxabi.h> - #endif -@@ -2238,9 +2242,14 @@ int main(int argc, char* argv[]) { - f = result; - } else if (role == ServerRole::FlowProcess) { - TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver"); --#if defined(__linux__) || defined(__FreeBSD__) -+#if defined(__linux__) - prctl(PR_SET_PDEATHSIG, SIGTERM); - if (getppid() == 1) /* parent already died before prctl */ -+ flushAndExit(FDB_EXIT_SUCCESS); -+#elif defined(__FreeBSD__) -+ const int sig = SIGTERM; -+ procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig); -+ if (getppid() == 1) /* parent already died before procctl */ - flushAndExit(FDB_EXIT_SUCCESS); - #endif - |