ericonr
/
erm
mirror of https://github.com/ericonr/erm.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use cond variables instead of sched_yield().

This commit is contained in:
Érico Nogueira 2021-09-18 15:36:26 -03:00
parent e98dc6a1a3
commit 82d06ef184
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
remove.c
View File

@ -28,6 +28,7 @@ struct task {
struct queue {
pthread_mutex_t mtx;
pthread_cond_t cond;
size_t len, size;
struct task *tasks;
/* add a counter to be decremented by each thread that can't add more stuff until we know we can stop searching? */
@ -58,6 +59,8 @@ int queue_add(struct queue *q, const char *path, unsigned char type, struct task
struct task t = {.path = p, .type = type, .parent = parent};
q->tasks[q->len++] = t;
pthread_cond_signal(&q->cond);
error:
pthread_mutex_unlock(&q->mtx);
return rv;
@ -69,6 +72,9 @@ int queue_remove(struct queue *q, struct task *t)
{
int rv = 0;
pthread_mutex_lock(&q->mtx);
while (q->len == 0) {
pthread_cond_wait(&q->cond, &q->mtx);
}
if (q->len == 0) {
rv = EAGAIN;
goto error;
@ -102,13 +108,7 @@ static void *process_queue_item(void *arg)
struct queue *q = arg;
struct task t;
while (1) {
int rv = queue_remove(q, &t);
if (rv == EAGAIN) {
puts("yield");
sched_yield();
continue;
/* no other errors yet, can be used to signal nothing is needed anymore? */
}
queue_remove(q, &t);
if (unlink(t.path)) {
if (errno == EISDIR) {
@ -212,6 +212,8 @@ int run_queue(void)
if (pthread_mutex_init(&queue.mtx, &mattr)) return -1;
pthread_mutexattr_destroy(&mattr);
if (pthread_cond_init(&queue.cond, NULL)) return -1;
pthread_attr_t pattr;
if (pthread_attr_init(&pattr)) return -1;
if (pthread_attr_setstacksize(&pattr, (1 << 13) - 1024)) return -1;