Rename the .state field of the starpu_buffer_descr into .handle since

programmers only manipulate "handles" and not states.

examples/cholesky/dw_cholesky.c

@@ -55,7 +55,7 @@ static struct starpu_task * create_task_11(starpu_data_handle dataA, unsigned k)
 	task->cl = &cl11;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, k);
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, k);
 	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
@@ -87,9 +87,9 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 	task->cl = &cl21;	
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, k); 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
+	task->buffers[1].handle = get_sub_data(dataA, 2, k, j); 
 	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
@@ -127,11 +127,11 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 	task->cl = &cl22;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, i); 
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, i); 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
+	task->buffers[1].handle = get_sub_data(dataA, 2, k, j); 
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = get_sub_data(dataA, 2, i, j); 
+	task->buffers[2].handle = get_sub_data(dataA, 2, i, j); 
 	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {

examples/cholesky/dw_cholesky_models.c

@@ -38,7 +38,7 @@ static double core_chol_task_11_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/1000.0f*0.894/0.79176);
 
@@ -53,7 +53,7 @@ static double cuda_chol_task_11_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/5.088633/0.9883);
 
@@ -68,7 +68,7 @@ static double core_chol_task_21_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/7706.674/0.95/0.9965);
 
@@ -83,7 +83,7 @@ static double cuda_chol_task_21_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/87.29520);
 
@@ -98,7 +98,7 @@ static double core_chol_task_22_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/8.0760);
 
@@ -113,7 +113,7 @@ static double cuda_chol_task_22_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/50.0f/10.75/76.30666);
 

examples/cholesky/dw_cholesky_no_stride.c

