Przeglądaj źródła

src: let's decrease number of warnings for icc ...

Nathalie Furmento 13 lat temu
rodzic
commit
5bd0025725

+ 0 - 2
include/starpu_data.h

@@ -78,9 +78,7 @@ void starpu_data_release(starpu_data_handle_t handle);
 int starpu_malloc(void **A, size_t dim);
 int starpu_free(void *A);
 
-#ifdef STARPU_GCC_PLUGIN
 void _starpu_free_unref(void *p);
-#endif
 
 /* XXX These macros are provided to avoid breaking old codes. But consider
  * these function names as deprecated. */

+ 2 - 0
src/datawizard/coherency.c

@@ -183,6 +183,8 @@ static int worker_supports_direct_access(unsigned node, unsigned handling_node)
 
 static int link_supports_direct_transfers(starpu_data_handle_t handle, unsigned src_node, unsigned dst_node, unsigned *handling_node)
 {
+	(void) handle; // unused
+
 	/* XXX That's a hack until we get cudaMemcpy3DPeerAsync to work !
 	 * Perhaps not all data interface provide a direct GPU-GPU transfer
 	 * method ! */

+ 1 - 0
src/datawizard/filters.c

@@ -248,6 +248,7 @@ void starpu_data_partition(starpu_data_handle_t initial_handle, struct starpu_da
 	_starpu_spin_unlock(&initial_handle->header_lock);
 }
 
+static
 void _starpu_empty_codelet_function(void *buffers[], void *args)
 {
 	(void) buffers; // unused;

+ 1 - 1
src/drivers/opencl/driver_opencl_utils.c

@@ -143,7 +143,7 @@ char *_starpu_opencl_load_program_source(const char *filename)
         stat(filename, &statbuf);
         source = (char *) malloc(statbuf.st_size + 1);
 
-        for(c=fgetc(fh), x=0 ; c != EOF ; c = fgetc(fh), x++)
+        for(c=(char)fgetc(fh), x=0 ; c != EOF ; c =(char)fgetc(fh), x++)
 	{
 		source[x] = c;
         }

+ 2 - 2
src/sched_policies/detect_combined_workers.c

@@ -333,8 +333,8 @@ static void get_min_max_sizes(unsigned int *min_size, unsigned int *max_size, st
     {
 
 	int nb_cpus = topology->nhwcpus;
-	int sqrt_nb_cpus = sqrt(nb_cpus);
-	short exact = (sqrt_nb_cpus * sqrt_nb_cpus == nb_cpus);
+	int sqrt_nb_cpus = (int)sqrt((double)nb_cpus);
+	int exact = (sqrt_nb_cpus * sqrt_nb_cpus == nb_cpus);
 
 	    if(_min_size == -1)
 	    {

+ 1 - 1
src/sched_policies/parallel_heft.c

@@ -190,7 +190,7 @@ static double compute_ntasks_end(int workerid)
 		for (i = 0; i < worker_size; i++)
 		{
 			/* XXX: this is actually bogus: not all pushed tasks are necessarily parallel... */
-			ntasks_end = STARPU_MAX(ntasks_end, ntasks[combined_workerid[i]] / starpu_worker_get_relative_speedup(perf_arch));
+			ntasks_end = STARPU_MAX(ntasks_end, ntasks[combined_workerid[i]] / (int)starpu_worker_get_relative_speedup(perf_arch));
 		}
 
 		return ntasks_end;

+ 23 - 14
src/top/starpu_top.c

@@ -47,14 +47,17 @@ int _starpu_top_status_get()
 	return starpu_top;
 }
 
-
+static
 unsigned long long int current_timestamp();
 
 /*********************************************
 *****************INIT FUNC********************
 **********************************************/
 
+static
 char *message_for_topdata_init(struct starpu_top_data* data);
+
+static
 char *message_for_topparam_init(struct starpu_top_param* param);
 
 /*
@@ -285,14 +288,14 @@ char *message_for_topdata_init(struct starpu_top_data* data)
 	{
 		case STARPU_TOP_DATA_BOOLEAN:
 			sprintf(message,
-					"BOOL;%d;%s;%d\n",
+					"BOOL;%u;%s;%d\n",
 					data->id,
 					data->name,
 					data->active ? 1 : 0);
 			break;
 		case STARPU_TOP_DATA_INTEGER:
 			sprintf(message,
-					"INT;%d;%s;%d;%d;%d\n",
+					"INT;%u;%s;%d;%d;%d\n",
 					data->id,
 					data->name,
 					data->int_min_value,
@@ -301,7 +304,7 @@ char *message_for_topdata_init(struct starpu_top_data* data)
 			break;
 		case STARPU_TOP_DATA_FLOAT:
 			sprintf(message,
-					"FLOAT;%d;%s;%f;%f;%d\n",
+					"FLOAT;%u;%s;%f;%f;%d\n",
 					data->id,
 					data->name,
 					data->double_min_value,
@@ -322,7 +325,7 @@ char *message_for_topparam_init(struct starpu_top_param* param)
 	case STARPU_TOP_PARAM_BOOLEAN:
 		message = (char *) malloc(256);
 		sprintf(message,
-				"BOOL;%d;%s;%d\n",
+				"BOOL;%u;%s;%d\n",
 				param->id,
 				param->name,
 				(*(int*)(param->value)) ? 1 : 0);
@@ -330,7 +333,7 @@ char *message_for_topparam_init(struct starpu_top_param* param)
 	case STARPU_TOP_PARAM_INTEGER:
 		message = (char *) malloc(256);
 		sprintf(message,
-				"INT;%d;%s;%d;%d;%d\n",param->id,
+				"INT;%u;%s;%d;%d;%d\n",param->id,
 				param->name,
 				param->int_min_value,
 				param->int_max_value,
@@ -339,7 +342,7 @@ char *message_for_topparam_init(struct starpu_top_param* param)
 	case STARPU_TOP_PARAM_FLOAT:
 		message = (char *) malloc(256);
 		sprintf(message,
-				"FLOAT;%d;%s;%f;%f;%f\n",
+				"FLOAT;%u;%s;%f;%f;%f\n",
 				param->id,
 				param->name,
 				param->double_min_value,
@@ -354,7 +357,7 @@ char *message_for_topparam_init(struct starpu_top_param* param)
 		}
 		message = (char *) malloc(256+length);
 		sprintf(message,
-				"ENUM;%d;%s;",
+				"ENUM;%u;%s;",
 				param->id,
 				param->name);
 
@@ -376,6 +379,7 @@ char *message_for_topparam_init(struct starpu_top_param* param)
 	return message;
 }
 
+static
 void starpu_top_enqueue_param(struct starpu_top_param* param)
 {
 	if(starpu_top_first_param == NULL)
@@ -486,7 +490,7 @@ void starpu_top_update_data_boolean(const struct starpu_top_data* data, int valu
 	{
 		char*message = (char *) malloc(256+strlen(data->name));
 		sprintf(message,
-				"U;%d;%d;%lld\n",
+				"U;%u;%d;%lld\n",
 				data->id,
 				(value?1:0),
 				current_timestamp());
@@ -502,7 +506,7 @@ void starpu_top_update_data_integer(const struct starpu_top_data* data, int valu
 	{
 		char*message = (char *) malloc(256+strlen(data->name));
 		sprintf(message,
-				"U;%d;%d;%lld\n",
+				"U;%u;%d;%lld\n",
 				data->id,
 				value,
 				current_timestamp());
@@ -518,7 +522,7 @@ void starpu_top_update_data_float(const struct starpu_top_data* data, double val
 	{
 		char*message = (char *) malloc(256+strlen(data->name));
 		sprintf(message,
-				"U;%d;%f;%lld\n",
+				"U;%u;%f;%lld\n",
 				data->id, value,
 				current_timestamp());
 		_starpu_top_message_add(_starpu_top_mt,message);
@@ -537,7 +541,7 @@ void starpu_top_update_parameter(const struct starpu_top_param* param)
 		case STARPU_TOP_PARAM_INTEGER:
 		case STARPU_TOP_PARAM_ENUM:
 			sprintf(message,
-					"SET;%d;%d;%lld\n",
+					"SET;%u;%d;%lld\n",
 					param->id,
 					*((int*)param->value),
 					current_timestamp());
@@ -545,7 +549,7 @@ void starpu_top_update_parameter(const struct starpu_top_param* param)
 
 		case STARPU_TOP_PARAM_FLOAT:
 			sprintf(message,
-					"SET;%d;%f;%lld\n",
+					"SET;%u;%f;%lld\n",
 					param->id,
 					*((double*)param->value),
 					current_timestamp());
@@ -641,6 +645,7 @@ unsigned long long _starpu_top_timing_timespec_to_ms(const struct timespec *ts)
  **************INPUT PROCESSING**************
  *******************************************/
 
+static
 enum starpu_top_message_type starpu_top_get_message_type(const char* message)
 {
 	if(!strncmp("GO\n", message,3))
@@ -659,13 +664,14 @@ enum starpu_top_message_type starpu_top_get_message_type(const char* message)
 		return TOP_TYPE_UNKNOW;
 }
 
-
+static
 void starpu_top_unlock_starpu()
 {
 	sem_post(&starpu_top_wait_for_go);
 	printf("%s:%d starpu started\n", __FILE__, __LINE__);
 }
 
+static
 void starpu_top_change_data_active(char* message, int active)
 {
 	char* debut = strstr(message, ";")+1;
@@ -676,6 +682,7 @@ void starpu_top_change_data_active(char* message, int active)
 	starpu_top_datas[data_id]->active = active;
 }
 
+static
 void starpu_top_change_parameter_value(const char* message)
 {
 	const char*tmp = strstr(message, ";")+1;
@@ -708,6 +715,7 @@ void starpu_top_change_parameter_value(const char* message)
 		param->callback(param);
 }
 
+static
 void starpu_top_change_debug_mode(const char*message)
 {
 	const char* debut = strstr(message, ";")+1;
@@ -730,6 +738,7 @@ void starpu_top_change_debug_mode(const char*message)
 /*
  * Unlock starpu if it was locked in debug state
 */
+static
 void starpu_top_debug_next_step()
 {
 	_STARPU_PTHREAD_COND_SIGNAL(&starpu_top_wait_for_continue_cond);

+ 3 - 3
src/top/starpu_top_connection.c

@@ -27,6 +27,7 @@
 #  include <netdb.h>
 #endif
 
+#include <top/starpu_top_core.h>
 #include <top/starpu_top_connection.h>
 #include <top/starpu_top_message_queue.h>
 #include <starpu_top.h>
@@ -48,7 +49,7 @@ FILE* starpu_top_socket_fd_write;
 //client socket (file descriptor)
 int starpu_top_socket_fd;
 
-
+static
 void * message_from_ui(void * p)
 {
 	(void) p;
@@ -72,9 +73,9 @@ void * message_from_ui(void * p)
 			return NULL;
 		}
 	}
-	return NULL;
 }
 
+static
 void * message_to_ui(void * p)
 {
 	(void) p;
@@ -95,7 +96,6 @@ void * message_to_ui(void * p)
 			}
 		}
 	}
-	return NULL;
 }
 
 void _starpu_top_communications_threads_launcher()

+ 3 - 1
src/top/starpu_top_core.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011 William Braik, Yann Courtois, Jean-Marie Couteyen, Anthony Roy
- * Copyright (C) 2011 Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012 Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +15,8 @@
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
 
+struct starpu_task;
+
 /*
  * Convert timespec to ms
  */