Skip to content

Fix for #945, cpu temperature is signed. #965

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.

Sign up for GitHub

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

Merged
SuperQ merged 4 commits into from
Jun 7, 2018
Merged

Fix for #945, cpu temperature is signed. #965

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18b68a5
Fix for #945, cpu temperature is signed.
derekmarcotte Jun 5, 2018
29cea37
Updated comments per PR feedback.
derekmarcotte Jun 6, 2018
c9c5bb0
Updated comment to fix SI prefix.
derekmarcotte Jun 6, 2018
472c4cd
Fix spelling.
derekmarcotte Jun 7, 2018
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
18 changes: 17 additions & 1 deletion collector/cpu_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,23 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) error {
}
continue
}
ch <- c.temp.mustNewConstMetric(float64(temp-2732)/10, lcpu)

// Temp is a signed integer in deci-degrees Kelvin.
// Cast uint32 to int32 and convert to float64 degrees Celsius.
//
// 2732 is used as the conversion constant for deci-degrees
// Kelvin, in multiple places in the kernel that feed into this
// sysctl, so we want to maintain consistency:
//
// sys/dev/amdtemp/amdtemp.c
// #define AMDTEMP_ZERO_C_TO_K 2732
//
// sys/dev/acpica/acpi_thermal.c
// #define TZ_ZEROC 2732
//
// sys/dev/coretemp/coretemp.c
// #define TZ_ZEROC 2732
ch <- c.temp.mustNewConstMetric(float64(int32(temp)-2732)/10, lcpu)
}
return err
}