merge fix

src/datawizard/filters.c

@@ -302,7 +302,7 @@ void starpu_data_unpartition(starpu_data_handle_t root_handle, uint32_t gatherin
 			task->handles[0] = child_handle;
 			task->cl = &cl;
 			task->synchronous = 1;
-			if (starpu_task_submit(task) != 0)
+			if (_starpu_task_submit_internally(task) != 0)
 				_STARPU_ERROR("Could not submit the conversion task while unpartitionning\n");
 		}
 

src/datawizard/reduction.c

@@ -254,7 +254,7 @@ void _starpu_data_end_reduction_mode(starpu_data_handle_t handle)
 		unsigned i;
 		for (i = 0; i < redux_task_idx; i++)
 		{
-			int ret = starpu_task_submit(redux_tasks[i]);
+			int ret = _starpu_task_submit_internally(redux_tasks[i]);
 			STARPU_ASSERT(ret == 0);
 		}
 #else
@@ -276,7 +276,7 @@ void _starpu_data_end_reduction_mode(starpu_data_handle_t handle)
 			redux_task->cl->modes[0] = STARPU_W;
 			redux_task->handles[0] = handle;
 
-			int ret = starpu_task_submit(redux_task);
+			int ret = _starpu_task_submit_internally(redux_task);
 			STARPU_ASSERT(!ret);
 		}
 
@@ -305,7 +305,7 @@ void _starpu_data_end_reduction_mode(starpu_data_handle_t handle)
 			redux_task->handles[0] = handle;
 			redux_task->handles[1] = replicate_array[replicate];
 
-			int ret = starpu_task_submit(redux_task);
+			int ret = _starpu_task_submit_internally(redux_task);
 			STARPU_ASSERT(!ret);
 		}
 #endif

src/util/execute_on_all.c

@@ -77,7 +77,7 @@ void starpu_execute_on_each_worker(void (*func)(void *), void *arg, uint32_t whe
 
 		_starpu_exclude_task_from_dag(tasks[worker]);
 
-		ret = starpu_task_submit(tasks[worker]);
+		ret = _starpu_task_submit_internally(tasks[worker]);
 		if (ret == -ENODEV)
 		{
 			/* if the worker is not able to execute this tasks, we

src/util/malloc.c

@@ -105,7 +105,7 @@ int starpu_malloc(void **A, size_t dim)
 
 		_starpu_exclude_task_from_dag(task);
 
-		push_res = starpu_task_submit(task);
+		push_res = _starpu_task_submit_internally(task);
 		STARPU_ASSERT(push_res != -ENODEV);
 #endif
 #endif
@@ -131,7 +131,7 @@ int starpu_malloc(void **A, size_t dim)
 //
 //		_starpu_exclude_task_from_dag(task);
 //
-//		push_res = starpu_task_submit(task);
+//		push_res = _starpu_task_submit_internally(task);
 //		STARPU_ASSERT(push_res != -ENODEV);
 //#endif
 //        }
@@ -216,7 +216,7 @@ int starpu_free(void *A)
 
 		_starpu_exclude_task_from_dag(task);
 
-		push_res = starpu_task_submit(task);
+		push_res = _starpu_task_submit_internally(task);
 		STARPU_ASSERT(push_res != -ENODEV);
 	}
 #endif
@@ -235,7 +235,7 @@ int starpu_free(void *A)
 //
 //		_starpu_exclude_task_from_dag(task);
 //
-//		push_res = starpu_task_submit(task);
+//		push_res = _starpu_task_submit_internally(task);
 //		STARPU_ASSERT(push_res != -ENODEV);
 //#endif
 //	}

src/util/starpu_create_sync_task.c

@@ -39,6 +39,6 @@ void starpu_create_sync_task(starpu_tag_t sync_tag, unsigned ndeps, starpu_tag_t
 	/* This task does nothing */
 	sync_task->cl = NULL;
 
-	int sync_ret = starpu_task_submit(sync_task);
+	int sync_ret = _starpu_task_submit_internally(sync_task);
 	STARPU_ASSERT(!sync_ret);
 }

src/util/starpu_data_cpy.c

@@ -96,7 +96,7 @@ int _starpu_data_cpy(starpu_data_handle_t dst_handle, starpu_data_handle_t src_h
 
 	task->synchronous = !asynchronous;
 
-	int ret = starpu_task_submit(task);
+	int ret = _starpu_task_submit_internally(task);
 	STARPU_ASSERT(!ret);
 
 	return 0;