@@ -72,7 +72,7 @@ static struct starpu_task * create_task_11(unsigned k, unsigned nblocks, sem_t *
 	task->cl = &cl11;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = A_state[k][k];
+	task->buffers[0].handle = A_state[k][k];
 	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
@@ -117,9 +117,9 @@ static void create_task_21(unsigned k, unsigned j)
 	task->cl = &cl21;	
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = A_state[k][k]; 
+	task->buffers[0].handle = A_state[k][k]; 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = A_state[j][k]; 
+	task->buffers[1].handle = A_state[j][k]; 
 	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
@@ -164,11 +164,11 @@ static void create_task_22(unsigned k, unsigned i, unsigned j)
 	task->cl = &cl22;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = A_state[i][k]; 
+	task->buffers[0].handle = A_state[i][k]; 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = A_state[j][k]; 
+	task->buffers[1].handle = A_state[j][k]; 
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = A_state[j][i]; 
+	task->buffers[2].handle = A_state[j][i]; 
 	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {

examples/common/blas_model.c

@@ -32,9 +32,9 @@ double gemm_cost(starpu_buffer_descr *descr)
 	uint32_t nxC, nyC, nxA;
 
 
-	nxC = starpu_get_blas_nx(descr[2].state);
-	nyC = starpu_get_blas_ny(descr[2].state);
-	nxA = starpu_get_blas_nx(descr[0].state);
+	nxC = starpu_get_blas_nx(descr[2].handle);
+	nyC = starpu_get_blas_ny(descr[2].handle);
+	nxA = starpu_get_blas_nx(descr[0].handle);
 
 //	printf("nxC %d nxC %d nxA %d\n", nxC, nyC, nxA);
 

examples/heat/dw_factolu.c

@@ -99,7 +99,7 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 			task->cl = &cl11;
 			task->cl_arg = u11arg;
 
-			task->buffers[0].state =
+			task->buffers[0].handle =
 				get_sub_data(args->dataA, 2, k+1, k+1);
 			task->buffers[0].mode = STARPU_RW;
 	
@@ -138,10 +138,10 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 					u21a->dataA = args->dataA;
 					u21a->sem = args->sem;
 
-					task21->buffers[0].state = 
+					task21->buffers[0].handle = 
 						get_sub_data(args->dataA, 2, u21a->i, u21a->i);
 					task21->buffers[0].mode = STARPU_R;
-					task21->buffers[1].state =
+					task21->buffers[1].handle =
 						get_sub_data(args->dataA, 2, u21a->i, u21a->k);
 					task21->buffers[1].mode = STARPU_RW;
 		
@@ -174,9 +174,9 @@ void dw_callback_v2_codelet_update_u22(void *argcb)
 					u12a->dataA = args->dataA;
 					u12a->sem = args->sem;
 
-					task12->buffers[0].state = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
+					task12->buffers[0].handle = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
 					task12->buffers[0].mode = STARPU_R;
-					task12->buffers[1].state = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
+					task12->buffers[1].handle = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
 					task12->buffers[1].mode = STARPU_RW;
 					
 					starpu_submit_task(task12);
@@ -227,13 +227,13 @@ void dw_callback_v2_codelet_update_u12(void *argcb)
 				u22a->nblocks = nblocks;
 				u22a->sem = args->sem;
 
-				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
+				task22->buffers[0].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
 				task22->buffers[0].mode = STARPU_R;
 
-				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
+				task22->buffers[1].handle = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
 				task22->buffers[1].mode = STARPU_R;
 
-				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
+				task22->buffers[2].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
 				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
@@ -287,13 +287,13 @@ void dw_callback_v2_codelet_update_u21(void *argcb)
 				u22a->nblocks = nblocks;
 				u22a->sem = args->sem;
 
-				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
+				task22->buffers[0].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
 				task22->buffers[0].mode = STARPU_R;
 
-				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
+				task22->buffers[1].handle = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
 				task22->buffers[1].mode = STARPU_R;
 
-				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
+				task22->buffers[2].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
 				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
@@ -357,9 +357,9 @@ void dw_callback_v2_codelet_update_u11(void *argcb)
 					u12a->dataA = args->dataA;
 					u12a->sem = args->sem;
 
-					task12->buffers[0].state = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
+					task12->buffers[0].handle = get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
 					task12->buffers[0].mode = STARPU_R;
-					task12->buffers[1].state = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
+					task12->buffers[1].handle = get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
 					task12->buffers[1].mode = STARPU_RW;
 
 					if (slice == i +1) 
@@ -395,9 +395,9 @@ void dw_callback_v2_codelet_update_u11(void *argcb)
 					u21a->dataA = args->dataA;
 					u21a->sem = args->sem;
 
-					task21->buffers[0].state = get_sub_data(args->dataA, 2, u21a->i, u21a->i);
+					task21->buffers[0].handle = get_sub_data(args->dataA, 2, u21a->i, u21a->i);
 					task21->buffers[0].mode = STARPU_R;
-					task21->buffers[1].state = get_sub_data(args->dataA, 2, u21a->i, u21a->k);
+					task21->buffers[1].handle = get_sub_data(args->dataA, 2, u21a->i, u21a->k);
 					task21->buffers[1].mode = STARPU_RW;
 		
 					if (slice == i +1)
@@ -473,17 +473,17 @@ void dw_callback_codelet_update_u11(void *argcb)
 			u21a->remaining = remaining;
 			u21a->sem = args->sem;
 
-			task12->buffers[0].state = 
+			task12->buffers[0].handle = 
 				get_sub_data(args->dataA, 2, u12a->i, u12a->i); 
 			task12->buffers[0].mode = STARPU_R;
-			task12->buffers[1].state = 
+			task12->buffers[1].handle = 
 				get_sub_data(args->dataA, 2, u12a->k, u12a->i); 
 			task12->buffers[1].mode = STARPU_RW;
 
-			task21->buffers[0].state = 
+			task21->buffers[0].handle = 
 				get_sub_data(args->dataA, 2, u21a->i, u21a->i);
 			task21->buffers[0].mode = STARPU_R;
-			task21->buffers[1].state = 
+			task21->buffers[1].handle = 
 				get_sub_data(args->dataA, 2, u21a->i, u21a->k);
 			task21->buffers[1].mode = STARPU_RW;
 		
@@ -512,7 +512,7 @@ void dw_callback_codelet_update_u22(void *argcb)
 			task->cl = &cl11;
 			task->cl_arg = u11arg;
 
-			task->buffers[0].state = get_sub_data(args->dataA, 2, args->k + 1, args->k + 1);
+			task->buffers[0].handle = get_sub_data(args->dataA, 2, args->k + 1, args->k + 1);
 			task->buffers[0].mode = STARPU_RW;
 	
 		u11arg->dataA = args->dataA;
@@ -563,13 +563,13 @@ void dw_callback_codelet_update_u12_21(void *argcb)
 				u22a->remaining = remaining;
 				u22a->sem = args->sem;
 
-				task22->buffers[0].state = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
+				task22->buffers[0].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->k);
 				task22->buffers[0].mode = STARPU_R;
 
-				task22->buffers[1].state = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
+				task22->buffers[1].handle = get_sub_data(args->dataA, 2, u22a->k, u22a->j);
 				task22->buffers[1].mode = STARPU_R;
 
-				task22->buffers[2].state = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
+				task22->buffers[2].handle = get_sub_data(args->dataA, 2, u22a->i, u22a->j);
 				task22->buffers[2].mode = STARPU_RW;
 				
 				/* schedule that codelet */
@@ -607,7 +607,7 @@ void dw_codelet_facto(starpu_data_handle dataA, unsigned nblocks)
 		task->cl = &cl11;
 		task->cl_arg = args;
 
-		task->buffers[0].state = get_sub_data(dataA, 2, 0, 0);
+		task->buffers[0].handle = get_sub_data(dataA, 2, 0, 0);
 		task->buffers[0].mode = STARPU_RW;
 
 	/* schedule the codelet */
@@ -660,7 +660,7 @@ void dw_codelet_facto_v2(starpu_data_handle dataA, unsigned nblocks)
 		task->cl = &cl11;
 		task->cl_arg = args;
 
-		task->buffers[0].state = get_sub_data(dataA, 2, 0, 0); 
+		task->buffers[0].handle = get_sub_data(dataA, 2, 0, 0); 
 		task->buffers[0].mode = STARPU_RW;
 
 	/* schedule the codelet */

examples/heat/dw_factolu_tag.c

@@ -59,7 +59,7 @@ static struct starpu_task *create_task_11(starpu_data_handle dataA, unsigned k)
 	task->cl = &cl11;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, k);
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, k);
 	task->buffers[0].mode = STARPU_RW;
 
 	/* this is an important task */
