From 3ce7876bd76e841db1cf2d3852d365aa6d8de672 Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Wed, 11 Nov 2015 22:12:56 +0100
Subject: [PATCH] holy crap, this actually seems to work... cleaning up the
formatting and puting it out there.
---
src/runner.c | 3 ++-
src/scheduler.c | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/runner.c b/src/runner.c
index 5aeef2d7be..82dc9d9e0b 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1291,7 +1291,8 @@ void *runner_main(void *data) {
runner_dograv_down(r, t->ci);
break;
case task_type_rewait:
- for (struct task *t2 = (struct task *)t->ci; t2 != (struct task *)t->cj; t2++) {
+ for (struct task *t2 = (struct task *)t->ci;
+ t2 != (struct task *)t->cj; t2++) {
for (k = 0; k < t2->nr_unlock_tasks; k++)
atomic_inc(&t2->unlock_tasks[k]->wait);
}
diff --git a/src/scheduler.c b/src/scheduler.c
index 6e4e8b25fa..37cef93950 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -888,21 +888,23 @@ void scheduler_start(struct scheduler *s, unsigned int mask) {
/* Store the mask */
s->mask = mask;
-
+
/* Clear all the waits and rids. */
// tic = getticks();
for (int k = 0; k < s->nr_tasks; k++) {
s->tasks[k].wait = 0;
s->tasks[k].rid = -1;
}
-
+
/* Enqueue a set of extraenous tasks to set the task waits. */
struct task rewait_tasks[s->nr_queues];
- const int waiting_old = s->waiting; // Remember that engine_launch may fiddle with this value.
+ const int waiting_old =
+ s->waiting; // Remember that engine_launch may fiddle with this value.
for (int k = 0; k < s->nr_queues; k++) {
rewait_tasks[k].type = task_type_rewait;
rewait_tasks[k].ci = (struct cell *)&s->tasks[k * nr_tasks / s->nr_queues];
- rewait_tasks[k].cj = (struct cell *)&s->tasks[(k + 1) * nr_tasks / s->nr_queues];
+ rewait_tasks[k].cj =
+ (struct cell *)&s->tasks[(k + 1) * nr_tasks / s->nr_queues];
rewait_tasks[k].skip = 0;
rewait_tasks[k].wait = 0;
rewait_tasks[k].weight = 1;
@@ -911,7 +913,7 @@ void scheduler_start(struct scheduler *s, unsigned int mask) {
scheduler_enqueue(s, &rewait_tasks[k]);
pthread_cond_broadcast(&s->sleep_cond);
}
-
+
/* Wait for the rewait tasks to have executed. */
pthread_mutex_lock(&s->sleep_mutex);
while (s->waiting > waiting_old) {
--
GitLab