Merge pull request #44162 from jpsamaroo/jps/alloc-ns-ct

Profile.Allocs: Add task and timestamp (take 2)

Author: vchuravy

src/gc-alloc-profiler.cpp

@@ -20,6 +20,8 @@ struct jl_raw_alloc_t {
     jl_datatype_t *type_address;
     jl_raw_backtrace_t backtrace;
     size_t size;
+    jl_task_t *task;
+    uint64_t timestamp;
 };
 
 // == These structs define the global singleton profile buffer that will be used by
@@ -132,7 +134,9 @@ void _maybe_record_alloc_to_profile(jl_value_t *val, size_t size, jl_datatype_t
     profile.allocs.emplace_back(jl_raw_alloc_t{
         type,
         get_raw_backtrace(),
-        size
+        size,
+        jl_current_task,
+        cycleclock()
     });
 }
 

src/julia_internal.h

@@ -129,7 +129,7 @@ int jl_running_under_rr(int recheck) JL_NOTSAFEPOINT;
 JL_DLLEXPORT uint64_t jl_hrtime(void) JL_NOTSAFEPOINT;
 
 // number of cycles since power-on
-static inline uint64_t cycleclock(void)
+static inline uint64_t cycleclock(void) JL_NOTSAFEPOINT
 {
 #if defined(_CPU_X86_64_)
     uint64_t low, high;

stdlib/Profile/src/Allocs.jl

@@ -19,6 +19,8 @@ struct RawAlloc
     type::Ptr{Type}
     backtrace::RawBacktrace
     size::Csize_t
+    task::Ptr{Cvoid}
+    timestamp::UInt64
 end
 
 # matches jl_profile_allocs_raw_results_t on the C side
@@ -121,6 +123,8 @@ struct Alloc
     type::Any
     stacktrace::StackTrace
     size::Int
+    task::Ptr{Cvoid}
+    timestamp::UInt64
 end
 
 struct AllocResults
@@ -158,7 +162,9 @@ function decode_alloc(cache::BacktraceCache, raw_alloc::RawAlloc)::Alloc
     Alloc(
         load_type(raw_alloc.type),
         stacktrace_memoized(cache, load_backtrace(raw_alloc.backtrace)),
-        UInt(raw_alloc.size)
+        UInt(raw_alloc.size),
+        raw_alloc.task,
+        raw_alloc.timestamp
     )
 end