zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / thread.h

diff --git a/lib/thread.h b/lib/thread.h
index f7c110914dcaa1105615b523d9c9fc0add8f3dc7..f404d92755e6b82a28671259b5f2e821c75a3385 100644 (file)
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -25,6 +25,7 @@
 #include <pthread.h>
 #include <poll.h>
 #include "monotime.h"
+#include "frratomic.h"
 
 struct rusage_t {
        struct rusage cpu;
@@ -91,12 +92,10 @@ struct thread_master {
        pthread_t owner;
 };
 
-typedef unsigned char thread_type;
-
 /* Thread itself. */
 struct thread {
-       thread_type type;            /* thread type */
-       thread_type add_type;    /* thread type */
+       uint8_t type;             /* thread type */
+       uint8_t add_type;         /* thread type */
        struct thread *next;      /* next pointer of the thread */
        struct thread *prev;      /* previous pointer of the thread */
        struct thread **ref;      /* external reference (if given) */
@@ -120,13 +119,13 @@ struct thread {
 
 struct cpu_thread_history {
        int (*func)(struct thread *);
-       unsigned int total_calls;
-       unsigned int total_active;
+       _Atomic unsigned int total_calls;
+       _Atomic unsigned int total_active;
        struct time_stats {
-               unsigned long total, max;
+               _Atomic unsigned long total, max;
        } real;
        struct time_stats cpu;
-       thread_type types;
+       _Atomic uint32_t types;
        const char *funcname;
 };
 
@@ -171,6 +170,8 @@ struct cpu_thread_history {
 #define thread_add_timer_tv(m,f,a,v,t) funcname_thread_add_timer_tv(m,f,a,v,t,#f,__FILE__,__LINE__)
 #define thread_add_event(m,f,a,v,t) funcname_thread_add_event(m,f,a,v,t,#f,__FILE__,__LINE__)
 #define thread_execute(m,f,a,v) funcname_thread_execute(m,f,a,v,#f,__FILE__,__LINE__)
+#define thread_execute_name(m, f, a, v, n)                             \
+       funcname_thread_execute(m, f, a, v, n, __FILE__, __LINE__)
 
 /* Prototypes. */
 extern struct thread_master *thread_master_create(const char *);
@@ -216,6 +217,7 @@ extern struct thread *thread_fetch(struct thread_master *, struct thread *);
 extern void thread_call(struct thread *);
 extern unsigned long thread_timer_remain_second(struct thread *);
 extern struct timeval thread_timer_remain(struct thread *);
+extern unsigned long thread_timer_remain_msec(struct thread *);
 extern int thread_should_yield(struct thread *);
 /* set yield time for thread */
 extern void thread_set_yield_time(struct thread *, unsigned long);