From 4c93f8570c43fda3d0841c6e91205048ef07ff04 Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Thu, 14 Jul 2016 12:26:36 +0100
Subject: [PATCH] Remove unwanted changes from the comm_stalls branch
---
src/engine.c | 6 ------
src/engine.h | 3 ---
src/runner.c | 2 --
src/scheduler.c | 2 +-
src/task.c | 2 +-
src/task.h | 1 -
6 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 78d6422fe1..7cb08b7d6d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1750,12 +1750,6 @@ void engine_maketasks(struct engine *e) {
/* Add the communication tasks if MPI is being used. */
if (e->policy & engine_policy_mpi) {
- /* Create root tasks for send/recv. */
- e->send_root = scheduler_addtask(&e->sched, task_type_comm_root,
- task_subtype_none, 0, 0, NULL, NULL, 0);
- e->recv_root = scheduler_addtask(&e->sched, task_type_comm_root,
- task_subtype_none, 0, 0, NULL, NULL, 0);
-
/* Loop over the proxies. */
for (int pid = 0; pid < e->nr_proxies; pid++) {
diff --git a/src/engine.h b/src/engine.h
index 7333bf3ac5..329f6b465e 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -187,9 +187,6 @@ struct engine {
struct link *links;
int nr_links, size_links;
- /* Root task for all send and recv tasks. */
- struct task *send_root, *recv_root;
-
/* Are we talkative ? */
int verbose;
diff --git a/src/runner.c b/src/runner.c
index 761201d7ee..e6cc88ae52 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -1132,8 +1132,6 @@ void *runner_main(void *data) {
case task_type_grav_external:
runner_do_grav_external(r, t->ci, 1);
break;
- case task_type_comm_root:
- break;
default:
error("Unknown task type.");
}
diff --git a/src/scheduler.c b/src/scheduler.c
index e3bb071603..86dac98d00 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -1029,7 +1029,7 @@ void scheduler_start(struct scheduler *s, unsigned int mask,
// ticks tic = getticks();
/* Store the masks */
- s->mask = mask | (1 << task_type_comm_root);
+ s->mask = mask;
s->submask = submask | (1 << task_subtype_none);
/* Clear all the waits and rids. */
diff --git a/src/task.c b/src/task.c
index fb101e3025..3a1b14ccaa 100644
--- a/src/task.c
+++ b/src/task.c
@@ -50,7 +50,7 @@ const char *taskID_names[task_type_count] = {
"none", "sort", "self", "pair", "sub_self",
"sub_pair", "init", "ghost", "kick", "kick_fixdt",
"send", "recv", "grav_pp", "grav_mm", "grav_up",
- "grav_down", "grav_external", "comm_root"};
+ "grav_down", "grav_external"};
const char *subtaskID_names[task_type_count] = {"none", "density", "force",
"grav", "t_end"};
diff --git a/src/task.h b/src/task.h
index 01eb859e77..ca31716032 100644
--- a/src/task.h
+++ b/src/task.h
@@ -50,7 +50,6 @@ enum task_types {
task_type_grav_up,
task_type_grav_down,
task_type_grav_external,
- task_type_comm_root,
task_type_count
};
--
GitLab