include/starpu_data.h: do not use a typedef for starpu_buffer_descr, use it directly as a struct

examples/cholesky/cholesky_models.c

@@ -36,7 +36,7 @@
 #define PERTURBATE(a)	(a)
 #endif
 
-static double cpu_chol_task_11_cost(starpu_buffer_descr *descr)
+static double cpu_chol_task_11_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -51,7 +51,7 @@ static double cpu_chol_task_11_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-static double cuda_chol_task_11_cost(starpu_buffer_descr *descr)
+static double cuda_chol_task_11_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -66,7 +66,7 @@ static double cuda_chol_task_11_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-static double cpu_chol_task_21_cost(starpu_buffer_descr *descr)
+static double cpu_chol_task_21_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -81,7 +81,7 @@ static double cpu_chol_task_21_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-static double cuda_chol_task_21_cost(starpu_buffer_descr *descr)
+static double cuda_chol_task_21_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -96,7 +96,7 @@ static double cuda_chol_task_21_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-static double cpu_chol_task_22_cost(starpu_buffer_descr *descr)
+static double cpu_chol_task_22_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -111,7 +111,7 @@ static double cpu_chol_task_22_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-static double cuda_chol_task_22_cost(starpu_buffer_descr *descr)
+static double cuda_chol_task_22_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 

examples/common/blas_model.c

@@ -27,7 +27,7 @@
  *	Number of flops of Gemm 
  */
 
