Update dtrace for changes in R15

12 files changed, 135 insertions, 123 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 3fb0964810..d8fad98de2 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -486,7 +486,11 @@ endif
 endif
 
 ifdef DTRACE_ENABLED
-GENERATE += $(TARGET)/erlang_dtrace.h
+# global.h causes problems by including dtrace-wrapper.h which includes
+# the autogenerated erlang_dtrace.h ... so make erlang_dtrace.h very early.
+generate: $(TARGET)/erlang_dtrace.h $(GENERATE)
+else
+generate: $(GENERATE)
 endif
 
 ifdef HIPE_ENABLED
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index d0beccfda2..1dbe2cad00 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -41,8 +41,6 @@
 #include "hipe_mode_switch.h"
 #include "hipe_bif1.h"
 #endif
-
-#include <assert.h>
 #include "dtrace-wrapper.h"
 
 /* #define HARDDEBUG 1 */
@@ -1053,72 +1051,6 @@ init_emulator(void)
 #  define REG_tmp_arg2
 #endif
 
-ERTS_INLINE void
-dtrace_proc_str(Process *process, char *process_buf)
-{
-    dtrace_pid_str(process->id, process_buf);
-}
-
-ERTS_INLINE void
-dtrace_pid_str(Eterm pid, char *process_buf)
-{
-    snprintf(process_buf, DTRACE_TERM_BUF_SIZE, "<%lu.%lu.%lu>",
-             pid_channel_no(pid),
-             pid_number(pid),
-             pid_serial(pid));
-}
-
-ERTS_INLINE void
-dtrace_port_str(Port *port, char *port_buf)
-{
-    snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
-             port_channel_no(port->id),
-             port_number(port->id));
-}
-
-ERTS_INLINE void
-dtrace_drvport_str(ErlDrvPort drvport, char *port_buf)
-{
-    Port *port = erts_drvport2port(drvport);
-
-    snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
-             port_channel_no(port->id),
-             port_number(port->id));
-}
-
-ERTS_INLINE void
-dtrace_fun_decode(Process *process,
-                  Eterm module, Eterm function, int arity,
-                  char *process_buf, char *mfa_buf)
-{
-    char funbuf[DTRACE_TERM_BUF_SIZE];
-    char *funptr = funbuf;
-    char *p = NULL;
-
-    if (process_buf) {
-        dtrace_proc_str(process, process_buf);
-    }
-
-    erts_snprintf(funbuf, sizeof(funbuf), "%T", function);
-    /*
-     * I'm not quite sure how these function names are synthesized,
-     *  but they almost always seem to be in the form of
-     *  '-name/arity-fun-0-' so I'm chopping them up when it's -fun-0-
-     *  (which seems to be the toplevel)
-     */
-    if (funbuf[0] == '\'' && funbuf[1] == '-'
-        && strlen(funbuf) > 3 && funbuf[strlen(funbuf) - 3] == '0') {
-        p = strchr(funbuf, '/');
-        if (p) {
-            *p = 0;
-        }
-        funptr += 2;
-    }
-
-    erts_snprintf(mfa_buf, DTRACE_TERM_BUF_SIZE, "%T:%s/%d",
-                  module, funptr, arity);
-}
-
 #ifdef HAVE_DTRACE
 
 #define DTRACE_CALL(p, m, f, a)                                 \
