store time of each profile sample

JuliaLang · Aug 8, 2021 · 7131a46 · 7131a46
1 parent 96c7cb3
commit 7131a46
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/signals-mach.c b/src/signals-mach.c
@@ -596,6 +596,9 @@ void *mach_profile_listener(void *arg)
                 // store task id
                 bt_data_prof[bt_size_cur++].uintptr = ptls->current_task;
 
+                // store time
+                bt_data_prof[bt_size_cur++].uintptr = jl_hrtime();
+
                 // Mark the end of this block with 0
                 bt_data_prof[bt_size_cur++].uintptr = 0;
             }

diff --git a/src/signals-unix.c b/src/signals-unix.c
@@ -791,6 +791,9 @@ static void *signal_listener(void *arg)
                     // store task id
                     bt_data_prof[bt_size_cur++].uintptr = ptls->current_task;
 
+                    // store time
+                    bt_data_prof[bt_size_cur++].uintptr = jl_hrtime();
+
                     // Mark the end of this block with 0
                     bt_data_prof[bt_size_cur++].uintptr = 0;
                 }

diff --git a/src/signals-win.c b/src/signals-win.c
@@ -369,6 +369,9 @@ static DWORD WINAPI profile_bt( LPVOID lparam )
                     // store task id
                     bt_data_prof[bt_size_cur++].uintptr = ptls->current_task;
 
+                    // store time
+                    bt_data_prof[bt_size_cur++].uintptr = jl_hrtime();
+
                     // Mark the end of this block with 0
                     bt_data_prof[bt_size_cur++].uintptr = 0;
                 }

diff --git a/stdlib/Profile/src/Profile.jl b/stdlib/Profile/src/Profile.jl
@@ -488,7 +488,7 @@ function fetch(;include_meta = false)
         return data
     else
         nblocks = count(iszero, data)
-        nmeta = 2 # number of metadata fields (threadid, taskid)
+        nmeta = 3 # number of metadata fields (threadid, taskid, time)
         data_stripped = Vector{UInt}(undef, length(data) - (nblocks * nmeta))
         j = length(data_stripped)
         i = length(data)
@@ -735,12 +735,13 @@ function tree!(root::StackFrameTree{T}, all::Vector{UInt64}, lidict::Union{LineI
     startframe = length(all)
     skip = false
     for i in startframe:-1:1
-        startframe - 1 <= i <= startframe - 2 && continue # skip metadata (its read ahead below)
+        startframe - 1 <= i <= startframe - 3 && continue # skip metadata (its read ahead below)
         ip = all[i]
         if ip == 0
             # read metadata
-            taskid = all[i - 1]
-            threadid = all[i - 2]
+            # time = all[i - 1]
+            taskid = all[i - 2]
+            threadid = all[i - 3]
             if !in(threadid, threads) || !in(taskid, tasks)
                 skip = true
                 continue