swiftlint autocorrect

This commit is contained in:
shogo4405 2018-11-22 18:16:49 +09:00
parent 339a9ffbcd
commit 261fdbdf48
8 changed files with 44 additions and 45 deletions

View File

@ -9,7 +9,7 @@ let package = Package(
// Products define the executables and libraries produced by a package, and make them visible to other packages. // Products define the executables and libraries produced by a package, and make them visible to other packages.
.library( .library(
name: "Usage", name: "Usage",
targets: ["Usage"]), targets: ["Usage"])
], ],
dependencies: [ dependencies: [
// Dependencies declare other packages that this package depends on. // Dependencies declare other packages that this package depends on.
@ -23,6 +23,6 @@ let package = Package(
dependencies: []), dependencies: []),
.testTarget( .testTarget(
name: "UsageTests", name: "UsageTests",
dependencies: ["Usage"]), dependencies: ["Usage"])
] ]
) )

View File

@ -1,4 +1,4 @@
import <UIKit/UIKit.h> #import <Cocoa/Cocoa.h>
FOUNDATION_EXPORT double UsageVersionNumber; FOUNDATION_EXPORT double UsageVersionNumber;
FOUNDATION_EXPORT const unsigned char UsageVersionString[]; FOUNDATION_EXPORT const unsigned char UsageVersionString[];

View File