-double gemm_cost(starpu_buffer_descr *descr)
+double gemm_cost(struct starpu_buffer_descr *descr)
 {
 	/* C = A * B */
 	uint32_t nxC, nyC, nxA;

examples/common/blas_model.h

@@ -20,7 +20,7 @@
 
 #include <starpu.h>
 
-double gemm_cost(starpu_buffer_descr *descr);
+double gemm_cost(struct starpu_buffer_descr *descr);
 
 static struct starpu_perfmodel starpu_sgemm_model = {
 	.type = STARPU_HISTORY_BASED,

examples/heat/lu_kernels_model.c

@@ -42,7 +42,7 @@
  *
  */
 
-double task_11_cost(starpu_buffer_descr *descr)
+double task_11_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -53,7 +53,7 @@ double task_11_cost(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-double task_12_cost(starpu_buffer_descr *descr)
+double task_12_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -67,7 +67,7 @@ double task_12_cost(starpu_buffer_descr *descr)
 }
 
 
-double task_21_cost(starpu_buffer_descr *descr)
+double task_21_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -82,7 +82,7 @@ double task_21_cost(starpu_buffer_descr *descr)
 
 
 
-double task_22_cost(starpu_buffer_descr *descr)
+double task_22_cost(struct starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 
@@ -102,7 +102,7 @@ double task_22_cost(starpu_buffer_descr *descr)
  */
 
 
-double task_11_cost_cuda(starpu_buffer_descr *descr)
+double task_11_cost_cuda(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -114,7 +114,7 @@ double task_11_cost_cuda(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-double task_12_cost_cuda(starpu_buffer_descr *descr)
+double task_12_cost_cuda(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -127,7 +127,7 @@ double task_12_cost_cuda(starpu_buffer_descr *descr)
 }
 
 
-double task_21_cost_cuda(starpu_buffer_descr *descr)
+double task_21_cost_cuda(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -141,7 +141,7 @@ double task_21_cost_cuda(starpu_buffer_descr *descr)
 
 
 
-double task_22_cost_cuda(starpu_buffer_descr *descr)
+double task_22_cost_cuda(struct starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 
@@ -161,7 +161,7 @@ double task_22_cost_cuda(starpu_buffer_descr *descr)
  *
  */
 
-double task_11_cost_cpu(starpu_buffer_descr *descr)
+double task_11_cost_cpu(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -173,7 +173,7 @@ double task_11_cost_cpu(starpu_buffer_descr *descr)
 	return PERTURBATE(cost);
 }
 
-double task_12_cost_cpu(starpu_buffer_descr *descr)
+double task_12_cost_cpu(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -186,7 +186,7 @@ double task_12_cost_cpu(starpu_buffer_descr *descr)
 }
 
 
-double task_21_cost_cpu(starpu_buffer_descr *descr)
+double task_21_cost_cpu(struct starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
@@ -200,7 +200,7 @@ double task_21_cost_cpu(starpu_buffer_descr *descr)
 
 
 
-double task_22_cost_cpu(starpu_buffer_descr *descr)
+double task_22_cost_cpu(struct starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 

include/starpu_data.h

@@ -40,10 +40,10 @@ enum starpu_access_mode {
 	STARPU_REDUX=(1<<3)
 };
 
-typedef struct starpu_buffer_descr_t {
+struct starpu_buffer_descr {
 	starpu_data_handle handle;
 	enum starpu_access_mode mode;
-} starpu_buffer_descr;
+};
 
 struct starpu_data_interface_ops;
 

src/core/dependencies/data_concurrency.c

@@ -226,7 +226,7 @@ unsigned _starpu_submit_job_enforce_data_deps(starpu_job_t j)
 	/* Compute an ordered list of the different pieces of data so that we
 	 * grab then according to a total order, thus avoiding a deadlock
 	 * condition */
-	memcpy(j->ordered_buffers, j->task->buffers, cl->nbuffers*sizeof(starpu_buffer_descr));
+	memcpy(j->ordered_buffers, j->task->buffers, cl->nbuffers*sizeof(struct starpu_buffer_descr));
 	_starpu_sort_task_handles(j->ordered_buffers, cl->nbuffers);
 
 	return _submit_job_enforce_data_deps(j, 0);

src/datawizard/coherency.c

@@ -564,7 +564,7 @@ static void _starpu_set_data_requested_flag_if_needed(struct starpu_data_replica
 
 int starpu_prefetch_task_input_on_node(struct starpu_task *task, uint32_t node)
 {
-	starpu_buffer_descr *descrs = task->buffers;
+	struct starpu_buffer_descr *descrs = task->buffers;
 	unsigned nbuffers = task->cl->nbuffers;
 
 	unsigned index;
@@ -593,7 +593,7 @@ int _starpu_fetch_task_input(struct starpu_task *task, uint32_t mask)
 	if (profiling && task->profiling_info)
 		starpu_clock_gettime(&task->profiling_info->acquire_data_start_time);
 
-	starpu_buffer_descr *descrs = task->buffers;
+	struct starpu_buffer_descr *descrs = task->buffers;
 	unsigned nbuffers = task->cl->nbuffers;
 
 	unsigned local_memory_node = _starpu_get_local_memory_node();
@@ -656,7 +656,7 @@ void _starpu_push_task_output(struct starpu_task *task, uint32_t mask)
 	if (profiling && task->profiling_info)
 		starpu_clock_gettime(&task->profiling_info->release_data_start_time);
 
-        starpu_buffer_descr *descrs = task->buffers;
+        struct starpu_buffer_descr *descrs = task->buffers;
         unsigned nbuffers = task->cl->nbuffers;
 
 	unsigned index;

src/datawizard/sort_data_handles.c

@@ -88,14 +88,14 @@ static int _starpu_compar_handles(struct starpu_data_state_t *dataA,
 
 static int _starpu_compar_buffer_descr(const void *_descrA, const void *_descrB)
 {
-	const starpu_buffer_descr *descrA = (const starpu_buffer_descr *) _descrA;
-	const starpu_buffer_descr *descrB = (const starpu_buffer_descr *) _descrB;
+	const struct starpu_buffer_descr *descrA = (const struct starpu_buffer_descr *) _descrA;
+	const struct starpu_buffer_descr *descrB = (const struct starpu_buffer_descr *) _descrB;
 
 	return _starpu_compar_handles(descrA->handle, descrB->handle);
 }
 
 /* The descr array will be overwritten, so this must be a copy ! */
-void _starpu_sort_task_handles(starpu_buffer_descr descr[], unsigned nbuffers)
+void _starpu_sort_task_handles(struct starpu_buffer_descr descr[], unsigned nbuffers)
 {
-	qsort(descr, nbuffers, sizeof(starpu_buffer_descr), _starpu_compar_buffer_descr);
+	qsort(descr, nbuffers, sizeof(struct starpu_buffer_descr), _starpu_compar_buffer_descr);
 }

src/datawizard/sort_data_handles.h

@@ -29,6 +29,6 @@
 /* To avoid deadlocks, we reorder the different buffers accessed to by the task
  * so that we always grab the rw-lock associated to the handles in the same
  * order. */
-void _starpu_sort_task_handles(starpu_buffer_descr descr[], unsigned nbuffers);
+void _starpu_sort_task_handles(struct starpu_buffer_descr descr[], unsigned nbuffers);
 
 #endif // SORT_DATA_HANDLES

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -45,13 +45,13 @@ static int count_non_ready_buffers(struct starpu_task *task, uint32_t node)
 {
 	int cnt = 0;
 
-	starpu_buffer_descr *descrs = task->buffers;
+	struct starpu_buffer_descr *descrs = task->buffers;
 	unsigned nbuffers = task->cl->nbuffers;
 
 	unsigned index;
 	for (index = 0; index < nbuffers; index++)
 	{
-		starpu_buffer_descr *descr;
+		struct starpu_buffer_descr *descr;
 		starpu_data_handle handle;
 
 		descr = &descrs[index];

tools/dev/rename.sed

@@ -14,6 +14,7 @@
 #
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
+s/\bstarpu_buffer_descr\b/struct starpu_buffer_descr/g
 s/\bstarpu_perfmodel_t\b/starpu_perfmodel/g
 s/\bstarpu_tag_t\b/starpu_tag/g
 s/\bstarpu_sched_policy_s\b/starpu_sched_policy/g