瀏覽代碼

src/core/task.c: avoid code duplication

Nathalie Furmento 11 年之前
父節點
當前提交
c9856f9640
共有 1 個文件被更改,包括 3 次插入7 次删除
  1. 3 7
      src/core/task.c

+ 3 - 7
src/core/task.c

@@ -723,26 +723,22 @@ int starpu_task_wait_for_all(void)
 #ifdef HAVE_AYUDAME_H
 		if (AYU_event) AYU_event(AYU_BARRIER, 0, NULL);
 #endif
+		return 0;
 	}
 	else
 	{
 		_STARPU_DEBUG("Waiting for tasks submitted to context %u\n", sched_ctx_id);
-		_starpu_wait_for_all_tasks_of_sched_ctx(sched_ctx_id);
-#ifdef HAVE_AYUDAME_H
-		/* TODO: improve Temanejo into knowing about contexts ... */
-		if (AYU_event) AYU_event(AYU_BARRIER, 0, NULL);
-#endif
+		return starpu_task_wait_for_all_in_ctx(sched_ctx_id);
 	}
-	return 0;
 }
 
 int starpu_task_wait_for_all_in_ctx(unsigned sched_ctx)
 {
 	_starpu_wait_for_all_tasks_of_sched_ctx(sched_ctx);
 #ifdef HAVE_AYUDAME_H
+	/* TODO: improve Temanejo into knowing about contexts ... */
 	if (AYU_event) AYU_event(AYU_BARRIER, 0, NULL);
 #endif
-
 	return 0;
 }
 /*