rename starpu_data_unpartition_submit_sequential_consistency_with_callback into starpu_data_unpartition_submit_sequential_consistency_cb

.gitignore

@@ -5,6 +5,7 @@
 /libtool
 /aclocal.m4
 /build
+/build2
 /build-aux
 /GPATH
 /GRTAGS

ChangeLog

@@ -121,7 +121,7 @@ Small features:
     automatic partitioning of a data handle for which a asynchronous
     plan has previously been submitted
   * Add starpu_task_declare_deps()
-  * New function starpu_data_unpartition_submit_sequential_consistency_with_callback()
+  * New function starpu_data_unpartition_submit_sequential_consistency_cb()
     to specify a callback for the task submitting the unpartitioning
 
 

doc/doxygen/chapters/api/data_partition.doxy

@@ -196,7 +196,7 @@ Similar to starpu_data_partition_submit() but also allows to
 specify the coherency to be used for the main data \p initial_handle
 through the parameter \p sequential_consistency.
 
-\fn void starpu_data_unpartition_submit_sequential_consistency_with_callback(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg)
+\fn void starpu_data_unpartition_submit_sequential_consistency_cb(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg)
 \ingroup API_Data_Partition
 Similar to starpu_data_partition_submit_sequential_consistency() but
 allow to specify a callback function for the unpartitiong task

examples/filters/fplan_notautomatic.c

@@ -95,7 +95,7 @@ void merge_callback(void *arg)
 
 	FPRINTF(stderr, "Unpartition for handle %p from handles %p %p and %p\n", value_handle, sub_handles[0], sub_handles[1], sub_handles[2]);
 
-	starpu_data_unpartition_submit_sequential_consistency_with_callback(value_handle, PARTS, sub_handles, STARPU_MAIN_RAM, 0, release, task);
+	starpu_data_unpartition_submit_sequential_consistency_cb(value_handle, PARTS, sub_handles, STARPU_MAIN_RAM, 0, release, task);
 }
 
 // Codelets

include/starpu_data_filters.h

@@ -53,7 +53,7 @@ void starpu_data_unpartition_submit_r(starpu_data_handle_t initial_handle, int g
 void starpu_data_unpartition_readonly_submit(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gathering_node);
 void starpu_data_partition_clean(starpu_data_handle_t root_data, unsigned nparts, starpu_data_handle_t *children);
 
-void starpu_data_unpartition_submit_sequential_consistency_with_callback(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg);
+void starpu_data_unpartition_submit_sequential_consistency_cb(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg);
 void starpu_data_partition_submit_sequential_consistency(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int sequential_consistency);
 void starpu_data_unpartition_submit_sequential_consistency(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gathering_node, int sequential_consistency);
 void starpu_data_partition_not_automatic(starpu_data_handle_t handle);

src/datawizard/filters.c

@@ -854,7 +854,7 @@ void starpu_data_unpartition_submit(starpu_data_handle_t initial_handle, unsigne
 	_starpu_data_unpartition_submit(initial_handle, nparts, children, gather_node, NULL, NULL, NULL);
 }
 
-void starpu_data_unpartition_submit_sequential_consistency_with_callback(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg)
+void starpu_data_unpartition_submit_sequential_consistency_cb(starpu_data_handle_t initial_handle, unsigned nparts, starpu_data_handle_t *children, int gather_node, int sequential_consistency, void (*callback_func)(void *), void *callback_arg)
 {
 	unsigned i;
 	unsigned char handles_sequential_consistency[nparts+1];