mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-08-27 12:28:49 +00:00
Code Issues Releases Wiki Activity
4,039 Commits 4 Branches 76 Tags
Commit Graph

384 Commits

Author SHA1 Message Date
Darrick J. Wong
f4e4fcd8c1 Subject: [PATCH 3/3 v3]: sensors: Automatically scale energy/power units 
Automatically scale energy and power values when printing them in cooked
mode.  Fixed all the warnings and warts that were brought up by Jean in
the previous thread.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5185 7894878c-1315-0410-8ee3-d5d059ff63e0
 2008-04-17 01:30:37 +00:00
Darrick J. Wong
4c93dffd4f Subject: [PATCH 3/4 v2] sensors: Print energy and power meters 
Display power and energy meters in sensors.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5184 7894878c-1315-0410-8ee3-d5d059ff63e0
 2008-04-17 01:28:51 +00:00
Jean Delvare
f2e518511d Patch from Aurelien Jarno: 
I have just noticed that the FSF address is the old one in all files
except COPYING. Please find a patch below to fix that.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5163 7894878c-1315-0410-8ee3-d5d059ff63e0
 2008-03-26 13:37:12 +00:00
Jean Delvare
7a2649483e Fix error path on library initialization error. Only call fclose() if 
we have actually opened a configuration file before.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5090 7894878c-1315-0410-8ee3-d5d059ff63e0
 2008-01-05 09:14:28 +00:00
Jean Delvare
5b5b1bb3dc Install sensors as sensors again. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4991 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-10-25 10:57:14 +00:00
Jean Delvare
35a5a7dbce Use /etc/sensors3.conf as the default configuration file. If it can't 
be found, fallback to /etc/sensors.conf. This allows for an old
libsensors and a new libsensors to be installed in parallel, and each
one has its own configuration file.

One important change here is that the default configuration file will
be installed as /etc/sensors3.conf by "make install".


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4990 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-10-25 09:59:05 +00:00
Jean Delvare
f17e1cf5a8 "sensors" no longer needs a default configuration file name. If no 
file name is provided on the command line, use the libsensors default.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4986 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-10-25 09:49:34 +00:00
Jean Delvare
2b650945f1 sensors: Handle the case where voltage measurements aren't available. 
This will soon be the case of the Linux 2.6 gl518sm driver.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4977 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-10-22 18:27:04 +00:00
Jean Delvare
2b1c2a0e6f sensors: Fix file handle leak on library initialization error. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4973 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-10-21 14:31:38 +00:00
Jean Delvare
e012d14d95 sensors: Better handling of the fault flags. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4910 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-30 17:56:19 +00:00
Jean Delvare
647b47cb6a Add my copyright everywhere it is missing. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4902 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-29 19:18:15 +00:00
Jean Delvare
855b1aa6ef The lm-sensors team has no legal existence and thus can't hold a copyright. 
I tried to assign the copyright back to the original author where possible.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4900 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-29 19:08:30 +00:00
Jean Delvare
fa1f1aef32 sensors: Make error messages more helpful and consistent. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4898 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-29 18:11:38 +00:00
Jean Delvare
a269604853 sensors: Print error messages to stderr. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4897 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-29 14:31:07 +00:00
Jean Delvare
19b4cf5e37 Fix spurious critical temperature alarm. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4892 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-26 21:28:04 +00:00
Jean Delvare
ab36c5b0f8 Delete unused SENSORS_ERR_ACCESS. 
Rename SENSORS_ERR_PROC to the more neutral SENSORS_ERR_KERNEL.
Introduce SENSORS_ERR_NO_DEVS for finer-grained error reporting.
Use SENSORS_ERR_KERNEL and SENSORS_ERR_NO_DEVS where appropriate.
No error message for invalid error codes.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4854 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 13:53:11 +00:00
Jean Delvare
9698d82fd3 Rename sensors_get_label_size() to get_label_size() for consistency. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4847 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:33:12 +00:00
Jean Delvare
e01466d993 New public library function: sensors_get_subfeature(). Applications can 
use it to retrieve a specific subfeature by type. While it is slighly
less efficient than looping over sensors_get_all_subfeatures(), it
often makes the application code much more elegant.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4846 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:30:28 +00:00
Jean Delvare
da7b4e48da Introduce a separate type for main features. Make subfeatures map to 
the real main feature rather than the first subfeature.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4838 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:16:50 +00:00
Jean Delvare
65f1d1f1cd Rename subfeature types from *_FEATURE_* to *_SUBFEATURE_*, to better 
reflect what they represent.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4837 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:12:19 +00:00
Jean Delvare
96c914bfda Define a separate structure to represent main features. This allows 
for faster main features lookup. One side effect of this change is
that subfeatures can no longer have labels nor be ignored. I do not
think that this is a problem in practice, and actually this makes a
lot of sense.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4834 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:05:16 +00:00
Jean Delvare
bfe337fe76 Store current temperature, voltage and fan values together with 
the rest of the subfeatures. This makes the code more simple, and
prepares for current values to be subfeatures like any others (i.e.
they can be missing.)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4833 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:02:59 +00:00
Jean Delvare
79086fb7b8 Rename struct sensors_feature_data to sensors_subfeature. This is a 
first step towards a clean separation between main features and
subfeatures.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4832 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:02:22 +00:00
Jean Delvare
eba601a964 Split sensors_get_all_features() into two distinct functions, one to 
get the list of all main features, and one to get the list of all the
subfeatures of a given main feature. This is a more logical interface for
applications to use. The current implementation is admittedly less than
optimal, because the storage structures weren't meant for it, but this
issue can (and will) be addressed later.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4831 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-23 12:00:59 +00:00
Jean Delvare
a46211007e Better error handling when a feature value can't be read. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4822 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-19 16:53:16 +00:00
Jean Delvare
0464f51062 Fix fan fault handling. We were testing for fan fault before actually 
retrieving the fan features, so faults could not be detected. Swapping
the instructions fixes it.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4801 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-18 09:38:14 +00:00
Jean Delvare
3ff2df927b Fix sensors output when a temperature channel has a critical limit but 
no max limit (for example the coretemp driver.)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4791 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-08 10:47:03 +00:00
Jean Delvare
8f352d518c New sensors option: --bus-list. This option lists i2c buses that are 
used by sensor chips on the running system, in a format suitable for
sensors.conf. This is a replacement for the old, broken grab_busses.sh
script. Benefits of having this directly in sensors:
* It lists only the i2c buses that are relevant to sensors.
* sensors is installed by default, while most people didn't have
  access to grab_busses.sh.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4781 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-05 21:19:45 +00:00
