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

sensor: Refactor ipmi_sensor_print_fc_threshold()

Browse Source 
Break the function into smaller pieces to reduce
complexity.
This commit is contained in:
eyjhbb@gmail.com 2018-09-24 15:41:00 +02:00 committed by Alexander Amelkin
parent 9d49a6edfe
commit 6f336d04f1
1 changed files with 182 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
lib/ipmi_sensor.c
View File

@ -260,34 +260,13 @@ print_thresh_setting(struct sdr_record_full_sensor *full,
} }
} }
static int static void
ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf, dump_sensor_fc_thredshold_csv(
struct sdr_record_common_sensor *sensor, int thresh_available,
uint8_t sdr_record_type) const char *thresh_status,
struct ipmi_rs *rsp,
struct sensor_reading *sr)
{ {
int thresh_available = 1;
struct ipmi_rs *rsp;
struct sensor_reading *sr;
sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr_record_type, 3);
if (!sr) {
return -1;
}
const char *thresh_status = ipmi_sdr_get_thresh_status(sr, "ns");
/*
* Get sensor thresholds
*/
rsp = ipmi_sdr_get_sensor_thresholds(intf,
sensor->keys.sensor_num, sensor->keys.owner_id,
sensor->keys.lun, sensor->keys.channel);
if (!rsp || rsp->ccode || !rsp->data_len)
thresh_available = 0;
if (csv_output) {
printf("%s", sr->s_id); printf("%s", sr->s_id);
if (sr->s_reading_valid) { if (sr->s_reading_valid) {
if (sr->s_has_analog_value) if (sr->s_has_analog_value)
@ -303,7 +282,7 @@ ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
if (thresh_available && sr->full) { if (thresh_available && sr->full) {
#define PTS(bit, dataidx) { \ #define PTS(bit, dataidx) { \
print_thresh_setting(sr->full, rsp->data[0] & (bit), \ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], ",", "%.3f", "0x%x", "%s"); \ rsp->data[(dataidx)], ",", "%.3f", "0x%x", "%s"); \
} }
PTS(LOWER_NON_RECOV_SPECIFIED, 3); PTS(LOWER_NON_RECOV_SPECIFIED, 3);
PTS(LOWER_CRIT_SPECIFIED, 2); PTS(LOWER_CRIT_SPECIFIED, 2);
@ -317,11 +296,18 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
"na", "na", "na", "na", "na", "na"); "na", "na", "na", "na", "na", "na");
} }
printf("\n"); printf("\n");
} else { }
if (verbose == 0) {
/* output format /* output format
* id value units status thresholds.... * id value units status thresholds....
*/ */
static void
dump_sensor_fc_thredshold(
int thresh_available,
const char *thresh_status,
struct ipmi_rs *rsp,
struct sensor_reading *sr)
{
printf("%-16s ", sr->s_id); printf("%-16s ", sr->s_id);
if (sr->s_reading_valid) { if (sr->s_reading_valid) {
if (sr->s_has_analog_value) if (sr->s_has_analog_value)
@ -336,8 +322,8 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
} }
if (thresh_available && sr->full) { if (thresh_available && sr->full) {
#define PTS(bit, dataidx) { \ #define PTS(bit, dataidx) { \
print_thresh_setting(sr->full, rsp->data[0] & (bit), \ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], "| ", "%-10.3f", "0x%-8x", "%-10s"); \ rsp->data[(dataidx)], "| ", "%-10.3f", "0x%-8x", "%-10s"); \
} }
PTS(LOWER_NON_RECOV_SPECIFIED, 3); PTS(LOWER_NON_RECOV_SPECIFIED, 3);
PTS(LOWER_CRIT_SPECIFIED, 2); PTS(LOWER_CRIT_SPECIFIED, 2);
@ -352,7 +338,17 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
} }
printf("\n"); printf("\n");
} else { }
static void
dump_sensor_fc_thredshold_verbose(
int thresh_available,
const char *thresh_status,
struct ipmi_intf *intf,
struct sdr_record_common_sensor *sensor,
struct ipmi_rs *rsp,
struct sensor_reading *sr)
{
printf("Sensor ID : %s (0x%x)\n", printf("Sensor ID : %s (0x%x)\n",
sr->s_id, sensor->keys.sensor_num); sr->s_id, sensor->keys.sensor_num);
@ -360,8 +356,7 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
sensor->entity.id, sensor->entity.instance); sensor->entity.id, sensor->entity.instance);
printf(" Sensor Type (Threshold) : %s\n", printf(" Sensor Type (Threshold) : %s\n",
ipmi_get_sensor_type(intf, sensor->sensor. ipmi_get_sensor_type(intf, sensor->sensor.type));
type));
printf(" Sensor Reading : "); printf(" Sensor Reading : ");
if (sr->s_reading_valid) { if (sr->s_reading_valid) {
@ -384,8 +379,8 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
sr->s_a_units); sr->s_a_units);
} }
} else { } else {
printf("0x%x %s\n", sr->s_reading, printf("0x%x %s\n",
sr->s_a_units); sr->s_reading, sr->s_a_units);
} }
printf(" Status : %s\n", thresh_status); printf(" Status : %s\n", thresh_status);
@ -396,7 +391,6 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
rsp->data[(dataidx)], \ rsp->data[(dataidx)], \
(str), "%.3f\n", "0x%x\n", "%s\n"); \ (str), "%.3f\n", "0x%x\n", "%s\n"); \
} }
PTS(LOWER_NON_RECOV_SPECIFIED, 3, " Lower Non-Recoverable : "); PTS(LOWER_NON_RECOV_SPECIFIED, 3, " Lower Non-Recoverable : ");
PTS(LOWER_CRIT_SPECIFIED, 2, " Lower Critical : "); PTS(LOWER_CRIT_SPECIFIED, 2, " Lower Critical : ");
PTS(LOWER_NON_CRIT_SPECIFIED, 1, " Lower Non-Critical : "); PTS(LOWER_NON_CRIT_SPECIFIED, 1, " Lower Non-Critical : ");
@ -442,6 +436,43 @@ print_thresh_setting(sr->full, rsp->data[0] & (bit), \
sensor->keys.channel); sensor->keys.channel);
printf("\n"); printf("\n");
}
static int
ipmi_sensor_print_fc_threshold(struct ipmi_intf *intf,
struct sdr_record_common_sensor *sensor,
uint8_t sdr_record_type)
{
int thresh_available = 1;
struct ipmi_rs *rsp;
struct sensor_reading *sr;
sr = ipmi_sdr_read_sensor_value(intf, sensor, sdr_record_type, 3);
if (!sr) {
return -1;
}
const char *thresh_status = ipmi_sdr_get_thresh_status(sr, "ns");
/*
* Get sensor thresholds
*/
rsp = ipmi_sdr_get_sensor_thresholds(intf,
sensor->keys.sensor_num, sensor->keys.owner_id,
sensor->keys.lun, sensor->keys.channel);
if (!rsp || rsp->ccode || !rsp->data_len)
thresh_available = 0;
if (csv_output) {
dump_sensor_fc_thredshold_csv(thresh_available, thresh_status, rsp, sr);
} else {
if (verbose == 0) {
dump_sensor_fc_thredshold(thresh_available, thresh_status, rsp, sr);
} else {
dump_sensor_fc_thredshold_verbose(thresh_available, thresh_status,
intf, sensor, rsp, sr);
} }
} }