Fix hook and dylib

xoofx · Dec 13, 2024 · 5fcf716 · 5fcf716
1 parent 03e8a6b
commit 5fcf716
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/Ultra.Core/Ultra.Core.csproj b/src/Ultra.Core/Ultra.Core.csproj
@@ -44,7 +44,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <!--<ItemGroup>
+  <ItemGroup>
     <Content Include="..\Ultra.Sampler\libUltraSampler.dylib">
       <Link>libUltraSampler.dylib</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -53,5 +53,5 @@
       <Link>libUltraSamplerHook.dylib</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-  </ItemGroup>-->
+  </ItemGroup>
 </Project>
diff --git a/src/Ultra.Core/UltraProfilerEventPipe.cs b/src/Ultra.Core/UltraProfilerEventPipe.cs
@@ -11,7 +11,7 @@ namespace Ultra.Core;
 /// </summary>
 internal sealed class UltraProfilerEventPipe : UltraProfiler
 {
-    private static string PathToNativeUltraSampler => Path.Combine(AppContext.BaseDirectory, "libUltraSamplerHook.dyld");
+    private static string PathToNativeUltraSampler => Path.Combine(AppContext.BaseDirectory, "libUltraSamplerHook.dylib");
 
     /// <summary>
     /// Initializes a new instance of the <see cref="UltraProfiler"/> class.
@@ -97,11 +97,13 @@ private static void SetupUltraSampler(ProcessStartInfo startInfo)
 
     private class UltraSamplerProfilerState
     {
+        private readonly CancellationToken _token;
         private readonly DiagnosticPortSession _samplerSession;
         private readonly DiagnosticPortSession _clrSession;
-        
+
         public UltraSamplerProfilerState(string baseName, int pid, CancellationToken token)
         {
+            _token = token;
             _samplerSession = new(pid, true, baseName, token);
             _clrSession = new(pid, false, baseName, token);
         }
@@ -129,8 +131,11 @@ public long TotalFileLength()
         public async Task StartProfiling()
         {
             await _samplerSession.WaitForConnectAndStartSession();
+
+            await _samplerSession.StartProfiling(_token);
+            await _clrSession.StartProfiling(_token);
         }
-        
+
         public async ValueTask StopAndDisposeAsync()
         {
             await _samplerSession.StopAndDisposeAsync().ConfigureAwait(false);

diff --git a/src/Ultra.Sampler/libUltraSampler.dylib b/src/Ultra.Sampler/libUltraSampler.dylib
diff --git a/src/Ultra.Sampler/libUltraSamplerHook.dylib b/src/Ultra.Sampler/libUltraSamplerHook.dylib