瀏覽代碼

minor bug fixes

Simon Archipoff 12 年之前
父節點
當前提交
a1a31ff6b9
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 3 0
      src/sched_policies/node_worker.c
  2. 1 1
      tests/parallel_tasks/parallel_kernels_spmd.c

+ 3 - 0
src/sched_policies/node_worker.c

@@ -149,6 +149,8 @@ static inline struct starpu_task * _starpu_worker_task_list_pop(struct _starpu_w
 	if(t->task == NULL && t->right == NULL && t->left == NULL)
 	{
 		l->first = t->up;
+		if(l->first)
+			l->first->down = NULL;
 		if(l->last == t)
 			l->last = NULL;
 		_starpu_task_grid_destroy(t);
@@ -205,6 +207,7 @@ int _starpu_sched_node_worker_push_task(struct _starpu_sched_node * node, struct
 	struct _starpu_worker_node_data * data = node->data;
 	struct _starpu_task_grid * t = _starpu_task_grid_create();
 	t->task = task;
+	t->ntasks = 1;
 	STARPU_PTHREAD_MUTEX_LOCK(&data->list->mutex);
 	_starpu_worker_task_list_push(data->list, t);
 	STARPU_PTHREAD_MUTEX_UNLOCK(&data->list->mutex);

+ 1 - 1
tests/parallel_tasks/parallel_kernels_spmd.c

@@ -32,7 +32,7 @@ static void codelet_null(void *descr[], __attribute__ ((unused)) void *_args)
 	STARPU_ASSERT(worker_size > 0);
 
 	usleep(1000/worker_size);
-#if 0
+#if 1
 	int id = starpu_worker_get_id();
 	int combined_id = starpu_combined_worker_get_id();
 	int rank = starpu_combined_worker_get_rank();