@@ -92,9 +92,9 @@ static void create_task_12(starpu_data_handle dataA, unsigned k, unsigned i)
 	task->cl = &cl12;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, k); 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = get_sub_data(dataA, 2, i, k); 
+	task->buffers[1].handle = get_sub_data(dataA, 2, i, k); 
 	task->buffers[1].mode = STARPU_RW;
 
 	if (i == k+1) {
@@ -129,9 +129,9 @@ static void create_task_21(starpu_data_handle dataA, unsigned k, unsigned j)
 	task->cl = &cl21;
 	
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, k, k); 
+	task->buffers[0].handle = get_sub_data(dataA, 2, k, k); 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
+	task->buffers[1].handle = get_sub_data(dataA, 2, k, j); 
 	task->buffers[1].mode = STARPU_RW;
 
 	if (j == k+1) {
@@ -168,11 +168,11 @@ static void create_task_22(starpu_data_handle dataA, unsigned k, unsigned i, uns
 	task->cl = &cl22;
 
 	/* which sub-data is manipulated ? */
-	task->buffers[0].state = get_sub_data(dataA, 2, i, k); 
+	task->buffers[0].handle = get_sub_data(dataA, 2, i, k); 
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = get_sub_data(dataA, 2, k, j); 
+	task->buffers[1].handle = get_sub_data(dataA, 2, k, j); 
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = get_sub_data(dataA, 2, i, j); 
+	task->buffers[2].handle = get_sub_data(dataA, 2, i, j); 
 	task->buffers[2].mode = STARPU_RW;
 
 	if ( (i == k + 1) && (j == k +1) ) {

examples/heat/dw_sparse_cg.c

@@ -171,13 +171,13 @@ void init_cg(struct cg_problem *problem)
 	task1->cl->where = CORE;
 	task1->cl->core_func = core_codelet_func_1;
 	task1->cl->nbuffers = 4;
-		task1->buffers[0].state = problem->ds_matrixA;
+		task1->buffers[0].handle = problem->ds_matrixA;
 		task1->buffers[0].mode = STARPU_R;
-		task1->buffers[1].state = problem->ds_vecx;
+		task1->buffers[1].handle = problem->ds_vecx;
 		task1->buffers[1].mode = STARPU_R;
-		task1->buffers[2].state = problem->ds_vecr;
+		task1->buffers[2].handle = problem->ds_vecr;
 		task1->buffers[2].mode = STARPU_W;
-		task1->buffers[3].state = problem->ds_vecb;
+		task1->buffers[3].handle = problem->ds_vecb;
 		task1->buffers[3].mode = STARPU_R;
 
 	/* d = r */
@@ -185,9 +185,9 @@ void init_cg(struct cg_problem *problem)
 	task2->cl->where = CORE;
 	task2->cl->core_func = core_codelet_func_2;
 	task2->cl->nbuffers = 2;
-		task2->buffers[0].state = problem->ds_vecd;
+		task2->buffers[0].handle = problem->ds_vecd;
 		task2->buffers[0].mode = STARPU_W;
-		task2->buffers[1].state = problem->ds_vecr;
+		task2->buffers[1].handle = problem->ds_vecr;
 		task2->buffers[1].mode = STARPU_R;
 	
 	starpu_tag_declare_deps((starpu_tag_t)2UL, 1, (starpu_tag_t)1UL);
@@ -201,7 +201,7 @@ void init_cg(struct cg_problem *problem)
 	task3->cl->core_func = core_codelet_func_3;
 	task3->cl_arg = problem;
 	task3->cl->nbuffers = 1;
-		task3->buffers[0].state = problem->ds_vecr;
+		task3->buffers[0].handle = problem->ds_vecr;
 		task3->buffers[0].mode = STARPU_R;
 
 	task3->callback_func = iteration_cg;
@@ -232,11 +232,11 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task4->cl->where = CORE;
 	task4->cl->core_func = core_codelet_func_4;
 	task4->cl->nbuffers = 3;
-		task4->buffers[0].state = problem->ds_matrixA;
+		task4->buffers[0].handle = problem->ds_matrixA;
 		task4->buffers[0].mode = STARPU_R;
-		task4->buffers[1].state = problem->ds_vecd;
+		task4->buffers[1].handle = problem->ds_vecd;
 		task4->buffers[1].mode = STARPU_R;
-		task4->buffers[2].state = problem->ds_vecq;
+		task4->buffers[2].handle = problem->ds_vecq;
 		task4->buffers[2].mode = STARPU_W;
 
 	/* alpha = delta_new / ( trans(d) q )*/
@@ -248,9 +248,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task5->cl->core_func = core_codelet_func_5;
 	task5->cl_arg = problem;
 	task5->cl->nbuffers = 2;
-		task5->buffers[0].state = problem->ds_vecd;
+		task5->buffers[0].handle = problem->ds_vecd;
 		task5->buffers[0].mode = STARPU_R;
-		task5->buffers[1].state = problem->ds_vecq;
+		task5->buffers[1].handle = problem->ds_vecq;
 		task5->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 5UL), 1, (starpu_tag_t)(maskiter | 4UL));
@@ -264,9 +264,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task6->cl->core_func = core_codelet_func_6;
 	task6->cl_arg = problem;
 	task6->cl->nbuffers = 2;
-		task6->buffers[0].state = problem->ds_vecx;
+		task6->buffers[0].handle = problem->ds_vecx;
 		task6->buffers[0].mode = STARPU_RW;
-		task6->buffers[1].state = problem->ds_vecd;
+		task6->buffers[1].handle = problem->ds_vecd;
 		task6->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 6UL), 1, (starpu_tag_t)(maskiter | 5UL));
