rename type starpu_tag into starpu_tag_t

doc/chapters/basic-api.texi

@@ -1286,7 +1286,7 @@ same task, in this case, the dependencies are added. It is possible to have
 redundancy in the task dependencies.
 @end deftypefun
 
-@deftp {Data Type} {starpu_tag}
+@deftp {Data Type} {starpu_tag_t}
 This type defines a task logical identifer. It is possible to associate a task with a unique ``tag'' chosen by the application, and to express
 dependencies between tasks by the means of those tags. To do so, fill the
 @code{tag_id} field of the @code{starpu_task} structure with a tag number (can
@@ -1297,7 +1297,7 @@ not be started until the tasks which holds the declared dependency tags are
 completed.
 @end deftp
 
-@deftypefun void starpu_tag_declare_deps (starpu_tag @var{id}, unsigned @var{ndeps}, ...)
+@deftypefun void starpu_tag_declare_deps (starpu_tag_t @var{id}, unsigned @var{ndeps}, ...)
 Specify the dependencies of the task identified by tag @var{id}. The first
 argument specifies the tag which is configured, the second argument gives the
 number of tag(s) on which @var{id} depends. The following arguments are the
@@ -1307,33 +1307,33 @@ This function must be called before the associated task is submitted to StarPU
 with @code{starpu_task_submit}.
 
 Because of the variable arity of @code{starpu_tag_declare_deps}, note that the
-last arguments @emph{must} be of type @code{starpu_tag}: constant values
+last arguments @emph{must} be of type @code{starpu_tag_t}: constant values
 typically need to be explicitly casted. Using the
 @code{starpu_tag_declare_deps_array} function avoids this hazard.
 
 @cartouche
 @example
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
-starpu_tag_declare_deps((starpu_tag)0x1,
-        2, (starpu_tag)0x32, (starpu_tag)0x52);
+starpu_tag_declare_deps((starpu_tag_t)0x1,
+        2, (starpu_tag_t)0x32, (starpu_tag_t)0x52);
 @end example
 @end cartouche
 @end deftypefun
 
-@deftypefun void starpu_tag_declare_deps_array (starpu_tag @var{id}, unsigned @var{ndeps}, {starpu_tag *}@var{array})
+@deftypefun void starpu_tag_declare_deps_array (starpu_tag_t @var{id}, unsigned @var{ndeps}, {starpu_tag_t *}@var{array})
 This function is similar to @code{starpu_tag_declare_deps}, except
 that its does not take a variable number of arguments but an array of
 tags of size @var{ndeps}.
 @cartouche
 @example
 /*  Tag 0x1 depends on tags 0x32 and 0x52 */
-starpu_tag tag_array[2] = @{0x32, 0x52@};
-starpu_tag_declare_deps_array((starpu_tag)0x1, 2, tag_array);
+starpu_tag_t tag_array[2] = @{0x32, 0x52@};
+starpu_tag_declare_deps_array((starpu_tag_t)0x1, 2, tag_array);
 @end example
 @end cartouche
 @end deftypefun
 
-@deftypefun void starpu_tag_wait (starpu_tag @var{id})
+@deftypefun void starpu_tag_wait (starpu_tag_t @var{id})
 This function blocks until the task associated to tag @var{id} has been
 executed. This is a blocking call which must therefore not be called within
 tasks or callbacks, but only from the application directly.  It is possible to
@@ -1344,19 +1344,19 @@ data structure was freed (e.g. if the @code{destroy} flag of the
 @code{starpu_task} was enabled).
 @end deftypefun
 
-@deftypefun void starpu_tag_wait_array (unsigned @var{ntags}, starpu_tag *@var{id})
+@deftypefun void starpu_tag_wait_array (unsigned @var{ntags}, starpu_tag_t *@var{id})
 This function is similar to @code{starpu_tag_wait} except that it blocks until
 @emph{all} the @var{ntags} tags contained in the @var{id} array are
 terminated.
 @end deftypefun
 
-@deftypefun void starpu_tag_remove (starpu_tag @var{id})
+@deftypefun void starpu_tag_remove (starpu_tag_t @var{id})
 This function releases the resources associated to tag @var{id}. It can be
 called once the corresponding task has been executed and when there is
 no other tag that depend on this tag anymore.
 @end deftypefun
 
-@deftypefun void starpu_tag_notify_from_apps (starpu_tag @var{id})
+@deftypefun void starpu_tag_notify_from_apps (starpu_tag_t @var{id})
 This function explicitly unlocks tag @var{id}. It may be useful in the
 case of applications which execute part of their computation outside StarPU
 tasks (e.g. third-party libraries).  It is also provided as a

doc/chapters/mpi-support.texi

@@ -95,19 +95,19 @@ by calling @code{starpu_mpi_initialize_extended}.
 @deftypefun int starpu_mpi_barrier (MPI_Comm @var{comm})
 @end deftypefun
 
-@deftypefun int starpu_mpi_isend_detached_unlock_tag (starpu_data_handle_t @var{data_handle}, int @var{dest}, int @var{mpi_tag}, MPI_Comm @var{comm}, starpu_tag @var{tag})
+@deftypefun int starpu_mpi_isend_detached_unlock_tag (starpu_data_handle_t @var{data_handle}, int @var{dest}, int @var{mpi_tag}, MPI_Comm @var{comm}, starpu_tag_t @var{tag})
 When the transfer is completed, the tag is unlocked
 @end deftypefun
 
-@deftypefun int starpu_mpi_irecv_detached_unlock_tag (starpu_data_handle_t @var{data_handle}, int @var{source}, int @var{mpi_tag}, MPI_Comm @var{comm}, starpu_tag @var{tag})
+@deftypefun int starpu_mpi_irecv_detached_unlock_tag (starpu_data_handle_t @var{data_handle}, int @var{source}, int @var{mpi_tag}, MPI_Comm @var{comm}, starpu_tag_t @var{tag})
 @end deftypefun
 
-@deftypefun int starpu_mpi_isend_array_detached_unlock_tag (unsigned @var{array_size}, starpu_data_handle_t *@var{data_handle}, int *@var{dest}, int *@var{mpi_tag}, MPI_Comm *@var{comm}, starpu_tag @var{tag})
+@deftypefun int starpu_mpi_isend_array_detached_unlock_tag (unsigned @var{array_size}, starpu_data_handle_t *@var{data_handle}, int *@var{dest}, int *@var{mpi_tag}, MPI_Comm *@var{comm}, starpu_tag_t @var{tag})
 Asynchronously send an array of buffers, and unlocks the tag once all
 of them are transmitted.
 @end deftypefun
 
-@deftypefun int starpu_mpi_irecv_array_detached_unlock_tag (unsigned @var{array_size}, starpu_data_handle_t *@var{data_handle}, int *@var{source}, int *@var{mpi_tag}, MPI_Comm *@var{comm}, starpu_tag @var{tag})
+@deftypefun int starpu_mpi_irecv_array_detached_unlock_tag (unsigned @var{array_size}, starpu_data_handle_t *@var{data_handle}, int *@var{source}, int *@var{mpi_tag}, MPI_Comm *@var{comm}, starpu_tag_t @var{tag})
 @end deftypefun
 
 @page

examples/cholesky/cholesky.h

@@ -35,18 +35,18 @@
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 #define NMAXBLOCKS	32
 
-#define TAG11(k)	((starpu_tag)( (1ULL<<60) | (unsigned long long)(k)))
-#define TAG21(k,j)	((starpu_tag)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k)	((starpu_tag_t)( (1ULL<<60) | (unsigned long long)(k)))
+#define TAG21(k,j)	((starpu_tag_t)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22(k,i,j)	((starpu_tag)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j)	((starpu_tag_t)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
 
-#define TAG11_AUX(k, prefix)	((starpu_tag)( (((unsigned long long)(prefix))<<60)  |  (1ULL<<56) | (unsigned long long)(k)))
-#define TAG21_AUX(k,j, prefix)	((starpu_tag)( (((unsigned long long)(prefix))<<60)  			\
+#define TAG11_AUX(k, prefix)	((starpu_tag_t)( (((unsigned long long)(prefix))<<60)  |  (1ULL<<56) | (unsigned long long)(k)))
+#define TAG21_AUX(k,j, prefix)	((starpu_tag_t)( (((unsigned long long)(prefix))<<60)  			\
 					|  ((3ULL<<56) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22_AUX(k,i,j, prefix)    ((starpu_tag)(  (((unsigned long long)(prefix))<<60)	\
+#define TAG22_AUX(k,i,j, prefix)    ((starpu_tag_t)(  (((unsigned long long)(prefix))<<60)	\
 					|  ((4ULL<<56) | ((unsigned long long)(k)<<32)  	\
 					| ((unsigned long long)(i)<<16) 			\
 					| (unsigned long long)(j))))

examples/cholesky/cholesky_grain_tag.c

@@ -22,7 +22,7 @@
  *	Some useful functions
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;
@@ -227,7 +227,7 @@ static void cholesky_grain_rec(float *matA, unsigned size, unsigned ld, unsigned
 		STARPU_ASSERT(reclevel == 0);
 		unsigned ndeps_tags = (nblocks - nbigblocks)*(nblocks - nbigblocks);
 
-		starpu_tag *tag_array = malloc(ndeps_tags*sizeof(starpu_tag));
+		starpu_tag_t *tag_array = malloc(ndeps_tags*sizeof(starpu_tag_t));
 		STARPU_ASSERT(tag_array);
 
 		unsigned ind = 0;

examples/cholesky/cholesky_tag.c

@@ -22,7 +22,7 @@
  *	Some useful functions
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;

examples/cholesky/cholesky_tile_tag.c

@@ -25,7 +25,7 @@ starpu_data_handle_t A_state[NMAXBLOCKS][NMAXBLOCKS];
  *	Some useful functions
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;

examples/heat/dw_factolu_grain.c

@@ -18,12 +18,12 @@
 
 #include "dw_factolu.h"
 
-#define TAG11(k, prefix)	((starpu_tag)( (((unsigned long long)(prefix))<<60)  |  (1ULL<<56) | (unsigned long long)(k)))
-#define TAG12(k,i, prefix)	((starpu_tag)((((unsigned long long)(prefix))<<60)  | ((2ULL<<56) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k, prefix)	((starpu_tag_t)( (((unsigned long long)(prefix))<<60)  |  (1ULL<<56) | (unsigned long long)(k)))
+#define TAG12(k,i, prefix)	((starpu_tag_t)((((unsigned long long)(prefix))<<60)  | ((2ULL<<56) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
-#define TAG21(k,j, prefix)	((starpu_tag)( (((unsigned long long)(prefix))<<60)  |  ((3ULL<<56) | (((unsigned long long)(k))<<32)	\
+#define TAG21(k,j, prefix)	((starpu_tag_t)( (((unsigned long long)(prefix))<<60)  |  ((3ULL<<56) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22(k,i,j, prefix)	((starpu_tag)(  (((unsigned long long)(prefix))<<60)  |  ((4ULL<<56) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j, prefix)	((starpu_tag_t)(  (((unsigned long long)(prefix))<<60)  |  ((4ULL<<56) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
 
@@ -31,7 +31,7 @@
  *	Construct the DAG
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;
@@ -278,7 +278,7 @@ static void dw_factoLU_grain_inner(float *matA, unsigned size, unsigned inner_si
 		 */
 
 		unsigned ndeps_tags = (nblocks - maxk)*(nblocks - maxk);
-		starpu_tag *tag_array = malloc(ndeps_tags*sizeof(starpu_tag));
+		starpu_tag_t *tag_array = malloc(ndeps_tags*sizeof(starpu_tag_t));
 		STARPU_ASSERT(tag_array);
 
 		unsigned ind = 0;

examples/heat/dw_factolu_tag.c

@@ -18,12 +18,12 @@
 
 #include "dw_factolu.h"
 
-#define TAG11(k)	((starpu_tag)( (1ULL<<60) | (unsigned long long)(k)))
-#define TAG12(k,i)	((starpu_tag)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k)	((starpu_tag_t)( (1ULL<<60) | (unsigned long long)(k)))
+#define TAG12(k,i)	((starpu_tag_t)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
-#define TAG21(k,j)	((starpu_tag)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG21(k,j)	((starpu_tag_t)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22(k,i,j)	((starpu_tag)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j)	((starpu_tag_t)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
 
@@ -33,7 +33,7 @@ static unsigned no_prio = 0;
  *	Construct the DAG
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;

examples/heat/dw_sparse_cg.c

@@ -22,7 +22,7 @@
 #include "dw_sparse_cg.h"
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	starpu_codelet *cl = calloc(1,sizeof(starpu_codelet));
 
@@ -156,7 +156,7 @@ void init_cg(struct cg_problem *problem)
 		task2->buffers[1].handle = problem->ds_vecr;
 		task2->buffers[1].mode = STARPU_R;
 	
-	starpu_tag_declare_deps((starpu_tag)2UL, 1, (starpu_tag)1UL);
+	starpu_tag_declare_deps((starpu_tag_t)2UL, 1, (starpu_tag_t)1UL);
 
 	/* delta_new = trans(r) r */
 	struct starpu_task *task3 = create_task(3UL);
@@ -174,7 +174,7 @@ void init_cg(struct cg_problem *problem)
 	task3->callback_arg = problem;
 	
 	/* XXX 3 should only depend on 1 ... */
-	starpu_tag_declare_deps((starpu_tag)3UL, 1, (starpu_tag)2UL);
+	starpu_tag_declare_deps((starpu_tag_t)3UL, 1, (starpu_tag_t)2UL);
 
 	/* launch the computation now */
 	starpu_task_submit(task1);
@@ -219,7 +219,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task5->buffers[1].handle = problem->ds_vecq;
 		task5->buffers[1].mode = STARPU_R;
 
-	starpu_tag_declare_deps((starpu_tag)(maskiter | 5UL), 1, (starpu_tag)(maskiter | 4UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 5UL), 1, (starpu_tag_t)(maskiter | 4UL));
 
 	/* x = x + alpha d */
 	struct starpu_task *task6 = create_task(maskiter | 6UL);
@@ -235,7 +235,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task6->buffers[1].handle = problem->ds_vecd;
 		task6->buffers[1].mode = STARPU_R;
 
-	starpu_tag_declare_deps((starpu_tag)(maskiter | 6UL), 1, (starpu_tag)(maskiter | 5UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 6UL), 1, (starpu_tag_t)(maskiter | 5UL));
 
 	/* r = r - alpha q */
 	struct starpu_task *task7 = create_task(maskiter | 7UL);
@@ -251,7 +251,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task7->buffers[1].handle = problem->ds_vecq;
 		task7->buffers[1].mode = STARPU_R;
 
-	starpu_tag_declare_deps((starpu_tag)(maskiter | 7UL), 1, (starpu_tag)(maskiter | 6UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 7UL), 1, (starpu_tag_t)(maskiter | 6UL));
 
 	/* update delta_* and compute beta */
 	struct starpu_task *task8 = create_task(maskiter | 8UL);
@@ -265,7 +265,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task8->buffers[0].handle = problem->ds_vecr;
 		task8->buffers[0].mode = STARPU_R;
 
-	starpu_tag_declare_deps((starpu_tag)(maskiter | 8UL), 1, (starpu_tag)(maskiter | 7UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 8UL), 1, (starpu_tag_t)(maskiter | 7UL));
 
 	/* d = r + beta d */
 	struct starpu_task *task9 = create_task(maskiter | 9UL);
@@ -281,7 +281,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 		task9->buffers[1].handle = problem->ds_vecr;
 		task9->buffers[1].mode = STARPU_R;
 
-	starpu_tag_declare_deps((starpu_tag)(maskiter | 9UL), 1, (starpu_tag)(maskiter | 8UL));
+	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 9UL), 1, (starpu_tag_t)(maskiter | 8UL));
 
 	task9->callback_func = iteration_cg;
 	task9->callback_arg = problem;

examples/lu/xlu.c

@@ -19,12 +19,12 @@
 #include "xlu.h"
 #include "xlu_kernels.h"
 
-#define TAG11(k)	((starpu_tag)( (1ULL<<60) | (unsigned long long)(k)))
-#define TAG12(k,i)	((starpu_tag)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k)	((starpu_tag_t)( (1ULL<<60) | (unsigned long long)(k)))
+#define TAG12(k,i)	((starpu_tag_t)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
-#define TAG21(k,j)	((starpu_tag)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG21(k,j)	((starpu_tag_t)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22(k,i,j)	((starpu_tag)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j)	((starpu_tag_t)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
 
@@ -37,7 +37,7 @@ static unsigned no_prio = 0;
  *	Construct the DAG
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;

examples/lu/xlu_pivot.c

@@ -18,15 +18,15 @@
 #include "xlu.h"
 #include "xlu_kernels.h"
 
-#define TAG11(k)	((starpu_tag)( (1ULL<<60) | (unsigned long long)(k)))
-#define TAG12(k,i)	((starpu_tag)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k)	((starpu_tag_t)( (1ULL<<60) | (unsigned long long)(k)))
+#define TAG12(k,i)	((starpu_tag_t)(((2ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
-#define TAG21(k,j)	((starpu_tag)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define TAG21(k,j)	((starpu_tag_t)(((3ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG22(k,i,j)	((starpu_tag)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j)	((starpu_tag_t)(((4ULL<<60) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
-#define PIVOT(k,i)	((starpu_tag)(((5ULL<<60) | (((unsigned long long)(k))<<32)	\
+#define PIVOT(k,i)	((starpu_tag_t)(((5ULL<<60) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
 
 static unsigned no_prio = 0;
@@ -35,7 +35,7 @@ static unsigned no_prio = 0;
  *	Construct the DAG
  */
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;
@@ -75,7 +75,7 @@ static void create_task_pivot(starpu_data_handle_t *dataAp, unsigned nblocks,
 			starpu_tag_declare_deps(PIVOT(k, i), 2, TAG11(k), TAG22(k-1, i, k));
 		}
 		else {
-			starpu_tag *tags = malloc((nblocks - k)*sizeof(starpu_tag));
+			starpu_tag_t *tags = malloc((nblocks - k)*sizeof(starpu_tag_t));
 			
 			tags[0] = TAG11(k);
 			unsigned ind, ind2;
@@ -263,7 +263,7 @@ static double dw_codelet_facto_pivot(starpu_data_handle_t *dataAp,
 	}
 
 	/* we wait the last task (TAG11(nblocks - 1)) and all the pivot tasks */
-	starpu_tag *tags = malloc(nblocks*nblocks*sizeof(starpu_tag));
+	starpu_tag_t *tags = malloc(nblocks*nblocks*sizeof(starpu_tag_t));
 	unsigned ndeps = 0;
 
 	tags[ndeps++] = TAG11(nblocks - 1);

examples/spmv/dw_block_spmv.c

@@ -219,7 +219,7 @@ void launch_spmv_codelets(void)
 				if (index != rowptr[row & ~0x3])
 				{
 					/* this is not the first task in the row */
-					starpu_tag_declare_deps((starpu_tag)taskid, 1, (starpu_tag)(taskid-1));
+					starpu_tag_declare_deps((starpu_tag_t)taskid, 1, (starpu_tag_t)(taskid-1));
 
 					is_entry_tab[taskid] = 0;
 				}

examples/starpufft/starpufft.h

@@ -40,7 +40,7 @@ void *starpufft(malloc)(size_t n); \
 void starpufft(free)(void *p); \
 \
 void starpufft(execute)(starpufft(plan) p, void *in, void *out); \
-starpu_tag starpufft(start)(starpufft(plan) p, void *in, void *out); \
+starpu_tag_t starpufft(start)(starpufft(plan) p, void *in, void *out); \
 \
 void starpufft(destroy_plan)(starpufft(plan) p); \
 \

examples/starpufft/starpufftx.c

@@ -40,7 +40,7 @@ enum steps {
 #define STEP_BITS 3
 #define STEP_SHIFT (NUMBER_SHIFT - STEP_BITS)
 
-#define _STEP_TAG(plan, step, i) (((starpu_tag) plan->number << NUMBER_SHIFT) | ((starpu_tag)(step) << STEP_SHIFT) | (starpu_tag) (i))
+#define _STEP_TAG(plan, step, i) (((starpu_tag_t) plan->number << NUMBER_SHIFT) | ((starpu_tag_t)(step) << STEP_SHIFT) | (starpu_tag_t) (i))
 
 
 #define I_BITS STEP_SHIFT
@@ -158,10 +158,10 @@ compute_roots(STARPUFFT(plan) plan)
 #include "starpufftx1d.c"
 #include "starpufftx2d.c"
 
-starpu_tag
+starpu_tag_t
 STARPUFFT(start)(STARPUFFT(plan) plan, void *_in, void *_out)
 {
-	starpu_tag tag;
+	starpu_tag_t tag;
 	int z;
 
 	plan->in = _in;
@@ -209,7 +209,7 @@ STARPUFFT(execute)(STARPUFFT(plan) plan, void *in, void *out)
 
 	gettimeofday(&start, NULL);
 
-	starpu_tag tag = STARPUFFT(start)(plan, in, out);
+	starpu_tag_t tag = STARPUFFT(start)(plan, in, out);
 	gettimeofday(&submit_tasks, NULL);
 	starpu_tag_wait(tag);
 

examples/starpufft/starpufftx1d.c

@@ -672,7 +672,7 @@ STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 }
 
 /* Actually submit all the tasks. */
-static starpu_tag
+static starpu_tag_t
 STARPUFFT(start1dC2C)(STARPUFFT(plan) plan)
 {
 	STARPU_ASSERT(plan->type == C2C);

examples/starpufft/starpufftx2d.c

@@ -21,7 +21,7 @@
 #define I_SHIFT (I_BITS/2)
 #define J_BITS I_SHIFT
 
-#define STEP_TAG_2D(plan, step, i, j) _STEP_TAG(plan, step, ((starpu_tag) i << I_SHIFT) | (starpu_tag) j)
+#define STEP_TAG_2D(plan, step, i, j) _STEP_TAG(plan, step, ((starpu_tag_t) i << I_SHIFT) | (starpu_tag_t) j)
 
 #ifdef STARPU_USE_CUDA
 /* Twist the full vector into a n2,m2 chunk */
@@ -657,7 +657,7 @@ STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 	return plan;
 }
 
-static starpu_tag
+static starpu_tag_t
 STARPUFFT(start2dC2C)(STARPUFFT(plan) plan)
 {
 	STARPU_ASSERT(plan->type == C2C);

examples/stencil/stencil-blocks.c

@@ -31,26 +31,26 @@ static unsigned *block_sizes_z;
 /*
  * common tag format:
  */
-static starpu_tag tag_common(int z, int dir, int type)
+static starpu_tag_t tag_common(int z, int dir, int type)
 {
-	return (((((starpu_tag)type) << 4) | ((dir+1)/2)) << 32)|(starpu_tag)z;
+	return (((((starpu_tag_t)type) << 4) | ((dir+1)/2)) << 32)|(starpu_tag_t)z;
 }
 
 /* Completion of last update tasks */
-starpu_tag TAG_FINISH(int z)
+starpu_tag_t TAG_FINISH(int z)
 {
 	z = (z + nbz)%nbz;
 
-	starpu_tag tag = tag_common(z, 0, 1);
+	starpu_tag_t tag = tag_common(z, 0, 1);
 	return tag;
 }
 
 /* Completion of the save codelet for MPI send/recv */
-starpu_tag TAG_START(int z, int dir)
+starpu_tag_t TAG_START(int z, int dir)
 {
 	z = (z + nbz)%nbz;
 
-	starpu_tag tag = tag_common(z, dir, 2);
+	starpu_tag_t tag = tag_common(z, dir, 2);
 	return tag;
 }
 

examples/stencil/stencil-tasks.c

@@ -232,7 +232,7 @@ void create_start_task(int z, int dir) {
 	   before we start measuring time */
 	struct starpu_task *wait_init = starpu_task_create();
 	struct block_description *descr = get_block_description(z);
-	starpu_tag tag_init = TAG_INIT_TASK;
+	starpu_tag_t tag_init = TAG_INIT_TASK;
 	wait_init->cl = &null;
 	wait_init->use_tag = 1;
 	wait_init->tag_id = TAG_START(z, dir);

examples/stencil/stencil.h

@@ -83,10 +83,10 @@ struct block_description {
 	struct block_description *boundary_blocks[NDIRS];
 };
 
-#define TAG_INIT_TASK			((starpu_tag)1)
+#define TAG_INIT_TASK			((starpu_tag_t)1)
 
-starpu_tag TAG_FINISH(int z);
-starpu_tag TAG_START(int z, int dir);
+starpu_tag_t TAG_FINISH(int z);
+starpu_tag_t TAG_START(int z, int dir);
 int MPI_TAG0(int z, int iter, int dir);
 int MPI_TAG1(int z, int iter, int dir);
 

examples/tag_example/tag_example.c

@@ -28,7 +28,7 @@
 #endif
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-#define TAG(i, j, iter)	((starpu_tag) ( ((uint64_t)(iter)<<48) |  ((uint64_t)(j)<<24) | (i)) )
+#define TAG(i, j, iter)	((starpu_tag_t) ( ((uint64_t)(iter)<<48) |  ((uint64_t)(j)<<24) | (i)) )
 
 starpu_codelet cl = {};
 

examples/tag_example/tag_example2.c

@@ -28,7 +28,7 @@
 #endif
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-#define TAG(i, iter)	((starpu_tag)  (((uint64_t)iter)<<32 | (i)) )
+#define TAG(i, iter)	((starpu_tag_t)  (((uint64_t)iter)<<32 | (i)) )
 
 starpu_codelet cl = {};
 

examples/tag_example/tag_example3.c

@@ -28,7 +28,7 @@
 #endif
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-#define TAG(i, iter)	((starpu_tag)  (((uint64_t)iter)<<32 | (i)) )
+#define TAG(i, iter)	((starpu_tag_t)  (((uint64_t)iter)<<32 | (i)) )
 
 starpu_codelet cl = {};
 

examples/tag_example/tag_restartable.c

@@ -33,7 +33,7 @@
 #define SLEEP 1
 
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-#define TAG(i, iter)	((starpu_tag)  (((uint64_t)((iter)%Nrolls))<<32 | (i)) )
+#define TAG(i, iter)	((starpu_tag_t)  (((uint64_t)((iter)%Nrolls))<<32 | (i)) )
 
 starpu_codelet cl = {};
 

include/starpu_task.h

@@ -56,7 +56,7 @@
 extern "C" {
 #endif
 
-typedef uint64_t starpu_tag;
+typedef uint64_t starpu_tag_t;
 
 
 typedef void (*starpu_cpu_func_t)(void **, void*);    /* CPU core */
@@ -126,7 +126,7 @@ struct starpu_task {
 	void *callback_arg;
 
 	unsigned use_tag;
-	starpu_tag tag_id;
+	starpu_tag_t tag_id;
 
 	/* options for the task execution */
 	unsigned synchronous; /* if set, a call to push is blocking */
@@ -224,27 +224,27 @@ struct starpu_task {
 /*
  * WARNING ! use with caution ...
  *  In case starpu_tag_declare_deps is passed constant arguments, the caller
- *  must make sure that the constants are casted to starpu_tag. Otherwise,
+ *  must make sure that the constants are casted to starpu_tag_t. Otherwise,
  *  due to integer sizes and argument passing on the stack, the C compiler
  *  might consider the tag *  0x200000003 instead of 0x2 and 0x3 when calling:
  *      "starpu_tag_declare_deps(0x1, 2, 0x2, 0x3)"
  *  Using starpu_tag_declare_deps_array is a way to avoid this problem.
  */
 /* make id depend on the list of ids */
-void starpu_tag_declare_deps(starpu_tag id, unsigned ndeps, ...);
-void starpu_tag_declare_deps_array(starpu_tag id, unsigned ndeps, starpu_tag *array);
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
+void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t *array);
 
 /* task depends on the tasks in task array */
 void starpu_task_declare_deps_array(struct starpu_task *task, unsigned ndeps, struct starpu_task *task_array[]);
 
-int starpu_tag_wait(starpu_tag id);
-int starpu_tag_wait_array(unsigned ntags, starpu_tag *id);
+int starpu_tag_wait(starpu_tag_t id);
+int starpu_tag_wait_array(unsigned ntags, starpu_tag_t *id);
 
 /* The application can feed a tag explicitely */
-void starpu_tag_notify_from_apps(starpu_tag id);
+void starpu_tag_notify_from_apps(starpu_tag_t id);
 
 /* To release resources, tags should be freed after use */
-void starpu_tag_remove(starpu_tag id);
+void starpu_tag_remove(starpu_tag_t id);
 
 /* Initialize a task structure with default values. */
 void starpu_task_init(struct starpu_task *task);

include/starpu_util.h

@@ -218,7 +218,7 @@ void starpu_execute_on_each_worker(void (*func)(void *), void *arg, uint32_t whe
 
 /* This creates (and submits) an empty task that unlocks a tag once all its
  * dependencies are fulfilled. */
-void starpu_create_sync_task(starpu_tag sync_tag, unsigned ndeps, starpu_tag *deps,
+void starpu_create_sync_task(starpu_tag_t sync_tag, unsigned ndeps, starpu_tag_t *deps,
 				void (*callback)(void *), void *callback_arg);
 
 /* Copy the content of the src_handle into the dst_handle handle.  The

mpi/examples/mpi_lu/pxlu.c

@@ -26,27 +26,27 @@
 // 11 21
 // 12 22
 
-#define TAG11(k)	((starpu_tag)( (1ULL<<50) | (unsigned long long)(k)))
-#define TAG12(k,j)	((starpu_tag)(((2ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG11(k)	((starpu_tag_t)( (1ULL<<50) | (unsigned long long)(k)))
+#define TAG12(k,j)	((starpu_tag_t)(((2ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG21(k,i)	((starpu_tag)(((3ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG21(k,i)	((starpu_tag_t)(((3ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
-#define TAG22(k,i,j)	((starpu_tag)(((4ULL<<50) | ((unsigned long long)(k)<<32) 	\
+#define TAG22(k,i,j)	((starpu_tag_t)(((4ULL<<50) | ((unsigned long long)(k)<<32) 	\
 					| ((unsigned long long)(i)<<16)	\
 					| (unsigned long long)(j))))
-#define TAG11_SAVE(k)	((starpu_tag)( (5ULL<<50) | (unsigned long long)(k)))
-#define TAG12_SAVE(k,j)	((starpu_tag)(((6ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG11_SAVE(k)	((starpu_tag_t)( (5ULL<<50) | (unsigned long long)(k)))
+#define TAG12_SAVE(k,j)	((starpu_tag_t)(((6ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG21_SAVE(k,i)	((starpu_tag)(((7ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG21_SAVE(k,i)	((starpu_tag_t)(((7ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
 
-#define TAG11_SAVE_PARTIAL(k)	((starpu_tag)( (8ULL<<50) | (unsigned long long)(k)))
-#define TAG12_SAVE_PARTIAL(k,j)	((starpu_tag)(((9ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG11_SAVE_PARTIAL(k)	((starpu_tag_t)( (8ULL<<50) | (unsigned long long)(k)))
+#define TAG12_SAVE_PARTIAL(k,j)	((starpu_tag_t)(((9ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(j))))
-#define TAG21_SAVE_PARTIAL(k,i)	((starpu_tag)(((10ULL<<50) | (((unsigned long long)(k))<<32)	\
+#define TAG21_SAVE_PARTIAL(k,i)	((starpu_tag_t)(((10ULL<<50) | (((unsigned long long)(k))<<32)	\
 					| (unsigned long long)(i))))
 
-#define STARPU_TAG_INIT	((starpu_tag)(11ULL<<50))
+#define STARPU_TAG_INIT	((starpu_tag_t)(11ULL<<50))
 
 //#define VERBOSE_INIT	1
 
@@ -77,7 +77,7 @@ static struct debug_info *create_debug_info(unsigned i, unsigned j, unsigned k)
 	return info;
 }
 
-static struct starpu_task *create_task(starpu_tag id)
+static struct starpu_task *create_task(starpu_tag_t id)
 {
 	struct starpu_task *task = starpu_task_create();
 		task->cl_arg = NULL;
@@ -90,7 +90,7 @@ static struct starpu_task *create_task(starpu_tag id)
 
 /* Send handle to every node appearing in the mask, and unlock tag once the
  * transfers are done. */
-static void send_data_to_mask(starpu_data_handle_t handle, int *rank_mask, int mpi_tag, starpu_tag tag)
+static void send_data_to_mask(starpu_data_handle_t handle, int *rank_mask, int mpi_tag, starpu_tag_t tag)
 {
 	unsigned cnt = 0;
 
@@ -133,7 +133,7 @@ struct recv_when_done_callback_arg {
 	int source;
 	int mpi_tag;
 	starpu_data_handle_t handle;
-	starpu_tag unlocked_tag;
+	starpu_tag_t unlocked_tag;
 };
 
 static void callback_receive_when_done(void *_arg)
@@ -146,11 +146,11 @@ static void callback_receive_when_done(void *_arg)
 	free(arg);
 }
 
-static void receive_when_deps_are_done(unsigned ndeps, starpu_tag *deps_tags,
+static void receive_when_deps_are_done(unsigned ndeps, starpu_tag_t *deps_tags,
 				int source, int mpi_tag,
 				starpu_data_handle_t handle,
-				starpu_tag partial_tag,
-				starpu_tag unlocked_tag)
+				starpu_tag_t partial_tag,
+				starpu_tag_t unlocked_tag)
 {
 	STARPU_ASSERT(handle != STARPU_POISON_PTR);
 
@@ -185,7 +185,7 @@ static void create_task_11_recv(unsigned k)
 	 * temporary buffer is done : 11_(k-1) can be used by 12_(k-1)j and
 	 * 21(k-1)i with i,j >= k */
 	unsigned ndeps = 0;
-	starpu_tag tag_array[2*nblocks];
+	starpu_tag_t tag_array[2*nblocks];
 	
 #ifdef SINGLE_TMP11
 	unsigned i, j;
@@ -211,8 +211,8 @@ static void create_task_11_recv(unsigned k)
 	starpu_data_handle_t block_handle = STARPU_PLU(get_tmp_11_block_handle)(k);
 #endif
 	int mpi_tag = MPI_TAG11(k);
-	starpu_tag partial_tag = TAG11_SAVE_PARTIAL(k);
-	starpu_tag unlocked_tag = TAG11_SAVE(k);
+	starpu_tag_t partial_tag = TAG11_SAVE_PARTIAL(k);
+	starpu_tag_t unlocked_tag = TAG11_SAVE(k);
 
 //	fprintf(stderr, "NODE %d - 11 (%d) - recv when done ndeps %d - tag array %lx\n", rank, k, ndeps, tag_array[0]);
 	receive_when_deps_are_done(ndeps, tag_array, source, mpi_tag, block_handle, partial_tag, unlocked_tag);
@@ -251,7 +251,7 @@ static void callback_task_11_real(void *_arg)
 
 	/* Send the block to those nodes */
 	starpu_data_handle_t block_handle = STARPU_PLU(get_block_handle)(k, k);
-	starpu_tag tag = TAG11_SAVE(k);
+	starpu_tag_t tag = TAG11_SAVE(k);
 	int mpi_tag = MPI_TAG11(k);
 	send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
 	
@@ -337,7 +337,7 @@ static void create_task_12_recv(unsigned k, unsigned j)
 	 * temporary buffer is done : 12_(k-1)j can be used by 22_(k-1)ij with
 	 * i >= k */
 	unsigned ndeps = 0;
-	starpu_tag tag_array[nblocks];
+	starpu_tag_t tag_array[nblocks];
 	
 #ifdef SINGLE_TMP1221
 	if (k > 0)
@@ -362,8 +362,8 @@ static void create_task_12_recv(unsigned k, unsigned j)
 	starpu_data_handle_t block_handle = STARPU_PLU(get_tmp_12_block_handle)(j,k);
 #endif
 	int mpi_tag = MPI_TAG12(k, j);
-	starpu_tag partial_tag = TAG12_SAVE_PARTIAL(k, j);
-	starpu_tag unlocked_tag = TAG12_SAVE(k, j);
+	starpu_tag_t partial_tag = TAG12_SAVE_PARTIAL(k, j);
+	starpu_tag_t unlocked_tag = TAG12_SAVE(k, j);
 
 	receive_when_deps_are_done(ndeps, tag_array, source, mpi_tag, block_handle, partial_tag, unlocked_tag);
 }
@@ -395,7 +395,7 @@ static void callback_task_12_real(void *_arg)
 
 	/* Send the block to those nodes */
 	starpu_data_handle_t block_handle = STARPU_PLU(get_block_handle)(k, j);
-	starpu_tag tag = TAG12_SAVE(k, j);
+	starpu_tag_t tag = TAG12_SAVE(k, j);
 	int mpi_tag = MPI_TAG12(k, j);
 	send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
 	
@@ -414,7 +414,7 @@ static void create_task_12_real(unsigned k, unsigned j)
 
 	unsigned diag_block_is_local = (get_block_rank(k, k) == rank);
 
-	starpu_tag tag_11_dep; 
+	starpu_tag_t tag_11_dep; 
 
 	/* which sub-data is manipulated ? */
 	starpu_data_handle_t diag_block;
@@ -509,7 +509,7 @@ static void create_task_21_recv(unsigned k, unsigned i)
 	 * temporary buffer is done : 21_(k-1)i can be used by 22_(k-1)ij with
 	 * j >= k */
 	unsigned ndeps = 0;
-	starpu_tag tag_array[nblocks];
+	starpu_tag_t tag_array[nblocks];
 	
 #ifdef SINGLE_TMP1221
 	if (k > 0)
@@ -534,8 +534,8 @@ static void create_task_21_recv(unsigned k, unsigned i)
 	starpu_data_handle_t block_handle = STARPU_PLU(get_tmp_21_block_handle)(i, k);
 #endif
 	int mpi_tag = MPI_TAG21(k, i);
-	starpu_tag partial_tag = TAG21_SAVE_PARTIAL(k, i);
-	starpu_tag unlocked_tag = TAG21_SAVE(k, i);
+	starpu_tag_t partial_tag = TAG21_SAVE_PARTIAL(k, i);
+	starpu_tag_t unlocked_tag = TAG21_SAVE(k, i);
 
 //	fprintf(stderr, "NODE %d - 21 (%d, %d) - recv when done ndeps %d - tag array %lx\n", rank, k, i, ndeps, tag_array[0]);
 	receive_when_deps_are_done(ndeps, tag_array, source, mpi_tag, block_handle, partial_tag, unlocked_tag);
@@ -568,7 +568,7 @@ static void callback_task_21_real(void *_arg)
 
 	/* Send the block to those nodes */
 	starpu_data_handle_t block_handle = STARPU_PLU(get_block_handle)(i, k);
-	starpu_tag tag = TAG21_SAVE(k, i);
+	starpu_tag_t tag = TAG21_SAVE(k, i);
 	int mpi_tag = MPI_TAG21(k, i);
 	send_data_to_mask(block_handle, rank_mask, mpi_tag, tag);
 	
@@ -587,7 +587,7 @@ static void create_task_21_real(unsigned k, unsigned i)
 
 	unsigned diag_block_is_local = (get_block_rank(k, k) == rank);
 
-	starpu_tag tag_11_dep; 
+	starpu_tag_t tag_11_dep; 
 	
 	/* which sub-data is manipulated ? */
 	starpu_data_handle_t diag_block;
@@ -683,7 +683,7 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
 
 	/* produced by TAG21_SAVE(k, i) */ 
 	unsigned block21_is_local = (get_block_rank(i, k) == rank);
-	starpu_tag tag_21_dep;
+	starpu_tag_t tag_21_dep;
 
 	starpu_data_handle_t block21;
 	if (block21_is_local)
@@ -703,7 +703,7 @@ static void create_task_22_real(unsigned k, unsigned i, unsigned j)
 
 	/* produced by TAG12_SAVE(k, j) */
 	unsigned block12_is_local = (get_block_rank(k, j) == rank);
-	starpu_tag tag_12_dep;
+	starpu_tag_t tag_12_dep;
 
 	starpu_data_handle_t block12;
 	if (block12_is_local)
@@ -768,7 +768,7 @@ static void create_task_22(unsigned k, unsigned i, unsigned j)
 //	}
 }
 
-static void wait_tag_and_fetch_handle(starpu_tag tag, starpu_data_handle_t handle)
+static void wait_tag_and_fetch_handle(starpu_tag_t tag, starpu_data_handle_t handle)
 {
 	STARPU_ASSERT(handle != STARPU_POISON_PTR);
 

mpi/starpu_mpi.h

@@ -49,17 +49,17 @@ int starpu_mpi_gather_detached(starpu_data_handle_t *data_handles, int count, in
 /* Some helper functions */
 
 /* When the transfer is completed, the tag is unlocked */
-int starpu_mpi_isend_detached_unlock_tag(starpu_data_handle_t data_handle, int dest, int mpi_tag, MPI_Comm comm, starpu_tag tag);
-int starpu_mpi_irecv_detached_unlock_tag(starpu_data_handle_t data_handle, int source, int mpi_tag, MPI_Comm comm, starpu_tag tag);
+int starpu_mpi_isend_detached_unlock_tag(starpu_data_handle_t data_handle, int dest, int mpi_tag, MPI_Comm comm, starpu_tag_t tag);
+int starpu_mpi_irecv_detached_unlock_tag(starpu_data_handle_t data_handle, int source, int mpi_tag, MPI_Comm comm, starpu_tag_t tag);
 
 /* Asynchronously send an array of buffers, and unlocks the tag once all of
  * them are transmitted. */
 int starpu_mpi_isend_array_detached_unlock_tag(unsigned array_size,
 		starpu_data_handle_t *data_handle, int *dest, int *mpi_tag,
-		MPI_Comm *comm, starpu_tag tag);
+		MPI_Comm *comm, starpu_tag_t tag);
 int starpu_mpi_irecv_array_detached_unlock_tag(unsigned array_size,
 		starpu_data_handle_t *data_handle, int *source, int *mpi_tag,
-		MPI_Comm *comm, starpu_tag tag);
+		MPI_Comm *comm, starpu_tag_t tag);
 
 #ifdef __cplusplus
 }

mpi/starpu_mpi_helper.c

@@ -19,7 +19,7 @@
 
 static void starpu_mpi_unlock_tag_callback(void *arg)
 {
-	starpu_tag *tagptr = arg;
+	starpu_tag_t *tagptr = arg;
 
 	starpu_tag_notify_from_apps(*tagptr);
 
@@ -27,9 +27,9 @@ static void starpu_mpi_unlock_tag_callback(void *arg)
 }
 
 int starpu_mpi_isend_detached_unlock_tag(starpu_data_handle_t data_handle,
-				int dest, int mpi_tag, MPI_Comm comm, starpu_tag tag)
+				int dest, int mpi_tag, MPI_Comm comm, starpu_tag_t tag)
 {
-	starpu_tag *tagptr = malloc(sizeof(starpu_tag));
+	starpu_tag_t *tagptr = malloc(sizeof(starpu_tag_t));
 	*tagptr = tag;
 	
 	return starpu_mpi_isend_detached(data_handle, dest, mpi_tag, comm,
@@ -37,9 +37,9 @@ int starpu_mpi_isend_detached_unlock_tag(starpu_data_handle_t data_handle,
 }
 
 
-int starpu_mpi_irecv_detached_unlock_tag(starpu_data_handle_t data_handle, int source, int mpi_tag, MPI_Comm comm, starpu_tag tag)
+int starpu_mpi_irecv_detached_unlock_tag(starpu_data_handle_t data_handle, int source, int mpi_tag, MPI_Comm comm, starpu_tag_t tag)
 {
-	starpu_tag *tagptr = malloc(sizeof(starpu_tag));
+	starpu_tag_t *tagptr = malloc(sizeof(starpu_tag_t));
 	*tagptr = tag;
 	
 	return starpu_mpi_irecv_detached(data_handle, source, mpi_tag, comm,
@@ -48,7 +48,7 @@ int starpu_mpi_irecv_detached_unlock_tag(starpu_data_handle_t data_handle, int s
 
 struct arg_array {
 	int array_size;
-	starpu_tag tag;
+	starpu_tag_t tag;
 };
 
 static void starpu_mpi_array_unlock_callback(void *_arg)
@@ -66,7 +66,7 @@ static void starpu_mpi_array_unlock_callback(void *_arg)
 
 int starpu_mpi_isend_array_detached_unlock_tag(unsigned array_size,
 		starpu_data_handle_t *data_handle, int *dest, int *mpi_tag,
-		MPI_Comm *comm, starpu_tag tag)
+		MPI_Comm *comm, starpu_tag_t tag)
 {
 	struct arg_array *arg = malloc(sizeof(struct arg_array));
 
@@ -85,7 +85,7 @@ int starpu_mpi_isend_array_detached_unlock_tag(unsigned array_size,
 }
 
 
-int starpu_mpi_irecv_array_detached_unlock_tag(unsigned array_size, starpu_data_handle_t *data_handle, int *source, int *mpi_tag, MPI_Comm *comm, starpu_tag tag)
+int starpu_mpi_irecv_array_detached_unlock_tag(unsigned array_size, starpu_data_handle_t *data_handle, int *source, int *mpi_tag, MPI_Comm *comm, starpu_tag_t tag)
 {
 	struct arg_array *arg = malloc(sizeof(struct arg_array));
 

mpi/tests/mpi_detached_tag.c

@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 
 	for (loop = 0; loop < nloops; loop++)
 	{
-		starpu_tag tag = (starpu_tag)loop;
+		starpu_tag_t tag = (starpu_tag_t)loop;
 
 		if ((loop % 2) == rank)
 		{

socl/src/task.c

@@ -69,7 +69,7 @@ void task_depends_on(starpu_task task, cl_uint num_events, cl_event *events) {
 	if (num_events != 0) {
 		cl_uint i;
 
-		starpu_tag * tags = malloc(num_events * sizeof(starpu_tag));	
+		starpu_tag_t * tags = malloc(num_events * sizeof(starpu_tag_t));	
 
 		if (num_events != 0)
 			DEBUG_MSG("Tag %d depends on %u tags:", task->tag_id, num_events);

src/core/dependencies/htable.c

@@ -18,13 +18,13 @@
 #include <core/dependencies/htable.h>
 #include <string.h>
 
-void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
+void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag_t tag)
 {
 	unsigned currentbit;
 	starpu_htbl_node_t *current_htbl = htbl;
 
 	/* 000000000001111 with STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
+	starpu_tag_t mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
 
 	for(currentbit = 0; currentbit < STARPU_TAG_SIZE; currentbit+=STARPU_HTBL_NODE_SIZE)
 	{
@@ -41,7 +41,7 @@ void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
 
 		unsigned last_currentbit = 
 			STARPU_TAG_SIZE - (currentbit + STARPU_HTBL_NODE_SIZE);
-		starpu_tag offloaded_mask = mask << last_currentbit;
+		starpu_tag_t offloaded_mask = mask << last_currentbit;
 		unsigned current_index = 
 			(tag & (offloaded_mask)) >> (last_currentbit);
 
@@ -55,7 +55,7 @@ void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
  * returns the previous value of the tag, or NULL else
  */
 
-void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag tag, void *entry)
+void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag_t tag, void *entry)
 {
 
 	unsigned currentbit;
@@ -63,7 +63,7 @@ void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag tag, void *e
 	starpu_htbl_node_t *previous_htbl_ptr = NULL;
 
 	/* 000000000001111 with STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
+	starpu_tag_t mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
 
 	for(currentbit = 0; currentbit < STARPU_TAG_SIZE; currentbit+=STARPU_HTBL_NODE_SIZE)
 	{
@@ -84,7 +84,7 @@ void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag tag, void *e
 
 		unsigned last_currentbit = 
 			STARPU_TAG_SIZE - (currentbit + STARPU_HTBL_NODE_SIZE);
-		starpu_tag offloaded_mask = mask << last_currentbit;
+		starpu_tag_t offloaded_mask = mask << last_currentbit;
 		unsigned current_index = 
 			(tag & (offloaded_mask)) >> (last_currentbit);
 
@@ -106,7 +106,7 @@ void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag tag, void *e
 }
 
 /* returns the entry corresponding to the tag and remove it from the htbl */
-void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
+void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag_t tag)
 {
 	/* NB : if the entry is "NULL", we assume this means it is not present XXX */
 	unsigned currentbit;
@@ -116,7 +116,7 @@ void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
 	starpu_htbl_node_t *path[(STARPU_TAG_SIZE + STARPU_HTBL_NODE_SIZE - 1)/(STARPU_HTBL_NODE_SIZE)];
 
 	/* 000000000001111 with STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
+	starpu_tag_t mask = (1<<STARPU_HTBL_NODE_SIZE)-1;
 	int level, maxlevel;
 	unsigned tag_is_present = 1;
 
@@ -137,7 +137,7 @@ void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag tag)
 
 		unsigned last_currentbit = 
 			STARPU_TAG_SIZE - (currentbit + STARPU_HTBL_NODE_SIZE);
-		starpu_tag offloaded_mask = mask << last_currentbit;
+		starpu_tag_t offloaded_mask = mask << last_currentbit;
 		unsigned current_index = 
 			(tag & (offloaded_mask)) >> (last_currentbit);
 		

src/core/dependencies/htable.h

@@ -35,9 +35,9 @@ typedef struct starpu_htbl_node_s {
 	struct starpu_htbl_node_s *children[1<<STARPU_HTBL_NODE_SIZE];
 } starpu_htbl_node_t;
 
-void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag tag);
-void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag tag, void *entry);
-void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag tag);
+void *_starpu_htbl_search_tag(starpu_htbl_node_t *htbl, starpu_tag_t tag);
+void *_starpu_htbl_insert_tag(starpu_htbl_node_t **htbl, starpu_tag_t tag, void *entry);
+void *_starpu_htbl_remove_tag(starpu_htbl_node_t *htbl, starpu_tag_t tag);
 
 
 #endif

src/core/dependencies/tags.c

@@ -60,7 +60,7 @@ static starpu_cg_t *create_cg_tag(unsigned ntags, struct starpu_tag_s *tag)
 	return cg;
 }
 
-static struct starpu_tag_s *_starpu_tag_init(starpu_tag id)
+static struct starpu_tag_s *_starpu_tag_init(starpu_tag_t id)
 {
 	struct starpu_tag_s *tag;
 	tag = (struct starpu_tag_s *) malloc(sizeof(struct starpu_tag_s));
@@ -80,7 +80,7 @@ static struct starpu_tag_s *_starpu_tag_init(starpu_tag id)
 	return tag;
 }
 
-void starpu_tag_remove(starpu_tag id)
+void starpu_tag_remove(starpu_tag_t id)
 {
 	struct starpu_tag_s *tag;
 
@@ -118,7 +118,7 @@ void starpu_tag_remove(starpu_tag id)
 	free(tag);
 }
 
-static struct starpu_tag_s *gettag_struct(starpu_tag id)
+static struct starpu_tag_s *gettag_struct(starpu_tag_t id)
 {
 	pthread_rwlock_wrlock(&tag_global_rwlock);
 
@@ -190,14 +190,14 @@ void _starpu_notify_tag_dependencies(struct starpu_tag_s *tag)
 	_starpu_spin_unlock(&tag->lock);
 }
 
-void starpu_tag_notify_from_apps(starpu_tag id)
+void starpu_tag_notify_from_apps(starpu_tag_t id)
 {
 	struct starpu_tag_s *tag = gettag_struct(id);
 
 	_starpu_notify_tag_dependencies(tag);
 }
 
-void _starpu_tag_declare(starpu_tag id, struct starpu_job_s *job)
+void _starpu_tag_declare(starpu_tag_t id, struct starpu_job_s *job)
 {
 	STARPU_TRACE_TAG(id, job);
 	job->task->use_tag = 1;
@@ -214,7 +214,7 @@ void _starpu_tag_declare(starpu_tag id, struct starpu_job_s *job)
 	_starpu_spin_unlock(&tag->lock);
 }
 
-void starpu_tag_declare_deps_array(starpu_tag id, unsigned ndeps, starpu_tag *array)
+void starpu_tag_declare_deps_array(starpu_tag_t id, unsigned ndeps, starpu_tag_t *array)
 {
 	unsigned i;
 
@@ -229,7 +229,7 @@ void starpu_tag_declare_deps_array(starpu_tag id, unsigned ndeps, starpu_tag *ar
 	
 	for (i = 0; i < ndeps; i++)
 	{
-		starpu_tag dep_id = array[i];
+		starpu_tag_t dep_id = array[i];
 		
 		/* id depends on dep_id
 		 * so cg should be among dep_id's successors*/
@@ -245,7 +245,7 @@ void starpu_tag_declare_deps_array(starpu_tag id, unsigned ndeps, starpu_tag *ar
 	_starpu_spin_unlock(&tag_child->lock);
 }
 
-void starpu_tag_declare_deps(starpu_tag id, unsigned ndeps, ...)
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...)
 {
 	unsigned i;
 	
@@ -262,8 +262,8 @@ void starpu_tag_declare_deps(starpu_tag id, unsigned ndeps, ...)
 	va_start(pa, ndeps);
 	for (i = 0; i < ndeps; i++)
 	{
-		starpu_tag dep_id;
-		dep_id = va_arg(pa, starpu_tag);
+		starpu_tag_t dep_id;
+		dep_id = va_arg(pa, starpu_tag_t);
 	
 		/* id depends on dep_id
 		 * so cg should be among dep_id's successors*/
@@ -281,7 +281,7 @@ void starpu_tag_declare_deps(starpu_tag id, unsigned ndeps, ...)
 }
 
 /* this function may be called by the application (outside callbacks !) */
-int starpu_tag_wait_array(unsigned ntags, starpu_tag *id)
+int starpu_tag_wait_array(unsigned ntags, starpu_tag_t *id)
 {
 	unsigned i;
 	unsigned current;
@@ -347,7 +347,7 @@ int starpu_tag_wait_array(unsigned ntags, starpu_tag *id)
 	return 0;
 }
 
-int starpu_tag_wait(starpu_tag id)
+int starpu_tag_wait(starpu_tag_t id)
 {
 	return starpu_tag_wait_array(1, &id);
 }

src/core/dependencies/tags.h

@@ -23,7 +23,7 @@
 #include <common/starpu_spinlock.h>
 #include <core/dependencies/cg.h>
 
-#define STARPU_TAG_SIZE        (sizeof(starpu_tag)*8)
+#define STARPU_TAG_SIZE        (sizeof(starpu_tag_t)*8)
 
 typedef enum {
 	/* this tag is not declared by any task */
@@ -46,7 +46,7 @@ struct starpu_job_s;
 
 struct starpu_tag_s {
 	struct _starpu_spinlock lock;
-	starpu_tag id; /* an identifier for the task */
+	starpu_tag_t id; /* an identifier for the task */
 	starpu_tag_state state;
 
 	struct starpu_cg_list_s tag_successors;
@@ -57,12 +57,12 @@ struct starpu_tag_s {
 	unsigned is_submitted;
 };
 
-void starpu_tag_declare_deps(starpu_tag id, unsigned ndeps, ...);
+void starpu_tag_declare_deps(starpu_tag_t id, unsigned ndeps, ...);
 
 void _starpu_notify_dependencies(struct starpu_job_s *j);
 void _starpu_notify_tag_dependencies(struct starpu_tag_s *tag);
 
-void _starpu_tag_declare(starpu_tag id, struct starpu_job_s *job);
+void _starpu_tag_declare(starpu_tag_t id, struct starpu_job_s *job);
 void _starpu_tag_set_ready(struct starpu_tag_s *tag);
 
 unsigned _starpu_submit_job_enforce_task_deps(struct starpu_job_s *j);

src/profiling/bound.c

@@ -81,7 +81,7 @@ struct bound_task {
 	/* Unique ID */
 	unsigned long id;
 	/* Tag ID, if any */
-	starpu_tag tag_id;
+	starpu_tag_t tag_id;
 	int use_tag;
 	/* Which codelet has been executed */
 	struct starpu_codelet_t *cl;
@@ -101,8 +101,8 @@ struct bound_task {
 };
 
 struct bound_tag_dep {
-	starpu_tag tag;
-	starpu_tag dep_tag;
+	starpu_tag_t tag;
+	starpu_tag_t dep_tag;
 	struct bound_tag_dep *next;
 };
 
@@ -232,7 +232,7 @@ void _starpu_bound_record(starpu_job_t j)
 	_STARPU_PTHREAD_MUTEX_UNLOCK(&mutex);
 }
 
-void _starpu_bound_tag_dep(starpu_tag id, starpu_tag dep_id)
+void _starpu_bound_tag_dep(starpu_tag_t id, starpu_tag_t dep_id)
 {
 	struct bound_tag_dep *td;
 

src/profiling/bound.h

@@ -28,7 +28,7 @@ extern int _starpu_bound_recording;
 extern void _starpu_bound_record(starpu_job_t j);
 
 /* Record tag dependency: id depends on dep_id */
-extern void _starpu_bound_tag_dep(starpu_tag id, starpu_tag dep_id);
+extern void _starpu_bound_tag_dep(starpu_tag_t id, starpu_tag_t dep_id);
 
 /* Record task dependency: j depends on dep_j */
 extern void _starpu_bound_task_dep(starpu_job_t j, starpu_job_t dep_j);

src/util/starpu_create_sync_task.c

@@ -22,7 +22,7 @@
  * dependencies are fulfilled. */
 /* TODO it would be nice to have such a function without sync_tag in case we
  * just want to execute the callback. */
-void starpu_create_sync_task(starpu_tag sync_tag, unsigned ndeps, starpu_tag *deps,
+void starpu_create_sync_task(starpu_tag_t sync_tag, unsigned ndeps, starpu_tag_t *deps,
 				void (*callback)(void *), void *callback_arg)
 {
 	starpu_tag_declare_deps_array(sync_tag, ndeps, deps);

tests/core/empty_task_sync_point.c

@@ -23,12 +23,12 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-static starpu_tag tagA = 0x0042;
-static starpu_tag tagB = 0x1042;
-static starpu_tag tagC = 0x2042;
-static starpu_tag tagD = 0x3042;
-static starpu_tag tagE = 0x4042;
-static starpu_tag tagF = 0x5042;
+static starpu_tag_t tagA = 0x0042;
+static starpu_tag_t tagB = 0x1042;
+static starpu_tag_t tagC = 0x2042;
+static starpu_tag_t tagD = 0x3042;
+static starpu_tag_t tagE = 0x4042;
+static starpu_tag_t tagF = 0x5042;
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	ret = starpu_task_submit(taskE); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	ret = starpu_task_submit(taskF); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
-	starpu_tag tag_array[2] = {tagE, tagF};
+	starpu_tag_t tag_array[2] = {tagE, tagF};
 	ret = starpu_tag_wait_array(2, tag_array);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_tag_wait_array");
 

tests/core/static_restartable_tag.c

@@ -23,7 +23,7 @@
 #include "../common/helper.h"
 
 static unsigned ntasks = 65536;
-static starpu_tag tag = 0x32;
+static starpu_tag_t tag = 0x32;
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {

tests/core/tag_wait_api.c

@@ -43,7 +43,7 @@ static void callback(void *tag)
 //	fflush(stderr);
 }
 
-static struct starpu_task *create_dummy_task(starpu_tag tag)
+static struct starpu_task *create_dummy_task(starpu_tag_t tag)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -58,20 +58,20 @@ static struct starpu_task *create_dummy_task(starpu_tag tag)
 	return task;
 }
 
-#define tagA	((starpu_tag)0x42)
-#define tagB	((starpu_tag)0x12300)
+#define tagA	((starpu_tag_t)0x42)
+#define tagB	((starpu_tag_t)0x12300)
 
-#define tagC	((starpu_tag)0x32)
-#define tagD	((starpu_tag)0x52)
-#define tagE	((starpu_tag)0x19999)
-#define tagF	((starpu_tag)0x2312)
-#define tagG	((starpu_tag)0x1985)
+#define tagC	((starpu_tag_t)0x32)
+#define tagD	((starpu_tag_t)0x52)
+#define tagE	((starpu_tag_t)0x19999)
+#define tagF	((starpu_tag_t)0x2312)
+#define tagG	((starpu_tag_t)0x1985)
 
-#define tagH	((starpu_tag)0x32234)
-#define tagI	((starpu_tag)0x5234)
-#define tagJ	((starpu_tag)0x199)
-#define tagK	((starpu_tag)0x231234)
-#define tagL	((starpu_tag)0x2345)
+#define tagH	((starpu_tag_t)0x32234)
+#define tagI	((starpu_tag_t)0x5234)
+#define tagJ	((starpu_tag_t)0x199)
+#define tagK	((starpu_tag_t)0x231234)
+#define tagL	((starpu_tag_t)0x2345)
 
 int main(int argc, char **argv)
 {
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 	starpu_tag_declare_deps(tagK, 2, tagH, tagI);
 	starpu_tag_declare_deps(tagL, 2, tagH, tagI);
 
-	starpu_tag tagJKL[3] = {tagJ, tagK, tagL};
+	starpu_tag_t tagJKL[3] = {tagJ, tagK, tagL};
 
 	ret = starpu_task_submit(taskH); STARPU_CHECK_RETURN_VALUE(ret, "starpu_submit");
 	ret = starpu_task_submit(taskI); STARPU_CHECK_RETURN_VALUE(ret, "starpu_submit");

tests/helper/starpu_create_sync_task.c

@@ -34,7 +34,7 @@ static starpu_codelet dummy_codelet =
 	.nbuffers = 0
 };
 
-static int create_dummy_task(starpu_tag tag)
+static int create_dummy_task(starpu_tag_t tag)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -53,17 +53,17 @@ int main(int argc, char **argv)
 	ret = starpu_init(NULL);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	starpu_tag sync_tags[NITER];
+	starpu_tag_t sync_tags[NITER];
 
 	unsigned iter;
 	for (iter = 0; iter < NITER; iter++)
 	{
-		starpu_tag sync_tag = (starpu_tag)iter*100;
+		starpu_tag_t sync_tag = (starpu_tag_t)iter*100;
 
 		sync_tags[iter] = sync_tag;
 
 		unsigned ndeps = 10;
-		starpu_tag deps[ndeps];
+		starpu_tag_t deps[ndeps];
 
 		unsigned d;
 		for (d = 0; d < ndeps; d++)

tests/microbenchs/tasks_overhead.c

@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 		tasks[i].cl_arg = NULL;
 		tasks[i].synchronous = 0;
 		tasks[i].use_tag = 1;
-		tasks[i].tag_id = (starpu_tag)i;
+		tasks[i].tag_id = (starpu_tag_t)i;
 
 		/* we have 8 buffers at most */
 		for (buffer = 0; buffer < nbuffers; buffer++)
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 	gettimeofday(&start_submit, NULL);
 	for (i = 1; i < ntasks; i++)
 	{
-		starpu_tag_declare_deps((starpu_tag)i, 1, (starpu_tag)(i-1));
+		starpu_tag_declare_deps((starpu_tag_t)i, 1, (starpu_tag_t)(i-1));
 
 		ret = starpu_task_submit(&tasks[i]);
 		if (ret == -ENODEV) goto enodev;
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
 
 	/* wait for the execution of the tasks */
 	gettimeofday(&start_exec, NULL);
-	ret = starpu_tag_wait((starpu_tag)(ntasks - 1));
+	ret = starpu_tag_wait((starpu_tag_t)(ntasks - 1));
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_tag_wait");
 	gettimeofday(&end_exec, NULL);
 

tools/dev/rename.sed

@@ -33,7 +33,6 @@ s/\bstarpu_regression_model_t\b/starpu_regression_model/g
 s/\bstarpu_per_arch_perfmodel_t\b/starpu_per_arch_perfmodel/g
 #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
 s/\bstarpu_data_interface_ops_t\b/starpu_data_interface_ops/g
 s/\bstarpu_submit_task\b/starpu_task_submit/g