diff options
Diffstat (limited to 'plugins/check_load.c')
-rw-r--r-- | plugins/check_load.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/plugins/check_load.c b/plugins/check_load.c index 2925bff3..644cd604 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c | |||
@@ -168,7 +168,8 @@ int main(int argc, char **argv) { | |||
168 | mp_subcheck scaled_load_sc1 = mp_subcheck_init(); | 168 | mp_subcheck scaled_load_sc1 = mp_subcheck_init(); |
169 | scaled_load_sc1 = mp_set_subcheck_state(scaled_load_sc1, mp_get_pd_status(pd_scaled_load1)); | 169 | scaled_load_sc1 = mp_set_subcheck_state(scaled_load_sc1, mp_get_pd_status(pd_scaled_load1)); |
170 | mp_add_perfdata_to_subcheck(&scaled_load_sc1, pd_scaled_load1); | 170 | mp_add_perfdata_to_subcheck(&scaled_load_sc1, pd_scaled_load1); |
171 | xasprintf(&scaled_load_sc1.output, "1 Minute: %s", pd_value_to_string(pd_scaled_load1.value)); | 171 | xasprintf(&scaled_load_sc1.output, "1 Minute: %s", |
172 | pd_value_to_string(pd_scaled_load1.value)); | ||
172 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc1); | 173 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc1); |
173 | 174 | ||
174 | mp_perfdata pd_scaled_load5 = perfdata_init(); | 175 | mp_perfdata pd_scaled_load5 = perfdata_init(); |
@@ -179,7 +180,8 @@ int main(int argc, char **argv) { | |||
179 | mp_subcheck scaled_load_sc5 = mp_subcheck_init(); | 180 | mp_subcheck scaled_load_sc5 = mp_subcheck_init(); |
180 | scaled_load_sc5 = mp_set_subcheck_state(scaled_load_sc5, mp_get_pd_status(pd_scaled_load5)); | 181 | scaled_load_sc5 = mp_set_subcheck_state(scaled_load_sc5, mp_get_pd_status(pd_scaled_load5)); |
181 | mp_add_perfdata_to_subcheck(&scaled_load_sc5, pd_scaled_load5); | 182 | mp_add_perfdata_to_subcheck(&scaled_load_sc5, pd_scaled_load5); |
182 | xasprintf(&scaled_load_sc5.output, "5 Minutes: %s", pd_value_to_string(pd_scaled_load5.value)); | 183 | xasprintf(&scaled_load_sc5.output, "5 Minutes: %s", |
184 | pd_value_to_string(pd_scaled_load5.value)); | ||
183 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc5); | 185 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc5); |
184 | 186 | ||
185 | mp_perfdata pd_scaled_load15 = perfdata_init(); | 187 | mp_perfdata pd_scaled_load15 = perfdata_init(); |
@@ -188,9 +190,11 @@ int main(int argc, char **argv) { | |||
188 | pd_scaled_load15 = mp_pd_set_thresholds(pd_scaled_load15, config.th_load[2]); | 190 | pd_scaled_load15 = mp_pd_set_thresholds(pd_scaled_load15, config.th_load[2]); |
189 | 191 | ||
190 | mp_subcheck scaled_load_sc15 = mp_subcheck_init(); | 192 | mp_subcheck scaled_load_sc15 = mp_subcheck_init(); |
191 | scaled_load_sc15 = mp_set_subcheck_state(scaled_load_sc15, mp_get_pd_status(pd_scaled_load15)); | 193 | scaled_load_sc15 = |
194 | mp_set_subcheck_state(scaled_load_sc15, mp_get_pd_status(pd_scaled_load15)); | ||
192 | mp_add_perfdata_to_subcheck(&scaled_load_sc15, pd_scaled_load15); | 195 | mp_add_perfdata_to_subcheck(&scaled_load_sc15, pd_scaled_load15); |
193 | xasprintf(&scaled_load_sc15.output, "15 Minutes: %s", pd_value_to_string(pd_scaled_load15.value)); | 196 | xasprintf(&scaled_load_sc15.output, "15 Minutes: %s", |
197 | pd_value_to_string(pd_scaled_load15.value)); | ||
194 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc15); | 198 | mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc15); |
195 | 199 | ||
196 | mp_add_subcheck_to_check(&overall, scaled_load_sc); | 200 | mp_add_subcheck_to_check(&overall, scaled_load_sc); |
@@ -245,11 +249,13 @@ int main(int argc, char **argv) { | |||
245 | mp_subcheck top_proc_sc = mp_subcheck_init(); | 249 | mp_subcheck top_proc_sc = mp_subcheck_init(); |
246 | top_proc_sc = mp_set_subcheck_state(top_proc_sc, STATE_OK); | 250 | top_proc_sc = mp_set_subcheck_state(top_proc_sc, STATE_OK); |
247 | top_processes_result top_proc = print_top_consuming_processes(config.n_procs_to_show); | 251 | top_processes_result top_proc = print_top_consuming_processes(config.n_procs_to_show); |
248 | xasprintf(&top_proc_sc.output, "Top %lu CPU time consuming processes", config.n_procs_to_show); | 252 | xasprintf(&top_proc_sc.output, "Top %lu CPU time consuming processes", |
253 | config.n_procs_to_show); | ||
249 | 254 | ||
250 | if (top_proc.errorcode == OK) { | 255 | if (top_proc.errorcode == OK) { |
251 | for (unsigned long i = 0; i < config.n_procs_to_show; i++) { | 256 | for (unsigned long i = 0; i < config.n_procs_to_show; i++) { |
252 | xasprintf(&top_proc_sc.output, "%s\n%s", top_proc_sc.output, top_proc.top_processes[i]); | 257 | xasprintf(&top_proc_sc.output, "%s\n%s", top_proc_sc.output, |
258 | top_proc.top_processes[i]); | ||
253 | } | 259 | } |
254 | } | 260 | } |
255 | 261 | ||
@@ -417,7 +423,8 @@ void print_help(void) { | |||
417 | 423 | ||
418 | void print_usage(void) { | 424 | void print_usage(void) { |
419 | printf("%s\n", _("Usage:")); | 425 | printf("%s\n", _("Usage:")); |
420 | printf("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", progname); | 426 | printf("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", |
427 | progname); | ||
421 | } | 428 | } |
422 | 429 | ||
423 | #ifdef PS_USES_PROCPCPU | 430 | #ifdef PS_USES_PROCPCPU |
@@ -445,8 +452,8 @@ static top_processes_result print_top_consuming_processes(unsigned long n_procs_ | |||
445 | top_processes_result result = { | 452 | top_processes_result result = { |
446 | .errorcode = OK, | 453 | .errorcode = OK, |
447 | }; | 454 | }; |
448 | struct output chld_out; | 455 | output chld_out; |
449 | struct output chld_err; | 456 | output chld_err; |
450 | if (np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0) != 0) { | 457 | if (np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0) != 0) { |
451 | fprintf(stderr, _("'%s' exited with non-zero status.\n"), PS_COMMAND); | 458 | fprintf(stderr, _("'%s' exited with non-zero status.\n"), PS_COMMAND); |
452 | result.errorcode = ERROR; | 459 | result.errorcode = ERROR; |
@@ -462,7 +469,8 @@ static top_processes_result print_top_consuming_processes(unsigned long n_procs_ | |||
462 | #ifdef PS_USES_PROCPCPU | 469 | #ifdef PS_USES_PROCPCPU |
463 | qsort(chld_out.line + 1, chld_out.lines - 1, sizeof(char *), cmpstringp); | 470 | qsort(chld_out.line + 1, chld_out.lines - 1, sizeof(char *), cmpstringp); |
464 | #endif /* PS_USES_PROCPCPU */ | 471 | #endif /* PS_USES_PROCPCPU */ |
465 | unsigned long lines_to_show = chld_out.lines < (size_t)(n_procs_to_show + 1) ? chld_out.lines : n_procs_to_show + 1; | 472 | unsigned long lines_to_show = |
473 | chld_out.lines < (size_t)(n_procs_to_show + 1) ? chld_out.lines : n_procs_to_show + 1; | ||
466 | 474 | ||
467 | result.top_processes = calloc(lines_to_show, sizeof(char *)); | 475 | result.top_processes = calloc(lines_to_show, sizeof(char *)); |
468 | if (result.top_processes == NULL) { | 476 | if (result.top_processes == NULL) { |