aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/dist.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-07-10 13:40:42 +0200
committerSverker Eriksson <[email protected]>2018-07-18 14:59:39 +0200
commitbd228591a434bd0a15f5220e66a8bb623b410e2f (patch)
treeaa4ecc00747a8f21876312adc6906422ffd7af9d /erts/emulator/beam/dist.c
parent3e2508e0f6dbd973d80c96418a989d1fa525767a (diff)
downloadotp-bd228591a434bd0a15f5220e66a8bb623b410e2f.tar.gz
otp-bd228591a434bd0a15f5220e66a8bb623b410e2f.tar.bz2
otp-bd228591a434bd0a15f5220e66a8bb623b410e2f.zip
erts: Remove use of VALGRIND_PRINTF_XML
which only existed in a patched version of valgrind (by pan) no longer used. Instead we use standard VALGRIND_PRINTF which will end up like this if valgrind log format is XML and valgrind version >= 3.9: <clientmsg> <tid>7</tid> <threadname>3_scheduler</threadname> <text>Test case #20 ei_encode_SUITE:test_ei_encode_long/1 </text> </clientmsg> Note the extra trailing whitespace that may occure before </text>.
Diffstat (limited to 'erts/emulator/beam/dist.c')
-rw-r--r--erts/emulator/beam/dist.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index db35137e92..61090e2c47 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1200,21 +1200,8 @@ erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote)
#include <valgrind/valgrind.h>
#include <valgrind/memcheck.h>
-#ifndef HAVE_VALGRIND_PRINTF_XML
-#define VALGRIND_PRINTF_XML VALGRIND_PRINTF
-#endif
-
# define PURIFY_MSG(msg) \
- do { \
- char buf__[1]; size_t bufsz__ = sizeof(buf__); \
- if (erts_sys_explicit_8bit_getenv("VALGRIND_LOG_XML", buf__, &bufsz__) != 0) { \
- VALGRIND_PRINTF_XML("<erlang_error_log>" \
- "%s, line %d: %s</erlang_error_log>\n", \
- __FILE__, __LINE__, msg); \
- } else { \
- VALGRIND_PRINTF("%s, line %d: %s", __FILE__, __LINE__, msg); \
- } \
- } while (0)
+ VALGRIND_PRINTF("%s, line %d: %s", __FILE__, __LINE__, msg)
#else
# define PURIFY_MSG(msg)
#endif