Jean Delvare
8b30917c16 Don't print an error message when libsensors returns a feature 
we don't know. Just ignore that feature.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4774 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-05 15:56:28 +00:00
Jean Delvare
29bea1e843 Add support for the standard beep_enable attribute (#2248). 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4766 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-05 12:28:31 +00:00
Jean Delvare
87efbc06c5 Rename sensors_feature_data.mode to flags, as we plan to use it to 
store non-mode flags soon.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4757 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-09-05 08:13:15 +00:00
Jean Delvare
5b1068a007 Rename SENSORS_FEATURE_TEMP_SENS to SENSORS_FEATURE_TEMP_TYPE. This 
better reflects what this feature is, in line with the sysfs file name.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4730 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-29 14:08:47 +00:00
Jean Delvare
2ee12591df Remove "generic" from all printing function names. This is the default 
mode now so no need to mention it explicitly.
Rename print_vid_info to print_chip_vid and move it around for
consistency.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4728 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 21:26:20 +00:00
Jean Delvare
eaeaffb89b Fix a memory leak on error in raw print mode. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4726 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 21:14:37 +00:00
Jean Delvare
4e5d695411 Don't print the feature name for subfeatures in raw mode. Subfeatures 
typically don't have a label so printing their label is equivalent
to printing their name, so printing it again is redundant.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4725 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 21:10:42 +00:00
Jean Delvare
deb41a945d Move print_chip_raw() at the top of the file, as it is indepdendent from 
all the other functions.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4724 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:55:36 +00:00
Jean Delvare
9fe77731a9 Fix error message in print_chip_raw(). 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4723 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:52:24 +00:00
Jean Delvare
60b2bafabd Drop function get_feature_value, it wasn't adding much value. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4720 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:41:53 +00:00
Jean Delvare
868fd8d093 Avoid the conversions from double to float. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4719 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:41:03 +00:00
Jean Delvare
4716a8c8f1 Change print_temp_limits() to expose a sane interface. This lets us get 
rid of arbitrary constants. Now we can reuse the same code to display
the extra temperature limits.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4718 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:37:15 +00:00
Jean Delvare
9da5883c98 Move the printing of the current temperature out of print_temp_info(). 
That way we don't need to use an arbitrary value to carry the fault
information.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4717 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:36:46 +00:00
Jean Delvare
02e4d6fe83 print_temp_info is only ever called with precision values of 1, so we 
can hard-code this precision for improved performance.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4716 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:35:26 +00:00
Jean Delvare
2cc20c4487 Only consider the main features when computing how much room we need 
to print the labels. This is both a fix (beforehand we would leave
enough room to print possibly long subfeature names, even though we
do not actually print subfeature names at all) and a significant
performance boost. This change alone shrinks the CPU cost of a sensors
run by 4.5%.

I am still worried that this feature causes us to allocate each label
string twice, but I guess this overhead is now acceptable.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4715 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:34:55 +00:00
Jean Delvare
f0f3df8a48 Labels do fit in the imparted space by construction now, so no need 
to check.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4714 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 20:33:21 +00:00
Jean Delvare
7ba794d9ba Clean up the global variables: 
* do_sets, do_raw and hide_adapter are only used in main.c and could
thus be declared static.
* fahrenheit and degstr are used in chips.c as well, so they should be
declared in a header file.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4713 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 13:24:46 +00:00
Jean Delvare
55291db894 Reorder the functions so as to get rid of unneeded forward 
declarations.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4712 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 13:22:28 +00:00
Jean Delvare
364bd24c44 config_file doesn't need to be a global. Also move the handling of 
the configuration file in a single separate function for clarity.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4711 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 13:21:05 +00:00
Jean Delvare
c649ae5ac3 Merge chips_generic.c into chips.c. The boundary between both files was 
only historical, and prevents us from doing a number of cleanups.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4710 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 12:19:07 +00:00
Jean Delvare
252c5faf86 Mass reindent and coding style cleanups. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4708 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 10:57:16 +00:00
Jean Delvare
c91457b7de Executing the set statements is an exclusive action. 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4706 7894878c-1315-0410-8ee3-d5d059ff63e0
 2007-08-26 08:57:48 +00:00