Skip to content

Commit 2f1403a

Browse files
committed
Merge bitcoin/bitcoin#27458: build: Detect USDT the same way how it is used in the code
b53cab0 build: Detect USDT the same way how it is used in the code (Hennadii Stepanov) Pull request description: In the code we do not use string literals. Also a check for `DTRACE_PROBE7` macro has been added as not all systems define`DTRACE_PROBE{6,7,8,9,10,11,12}` macros (e.g., FreeBSD). ACKs for top commit: 0xB10C: ACK b53cab0 Tree-SHA512: 74f49424d57bf1929f2b09edba1449cef5a1a2448161952da35302343f3003d5bedeab1417e166b656c5f629303e2de888550b1219e886a1b991b12b9c880794
2 parents edd6d83 + b53cab0 commit 2f1403a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,9 @@ if test "$use_usdt" != "no"; then
14091409
AC_COMPILE_IFELSE([
14101410
AC_LANG_PROGRAM(
14111411
[#include <sys/sdt.h>],
1412-
[DTRACE_PROBE("context", "event");]
1412+
[DTRACE_PROBE(context, event);
1413+
int a, b, c, d, e, f, g;
1414+
DTRACE_PROBE7(context, event, a, b, c, d, e, f, g);]
14131415
)],
14141416
[AC_MSG_RESULT([yes]); AC_DEFINE([ENABLE_TRACING], [1], [Define to 1 to enable tracepoints for Userspace, Statically Defined Tracing])],
14151417
[AC_MSG_RESULT([no]); use_usdt=no;]

0 commit comments

Comments
 (0)