Skip to content

Commit 5378baf

Browse files
committed
Move _OSActivityLogMessageEvent
1 parent 7a8e18a commit 5378baf

3 files changed

Lines changed: 16 additions & 15 deletions

File tree

Sources/LogStream/LogMessage.swift

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extension LogMessage: Hashable {
4545
}
4646

4747
extension LogMessage {
48-
init(_ event: _OSActivityLogMessageEvent) {
48+
init(_ event: LoggingSupport._OSActivityLogMessageEvent) {
4949
self.init(
5050
message: event.eventMessage,
5151
date: event.timestamp,
@@ -57,16 +57,3 @@ extension LogMessage {
5757
)
5858
}
5959
}
60-
61-
@objc
62-
protocol _OSActivityLogMessageEvent {
63-
var eventMessage: String { get set }
64-
var timestamp: Date { get set }
65-
var subsystem: String? { get set }
66-
var category: String? { get set }
67-
var messageType: UInt8 { get set }
68-
var process: String { get set }
69-
var processID: pid_t { get set }
70-
71-
init(entry: UnsafeMutablePointer<os_activity_stream_entry_s>)
72-
}

Sources/LogStream/LogStream.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public enum LogStream {
9696
LogStream.logs(for: -1, flags: flags)
9797
}
9898

99-
static let messageClass = unsafeBitCast(NSClassFromString("OSActivityLogMessageEvent"), to: _OSActivityLogMessageEvent.Type.self)
99+
static let messageClass = unsafeBitCast(NSClassFromString("OSActivityLogMessageEvent"), to: LoggingSupport._OSActivityLogMessageEvent.Type.self)
100100

101101
static func createStream(
102102
pid: pid_t,

Sources/LogStream/LoggingSupport.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,19 @@ enum LoggingSupport {
2525
typealias CancelLog = ResumeLog
2626

2727
typealias ActivityStream = OpaquePointer
28+
}
29+
30+
extension LoggingSupport {
31+
@objc
32+
protocol _OSActivityLogMessageEvent {
33+
var eventMessage: String { get set }
34+
var timestamp: Date { get set }
35+
var subsystem: String? { get set }
36+
var category: String? { get set }
37+
var messageType: UInt8 { get set }
38+
var process: String { get set }
39+
var processID: pid_t { get set }
2840

41+
init(entry: UnsafeMutablePointer<os_activity_stream_entry_s>)
42+
}
2943
}

0 commit comments

Comments
 (0)