projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use true and false for assignments to bool
[collectd.git]
/
src
/
ipmi.c
diff --git
a/src/ipmi.c
b/src/ipmi.c
index
a880586
..
2475278
100644
(file)
--- 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;
struct c_ipmi_instance_s {
char *name;
ignorelist_t *ignorelist;
-
_B
ool notify_add;
-
_B
ool notify_remove;
-
_B
ool notify_notpresent;
-
_B
ool notify_conn;
-
_B
ool sel_enabled;
-
_B
ool sel_clear_event;
+
b
ool notify_add;
+
b
ool notify_remove;
+
b
ool notify_notpresent;
+
b
ool notify_conn;
+
b
ool sel_enabled;
+
b
ool sel_clear_event;
char *host;
char *connaddr;
char *host;
char *connaddr;
@@
-62,12
+62,12
@@
struct c_ipmi_instance_s {
char *password;
unsigned int authtype;
char *password;
unsigned int authtype;
-
_B
ool connected;
+
b
ool connected;
ipmi_con_t *connection;
pthread_mutex_t sensor_list_lock;
c_ipmi_sensor_list_t *sensor_list;
ipmi_con_t *connection;
pthread_mutex_t sensor_list_lock;
c_ipmi_sensor_list_t *sensor_list;
-
_B
ool active;
+
b
ool active;
pthread_t thread_id;
int init_in_progress;
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. */
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 */
/* 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;
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.. */
if ((op == IPMI_ADDED) || (op == IPMI_CHANGED)) {
/* Will check for duplicate entries.. */
@@
-805,8
+796,9
@@
entity_sensor_update_handler(enum ipmi_update_e op,
sensor, sensor_discrete_event_handler, st);
if (status) {
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) {
}
}
} else if (op == IPMI_DELETED) {
@@
-892,7
+884,7
@@
static void domain_connection_change_handler(ipmi_domain_t *domain, int err,
plugin_dispatch_notification(&n);
}
plugin_dispatch_notification(&n);
}
- st->connected =
0
;
+ st->connected =
false
;
return;
}
return;
}
@@
-904,7
+896,7
@@
static void domain_connection_change_handler(ipmi_domain_t *domain, int err,
plugin_dispatch_notification(&n);
}
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);
int status = ipmi_domain_add_entity_update_handler(
domain, domain_entity_update_handler, /* user data = */ st);
@@
-973,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.");
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;
}
return (void *)-1;
}
- while (st->active
!= 0
) {
+ while (st->active) {
struct timeval tv = {1, 0};
os_handler->perform_one_op(os_handler, &tv);
}
struct timeval tv = {1, 0};
os_handler->perform_one_op(os_handler, &tv);
}
@@
-1073,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) {
if (strcasecmp("Sensor", child->key) == 0)
ignorelist_add(st->ignorelist, child->values[0].value.string);
else if (strcasecmp("IgnoreSelected", child->key) == 0) {
-
_B
ool t;
+
b
ool t;
status = cf_util_get_boolean(child, &t);
if (status != 0)
break;
status = cf_util_get_boolean(child, &t);
if (status != 0)
break;
@@
-1132,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) {
} /* int c_ipmi_config_add_instance */
static int c_ipmi_config(oconfig_item_t *ci) {
-
_B
ool have_instance_block = 0;
+
b
ool have_instance_block = 0;
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
for (int i = 0; i < ci->children_num; i++) {
oconfig_item_t *child = ci->children + i;
@@
-1166,12
+1158,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;
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;
}
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);
return 0;
sensor_list_read_all(st);
@@
-1242,14
+1234,14
@@
static int c_ipmi_init(void) {
}
st->init_in_progress = cycles;
}
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) {
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);
st->thread_id = (pthread_t){0};
plugin_unregister_read(callback_name);
@@
-1271,7
+1263,7
@@
static int c_ipmi_shutdown(void) {
c_ipmi_instance_t *next = st->next;
st->next = NULL;
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);
if (!pthread_equal(st->thread_id, (pthread_t){0})) {
pthread_join(st->thread_id, NULL);