@@ -1190,6 +1122,16 @@ dtrace_fun_decode(Process *process,
 
 #endif /* HAVE_DTRACE */
 
+void
+dtrace_drvport_str(ErlDrvPort drvport, char *port_buf)
+{
+    Port *port = erts_drvport2port(drvport);
+
+    erts_snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
+                  port_channel_no(port->id),
+                  port_number(port->id));
+}
+
 /*
  * process_main() is called twice:
  * The first call performs some initialisation, including exporting
@@ -1376,7 +1318,8 @@ void process_main(void)
                                       (Eterm)fptr[1], (Uint)fptr[2],
                                       NULL, fun_buf);
                 } else {
-                    snprintf(fun_buf, sizeof(fun_buf), "<unknown/%p>", next);
+                    erts_snprintf(fun_buf, sizeof(fun_buf),
+                                  "<unknown/%p>", next);
                 }
             }
 
@@ -1970,7 +1913,9 @@ void process_main(void)
      if (DTRACE_ENABLED(message_receive)) {
          Eterm token2 = NIL;
          DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
-         Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
+         ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+         ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+         ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
 
          dtrace_proc_str(c_p, receiver_name);
          token2 = SEQ_TRACE_TOKEN(c_p);
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 6f6b04d278..ba55a1918a 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -741,8 +741,10 @@ erts_dsig_send_msg(ErtsDSigData *dsdp, Eterm remote, Eterm message)
     Eterm token = NIL;
     Process *sender = dsdp->proc;
     int res;
-    Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
-    Uint msize = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
+    ERTS_DECLARE_DUMMY(Uint msize) = 0;
     DTRACE_CHARBUF(node_name, 64);
     DTRACE_CHARBUF(sender_name, 64);
     DTRACE_CHARBUF(receiver_name, 64);
@@ -788,8 +790,10 @@ erts_dsig_send_reg_msg(ErtsDSigData *dsdp, Eterm remote_name, Eterm message)
     Eterm token = NIL;
     Process *sender = dsdp->proc;
     int res;
-    Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
-    Uint32 msize = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
+    ERTS_DECLARE_DUMMY(Uint32 msize) = 0;
     DTRACE_CHARBUF(node_name, 64);
     DTRACE_CHARBUF(sender_name, 64);
     DTRACE_CHARBUF(receiver_name, 128);
@@ -838,7 +842,9 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
     DeclareTmpHeapNoproc(ctl_heap,6);
     int res;
     Process *sender = dsdp->proc;
-    Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
     DTRACE_CHARBUF(node_name, 64);
     DTRACE_CHARBUF(sender_name, 64);
     DTRACE_CHARBUF(remote_name, 128);
diff --git a/erts/emulator/beam/dtrace-wrapper.h b/erts/emulator/beam/dtrace-wrapper.h
index f93871bd25..b633058e90 100644
--- a/erts/emulator/beam/dtrace-wrapper.h
+++ b/erts/emulator/beam/dtrace-wrapper.h
@@ -23,15 +23,6 @@
 
 #define DTRACE_TERM_BUF_SIZE 256
 
-#ifndef	DTRACE_DRIVER_SKIP_FUNC_DECLARATIONS
-inline void dtrace_proc_str(Process *process, char *process_buf);
-inline void dtrace_pid_str(Eterm pid, char *process_buf);
-inline void dtrace_port_str(Port *port, char *port_buf);
-inline void dtrace_fun_decode(Process *process,
-			      Eterm module, Eterm function, int arity,
-			      char *process_buf, char *mfa_buf);
-#endif
-
 /*
  * Some varieties of SystemTap macros do not like statically-sized
  * char[N] buffers.  (For example, CentOS 6's macros.)
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index 72dcc99f4f..b8cb3c6cc4 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -253,8 +253,7 @@ erts_get_async_ready_queue(Uint sched_id)
 
 static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q)
 {
-    /* DTRACE TODO: Get the queue length from erts_thr_q_enqueue() */
-    int len = -1;
+    int len;
 
     if (is_internal_port(a->port)) {
 #if ERTS_USE_ASYNC_READY_Q
@@ -275,6 +274,8 @@ static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q)
         DTRACE_CHARBUF(port_str, 16);
 
         erts_snprintf(port_str, sizeof(port_str), "%T", a->port);
+        /* DTRACE TODO: Get the queue length from erts_thr_q_enqueue() ? */
+        len = -1;
         DTRACE2(aio_pool_add, port_str, len);
     }
     gcc_optimizer_hack++;
