Add more signposter intervals

Author: nikitabobko

Sources/AppBundle/layout/refresh.swift

@@ -16,6 +16,10 @@ func runRefreshSession(
 
 @MainActor
 func runRefreshSessionBlocking(_ event: RefreshSessionEvent) async throws {
+    let state = signposter.beginInterval(#function, "event: \(event) axTaskLocalAppThreadToken: \(axTaskLocalAppThreadToken?.idForDebug)")
+    defer {
+        signposter.endInterval(#function, state)
+    }
     if !TrayMenuModel.shared.isEnabled { return }
     try await $refreshSessionEventForDebug.withValue(event) {
         try await refresh()
@@ -37,6 +41,10 @@ func runSession<T>(
     _ token: RunSessionGuard,
     body: @MainActor () async throws -> T
 ) async throws -> T {
+    let state = signposter.beginInterval(#function, "event: \(event) axTaskLocalAppThreadToken: \(axTaskLocalAppThreadToken?.idForDebug)")
+    defer {
+        signposter.endInterval(#function, state)
+    }
     activeRefreshTask?.cancel() // Give priority to runSession
     activeRefreshTask = nil
     return try await $refreshSessionEventForDebug.withValue(event) {

Sources/AppBundle/tree/MacApp.swift

@@ -290,7 +290,7 @@ final class MacApp: AbstractApp {
                 }
             }
 
-            for window in axApp.threadGuarded.get(Ax.windowsAttr, signpostEvent: nsApp.idForDebug) ?? [] {
+            for window in axApp.threadGuarded.get(Ax.windowsAttr) ?? [] {
                 try job.checkCancellation()
                 result.getOrRegisterAxWindow(window, nsApp)
             }

Sources/AppBundle/util/accessibility.swift

@@ -300,16 +300,20 @@ private func tryGetWindow(_ any: Any?) -> AXUIElement? {
 }
 
 extension AXUIElement {
-    func get<Attr: ReadableAttr>(_ attr: Attr, signpostEvent: String? = nil, function: String = #function) -> Attr.T? {
-        let state = signposter.beginInterval("AXUIElement.get", "\(function): \(signpostEvent)")
+    func get<Attr: ReadableAttr>(_ attr: Attr) -> Attr.T? {
+        let state = signposter.beginInterval(#function, "axTaskLocalAppThreadToken: \(axTaskLocalAppThreadToken?.idForDebug)")
         defer {
-            signposter.endInterval("AXUIElement.get", state)
+            signposter.endInterval(#function, state)
         }
         var raw: AnyObject?
         return AXUIElementCopyAttributeValue(self, attr.key as CFString, &raw) == .success ? attr.getter(raw!) : nil
     }
 
     @discardableResult func set<Attr: WritableAttr>(_ attr: Attr, _ value: Attr.T) -> Bool {
+        let state = signposter.beginInterval(#function, "axTaskLocalAppThreadToken: \(axTaskLocalAppThreadToken?.idForDebug)")
+        defer {
+            signposter.endInterval(#function, state)
+        }
         guard let value = attr.setter(value) else { return false }
         return AXUIElementSetAttributeValue(self, attr.key as CFString, value) == .success
     }

Sources/Common/model/AxAppThreadToken.swift

@@ -3,7 +3,7 @@ import Foundation
 @TaskLocal
 public var axTaskLocalAppThreadToken: AxAppThreadToken? = nil
 
-public struct AxAppThreadToken: Sendable, Equatable {
+public struct AxAppThreadToken: Sendable, Equatable, CustomStringConvertible {
     public let pid: pid_t
     public let idForDebug: String
 
@@ -17,4 +17,6 @@ public struct AxAppThreadToken: Sendable, Equatable {
     public func checkEquals(_ other: AxAppThreadToken?) {
         check(self == other, "\(self) != \(other.optionalToPrettyString())")
     }
+
+    public var description: String { idForDebug }
 }

Sources/Common/util/commonUtil.swift

@@ -66,7 +66,7 @@ public func dieT<T>(
     fatalError("\n" + message)
 }
 
-public enum RefreshSessionEvent: Sendable {
+public enum RefreshSessionEvent: Sendable, CustomStringConvertible {
     case globalObserver(String)
     case globalObserverLeftMouseUp
     case menuBarButton
@@ -76,6 +76,20 @@ public enum RefreshSessionEvent: Sendable {
     case socketServer
     case resetManipulatedWithMouse
     case ax(String)
+
+    public var description: String {
+        switch self {
+            case .ax(let str): "ax(\(str))"
+            case .globalObserver(let str): "globalObserver(\(str))"
+            case .globalObserverLeftMouseUp: "globalObserverLeftMouseUp"
+            case .hotkeyBinding: "hotkeyBinding"
+            case .menuBarButton: "menuBarButton"
+            case .resetManipulatedWithMouse: "resetManipulatedWithMouse"
+            case .socketServer: " socketServer"
+            case .startup1: "startup1"
+            case .startup2: "startup2"
+        }
+    }
 }
 
 public func throwT<T>(_ error: Error) throws -> T {