Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add interval option #34

Merged
merged 2 commits into from
Aug 19, 2024
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
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,25 @@ Usage:
-c : list CPU temperatures (Celsius)
-g : list GPU temperatures (Celsius)
-h : help
-i : set interval in milliseconds (e.g. -i25, valid range is 20-1000, default: 1000)
-l : list all keys and values
-f : fail-soft mode. Shows last valid value if current sensor read fails.
-v : version
-n : tries to query the temperature sensors for n times (e.g. -n3) (1 second interval) until a valid value is returned
-n : tries to query the temperature sensors for n times (e.g. -n3) until a valid value is returned

$ smctemp -c
64.2

$ smctemp -g
36.2
```

## Note for M2 Mac Users
On M2 Macs, sensor values may be unstable as described in the following issue:
- https://github.com/narugit/smctemp/pull/14
- https://github.com/narugit/smctemp/issues/32

For M2 Macs, using the `-n`, `-i`, and `-f` options can help obtain more stable sensor values.
Try tuning these options to get better results.

The recommended settings are `-i25 -n180 -f` (See also https://github.com/narugit/smctemp/pull/34/files#r1721025001)
23 changes: 21 additions & 2 deletions main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ void usage(char* prog) {
std::cout << " -c : list CPU temperatures (Celsius)" << std::endl;
std::cout << " -g : list GPU temperatures (Celsius)" << std::endl;
std::cout << " -h : help" << std::endl;
std::cout << " -i : set interval in milliseconds (e.g. -i25, valid range is 20-1000, default: 1000)"
<< std::endl;
std::cout << " -l : list all keys and values" << std::endl;
std::cout << " -f : fail-soft mode. Shows last valid value if current sensor read fails." << std::endl;
std::cout << " -v : version" << std::endl;
Expand All @@ -21,19 +23,31 @@ void usage(char* prog) {
int main(int argc, char *argv[]) {
int c;
unsigned int attempts = 1;
unsigned int interval_ms = 1'000;

kern_return_t result;
int op = smctemp::kOpNone;
bool isFailSoft = false;

while ((c = getopt(argc, argv, "clvfhn:g")) != -1) {
while ((c = getopt(argc, argv, "clvfhn:gi:")) != -1) {
switch(c) {
case 'c':
op = smctemp::kOpReadCpuTemp;
break;
case 'g':
op = smctemp::kOpReadGpuTemp;
break;
case 'i':
if (optarg) {
unsigned int temp_interval;
auto [ptr, ec] = std::from_chars(optarg, optarg + strlen(optarg), temp_interval);
if (ec != std::errc() || temp_interval < 20 || temp_interval > 1000) {
std::cerr << "Invalid argument provided for -i (integer between 20 and 1000 is required)" << std::endl;
return 1;
}
interval_ms = temp_interval;
}
break;
case 'n':
if (optarg) {
auto [ptr, ec] = std::from_chars(optarg, optarg + strlen(optarg), attempts);
Expand Down Expand Up @@ -91,7 +105,7 @@ int main(int argc, char *argv[]) {
if (smc_temp.IsValidTemperature(temp, valid_temperature_limits)) {
break;
} else {
usleep(1'000'000);
usleep(interval_ms * 1'000);
attempts--;
}
}
Expand All @@ -105,6 +119,11 @@ int main(int argc, char *argv[]) {
}
}
std::cout << std::fixed << std::setprecision(1) << temp << std::endl;
if (temp == 0.0) {
std::cerr << "Could not get valid sensor value. Please use `-n` option and `-i` option." << std::endl;
std::cerr << "In M2 Mac, it would be work fine with `-i25 -n180 -f` options.`" << std::endl;
return 1;
}
break;
}

Expand Down
Loading