From 7887b10a5c8370ed81905902a01f2e3c35113f72 Mon Sep 17 00:00:00 2001 From: Gregory LEOCADIE Date: Thu, 12 Dec 2024 11:40:51 +0100 Subject: [PATCH] Fix tests --- .../Datadog.Profiler.Native.Linux/wrapper_callback.s | 4 ++-- .../Datadog.Profiler.Native/ManagedThreadInfo.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/wrapper_callback.s b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/wrapper_callback.s index 83a4c542b700..893dd328686c 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/wrapper_callback.s +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/wrapper_callback.s @@ -34,10 +34,10 @@ dd_restart_wrapper: # and rsp, -16 # Make sure the stack is 16-byte aligned # Mark the execution as resumed - mov qword ptr [rdi + 8], 1 + mov qword ptr [rdi + 16], 1 # Restore rdi - mov rdi, qword ptr [rdi + 16] + mov rdi, qword ptr [rdi + 8] # Epilogue # leave diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/ManagedThreadInfo.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/ManagedThreadInfo.h index a6bf430be922..8779f9ea098c 100644 --- a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/ManagedThreadInfo.h +++ b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/ManagedThreadInfo.h @@ -171,7 +171,7 @@ struct ManagedThreadInfo : public IThreadInfo std::uintptr_t Flag; }; - WrapperThreadContext _wrapperContext = {0, 0, 1}; + WrapperThreadContext _wrapperContext = {0xdeadbeef, 0xdeadbeef, 1}; public: // should be previous snapshot (missing spanid and stuff)