Made DTrace probe process_unscheduled correspond to Erlang trace mess…

…age out, Fixed process_scheduled to contain 0 in case MFA cannot be determined
erlang · Mar 29, 2013 · 867a4e9 · 867a4e9
1 parent 1115612
commit 867a4e9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
@@ -1270,11 +1270,9 @@ void process_main(void)
                                       (Eterm)fptr[1], (Uint)fptr[2],
                                       NULL, fun_buf);
                 } else {
-                    erts_snprintf(fun_buf, sizeof(fun_buf),
-                                  "<unknown/%p>", next);
+                    erts_snprintf(fun_buf, sizeof(fun_buf), "0");
                 }
             }
-
             DTRACE3(process_scheduled, process_buf, fun_buf, dtrace_ts());
         }
 #endif

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
@@ -6592,9 +6592,21 @@ Process *schedule(Process *p, int calls)
 #ifdef USE_VM_PROBES
     if (p != NULL && DTRACE_ENABLED(process_unscheduled)) {
         DTRACE_CHARBUF(process_buf, DTRACE_TERM_BUF_SIZE);
-
+        DTRACE_CHARBUF(fun_buf, DTRACE_TERM_BUF_SIZE);
         dtrace_proc_str(p, process_buf);
-        DTRACE1(process_unscheduled, process_buf);
+        if (ERTS_PROC_IS_EXITING(p)) {
+            strcpy(fun_buf, "<exiting>");
+        } else {
+            BeamInstr *fptr = find_function_from_pc(p->i);
+            if (fptr) {
+                dtrace_fun_decode(p, (Eterm)fptr[0],
+                                  (Eterm)fptr[1], (Uint)fptr[2],
+                                  NULL, fun_buf);
+            } else {
+                erts_snprintf(fun_buf, sizeof(fun_buf), "0");
+            }
+        }
+        DTRACE3(process_unscheduled, process_buf, fun_buf, dtrace_ts());
     }
 #endif
 

diff --git a/erts/emulator/beam/erlang_dtrace.d b/erts/emulator/beam/erlang_dtrace.d
@@ -307,9 +307,11 @@ provider erlang {
      * Fired when a process is unscheduled.
      *
      * @param p the PID (string form) of the process that has been
-     * unscheduled.
+     * unscheduled
+     * @param mfa the m:f/a of the function that was running
+     * @param ts timestamp
      */
-    probe process__unscheduled(char *p);
+    probe process__unscheduled(char *p, char *mfa, uint64_t ts);
 
     /**
      * Fired when a process goes into hibernation.