From ca912a0c640b56b0b8b7eda6f84ed7dc407e25a0 Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Tue, 7 Jun 2016 21:06:29 +0200
Subject: [PATCH] re-instate verbosity in engine_marktasks.
---
src/engine.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 59d8375783..d3213cdfe6 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1637,12 +1637,12 @@ int engine_marktasks(struct engine *e) {
struct scheduler *s = &e->sched;
const ticks tic = getticks();
+ int rebuild_space = 0;
/* Much less to do here if we're on a fixed time-step. */
if (e->policy & engine_policy_fixdt) {
/* Run through the tasks and mark as skip or not. */
- int rebuild_space = 0;
threadpool_map(&e->threadpool, engine_marktasks_fixdt_mapper, s->tasks,
s->nr_tasks, sizeof(struct task), &rebuild_space);
return rebuild_space;
@@ -1651,12 +1651,12 @@ int engine_marktasks(struct engine *e) {
} else {
/* Run through the tasks and mark as skip or not. */
- int extra_data[2] = {e->ti_current, 0};
+ int extra_data[2] = {e->ti_current, rebuild_space};
threadpool_map(&e->threadpool, engine_marktasks_sorts_mapper, s->tasks,
s->nr_tasks, sizeof(struct task), NULL);
threadpool_map(&e->threadpool, engine_marktasks_mapper, s->tasks,
s->nr_tasks, sizeof(struct task), extra_data);
- return extra_data[1];
+ rebuild_space = extra_data[1];
}
if (e->verbose)
@@ -1664,7 +1664,7 @@ int engine_marktasks(struct engine *e) {
clocks_getunit());
/* All is well... */
- return 0;
+ return rebuild_space;
}
/**
--
GitLab