Update traceInternal and traceBody

Author: Kyle-Ye

Package.resolved

@@ -1,15 +1,6 @@
 {
-  "originHash" : "5ab08033fa312aa04f0cf9d4751edd41156f13745ec663a3da48d38ca11c507b",
+  "originHash" : "093c1851811a8423bb946386b7901adf094aa28258f12ae335ef9ee3a59018c7",
   "pins" : [
-    {
-      "identity" : "opencombine",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/OpenSwiftUIProject/OpenCombine.git",
-      "state" : {
-        "revision" : "63aef318cb3a853bcb8d774cce15f4dcb1ccdfe4",
-        "version" : "0.15.1"
-      }
-    },
     {
       "identity" : "opengraph",
       "kind" : "remoteSourceControl",
@@ -18,15 +9,6 @@
         "branch" : "main",
         "revision" : "7f22fb5948bb6bc77603f5496a9881622041d3bb"
       }
-    },
-    {
-      "identity" : "swift-log",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log",
-      "state" : {
-        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
-        "version" : "1.6.1"
-      }
     }
   ],
   "version" : 3

Sources/OpenSwiftUICore/Log/Signpost.swift

@@ -101,8 +101,8 @@ package struct Signpost {
         #if canImport(Darwin)
         switch style {
         case let .kdebug(code):
-            return kdebug_is_enabled(UInt32(code))
-        case let .os_log(name):
+            return kdebug_is_enabled(UInt32(OSSignpostType.event.rawValue & 0xfc) | (UInt32(code) << 2) & 0x3fc | 0x14110000)
+        case .os_log:
             guard kdebug_is_enabled(UInt32(OSSignpostType.event.rawValue & 0xfc) | 0x14110000) else {
                 return false
             }
@@ -115,44 +115,107 @@ package struct Signpost {
 
     // TODO
     @_transparent
-    @inline(__always)
-    package func traceInterval<R>(
-        object: AnyObject? = nil,
+    package func traceInterval<T>(
+        object: AnyObject?,
         _ message: StaticString?,
-        closure: () -> R
-    ) -> R {
+        closure: () -> T
+    ) -> T {
         guard isEnabled else {
             return closure()
         }
-        // TODO
-        return closure()
+        let id = OSSignpostID.makeExclusiveID(object)
+        switch style {
+        case let .kdebug(code):
+            kdebug_trace(UInt32(code) << 2 | (UInt32(OSSignpostType.begin.rawValue & 0xfc) | 0x14110000), id.rawValue, 0, 0, 0)
+            defer { kdebug_trace(UInt32(code) << 2 | (UInt32(OSSignpostType.end.rawValue & 0xfc) | 0x14110000), id.rawValue, 0, 0, 0) }
+            return closure()
+        case let .os_log(name):
+            if let message {
+                os_signpost(.begin, log: _signpostLog, name: name, signpostID: id, message, [])
+            } else {
+                os_signpost(.begin, log: _signpostLog, name: name, signpostID: id)
+            }
+            defer { os_signpost(.end, log: _signpostLog, name: name, signpostID: id) }
+            return closure()
+        }
     }
 
-    // TODO
     @_transparent
-    @inline(__always)
-    package func traceInterval<R>(
+    package func traceInterval<T>(
         object: AnyObject? = nil,
-        _ message: StaticString?,
-        _ arguments: @autoclosure () -> [CVarArg],
-        closure: () -> R
-    ) -> R {
+        _ message: StaticString,
+        _ args: @autoclosure () -> [any CVarArg],
+        closure: () -> T
+    ) -> T {
         guard isEnabled else {
             return closure()
         }
+        let id = OSSignpostID.makeExclusiveID(object)
+        switch style {
+        case let .kdebug(code):
+            // FIXME: _primitive
+            print(code)
+            return closure()
+        case let .os_log(name):
+            os_signpost(.begin, log: _signpostLog, name: name, signpostID: id, message, args())
+            defer { os_signpost(.end, log: _signpostLog, name: name, signpostID: id) }
+            return closure()
+        }
+    }
+    
+    @_transparent
+    package func traceEvent(
+        type: OSSignpostType,
+        object: AnyObject?,
+        _ message: StaticString,
+        _ args: @autoclosure () -> [any CVarArg]
+    ) {
+        guard isEnabled else {
+            return
+        }
+        #if canImport(Darwin)
+        let id = OSSignpostID.makeExclusiveID(object)
+        let args = args()
+
+        switch style {
+        case let .kdebug(code):
+            // FIXME: _primitive
+            print(code)
+            return
+        case let .os_log(name):
+            os_signpost(type, log: _signpostLog, name: name, signpostID: id, message, args)
+        }
+        #endif
+    }
+    
+    #if canImport(Darwin)
+    private func _primitive(
+        _ type: OSSignpostType,
+        log: OSLog,
+        signpostID: OSSignpostID,
+        _ message: StaticString?,
+        _ arguments: [any CVarArg]?
+    ) {
         // TODO
-        return closure()
     }
+    #endif
 }
 
-// TODO
-@_transparent
-@inline(__always)
-package func traceRuleBody<R>(_ type: Any.Type, body: () -> R) -> R {
-    Signpost.bodyInvoke.traceInterval(
-        "%{public}@.body [in %{public}@]",
-        [OGTypeID(type).description, Tracing.libraryName(defining: type)]
-    ) {
-        body()
+#if canImport(Darwin)
+extension OSSignpostID {
+    private static let continuation = OSSignpostID(0x0ea89ce2)
+    
+    @inline(__always)
+    static func makeExclusiveID(_ object: AnyObject?) -> OSSignpostID {
+        if let object {
+            OSSignpostID(log: _signpostLog, object: object)
+        } else {
+            .exclusive
+        }
     }
 }
+#endif
+
+private func withKDebugValues(_ code: UInt32, _ args: [(any CVarArg)?], closure: (([UInt64]) -> Void)) {
+    // TODO
+}

Sources/OpenSwiftUICore/Util/Tracing.swift

@@ -18,9 +18,13 @@ import WASILibc
 #endif
 internal import OpenGraphShims
 import Foundation
+internal import COpenSwiftUICore
+#if canImport(Darwin)
+import os.log
+#endif
 
 enum Tracing {
-    private static var moduleLookupCache = ThreadSpecific<[UnsafeRawPointer : String]>([:])
+    private static var moduleLookupCache = ThreadSpecific<[UnsafeRawPointer: String]>([:])
 
     static func libraryName(defining type: Any.Type) -> String {
         let unknown = "ModuleUnknown"
@@ -50,3 +54,27 @@ enum Tracing {
         OGTypeID(type).description
     }
 }
+
+@_transparent
+package func traceBody<Body>(_ v: any Any.Type, body: () -> Body) -> Body {
+    #if canImport(Darwin)
+    // Signpost.bodyInvoke.traceInterval
+    guard kdebug_is_enabled(UInt32(OSSignpostType.event.rawValue) & 0xF8 | 0x1411_0014) else {
+        return body()
+    }
+    // TODO: OGTypeID(type).description, Tracing.libraryName(defining: v)
+    return body()
+    #else
+    body()
+    #endif
+}
+
+@_transparent
+package func traceRuleBody<Body>(_ v: any Any.Type, body: () -> Body) -> Body {
+    #if canImport(Darwin)
+    // TODO:
+    return body()
+    #else
+    body()
+    #endif
+}