Tracy

Directory.Packages.props

@@ -1,7 +1,8 @@
 <Project>
-    <Import Project="RobustToolbox/Directory.Packages.props" />
-    <ItemGroup>
-        <PackageVersion Include="NUnit.ConsoleRunner" Version="3.15.0" />
-        <PackageVersion Include="Byond.TopicSender" Version="8.0.1" />
-    </ItemGroup>
+  <Import Project="RobustToolbox/Directory.Packages.props" />
+  <ItemGroup>
+    <PackageVersion Include="NUnit.ConsoleRunner" Version="3.15.0" />
+    <PackageVersion Include="Byond.TopicSender" Version="8.0.1" />
+    <PackageVersion Include="Tracy-CSharp" Version="0.11.1-hotfix" />
+  </ItemGroup>
 </Project>

OpenDreamRuntime/DreamManager.cs

@@ -80,16 +80,17 @@ public void StartWorld() {
             // It is now OK to call user code, like /New procs.
             Initialized = true;
             InitializedTick = _gameTiming.CurTick;
+            using (Profiler.BeginZone("StartWorld", color:(uint)Color.OrangeRed.ToArgb())) {
+                // Call global <init> with waitfor=FALSE
+                _objectTree.GlobalInitProc?.Spawn(WorldInstance, new());
 
-            // Call global <init> with waitfor=FALSE
-            _objectTree.GlobalInitProc?.Spawn(WorldInstance, new());
+                // Call New() on all /area and /turf that exist, each with waitfor=FALSE separately. If <global init> created any /area, call New a SECOND TIME
+                // new() up /objs and /mobs from compiled-in maps [order: (1,1) then (2,1) then (1,2) then (2,2)]
+                _dreamMapManager.InitializeAtoms(_compiledJson.Maps);
 
-            // Call New() on all /area and /turf that exist, each with waitfor=FALSE separately. If <global init> created any /area, call New a SECOND TIME
-            // new() up /objs and /mobs from compiled-in maps [order: (1,1) then (2,1) then (1,2) then (2,2)]
-            _dreamMapManager.InitializeAtoms(_compiledJson.Maps);
-
-            // Call world.New()
-            WorldInstance.SpawnProc("New");
+                // Call world.New()
+                WorldInstance.SpawnProc("New");
+            }
         }
 
         public void Shutdown() {
@@ -102,13 +103,26 @@ public void Shutdown() {
         public void Update() {
             if (!Initialized)
                 return;
+            using (Profiler.BeginZone("Tick", color:(uint)Color.OrangeRed.ToArgb()))
+            {
+                using (Profiler.BeginZone("DM Execution", color:(uint)Color.LightPink.ToArgb()))
+                    _procScheduler.Process();
+
+                using (Profiler.BeginZone("Map Update", color:(uint)Color.LightPink.ToArgb())){
+                    UpdateStat();
+                    _dreamMapManager.UpdateTiles();
+                }
+
+                using (Profiler.BeginZone("Disk IO", color:(uint)Color.LightPink.ToArgb()))
+                    DreamObjectSavefile.FlushAllUpdates();
+
+                WorldInstance.SetVariableValue("cpu", WorldInstance.GetVariable("tick_usage"));
+
+                using (Profiler.BeginZone("Deletion Queue", color:(uint)Color.LightPink.ToArgb()))
+                    ProcessDelQueue();
+            }
 
-            _procScheduler.Process();
-            UpdateStat();
-            _dreamMapManager.UpdateTiles();
-            DreamObjectSavefile.FlushAllUpdates();
-            WorldInstance.SetVariableValue("cpu", WorldInstance.GetVariable("tick_usage"));
-            ProcessDelQueue();
+            Profiler.EmitFrameMark();
         }
 
         public void ProcessDelQueue() {

OpenDreamRuntime/DreamThread.cs

@@ -137,7 +137,9 @@
     public abstract class ProcState : IDisposable {
         private static int _idCounter = 0;
         public int Id { get; } = ++_idCounter;
-
+        public abstract (string SourceFile, int Line) TracyLocationId { get; }
+        public ProfilerZone TracyZoneId { get; set; }
+        public bool TracyZoned { get; set; }
         public DreamThread Thread { get; set; }
 
         [Access(typeof(ProcScheduler))]
@@ -252,6 +254,11 @@
                 while (_current != null) {
                     ProcStatus status;
                     try {
+                        if (!_current.TracyZoned && _current.Proc != null) {
+                            var location =_current.TracyLocationId;
+                            _current.TracyZoneId = Profiler.BeginZone((_current.Proc.OwningType.Path.Equals("/") ? "/proc/" : _current.Proc.OwningType.Path+"/") +_current.Proc.Name, filePath: location.SourceFile, lineNumber:(uint)location.Line);
+                            _current.TracyZoned = true;
+                        }
                         // _current.Resume may mutate our state!!!
                         status = _current.Resume();
                     } catch (DMError dmError) {
@@ -274,15 +281,29 @@
                     switch (status) {
                         // The entire Thread is stopping
                         case ProcStatus.Cancelled:
+                            if (_current.TracyZoned) {
+                                _current.TracyZoneId.Dispose();
+                                _current.TracyZoned = false;
+                            }
                             var current = _current;
                             _current = null;
+                            foreach (var s in _stack) {
+                                if (!s.TracyZoned)
+                                    continue;
+                                s.TracyZoneId.Dispose();
+                                s.TracyZoned = false;
+                            }
                             _stack.Clear();
                             resultStatus = status;
                             return current.Result;
 
                         // Our top-most proc just returned a value
                         case ProcStatus.Returned:
                             var returned = _current.Result;
+                            if (_current.TracyZoned) {
+                                _current.TracyZoneId.Dispose();
+                                _current.TracyZoned = false;
+                            }
                             PopProcState();
 
                             // If our stack is empty, the context has finished execution
@@ -298,6 +319,17 @@
 
                         // The context is done executing for now
                         case ProcStatus.Deferred:
+                            if (_current.TracyZoned) {
+                                _current.TracyZoneId.Dispose();
+                                _current.TracyZoned = false;
+                            }
+
+                            foreach (var s in _stack) {
+                                if (!s.TracyZoned)
+                                    continue;
+                                s.TracyZoneId.Dispose();
+                                s.TracyZoned = false;
+                            }
                             // We return the current return value here even though it may not be the final result
                             resultStatus = status;
                             return _current.Result;

OpenDreamRuntime/OpenDreamRuntime.csproj

@@ -14,6 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Byond.TopicSender" />
+    <PackageReference Include="Tracy-CSharp" />
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />

OpenDreamRuntime/Procs/AsyncNativeProc.cs

@@ -26,6 +26,8 @@ public sealed class State : ProcState {
             private AsyncNativeProc? _proc;
             public override DreamProc? Proc => _proc;
 
+            public override (string SourceFile, int Line) TracyLocationId => ("Native Proc", 0);
+
             private Func<State, Task<DreamValue>> _taskFunc;
             private Task? _task;
 

OpenDreamRuntime/Procs/DMProc.cs

@@ -50,6 +50,8 @@ public DMProc(int id, TreeEntry owningType, ProcDefinitionJson json, string? nam
         }
 
         public (string Source, int Line) GetSourceAtOffset(int offset) {
+            if(SourceInfo.Count == 0)
+                return ("whatthefuck",0);
             SourceInfoJson current = SourceInfo[0];
             string source = ObjectTree.Strings[current.File!.Value];
 
@@ -151,6 +153,8 @@ public sealed class NullProcState : ProcState {
 
         public override DreamProc? Proc => _proc;
 
+        public override (string SourceFile, int Line) TracyLocationId => ("<null>",0);
+
         private DreamProc? _proc;
 
         public override ProcStatus Resume() {
@@ -354,6 +358,9 @@ public sealed class DMProcState : ProcState {
         private DMProc _proc;
         public override DMProc Proc => _proc;
 
+        public override (string SourceFile, int Line) TracyLocationId => _proc.GetSourceAtOffset(_pc+1);
+
+
         /// Static initializer for maintainer friendly OpcodeHandlers to performance friendly _opcodeHandlers
         static unsafe DMProcState() {
             int maxOpcode = (int)_opcodeHandlers.Keys.Max();

OpenDreamRuntime/Procs/InitDreamObject.cs

@@ -9,7 +9,7 @@ internal sealed class InitDreamObjectState : ProcState {
         private readonly DreamObjectTree _objectTree;
 
         private enum Stage {
-            // Need to call the object's (init) proc
+        // Need to call the object's (init) proc
             Init,
 
             // Need to call IDreamMetaObject.OnObjectCreated & New
@@ -42,6 +42,8 @@ public void Initialize(DreamThread thread, DreamObject dreamObject, DreamObject?
 
         public override DreamProc? Proc => null;
 
+        public override (string SourceFile, int Line) TracyLocationId => ($"new {_dreamObject.ObjectDefinition.Type}",0);
+
         public override void AppendStackFrame(StringBuilder builder) {
             builder.AppendLine($"new {_dreamObject.ObjectDefinition.Type}");
         }