#include "u_queue.h"
-#include <time.h>
+#include "c11/threads.h"
#include "util/os_time.h"
#include "util/u_string.h"
#include "u_process.h"
static void
-util_queue_kill_threads(struct util_queue *queue, unsigned keep_num_threads);
+util_queue_kill_threads(struct util_queue *queue, unsigned keep_num_threads,
+ bool finish_locked);
/****************************************************************************
* Wait for all queues to assert idle when exit() is called.
mtx_lock(&exit_mutex);
/* Wait for all queues to assert idle. */
LIST_FOR_EACH_ENTRY(iter, &queue_list, head) {
- util_queue_kill_threads(iter, 0);
+ util_queue_kill_threads(iter, 0, false);
}
mtx_unlock(&exit_mutex);
}
if (strlen(queue->name) > 0) {
char name[16];
- util_snprintf(name, sizeof(name), "%s%i", queue->name, thread_index);
+ snprintf(name, sizeof(name), "%s%i", queue->name, thread_index);
u_thread_setname(name);
}
return true;
}
+void
+util_queue_adjust_num_threads(struct util_queue *queue, unsigned num_threads)
+{
+ num_threads = MIN2(num_threads, queue->max_threads);
+ num_threads = MAX2(num_threads, 1);
+
+ mtx_lock(&queue->finish_lock);
+ unsigned old_num_threads = queue->num_threads;
+
+ if (num_threads == old_num_threads) {
+ mtx_unlock(&queue->finish_lock);
+ return;
+ }
+
+ if (num_threads < old_num_threads) {
+ util_queue_kill_threads(queue, num_threads, true);
+ mtx_unlock(&queue->finish_lock);
+ return;
+ }
+
+ /* Create threads.
+ *
+ * We need to update num_threads first, because threads terminate
+ * when thread_index < num_threads.
+ */
+ queue->num_threads = num_threads;
+ for (unsigned i = old_num_threads; i < num_threads; i++) {
+ if (!util_queue_create_thread(queue, i))
+ break;
+ }
+ mtx_unlock(&queue->finish_lock);
+}
+
bool
util_queue_init(struct util_queue *queue,
const char *name,
memset(queue, 0, sizeof(*queue));
if (process_len) {
- util_snprintf(queue->name, sizeof(queue->name), "%.*s:%s",
- process_len, process_name, name);
+ snprintf(queue->name, sizeof(queue->name), "%.*s:%s",
+ process_len, process_name, name);
} else {
- util_snprintf(queue->name, sizeof(queue->name), "%s", name);
+ snprintf(queue->name, sizeof(queue->name), "%s", name);
}
queue->flags = flags;
+ queue->max_threads = num_threads;
queue->num_threads = num_threads;
queue->max_jobs = max_jobs;
}
static void
-util_queue_kill_threads(struct util_queue *queue, unsigned keep_num_threads)
+util_queue_kill_threads(struct util_queue *queue, unsigned keep_num_threads,
+ bool finish_locked)
{
unsigned i;
/* Signal all threads to terminate. */
- mtx_lock(&queue->finish_lock);
+ if (!finish_locked)
+ mtx_lock(&queue->finish_lock);
if (keep_num_threads >= queue->num_threads) {
mtx_unlock(&queue->finish_lock);
for (i = keep_num_threads; i < old_num_threads; i++)
thrd_join(queue->threads[i], NULL);
- mtx_unlock(&queue->finish_lock);
+ if (!finish_locked)
+ mtx_unlock(&queue->finish_lock);
}
void
util_queue_destroy(struct util_queue *queue)
{
- util_queue_kill_threads(queue, 0);
+ util_queue_kill_threads(queue, 0, false);
remove_from_atexit_list(queue);
cnd_destroy(&queue->has_space_cond);
util_queue_finish(struct util_queue *queue)
{
util_barrier barrier;
- struct util_queue_fence *fences = malloc(queue->num_threads * sizeof(*fences));
-
- util_barrier_init(&barrier, queue->num_threads);
+ struct util_queue_fence *fences;
/* If 2 threads were adding jobs for 2 different barries at the same time,
* a deadlock would happen, because 1 barrier requires that all threads
* wait for it exclusively.
*/
mtx_lock(&queue->finish_lock);
+ fences = malloc(queue->num_threads * sizeof(*fences));
+ util_barrier_init(&barrier, queue->num_threads);
for (unsigned i = 0; i < queue->num_threads; ++i) {
util_queue_fence_init(&fences[i]);