minor fixes

src/core/perfmodel/energy_model.c

@@ -169,7 +169,7 @@ int starpu_energy_start(int workerid STARPU_ATTRIBUTE_UNUSED, enum starpu_worker
 int starpu_energy_stop(struct starpu_perfmodel *model, struct starpu_task *task, unsigned nimpl, unsigned ntasks, int workerid, enum starpu_worker_archtype archi)
 {
 	double energy = 0.;
-	int retval;
+	int retval = 0;
 	unsigned cpuid = 0;
 	double t2 = starpu_timing_now();
 	double t STARPU_ATTRIBUTE_UNUSED = t2 - t1;
@@ -221,7 +221,7 @@ int starpu_energy_stop(struct starpu_perfmodel *model, struct starpu_task *task,
 	case STARPU_CUDA_WORKER:
 	{
 		STARPU_ASSERT_MSG(workerid != -1, "For CUDA GPUs we measure each GPU separately, please specify a worker\n");
-		int ret = nvmlDeviceGetTotalEnergyConsumption(device, &energy_end );
+		int ret = nvmlDeviceGetTotalEnergyConsumption(device, &energy_end);
 		if (ret != NVML_SUCCESS)
 			return -1;
 		energy = (energy_end - energy_begin) / 1000.;

tests/datawizard/data_register.c

@@ -29,6 +29,7 @@ static struct starpu_data_interface_ops starpu_interface_my_ops;
 
 static void register_my(starpu_data_handle_t handle, unsigned home_node, void *data_interface)
 {
+	(void) home_node;
 	struct my_interface *my_interface = data_interface;
 	unsigned node;
 	for (node = 0; node < STARPU_MAXNODES; node++)

tests/datawizard/interfaces/test_interfaces.c

@@ -405,6 +405,7 @@ static void run_opencl(int async, struct data_interface_test_summary *s)
 
 static void run_mic(int async, struct data_interface_test_summary *s)
 {
+	(void)async;
 	int err;
 
 	err = ram_to_mic();

tests/datawizard/partition_init.c

@@ -20,6 +20,7 @@
 
 void my_func(void *buffers[], void *cl_arg)
 {
+	(void)cl_arg;
 	unsigned nb = STARPU_VECTOR_GET_NX(buffers[0]);
         int *v = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
 
@@ -40,6 +41,7 @@ struct starpu_codelet my_codelet =
 
 void display_func(void *buffers[], void *cl_arg)
 {
+	(void)cl_arg;
 	unsigned nb = STARPU_VECTOR_GET_NX(buffers[0]);
         int *v = (int *)STARPU_VECTOR_GET_PTR(buffers[0]);
 

tests/datawizard/scratch_reuse.c

@@ -33,6 +33,7 @@ int main(void)
 
 static void kernel(void *buffers[], void *cl_args)
 {
+	(void)cl_args;
 	STARPU_ASSERT(STARPU_MATRIX_GET_PTR(buffers[0]) != 0);
 }
 

tests/datawizard/variable_size.c

@@ -115,6 +115,7 @@ static size_t variable_size_get_size(starpu_data_handle_t handle)
 
 static size_t variable_size_get_max_size(starpu_data_handle_t handle)
 {
+	(void)handle;
 	return FULLSIZE;
 }
 

tests/microbenchs/bandwidth.c

@@ -49,6 +49,7 @@ static unsigned interleave(unsigned i);
 /* Initialize the buffer locally */
 void initialize_buffer(void *foo)
 {
+	(void) foo;
 	unsigned id = starpu_worker_get_id();
 #ifdef STARPU_HAVE_POSIX_MEMALIGN
 	int ret = posix_memalign(&buffers[id], getpagesize(), 2*size);
@@ -62,6 +63,7 @@ void initialize_buffer(void *foo)
 /* Actual transfer codelet */
 void bw_func(void *descr[], void *arg)
 {
+	(void)descr;
 	int id = (uintptr_t) arg;
 	void *src = buffers[id];
 	void *dst = (void*) ((uintptr_t)src + size);
@@ -92,6 +94,8 @@ static struct starpu_codelet bw_codelet =
 /* Codelet that waits for completion while doing lots of cpu yields (nop). */
 void nop_func(void *descr[], void *arg)
 {
+	(void)descr;
+	(void)arg;
 	STARPU_PTHREAD_BARRIER_WAIT(&barrier_begin);
 	while (!finished)
 	{
@@ -112,6 +116,8 @@ static struct starpu_codelet nop_codelet =
 /* Codelet that waits for completion while aggressively reading the finished variable. */
 void sync_func(void *descr[], void *arg)
 {
+	(void)descr;
+	(void)arg;
 	STARPU_PTHREAD_BARRIER_WAIT(&barrier_begin);
 	while (!finished)
 	{

tests/openmp/parallel_nested_lock_01.c

@@ -64,11 +64,13 @@ void locked_func_n1(void)
 
 void master_g1(void *arg)
 {
+	(void)arg;
 	starpu_omp_init_nest_lock(&omp_nest_lock);
 }
 
 void master_g2(void *arg)
 {
+	(void)arg;
 	starpu_omp_destroy_nest_lock(&omp_nest_lock);
 }
 

tests/openmp/parallel_simple_lock_01.c

@@ -54,11 +54,13 @@ void locked_func(void)
 
 void master_g1(void *arg)
 {
+	(void)arg;
 	starpu_omp_init_lock(&omp_lock);
 }
 
 void master_g2(void *arg)
 {
+	(void)arg;
 	starpu_omp_destroy_lock(&omp_lock);
 }
 

tests/openmp/task_02.c

@@ -125,6 +125,7 @@ void task_region_g(void *buffers[], void *args)
 
 void master_g1(void *arg)
 {
+	(void)arg;
 	starpu_data_handle_t region_vector_handle;
 	int i;
 
@@ -140,6 +141,7 @@ void master_g1(void *arg)
 
 void master_g2(void *arg)
 {
+	(void)arg;
 	starpu_data_handle_t region_vector_handle;
 	struct starpu_omp_task_region_attr attr;
 	int i;
@@ -178,6 +180,8 @@ void master_g2(void *arg)
 
 void parallel_region_f(void *buffers[], void *args)
 {
+	(void)buffers;
+	(void)args;
 	starpu_omp_master(master_g1, NULL);
 	starpu_omp_barrier();
 	{

tests/perfmodels/opencl_memset.c

@@ -70,10 +70,12 @@ void _memset_opencl(void *buffers[], void *args, const char *name)
 
 void memset_opencl(void *buffers[], void *args, const char *kernel)
 {
+	(void)kernel;
 	_memset_opencl(buffers, args, "_memset_opencl");
 }
 
 void memset0_opencl(void *buffers[], void *args, const char *kernel)
 {
+	(void)kernel;
 	_memset_opencl(buffers, args, "_memset0_opencl");
 }

tests/perfmodels/regression_based_memset.c

@@ -163,6 +163,7 @@ static void test_memset(int nelems, struct starpu_codelet *codelet)
 
 static int test_memset_energy(int nelems, int workerid, int where, enum starpu_worker_archtype archtype, int impl, struct starpu_codelet *codelet)
 {
+	(void)impl;
 	int nloops;
 	int loop;
 

tests/sched_ctx/sched_ctx_hierarchy.c

@@ -17,12 +17,6 @@
 #include <starpu.h>
 #include "../helper.h"
 
-void free_codelet(void *arg)
-{
-	// The argument of the function is automatically freed by StarPU
-	//	free(arg);
-}
-
 void func_cpu_bis(void *descr[], void *_args)
 {
 	(void)descr;
@@ -48,7 +42,6 @@ void func_cpu_bis(void *descr[], void *_args)
 				   STARPU_VALUE, &msg, sizeof(msg),
 				   STARPU_VALUE, &nntasks, sizeof(ntasks),
 				   STARPU_VALUE, &worker_id, sizeof(worker_id),
-				   STARPU_CALLBACK_WITH_ARG, free_codelet, codelet,
 				   0);
 	}
 }
@@ -83,7 +76,6 @@ void func_cpu(void *descr[], void *_args)
 				   STARPU_VALUE, &msg, sizeof(msg),
 				   STARPU_VALUE, &nntasks, sizeof(nntasks),
 				   STARPU_VALUE, &worker_id, sizeof(worker_id),
-				   STARPU_CALLBACK_WITH_ARG, free_codelet, codelet,
 				   0);
 	}
 }