derive_t io_syscw;
derive_t io_diskr;
derive_t io_diskw;
- _Bool has_io;
+ bool has_io;
derive_t cswitch_vol;
derive_t cswitch_invol;
- _Bool has_cswitch;
+ bool has_cswitch;
#if HAVE_LIBTASKSTATS
ts_delay_t delay;
#endif
- _Bool has_delay;
+ bool has_delay;
- _Bool has_fd;
+ bool has_fd;
- _Bool has_maps;
+ bool has_maps;
} process_entry_t;
typedef struct procstat_entry_s {
gauge_t delay_swapin;
gauge_t delay_freepages;
- _Bool report_fd_num;
- _Bool report_maps_num;
- _Bool report_ctx_switch;
- _Bool report_delay;
+ bool report_fd_num;
+ bool report_maps_num;
+ bool report_ctx_switch;
+ bool report_delay;
struct procstat *next;
struct procstat_entry_s *instances;
static procstat_t *list_head_g = NULL;
-static _Bool want_init = 1;
-static _Bool report_ctx_switch = 0;
-static _Bool report_fd_num = 0;
-static _Bool report_maps_num = 0;
-static _Bool report_delay = 0;
+static bool want_init = 1;
+static bool report_ctx_switch;
+static bool report_fd_num;
+static bool report_maps_num;
+static bool report_delay;
#if HAVE_THREAD_INFO
static mach_port_t port_host_self;
"for the \"CollectDelayAccounting\" option.");
#endif
} else {
- ERROR("processes plugin: Option `%s' not allowed heeere.", c->key);
+ ERROR("processes plugin: Option \"%s\" not allowed here.", c->key);
}
} /* for (ci->children) */
} /* void ps_tune_instance */
#if KERNEL_LINUX || KERNEL_SOLARIS || KERNEL_FREEBSD
if (strlen(c->values[0].value.string) > max_procname_len) {
- WARNING("processes plugin: this platform has a %zu character limit "
+ WARNING("processes plugin: this platform has a %" PRIsz
+ " character limit "
"to process names. The `Process \"%s\"' option will "
"not work as expected.",
max_procname_len, c->values[0].value.string);
plugin_dispatch_values(&vl);
}
- /* The ps->delay_* metrics are in nanoseconds per second. This factor converts
- * them to a percentage. */
- gauge_t const delay_factor = 100.0 / 1000000000.0;
-
- if (!isnan(ps->delay_cpu)) {
- sstrncpy(vl.type, "percent", sizeof(vl.type));
- sstrncpy(vl.type_instance, "delay-cpu", sizeof(vl.type_instance));
- vl.values[0].gauge = ps->delay_cpu * delay_factor;
- vl.values_len = 1;
- plugin_dispatch_values(&vl);
- }
-
- if (!isnan(ps->delay_blkio)) {
- sstrncpy(vl.type, "percent", sizeof(vl.type));
- sstrncpy(vl.type_instance, "delay-blkio", sizeof(vl.type_instance));
- vl.values[0].gauge = ps->delay_blkio * delay_factor;
- vl.values_len = 1;
- plugin_dispatch_values(&vl);
- }
-
- if (!isnan(ps->delay_swapin)) {
- sstrncpy(vl.type, "percent", sizeof(vl.type));
- sstrncpy(vl.type_instance, "delay-swapin", sizeof(vl.type_instance));
- vl.values[0].gauge = ps->delay_swapin * delay_factor;
- vl.values_len = 1;
- plugin_dispatch_values(&vl);
- }
-
- if (!isnan(ps->delay_freepages)) {
- sstrncpy(vl.type, "percent", sizeof(vl.type));
- sstrncpy(vl.type_instance, "delay-freepages", sizeof(vl.type_instance));
- vl.values[0].gauge = ps->delay_freepages * delay_factor;
+ /* The ps->delay_* metrics are in nanoseconds per second. Convert to seconds
+ * per second. */
+ gauge_t const delay_factor = 1000000000.0;
+
+ struct {
+ char *type_instance;
+ gauge_t rate_ns;
+ } delay_metrics[] = {
+ {"delay-cpu", ps->delay_cpu},
+ {"delay-blkio", ps->delay_blkio},
+ {"delay-swapin", ps->delay_swapin},
+ {"delay-freepages", ps->delay_freepages},
+ };
+ for (size_t i = 0; i < STATIC_ARRAY_SIZE(delay_metrics); i++) {
+ if (isnan(delay_metrics[i].rate_ns)) {
+ continue;
+ }
+ sstrncpy(vl.type, "delay_rate", sizeof(vl.type));
+ sstrncpy(vl.type_instance, delay_metrics[i].type_instance,
+ sizeof(vl.type_instance));
+ vl.values[0].gauge = delay_metrics[i].rate_ns * delay_factor;
vl.values_len = 1;
plugin_dispatch_values(&vl);
}
return 0;
}
-#else
-static int ps_delay(__attribute__((unused)) process_entry_t *unused) {
- return -1;
-}
#endif
static void ps_fill_details(const procstat_t *ps, process_entry_t *entry) {
/* Either '(' or ')' is not found or they are in the wrong order.
* Anyway, something weird that shouldn't happen ever. */
if (name_start_pos >= name_end_pos) {
- ERROR("processes plugin: name_start_pos = %zu >= name_end_pos = %zu",
+ ERROR("processes plugin: name_start_pos = %" PRIsz
+ " >= name_end_pos = %" PRIsz,
name_start_pos, name_end_pos);
return -1;
}
FILE *proc_stat;
char buffer[1024];
value_t value;
- _Bool value_valid = 0;
+ bool value_valid = 0;
proc_stat = fopen("/proc/stat", "r");
if (proc_stat == NULL) {
if ((status < 0) || (((size_t)status) != sizeof(info))) {
ERROR("processes plugin: Unexpected return value "
"while reading \"%s\": "
- "Returned %zd but expected %zu.",
+ "Returned %zd but expected %" PRIsz ".",
path, status, buffer_size);
return NULL;
}
* filter out threads (duplicate PID entries). */
if ((proc_ptr == NULL) || (proc_ptr->ki_pid != procs[i].ki_pid)) {
char cmdline[CMDLINE_BUFFER_SIZE] = "";
- _Bool have_cmdline = 0;
+ bool have_cmdline = 0;
proc_ptr = &(procs[i]);
/* Don't probe system processes and processes without arguments */
* filter out threads (duplicate PID entries). */
if ((proc_ptr == NULL) || (proc_ptr->p_pid != procs[i].p_pid)) {
char cmdline[CMDLINE_BUFFER_SIZE] = "";
- _Bool have_cmdline = 0;
+ bool have_cmdline = 0;
proc_ptr = &(procs[i]);
/* Don't probe zombie processes */