proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 15:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Incorporate Wall and Cpu warning into show thread cpu

Browse Source 
Incorporate into the `show thread cpu` the number of times
we have issued warnings about a particular thread being
too slow.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-02-02 13:24:31 -05:00
parent 039d547f6f
commit 9b8e01cae4
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/thread.c
View File

@ -124,10 +124,11 @@ static void cpu_record_hash_free(void *a)
static void vty_out_cpu_thread_history(struct vty *vty, static void vty_out_cpu_thread_history(struct vty *vty,
struct cpu_thread_history *a) struct cpu_thread_history *a)
{ {
vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu", vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu %9zu %9zu",
a->total_active, a->cpu.total / 1000, a->cpu.total % 1000, a->total_active, a->cpu.total / 1000, a->cpu.total % 1000,
a->total_calls, (a->cpu.total / a->total_calls), a->cpu.max, a->total_calls, (a->cpu.total / a->total_calls), a->cpu.max,
(a->real.total / a->total_calls), a->real.max); (a->real.total / a->total_calls), a->real.max,
a->total_cpu_warn, a->total_wall_warn);
vty_out(vty, " %c%c%c%c%c %s\n", vty_out(vty, " %c%c%c%c%c %s\n",
a->types & (1 << THREAD_READ) ? 'R' : ' ', a->types & (1 << THREAD_READ) ? 'R' : ' ',
a->types & (1 << THREAD_WRITE) ? 'W' : ' ', a->types & (1 << THREAD_WRITE) ? 'W' : ' ',
@ -149,6 +150,10 @@ static void cpu_record_hash_print(struct hash_bucket *bucket, void *args[])
atomic_load_explicit(&a->total_active, memory_order_seq_cst); atomic_load_explicit(&a->total_active, memory_order_seq_cst);
copy.total_calls = copy.total_calls =
atomic_load_explicit(&a->total_calls, memory_order_seq_cst); atomic_load_explicit(&a->total_calls, memory_order_seq_cst);
copy.total_cpu_warn =
atomic_load_explicit(&a->total_cpu_warn, memory_order_seq_cst);
copy.total_wall_warn =
atomic_load_explicit(&a->total_wall_warn, memory_order_seq_cst);
copy.cpu.total = copy.cpu.total =
atomic_load_explicit(&a->cpu.total, memory_order_seq_cst); atomic_load_explicit(&a->cpu.total, memory_order_seq_cst);
copy.cpu.max = atomic_load_explicit(&a->cpu.max, memory_order_seq_cst); copy.cpu.max = atomic_load_explicit(&a->cpu.max, memory_order_seq_cst);
@ -165,6 +170,8 @@ static void cpu_record_hash_print(struct hash_bucket *bucket, void *args[])
vty_out_cpu_thread_history(vty, &copy); vty_out_cpu_thread_history(vty, &copy);
totals->total_active += copy.total_active; totals->total_active += copy.total_active;
totals->total_calls += copy.total_calls; totals->total_calls += copy.total_calls;
totals->total_cpu_warn += copy.total_cpu_warn;
totals->total_wall_warn += copy.total_wall_warn;
totals->real.total += copy.real.total; totals->real.total += copy.real.total;
if (totals->real.max < copy.real.max) if (totals->real.max < copy.real.max)
totals->real.max = copy.real.max; totals->real.max = copy.real.max;
@ -202,7 +209,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
vty_out(vty, vty_out(vty,
"Active Runtime(ms) Invoked Avg uSec Max uSecs"); "Active Runtime(ms) Invoked Avg uSec Max uSecs");
vty_out(vty, " Avg uSec Max uSecs"); vty_out(vty, " Avg uSec Max uSecs");
vty_out(vty, " Type Thread\n"); vty_out(vty, " CPU_Warn Wall_Warn Type Thread\n");
if (m->cpu_record->count) if (m->cpu_record->count)
hash_iterate( hash_iterate(
@ -223,7 +230,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
vty_out(vty, "%30s %18s %18s\n", "", vty_out(vty, "%30s %18s %18s\n", "",
"CPU (user+system):", "Real (wall-clock):"); "CPU (user+system):", "Real (wall-clock):");
vty_out(vty, "Active Runtime(ms) Invoked Avg uSec Max uSecs"); vty_out(vty, "Active Runtime(ms) Invoked Avg uSec Max uSecs");
vty_out(vty, " Avg uSec Max uSecs"); vty_out(vty, " Avg uSec Max uSecs CPU_Warn Wall_Warn");
vty_out(vty, " Type Thread\n"); vty_out(vty, " Type Thread\n");
if (tmp.total_calls > 0) if (tmp.total_calls > 0)
@ -1858,6 +1865,8 @@ void thread_call(struct thread *thread)
* Whinge about it now, so we're aware this is yet another task * Whinge about it now, so we're aware this is yet another task
* to fix. * to fix.
*/ */
atomic_fetch_add_explicit(&thread->hist->total_cpu_warn,
1, memory_order_seq_cst);
flog_warn( flog_warn(
EC_LIB_SLOW_THREAD_CPU, EC_LIB_SLOW_THREAD_CPU,
"CPU HOG: task %s (%lx) ran for %lums (cpu time %lums)", "CPU HOG: task %s (%lx) ran for %lums (cpu time %lums)",
@ -1870,6 +1879,8 @@ void thread_call(struct thread *thread)
* about this because this could imply some sort of * about this because this could imply some sort of
* scheduling issue. * scheduling issue.
*/ */
atomic_fetch_add_explicit(&thread->hist->total_wall_warn,
1, memory_order_seq_cst);
flog_warn( flog_warn(
EC_LIB_SLOW_THREAD_WALL, EC_LIB_SLOW_THREAD_WALL,
"STARVATION: task %s (%lx) ran for %lums (cpu time %lums)", "STARVATION: task %s (%lx) ran for %lums (cpu time %lums)",

2
lib/thread.h
View File

@ -119,6 +119,8 @@ struct thread {
struct cpu_thread_history { struct cpu_thread_history {
int (*func)(struct thread *); int (*func)(struct thread *);
atomic_size_t total_cpu_warn;
atomic_size_t total_wall_warn;
atomic_size_t total_calls; atomic_size_t total_calls;
atomic_size_t total_active; atomic_size_t total_active;
struct time_stats { struct time_stats {

4
lib/vty.c
View File

@ -517,12 +517,12 @@ static int vty_command(struct vty *vty, char *buf)
/* Warn about CPU hog that must be fixed. */ /* Warn about CPU hog that must be fixed. */
flog_warn( flog_warn(
EC_LIB_SLOW_THREAD_CPU, EC_LIB_SLOW_THREAD_CPU,
"SLOW COMMAND: command took %lums (cpu time %lums): %s", "CPU HOG: command took %lums (cpu time %lums): %s",
realtime / 1000, cputime / 1000, buf); realtime / 1000, cputime / 1000, buf);
} else if (realtime > CONSUMED_TIME_CHECK) { } else if (realtime > CONSUMED_TIME_CHECK) {
flog_warn( flog_warn(
EC_LIB_SLOW_THREAD_WALL, EC_LIB_SLOW_THREAD_WALL,
"SLOW COMMAND: command took %lums (cpu time %lums): %s", "STARVATION: command took %lums (cpu time %lums): %s",
realtime / 1000, cputime / 1000, buf); realtime / 1000, cputime / 1000, buf);
} }
} }