@@ -280,9 +280,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task7->cl->core_func = core_codelet_func_7;
 	task7->cl_arg = problem;
 	task7->cl->nbuffers = 2;
-		task7->buffers[0].state = problem->ds_vecr;
+		task7->buffers[0].handle = problem->ds_vecr;
 		task7->buffers[0].mode = STARPU_RW;
-		task7->buffers[1].state = problem->ds_vecq;
+		task7->buffers[1].handle = problem->ds_vecq;
 		task7->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 7UL), 1, (starpu_tag_t)(maskiter | 6UL));
@@ -296,7 +296,7 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task8->cl->core_func = core_codelet_func_8;
 	task8->cl_arg = problem;
 	task8->cl->nbuffers = 1;
-		task8->buffers[0].state = problem->ds_vecr;
+		task8->buffers[0].handle = problem->ds_vecr;
 		task8->buffers[0].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 8UL), 1, (starpu_tag_t)(maskiter | 7UL));
@@ -310,9 +310,9 @@ void launch_new_cg_iteration(struct cg_problem *problem)
 	task9->cl->core_func = core_codelet_func_9;
 	task9->cl_arg = problem;
 	task9->cl->nbuffers = 2;
-		task9->buffers[0].state = problem->ds_vecd;
+		task9->buffers[0].handle = problem->ds_vecd;
 		task9->buffers[0].mode = STARPU_RW;
-		task9->buffers[1].state = problem->ds_vecr;
+		task9->buffers[1].handle = problem->ds_vecr;
 		task9->buffers[1].mode = STARPU_R;
 
 	starpu_tag_declare_deps((starpu_tag_t)(maskiter | 9UL), 1, (starpu_tag_t)(maskiter | 8UL));

examples/heat/lu_kernels_model.c

@@ -44,7 +44,7 @@ double task_11_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/537.5);
 
@@ -55,7 +55,7 @@ double task_12_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 //	double cost = ((n*n*n)/1744.695);
 	double cost = ((n*n*n)/3210.80);
@@ -69,7 +69,7 @@ double task_21_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 //	double cost = ((n*n*n)/1744.695);
 	double cost = ((n*n*n)/3691.53);
