Browse Source

fixes following cppcheck warnings

Nathalie Furmento 8 years ago
parent
commit
73c19b8047

+ 1 - 1
src/core/jobs.c

@@ -713,7 +713,7 @@ int _starpu_push_local_task(struct _starpu_worker *worker, struct starpu_task *t
 
 
 	if (task->execute_on_a_specific_worker && task->workerorder)
 	if (task->execute_on_a_specific_worker && task->workerorder)
 	{
 	{
-		STARPU_ASSERT_MSG(task->workerorder >= worker->current_ordered_task_order, "worker order values must not have duplicates (%u pushed to worker %d, but %d already passed)", task->workerorder, worker->workerid, worker->current_ordered_task_order);
+		STARPU_ASSERT_MSG(task->workerorder >= worker->current_ordered_task_order, "worker order values must not have duplicates (%u pushed to worker %d, but %u already passed)", task->workerorder, worker->workerid, worker->current_ordered_task_order);
 		/* Put it in the ordered task ring */
 		/* Put it in the ordered task ring */
 		unsigned needed = task->workerorder - worker->current_ordered_task_order + 1;
 		unsigned needed = task->workerorder - worker->current_ordered_task_order + 1;
 		if (worker->local_ordered_tasks_size < needed)
 		if (worker->local_ordered_tasks_size < needed)

+ 1 - 1
src/core/sched_ctx.c

@@ -1355,7 +1355,7 @@ int _starpu_nworkers_able_to_execute_task(struct starpu_task *task, struct _star
 	while(workers->has_next(workers, &it))
 	while(workers->has_next(workers, &it))
 	{
 	{
 		unsigned worker = workers->get_next(workers, &it);
 		unsigned worker = workers->get_next(workers, &it);
-		STARPU_ASSERT_MSG(worker < STARPU_NMAXWORKERS, "worker id %d", worker);
+		STARPU_ASSERT_MSG(worker < STARPU_NMAXWORKERS, "worker id %u", worker);
 		if (starpu_worker_can_execute_task_first_impl(worker, task, NULL))
 		if (starpu_worker_can_execute_task_first_impl(worker, task, NULL))
 			nworkers++;
 			nworkers++;
 	}
 	}

+ 2 - 2
src/core/topology.c

@@ -892,7 +892,7 @@ _starpu_init_mic_config (struct _starpu_machine_config *config,
 
 
 	topology->nmiccores[mic_idx] = nmiccores;
 	topology->nmiccores[mic_idx] = nmiccores;
 	STARPU_ASSERT_MSG(topology->nmiccores[mic_idx] + topology->nworkers <= STARPU_NMAXWORKERS,
 	STARPU_ASSERT_MSG(topology->nmiccores[mic_idx] + topology->nworkers <= STARPU_NMAXWORKERS,
-			  "topology->nmiccores[mic_idx(%d)] (%d) + topology->nworkers (%d) <= STARPU_NMAXWORKERS (%d)",
+			  "topology->nmiccores[mic_idx(%u)] (%u) + topology->nworkers (%u) <= STARPU_NMAXWORKERS (%d)",
 			  mic_idx, topology->nmiccores[mic_idx], topology->nworkers, STARPU_NMAXWORKERS);
 			  mic_idx, topology->nmiccores[mic_idx], topology->nworkers, STARPU_NMAXWORKERS);
 
 
 	/* _starpu_initialize_workers_mic_deviceid (config); */
 	/* _starpu_initialize_workers_mic_deviceid (config); */
@@ -957,7 +957,7 @@ _starpu_init_mpi_config (struct _starpu_machine_config *config,
 
 
         topology->nmpicores[mpi_idx] = nmpicores;
         topology->nmpicores[mpi_idx] = nmpicores;
         STARPU_ASSERT_MSG(topology->nmpicores[mpi_idx] + topology->nworkers <= STARPU_NMAXWORKERS,
         STARPU_ASSERT_MSG(topology->nmpicores[mpi_idx] + topology->nworkers <= STARPU_NMAXWORKERS,
-                        "topology->nmpicores[mpi_idx(%d)] (%d) + topology->nworkers (%d) <= STARPU_NMAXWORKERS (%d)",
+                        "topology->nmpicores[mpi_idx(%u)] (%u) + topology->nworkers (%u) <= STARPU_NMAXWORKERS (%d)",
                         mpi_idx, topology->nmpicores[mpi_idx], topology->nworkers, STARPU_NMAXWORKERS);
                         mpi_idx, topology->nmpicores[mpi_idx], topology->nworkers, STARPU_NMAXWORKERS);
 
 
         mpi_worker_set[mpi_idx].workers = &config->workers[topology->nworkers];
         mpi_worker_set[mpi_idx].workers = &config->workers[topology->nworkers];

+ 1 - 1
src/datawizard/interfaces/data_interface.c

@@ -965,7 +965,7 @@ static void _starpu_data_invalidate(void *data)
 		unsigned i, j, nnodes = starpu_memory_nodes_get_count();
 		unsigned i, j, nnodes = starpu_memory_nodes_get_count();
 		for (i = 0; i < nnodes; i++)
 		for (i = 0; i < nnodes; i++)
 			for (j = 0; j < nnodes; j++)
 			for (j = 0; j < nnodes; j++)
-				STARPU_ASSERT_MSG(!handle->per_node[i].request[j], "request for handle %p pending from %d to %d while invalidating data!", handle, j, i);
+				STARPU_ASSERT_MSG(!handle->per_node[i].request[j], "request for handle %p pending from %u to %u while invalidating data!", handle, j, i);
 	}
 	}
 #endif
 #endif
 
 

+ 1 - 1
tests/disk/mem_reclaim.c

@@ -106,7 +106,7 @@ static void check(void *buffers[], void *args)
 	unsigned *val = (unsigned*) STARPU_VECTOR_GET_PTR(vector);
 	unsigned *val = (unsigned*) STARPU_VECTOR_GET_PTR(vector);
 	unsigned i;
 	unsigned i;
 	starpu_codelet_unpack_args(args, &i);
 	starpu_codelet_unpack_args(args, &i);
-	STARPU_ASSERT_MSG(*val == values[i], "Incorrect value. Value %u should be %u (index %d)", *val, values[i], i);
+	STARPU_ASSERT_MSG(*val == values[i], "Incorrect value. Value %u should be %u (index %u)", *val, values[i], i);
 }
 }
 
 
 static struct starpu_codelet zero_cl =
 static struct starpu_codelet zero_cl =

+ 4 - 2
tests/main/combined_workers/bfs/bfs.cpp

@@ -29,7 +29,8 @@
 
 
 extern void omp_bfs_func(void *buffers[], void *_args);
 extern void omp_bfs_func(void *buffers[], void *_args);
 
 
-void Usage(int argc, char**argv){
+void Usage(int argc, char**argv)
+{
 	fprintf(stderr,"Usage: %s <input_file>\n", argv[0]);
 	fprintf(stderr,"Usage: %s <input_file>\n", argv[0]);
 }
 }
 
 
@@ -146,7 +147,8 @@ int main( int argc, char** argv)
 	starpu_data_handle_t graph_visited_handle;
 	starpu_data_handle_t graph_visited_handle;
 	starpu_data_handle_t cost_handle;
 	starpu_data_handle_t cost_handle;
 
 
-	if(argc != 2){
+	if(argc != 2)
+	{
 		Usage(argc, argv);
 		Usage(argc, argv);
 		exit(1);
 		exit(1);
 	}
 	}