Commit 1a4de4b7 authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

remove all traces of the link tasks, pretend that never happened.

parent 86c00438
...@@ -1813,7 +1813,7 @@ void engine_step(struct engine *e) { ...@@ -1813,7 +1813,7 @@ void engine_step(struct engine *e) {
if (e->step == 0 || !(e->policy & engine_policy_fixdt)) { if (e->step == 0 || !(e->policy & engine_policy_fixdt)) {
TIMER_TIC TIMER_TIC
engine_launch(e, (e->nr_threads > 8) ? 8 : e->nr_threads, engine_launch(e, (e->nr_threads > 8) ? 8 : e->nr_threads,
(1 << task_type_kick1) | (1 << task_type_link)); (1 << task_type_kick1));
TIMER_TOC(timer_kick1); TIMER_TOC(timer_kick1);
} }
...@@ -1844,8 +1844,7 @@ void engine_step(struct engine *e) { ...@@ -1844,8 +1844,7 @@ void engine_step(struct engine *e) {
(1 << task_type_ghost) | (1 << task_type_kick2) | (1 << task_type_ghost) | (1 << task_type_kick2) |
(1 << task_type_send) | (1 << task_type_recv) | (1 << task_type_send) | (1 << task_type_recv) |
(1 << task_type_grav_pp) | (1 << task_type_grav_mm) | (1 << task_type_grav_pp) | (1 << task_type_grav_mm) |
(1 << task_type_grav_up) | (1 << task_type_grav_down) | (1 << task_type_grav_up) | (1 << task_type_grav_down));
(1 << task_type_link));
TIMER_TOC(timer_runners); TIMER_TOC(timer_runners);
......
...@@ -985,9 +985,6 @@ void scheduler_start(struct scheduler *s, unsigned int mask) { ...@@ -985,9 +985,6 @@ void scheduler_start(struct scheduler *s, unsigned int mask) {
/* message("waiting tasks took %.3f ms.", /* message("waiting tasks took %.3f ms.",
(double)(getticks() - tic) / CPU_TPS * 1000); */ (double)(getticks() - tic) / CPU_TPS * 1000); */
/* Don't enqueue link tasks directly. */
s->mask &= ~(1 << task_type_link);
/* Loop over the tasks and enqueue whoever is ready. */ /* Loop over the tasks and enqueue whoever is ready. */
// tic = getticks(); // tic = getticks();
for (int k = 0; k < s->nr_tasks; k++) { for (int k = 0; k < s->nr_tasks; k++) {
...@@ -1021,7 +1018,7 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) { ...@@ -1021,7 +1018,7 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
if (t->rid >= 0) error("Task has already been enqueued."); if (t->rid >= 0) error("Task has already been enqueued.");
/* Ignore skipped tasks and tasks not in the mask. */ /* Ignore skipped tasks and tasks not in the mask. */
if (t->skip || ((1 << t->type) & ~(s->mask) && t->type != task_type_link)) { if (t->skip || (1 << t->type) & ~(s->mask)) {
return; return;
} }
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
const char *taskID_names[task_type_count] = { const char *taskID_names[task_type_count] = {
"none", "sort", "self", "pair", "sub", "none", "sort", "self", "pair", "sub",
"ghost", "kick1", "kick2", "send", "recv", "ghost", "kick1", "kick2", "send", "recv",
"link", "grav_pp", "grav_mm", "grav_up", "grav_down", "grav_pp", "grav_mm", "grav_up", "grav_down",
"psort", "split_cell", "rewait"}; "psort", "split_cell", "rewait"};
/** /**
......
...@@ -39,7 +39,6 @@ enum task_types { ...@@ -39,7 +39,6 @@ enum task_types {
task_type_kick2, task_type_kick2,
task_type_send, task_type_send,
task_type_recv, task_type_recv,
task_type_link,
task_type_grav_pp, task_type_grav_pp,
task_type_grav_mm, task_type_grav_mm,
task_type_grav_up, task_type_grav_up,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment