Commit e9d7520b authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Code formatting

parent 4e460da8
...@@ -907,10 +907,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) { ...@@ -907,10 +907,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
if (l == NULL) error("Missing link to send_xv task."); if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t); scheduler_activate(s, l->t);
if(cj->super->drift) if (cj->super->drift)
scheduler_activate(s, cj->super->drift); scheduler_activate(s, cj->super->drift);
else else
error("Drift task missing !"); error("Drift task missing !");
for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID; for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID;
l = l->next) l = l->next)
...@@ -939,10 +939,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) { ...@@ -939,10 +939,10 @@ int cell_unskip_tasks(struct cell *c, struct scheduler *s) {
if (l == NULL) error("Missing link to send_xv task."); if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t); scheduler_activate(s, l->t);
if(ci->super->drift) if (ci->super->drift)
scheduler_activate(s, ci->super->drift); scheduler_activate(s, ci->super->drift);
else else
error("Drift task missing !"); error("Drift task missing !");
for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID; for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID;
l = l->next) l = l->next)
......
...@@ -674,10 +674,10 @@ void engine_addtasks_send(struct engine *e, struct cell *ci, struct cell *cj, ...@@ -674,10 +674,10 @@ void engine_addtasks_send(struct engine *e, struct cell *ci, struct cell *cj,
/* Create the tasks and their dependencies? */ /* Create the tasks and their dependencies? */
if (t_xv == NULL) { if (t_xv == NULL) {
if(ci->super->drift == NULL) if (ci->super->drift == NULL)
ci->super->drift = scheduler_addtask(s, task_type_drift, task_subtype_none, 0, 0, ci->super->drift = scheduler_addtask(
ci->super, NULL, 0); s, task_type_drift, task_subtype_none, 0, 0, ci->super, NULL, 0);
t_xv = scheduler_addtask(s, task_type_send, task_subtype_none, t_xv = scheduler_addtask(s, task_type_send, task_subtype_none,
4 * ci->tag, 0, ci, cj, 0); 4 * ci->tag, 0, ci, cj, 0);
...@@ -2067,11 +2067,11 @@ void engine_marktasks_mapper(void *map_data, int num_elements, ...@@ -2067,11 +2067,11 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if (l == NULL) error("Missing link to send_xv task."); if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t); scheduler_activate(s, l->t);
if(cj->super->drift) if (cj->super->drift)
scheduler_activate(s, cj->super->drift); scheduler_activate(s, cj->super->drift);
else else
error("Drift task missing !"); error("Drift task missing !");
for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID; for (l = cj->send_rho; l != NULL && l->t->cj->nodeID != ci->nodeID;
l = l->next) l = l->next)
; ;
...@@ -2099,10 +2099,10 @@ void engine_marktasks_mapper(void *map_data, int num_elements, ...@@ -2099,10 +2099,10 @@ void engine_marktasks_mapper(void *map_data, int num_elements,
if (l == NULL) error("Missing link to send_xv task."); if (l == NULL) error("Missing link to send_xv task.");
scheduler_activate(s, l->t); scheduler_activate(s, l->t);
if(ci->super->drift) if (ci->super->drift)
scheduler_activate(s, ci->super->drift); scheduler_activate(s, ci->super->drift);
else else
error("Drift task missing !"); error("Drift task missing !");
for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID; for (l = ci->send_rho; l != NULL && l->t->cj->nodeID != cj->nodeID;
l = l->next) l = l->next)
......
...@@ -1054,7 +1054,8 @@ void *runner_main(void *data) { ...@@ -1054,7 +1054,8 @@ void *runner_main(void *data) {
#ifdef SWIFT_DEBUG_CHECKS #ifdef SWIFT_DEBUG_CHECKS
#ifndef WITH_MPI #ifndef WITH_MPI
if (cj == NULL) { /* self */ if (cj == NULL) { /* self */
if (!cell_is_active(ci, e) && t->type != task_type_sort && t->type != task_type_send && t->type != task_type_recv) if (!cell_is_active(ci, e) && t->type != task_type_sort &&
t->type != task_type_send && t->type != task_type_recv)
error( error(
"Task (type='%s/%s') should have been skipped ti_current=%d " "Task (type='%s/%s') should have been skipped ti_current=%d "
"c->ti_end_min=%d", "c->ti_end_min=%d",
...@@ -1073,12 +1074,12 @@ void *runner_main(void *data) { ...@@ -1073,12 +1074,12 @@ void *runner_main(void *data) {
} else { /* pair */ } else { /* pair */
if (!cell_is_active(ci, e) && !cell_is_active(cj, e)) if (!cell_is_active(ci, e) && !cell_is_active(cj, e))
if(t->type != task_type_send && t->type != task_type_recv) if (t->type != task_type_send && t->type != task_type_recv)
error( error(
"Task (type='%s/%s') should have been skipped ti_current=%d " "Task (type='%s/%s') should have been skipped ti_current=%d "
"ci->ti_end_min=%d cj->ti_end_min=%d", "ci->ti_end_min=%d cj->ti_end_min=%d",
taskID_names[t->type], subtaskID_names[t->subtype], e->ti_current, taskID_names[t->type], subtaskID_names[t->subtype],
ci->ti_end_min, cj->ti_end_min); e->ti_current, ci->ti_end_min, cj->ti_end_min);
} }
#endif #endif
#endif #endif
......
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