*: reindentreindent-master-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 128 insertions, 123 deletions

diff --git a/lib/thread.h b/lib/thread.h
index ad923c413f..c830446e10 100644
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -26,114 +26,108 @@
 #include <poll.h>
 #include "monotime.h"
 
-struct rusage_t
-{
-  struct rusage cpu;
-  struct timeval real;
+struct rusage_t {
+	struct rusage cpu;
+	struct timeval real;
 };
 #define RUSAGE_T        struct rusage_t
 
 #define GETRUSAGE(X) thread_getrusage(X)
 
 /* Linked list of thread. */
-struct thread_list
-{
-  struct thread *head;
-  struct thread *tail;
-  int count;
+struct thread_list {
+	struct thread *head;
+	struct thread *tail;
+	int count;
 };
 
 struct pqueue;
 
-struct fd_handler
-{
-  /* number of pfd that fit in the allocated space of pfds. This is a constant
-   * and is the same for both pfds and copy. */
-  nfds_t pfdsize;
-
-  /* file descriptors to monitor for i/o */
-  struct pollfd *pfds;
-  /* number of pollfds stored in pfds */
-  nfds_t pfdcount;
-
-  /* chunk used for temp copy of pollfds */
-  struct pollfd *copy;
-  /* number of pollfds stored in copy */
-  nfds_t copycount;
+struct fd_handler {
+	/* number of pfd that fit in the allocated space of pfds. This is a
+	 * constant
+	 * and is the same for both pfds and copy. */
+	nfds_t pfdsize;
+
+	/* file descriptors to monitor for i/o */
+	struct pollfd *pfds;
+	/* number of pollfds stored in pfds */
+	nfds_t pfdcount;
+
+	/* chunk used for temp copy of pollfds */
+	struct pollfd *copy;
+	/* number of pollfds stored in copy */
+	nfds_t copycount;
 };
 
 struct cancel_req {
-  struct thread *thread;
-  void *eventobj;
-  struct thread **threadref;
+	struct thread *thread;
+	void *eventobj;
+	struct thread **threadref;
 };
 
 /* Master of the theads. */
-struct thread_master
-{
-  char *name;
-
-  struct thread **read;
-  struct thread **write;
-  struct pqueue *timer;
-  struct thread_list event;
-  struct thread_list ready;
-  struct thread_list unuse;
-  struct list *cancel_req;
-  bool canceled;
-  pthread_cond_t cancel_cond;
-  struct hash *cpu_record;
-  int io_pipe[2];
-  int fd_limit;
-  struct fd_handler handler;
-  unsigned long alloc;
-  long selectpoll_timeout;
-  bool spin;
-  bool handle_signals;
-  pthread_mutex_t mtx;
-  pthread_t owner;
+struct thread_master {
+	char *name;
+
+	struct thread **read;
+	struct thread **write;
+	struct pqueue *timer;
+	struct thread_list event;
+	struct thread_list ready;
+	struct thread_list unuse;
+	struct list *cancel_req;
+	bool canceled;
+	pthread_cond_t cancel_cond;
+	struct hash *cpu_record;
+	int io_pipe[2];
+	int fd_limit;
+	struct fd_handler handler;
+	unsigned long alloc;
+	long selectpoll_timeout;
+	bool spin;
+	bool handle_signals;
+	pthread_mutex_t mtx;
+	pthread_t owner;
 };
 
 typedef unsigned char thread_type;
 
 /* Thread itself. */
-struct thread
-{
-  thread_type type;                 /* thread type */
-  thread_type 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) */
-  struct thread_master *master;     /* pointer to the struct thread_master */
-  int (*func) (struct thread *);    /* event function */
-  void *arg;                        /* event argument */
-  union {
-    int val;                        /* second argument of the event. */
-    int fd;                         /* file descriptor in case of r/w */
-    struct timeval sands;           /* rest of time sands value. */
-  } u;
-  int index;                        /* queue position for timers */
-  struct timeval real;
-  struct cpu_thread_history *hist;  /* cache pointer to cpu_history */
-  unsigned long yield;              /* yield time in microseconds */
-  const char *funcname;             /* name of thread function */
-  const char *schedfrom;            /* source file thread was scheduled from */
-  int schedfrom_line;               /* line number of source file */
-  pthread_mutex_t mtx;              /* mutex for thread.c functions */
+struct thread {
+	thread_type type;	     /* thread type */
+	thread_type 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) */
+	struct thread_master *master; /* pointer to the struct thread_master */
+	int (*func)(struct thread *); /* event function */
+	void *arg;		      /* event argument */
+	union {
+		int val;	      /* second argument of the event. */
+		int fd;		      /* file descriptor in case of r/w */
+		struct timeval sands; /* rest of time sands value. */
+	} u;
+	int index; /* queue position for timers */
+	struct timeval real;
+	struct cpu_thread_history *hist; /* cache pointer to cpu_history */
+	unsigned long yield;		 /* yield time in microseconds */
+	const char *funcname;		 /* name of thread function */
+	const char *schedfrom; /* source file thread was scheduled from */
+	int schedfrom_line;    /* line number of source file */
+	pthread_mutex_t mtx;   /* mutex for thread.c functions */
 };
 
-struct cpu_thread_history 
-{
-  int (*func)(struct thread *);
-  unsigned int total_calls;
-  unsigned int total_active;
-  struct time_stats
-  {
-    unsigned long total, max;
-  } real;
-  struct time_stats cpu;
-  thread_type types;
-  const char *funcname;
+struct cpu_thread_history {
+	int (*func)(struct thread *);
+	unsigned int total_calls;
+	unsigned int total_active;
+	struct time_stats {
+		unsigned long total, max;
+	} real;
+	struct time_stats cpu;
+	thread_type types;
+	const char *funcname;
 };
 
 /* Struct timeval's tv_usec one second value.  */
@@ -156,14 +150,13 @@ struct cpu_thread_history
 #define THREAD_FD(X)  ((X)->u.fd)
 #define THREAD_VAL(X) ((X)->u.val)
 
-#define THREAD_OFF(thread) \
-  do { \
-    if (thread) \
-      { \
-        thread_cancel (thread); \
-        thread = NULL; \
-      } \
-  } while (0)
+#define THREAD_OFF(thread)                                                     \
+	do {                                                                   \
+		if (thread) {                                                  \
+			thread_cancel(thread);                                 \
+			thread = NULL;                                         \
+		}                                                              \
+	} while (0)
 
 #define THREAD_READ_OFF(thread)  THREAD_OFF(thread)
 #define THREAD_WRITE_OFF(thread)  THREAD_OFF(thread)
@@ -180,43 +173,55 @@ struct cpu_thread_history
 #define thread_execute(m,f,a,v) funcname_thread_execute(m,f,a,v,#f,__FILE__,__LINE__)
 
 /* Prototypes. */
-extern struct thread_master *thread_master_create (const char *);
-extern void thread_master_free (struct thread_master *);
+extern struct thread_master *thread_master_create(const char *);
+extern void thread_master_free(struct thread_master *);
 extern void thread_master_free_unused(struct thread_master *);
 
-extern struct thread * funcname_thread_add_read_write (int dir, struct thread_master *,
-    int (*)(struct thread *), void *, int, struct thread **, debugargdef);
-
-extern struct thread * funcname_thread_add_timer (struct thread_master *,
-    int (*)(struct thread *), void *, long, struct thread **, debugargdef);
-
-extern struct thread * funcname_thread_add_timer_msec (struct thread_master *,
-    int (*)(struct thread *), void *, long, struct thread **, debugargdef);
-
-extern struct thread * funcname_thread_add_timer_tv (struct thread_master *,
-    int (*)(struct thread *), void *, struct timeval *, struct thread **, debugargdef);
-
-extern struct thread * funcname_thread_add_event (struct thread_master *,
-    int (*)(struct thread *), void *, int, struct thread **, debugargdef);
-
-extern void funcname_thread_execute (struct thread_master *,
-    int (*)(struct thread *), void *, int, debugargdef);
+extern struct thread *
+funcname_thread_add_read_write(int dir, struct thread_master *,
+			       int (*)(struct thread *), void *, int,
+			       struct thread **, debugargdef);
+
+extern struct thread *funcname_thread_add_timer(struct thread_master *,
+						int (*)(struct thread *),
+						void *, long, struct thread **,
+						debugargdef);
+
+extern struct thread *
+funcname_thread_add_timer_msec(struct thread_master *, int (*)(struct thread *),
+			       void *, long, struct thread **, debugargdef);
+
+extern struct thread *funcname_thread_add_timer_tv(struct thread_master *,
+						   int (*)(struct thread *),
+						   void *, struct timeval *,
+						   struct thread **,
+						   debugargdef);
+
+extern struct thread *funcname_thread_add_event(struct thread_master *,
+						int (*)(struct thread *),
+						void *, int, struct thread **,
+						debugargdef);
+
+extern void funcname_thread_execute(struct thread_master *,
+				    int (*)(struct thread *), void *, int,
+				    debugargdef);
 #undef debugargdef
 
-extern void thread_cancel (struct thread *);
-extern void thread_cancel_async (struct thread_master *, struct thread **, void *);
-extern void thread_cancel_event (struct thread_master *, void *);
-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 int thread_should_yield (struct thread *);
+extern void thread_cancel(struct thread *);
+extern void thread_cancel_async(struct thread_master *, struct thread **,
+				void *);
+extern void thread_cancel_event(struct thread_master *, void *);
+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 int thread_should_yield(struct thread *);
 /* set yield time for thread */
-extern void thread_set_yield_time (struct thread *, unsigned long);
+extern void thread_set_yield_time(struct thread *, unsigned long);
 
 /* Internal libfrr exports */
-extern void thread_getrusage (RUSAGE_T *);
-extern void thread_cmd_init (void);
+extern void thread_getrusage(RUSAGE_T *);
+extern void thread_cmd_init(void);
 
 /* Returns elapsed real (wall clock) time. */
 extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before,