deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID:343 - Print actual sensor thresholds in 'sensors' comand

Browse Source 
Use Get Sensor Threshold command for obtaining thresholds, since SDR records may
contain not actual threhsolds.
This commit is contained in:
Zdenek Styblik 2014-11-29 17:44:07 +01:00
parent f56d740d98
commit 0eaa2eae51
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/ipmi_sensor.c
View File

@ -1,21 +1,21 @@
/* /*
* Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. * Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* Redistribution of source code must retain the above copyright * Redistribution of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* Redistribution in binary form must reproduce the above copyright * Redistribution in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* Neither the name of Sun Microsystems, Inc. or the names of * Neither the name of Sun Microsystems, Inc. or the names of
* contributors may be used to endorse or promote products derived * contributors may be used to endorse or promote products derived
* from this software without specific prior written permission. * from this software without specific prior written permission.
* *
* This software is provided "AS IS," without a warranty of any kind. * This software is provided "AS IS," without a warranty of any kind.
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
* INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
@ -52,8 +52,8 @@ void print_sensor_thresh_usage();
// static // static
int int
ipmi_sensor_get_sensor_reading_factors( ipmi_sensor_get_sensor_reading_factors(
struct ipmi_intf * intf, struct ipmi_intf * intf,
struct sdr_record_full_sensor * sensor, struct sdr_record_full_sensor * sensor,
uint8_t reading) uint8_t reading)
{ {
struct ipmi_rq req; struct ipmi_rq req;
@ -88,9 +88,9 @@ ipmi_sensor_get_sensor_reading_factors(
return -1; return -1;
} else { } else {
/* Update SDR copy with updated Reading Factors for this reading */ /* Update SDR copy with updated Reading Factors for this reading */
/* Note: /* Note:
* The Format of the returned data is exactly as in the SDR definition (Little Endian Format), * The Format of the returned data is exactly as in the SDR definition (Little Endian Format),
* therefore we can use raw copy operation here. * therefore we can use raw copy operation here.
* Note: rsp->data[0] would point to the next valid entry in the sampling table * Note: rsp->data[0] would point to the next valid entry in the sampling table
*/ */
// BUGBUG: uses 'hardcoded' length information from SDR Definition // BUGBUG: uses 'hardcoded' length information from SDR Definition
@ -892,8 +892,20 @@ ipmi_sensor_get(struct ipmi_intf *intf, int argc, char **argv)
/* need to set verbose level to 1 */ /* need to set verbose level to 1 */
v = verbose; v = verbose;
verbose = 1; verbose = 1;
if (ipmi_sdr_print_listentry(intf, sdr) < 0) { switch (sdr->type) {
rc = (-1); case SDR_RECORD_TYPE_FULL_SENSOR:
case SDR_RECORD_TYPE_COMPACT_SENSOR:
if (ipmi_sensor_print_fc(intf,
(struct sdr_record_common_sensor *) sdr->record.common,
sdr->type)) {
rc = -1;
}
break;
default:
if (ipmi_sdr_print_listentry(intf, sdr) < 0) {
rc = (-1);
}
break;
} }
verbose = v; verbose = v;
sdr = NULL; sdr = NULL;