瀏覽代碼

merge trunk

Nathalie Furmento 10 年之前
父節點
當前提交
ad5a7b542d
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 0
      src/core/jobs.c
  2. 1 1
      tests/main/execute_schedule.c

+ 1 - 0
src/core/jobs.c

@@ -463,6 +463,7 @@ unsigned _starpu_enforce_deps_starting_from_task(struct _starpu_job *j)
 
 /* Ordered tasks are simply recorded as they arrive in the local_ordered_tasks
  * ring buffer, indexed by order, and pulled from its head. */
+/* TODO: replace with perhaps a heap */
 
 /* This function must be called with worker->sched_mutex taken */
 struct starpu_task *_starpu_pop_local_task(struct _starpu_worker *worker)

+ 1 - 1
tests/main/execute_schedule.c

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 
 		for (n = 0; n < N; n++)
 		{
-			i = random()%(N-n);
+			i = (int)starpu_drand48()%(N-n);
 			ret = starpu_task_submit(dep_task[i]);
 			memmove(&dep_task[i], &dep_task[i+1], (N-i-1)*sizeof(dep_task[i]));
 			if (ret == -ENODEV) goto enodev;