rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-25 18:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Distinguish system temperature sensor from thermal model ambient reference

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-09-07 11:38:49 +02:00
parent 5e4cca1fe3
commit 31710bc1f3
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmdline/state.c
View file

@ -179,6 +179,7 @@ void state_init(struct snapraid_state* state)
state->unsynced_blocks = 0;
state->unscrubbed_blocks = 0;
state->thermal_stop_gathering = 0;
state->thermal_system_temperature = 0;
state->thermal_ambient_temperature = 0;
state->thermal_highest_temperature = 0;
state->thermal_first = 0;

3
cmdline/state.h
View file

@ -159,7 +159,8 @@ struct snapraid_state {
/* Thermal */
tommy_list thermallist; /**< List of all thermal state */
int thermal_stop_gathering; /**< If thermal data gathering is stopped */
int thermal_ambient_temperature; /**< Ambient themperature. 0 if not available */
int thermal_system_temperature; /**< System temperature. 0 if not available */
int thermal_ambient_temperature; /**< Ambient temperature used as thermal model reference. 0 if not available */
int thermal_highest_temperature; /**< Current highest temperature */
uint64_t thermal_first; /**< Monotonic time of the first measure */
uint64_t thermal_latest; /**< Monotonic time of latest measure */

31
cmdline/thermal.c
View file

@ -196,21 +196,24 @@ int state_thermal(struct snapraid_state* state, time_t now)
/* report new attribute */
state_attr(state, &low);
/* if ambient temperature is not set, set it now with the lowest HD temperature */
/* if ambient temperature is not set, get the system temperature or fallback to the lowest HD temperature */
if (state->thermal_ambient_temperature == 0) {
state->thermal_ambient_temperature = ambient_temperature();
state->thermal_system_temperature = ambient_temperature();
state->thermal_ambient_temperature = state->thermal_system_temperature;
for (i = tommy_list_head(&low); i != 0; i = i->next) {
devinfo_t* devinfo = i->data;
if (state->thermal_ambient_temperature == 0) {
for (i = tommy_list_head(&low); i != 0; i = i->next) {
devinfo_t* devinfo = i->data;
int temp = smart_temp(devinfo);
if (temp < 0)
continue;
int temp = smart_temp(devinfo);
if (temp < 0)
continue;
log_tag("thermal:system:candidate:%d\n", temp);
log_tag("thermal:system:candidate:%d\n", temp);
if (state->thermal_ambient_temperature == 0 || state->thermal_ambient_temperature > temp)
state->thermal_ambient_temperature = temp;
if (state->thermal_ambient_temperature == 0 || state->thermal_ambient_temperature > temp)
state->thermal_ambient_temperature = temp;
}
}
log_tag("thermal:system:final:%d\n", state->thermal_ambient_temperature);
@ -404,12 +407,12 @@ int state_thermal_begin(struct snapraid_state* state, time_t now)
state->thermal_latest = state->thermal_first;
state_thermal(state, now);
if (state->thermal_ambient_temperature != 0) {
printf("System temperature is %u degrees\n", state->thermal_ambient_temperature);
if (state->thermal_system_temperature != 0) {
printf("System temperature is %u degrees\n", state->thermal_system_temperature);
if (state->thermal_temperature_limit != 0 && state->thermal_temperature_limit <= state->thermal_ambient_temperature) {
if (state->thermal_temperature_limit != 0 && state->thermal_temperature_limit <= state->thermal_system_temperature) {
/* LCOV_EXCL_START */
log_fatal(EENVIRONMENT, "DANGER! System temperature of %d degrees is higher than the temperature limit of %d degrees. Unable to proceed!\n", state->thermal_ambient_temperature, state->thermal_temperature_limit);
log_fatal(EENVIRONMENT, "DANGER! System temperature of %d degrees is higher than the temperature limit of %d degrees. Unable to proceed!\n", state->thermal_system_temperature, state->thermal_temperature_limit);
log_flush();
return 0;
/* LCOV_EXCL_STOP */