Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
4c93f857
Commit
4c93f857
authored
Jul 14, 2016
by
Peter W. Draper
Browse files
Remove unwanted changes from the comm_stalls branch
parent
09d7fe2f
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/engine.c
View file @
4c93f857
...
...
@@ -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
++
)
{
...
...
src/engine.h
View file @
4c93f857
...
...
@@ -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
;
...
...
src/runner.c
View file @
4c93f857
...
...
@@ -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."
);
}
...
...
src/scheduler.c
View file @
4c93f857
...
...
@@ -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. */
...
...
src/task.c
View file @
4c93f857
...
...
@@ -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"
};
...
...
src/task.h
View file @
4c93f857
...
...
@@ -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
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment