X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fipmi.c;h=67fd949cba815c7ba3d83a9cbbb6af4b45eed815;hp=22aff82cdfac4f3262b4b752e49b2843f2961f8d;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=1f88406aadbfbd3da8f2d7f08220d2734aa286b4 diff --git a/src/ipmi.c b/src/ipmi.c index 22aff82c..67fd949c 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; @@ -95,8 +95,8 @@ typedef struct c_ipmi_db_type_map_s c_ipmi_db_type_map_t; /* * Module global variables */ -static os_handler_t *os_handler = NULL; -static c_ipmi_instance_t *instances = NULL; +static os_handler_t *os_handler; +static c_ipmi_instance_t *instances; /* * Misc private functions @@ -449,9 +449,12 @@ static int sensor_list_add(c_ipmi_instance_t *st, ipmi_sensor_t *sensor) { break; INFO("ipmi plugin: sensor_list_add: Ignore sensor `%s` of `%s`, " - "because I don't know how to handle its type (%#x, %s). " - "If you need this sensor, please file a bug report.", - sensor_name_ptr, st->name, sensor_type, + "because I don't know how to handle its units (%#x, %#x, %#x). " + "Sensor type: (%#x, %s). If you need this sensor, please file " + "a bug report at http://collectd.org/.", + sensor_name_ptr, st->name, ipmi_sensor_get_base_unit(sensor), + ipmi_sensor_get_modifier_unit(sensor), + ipmi_sensor_get_rate_unit(sensor), sensor_type, ipmi_sensor_get_sensor_type_string(sensor)); return -1; } @@ -782,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 */ @@ -883,7 +884,7 @@ static void domain_connection_change_handler(ipmi_domain_t *domain, int err, plugin_dispatch_notification(&n); } - st->connected = 0; + st->connected = false; return; } @@ -895,7 +896,7 @@ static void domain_connection_change_handler(ipmi_domain_t *domain, int err, plugin_dispatch_notification(&n); } - st->connected = 1; + st->connected = true; int status = ipmi_domain_add_entity_update_handler( domain, domain_entity_update_handler, /* user data = */ st); @@ -964,11 +965,11 @@ static void *c_ipmi_thread_main(void *user_data) { int status = c_ipmi_thread_init(st); if (status != 0) { ERROR("ipmi plugin: c_ipmi_thread_init failed."); - st->active = 0; + st->active = false; return (void *)-1; } - while (st->active != 0) { + while (st->active) { struct timeval tv = {1, 0}; os_handler->perform_one_op(os_handler, &tv); } @@ -1061,10 +1062,15 @@ static int c_ipmi_config_add_instance(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp("Sensor", child->key) == 0) - ignorelist_add(st->ignorelist, ci->values[0].value.string); - else if (strcasecmp("IgnoreSelected", child->key) == 0) { - _Bool t; + if (strcasecmp("Sensor", child->key) == 0) { + char *value = NULL; + status = cf_util_get_string(child, &value); + if (status != 0) + break; + ignorelist_add(st->ignorelist, value); + sfree(value); + } else if (strcasecmp("IgnoreSelected", child->key) == 0) { + bool t; status = cf_util_get_boolean(child, &t); if (status != 0) break; @@ -1123,7 +1129,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; @@ -1157,12 +1163,12 @@ static int c_ipmi_config(oconfig_item_t *ci) { static int c_ipmi_read(user_data_t *user_data) { c_ipmi_instance_t *st = user_data->data; - if (st->active == 0) { + if (st->active == false) { INFO("ipmi plugin: c_ipmi_read: I'm not active, returning false."); return -1; } - if (st->connected == 0) + if (st->connected == false) return 0; sensor_list_read_all(st); @@ -1207,7 +1213,7 @@ static int c_ipmi_init(void) { } /* Don't send `ADD' notifications during startup (~ 1 minute) */ - int cycles = 1 + (60 / CDTIME_T_TO_TIME_T(plugin_get_interval())); + int cycles = 1 + (int)(TIME_T_TO_CDTIME_T(60) / plugin_get_interval()); st = instances; while (NULL != st) { @@ -1233,14 +1239,14 @@ static int c_ipmi_init(void) { } st->init_in_progress = cycles; - st->active = 1; + st->active = true; status = plugin_thread_create(&st->thread_id, /* attr = */ NULL, c_ipmi_thread_main, /* user data = */ (void *)st, "ipmi"); if (status != 0) { - st->active = 0; + st->active = false; st->thread_id = (pthread_t){0}; plugin_unregister_read(callback_name); @@ -1262,7 +1268,7 @@ static int c_ipmi_shutdown(void) { c_ipmi_instance_t *next = st->next; st->next = NULL; - st->active = 0; + st->active = false; if (!pthread_equal(st->thread_id, (pthread_t){0})) { pthread_join(st->thread_id, NULL);