@@ -288,8 +289,7 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q,
     int saved_fin_deq = 0;
     ErtsThrQFinDeQ_t fin_deq;
 #endif
-    /* DTRACE TODO: Get the queue length from erts_thr_q_dequeue() somehow? */
-    int len = -1;
+    int len;
 
     while (1) {
 	ErtsAsync *a = (ErtsAsync *) erts_thr_q_dequeue(q);
@@ -305,6 +305,8 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q,
                 DTRACE_CHARBUF(port_str, 16);
 
                 erts_snprintf(port_str, sizeof(port_str), "%T", a->port);
+                /* DTRACE TODO: Get the length from erts_thr_q_dequeue() ? */
+                len = -1;
                 DTRACE2(aio_pool_get, port_str, len);
             }
 	    return a;
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 858ae32ad5..679a3645ba 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -2055,7 +2055,6 @@ shrink_new_heap(Process *p, Uint new_sz, Eterm *objv, int nobj)
     Uint heap_size = HEAP_TOP(p) - HEAP_START(p);
     Sint offs;
     Uint stack_size = p->hend - p->stop;
-    char pidbuf[DTRACE_TERM_BUF_SIZE];
 
     ASSERT(new_sz < p->heap_sz);
     sys_memmove(p->heap + new_sz - stack_size, p->stop, stack_size *
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 8489353c9e..786d6ac52c 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -336,7 +336,9 @@ erts_queue_dist_message(Process *rcvr,
 			Eterm token)
 {
     ErlMessage* mp;
-    Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
 #ifdef ERTS_SMP
     ErtsProcLocks need_locks;
 #endif
@@ -495,7 +497,9 @@ erts_queue_message(Process* receiver,
 
     if (DTRACE_ENABLED(message_queued)) {
         DTRACE_CHARBUF(receiver_name, DTRACE_TERM_BUF_SIZE);
-        Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
+        ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+        ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+        ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
 
         dtrace_proc_str(receiver, receiver_name);
         if (seq_trace_token != NIL && is_tuple(seq_trace_token)) {
@@ -822,7 +826,9 @@ erts_send_message(Process* sender,
     Eterm token = NIL;
     DTRACE_CHARBUF(sender_name, 64);
     DTRACE_CHARBUF(receiver_name, 64);
-    Sint tok_label = 0, tok_lastcnt = 0, tok_serial = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_label) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_lastcnt) = 0;
+    ERTS_DECLARE_DUMMY(Sint tok_serial) = 0;
 
     BM_STOP_TIMER(system);
     BM_MESSAGE(message,sender,receiver);
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 6f6263d160..7f12004b43 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1072,13 +1072,6 @@ void process_main(void);
 Eterm build_stacktrace(Process* c_p, Eterm exc);
 Eterm expand_error_value(Process* c_p, Uint freason, Eterm Value);
 void erts_save_stacktrace(Process* p, struct StackTrace* s, int depth);
-ERTS_INLINE void dtrace_proc_str(Process *process, char *process_buf);
-ERTS_INLINE void dtrace_pid_str(Eterm pid, char *process_buf);
-ERTS_INLINE void dtrace_port_str(Port *port, char *port_buf);
-ERTS_INLINE void dtrace_drvport_str(ErlDrvPort port, char *port_buf);
-ERTS_INLINE void dtrace_fun_decode(Process *process,
-                                   Eterm module, Eterm function, int arity,
-                                   char *process_buf, char *mfa_buf);
 
 /* erl_init.c */
 
@@ -1981,4 +1974,66 @@ erts_alloc_message_heap(Uint size,
 #  define UseTmpHeapNoproc(Size) /* Nothing */
 #  define UnUseTmpHeapNoproc(Size) /* Nothing */
 #endif /* HEAP_ON_C_STACK */
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+#include "dtrace-wrapper.h"
+
+ERTS_GLB_INLINE void
+dtrace_pid_str(Eterm pid, char *process_buf)
+{
+    erts_snprintf(process_buf, DTRACE_TERM_BUF_SIZE, "<%lu.%lu.%lu>",
+                  pid_channel_no(pid),
+                  pid_number(pid),
+                  pid_serial(pid));
+}
+
+ERTS_GLB_INLINE void
+dtrace_proc_str(Process *process, char *process_buf)
+{
+    dtrace_pid_str(process->id, process_buf);
+}
+
+ERTS_GLB_INLINE void
+dtrace_port_str(Port *port, char *port_buf)
+{
+    erts_snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
+                  port_channel_no(port->id),
+                  port_number(port->id));
+}
+
+ERTS_GLB_INLINE void
+dtrace_fun_decode(Process *process,
+                  Eterm module, Eterm function, int arity,
+                  char *process_buf, char *mfa_buf)
+{
+    char funbuf[DTRACE_TERM_BUF_SIZE];
+    char *funptr = funbuf;
+    char *p = NULL;
+
+    if (process_buf) {
+        dtrace_proc_str(process, process_buf);
+    }
+
+    erts_snprintf(funbuf, sizeof(funbuf), "%T", function);
+    /*
+     * I'm not quite sure how these function names are synthesized,
+     *  but they almost always seem to be in the form of
+     *  '-name/arity-fun-0-' so I'm chopping them up when it's -fun-0-
+     *  (which seems to be the toplevel)
+     */
+    if (funbuf[0] == '\'' && funbuf[1] == '-'
+        && strlen(funbuf) > 3 && funbuf[strlen(funbuf) - 3] == '0') {
+        p = strchr(funbuf, '/');
+        if (p) {
+            *p = 0;
+        }
+        funptr += 2;
+    }
+
+    erts_snprintf(mfa_buf, DTRACE_TERM_BUF_SIZE, "%T:%s/%d",
+                  module, funptr, arity);
+}
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
 #endif /* !__GLOBAL_H__ */
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index b72f95792c..293f024e45 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -112,7 +112,6 @@
 #include "erl_threads.h"
 #include "zlib.h"
 #include "gzio.h"
-#define DTRACE_DRIVER_SKIP_FUNC_DECLARATIONS
 #include "dtrace-wrapper.h"
 #include <ctype.h>
 #include <sys/types.h>
@@ -126,6 +125,8 @@ static unsigned gcc_optimizer_hack = 0;
 
 #ifdef  HAVE_DTRACE
 
+#define DTRACE_EFILE_BUFSIZ 128
+
 #define DTRACE_INVOKE_SETUP(op) \
     do { DTRACE3(efile_drv_int_entry, d->sched_i1, d->sched_i2, op); } while (0)
 #define DTRACE_INVOKE_SETUP_BY_NAME(op) \
@@ -149,6 +150,7 @@ typedef struct {
 dt_private *get_dt_private(int);
 #else  /* HAVE_DTRACE */
 typedef struct {
+    char        dummy;          /* Unused except to quiet some compilers */
 } dt_private;
 
 #define DTRACE_INVOKE_SETUP(op)            do {} while (0)
@@ -429,7 +431,7 @@ struct t_data
 #ifdef  HAVE_DTRACE
     int               sched_i1;
     Uint64            sched_i2;
-    char              sched_utag[128+1];
+    char              sched_utag[DTRACE_EFILE_BUFSIZ+1];
 #else
     char              sched_utag[1];
 #endif
@@ -2196,12 +2198,12 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
     int sched_i1 = d->sched_i1, sched_i2 = d->sched_i2, command = d->command,
         result_ok = d->result_ok,
         posix_errno = d->result_ok ? 0 : d->errInfo.posix_errno;
-    DTRACE_CHARBUF(sched_utag, 128+1);
+    DTRACE_CHARBUF(sched_utag, DTRACE_EFILE_BUFSIZ+1);
 
     sched_utag[0] = '\0';
     if (DTRACE_ENABLED(efile_drv_return)) {
-        strncpy(sched_utag, d->sched_utag, sizeof(sched_utag) - 1);
-        sched_utag[sizeof(sched_utag) - 1] = '\0';
+        strncpy(sched_utag, d->sched_utag, DTRACE_EFILE_BUFSIZ);
+        sched_utag[DTRACE_EFILE_BUFSIZ] = '\0';
     }
 #endif  /* HAVE_DTRACE */
 
@@ -2488,8 +2490,12 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count)
     char* name;			/* Points to the filename in buf. */
     int command;
     struct t_data *d = NULL;
-    char *dt_utag = NULL, *dt_s1 = NULL, *dt_s2 = NULL;
-    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0, dt_i4 = 0;
+    ERTS_DECLARE_DUMMY(char *dt_utag) = NULL;
+    char *dt_s1 = NULL, *dt_s2 = NULL;
+    ERTS_DECLARE_DUMMY(Sint64 dt_i1) = 0;
+    ERTS_DECLARE_DUMMY(Sint64 dt_i2) = 0;
+    ERTS_DECLARE_DUMMY(Sint64 dt_i3) = 0;
+    ERTS_DECLARE_DUMMY(Sint64 dt_i4) = 0;
 #ifdef  HAVE_DTRACE
     dt_private *dt_priv = get_dt_private(0);
 #endif  /* HAVE_DTRACE */
@@ -3015,8 +3021,10 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
     int p, q;
     int err;
     struct t_data *d = NULL;
-    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0, dt_i4 = 0;
-    char *dt_utag = NULL, *dt_s1 = NULL;
+    Sint64 dt_i1 = 0, dt_i2 = 0, dt_i3 = 0;
+    ERTS_DECLARE_DUMMY(Sint64 dt_i4) = 0;
+    char *dt_utag = NULL;
+    ERTS_DECLARE_DUMMY(char *dt_s1) = NULL;
 #ifdef  HAVE_DTRACE
     dt_private *dt_priv = get_dt_private(dt_driver_io_worker_base);
 #else
diff --git a/erts/lib_src/common/erl_printf.c b/erts/lib_src/common/erl_printf.c
index afb9c0abb7..399c83384e 100644
--- a/erts/lib_src/common/erl_printf.c
+++ b/erts/lib_src/common/erl_printf.c
@@ -173,10 +173,10 @@ typedef struct {
 static int
 write_sn(void *vwsnap, char* buf, size_t len)
 {
+    int rv = 0;
     write_sn_arg_t *wsnap = (write_sn_arg_t *) vwsnap;
     ASSERT(wsnap);
     ASSERT(len > 0);
-    int rv = 0;
     if (wsnap->len > 0) {
 	size_t sz = len;
 	if (sz >= wsnap->len)
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 9d6c47ffc1..6778fe353c 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 5c9cad3a2c..46ce3ab1a4 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -1493,19 +1493,15 @@ to_seconds({_,_} = Datetime, universal) ->
 to_seconds({_,_} = Datetime, local) ->
     erlang:universaltime_to_posixtime(erlang:localtime_to_universaltime(Datetime)).
 
-%% TODO: Duplicate code!
 get_dtrace_utag() ->
-    case get(dtrace_utag) of
-        X when is_list(X) ->
-            X;
-        _ ->
-            ""
+    %% We cannot call dtrace:get_utag() because this is prim_file.erl.
+    %% We must reimplement it here.
+    case get('_dtrace_utag_@_@') of
+        undefined ->
+            <<>>;
+        X ->
+            X
     end.
 
-%% TODO: Measure if it's worth checking (re:run()?) for NUL byte first?
-enc_utag([0|Cs]) ->
-    enc_utag(Cs);
-enc_utag([C|Cs]) ->
-    [C|enc_utag(Cs)];
-enc_utag([]) ->
-    [0].
+enc_utag(UTag) ->
+    [UTag, 0].