Paris7/work-stealing-scheduler
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

typos

Browse source
This commit is contained in:
Mylloon 2024-04-24 17:21:38 +02:00
parent 3bf142d72d
commit 019edca380
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/sched-ws.c
View file

@ -12,7 +12,7 @@ struct task_info {
}; };
struct scheduler { struct scheduler {
/* Dernier élément du deque (premier ajouter) */ /* Premier élément du deque (dernier ajouter) */
int *bottom; int *bottom;
/* Variable de conditions pour reveillé les threads au besoin */ /* Variable de conditions pour reveillé les threads au besoin */
@ -36,7 +36,7 @@ struct scheduler {
/* Liste des threads */ /* Liste des threads */
pthread_t *threads; pthread_t *threads;
/* Premier élément du deque (dernier ajouter) */ /* Dernier élément du deque (premier ajouter) */
int *top; int *top;
}; };
@ -54,10 +54,10 @@ sched_init(int nthreads, int qlen, taskfunc f, void *closure)
{ {
static struct scheduler sched; static struct scheduler sched;
sched.bottom = NULL;
sched.tasks = NULL; sched.tasks = NULL;
sched.threads = NULL; sched.threads = NULL;
sched.top = NULL; sched.top = NULL;
sched.bottom = NULL;
if(qlen <= 0) { if(qlen <= 0) {
fprintf(stderr, "qlen must be greater than 0\n"); fprintf(stderr, "qlen must be greater than 0\n");
@ -88,17 +88,17 @@ sched_init(int nthreads, int qlen, taskfunc f, void *closure)
} }
// Initialisation du curseur suivant l'état de la pile de chaque processus // Initialisation du curseur suivant l'état de la pile de chaque processus
if(!(sched.top = malloc(nthreads * sizeof(int)))) {
perror("Cursor top stack");
return sched_init_cleanup(sched, -1);
}
if(!(sched.bottom = malloc(nthreads * sizeof(int)))) { if(!(sched.bottom = malloc(nthreads * sizeof(int)))) {
perror("Cursor bottom stack"); perror("Cursor bottom stack");
return sched_init_cleanup(sched, -1); return sched_init_cleanup(sched, -1);
} }
if(!(sched.top = malloc(nthreads * sizeof(int)))) {
perror("Cursor top stack");
return sched_init_cleanup(sched, -1);
}
for(int i = 0; i < nthreads; ++i) { for(int i = 0; i < nthreads; ++i) {
sched.top[i] = 0;
sched.bottom[i] = 0; sched.bottom[i] = 0;
sched.top[i] = 0;
} }
// Allocation mémoire pour la pile de chaque processus // Allocation mémoire pour la pile de chaque processus
@ -186,16 +186,16 @@ sched_init_cleanup(struct scheduler s, int ret_code)
s.threads = NULL; s.threads = NULL;
} }
if(s.top) {
free(s.top);
s.top = NULL;
}
if(s.bottom) { if(s.bottom) {
free(s.bottom); free(s.bottom);
s.bottom = NULL; s.bottom = NULL;
} }
if(s.top) {
free(s.top);
s.top = NULL;
}
return ret_code; return ret_code;
} }
@ -226,16 +226,16 @@ sched_spawn(taskfunc f, void *closure, struct scheduler *s)
pthread_mutex_lock(&s->mutex); pthread_mutex_lock(&s->mutex);
int next = (s->top[th] + 1) % s->qlen; int next = (s->bottom[th] + 1) % s->qlen;
if(next == s->bottom[th]) { if(next == s->top[th]) {
pthread_mutex_unlock(&s->mutex); pthread_mutex_unlock(&s->mutex);
fprintf(stderr, "Stack is full\n"); fprintf(stderr, "Stack is full\n");
errno = EAGAIN; errno = EAGAIN;
return -1; return -1;
} }
s->tasks[th][s->top[th]] = (struct task_info){closure, f}; s->tasks[th][s->bottom[th]] = (struct task_info){closure, f};
s->top[th] = next; s->bottom[th] = next;
pthread_mutex_unlock(&s->mutex); pthread_mutex_unlock(&s->mutex);
@ -257,10 +257,10 @@ sched_worker(void *arg)
found = 0; found = 0;
pthread_mutex_lock(&s->mutex); pthread_mutex_lock(&s->mutex);
if(s->bottom[curr_th] != s->top[curr_th]) { if(s->top[curr_th] != s->bottom[curr_th]) {
found = 1; found = 1;
s->top[curr_th] = (s->top[curr_th] - 1 + s->qlen) % s->qlen; s->bottom[curr_th] = (s->bottom[curr_th] - 1 + s->qlen) % s->qlen;
task = s->tasks[curr_th][s->top[curr_th]]; task = s->tasks[curr_th][s->bottom[curr_th]];
} }
if(!found) { if(!found) {
@ -269,11 +269,12 @@ sched_worker(void *arg)
i < s->nthreads; ++i) { i < s->nthreads; ++i) {
target = (i + k) % s->nthreads; target = (i + k) % s->nthreads;
if(s->bottom[target] != s->top[target]) { if(s->top[target] != s->bottom[target]) {
// Tâche trouvée // Tâche trouvée
found = 1; found = 1;
s->top[target] = (s->top[target] - 1 + s->qlen) % s->qlen; s->bottom[target] =
task = s->tasks[target][s->top[target]]; (s->bottom[target] - 1 + s->qlen) % s->qlen;
task = s->tasks[target][s->bottom[target]];
break; break;
} }
} }