소스 검색

Fix bogus sizeof use

Samuel Thibault 9 년 전
부모
커밋
1513a493bc

+ 1 - 1
tests/datawizard/interfaces/test_interfaces.c

@@ -425,7 +425,7 @@ create_task(struct starpu_task **taskp, enum starpu_worker_archtype type, int id
 	}
 	factor = -factor;
 	task->cl_arg = &factor;
-	task->cl_arg_size = sizeof(&factor);
+	task->cl_arg_size = sizeof(factor);
 
 	*taskp = task;
 	return 0;

+ 1 - 9
tests/main/subgraph_repeat.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2012-2014  Université de Bordeaux
+ * Copyright (C) 2010, 2012-2015  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -116,26 +116,18 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskA);
 	taskA.cl = &dummy_codelet;
-	taskA.cl_arg = &taskA;
-	taskA.cl_arg_size = sizeof(&taskA);
 	taskA.handles[0] = check_data;
 
 	starpu_task_init(&taskB);
 	taskB.cl = &dummy_codelet;
-	taskB.cl_arg = &taskB;
-	taskB.cl_arg_size = sizeof(&taskB);
 	taskB.handles[0] = check_data;
 
 	starpu_task_init(&taskC);
 	taskC.cl = &dummy_codelet;
-	taskC.cl_arg = &taskC;
-	taskC.cl_arg_size = sizeof(&taskC);
 	taskC.handles[0] = check_data;
 
 	starpu_task_init(&taskD);
 	taskD.cl = &dummy_codelet;
-	taskD.cl_arg = &taskD;
-	taskD.cl_arg_size = sizeof(&taskD);
 	taskD.callback_func = callback_task_D;
 	taskD.handles[0] = check_data;
 

+ 0 - 8
tests/main/subgraph_repeat_regenerate.c

@@ -130,31 +130,23 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskA);
 	taskA.cl = &dummy_codelet;
-	taskA.cl_arg = &taskA;
-	taskA.cl_arg_size = sizeof(&taskA);
 	taskA.regenerate = 0; /* this task will be explicitely resubmitted if needed */
 	taskA.handles[0] = check_data;
 
 	starpu_task_init(&taskB);
 	taskB.cl = &dummy_codelet;
-	taskB.cl_arg = &taskB;
-	taskB.cl_arg_size = sizeof(&taskB);
 	taskB.callback_func = callback_task_B;
 	taskB.regenerate = 1;
 	taskB.handles[0] = check_data;
 
 	starpu_task_init(&taskC);
 	taskC.cl = &dummy_codelet;
-	taskC.cl_arg = &taskC;
-	taskC.cl_arg_size = sizeof(&taskC);
 	taskC.callback_func = callback_task_C;
 	taskC.regenerate = 1;
 	taskC.handles[0] = check_data;
 
 	starpu_task_init(&taskD);
 	taskD.cl = &dummy_codelet;
-	taskD.cl_arg = &taskD;
-	taskD.cl_arg_size = sizeof(&taskD);
 	taskD.callback_func = callback_task_D;
 	taskD.regenerate = 1;
 	taskD.handles[0] = check_data;

+ 1 - 9
tests/main/subgraph_repeat_regenerate_tag.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2014  Université de Bordeaux
+ * Copyright (C) 2010-2015  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -157,8 +157,6 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskA);
 	taskA.cl = &dummy_codelet;
-	taskA.cl_arg = &taskA;
-	taskA.cl_arg_size = sizeof(&taskA);
 	taskA.regenerate = 1; /* this task will be explicitely resubmitted if needed */
 	taskA.use_tag = 1;
 	taskA.tag_id = TAG_A;
@@ -167,8 +165,6 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskB);
 	taskB.cl = &dummy_codelet;
-	taskB.cl_arg = &taskB;
-	taskB.cl_arg_size = sizeof(&taskB);
 	taskB.regenerate = 1;
 	taskB.use_tag = 1;
 	taskB.tag_id = TAG_B;
@@ -177,8 +173,6 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskC);
 	taskC.cl = &dummy_codelet;
-	taskC.cl_arg = &taskC;
-	taskC.cl_arg_size = sizeof(&taskC);
 	taskC.regenerate = 1;
 	taskC.use_tag = 1;
 	taskC.tag_id = TAG_C;
@@ -187,8 +181,6 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskD);
 	taskD.cl = &dummy_codelet;
-	taskD.cl_arg = &taskD;
-	taskD.cl_arg_size = sizeof(&taskD);
 	taskD.callback_func = callback_task_D;
 	taskD.regenerate = 1;
 	taskD.use_tag = 1;

+ 1 - 9
tests/main/subgraph_repeat_tag.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2014  Université de Bordeaux
+ * Copyright (C) 2010-2015  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -139,31 +139,23 @@ int main(int argc, char **argv)
 
 	starpu_task_init(&taskA);
 	taskA.cl = &dummy_codelet;
-	taskA.cl_arg = &taskA;
-	taskA.cl_arg_size = sizeof(&taskA);
 	taskA.regenerate = 0; /* this task will be explicitely resubmitted if needed */
 	taskA.handles[0] = check_data;
 
 	starpu_task_init(&taskB);
 	taskB.cl = &dummy_codelet;
-	taskB.cl_arg = &taskB;
-	taskB.cl_arg_size = sizeof(&taskB);
 	taskB.regenerate = 1;
 	taskB.callback_func = callback_task_B;
 	taskB.handles[0] = check_data;
 
 	starpu_task_init(&taskC);
 	taskC.cl = &dummy_codelet;
-	taskC.cl_arg = &taskC;
-	taskC.cl_arg_size = sizeof(&taskC);
 	taskC.regenerate = 1;
 	taskC.callback_func = callback_task_C;
 	taskC.handles[0] = check_data;
 
 	starpu_task_init(&taskD);
 	taskD.cl = &dummy_codelet;
-	taskD.cl_arg = &taskD;
-	taskD.cl_arg_size = sizeof(&taskD);
 	taskD.callback_func = callback_task_D;
 	taskD.regenerate = 1;
 	taskD.handles[0] = check_data;