diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 17:27:17 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 17:27:17 +0200 |
| commit | 2ea950f70bb3c2bee32be7f98442df8d8d2f008a (patch) | |
| tree | 0438b76786bb8c1aac788600a85e1856aa7acbf1 /erts/emulator/beam/erl_bif_info.c | |
| parent | dc599847686a683441617eb507539d68dab88d6b (diff) | |
| parent | 58762e934f603b3fe036aa3b9d8a5930b77ae5f1 (diff) | |
| download | otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.tar.gz otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.tar.bz2 otp-2ea950f70bb3c2bee32be7f98442df8d8d2f008a.zip | |
Merge branch 'egil/erts/tracing-beam-lttng/OTP-10282'
* egil/erts/tracing-beam-lttng/OTP-10282:
erts: Don't use ratio in carrier lttng tracepoints
Add lttng testcases
erts: Extend erlang:system_info/1 with lttng
Refactor and fix dtrace define in erl_message
erts: Add lttng tracepoints for async pool queue
erts: Add lttng tracepoints for drivers
erts: Add lttng tracepoints for scheduler events
erts: Add lttng tracepoints for memory carriers
erts: Update lttng-wrapper with mfa conversion
erts: Teach lttng to configure and build system
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index d35bbb80b8..0b2c26a548 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -126,6 +126,9 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE #ifdef ERTS_FRMPTR " [frame-pointer]" #endif +#ifdef USE_LTTNG + " [lttng]" +#endif #ifdef USE_DTRACE " [dtrace]" #endif @@ -2748,6 +2751,9 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) #elif defined(USE_SYSTEMTAP) DECL_AM(systemtap); BIF_RET(AM_systemtap); +#elif defined(USE_LTTNG) + DECL_AM(lttng); + BIF_RET(AM_lttng); #else BIF_RET(am_none); #endif |