Fix various issues with EventPipe

Author: xoofx

src/Ultra.Core/Ultra.Core.csproj

@@ -41,4 +41,15 @@
     <ProjectReference Include="..\Ultra.ProcessHook\Ultra.ProcessHook.csproj" />
     <ProjectReference Include="..\Ultra.Sampler\Ultra.Sampler.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\Ultra.Sampler\libUltraSampler.dylib">
+      <Link>libUltraSampler.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Ultra.Sampler\libUltraSamplerIndirect.dyld">
+      <Link>libUltraSamplerIndirect.dyld</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

src/Ultra.Core/UltraProfiler.cs

@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using ByteSizeLib;
-using Microsoft.Diagnostics.Tracing.Session;
 
 namespace Ultra.Core;
 
@@ -87,14 +86,21 @@ public void Dispose()
     }
 
     private protected abstract void DisposeImpl();
-    
+
     /// <summary>
     /// Determines whether the current process is running with elevated privileges.
     /// </summary>
     /// <returns>True if the current process is running with elevated privileges; otherwise, false.</returns>
     public static bool IsElevated()
     {
-        var isElevated = TraceEventSession.IsElevated();
+        if (OperatingSystem.IsMacOS()) return true;
+
+        return IsElevatedWindows();
+    }
+
+    private static bool IsElevatedWindows()
+    {
+        var isElevated = Microsoft.Diagnostics.Tracing.Session.TraceEventSession.IsElevated();
         return isElevated.HasValue && isElevated.Value;
     }
 
@@ -155,7 +161,7 @@ public async Task<string> Run(UltraProfilerOptions ultraProfilerOptions)
         }
         else if (ultraProfilerOptions.ProgramPath != null)
         {
-            if (!ultraProfilerOptions.ProgramPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+            if (OperatingSystem.IsWindows() && !ultraProfilerOptions.ProgramPath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
             {
                 throw new ArgumentException($"Executable path {ultraProfilerOptions.ProgramPath} must end with .exe");
             }
@@ -300,11 +306,11 @@ public async Task<string> Run(UltraProfilerOptions ultraProfilerOptions)
         }
 
         await runner.OnFinalCleanup();
-        
+
         return jsonFinalFile;
     }
 
-    
+
     private protected abstract ProfilerRunner CreateRunner(UltraProfilerOptions ultraProfilerOptions, List<Process> processList, string baseName, Process? singleProcess);
 
     /// <summary>
@@ -373,7 +379,7 @@ private async Task EnableProfiling(ProfilerRunner runner, UltraProfilerOptions u
         // Reset the clock to account for the duration of the profiler
         ProfilerClock.Restart();
     }
-    
+
     private protected async Task WaitForStaleFile(string file, UltraProfilerOptions options)
     {
         var clock = Stopwatch.StartNew();

src/Ultra.Core/UltraProfilerEventPipe.cs

@@ -21,7 +21,7 @@ namespace Ultra.Core;
 internal sealed class UltraProfilerEventPipe : UltraProfiler
 {
     private static string PathToNativeUltraSampler => Path.Combine(AppContext.BaseDirectory, "libUltraSamplerIndirect.dyld");
-    
+
     /// <summary>
     /// Initializes a new instance of the <see cref="UltraProfiler"/> class.
     /// </summary>
@@ -117,6 +117,7 @@ private static void SetupUltraSampler(ProcessStartInfo startInfo)
             value = ultraSamplerPath;
         }
 
+        Console.WriteLine($"DYLD_INSERT_LIBRARIES={value}");
         startInfo.Environment[key] = value;
     }
 
@@ -228,13 +229,13 @@ public long TotalFileLength()
 
             return totalLength;
         }
-        
+
         public async Task StartProfiling()
         {
             var ultraEventProvider = new EventPipeProvider(UltraSamplerParser.Name, EventLevel.Verbose);
             _ultraSession = await _ultraDiagnosticsClient.StartEventPipeSessionAsync([ultraEventProvider], true, 256, _token).ConfigureAwait(false);
             _ultraEventStreamCopyTask = _ultraSession.EventStream.CopyToAsync(_ultraNetTraceFileStream, _token);
-            
+
             if (_mainDiagnosticsClient is not null)
             {
                 var jitEvents = ClrTraceEventParser.Keywords.JITSymbols |
@@ -290,5 +291,5 @@ public void Dispose()
             }
         }
     }
-    
+
 }

src/Ultra.Sampler/Ultra.Sampler.csproj

@@ -21,4 +21,10 @@
     <PackageReference Include="XenoAtom.Collections" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="libUltraSampler.dylib" />
+    
+    <None Remove="libUltraSamplerIndirect.dyld" />
+  </ItemGroup>
+
 </Project>

src/Ultra.Sampler/build_native.sh

@@ -2,6 +2,8 @@
 dotnet publish -c Release -r osx-arm64
 LIB_NAME=libUltraSampler.dylib
 LIB_OUTPUT_PATH=./bin/Release/net8.0/osx-arm64/publish/$LIB_NAME
-install_name_tool -id $LIB_NAME $LIB_OUTPUT_PATH
+#install_name_tool -id @loader/$LIB_NAME $LIB_OUTPUT_PATH
+install_name_tool -id @loader_path/$LIB_NAME $LIB_OUTPUT_PATH
 cp $LIB_OUTPUT_PATH ./$LIB_NAME
-clang -shared -O2 -o libUltraSamplerIndirect.dyld ultra_sampler_indirect.cpp ./$LIB_NAME
+clang -dynamiclib -O2 -o libUltraSamplerIndirect.dyld ultra_sampler_indirect.cpp -L . -l UltraSampler
+#install_name_tool -change $LIB_NAME @loader/$LIB_NAME libUltraSamplerIndirect.dyld

src/Ultra.Sampler/ultra_sampler_indirect.cpp

@@ -9,7 +9,6 @@
 extern "C" {
     void ultra_sampler_start();
 
-
     void set_temporary_tmpdir(const char* sub_dir_name, void (*func)()) {
         // Get the current TMPDIR
         const char* original_tmpdir = getenv("TMPDIR");