Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Sources/SWBProtocol/BuildOperationMessages.swift
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,10 @@ public struct BuildOperationMetrics: Equatable, Codable, Sendable {
/// The key is the first component of task rule info, a.k.a. the rule info type
public let taskCounters: [String: [TaskCounter: Int]]

public var isEmpty: Bool {
counters.isEmpty && taskCounters.isEmpty
}

public init(counters: [Counter : Int], taskCounters: [String: [TaskCounter: Int]]) {
self.counters = counters
self.taskCounters = taskCounters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

public import Foundation
public import SWBProjectModel
public import SWBProtocol

import SWBUtil

Expand Down Expand Up @@ -169,10 +168,10 @@ public enum SwiftBuildMessage {
}

public struct BuildOperationMetrics {
let counters: [SWBProtocol.BuildOperationMetrics.Counter: Int]
public let counters: [String: Int]

/// The key is the first component of task rule info, a.k.a. the rule info type
let taskCounters: [String: [SWBProtocol.BuildOperationMetrics.TaskCounter: Int]]
public let taskCounters: [String: [String: Int]]
}

public struct BuildCompletedInfo {
Expand Down
7 changes: 5 additions & 2 deletions Sources/SwiftBuild/SWBuildMessage+Protocol.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ extension SwiftBuildMessage {

init(_ message: BuildOperationEnded) {
let metrics: BuildOperationMetrics?
if let messageMetrics = message.metrics, !messageMetrics.counters.isEmpty {
metrics = .init(counters: messageMetrics.counters, taskCounters: messageMetrics.taskCounters)
if let messageMetrics = message.metrics, !messageMetrics.isEmpty {
metrics = .init(
counters: Dictionary(uniqueKeysWithValues: messageMetrics.counters.map { ($0.key.rawValue, $0.value) }),
taskCounters: messageMetrics.taskCounters.mapValues { Dictionary(uniqueKeysWithValues: $0.map { ($0.key.rawValue, $0.value) }) }
)
} else {
metrics = nil
}
Expand Down
Loading