Merge pull request #6263 from opensourcerouting/zlog-coverity-20200420

[mirror_frr.git] / lib / thread.c

diff --git a/lib/thread.c b/lib/thread.c
index 651d26dfb2f401f0bc1f91bbfc46e06b3a982ee1..4d689a9f88a9e6a5aca5c2123aa5b863d11d54d8 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -114,11 +114,10 @@ static void vty_out_cpu_thread_history(struct vty *vty,
                                       struct cpu_thread_history *a)
 {
        vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu",
-               (size_t)a->total_active,
-               a->cpu.total / 1000, a->cpu.total % 1000,
-               (size_t)a->total_calls,
-               a->cpu.total / a->total_calls, a->cpu.max,
-               a->real.total / a->total_calls, a->real.max);
+               (size_t)a->total_active, a->cpu.total / 1000,
+               a->cpu.total % 1000, (size_t)a->total_calls,
+               (size_t)(a->cpu.total / a->total_calls), a->cpu.max,
+               (size_t)(a->real.total / a->total_calls), a->real.max);
        vty_out(vty, " %c%c%c%c%c %s\n",
                a->types & (1 << THREAD_READ) ? 'R' : ' ',
                a->types & (1 << THREAD_WRITE) ? 'W' : ' ',
@@ -171,7 +170,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
        struct thread_master *m;
        struct listnode *ln;
 
-       memset(&tmp, 0, sizeof tmp);
+       memset(&tmp, 0, sizeof(tmp));
        tmp.funcname = "TOTAL";
        tmp.types = filter;
 
@@ -725,6 +724,7 @@ static int fd_poll(struct thread_master *m, struct pollfd *pfds, nfds_t pfdsize,
                 < 0) // effect a poll (return immediately)
                timeout = 0;
 
+       zlog_tls_buffer_flush();
        rcu_read_unlock();
        rcu_assert_read_unlocked();