X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fipmi.c;h=64651a24fcdb100ed563fd6df280210529cb762b;hb=61a4ed99b1a5b6d371bb745933d0efc5dff9505c;hp=f64e6177ab48ae3ea5c2b4caa2ebc6c81c68f22c;hpb=cd660c5b07b6f09d165435f240ca17d118a1e452;p=collectd.git diff --git a/src/ipmi.c b/src/ipmi.c index f64e6177..64651a24 100644 --- a/src/ipmi.c +++ b/src/ipmi.c @@ -49,12 +49,12 @@ typedef struct c_ipmi_sensor_list_s c_ipmi_sensor_list_t; struct c_ipmi_instance_s { char *name; ignorelist_t *ignorelist; - _Bool notify_add; - _Bool notify_remove; - _Bool notify_notpresent; - _Bool notify_conn; - _Bool sel_enabled; - _Bool sel_clear_event; + bool notify_add; + bool notify_remove; + bool notify_notpresent; + bool notify_conn; + bool sel_enabled; + bool sel_clear_event; char *host; char *connaddr; @@ -62,12 +62,12 @@ struct c_ipmi_instance_s { char *password; unsigned int authtype; - _Bool connected; + bool connected; ipmi_con_t *connection; pthread_mutex_t sensor_list_lock; c_ipmi_sensor_list_t *sensor_list; - _Bool active; + bool active; pthread_t thread_id; int init_in_progress; @@ -388,12 +388,8 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { ipmi_sensor_get_event_support(sensor)); /* Both `ignorelist' and `sensor_name_ptr' may be NULL. */ - if (ignorelist_match(st->ignorelist, sensor_name_ptr) != 0) { - INFO("ipmi plugin: sensor_list_add: Ignore sensor `%s` of `%s`, " - "because it is on ignore list.", - sensor_name_ptr, st->name); - return -1; - } + if (ignorelist_match(st->ignorelist, sensor_name_ptr) != 0) + return 0; /* FIXME: Use rate unit or base unit to scale the value */ @@ -782,11 +778,6 @@ entity_sensor_update_handler(enum ipmi_update_e op, ipmi_entity_t __attribute__((unused)) * entity, ipmi_sensor_t *sensor, void *user_data) { c_ipmi_instance_t *st = user_data; - char sensor_name[DATA_MAX_NAME_LEN] = {0}; - - sensor_get_name(sensor, sensor_name, sizeof(sensor_name)); - if (ignorelist_match(st->ignorelist, sensor_name) != 0) - return; /* Ignore - sensor on ignore list */ if ((op == IPMI_ADDED) || (op == IPMI_CHANGED)) { /* Will check for duplicate entries.. */ @@ -794,11 +785,9 @@ entity_sensor_update_handler(enum ipmi_update_e op, if (st->sel_enabled) { int status = 0; - /* register threshold event if threshold sensor support events */ - if ((ipmi_sensor_get_event_reading_type(sensor) == - IPMI_EVENT_READING_TYPE_THRESHOLD) && - (ipmi_sensor_get_threshold_access(sensor) != - IPMI_THRESHOLD_ACCESS_SUPPORT_NONE)) + /* register threshold event handler */ + if (ipmi_sensor_get_event_reading_type(sensor) == + IPMI_EVENT_READING_TYPE_THRESHOLD) status = ipmi_sensor_add_threshold_event_handler( sensor, sensor_threshold_event_handler, st); /* register discrete handler if discrete/specific sensor support events */ @@ -807,8 +796,9 @@ entity_sensor_update_handler(enum ipmi_update_e op, sensor, sensor_discrete_event_handler, st); if (status) { - ERROR("Unable to add sensor %s event handler, status: %d", sensor_name, - status); + char buf[DATA_MAX_NAME_LEN] = {0}; + sensor_get_name(sensor, buf, sizeof(buf)); + ERROR("Unable to add sensor %s event handler, status: %d", buf, status); } } } else if (op == IPMI_DELETED) { @@ -1075,7 +1065,7 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { if (strcasecmp("Sensor", child->key) == 0) ignorelist_add(st->ignorelist, child->values[0].value.string); else if (strcasecmp("IgnoreSelected", child->key) == 0) { - _Bool t; + bool t; status = cf_util_get_boolean(child, &t); if (status != 0) break; @@ -1134,7 +1124,7 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { } /* int c_ipmi_config_add_instance */ static int c_ipmi_config(oconfig_item_t *ci) { - _Bool have_instance_block = 0; + bool have_instance_block = 0; for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i;