summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/ferr.c10
-rw-r--r--lib/frr_pthread.c14
-rw-r--r--lib/hash.c4
-rw-r--r--lib/log_filter.c10
-rw-r--r--lib/privs.c4
-rw-r--r--lib/stream.c8
-rw-r--r--lib/thread.c46
-rw-r--r--lib/zlog_targets.c16
8 files changed, 56 insertions, 56 deletions
diff --git a/lib/ferr.c b/lib/ferr.c
index 9d79f38b7..bef7f3b20 100644
--- a/lib/ferr.c
+++ b/lib/ferr.c
@@ -84,7 +84,7 @@ void log_ref_add(struct log_ref *ref)
{
uint32_t i = 0;
- frr_with_mutex(&refs_mtx) {
+ frr_with_mutex (&refs_mtx) {
while (ref[i].code != END_FERR) {
(void)hash_get(refs, &ref[i], hash_alloc_intern);
i++;
@@ -98,7 +98,7 @@ struct log_ref *log_ref_get(uint32_t code)
struct log_ref *ref;
holder.code = code;
- frr_with_mutex(&refs_mtx) {
+ frr_with_mutex (&refs_mtx) {
ref = hash_lookup(refs, &holder);
}
@@ -115,7 +115,7 @@ void log_ref_display(struct vty *vty, uint32_t code, bool json)
if (json)
top = json_object_new_object();
- frr_with_mutex(&refs_mtx) {
+ frr_with_mutex (&refs_mtx) {
errlist = code ? list_new() : hash_to_list(refs);
}
@@ -182,7 +182,7 @@ DEFUN_NOSH(show_error_code,
void log_ref_init(void)
{
- frr_with_mutex(&refs_mtx) {
+ frr_with_mutex (&refs_mtx) {
refs = hash_create(ferr_hash_key, ferr_hash_cmp,
"Error Reference Texts");
}
@@ -190,7 +190,7 @@ void log_ref_init(void)
void log_ref_fini(void)
{
- frr_with_mutex(&refs_mtx) {
+ frr_with_mutex (&refs_mtx) {
hash_clean(refs, NULL);
hash_free(refs);
refs = NULL;
diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index 0f56fbac8..dd675bbb8 100644
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -55,7 +55,7 @@ static struct list *frr_pthread_list;
void frr_pthread_init(void)
{
- frr_with_mutex(&frr_pthread_list_mtx) {
+ frr_with_mutex (&frr_pthread_list_mtx) {
frr_pthread_list = list_new();
}
}
@@ -64,7 +64,7 @@ void frr_pthread_finish(void)
{
frr_pthread_stop_all();
- frr_with_mutex(&frr_pthread_list_mtx) {
+ frr_with_mutex (&frr_pthread_list_mtx) {
struct listnode *n, *nn;
struct frr_pthread *fpt;
@@ -105,7 +105,7 @@ struct frr_pthread *frr_pthread_new(const struct frr_pthread_attr *attr,
pthread_mutex_init(fpt->running_cond_mtx, NULL);
pthread_cond_init(fpt->running_cond, NULL);
- frr_with_mutex(&frr_pthread_list_mtx) {
+ frr_with_mutex (&frr_pthread_list_mtx) {
listnode_add(frr_pthread_list, fpt);
}
@@ -126,7 +126,7 @@ static void frr_pthread_destroy_nolock(struct frr_pthread *fpt)
void frr_pthread_destroy(struct frr_pthread *fpt)
{
- frr_with_mutex(&frr_pthread_list_mtx) {
+ frr_with_mutex (&frr_pthread_list_mtx) {
listnode_delete(frr_pthread_list, fpt);
}
@@ -193,7 +193,7 @@ int frr_pthread_run(struct frr_pthread *fpt, const pthread_attr_t *attr)
void frr_pthread_wait_running(struct frr_pthread *fpt)
{
- frr_with_mutex(fpt->running_cond_mtx) {
+ frr_with_mutex (fpt->running_cond_mtx) {
while (!fpt->running)
pthread_cond_wait(fpt->running_cond,
fpt->running_cond_mtx);
@@ -202,7 +202,7 @@ void frr_pthread_wait_running(struct frr_pthread *fpt)
void frr_pthread_notify_running(struct frr_pthread *fpt)
{
- frr_with_mutex(fpt->running_cond_mtx) {
+ frr_with_mutex (fpt->running_cond_mtx) {
fpt->running = true;
pthread_cond_signal(fpt->running_cond);
}
@@ -219,7 +219,7 @@ int frr_pthread_stop(struct frr_pthread *fpt, void **result)
void frr_pthread_stop_all(void)
{
- frr_with_mutex(&frr_pthread_list_mtx) {
+ frr_with_mutex (&frr_pthread_list_mtx) {
struct listnode *n;
struct frr_pthread *fpt;
for (ALL_LIST_ELEMENTS_RO(frr_pthread_list, n, fpt)) {
diff --git a/lib/hash.c b/lib/hash.c
index e9132f790..4b371b43a 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -56,7 +56,7 @@ struct hash *hash_create_size(unsigned int size,
hash->name = name ? XSTRDUP(MTYPE_HASH, name) : NULL;
hash->stats.empty = hash->size;
- frr_with_mutex(&_hashes_mtx) {
+ frr_with_mutex (&_hashes_mtx) {
if (!_hashes)
_hashes = list_new();
@@ -329,7 +329,7 @@ struct list *hash_to_list(struct hash *hash)
void hash_free(struct hash *hash)
{
- frr_with_mutex(&_hashes_mtx) {
+ frr_with_mutex (&_hashes_mtx) {
if (_hashes) {
listnode_delete(_hashes, hash);
if (_hashes->count == 0) {
diff --git a/lib/log_filter.c b/lib/log_filter.c
index f01497dea..df74a8c9b 100644
--- a/lib/log_filter.c
+++ b/lib/log_filter.c
@@ -43,14 +43,14 @@ static int zlog_filter_lookup(const char *lookup)
void zlog_filter_clear(void)
{
- frr_with_mutex(&logfilterlock) {
+ frr_with_mutex (&logfilterlock) {
zlog_filter_count = 0;
}
}
int zlog_filter_add(const char *filter)
{
- frr_with_mutex(&logfilterlock) {
+ frr_with_mutex (&logfilterlock) {
if (zlog_filter_count >= ZLOG_FILTERS_MAX)
return 1;
@@ -74,7 +74,7 @@ int zlog_filter_add(const char *filter)
int zlog_filter_del(const char *filter)
{
- frr_with_mutex(&logfilterlock) {
+ frr_with_mutex (&logfilterlock) {
int found_idx = zlog_filter_lookup(filter);
int last_idx = zlog_filter_count - 1;
@@ -96,7 +96,7 @@ int zlog_filter_dump(char *buf, size_t max_size)
{
int len = 0;
- frr_with_mutex(&logfilterlock) {
+ frr_with_mutex (&logfilterlock) {
for (int i = 0; i < zlog_filter_count; i++) {
int ret;
@@ -115,7 +115,7 @@ static int search_buf(const char *buf, size_t len)
{
char *found = NULL;
- frr_with_mutex(&logfilterlock) {
+ frr_with_mutex (&logfilterlock) {
for (int i = 0; i < zlog_filter_count; i++) {
found = memmem(buf, len, zlog_filters[i],
strlen(zlog_filters[i]));
diff --git a/lib/privs.c b/lib/privs.c
index 5cba90839..71416beeb 100644
--- a/lib/privs.c
+++ b/lib/privs.c
@@ -488,7 +488,7 @@ struct zebra_privs_t *_zprivs_raise(struct zebra_privs_t *privs,
* Serialize 'raise' operations; particularly important for
* OSes where privs are process-wide.
*/
- frr_with_mutex(&(privs->mutex)) {
+ frr_with_mutex (&(privs->mutex)) {
/* Locate ref-counting object to use */
refs = get_privs_refs(privs);
@@ -517,7 +517,7 @@ void _zprivs_lower(struct zebra_privs_t **privs)
/* Serialize 'lower privs' operation - particularly important
* when OS privs are process-wide.
*/
- frr_with_mutex(&(*privs)->mutex) {
+ frr_with_mutex (&(*privs)->mutex) {
refs = get_privs_refs(*privs);
if (--(refs->refcount) == 0) {
diff --git a/lib/stream.c b/lib/stream.c
index 83ed015bc..2de3abdf4 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -1280,7 +1280,7 @@ void stream_fifo_push(struct stream_fifo *fifo, struct stream *s)
void stream_fifo_push_safe(struct stream_fifo *fifo, struct stream *s)
{
- frr_with_mutex(&fifo->mtx) {
+ frr_with_mutex (&fifo->mtx) {
stream_fifo_push(fifo, s);
}
}
@@ -1312,7 +1312,7 @@ struct stream *stream_fifo_pop_safe(struct stream_fifo *fifo)
{
struct stream *ret;
- frr_with_mutex(&fifo->mtx) {
+ frr_with_mutex (&fifo->mtx) {
ret = stream_fifo_pop(fifo);
}
@@ -1328,7 +1328,7 @@ struct stream *stream_fifo_head_safe(struct stream_fifo *fifo)
{
struct stream *ret;
- frr_with_mutex(&fifo->mtx) {
+ frr_with_mutex (&fifo->mtx) {
ret = stream_fifo_head(fifo);
}
@@ -1350,7 +1350,7 @@ void stream_fifo_clean(struct stream_fifo *fifo)
void stream_fifo_clean_safe(struct stream_fifo *fifo)
{
- frr_with_mutex(&fifo->mtx) {
+ frr_with_mutex (&fifo->mtx) {
stream_fifo_clean(fifo);
}
}
diff --git a/lib/thread.c b/lib/thread.c
index 9c783808b..c3613b5b0 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -217,7 +217,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
tmp.funcname = "TOTAL";
tmp.types = filter;
- frr_with_mutex(&masters_mtx) {
+ frr_with_mutex (&masters_mtx) {
for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) {
const char *name = m->name ? m->name : "main";
@@ -283,9 +283,9 @@ static void cpu_record_clear(uint8_t filter)
struct thread_master *m;
struct listnode *ln;
- frr_with_mutex(&masters_mtx) {
+ frr_with_mutex (&masters_mtx) {
for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) {
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
void *args[2] = {tmp, m->cpu_record};
hash_iterate(
m->cpu_record,
@@ -463,7 +463,7 @@ DEFUN_NOSH (show_thread_poll,
struct listnode *node;
struct thread_master *m;
- frr_with_mutex(&masters_mtx) {
+ frr_with_mutex (&masters_mtx) {
for (ALL_LIST_ELEMENTS_RO(masters, node, m)) {
show_thread_poll_helper(vty, m);
}
@@ -630,7 +630,7 @@ struct thread_master *thread_master_create(const char *name)
sizeof(struct pollfd) * rv->handler.pfdsize);
/* add to list of threadmasters */
- frr_with_mutex(&masters_mtx) {
+ frr_with_mutex (&masters_mtx) {
if (!masters)
masters = list_new();
@@ -642,7 +642,7 @@ struct thread_master *thread_master_create(const char *name)
void thread_master_set_name(struct thread_master *master, const char *name)
{
- frr_with_mutex(&master->mtx) {
+ frr_with_mutex (&master->mtx) {
XFREE(MTYPE_THREAD_MASTER, master->name);
master->name = XSTRDUP(MTYPE_THREAD_MASTER, name);
}
@@ -708,7 +708,7 @@ static void thread_array_free(struct thread_master *m,
*/
void thread_master_free_unused(struct thread_master *m)
{
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
struct thread *t;
while ((t = thread_list_pop(&m->unuse)))
thread_free(m, t);
@@ -720,7 +720,7 @@ void thread_master_free(struct thread_master *m)
{
struct thread *t;
- frr_with_mutex(&masters_mtx) {
+ frr_with_mutex (&masters_mtx) {
listnode_delete(masters, m);
if (masters->count == 0) {
list_delete(&masters);
@@ -759,7 +759,7 @@ unsigned long thread_timer_remain_msec(struct thread *thread)
if (!thread_is_scheduled(thread))
return 0;
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
remain = monotime_until(&thread->u.sands, NULL) / 1000LL;
}
@@ -775,7 +775,7 @@ unsigned long thread_timer_remain_second(struct thread *thread)
struct timeval thread_timer_remain(struct thread *thread)
{
struct timeval remain;
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
monotime_until(&thread->u.sands, &remain);
}
return remain;
@@ -990,7 +990,7 @@ void _thread_add_read_write(const struct xref_threadsched *xref,
if (fd >= m->fd_limit)
assert(!"Number of FD's open is greater than FRR currently configured to handle, aborting");
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
if (t_ptr && *t_ptr)
// thread is already scheduled; don't reschedule
break;
@@ -1033,7 +1033,7 @@ void _thread_add_read_write(const struct xref_threadsched *xref,
m->handler.pfdcount++;
if (thread) {
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
thread->u.fd = fd;
thread_array[thread->u.fd] = thread;
}
@@ -1069,14 +1069,14 @@ static void _thread_add_timer_timeval(const struct xref_threadsched *xref,
monotime(&t);
timeradd(&t, time_relative, &t);
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
if (t_ptr && *t_ptr)
/* thread is already scheduled; don't reschedule */
return;
thread = thread_get(m, THREAD_TIMER, func, arg, xref);
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
thread->u.sands = t;
thread_timer_list_add(&m->timer, thread);
if (t_ptr) {
@@ -1154,13 +1154,13 @@ void _thread_add_event(const struct xref_threadsched *xref,
assert(m != NULL);
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
if (t_ptr && *t_ptr)
/* thread is already scheduled; don't reschedule */
break;
thread = thread_get(m, THREAD_EVENT, func, arg, xref);
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
thread->u.val = val;
thread_list_add_tail(&m->event, thread);
}
@@ -1441,7 +1441,7 @@ static void cancel_event_helper(struct thread_master *m, void *arg, int flags)
cr->flags = flags;
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
cr->eventobj = arg;
listnode_add(m->cancel_req, cr);
do_thread_cancel(m);
@@ -1499,7 +1499,7 @@ void thread_cancel(struct thread **thread)
assert(master->owner == pthread_self());
- frr_with_mutex(&master->mtx) {
+ frr_with_mutex (&master->mtx) {
struct cancel_req *cr =
XCALLOC(MTYPE_TMP, sizeof(struct cancel_req));
cr->thread = *thread;
@@ -1551,7 +1551,7 @@ void thread_cancel_async(struct thread_master *master, struct thread **thread,
assert(master->owner != pthread_self());
- frr_with_mutex(&master->mtx) {
+ frr_with_mutex (&master->mtx) {
master->canceled = false;
if (thread) {
@@ -1931,7 +1931,7 @@ unsigned long thread_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
int thread_should_yield(struct thread *thread)
{
int result;
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
result = monotime_since(&thread->real, NULL)
> (int64_t)thread->yield;
}
@@ -1940,7 +1940,7 @@ int thread_should_yield(struct thread *thread)
void thread_set_yield_time(struct thread *thread, unsigned long yield_time)
{
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
thread->yield = yield_time;
}
}
@@ -2082,11 +2082,11 @@ void _thread_execute(const struct xref_threadsched *xref,
struct thread *thread;
/* Get or allocate new thread to execute. */
- frr_with_mutex(&m->mtx) {
+ frr_with_mutex (&m->mtx) {
thread = thread_get(m, THREAD_EVENT, func, arg, xref);
/* Set its event value. */
- frr_with_mutex(&thread->mtx) {
+ frr_with_mutex (&thread->mtx) {
thread->add_type = THREAD_EXECUTE;
thread->u.val = val;
thread->ref = &thread;
diff --git a/lib/zlog_targets.c b/lib/zlog_targets.c
index 48785ad29..31bd8e16e 100644
--- a/lib/zlog_targets.c
+++ b/lib/zlog_targets.c
@@ -242,14 +242,14 @@ static bool zlog_file_cycle(struct zlog_cfg_file *zcf)
void zlog_file_set_other(struct zlog_cfg_file *zcf)
{
- frr_with_mutex(&zcf->cfg_mtx) {
+ frr_with_mutex (&zcf->cfg_mtx) {
zlog_file_cycle(zcf);
}
}
bool zlog_file_set_filename(struct zlog_cfg_file *zcf, const char *filename)
{
- frr_with_mutex(&zcf->cfg_mtx) {
+ frr_with_mutex (&zcf->cfg_mtx) {
XFREE(MTYPE_LOG_FD_NAME, zcf->filename);
zcf->filename = XSTRDUP(MTYPE_LOG_FD_NAME, filename);
zcf->fd = -1;
@@ -261,7 +261,7 @@ bool zlog_file_set_filename(struct zlog_cfg_file *zcf, const char *filename)
bool zlog_file_set_fd(struct zlog_cfg_file *zcf, int fd)
{
- frr_with_mutex(&zcf->cfg_mtx) {
+ frr_with_mutex (&zcf->cfg_mtx) {
if (zcf->fd == fd)
return true;
@@ -283,7 +283,7 @@ bool zlog_file_rotate(struct zlog_cfg_file *zcf)
struct rcu_close_rotate *rcr;
int fd;
- frr_with_mutex(&zcf->cfg_mtx) {
+ frr_with_mutex (&zcf->cfg_mtx) {
if (!zcf->active || !zcf->filename)
return true;
@@ -517,7 +517,7 @@ void zlog_syslog_set_facility(int facility)
struct zlog_target *newztc;
struct zlt_syslog *newzt;
- frr_with_mutex(&syslog_cfg_mutex) {
+ frr_with_mutex (&syslog_cfg_mutex) {
if (facility == syslog_facility)
return;
syslog_facility = facility;
@@ -540,7 +540,7 @@ void zlog_syslog_set_facility(int facility)
int zlog_syslog_get_facility(void)
{
- frr_with_mutex(&syslog_cfg_mutex) {
+ frr_with_mutex (&syslog_cfg_mutex) {
return syslog_facility;
}
assert(0);
@@ -551,7 +551,7 @@ void zlog_syslog_set_prio_min(int prio_min)
struct zlog_target *newztc;
struct zlt_syslog *newzt = NULL;
- frr_with_mutex(&syslog_cfg_mutex) {
+ frr_with_mutex (&syslog_cfg_mutex) {
if (prio_min == syslog_prio_min)
return;
syslog_prio_min = prio_min;
@@ -577,7 +577,7 @@ void zlog_syslog_set_prio_min(int prio_min)
int zlog_syslog_get_prio_min(void)
{
- frr_with_mutex(&syslog_cfg_mutex) {
+ frr_with_mutex (&syslog_cfg_mutex) {
return syslog_prio_min;
}
assert(0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 13:44:06 +0100