rename fr_thread functions for clarity

diff --git a/src/lib/io/coord.c b/src/lib/io/coord.c
index 447eba1763cce5cc445b8d369f44651b2c2b06a5..7461285e8d8a470abf24c20695a211377963bce4 100644 (file)
--- a/src/lib/io/coord.c
+++ b/src/lib/io/coord.c
@@ -514,7 +514,7 @@ int fr_coord_start(uint32_t num_workers, fr_sem_t *sem)
        /*
         *      Wait for all the coordinators to start.
         */
-       if (fr_thread_wait(sem, coord_threads) < 0) {
+       if (fr_thread_wait_list(sem, coord_threads) < 0) {
                ERROR("Failed creating coordinator threads");
                return -1;
        }

diff --git a/src/lib/io/schedule.c b/src/lib/io/schedule.c
index 47c4baaf0ee470420b8c9773e595c709db3c2746..f10b95aca04fa9b8ef06998d047b6e16880c9901 100644 (file)
--- a/src/lib/io/schedule.c
+++ b/src/lib/io/schedule.c
@@ -491,7 +491,7 @@ fr_schedule_t *fr_schedule_create(TALLOC_CTX *ctx, fr_event_list_t *el,
         *      they've started, OR there's been a problem and they
         *      can't start.
         */
-       if (fr_thread_wait(sc->network_sem, &sc->networks) < 0) {
+       if (fr_thread_wait_list(sc->network_sem, &sc->networks) < 0) {
                fr_schedule_destroy(&sc);
                return NULL;
        }
@@ -537,7 +537,7 @@ fr_schedule_t *fr_schedule_create(TALLOC_CTX *ctx, fr_event_list_t *el,
         *      they've started, OR there's been a problem and they
         *      can't start.
         */
-       if (fr_thread_wait(sc->worker_sem, &sc->workers) < 0) {
+       if (fr_thread_wait_list(sc->worker_sem, &sc->workers) < 0) {
                fr_schedule_destroy(&sc);
                return NULL;
        }

diff --git a/src/lib/io/thread.c b/src/lib/io/thread.c
index e4db69f530f23840cef449065fca71d9f892f87c..4d6b12944ddd51960dee335c27c756d69864ddd9 100644 (file)
--- a/src/lib/io/thread.c
+++ b/src/lib/io/thread.c
@@ -76,7 +76,7 @@ int fr_thread_create(pthread_t *thread, fr_thread_entry_t func, void *arg)
  *     - 0 for success
  *     - <0 negative number of threads which failed to start
  */
-int fr_thread_wait(fr_sem_t *sem, fr_dlist_head_t *head)
+int fr_thread_wait_list(fr_sem_t *sem, fr_dlist_head_t *head)
 {
        unsigned int i, count;
        int rcode = 0;

diff --git a/src/lib/io/thread.h b/src/lib/io/thread.h
index 540e4a452fda4395edc71db30b62a997be354ffe..a5c715751ac0a8a89b1759ccaece05b6fac8ce98 100644 (file)
--- a/src/lib/io/thread.h
+++ b/src/lib/io/thread.h
@@ -62,7 +62,7 @@ typedef void *(*fr_thread_entry_t)(void *);
 
 int    fr_thread_create(pthread_t *thread, fr_thread_entry_t func, void *arg) CC_HINT(nonnull(1,2));
 
-int    fr_thread_wait(fr_sem_t *sem, fr_dlist_head_t *head) CC_HINT(nonnull);
+int    fr_thread_wait_list(fr_sem_t *sem, fr_dlist_head_t *head) CC_HINT(nonnull);
 
 int    fr_thread_setup(fr_thread_t *out, char const *name) CC_HINT(nonnull);