Add Tracing.libraryName

Author: Kyle-Ye

Package.resolved

@@ -1,20 +1,9 @@
 //
-//  Tracing.swift
+//  DescriptiveDynamicProperty.swift
 //  OpenSwiftUI
 //
-//  Audited for RELEASE_2021
-//  Status: WIP
-//  ID: D59B7A281FFF29619A43A3D8F551CCE1
-
-// MARK: - Tracing
-
-enum Tracing {
-    static func libraryName(defining _: Any.Type) -> String {
-        // TODO:
-        ""
-    }
-//    private static moduleLookupCache: ThreadSpecific<[UnsafeRawPointer : String]>
-}
+//  Created by Kyle on 2024/9/22.
+//
 
 // MARK: - DescriptiveDynamicProperty
 

Sources/OpenSwiftUI/Core/Util/Tracing.swift renamed to Sources/OpenSwiftUI/Core/Util/DescriptiveDynamicProperty.swift

@@ -47,7 +47,7 @@ package enum Log {
         #if OPENSWIFTUI_SWIFT_LOG
         internalErrorsLog.debug("\(message()) \(file) \(line)")
         #else
-        #if DEBUG
+        #if DEBUG && OPENSWIFTUI_SUPPORT_2022_API
         os_log(.default, log: internalErrorsLog, "%s %s: %s", message(), file.description, line.description)
         #endif
         #endif
@@ -82,8 +82,8 @@ package enum Log {
         #else
         #if OPENSWIFTUI_SUPPORT_2022_API
         os_log(.fault, log: internalErrorsLog, "%s %s: %s", message(), file.description, line.description)
-        print("\(message()) - \(file): - please file a bug report")
         #endif
+        print("\(message()) - \(file): - please file a bug report")
         #endif
     }
 

Sources/OpenSwiftUICore/Log/Logging.swift

@@ -7,16 +7,23 @@
 //  ID: 34756F646CF7AC3DBE2A8E0B344C962F
 
 internal import OpenGraphShims
-#if canImport(os)
+#if canImport(Darwin)
 import os.signpost
 #endif
 
-struct Signpost {
+package struct Signpost {
+    #if canImport(Darwin)
+    package static let archiving = OSSignposter(logger: Log.archiving)
+    package static let metaExtraction = OSSignposter(logger: Log.metadataExtraction)
+    #endif
+    
+    package static let moduleName: String = Tracing.libraryName(defining: Signpost.self)
+    
     private let style: Style
     private let stability: Stability
 
     // TODO
-    var isEnabled: Bool {
+    package var isEnabled: Bool {
         switch stability {
         case .disabled, .verbose, .debug:
             return false
@@ -25,14 +32,14 @@ struct Signpost {
         }
     }
 
-    static let render = Signpost(style: .kdebug(0), stability: .published)
-    static let renderUpdate = Signpost(style: .kdebug(0), stability: .published)
-    static let viewHost = Signpost(style: .kdebug(9), stability: .published)
-    static let bodyInvoke = Signpost(style: .kdebug(5), stability: .published)
+    package static let render = Signpost(style: .kdebug(0), stability: .published)
+    package static let renderUpdate = Signpost(style: .kdebug(0), stability: .published)
+    package static let viewHost = Signpost(style: .kdebug(9), stability: .published)
+    package static let bodyInvoke = Signpost(style: .kdebug(5), stability: .published)
 
     @_transparent
     @inline(__always)
-    func traceInterval<R>(
+    package func traceInterval<R>(
         object: AnyObject? = nil,
         _ message: StaticString?,
         closure: () -> R
@@ -46,7 +53,7 @@ struct Signpost {
 
     @_transparent
     @inline(__always)
-    func traceInterval<R>(
+    package func traceInterval<R>(
         object: AnyObject? = nil,
         _ message: StaticString?,
         _ arguments: @autoclosure () -> [CVarArg],
@@ -77,7 +84,7 @@ extension Signpost {
 @_transparent
 @inline(__always)
 // FIXME
-func traceRuleBody<R>(_ type: Any.Type, body: () -> R) -> R {
+package func traceRuleBody<R>(_ type: Any.Type, body: () -> R) -> R {
     Signpost.bodyInvoke.traceInterval(
         "%{public}@.body [in %{public}@]",
         [OGTypeID(type).description, Tracing.libraryName(defining: type)]

Sources/OpenSwiftUI/Core/Log/Signpost.swift renamed to Sources/OpenSwiftUICore/Log/Signpost.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-import Foundation
+@preconcurrency import Foundation
 
 final package class ThreadSpecific<T> {
     var key: pthread_key_t
@@ -15,6 +15,9 @@ final package class ThreadSpecific<T> {
         key = 0
         self.defaultValue = defaultValue
         pthread_key_create(&key) { pointer in
+            #if !canImport(Darwin)
+            guard let pointer else { return }
+            #endif
             pointer.withMemoryRebound(to: Any.self, capacity: 1) { ptr in
                 ptr.deinitialize(count: 1)
                 ptr.deallocate()
@@ -56,7 +59,10 @@ package func onMainThread(do body: @escaping () -> Void) {
     if Thread.isMainThread {
         body()
     } else {
-        RunLoop.main.perform(inModes: [.common], block: body)
+        RunLoop.main.perform(inModes: [.common]) {
+            // Workaround the @Senable warning
+            body()
+        }
     }
     #endif
 }

Sources/OpenSwiftUICore/Util/ThreadUtils.swift

@@ -0,0 +1,54 @@
+//
+//  Tracing.swift
+//  OpenSwiftUICore
+//
+//  Audited for RELEASE_2024
+//  Status: WIP
+//  ID: D59B7A281FFF29619A43A3D8F551CCE1 (RELEASE_2021)
+//  ID: 56D4CED87D5B226E2B40FB60C47D6F49 (RELEASE_2024)
+
+#if canImport(Darwin)
+import Darwin
+#elseif canImport(Glibc)
+import Glibc
+#elseif canImport(Musl)
+import Musl
+#elseif os(WASI)
+import WASILibc
+#endif
+internal import OpenGraphShims
+import Foundation
+
+enum Tracing {
+    // RELEASE_2021 ID: D59B7A281FFF29619A43A3D8F551CCE1
+    // RELEASE_2024 ID: 56D4CED87D5B226E2B40FB60C47D6F49
+    private static var moduleLookupCache = ThreadSpecific<[UnsafeRawPointer : String]>([:])
+    
+    static func libraryName(defining type: Any.Type) -> String {
+        let unknown = "ModuleUnknown"
+        guard let nominalDescriptor = OGTypeID(type).nominalDescriptor else {
+            return unknown
+        }
+        if let cachedName = moduleLookupCache.value[nominalDescriptor] {
+            return cachedName
+        } else {
+            #if canImport(Darwin)
+            var info = Dl_info()
+            guard dladdr(nominalDescriptor, &info) == 0 else {
+                return unknown
+            }
+            let name = (String(cString: info.dli_fname) as NSString).lastPathComponent
+            moduleLookupCache.value[nominalDescriptor] = name
+            return unknown
+            #else
+            // TODO: [Easy] Add a C layer to import dladdr on non-Darwin Swift platform
+            // See https://forums.swift.org/t/dladdr-and-the-clang-importer/26379/11
+            return unknown
+            #endif
+        }
+    }
+    
+    static func nominalTypeName(_ type: Any.Type) -> String {
+        OGTypeID(type).description
+    }
+}