@ -1,18 +1,18 @@
import Foundation import Foundation
public struct HostCPULoadInfo { public struct HostCPULoadInfo {
static let count:natural_t = mach_msg_type_number_t(MemoryLayout<host_cpu_load_info>.size / MemoryLayout<integer_t>.size) static let count: natural_t = mach_msg_type_number_t(MemoryLayout<host_cpu_load_info>.size / MemoryLayout<integer_t>.size)
static let machHost:mach_port_t = mach_host_self() static let machHost: mach_port_t = mach_host_self()
public let user:Double public let user: Double
public let system:Double public let system: Double
public let idle:Double public let idle: Double
public let nice:Double public let nice: Double
public static func current() -> HostCPULoadInfo? { public static func current() -> HostCPULoadInfo? {
var count:natural_t = HostCPULoadInfo.count var count: natural_t = HostCPULoadInfo.count
var info:host_cpu_load_info = host_cpu_load_info() var info: host_cpu_load_info = host_cpu_load_info()
let result:kern_return_t = withUnsafeMutablePointer(to: &info) { let result: kern_return_t = withUnsafeMutablePointer(to: &info) {
$0.withMemoryRebound(to: integer_t.self, capacity: Int(count)) { $0.withMemoryRebound(to: integer_t.self, capacity: Int(count)) {
host_statistics(machHost, HOST_CPU_LOAD_INFO, $0, &count) host_statistics(machHost, HOST_CPU_LOAD_INFO, $0, &count)
} }

View File

@ -1,20 +1,20 @@
import Foundation import Foundation
public struct MachTaskBasicInfo { public struct MachTaskBasicInfo {
static let count:natural_t = mach_msg_type_number_t(MemoryLayout<mach_task_basic_info>.size) / 4 static let count: natural_t = mach_msg_type_number_t(MemoryLayout<mach_task_basic_info>.size) / 4
public let policy:Int32 public let policy: Int32
public let residentSize:UInt64 public let residentSize: UInt64
public let residentSizeMax:UInt64 public let residentSizeMax: UInt64
public let suspendCount:Int32 public let suspendCount: Int32
public let systemTime:time_value_t public let systemTime: time_value_t
public let userTime:time_value_t public let userTime: time_value_t
public let virtualSize:UInt64 public let virtualSize: UInt64
public static func current() -> MachTaskBasicInfo? { public static func current() -> MachTaskBasicInfo? {
var count:natural_t = MachTaskBasicInfo.count var count: natural_t = MachTaskBasicInfo.count
var info:mach_task_basic_info = mach_task_basic_info() var info: mach_task_basic_info = mach_task_basic_info()
let result:kern_return_t = withUnsafeMutablePointer(to: &info) { let result: kern_return_t = withUnsafeMutablePointer(to: &info) {
$0.withMemoryRebound(to: integer_t.self, capacity: 1) { $0.withMemoryRebound(to: integer_t.self, capacity: 1) {
task_info(mach_task_self_, task_flavor_t(MACH_TASK_BASIC_INFO), $0, &count) task_info(mach_task_self_, task_flavor_t(MACH_TASK_BASIC_INFO), $0, &count)
} }

View File

@ -1,13 +1,12 @@
import Foundation import Foundation
public struct MachThreadBasicInfo { public struct MachThreadBasicInfo {
public let userTime:time_value_t public let userTime: time_value_t
public let systemTIme:time_value_t public let systemTIme: time_value_t
public let cpuUsage:Int32 public let cpuUsage: Int32
public let policy:Int32 public let policy: Int32
public let runState:Int32 public let runState: Int32
public let flags:Int32 public let flags: Int32
public let suspendCount:Int32 public let suspendCount: Int32
public let sleepCount:Int32 public let sleepCount: Int32
} }

View File

@ -1,27 +1,27 @@
import Foundation import Foundation
public struct Usage { public struct Usage {
public enum Unit:UInt64 { public enum Unit: UInt64 {
case none = 1 case none = 1
case KiB = 1024 case KiB = 1024
case MiB = 1048576 case MiB = 1048576
} }
private static var loadPrevious:HostCPULoadInfo? private static var loadPrevious: HostCPULoadInfo?
public static func cpu() -> HostCPULoadInfo? { public static func cpu() -> HostCPULoadInfo? {
let _load:HostCPULoadInfo? = HostCPULoadInfo.current() let _load: HostCPULoadInfo? = HostCPULoadInfo.current()
defer { defer {
loadPrevious = _load loadPrevious = _load
} }
guard let load:HostCPULoadInfo = _load, let loadPrevious:HostCPULoadInfo = loadPrevious else { guard let load: HostCPULoadInfo = _load, let loadPrevious: HostCPULoadInfo = loadPrevious else {
return nil return nil
} }
let user:Double = load.user - loadPrevious.user let user: Double = load.user - loadPrevious.user
let system:Double = load.system - loadPrevious.system let system: Double = load.system - loadPrevious.system
let idle:Double = load.idle - loadPrevious.idle let idle: Double = load.idle - loadPrevious.idle
let nice:Double = load.nice - loadPrevious.nice let nice: Double = load.nice - loadPrevious.nice
let total:Double = user + system + idle + nice let total: Double = user + system + idle + nice
return HostCPULoadInfo( return HostCPULoadInfo(
user: user / total * 100.0, user: user / total * 100.0,
system: system / total * 100.0, system: system / total * 100.0,
@ -30,8 +30,8 @@ public struct Usage {
) )
} }
public static func memory(unit:Unit = .none) -> UInt64? { public static func memory(unit: Unit = .none) -> UInt64? {
guard let info:MachTaskBasicInfo = MachTaskBasicInfo.current() else { guard let info: MachTaskBasicInfo = MachTaskBasicInfo.current() else {
return nil return nil
} }
return info.residentSize / unit.rawValue return info.residentSize / unit.rawValue

View File

@ -2,6 +2,6 @@ import XCTest
final class MachTaskBasicInfoTest: XCTestCase { final class MachTaskBasicInfoTest: XCTestCase {
func testExample() { func testExample() {
let info:MachTaskBasicInfo? = MachTaskBasicInfo.current() let info: MachTaskBasicInfo? = MachTaskBasicInfo.current()
} }
} }

View File

@ -2,7 +2,7 @@ import XCTest
final class UsageTest: XCTestCase { final class UsageTest: XCTestCase {
func testCPU() { func testCPU() {
let _ = Usage.cpu() _ = Usage.cpu()
sleep(1) sleep(1)
let info = Usage.cpu() let info = Usage.cpu()
print(info?.nice) print(info?.nice)