Add verbose option

Author: op06072

socpowerbuddy_swift.xcodeproj/xcuserdata/eomsehwan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -59,6 +59,10 @@
             argument = "-v"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--verbose"
+            isEnabled = "YES">
+         </CommandLineArgument>
       </CommandLineArguments>
       <AdditionalOptions>
          <AdditionalOption

socpowerbuddy_swift.xcodeproj/xcuserdata/eomsehwan.xcuserdatad/xcschemes/socpowerbuddy_swift.xcscheme

@@ -33,6 +33,7 @@ struct iorep_data {
 
 struct static_data {
     var gpu_core_count = 0
+    var gpu_arch_name: String = ""
     var dvfm_states_holder: Array<Array<Double>> = []
     var dvfm_states: Array<Array<Double>> = []
     var cluster_core_counts: Array<UInt8> = []
@@ -49,6 +50,9 @@ struct static_data {
     var fan_mode = 0
     var fan_limit: [[Double]] = [[0, 0], [0, 0]]
     var os_ver: String = "macOS"
+    var marketing_name: String = "mac"
+    var os_code_name: String = ""
+    var verbosed = false
 }
 
 struct variating_data {

socpowerbuddy_swift/head.swift

@@ -15,14 +15,18 @@ var sd = static_data()
 var cmd = cmd_data()
 let sens = SensorsReader()
 
-let cur_ver = "v2.9"
+let cur_ver = "v2.10"
 var newVersion = false
+var beta = false
 
 struct Neoasitop: ParsableCommand {
     @Flag(name: .shortAndLong, help: "Print version information")
     var version = false
 
-    @Option(name: .shortAndLong, help: "Display interval and sampling interval for info gathering (seconds)")
+    @Flag(name: .long, help: "Show detail information of this system like OS codename, CPU architecture name, etc.")
+    var verbose = false
+    
+    @Option(name: .shortAndLong, help: "Display interval and sampling interval for info gathering (seconds) [0.01~]")
     var interval: Double = 1
 
     @Option(name: .shortAndLong, help: "Choose display color (0~7)")
@@ -56,6 +60,8 @@ struct Neoasitop: ParsableCommand {
         while cmd.interval/1000 >= interval {
             cmd.interval /= 2
         }
+        
+        sd.verbosed = verbose
 
         let procInfo = ProcessInfo()
         let systemVersion = procInfo.operatingSystemVersion
@@ -65,6 +71,7 @@ struct Neoasitop: ParsableCommand {
         //print("dvfm table gen finish")
         generateProcessorName(sd: &sd)
         //print("process name gen finish")
+        getOSCode(sd: &sd)
 
         let tmp = sd.extra[0].lowercased()
         //tmp = "m1 ultra"
@@ -262,7 +269,7 @@ struct Neoasitop: ParsableCommand {
                     }
                 }
                 del_tbox(tbx: &scr)
-                print("\nGood Bye")
+                print("\nGood Bye\(beta ? " Beta User!" : "")")
                 return
             default:
                 autoreleasepool {
@@ -298,6 +305,8 @@ enum Executable {
                 if let version = object.value(forKey: "tag_name") as? String {
                     if version.compare(cur_ver, options: .numeric) == .orderedDescending {
                         newVersion = true
+                    } else if version.compare(cur_ver, options: .numeric) == .orderedAscending {
+                        beta = true
                     }
                 }
             }

socpowerbuddy_swift/neoasitop.swift

@@ -130,8 +130,9 @@ struct dispInfo {
                     cpu_title += "[Rosetta 2] (cores: \(sd.core_ep_counts.reduce(0,+))C+"
                 }
                 cpu_title += "\(sd.gpu_core_count)GPU+\(sd.ram_capacity))"
+                cpu_title = "\(sd.verbosed ? sd.marketing_name + " " : "")\(cpu_title)"
             }
-            cpu_title += " \(sd.os_ver)"
+            cpu_title += " \(sd.os_ver)\(sd.verbosed ? " " + sd.os_code_name : "")"
 
             proc_grp = cpu_title
         }
@@ -473,9 +474,9 @@ func display(_ disp: dispInfo, _ gn: Bool = false, _ scrin: tbox? = nil, _ xy: [
 
     var scrn = scrin ?? screen_init(dark: dark)
 
-    if lines < 34 || cols < 63 {
+    if lines < 34 || cols < 63 + (sd.verbosed ? 22 : 0) {
         endwin()
-        print("Terminal size is too small!\nThis tool needs 63 cols and 34 lines at least!")
+        print("Terminal size is too small!\nThis tool needs \(sd.verbosed ? 85 : 63) cols and 34 lines at least!")
         exit(1)
     }
 

socpowerbuddy_swift/render.swift

@@ -638,11 +638,11 @@ func summary(sd: static_data, vd: variating_data, rd: inout render_data, rvd: in
             var space0 = 0 // 추가 내용 뺀 부분의 여분길이
             var space1 = 0
             // CPU & GPU 온도
-            if w.ws_col >= 73 {
+            if w.ws_col >= 73 + (sd.verbosed ? 17 : 0) {
                 rvd.gpu_usg.title += String(
                     format:" (%.1f°C)", rd.gpu.temp
                 )
-                if w.ws_col >= 80 {
+                if w.ws_col >= 80 + (sd.verbosed ? 24 : 0) {
                     rvd.ecpu_usg.title += String(
                         format:" (%.1f°C)", rd.ecpu.temp
                     )
@@ -651,6 +651,9 @@ func summary(sd: static_data, vd: variating_data, rd: inout render_data, rvd: in
                     )
                 }
             }
+            rvd.ecpu_usg.title = "\(rvd.ecpu_usg.title)\(sd.verbosed ? " [\(sd.extra[2])]" : "")"
+            rvd.pcpu_usg.title = "\(rvd.pcpu_usg.title)\(sd.verbosed ? " [\(sd.extra[3])]" : "")"
+            rvd.gpu_usg.title = "\(rvd.gpu_usg.title)\(sd.verbosed ? " [\(sd.gpu_arch_name)]" : "")"
             // Memory Bandwidth
             space = 0
             var tmp_val = 200.0

socpowerbuddy_swift/sampler.swift

@@ -158,13 +158,14 @@ func generateCoreCounts(sd: inout static_data) {
                 }
             }
         }
-
-        if model_name != "" {
-            if model_name.lowercased().contains("air") {
+        
+        if let count = SMC.shared.getValue("FNum") {
+            switch count {
+            case 0.0:
                 sd.fan_exist = false
-            } else if model_name.lowercased().contains("mini") {
+            case 1.0:
                 sd.fan_mode = 1
-            } else {
+            default:
                 sd.fan_mode = 2
             }
         } else {
@@ -179,27 +180,57 @@ func generateCoreCounts(sd: inout static_data) {
             port = kIOMasterPortDefault
         }
 
-        if let service = IOServiceMatching("AppleARMIODevice") {
+        func regAccessFailed(_ name: String) {
+            print("Failed to access \(name) service in IORegistry")
+            exit(1)
+        }
+        
+        let option_bits = IOOptionBits(kIORegistryIterateRecursively + kIORegistryIterateParents)
+        
+        var name = "product"
+        if let service = IOServiceNameMatching(name) {
             if IOServiceGetMatchingServices(port, service, &iter) != kIOReturnSuccess {
-                print("Failed to access AppleARMIODevice service in IORegistry")
+                regAccessFailed(name)
+            }
+        } else {
+            regAccessFailed(name)
+        }
+        
+        while case let entry = IOIteratorNext(iter), entry != IO_OBJECT_NULL {
+            if let productname = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, "product-name" as CFString, kCFAllocatorDefault, option_bits) {
+                sd.marketing_name = ""
+                let prodname = productname.bytes?.assumingMemoryBound(to: CChar.self)
+                for ii in 0...productname.length {
+                    sd.marketing_name += String(format: "%c", prodname![ii])
+                }
+            } else {
+                print("Failed to read \"product-name\" from \(name) service in IORegistry")
                 exit(1)
             }
+            IOObjectRelease(entry)
+        }
+        
+        name = "AppleARMIODevice"
+        if let service = IOServiceMatching(name) {
+            if IOServiceGetMatchingServices(port, service, &iter) != kIOReturnSuccess {
+                regAccessFailed(name)
+            }
         } else {
-            print("Failed to find AppleARMIODevice service in IORegistry")
-            exit(1)
+            regAccessFailed(name)
         }
 
         while case let entry = IOIteratorNext(iter), entry != IO_OBJECT_NULL {
             if IORegistryEntryCreateCFProperties(entry, &servicedict, kCFAllocatorDefault, 0) != kIOReturnSuccess {
-                print("Failed to create CFProperties for AppleARMIODevice service in IORegistry")
+                print("Failed to create CFProperties for \(name) service in IORegistry")
                 exit(1)
             }
 
             guard let serviceDict = servicedict?.takeRetainedValue() as? [String : AnyObject] else { continue }
 
-            if case let data = serviceDict["clusters"], data != nil {
-                let databytes = data?.bytes?.assumingMemoryBound(to: UInt8.self)
-                for ii in stride(from:0, to:data!.length, by:4) {
+            //if case let data = serviceDict["clusters"], data != nil {
+            if let data = serviceDict["clusters"] {
+                let databytes = data.bytes?.assumingMemoryBound(to: UInt8.self)
+                for ii in stride(from:0, to:data.length, by:4) {
                     let cores = UInt8(atoi(String(format: "%02x", databytes![ii])))
                     sd.cluster_core_counts.append(cores)
                     var die_num = 1
@@ -219,29 +250,57 @@ func generateCoreCounts(sd: inout static_data) {
             }
         }
 
-        if let service = IOServiceMatching("AGXAccelerator") {
+        name = "AGXAccelerator"
+        if let service = IOServiceMatching(name) {
             if IOServiceGetMatchingServices(port, service, &iter) != kIOReturnSuccess {
-                print("Failed to access AGXAccelerator service in IORegistry")
-                exit(1)
+                regAccessFailed(name)
             }
         } else {
-            print("Failed to find AGXAccelerator service in IORegistry")
-            exit(1)
+            regAccessFailed(name)
         }
 
         while case let entry = IOIteratorNext(iter), entry != IO_OBJECT_NULL {
-            if let gpucorecnt = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, "gpu-core-count" as CFString, kCFAllocatorDefault, IOOptionBits(kIORegistryIterateRecursively + kIORegistryIterateParents)) {
+            if IORegistryEntryCreateCFProperties(entry, &servicedict, kCFAllocatorDefault, 0) != kIOReturnSuccess {
+                print("Failed to create CFProperties for \(name) service in IORegistry")
+                exit(1)
+            }
+            
+            guard let serviceDict = servicedict?.takeRetainedValue() as? [String : AnyObject] else { continue }
+            
+            if let gpucorecnt = serviceDict["gpu-core-count"] {
                 sd.gpu_core_count = gpucorecnt as? Int ?? 0
                 IOObjectRelease(entry)
             } else {
-                print("Failed to read \"gpu-core-count\" from AGXAccelerator service in IORegistry")
+                print("Failed to read \"gpu-core-count\" from \(name) service in IORegistry")
+                exit(1)
+            }
+            
+            if let gpuname = serviceDict["IOClass"] {
+                sd.gpu_arch_name = gpuname as? String ?? ""
+                if let range = sd.gpu_arch_name.range(of: name) {
+                    sd.gpu_arch_name.removeSubrange(range)
+                }
+            } else {
+                print("Failed to read \"gpu-arch-name\" from \(name) service in IORegistry")
                 exit(1)
             }
+            IOObjectRelease(entry)
         }
         IOObjectRelease(iter)
     }
 }
 
+func getOSCode(sd: inout static_data) {
+    autoreleasepool {
+        let code_file = File("/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf")
+        while let code_line = code_file?.getLine() {
+            if code_line.contains("SOFTWARE LICENSE AGREEMENT FOR macOS") {
+                sd.os_code_name = String(code_line.split(separator: " ").last ?? "").replacingOccurrences(of: "\\\n", with: "")
+            }
+        }
+    }
+}
+
 func generateProcessorName(sd: inout static_data) {
     autoreleasepool {
         var size = 0
@@ -360,7 +419,7 @@ func generateMicroArchs(sd: inout static_data) {
             sd.extra.append(String(
                 format: "%s",
                 (data?.takeRetainedValue().bytes?.assumingMemoryBound(to: UInt8.self))!
-            ))
+            ).replacingOccurrences(of: "apple,", with: "").capitalized)
         } else {
             archError(sd: &sd)
         }
@@ -370,7 +429,7 @@ func generateMicroArchs(sd: inout static_data) {
             sd.extra.append(String(
                 format: "%s",
                 (data?.takeRetainedValue().bytes?.assumingMemoryBound(to: UInt8.self))!
-            ))
+            ).replacingOccurrences(of: "apple,", with: "").capitalized)
         } else {
             archError(sd: &sd)
         }

socpowerbuddy_swift/static.swift

@@ -7,6 +7,53 @@
 
 import Foundation
 
+class File {
+    init? (_ path: String) {
+        errno = 0
+        file = fopen(path, "r")
+        if file == nil {
+            perror(nil)
+            return nil
+        }
+    }
+    
+    deinit {
+        fclose(file)
+    }
+
+    func testIndex(line: String) -> Bool {
+        guard line.lastIndex(of: "\r") == nil else {
+            return false
+        }
+        guard line.lastIndex(of: "\n") == nil else {
+            return false
+        }
+        guard line.lastIndex(of: "\r\n") == nil else {
+            return false
+        }
+        return true
+    }
+
+    func getLine() -> String? {
+        var line = ""
+        repeat {
+            var buf = [CChar](repeating: 0, count: 1024)
+            errno = 0
+            if fgets(&buf, Int32(buf.count), file) == nil {
+                if feof(file) != 0 {
+                    return nil
+                } else {
+                    perror(nil)
+                    return nil
+                }
+            }
+            line += String(cString: buf)
+        } while testIndex(line: line)
+        return line
+    }
+    private var file: UnsafeMutablePointer<FILE>? = nil
+}
+
 func convertToGB(_ num: Double) -> [Double] {
     var res = [num, 0]
     while res[0] > 1024 {