commit 078062b3f5c78690c8e356b9291e7d8fdd23909d
author devnexen@gmail.com <devnexen@gmail.com> Sat Aug 21 09:13:10 2021 +0100
committer Christopher Faulet <cfaulet@haproxy.com> Thu Sep 23 17:20:17 2021 +0200
tree e189e2c50561ffc01d34b7d0db8f5bdff4e66076
parent 49a322817f170d4627c94631394a2b00750008ec

MINOR: proc: setting the process to produce a core dump on FreeBSD.

using the procctl api to set the current process as traceable, thus being able to produce a core dump as well.

making it as compile option if not wished or using freebsd prior to 11.x (last no EOL release).

(cherry picked from commit 21185970c199761c81b3b21b13b64dc9dd64838a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

Makefile

diff --git a/Makefile b/Makefile
index 01356d7..a707a60 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@
 #   USE_ACCEPT4          : enable use of accept4() on linux. Automatic.
 #   USE_CLOSEFROM        : enable use of closefrom() on *bsd, solaris. Automatic.
 #   USE_PRCTL            : enable use of prctl(). Automatic.
+#   USE_PROCCTL          : enable use of procctl(). Automatic.
 #   USE_ZLIB             : enable zlib library support and disable SLZ
 #   USE_SLZ              : enable slz library instead of zlib (default=enabled)
 #   USE_CPU_AFFINITY     : enable pinning processes to CPU on Linux. Automatic.
@@ -314,8 +315,8 @@
            USE_GETADDRINFO USE_OPENSSL USE_LUA USE_FUTEX USE_ACCEPT4          \
            USE_CLOSEFROM USE_ZLIB USE_SLZ USE_CPU_AFFINITY USE_TFO USE_NS     \
            USE_DL USE_RT USE_DEVICEATLAS USE_51DEGREES USE_WURFL USE_SYSTEMD  \
-           USE_OBSOLETE_LINKER USE_PRCTL USE_THREAD_DUMP USE_EVPORTS USE_OT   \
-           USE_QUIC USE_PROMEX USE_MEMORY_PROFILING
+           USE_OBSOLETE_LINKER USE_PRCTL USE_PROCCTL USE_THREAD_DUMP          \
+           USE_EVPORTS USE_OT USE_QUIC USE_PROMEX USE_MEMORY_PROFILING
 
 #### Target system options
 # Depending on the target platform, some options are set, as well as some
@@ -394,7 +395,7 @@
 ifeq ($(TARGET),freebsd)
   set_target_defaults = $(call default_opts, \
     USE_POLL USE_TPROXY USE_LIBCRYPT USE_THREAD USE_CPU_AFFINITY USE_KQUEUE   \
-    USE_ACCEPT4 USE_CLOSEFROM USE_GETADDRINFO)
+    USE_ACCEPT4 USE_CLOSEFROM USE_GETADDRINFO USE_PROCCTL)
 endif
 
 # DragonFlyBSD 4.3 and above

src/haproxy.c

diff --git a/src/haproxy.c b/src/haproxy.c
index c17e2bf..0e044d8 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -70,6 +70,10 @@
 #include <sys/prctl.h>
 #endif
 
+#if defined(USE_PROCCTL)
+#include <sys/procctl.h>
+#endif
+
 #ifdef DEBUG_FULL
 #include <assert.h>
 #endif
@@ -3396,6 +3400,11 @@
 		if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1)
 			ha_warning("[%s.main()] Failed to set the dumpable flag, "
 				   "no core will be dumped.\n", argv[0]);
+#elif defined(USE_PROCCTL)
+		int traceable = PROC_TRACE_CTL_ENABLE;
+		if (procctl(P_PID, getpid(), PROC_TRACE_CTL, &traceable) == -1)
+			ha_warning("[%s.main()] Failed to set the traceable flag, "
+				   "no core will be dumped.\n", argv[0]);
 #endif
 	}