@@ -84,9 +84,9 @@ double task_22_cost(starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 
-	nx = starpu_get_blas_nx(descr[2].state);
-	ny = starpu_get_blas_ny(descr[2].state);
-	nz = starpu_get_blas_ny(descr[0].state);
+	nx = starpu_get_blas_nx(descr[2].handle);
+	ny = starpu_get_blas_ny(descr[2].handle);
+	nz = starpu_get_blas_ny(descr[0].handle);
 
 	double cost = ((nx*ny*nz)/4110.0);
 
@@ -104,7 +104,7 @@ double task_11_cost_cuda(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/1853.7806);
 
@@ -116,7 +116,7 @@ double task_12_cost_cuda(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/42838.5718);
 
@@ -129,7 +129,7 @@ double task_21_cost_cuda(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/49208.667);
 
@@ -143,9 +143,9 @@ double task_22_cost_cuda(starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 
-	nx = starpu_get_blas_nx(descr[2].state);
-	ny = starpu_get_blas_ny(descr[2].state);
-	nz = starpu_get_blas_ny(descr[0].state);
+	nx = starpu_get_blas_nx(descr[2].handle);
+	ny = starpu_get_blas_ny(descr[2].handle);
+	nz = starpu_get_blas_ny(descr[0].handle);
 
 	double cost = ((nx*ny*nz)/57523.560);
 
@@ -163,7 +163,7 @@ double task_11_cost_core(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/537.5);
 
@@ -175,7 +175,7 @@ double task_12_cost_core(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/6668.224);
 
@@ -188,7 +188,7 @@ double task_21_cost_core(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = ((n*n*n)/6793.8423);
 
@@ -202,9 +202,9 @@ double task_22_cost_core(starpu_buffer_descr *descr)
 {
 	uint32_t nx, ny, nz;
 
-	nx = starpu_get_blas_nx(descr[2].state);
-	ny = starpu_get_blas_ny(descr[2].state);
-	nz = starpu_get_blas_ny(descr[0].state);
+	nx = starpu_get_blas_nx(descr[2].handle);
+	ny = starpu_get_blas_ny(descr[2].handle);
+	nz = starpu_get_blas_ny(descr[0].handle);
 
 	double cost = ((nx*ny*nz)/4203.0175);
 

examples/incrementer/incrementer.c

@@ -148,9 +148,9 @@ int main(int argc, char **argv)
 		task->cl_arg = &size;
 		task->cl_arg_size = sizeof(unsigned);
 
-		task->buffers[0].state = my_float_state;
+		task->buffers[0].handle = my_float_state;
 		task->buffers[0].mode = STARPU_RW;
-		task->buffers[1].state = unity_state; 
+		task->buffers[1].handle = unity_state; 
 		task->buffers[1].mode = STARPU_R;
 
 		starpu_submit_task(task);

examples/incrementer/incrementer_runtime.c

@@ -84,7 +84,7 @@ int main(int argc, char **argv)
 		task->callback_func = callback_func;
 		task->callback_arg = &counter;
 
-		task->buffers[0].state = float_array_handle;
+		task->buffers[0].handle = float_array_handle;
 		task->buffers[0].mode = STARPU_RW;
 
 		starpu_submit_task(task);

examples/mult/dw_mult.c

@@ -309,11 +309,11 @@ static void launch_codelets(void)
 			task->use_tag = 1;
 			task->tag_id = tag;
 
-			task->buffers[0].state = get_sub_data(A_handle, 1, tasky);
+			task->buffers[0].handle = get_sub_data(A_handle, 1, tasky);
 			task->buffers[0].mode = STARPU_R;
-			task->buffers[1].state = get_sub_data(B_handle, 1, taskx);
+			task->buffers[1].handle = get_sub_data(B_handle, 1, taskx);
 			task->buffers[1].mode = STARPU_R;
-			task->buffers[2].state = 
+			task->buffers[2].handle = 
 				get_sub_data(C_handle, 2, taskx, tasky);
 			task->buffers[2].mode = STARPU_RW;
 

examples/mult/dw_mult_no_stride.c

@@ -371,11 +371,11 @@ static struct starpu_task *construct_task(unsigned x, unsigned y, unsigned z, un
 	task->use_tag = 1;
 	task->tag_id = TAG(z, y, x, iter);
 
-	task->buffers[0].state = A_state[y][z];
+	task->buffers[0].handle = A_state[y][z];
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = B_state[z][x];
+	task->buffers[1].handle = B_state[z][x];
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = C_state[y][x];
+	task->buffers[2].handle = C_state[y][x];
 	task->buffers[2].mode = STARPU_RW;
 
 	return task;

examples/mult/dw_mult_no_stride_no_tag.c

@@ -397,11 +397,11 @@ static void construct_task(unsigned x, unsigned y, unsigned z, unsigned iter, st
 
 	task->cl = &cl;
 
-	task->buffers[0].state = A_state[y][z];
+	task->buffers[0].handle = A_state[y][z];
 	task->buffers[0].mode = STARPU_R;
-	task->buffers[1].state = B_state[z][x];
+	task->buffers[1].handle = B_state[z][x];
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = C_state[y][x];
+	task->buffers[2].handle = C_state[y][x];
 	task->buffers[2].mode = STARPU_RW;
 
 	task->callback_func = callback_func_3;

examples/pastix-wrappers/starpu-blas-wrapper.c

@@ -334,7 +334,7 @@ void STARPU_CBLK_STRSM(unsigned col)
 
 	j->nbuffers = 1;
 	/* we could be a little more precise actually */
-	j->buffers[0].state = &cblktab[col];
+	j->buffers[0].handle = &cblktab[col];
 	j->buffers[0].mode = STARPU_RW;
 	
 	j->cl->model = &starpu_cblk_strsm;
@@ -478,11 +478,11 @@ void STARPU_COMPUTE_CONTRIB_COMPACT(unsigned col, int dimi, int dimj, int dima,
 
 	j->nbuffers = 3;
 	/* we could be a little more precise actually */
-	j->buffers[0].state = &cblktab[col]; // gaik
+	j->buffers[0].handle = &cblktab[col]; // gaik
 	j->buffers[0].mode = STARPU_R;
-	j->buffers[1].state = get_sub_data(&work_block_1, 1, (ret==2)?0:1);
+	j->buffers[1].handle = get_sub_data(&work_block_1, 1, (ret==2)?0:1);
 	j->buffers[1].mode = STARPU_R;
-	j->buffers[2].state = get_sub_data(&work_block_2, 1, 0);; 
+	j->buffers[2].handle = get_sub_data(&work_block_2, 1, 0);; 
 	j->buffers[2].mode = STARPU_RW; // XXX STARPU_W
 	
 	sem_init(&sem, 0, 0U);
@@ -614,11 +614,11 @@ void STARPU_SGEMM (const char *transa, const char *transb, const int m,
 	j->cl_arg = &args;
 
 	j->nbuffers = 3;
-	j->buffers[0].state = &A_state;
+	j->buffers[0].handle = &A_state;
 	j->buffers[0].mode = STARPU_R;
-	j->buffers[1].state = &B_state;
+	j->buffers[1].handle = &B_state;
 	j->buffers[1].mode = STARPU_R;
-	j->buffers[2].state = &C_state;
+	j->buffers[2].handle = &C_state;
 	j->buffers[2].mode = STARPU_RW;
 	
 	j->cl->model = NULL;

examples/pastix-wrappers/starpu-blas-wrapper.h

@@ -44,9 +44,9 @@ static double transfer_time_htod(unsigned size)
 static double starpu_compute_contrib_compact_core_cost(starpu_buffer_descr *descr)
 {
 	unsigned nx0, ny0, ny2;
-	nx0 = descr[0].state->interface->blas.nx;
-	ny0 = descr[0].state->interface->blas.ny;
-	ny2 = descr[2].state->interface->blas.ny;
+	nx0 = descr[0].handle->interface->blas.nx;
+	ny0 = descr[0].handle->interface->blas.ny;
+	ny2 = descr[2].handle->interface->blas.ny;
 
 	return PERF_GEMM_CPU(nx0-ny0, ny2, ny0); 
 }
@@ -60,9 +60,9 @@ static double starpu_compute_contrib_compact_core_cost(starpu_buffer_descr *desc
 static double starpu_compute_contrib_compact_cuda_cost(starpu_buffer_descr *descr)
 {
 	unsigned nx0, ny0, ny2;
-	nx0 = descr[0].state->interface->blas.nx;
-	ny0 = descr[0].state->interface->blas.ny;
-	ny2 = descr[2].state->interface->blas.ny;
+	nx0 = descr[0].handle->interface->blas.nx;
+	ny0 = descr[0].handle->interface->blas.ny;
+	ny2 = descr[2].handle->interface->blas.ny;
 
 	return PERF_GEMM_GPU(nx0-ny0, ny2, ny0) + OVERHEAD; 
 }
@@ -75,8 +75,8 @@ static double starpu_compute_contrib_compact_cuda_cost(starpu_buffer_descr *desc
 static double starpu_cblk_strsm_cuda_cost(starpu_buffer_descr *descr)
 {
 	unsigned nx, ny;
-	nx = descr[0].state->interface->blas.nx;
-	ny = descr[0].state->interface->blas.ny;
+	nx = descr[0].handle->interface->blas.nx;
+	ny = descr[0].handle->interface->blas.ny;
 
 	return PERF_TRSM_GPU(nx-ny, ny) + OVERHEAD; 
 }
@@ -88,8 +88,8 @@ static double starpu_cblk_strsm_cuda_cost(starpu_buffer_descr *descr)
 static double starpu_cblk_strsm_core_cost(starpu_buffer_descr *descr)
 {
 	unsigned nx, ny;
-	nx = descr[0].state->interface->blas.nx;
-	ny = descr[0].state->interface->blas.ny;
+	nx = descr[0].handle->interface->blas.nx;
+	ny = descr[0].handle->interface->blas.ny;
 
 	return PERF_TRSM_CPU(nx-ny, ny); 
 }

examples/spmv/dw_block_spmv.c

@@ -181,11 +181,11 @@ void launch_spmv_codelets(void)
 				unsigned i = colind[index];
 				unsigned j = row;
 		
-				task->buffers[0].state = get_sub_data(sparse_matrix, 1, part);
+				task->buffers[0].handle = get_sub_data(sparse_matrix, 1, part);
 				task->buffers[0].mode  = STARPU_R;
-				task->buffers[1].state = get_sub_data(vector_in, 1, i);
+				task->buffers[1].handle = get_sub_data(vector_in, 1, i);
 				task->buffers[1].mode = STARPU_R;
-				task->buffers[2].state = get_sub_data(vector_out, 1, j);
+				task->buffers[2].handle = get_sub_data(vector_out, 1, j);
 				task->buffers[2].mode = STARPU_RW;
 
 				/* all tasks in the same row are dependant so that we don't wait too much for data 

examples/spmv/dw_spmv.c

@@ -290,11 +290,11 @@ void call_spmv_codelet_filters(void)
 		task->cl = cl;
 		task->cl_arg = NULL;
 	
-		task->buffers[0].state = get_sub_data(sparse_matrix, 1, part);
+		task->buffers[0].handle = get_sub_data(sparse_matrix, 1, part);
 		task->buffers[0].mode  = STARPU_R;
-		task->buffers[1].state = vector_in;
+		task->buffers[1].handle = vector_in;
 		task->buffers[1].mode = STARPU_R;
-		task->buffers[2].state = get_sub_data(vector_out, 1, part);
+		task->buffers[2].handle = get_sub_data(vector_out, 1, part);
 		task->buffers[2].mode = STARPU_W;
 	
 		starpu_submit_task(task);

examples/strassen/strassen.c

@@ -147,11 +147,11 @@ static void compute_add_sub_op(starpu_data_handle A1, operation op,
 		task->cl_arg = NULL;
 		task->use_tag = 0;
 
-	task->buffers[0].state = C;
+	task->buffers[0].handle = C;
 	task->buffers[0].mode = STARPU_W;
-	task->buffers[1].state = A1;
+	task->buffers[1].handle = A1;
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = A2;
+	task->buffers[2].handle = A2;
 	task->buffers[2].mode = STARPU_R;
 	
 	task->callback_func = callback;

examples/strassen/strassen_models.c

@@ -41,7 +41,7 @@ static double self_add_sub_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (n*n)/10.0f/4.0f/7.75f;
 
@@ -56,7 +56,7 @@ static double cuda_self_add_sub_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (n*n)/10.0f/4.0f;
 
@@ -71,7 +71,7 @@ static double add_sub_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (1.45f*n*n)/10.0f/2.0f;
 
@@ -86,7 +86,7 @@ static double cuda_add_sub_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (1.45f*n*n)/10.0f/2.0f;
 
@@ -102,7 +102,7 @@ static double mult_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/1000.0f/4.11f/0.2588);
 
@@ -117,7 +117,7 @@ static double cuda_mult_cost(starpu_buffer_descr *descr)
 {
 	uint32_t n;
 
-	n = starpu_get_blas_nx(descr[0].state);
+	n = starpu_get_blas_nx(descr[0].handle);
 
 	double cost = (((double)(n)*n*n)/1000.0f/4.11f);
 

examples/strassen2/strassen2.c

@@ -229,11 +229,11 @@ struct starpu_task *compute_add_sub_op(starpu_data_handle C, enum operation op,
 
 	uint64_t j_tag = current_tag++;
 
-	task->buffers[0].state = C;
+	task->buffers[0].handle = C;
 	task->buffers[0].mode = STARPU_W;
-	task->buffers[1].state = A;
+	task->buffers[1].handle = A;
 	task->buffers[1].mode = STARPU_R;
-	task->buffers[2].state = B;
+	task->buffers[2].handle = B;
 	task->buffers[2].mode = STARPU_R;
 
 	task->callback_func = NULL;
@@ -284,9 +284,9 @@ struct starpu_task *compute_self_add_sub_op(starpu_data_handle C, enum operation
 	struct starpu_task *task = starpu_task_create();
 	uint64_t j_tag = current_tag++;
 
-	task->buffers[0].state = C;
+	task->buffers[0].handle = C;
 	task->buffers[0].mode = STARPU_RW;
-	task->buffers[1].state = A;
+	task->buffers[1].handle = A;
 	task->buffers[1].mode = STARPU_R;
 
 	task->callback_func = NULL;

include/starpu-data.h

@@ -32,7 +32,7 @@ typedef enum {
 } starpu_access_mode;
 
 typedef struct starpu_buffer_descr_t {
-	starpu_data_handle state;
+	starpu_data_handle handle;
 	starpu_access_mode mode;
 } starpu_buffer_descr;
 

src/core/dependencies/data-concurrency.c

@@ -111,7 +111,7 @@ static unsigned attempt_to_submit_data_request_from_job(job_t j, unsigned buffer
 {
 	unsigned ret;
 
-	data_state *data = j->task->buffers[buffer_index].state;
+	data_state *data = j->task->buffers[buffer_index].handle;
 	starpu_access_mode mode = j->task->buffers[buffer_index].mode;
 
 	take_mutex(&data->header_lock);

src/core/jobs.c

@@ -30,7 +30,7 @@ size_t job_get_data_size(job_t j)
 	unsigned buffer;
 	for (buffer = 0; buffer < nbuffers; buffer++)
 	{
-		data_state *state = task->buffers[buffer].state;
+		data_state *state = task->buffers[buffer].handle;
 		size += state->ops->get_size(state);
 	}
 

src/core/perfmodel/perfmodel.c

@@ -123,7 +123,7 @@ double data_expected_penalty(struct jobq_s *q, struct job_s *j)
 
 	for (buffer = 0; buffer < nbuffers; buffer++)
 	{
-		data_state *state = j->task->buffers[buffer].state;
+		data_state *state = j->task->buffers[buffer].handle;
 
 		if (!is_data_present_or_requested(state, memory_node))
 		{

src/core/policies/deque-modeling-policy-data-aware.c

@@ -45,7 +45,7 @@ static void update_data_requests(struct jobq_s *q, struct job_s *j)
 
 	for (buffer = 0; buffer < nbuffers; buffer++)
 	{
-		data_state *state = j->task->buffers[buffer].state;
+		data_state *state = j->task->buffers[buffer].handle;
 
 		set_data_requested_flag_if_needed(state, memory_node);
 	}

src/datawizard/coherency.c

@@ -258,7 +258,7 @@ int fetch_codelet_input(starpu_buffer_descr *descrs, starpu_data_interface_t *in
 
 		descr = &descrs[index];
 
-		state = descr->state;
+		state = descr->handle;
 
 		ret = fetch_data(state, descr->mode);
 		if (STARPU_UNLIKELY(ret))
@@ -286,7 +286,7 @@ void push_codelet_output(starpu_buffer_descr *descrs, unsigned nbuffers, uint32_
 	unsigned index;
 	for (index = 0; index < nbuffers; index++)
 	{
-		release_data(descrs[index].state, mask);
+		release_data(descrs[index].handle, mask);
 	}
 
 	TRACE_END_PUSH_OUTPUT(NULL);

src/datawizard/footprint.c

@@ -25,7 +25,7 @@ void compute_buffers_footprint(job_t j)
 
 	for (buffer = 0; buffer < task->cl->nbuffers; buffer++)
 	{
-		data_state *state = task->buffers[buffer].state;
+		data_state *state = task->buffers[buffer].handle;
 
 		STARPU_ASSERT(state->ops);
 		STARPU_ASSERT(state->ops->footprint);

src/drivers/cuda/driver_cuda.c

@@ -95,7 +95,7 @@ void set_function_args(starpu_cuda_codelet_t *args,
 		 * the size of the buffer may be changed if needed */
 		uint8_t argbuffer[128];
 
-		data_state *state = descr[buf].state;
+		data_state *state = descr[buf].handle;
 	
 		/* dump the stack into the buffer */
 		STARPU_ASSERT(state);

src/drivers/gordon/driver_gordon.c

@@ -137,7 +137,7 @@ static void starpu_to_gordon_buffers(job_t j, struct gordon_ppu_job_s *gordon_jo
 				break;
 		}
 
-		struct starpu_data_state_t *state = task->buffers[buffer].state;
+		struct starpu_data_state_t *state = task->buffers[buffer].handle;
 
 		gordon_job->nalloc = 0;
 		gordon_job->nin = nin;

tests/microbenchs/sync_and_notify_data.c

@@ -105,7 +105,7 @@ int main(int argc, char **argv)
 			struct starpu_task *task = starpu_task_create();
 			task->cl = &cl_inc_a;
 
-			task->buffers[0].state = v_handle;
+			task->buffers[0].handle = v_handle;
 			task->buffers[0].mode = STARPU_RW;
 
 			task->synchronous = 1;
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
 			struct starpu_task *task = starpu_task_create();
 			task->cl = &cl_inc_c;
 
-			task->buffers[0].state = v_handle;
+			task->buffers[0].handle = v_handle;
 			task->buffers[0].mode = STARPU_RW;
 
 			task->synchronous = 1;