Code coverage

.github/workflows/swift.yml

@@ -15,14 +15,12 @@ jobs:
     - name: Xcode 15.2
       run: |
         sudo xcode-select -s '/Applications/Xcode_15.2.app/Contents/Developer'
-        xcodebuild -version
 
     - name: Build
-      run: sh build.sh DLog-Package
+      run: swift build
 
     - name: Test
       run: |
-        swift build
         swift test --enable-code-coverage
         xcrun llvm-cov export -format="lcov" .build/debug/DLogPackageTests.xctest/contents/macos/DLogPackageTests -instr-profile .build/debug/codecov/default.profdata -ignore-filename-regex='Tests' -ignore-filename-regex='Net' > info.lcov
 

Sources/DLog/LogInterval.swift

@@ -122,7 +122,6 @@ public class LogInterval: LogItem {
   private let logger: DLog
   private let id: Int
   private let name: String
-  private let _metadata: Metadata
   @Atomic
   private var begun = false
 
@@ -148,7 +147,6 @@ public class LogInterval: LogItem {
     self.name = name
     self.id = "\(location.file):\(location.function):\(location.line)".hash
     self.staticName = staticName
-    self._metadata = metadata
 
     let message = { LogMessage(stringLiteral: name) }
     super.init(message: message, type: .interval, category: category, config: config, scope: scope, metadata: {[metadata]}, location: location)
@@ -216,7 +214,8 @@ public class LogInterval: LogItem {
       (.min, "min", { stringFromTimeInterval(statistics.min) }),
       (.total, "total", { stringFromTimeInterval(statistics.total) }),
     ]
-    metadata = [_metadata, Metadata.metadata(from: items, options: config.intervalConfig.options)]
+    let metadata = Metadata.metadata(from: items, options: config.intervalConfig.options)
+    self.metadata = _metadata() + [metadata]
 
     logger.end(interval: self)
   }

Sources/DLog/LogItem.swift

@@ -123,7 +123,7 @@ public class LogItem: NSObject {
 
   let config: LogConfig
 
-  private let _metadata: () -> [Metadata]
+  let _metadata: () -> [Metadata]
   /// Metadata of log message
   public lazy var metadata: [Metadata] = { _metadata() }()
 

Sources/DLog/LogPrivacy.swift

@@ -88,8 +88,7 @@ public enum LogPrivacy {
     var info = kinfo_proc()
     var size = MemoryLayout.size(ofValue: info)
     var mib: [Int32] = [CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid()]
-    return sysctl(&mib, UInt32(mib.count), &info, &size, nil, 0) == 0 &&
-    (info.kp_proc.p_flag & P_TRACED) != 0
+    return sysctl(&mib, UInt32(mib.count), &info, &size, nil, 0) == 0 && (info.kp_proc.p_flag & P_TRACED) != 0
   }()
 
   private static let isXCTest: Bool = { NSClassFromString("XCTest") != nil }()

Sources/DLog/LogProtocol.swift

@@ -247,7 +247,7 @@ public class LogProtocol: NSObject {
   ///
   @discardableResult
   public func scope(_ name: String, metadata: Metadata? = nil, closure: ((LogScope) -> Void)? = nil) -> LogScope {
-    let scope = LogScope(name: name, logger: logger, category: category, config: self.config, metadata: metadata ?? self.logger.metadata.data)
+    let scope = LogScope(name: name, logger: logger, category: category, config: self.config, metadata: metadata ?? logger.metadata.data)
     if let block = closure {
       scope.enter()
       block(scope)
@@ -262,7 +262,7 @@ public class LogProtocol: NSObject {
       config.intervalConfig = intervalConfig
     }
 
-    let interval = LogInterval(logger: logger, name: name, staticName: staticName, category: category, config: config, scope: _scope, metadata: self.metadata.data, location: location)
+    let interval = LogInterval(logger: logger, name: name, staticName: staticName, category: category, config: config, scope: _scope, metadata: metadata.data, location: location)
     if let block = closure {
       interval.begin()
       block()

Sources/DLog/Mach.swift

@@ -39,7 +39,6 @@ struct TaskInfo {
   }
 
   static var power: task_power_info { taskInfo(task_power_info(), TASK_POWER_INFO) }
-  static var power_v2: task_power_info_v2 { taskInfo(task_power_info_v2(), TASK_POWER_INFO_V2) }
   static var vm: task_vm_info { taskInfo(task_vm_info(), TASK_VM_INFO) }
 }
 
@@ -65,18 +64,18 @@ struct ThreadInfo {
 func threadsInfo() -> (cpuUsage: Int32, threadsCount: UInt32) {
   var thread_list: thread_act_array_t?
   var thread_count: mach_msg_type_number_t = 0
-  guard task_threads(mach_task_self_, &thread_list, &thread_count) == KERN_SUCCESS, let threads = thread_list else {
-    return (0, 0)
-  }
+  task_threads(mach_task_self_, &thread_list, &thread_count)
 
   defer {
-    let size = MemoryLayout<thread_t>.size * Int(thread_count)
-    vm_deallocate(mach_task_self_, vm_address_t(threads.pointee), vm_size_t(size))
+    if thread_count > 0 {
+      let size = MemoryLayout<thread_t>.size * Int(thread_count)
+      vm_deallocate(mach_task_self_, vm_address_t(thread_list!.pointee), vm_size_t(size))
+    }
   }
 
   var cpu_usage: Int32 = 0
   for i in 0..<Int(thread_count) {
-    let basic = ThreadInfo.basic(thread: threads[i])
+    let basic = ThreadInfo.basic(thread: thread_list![i])
     if basic.flags & TH_FLAGS_IDLE == 0 {
       cpu_usage += basic.cpu_usage
     }

Sources/DLog/TraceStack.swift

@@ -73,15 +73,12 @@ public struct StackConfig {
 }
 
 fileprivate func swift_demangle(_ mangled: String) -> String? {
-  guard mangled.hasPrefix("$s") else {
+  guard mangled.hasPrefix("$s"), let cString = Dynamic.swift_demangle?(mangled, mangled.count, nil, nil, 0) else {
     return nil
   }
 
-  if let cString = Dynamic.swift_demangle?(mangled, mangled.count, nil, nil, 0) {
-    defer { cString.deallocate() }
-    return String(cString: cString)
-  }
-  return nil
+  defer { cString.deallocate() }
+  return String(cString: cString)
 }
 
 func stackMetadata(moduleName: String, stackAddresses: ArraySlice<NSNumber>, config: StackConfig) -> [Metadata] {

Tests/DLogTests/DLogTests.swift

@@ -1370,6 +1370,7 @@ final class TraceTests: XCTestCase {
   func test_trace_config_all() {
     var config = LogConfig()
     config.traceConfig.options = .all
+    config.traceConfig.stackConfig.view = .all
     let logger = DLog(config: config)
     let text = logger.trace()
     XCTAssert(text?.match(#"\#(Location) \{func:test_trace_config_all,process:\{cpu:\d+%,memory:\d+MB,pid:\d+,threads:\d+\},queue:com\.apple\.main-thread,stack:\[\{frame:\d+,symbol:DLogTests\.TraceTests\.test_trace_config_all\(\) -> \(\)\}"#) == true)