aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <pan@erlang.org>2012-03-09 15:51:51 +0100
committerPatrik Nyblom <pan@erlang.org>2012-03-22 18:16:15 +0100
commit19a36b917d8c7c2dc061ee5b41738fa8b315d70b (patch)
tree3498b3f753074ea6eb13c37514af77036c6fc11e /erts/emulator
parent0c0d640ed423d4a386de75a2b37a1be038c2d059 (diff)
downloadotp-19a36b917d8c7c2dc061ee5b41738fa8b315d70b.tar.gz
otp-19a36b917d8c7c2dc061ee5b41738fa8b315d70b.tar.bz2
otp-19a36b917d8c7c2dc061ee5b41738fa8b315d70b.zip
Update slogan and add system_info for dynamic trace
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_bif_info.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 618acc5117..041eac240d 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -115,9 +115,12 @@ static char erts_system_version[] = ("Erlang " ERLANG_OTP_RELEASE
#ifdef VALGRIND
" [valgrind-compiled]"
#endif
-#ifdef USE_VM_PROBES
+#ifdef USE_DTRACE
" [dtrace]"
#endif
+#ifdef USE_SYSTEMTAP
+ " [systemtap]"
+#endif
"\n");
#define ASIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -2723,6 +2726,24 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
#endif
BIF_RET(am_true);
}
+ else if (ERTS_IS_ATOM_STR("dynamic_trace", BIF_ARG_1)) {
+#if defined(USE_DTRACE)
+ DECL_AM(dtrace);
+ BIF_RET(AM_dtrace);
+#elif defined(USE_SYSTEMTAP)
+ DECL_AM(systemtap);
+ BIF_RET(AM_systemtap);
+#else
+ BIF_RET(am_none);
+#endif
+ }
+ else if (ERTS_IS_ATOM_STR("dynamic_trace_probes", BIF_ARG_1)) {
+#if defined(USE_VM_PROBES)
+ BIF_RET(am_true);
+#else
+ BIF_RET(am_false);
+#endif
+ }
#ifdef ERTS_SMP
else if (ERTS_IS_ATOM_STR("thread_progress", BIF_ARG_1)) {
erts_thr_progress_dbg_print_state();