diff options
author | aristocratos <admin@qvantnet.com> | 2021-11-13 23:31:01 +0100 |
---|---|---|
committer | aristocratos <admin@qvantnet.com> | 2021-11-13 23:37:23 +0100 |
commit | c0e17a64d32ee313b27048a182fea9d737e3e177 (patch) | |
tree | 6d583265bc957ce70b384633343e514e3a9665db /src/osx/smc.cpp | |
parent | 4926acda5f32dd342060cac9832ad67983d50fc4 (diff) |
Squashed commit of the following:
commit c2c4fe47db3002c3433114954c22bd92b149bea0
Author: aristocratos <admin@qvantnet.com>
Date: Sat Nov 13 23:15:53 2021 +0100
Changes from main + fixes
commit bd5d86708907397f7fc40868ff3665e23f24bb8a
Author: aristocratos <admin@qvantnet.com>
Date: Sat Nov 13 21:24:01 2021 +0100
Fixes
commit dc5f0606cbe6f4d61bec3621c25190f1241b3fce
Author: aristocratos <admin@qvantnet.com>
Date: Sat Nov 13 20:51:06 2021 +0100
Fixed leak in Proc::collect()
commit 8b59ab6e1120439a070b07a4255b10bd7d5197cf
Author: aristocratos <admin@qvantnet.com>
Date: Sat Nov 13 19:59:56 2021 +0100
Fixed process cpu usage calculation
commit 53c8a0325b7567b84da2f01ebd5acad33db4c0cb
Author: aristocratos <admin@qvantnet.com>
Date: Mon Oct 25 13:01:53 2021 +0200
Cpu temp set to average of pACC and eACC for mac m1
commit 940cd0a5131253b0595b233f9da350101211d3cb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 24 21:12:16 2021 +0200
limit cpu temp to 20
commit 254ceb9c2df0374ad07a6ca1e867ef40a60efc24
Author: aristocratos <admin@qvantnet.com>
Date: Sun Oct 24 11:24:04 2021 +0200
Fixed up Makefile
commit 6fa3bf41d757edbb311b99292b26aa45e83d9b9d
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 21 13:12:45 2021 +0200
Makefile fixed WARNFLAGS
commit 2c98e2ca2927d772674c130dcc527f3318daf150
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 21 13:08:12 2021 +0200
Updated Makefile
commit e69780e9bce7af37ba6a85843db0e97c55c61395
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 20 23:26:09 2021 +0200
fix build
commit de6216792154477a5ab7f564c9467761daf842e2
Merge: a590dd3 a0ee404
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 20 23:10:36 2021 +0200
Merge branch 'main' into OSX
commit a590dd3f67c9f2f8f8dc3fa49920a40a5e8b369d
Author: aristocratos <admin@qvantnet.com>
Date: Mon Oct 18 11:20:12 2021 +0200
Ignore format-truncation
commit 4c30742d412cf552de22b3746a68cd62bfe867f2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 18 10:08:01 2021 +0200
comments about temp sensors
commit 46030de77cb1409eb8b0247c331408a240b0227a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 18 08:10:37 2021 +0200
available = total - used
commit 4c228de0ef8a75275178bad081e568f85fc579fd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 17 22:19:41 2021 +0200
use sysconf to get arg_max - seems simpler
commit c60fc29f0f62831730c04c23cd9ffbefef50a1d8
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 17 22:10:50 2021 +0200
arg_max should be int on macos
commit 0b5a931a6d5e8d1a434e88e8fd0613ab948995fa
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 17 22:01:42 2021 +0200
only fetch max_args once
commit 71d5cd5fd91511a90e43e5e6dbf7a1b6a3c3f9c8
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 16 23:24:07 2021 +0200
Reverted mutexes back to custom atomic bool based locks
commit 3f34a67df68f3f451cb48b023b7cd42ccf933ce4
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 21:47:55 2021 +0200
these helpers can be static
commit fc19c46c8aab03e252f60f6f9447d7e1861cbcb9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 21:44:49 2021 +0200
code cleanup: put the code in .cpp to enable incremental build
commit c252c618c043c4b85783f56363121877d0db0727
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 21:09:21 2021 +0200
don't crash on intel
commit 9f88187c29821148c7a5272926d204bd3eb39f89
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 21:06:18 2021 +0200
small improvement
commit 808f09c97465e8cf511f7690b40a69cd8a2efa15
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 20:59:48 2021 +0200
don't iterate 3 times
commit d8408336e3b8336025a087a2bf79a2d15f51ee66
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 20:59:27 2021 +0200
remove debug
commit 4f078c3beb960fe06f4d8b44b9c913e2aacf7625
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 13 23:38:27 2021 +0200
more temperature (M1 + intel)
commit 289880aaa6d1a3625c01e9d7643138343b29db53
Merge: 88a2528 3ffb212
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 16 19:37:09 2021 +0200
Merge branch 'OSX' of github.com:aristocratos/btop into OSX
commit 88a2528ca3a2390f2c94c7f1a18ba982a5e5f2b2
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 16 19:34:10 2021 +0200
Merge changes from main
commit 3ffb21203aa3f4ad978533a3f2b1e67e636381ea
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 16 19:20:45 2021 +0200
release a bit more - still has negative temps for 2 cores on my system
commit 70b48710626ba22df496ba741625ce03cba6abbd
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 16 01:59:44 2021 +0200
Fixed leaks in Mem and attempt at fixing leaks in sensors.cpp
commit fbae907720afbae47162666b6b0aea974be80c07
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 15 23:41:37 2021 +0200
temperature sensors via IOKit
commit cef0f0a68daa88a380000ce200a364e4701ba93a
Author: aristocratos <admin@qvantnet.com>
Date: Fri Oct 15 18:39:17 2021 +0200
Process command line arguments
commit 921cfa01ffc104c57f2825d0bca648233ddff191
Author: aristocratos <admin@qvantnet.com>
Date: Wed Oct 13 23:20:15 2021 +0200
Re-enable setuid and set default SU_GROUP to wheel for OSX
commit a416c888c7356634ef7a5286130a56160d72f50a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 13 21:16:41 2021 +0200
temperature
commit e7afe00ce7960bfe6fb6ba2a9a2f5d498c5b4fca
Author: aristocratos <admin@qvantnet.com>
Date: Wed Oct 13 12:54:43 2021 +0200
Cpu usage working again
commit 4193ef8921617e48ce07ce95d898386f7dd77f43
Author: aristocratos <admin@qvantnet.com>
Date: Wed Oct 13 10:36:51 2021 +0200
Fixed cpu lazy sorting
commit 93fcb6ff04d84c008ed9f7d28918eb9eb8adf740
Author: aristocratos <admin@qvantnet.com>
Date: Tue Oct 12 22:22:45 2021 +0200
Update README.md
commit 683354cd2ed8add79c6940e51800431e8b020635
Merge: 8a399c4 6d724d6
Author: aristocratos <admin@qvantnet.com>
Date: Tue Oct 12 22:19:30 2021 +0200
Merge pull request #80 from ShrirajHegde/OSX
Add github workflow for MacOS
commit 8a399c499af87883a7e4b2cf7f6d193f76909923
Author: aristocratos <admin@qvantnet.com>
Date: Tue Oct 12 21:50:46 2021 +0200
pointer to smart pointer, first pass
commit 772605003af9c1c00f163ff75279cd0055074c96
Author: aristocratos <admin@qvantnet.com>
Date: Tue Oct 12 18:54:38 2021 +0200
Fixed detailed memory not updating
commit 28cb67753332fe8c93d23cbf8e4db636fc6823d6
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 11 22:19:25 2021 +0200
more memory free-up - still leaks like crazy
commit 304457863f6cdccf82fbe1cca3078c7f5d9f97cd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 11 21:48:07 2021 +0200
more RAII cleanup
commit 82e2e3c55c23e37dbf226952cca4587df3522fa3
Author: aristocratos <admin@qvantnet.com>
Date: Mon Oct 11 12:40:25 2021 +0200
Removed non present cpu fields and fixed calculation for selectable cpu field graphs
commit 68603f2b37e34828f78f0f675f66bd835dae8325
Author: aristocratos <admin@qvantnet.com>
Date: Mon Oct 11 10:57:04 2021 +0200
RAII Wrappers for Cpu::get_battery()
commit d5cb24fbeb19ae57507e1715aa402b2dc33f9b6b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 10 20:23:11 2021 +0200
RAII
commit 8fad5a61bee973c22f3a11fd7fee2c4e40390bbb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:44:16 2021 +0200
get more disk IO stats
commit 7fa903cf160b391fb316ea32a60984921a174066
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:43:48 2021 +0200
fix build
commit 98036db660e306626d41fb1b67d9938d9ffe168a
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:18:25 2021 +0200
remove unnecessary uptime param
commit aae7ae35caec64ba611d9b78b24c0ad2716f333e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:07:23 2021 +0200
remove debug logging
commit 5187420b04973edcdd25c1b639795a2c8539b2d9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:06:43 2021 +0200
fix process elapsed time
commit 89582c0ea6e9bdd7a658b5583d2ce2c5deeee8b0
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 9 21:06:29 2021 +0200
don't double free
commit 6d724d6155bad8c084e4c9bdb1d7dda13543a5ac
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:46:33 2021 +0530
Change Upload filename
commit 4f94ecc8ad7d7cdb7daed82fd98a5634d723ec6b
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:40:11 2021 +0530
Fix upload path
commit e1d6d0a1f224474417078a0a1b98a6c4b5c94a53
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:36:13 2021 +0530
Skip installing gcc via Homebrew
Change job name
commit 02cdd9d759d163519048d24746273e4eda2149d0
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:30:40 2021 +0530
Fix uploading
Remove distclean
commit 39eb6c396fc31f798d23c21e7f4b313930dca982
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:26:57 2021 +0530
Disable static compilation
commit 099592bccdafe8d8d8c421bcad3e036cbea580ce
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 9 17:52:10 2021 +0200
Ignore empty pid 0 to fix tree mode
commit a28e17556e74bb618fc2b6eb74f250b139406cdd
Author: Shriraj Hegde <shriraj.hegde@gmail.com>
Date: Sat Oct 9 21:17:11 2021 +0530
Add workflow for MacOS
commit aee9179c0a98bce54b55c8bb8ebdc1ac99bad69e
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 9 17:36:46 2021 +0200
Disable failed tty mode detection for OSX
commit 4b7b98058d7190a494fa522834217d786d71e5fb
Author: aristocratos <admin@qvantnet.com>
Date: Sat Oct 9 11:28:32 2021 +0200
Fixed disk io and added io activity based on read/write
commit bfa0629e7d1e50f88d9a1207930e2f39270fc189
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 8 22:28:10 2021 +0200
fill in 0 for ioticks
commit a016ff8a039634bc37a22a4a84b31055b3cfab37
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 8 22:16:01 2021 +0200
disk io from IOreg. Does not show any io though
commit f98606c6db09d50c7ae234437ea03eda2cc8739c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 8 09:32:06 2021 +0200
per process IO stats
commit c8b50ed4883103f66c9ed869fd0252d48f18f58f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 8 00:11:08 2021 +0200
don't show autofs, it's useless
commit c4df64d4409c511847d76b37a0794b8bb4f6942d
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 18:41:49 2021 +0200
Fixed compile time display for gmake and command timings
commit b3e6f495f76bd71fba3442a557df22afdd3e642d
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 18:26:15 2021 +0200
Fixed clk_tck -> clkTck
commit e53799188ffc24f3948e7ced375b7fbb53911247
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 18:25:14 2021 +0200
Fixed better detection for OSX
commit b864edf984e8f0daa0f10a6ee305074c68efeb42
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 18:24:37 2021 +0200
Fixed cumulative cpu usage
commit 6a3c5d9b976c711461d08c373483c84bb69db257
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 13:20:30 2021 +0200
Proc::collect() better cpu percent accurazy
commit 84d0596294432baef1b10f7d3a566a07382f69d3
Merge: 3564f8e 98e1e87
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 12:56:55 2021 +0200
Merge branch 'OSX' of github.com:aristocratos/btop into OSX
commit 3564f8e4c26f04ec89482606e68a452a3e5f9693
Author: aristocratos <admin@qvantnet.com>
Date: Thu Oct 7 12:56:27 2021 +0200
Proc::collect() fixed cputimes and cpu percentage calc
commit 98e1e874059fe69968d4bb7e4685f292e3b7fd65
Merge: 60c5636 d96fdd7
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Thu Oct 7 11:32:41 2021 +0200
Merge branch 'main' into OSX
commit 60c5636cd7c18e6c806cb4cd88846db10092dd57
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 22:45:54 2021 +0200
fix warning
commit 489e446152ce00f8e92db8c4e10759f96e38f17f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 22:38:40 2021 +0200
details + process states
commit 7e5a808c731772bab35204f2e286975fca334f54
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 22:38:19 2021 +0200
avoid details crash
commit 9c9da4606b3f93c0701b820a875fb3db5d0c3daf
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 21:03:21 2021 +0200
fix quit on macos
commit ec7415384d9d9b42892a1e36ff55bf7a117a253b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 00:41:37 2021 +0200
fix mistake in makefile
commit 5ac8fa4c8a8f73efac6ac1f15e458ed3b2c1164b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 18:56:13 2021 +0200
don't show /dev
commit d901bbebd94ec45c45431fcd1ab37a974f783d9b
Author: aristocratos <gnmjpl@gmail.com>
Date: Wed Oct 6 17:27:51 2021 +0200
Ignore tags and other branches
commit c7f1e71e29bafb5334cd4e256c662e5ee6303b1b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 16:00:41 2021 +0200
comment
commit b9d58e3faf5b60ad4f5f65454b454ff52deb5eaa
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 15:55:58 2021 +0200
impossible to get CPU freq on M1 apparently
commit 66072711c24b2694c4a0054c58829095ed97ada2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 15:33:43 2021 +0200
detect full
commit 6bb0e930a2c44b4fb7d0d02a40f210fa12fdc657
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 00:38:46 2021 +0200
CPU freq in GHz
commit a5f10f1a0ff9d10fa8d9d3038aa160b2380aa294
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 15:13:18 2021 +0200
check array length
commit 155c848b97e1385bd29eaba91a87ecfb1d846bf7
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 15:05:20 2021 +0200
switch to other way to get CPU freq (still does not work)
commit cf51ba2ebe88dddd943040ced484581dc260c3c8
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 14:45:44 2021 +0200
remove some warnings
commit 775dff5f72b0631bba0ed01d72374d8c1d1cd059
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 14:16:45 2021 +0200
fix link
commit 8c67967775fb98bda80eee40cb6833a00bfb93a1
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 14:16:38 2021 +0200
reduce diff more
commit 70b47d2ca8a7e0927cf9613e8fe776d2405f60ee
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 14:10:23 2021 +0200
reduce diff with main branch
commit ca9cb48054c5850cbb3c23d368e04644a1885de0
Merge: d0c6c0a c66b46f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 13:49:20 2021 +0200
Merge remote-tracking branch 'origin/main' into OSX
commit c66b46f850d31c100226e519c55b39df9129aeb8
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 13:41:57 2021 +0200
battery state via CoreFoundation
commit d0c6c0a362d8dc4f76e2901d7b406a70d8a69b6b
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 10:51:36 2021 +0200
all disks + load averages
commit ca67526dc175dba7d98193a6462e70ef1acab194
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 10:33:55 2021 +0200
show all disks
commit 56119f99a95ca541d6ab744a9ded54c84e0a3184
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 00:17:41 2021 +0200
procs sorting/filtering
commit 8d86011d72a07b3f86f6b525b026b805667a3172
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:42:17 2021 +0200
battery states
commit a9b64d62e4abf96fe3edcfa660871caef2041d0f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:24:59 2021 +0200
battery hack works on M1
commit ce5103114246f5549017ef4823442a0ea916e1dd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:18:22 2021 +0200
ugly hack to get battery
commit d5e6725c6cd6973cc75dfe2993892e1c25ac8d38
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 22:42:42 2021 +0200
CPU stuff
commit 5c02bd8c8380c5c74837b982987b7bf31103245f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 21:25:42 2021 +0200
network
commit d5da9d49835cdb23ad5830c000e1b93fcb8f46fd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 15:43:05 2021 +0200
correct cached size
commit 5f11aba504254d86ed9a2319967590d50988e16f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 12:03:48 2021 +0200
vm stats from syscall + swap
commit 776fc968529e8e7e38fc3168c83b2727198722ad
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:48:07 2021 +0200
seems to work indeed
commit 7b40e2835a085bfe0d5eb40f367a1ed50353e4d9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:46:14 2021 +0200
allow override optimization flag
commit 005ea24e4c9bcc6608671a0635126bf10bdece34
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:09:24 2021 +0200
update Makefile
commit af8cec9debac328645f0f4e2f136e4572d88332e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 15:32:55 2021 +0200
some more params
commit 7ebe4f7594599ccafbf72a004ce37f965549f64d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 15:15:55 2021 +0200
show more disks
commit e50a56394a3702b6616d03694f5d23a5f7ba2f1c
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 14:52:56 2021 +0200
disks show something
commit 6497a8c2021b67057dfed26488aec0d82e919a90
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 09:15:35 2021 +0200
reformat
commit 28e152b80c07c1fb9a4049cca8510f8bdc31adbb
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 23:21:13 2021 +0200
decrease diff with upstream
commit 40da88e9ca91f3db540b63b15da5bc34dc9175e9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:56:14 2021 +0200
try to get disks to show
commit eaf2bb56a503fd2bf3787bfd90b5bc8640b7d628
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:42:01 2021 +0200
don't crash on deque::back()
commit f66b6f712c361fafbe6d0cfd8f8c0838dc1bb4d2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:08:21 2021 +0200
cpu freq, name & process uid/name
commit 34a8a61f4de964d3137637b045be8738c4b1b6e5
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 21:46:11 2021 +0200
basic process info
commit 29bb2dcc5fcc6b946511068f036590c18fb459ce
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 21:45:39 2021 +0200
initialize mutex (needed on macos apparently and not on linux)
commit fb5970b0005793d760e652348d6acc30fb570f70
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:53:41 2021 +0200
comment
commit 49d16cdddd56ba5631269eb2ffbec87d9f36f81e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:51:29 2021 +0200
extract delimiters
commit 3db9d6647650bd836201b8150e320a7fbf28e3c2
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:48:28 2021 +0200
first infos on macos: memory used & free
commit f8acb2f8542429677116799ddb5f442488cf3f4f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Sep 28 23:37:03 2021 +0200
make it compile on macos (M1 - arm64). Does not run though
commit bbba17cd35248e4e9ec9bfc1b113758cfcffde1f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 10:51:36 2021 +0200
all disks + load averages
commit 548203e93dfaf3ec9f24086bee08aac85891c4df
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 10:33:55 2021 +0200
show all disks
commit 0ab2be39857fb3dcdb13b49bc9155f17c7d82a4e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Oct 6 00:17:41 2021 +0200
procs sorting/filtering
commit 096104c90b571e931a3a7d9c813dbfc9aa47e212
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:42:17 2021 +0200
battery states
commit 0ad93684c2a72293b23d6a2163c9ec51b499dfa3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:24:59 2021 +0200
battery hack works on M1
commit c75b0f1cea34e6c4c70332ba7e2572ec9b70deef
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 23:18:22 2021 +0200
ugly hack to get battery
commit 600b4f72b3bbbcd85bf5d148942bce7be8cf0b72
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 22:42:42 2021 +0200
CPU stuff
commit 4eb812d52c6e179ae386df0156021d7c35cbe5a3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 21:25:42 2021 +0200
network
commit 899be68a78270216bfdcca5f0c87668a87c8792f
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 15:43:05 2021 +0200
correct cached size
commit a1c7f935e3a5661688c0de1ad3226f7bc43b9979
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 12:03:48 2021 +0200
vm stats from syscall + swap
commit bd1050a7404f9766a0125523c868a27d5cfac8e8
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:48:07 2021 +0200
seems to work indeed
commit 5094b73758ee88617e8d5ce876211e1efa298769
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:46:14 2021 +0200
allow override optimization flag
commit 8811270332bc2276cd18c1116f4d3c2d64a6f721
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Oct 5 10:09:24 2021 +0200
update Makefile
commit 42f966f448b9ad571db7849dc8fd525e0fe72309
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 15:32:55 2021 +0200
some more params
commit c1e6d6a62e2810f80fac372e666ec169540b0591
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 15:15:55 2021 +0200
show more disks
commit 50fcdaa8543f717bf36146cfa38636fd39009f23
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 14:52:56 2021 +0200
disks show something
commit 264bf2d7da0e3fabb5987cddee73762e52170a51
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Mon Oct 4 09:15:35 2021 +0200
reformat
commit 1fd625086ba42e9440c463ae940563d934b8b5c3
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 23:21:13 2021 +0200
decrease diff with upstream
commit 17f9f3703c1dd52a86176131a2239cd52ee285bd
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:56:14 2021 +0200
try to get disks to show
commit 8462ae6431fcfe1985d1bbb4404452ddc03cc1de
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:42:01 2021 +0200
don't crash on deque::back()
commit 78bce5b5a6c1c0f3b38f802acad49ec2e32482d6
Merge: 53e379d f9505a4
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:08:34 2021 +0200
Merge branch 'aristocratos:main' into main
commit 53e379d74dffe2282b089450728501b51d13d199
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 22:08:21 2021 +0200
cpu freq, name & process uid/name
commit 2a44b307ef9e947c1007a86988876668a5731e64
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 21:46:11 2021 +0200
basic process info
commit 66534eb5b50753217687de0414d390bcb2a14cf1
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sun Oct 3 21:45:39 2021 +0200
initialize mutex (needed on macos apparently and not on linux)
commit 0983917f26948d83fd8da103903ec99f88058d87
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:53:41 2021 +0200
comment
commit 9732507248b30139d4af54615945c0b4737cff7d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:51:29 2021 +0200
extract delimiters
commit 6e704ce8387041c33022459fb6a084362f82a72c
Merge: fe4db7c 7bfbd83
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:48:43 2021 +0200
Merge branch 'main' of github.com:joske/btop
commit fe4db7c16cd349053385eda62e9f2df2e7344d3d
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Sat Oct 2 23:48:28 2021 +0200
first infos on macos: memory used & free
commit 7bfbd83a476c8cbe3b74e22b1e44f201026bf9d1
Merge: 8c8139b a15f961
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Fri Oct 1 17:05:26 2021 +0200
Merge branch 'aristocratos:main' into main
commit 8c8139bd1df0849061b5e1425a3138d5f45ec149
Merge: 679d21c a246c09
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Sep 29 21:50:00 2021 +0200
Merge branch 'aristocratos:main' into main
commit 679d21cd223b1928e8dde95cac25e8bfb412bedf
Merge: 4c70c5b a49b8f9
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Sep 29 20:23:34 2021 +0200
Merge branch 'aristocratos:main' into main
commit 4c70c5bdd98bfcc0ae9d9d9e8e3713dc8af71d03
Merge: 84a9746 c70667e
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed Sep 29 08:30:05 2021 +0200
Merge branch 'aristocratos:main' into main
commit 84a974695afaadc53d1d8576ea66255166ede482
Author: Jos Dehaes <jos.dehaes@gmail.com>
Date: Tue Sep 28 23:37:03 2021 +0200
make it compile on macos (M1 - arm64). Does not run though
Co-authored-by: Jos Dehaes <jos.dehaes@gmail.com>
Diffstat (limited to 'src/osx/smc.cpp')
-rw-r--r-- | src/osx/smc.cpp | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/src/osx/smc.cpp b/src/osx/smc.cpp new file mode 100644 index 0000000..2482ae3 --- /dev/null +++ b/src/osx/smc.cpp @@ -0,0 +1,120 @@ +#include "smc.hpp" + +static UInt32 _strtoul(char *str, int size, int base) { + UInt32 total = 0; + int i; + + for (i = 0; i < size; i++) { + if (base == 16) { + total += str[i] << (size - 1 - i) * 8; + } else { + total += (unsigned char)(str[i] << (size - 1 - i) * 8); + } + } + return total; +} + +static void _ultostr(char *str, UInt32 val) { + str[0] = '\0'; + sprintf(str, "%c%c%c%c", + (unsigned int)val >> 24, + (unsigned int)val >> 16, + (unsigned int)val >> 8, + (unsigned int)val); +} + +namespace Cpu { + + SMCConnection::SMCConnection() { + IOMasterPort(kIOMasterPortDefault, &masterPort); + + CFMutableDictionaryRef matchingDictionary = IOServiceMatching("AppleSMC"); + result = IOServiceGetMatchingServices(masterPort, matchingDictionary, &iterator); + if (result != kIOReturnSuccess) { + throw std::runtime_error("failed to get AppleSMC"); + } + + device = IOIteratorNext(iterator); + IOObjectRelease(iterator); + if (device == 0) { + throw std::runtime_error("failed to get SMC device"); + } + + result = IOServiceOpen(device, mach_task_self(), 0, &conn); + IOObjectRelease(device); + if (result != kIOReturnSuccess) { + throw std::runtime_error("failed to get SMC connection"); + } + } + SMCConnection::~SMCConnection() { + IOServiceClose(conn); + } + + // core means physical core in SMC, while in core map it's cpu threads :-/ Only an issue on hackintosh? + // this means we can only get the T per physical core + // another issue with the SMC API is that the key is always 4 chars -> what with systems with more than 9 physical cores? + // no Mac models with more than 18 threads are released, so no problem so far + // according to VirtualSMC docs (hackintosh fake SMC) the enumeration follows with alphabetic chars - not implemented yet here (nor in VirtualSMC) + long long SMCConnection::getTemp(int core) { + SMCVal_t val; + kern_return_t result; + char key[] = SMC_KEY_CPU_TEMP; + if (core >= 0) { + snprintf(key, 5, "TC%1dc", core); + } + result = SMCReadKey(key, &val); + if (result == kIOReturnSuccess) { + if (strcmp(val.dataType, DATATYPE_SP78) == 0) { + // convert sp78 value to temperature + int intValue = val.bytes[0] * 256 + (unsigned char)val.bytes[1]; + return static_cast<long long>(intValue / 256.0); + } + } + return -1; + } + + kern_return_t SMCConnection::SMCReadKey(UInt32Char_t key, SMCVal_t *val) { + kern_return_t result; + SMCKeyData_t inputStructure; + SMCKeyData_t outputStructure; + + memset(&inputStructure, 0, sizeof(SMCKeyData_t)); + memset(&outputStructure, 0, sizeof(SMCKeyData_t)); + memset(val, 0, sizeof(SMCVal_t)); + + inputStructure.key = _strtoul(key, 4, 16); + inputStructure.data8 = SMC_CMD_READ_KEYINFO; + + result = SMCCall(KERNEL_INDEX_SMC, &inputStructure, &outputStructure); + if (result != kIOReturnSuccess) + return result; + + val->dataSize = outputStructure.keyInfo.dataSize; + _ultostr(val->dataType, outputStructure.keyInfo.dataType); + inputStructure.keyInfo.dataSize = val->dataSize; + inputStructure.data8 = SMC_CMD_READ_BYTES; + + result = SMCCall(KERNEL_INDEX_SMC, &inputStructure, &outputStructure); + if (result != kIOReturnSuccess) + return result; + + memcpy(val->bytes, outputStructure.bytes, sizeof(outputStructure.bytes)); + + return kIOReturnSuccess; + } + + kern_return_t SMCConnection::SMCCall(int index, SMCKeyData_t *inputStructure, SMCKeyData_t *outputStructure) { + size_t structureInputSize; + size_t structureOutputSize; + + structureInputSize = sizeof(SMCKeyData_t); + structureOutputSize = sizeof(SMCKeyData_t); + + return IOConnectCallStructMethod(conn, index, + // inputStructure + inputStructure, structureInputSize, + // ouputStructure + outputStructure, &structureOutputSize); + } + +} // namespace Cpu |