fix warnings

include/starpu.h

@@ -83,7 +83,7 @@ struct starpu_conf
 
 	const char *sched_policy_name;
 	struct starpu_sched_policy *sched_policy;
-	void (*sched_policy_init)(void);
+	void (*sched_policy_init)(unsigned);
 
 	int ncpus;
 	int ncuda;

src/core/perfmodel/multiple_regression.c

@@ -232,7 +232,7 @@ int dgels_multiple_reg_coeff(double *mpar, double *my, long nn, unsigned ncoeff,
 	}
 
 	/* Copy computed coefficients */
-	for(i=0; i<ncoeff; i++)
+	for(i=0; i<(int) ncoeff; i++)
 		coeff[i] = Y[i];
 
 	free(X);

src/core/perfmodel/perfmodel_history.c

@@ -1410,7 +1410,7 @@ docal:
 		char archname[32];
 
 		starpu_perfmodel_get_arch_name(arch, archname, sizeof(archname), nimpl);
-		_STARPU_DISP("Warning: model %s is not calibrated enough for %s size %ld (only %u measurements), forcing calibration for this run. Use the STARPU_CALIBRATE environment variable to control this.\n", model->symbol, archname, j->task?_starpu_job_get_data_size(model, arch, nimpl, j):-1, entry ? entry->nsample : 0);
+		_STARPU_DISP("Warning: model %s is not calibrated enough for %s size %ld (only %u measurements), forcing calibration for this run. Use the STARPU_CALIBRATE environment variable to control this.\n", model->symbol, archname, j->task?(long int)_starpu_job_get_data_size(model, arch, nimpl, j):-1, entry ? entry->nsample : 0);
 		_starpu_set_calibrate_flag(1);
 		model->benchmarking = 1;
 	}

src/core/sched_ctx.c

@@ -472,7 +472,7 @@ struct _starpu_sched_ctx* _starpu_create_sched_ctx(struct starpu_sched_policy *p
 						   int min_prio_set, int min_prio,
 						   int max_prio_set, int max_prio,
 						   unsigned awake_workers,
-						   void (*sched_policy_init)(void),
+						   void (*sched_policy_init)(unsigned),
 						   void * user_data)
 {
 	struct _starpu_machine_config *config = (struct _starpu_machine_config *)_starpu_get_machine_config();
@@ -756,7 +756,7 @@ unsigned starpu_sched_ctx_create(int *workerids, int nworkers, const char *sched
 	unsigned hierarchy_level = 0;
 	unsigned nesting_sched_ctx = STARPU_NMAX_SCHED_CTXS;
 	unsigned awake_workers = 0;
-	void (*init_sched)(void) = NULL;
+	void (*init_sched)(unsigned) = NULL;
 
 	va_start(varg_list, sched_ctx_name);
 	while ((arg_type = va_arg(varg_list, int)) != 0)
@@ -795,7 +795,7 @@ unsigned starpu_sched_ctx_create(int *workerids, int nworkers, const char *sched
 		}
 		else if (arg_type == STARPU_SCHED_CTX_POLICY_INIT)
 		{
-			init_sched = va_arg(varg_list, void(*)(void));
+			init_sched = va_arg(varg_list, void(*)(unsigned));
 		}
 		else if (arg_type == STARPU_SCHED_CTX_USER_DATA)
 		{
@@ -854,7 +854,7 @@ int fstarpu_sched_ctx_create(int *workerids, int nworkers, const char *sched_ctx
 	unsigned hierarchy_level = 0;
 	unsigned nesting_sched_ctx = STARPU_NMAX_SCHED_CTXS;
 	unsigned awake_workers = 0;
-	void (*init_sched)(void) = NULL;
+	void (*init_sched)(unsigned) = NULL;
 
 	while (arglist[arg_i] != NULL)
 	{

src/core/sched_ctx.h

@@ -184,7 +184,7 @@ void _starpu_init_all_sched_ctxs(struct _starpu_machine_config *config);
 /* allocate all structures belonging to a context */
 struct _starpu_sched_ctx*  _starpu_create_sched_ctx(struct starpu_sched_policy *policy, int *workerid, int nworkerids, unsigned is_init_sched, const char *sched_name,
 						    int min_prio_set, int min_prio,
-						    int max_prio_set, int max_prio, unsigned awake_workers, void (*sched_policy_init)(void), void *user_data);
+						    int max_prio_set, int max_prio, unsigned awake_workers, void (*sched_policy_init)(unsigned), void *user_data);
 
 /* delete all sched_ctx */
 void _starpu_delete_all_sched_ctxs();

src/profiling/bound.c

@@ -926,7 +926,7 @@ void starpu_bound_print_mps(FILE *output)
 			for (t = 0, tp = task_pools; tp; t++, tp = tp->next)
 				if (!isnan(times[w*nt+t]))
 				{
-					char name[9];
+					char name[23];
 					snprintf(name, sizeof(name), "W%dT%d", w, t);
 					fprintf(output,"    %-8s  W%-7d  %12f\n", name, w, times[w*nt+t]);
 					fprintf(output,"    %-8s  T%-7d  %12d\n", name, t, 1);

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -1002,7 +1002,7 @@ static void initialize_dmda_sorted_policy(unsigned sched_ctx_id)
 static void deinitialize_dmda_policy(unsigned sched_ctx_id)
 {
 	struct _starpu_dmda_data *dt = (struct _starpu_dmda_data*)starpu_sched_ctx_get_policy_data(sched_ctx_id);
-#if STARPU_VERBOSE
+#ifdef STARPU_VERBOSE
 	{
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	long int modelled_task_cnt = dt->total_task_cnt - dt->eager_task_cnt;

src/util/file.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux
+ * Copyright (C) 2010, 2016  Université de Bordeaux
  * Copyright (C) 2010, 2011  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@ void _starpu_drop_comments(FILE *f)
 					ret = fgets(s, sizeof(s), f);
 				}
 				while (ret && (!strchr(s, '\n')));
+				continue;
 			}
 			case '\n':
 				continue;