Browse Source

src: fix minor warnings (detected by compiler icc)

Nathalie Furmento 13 years ago
parent
commit
fd84a18ae7

+ 1 - 1
src/core/jobs.h

@@ -128,7 +128,7 @@ LIST_TYPE(starpu_job,
 	/* Parallel workers may have to synchronize before/after the execution of a parallel task. */
 	pthread_barrier_t before_work_barrier;
 	pthread_barrier_t after_work_barrier;
-);
+)
 
 /* Create an internal starpu_job_t structure to encapsulate the task. */
 starpu_job_t __attribute__((malloc)) _starpu_job_create(struct starpu_task *task);

+ 2 - 3
src/core/perfmodel/perfmodel_history.c

@@ -206,10 +206,9 @@ static void parse_per_arch_model_file(FILE *f, struct starpu_per_arch_perfmodel_
 
 static void parse_arch(FILE *f, struct starpu_perfmodel_t *model, unsigned scan_history, unsigned archmin, unsigned archmax, int skiparch)
 {
-	unsigned arch, impl;
 	struct starpu_per_arch_perfmodel_t dummy;
-	int nimpls, implmax, skipimpl;
-	unsigned ret;
+	int nimpls, implmax, skipimpl, impl;
+	unsigned ret, arch;
 	
 
 	for (arch = archmin; arch < archmax; arch++) {

+ 1 - 1
src/datawizard/coherency.h

@@ -79,7 +79,7 @@ LIST_TYPE(starpu_data_replicate,
 	 */
 	uint8_t requested[STARPU_MAXNODES];
 	struct starpu_data_request_s *request[STARPU_MAXNODES];
-);
+)
 
 struct starpu_data_requester_list_s;
 

+ 3 - 3
src/datawizard/data_request.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011  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
@@ -64,7 +64,7 @@ LIST_TYPE(starpu_data_request,
 #ifdef STARPU_USE_FXT
 	unsigned com_id;
 #endif
-);
+)
 
 /* Everyone that wants to access some piece of data will post a request.
  * Not only StarPU internals, but also the application may put such requests */
@@ -84,7 +84,7 @@ LIST_TYPE(starpu_data_requester,
 	 */
 	void (*ready_data_callback)(void *argcb);
 	void *argcb;
-);
+)
 
 void _starpu_init_data_request_lists(void);
 void _starpu_deinit_data_request_lists(void);

+ 0 - 2
src/drivers/opencl/driver_opencl.c

@@ -268,8 +268,6 @@ cl_int _starpu_opencl_copy_opencl_to_ram_async_sync(cl_mem buffer, unsigned src_
                         return err;
                 }
         }
-
-        return CL_SUCCESS;
 }
 
 cl_int _starpu_opencl_copy_opencl_to_ram(cl_mem buffer, unsigned src_node STARPU_ATTRIBUTE_UNUSED, void *ptr, unsigned dst_node STARPU_ATTRIBUTE_UNUSED, size_t size, size_t offset, cl_event *event)

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

@@ -410,8 +410,8 @@ void starpu_opencl_display_error(const char *func, const char *file, int line, c
 		break;
 	}
 	if (msg)
-		printf("oops in %s (%s:%u) (%s) ... <%s> (%d) \n", func, file, line, msg, errormsg, status);
+		printf("oops in %s (%s:%d) (%s) ... <%s> (%d) \n", func, file, line, msg, errormsg, status);
 	else
-		printf("oops in %s (%s:%u) ... <%s> (%d) \n", func, file, line, errormsg, status);
+		printf("oops in %s (%s:%d) ... <%s> (%d) \n", func, file, line, errormsg, status);
 
 }

+ 2 - 0
src/sched_policies/detect_combined_workers.c

@@ -1,6 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010-2011  Université de Bordeaux 1
+ * Copyright (C) 2011       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
@@ -18,6 +19,7 @@
 #include <starpu.h>
 #include <common/utils.h>
 #include <core/workers.h>
+#include <math.h>
 
 #ifdef STARPU_HAVE_HWLOC
 #include <hwloc.h>

+ 1 - 1
src/sched_policies/heft.c

@@ -51,7 +51,7 @@ const float gamma_maximum=10000.0;
 const float idle_power_minimum=0;
 const float idle_power_maximum=10000.0;
 
-void param_modified(struct starputop_param_t* d){
+static void param_modified(struct starputop_param_t* d){
 	//just to show parameter modification
 	fprintf(stderr,"%s has been modified : alpha=%f|beta=%f|gamma=%f|idle_power=%f !\n", 
 		d->name, alpha,beta,_gamma,idle_power);

+ 1 - 1
src/top/starpu_top.c

@@ -114,7 +114,7 @@ static void starputop_send_devices_info()
 		char dev_name[64];
 		starputop_get_device_type(i,dev_type);
 		starpu_worker_get_name(i, dev_name,64);
-		snprintf(message, 128, "%d;%s;%s\n", i, dev_type, dev_name);
+		snprintf(message, 128, "%u;%s;%s\n", i, dev_type, dev_name);
 		starputop_message_add(starputop_mt,message);    
 	}