Merge pull request #45 from Mervill/hotfix-updates

Hotfix updates
clibequilibrium · Oct 8, 2024 · 6779fca · 6779fca
2 parents 2215bd3 + cbd8180
commit 6779fca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/cs/samples/HelloWorld/HelloWorld.csproj b/src/cs/samples/HelloWorld/HelloWorld.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tracy-CSharp" Version="0.11.1" />
+    <PackageReference Include="Tracy-CSharp" Version="0.11.1-hotfix" />
   </ItemGroup>
 
 </Project>
diff --git a/src/cs/samples/HelloWorld/Profiler.cs b/src/cs/samples/HelloWorld/Profiler.cs
@@ -45,14 +45,9 @@ public static ProfilerZone BeginZone(
         using var filestr = GetCString(filePath, out var fileln);
         using var memberstr = GetCString(memberName, out var memberln);
         using var namestr = GetCString(zoneName, out var nameln);
-        var srcLocId = TracyAllocSrclocName(lineNumber, filestr, fileln, memberstr, memberln, namestr, nameln);
+        var srcLocId = TracyAllocSrclocName(lineNumber, filestr, fileln, memberstr, memberln, namestr, nameln, color);
         var context = TracyEmitZoneBeginAlloc(srcLocId, active ? 1 : 0);
 
-        if (color != 0)
-        {
-            TracyEmitZoneColor(context, color);
-        }
-
         if (text != null)
         {
             using var textstr = GetCString(text, out var textln);
@@ -123,6 +118,19 @@ private static CString GetPlotCString(string name)
         return plotCString;
     }
 
+    /// <summary>
+    /// Emit a string that will be included along with the trace description.
+    /// </summary>
+    /// <remarks>
+    /// Viewable in the Info tab in the profiler.
+    /// </remarks>
+    public static void AppInfo(string appInfo)
+    {
+        using var infostr = GetCString(appInfo, out var infoln);
+        TracyEmitMessageAppinfo(infostr, infoln);
+    }
+
+
     /// <summary>
     /// Emit the top-level frame marker.
     /// </summary>
@@ -140,7 +148,7 @@ public static void EmitFrameMark()
     /// <returns></returns>
     public static bool IsConnected()
     {
-        return Convert.ToBoolean(TracyConnected());
+        return TracyConnected() != 0;
     }
 
     /// <summary>

diff --git a/src/cs/samples/HelloWorld/Program.cs b/src/cs/samples/HelloWorld/Program.cs
@@ -34,6 +34,8 @@ static void ColoredEvent()
 
     internal static void Main(string[] args)
     {
+        Profiler.AppInfo("Hello AppInfo!");
+
         while (true)
         {
             Delay();