fixes warnings detected by icc

src/common/barrier.c

@@ -28,6 +28,7 @@ int _starpu_barrier_init(_starpu_barrier_t *barrier, int count)
 	return 0;
 }
 
+static
 int _starpu_barrier_test(_starpu_barrier_t *barrier)
 {
     /*

src/common/fxt.c

@@ -19,6 +19,7 @@
 #include <common/config.h>
 #include <common/utils.h>
 #include <starpu_util.h>
+#include <starpu_profiling.h>
 
 #ifdef STARPU_USE_FXT
 #include <common/fxt.h>

src/common/fxt.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
@@ -123,12 +123,12 @@ do {									\
 	size_t len = strlen((str)) + 1;					\
 	unsigned nbargs = 3 + (len + sizeof(unsigned long) - 1)/(sizeof(unsigned long));\
 	size_t total_len = FUT_SIZE(nbargs);				\
-	unsigned long *args =						\
+	unsigned long *futargs =						\
 		fut_getstampedbuffer(FUT_CODE(CODE, nbargs), total_len);\
-	*(args++) = (unsigned long)(P1);				\
-	*(args++) = (unsigned long)(P2);				\
-	*(args++) = (unsigned long)(P3);				\
-	sprintf((char *)args, "%s", str);				\
+	*(futargs++) = (unsigned long)(P1);				\
+	*(futargs++) = (unsigned long)(P2);				\
+	*(futargs++) = (unsigned long)(P3);				\
+	sprintf((char *)futargs, "%s", str);				\
 } while (0);
 
 #define STARPU_FUT_DO_PROBE4STR(CODE, P1, P2, P3, P4, str)		\
@@ -137,13 +137,13 @@ do {									\
 	size_t len = strlen((str)) + 1;					\
 	unsigned nbargs = 4 + (len + sizeof(unsigned long) - 1)/(sizeof(unsigned long));\
 	size_t total_len = FUT_SIZE(nbargs);				\
-	unsigned long *args =						\
+	unsigned long *futargs =						\
 		fut_getstampedbuffer(FUT_CODE(CODE, nbargs), total_len);\
-	*(args++) = (unsigned long)(P1);				\
-	*(args++) = (unsigned long)(P2);				\
-	*(args++) = (unsigned long)(P3);				\
-	*(args++) = (unsigned long)(P4);				\
-	sprintf((char *)args, "%s", str);				\
+	*(futargs++) = (unsigned long)(P1);				\
+	*(futargs++) = (unsigned long)(P2);				\
+	*(futargs++) = (unsigned long)(P3);				\
+	*(futargs++) = (unsigned long)(P4);				\
+	sprintf((char *)futargs, "%s", str);				\
 } while (0);
 
 

src/core/jobs.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010, 2011  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
@@ -393,10 +393,11 @@ const char *_starpu_get_model_name(starpu_job_t j)
             && task->cl->model
             && task->cl->model->symbol)
                 return task->cl->model->symbol;
-#ifdef STARPU_USE_FXT
         else {
+#ifdef STARPU_USE_FXT
                 return j->model_name;
-        }
+#else
+                return NULL;
 #endif
-        return NULL;
+        }
 }

src/core/perfmodel/perfmodel_bus.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010-2011  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
@@ -574,7 +574,7 @@ static void write_bus_affinity_file_content(void)
 
         fprintf(f, "# GPU\t");
 	for (cpu = 0; cpu < ncpus; cpu++)
-		fprintf(f, "CPU%d\t", cpu);
+		fprintf(f, "CPU%u\t", cpu);
 	fprintf(f, "\n");
 
 #ifdef STARPU_USE_CUDA

src/core/perfmodel/perfmodel_history.c

@@ -613,7 +613,7 @@ double _starpu_regression_based_job_expected_perf(struct starpu_perfmodel_t *mod
 	regmodel = &model->per_arch[arch].regression;
 
 	if (regmodel->valid)
-		exp = regmodel->alpha*pow(size, regmodel->beta);
+                exp = regmodel->alpha*pow((double)size, regmodel->beta);
 
 	return exp;
 }
@@ -629,7 +629,7 @@ double _starpu_non_linear_regression_based_job_expected_perf(struct starpu_perfm
 	regmodel = &model->per_arch[arch].regression;
 
 	if (regmodel->nl_valid)
-		exp = regmodel->a*pow(size, regmodel->b) + regmodel->c;
+		exp = regmodel->a*pow((double)size, regmodel->b) + regmodel->c;
 
 	return exp;
 }
@@ -735,7 +735,7 @@ void _starpu_update_perfmodel_history(starpu_job_t j, struct starpu_perfmodel_t
 			/* update the regression model */
 			size_t job_size = _starpu_job_get_data_size(j);
 			double logy, logx;
-			logx = log(job_size);
+			logx = log((double)job_size);
 			logy = log(measured);
 
 			reg_model->sumlnx += logx;

src/core/workers.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009, 2010, 2011  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  * Copyright (C) 2010  Institut National de Recherche en Informatique et Automatique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -285,7 +285,7 @@ int starpu_conf_init(struct starpu_conf *conf)
 	conf->use_explicit_workers_opencl_gpuid = 0; /* TODO */
 
 	return 0;
-};
+}
 
 int starpu_init(struct starpu_conf *user_conf)
 {

src/datawizard/sort_data_handles.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 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
@@ -19,6 +19,7 @@
 #include <common/config.h>
 
 #include <datawizard/filters.h>
+#include <datawizard/sort_data_handles.h>
 
 /* To avoid deadlocks in case we have multiple tasks accessing the same piece
  * of data  (eg. task T1 needs A and B, and T2 needs B and A), we need to lock

src/datawizard/user_interactions.c

@@ -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
@@ -305,6 +305,7 @@ static void _prefetch_data_on_node(void *arg)
 
 }
 
+static
 int _starpu_prefetch_data_on_node_with_mode(starpu_data_handle handle, unsigned node, unsigned async, starpu_access_mode mode)
 {
 	STARPU_ASSERT(handle);

src/datawizard/write_back.c

@@ -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
@@ -16,6 +16,7 @@
  */
 
 #include <datawizard/datawizard.h>
+#include <datawizard/write_back.h>
 
 void _starpu_write_through_data(starpu_data_handle handle, uint32_t requesting_node, 
 					   uint32_t write_through_mask)

src/debug/structures_size.c

@@ -19,19 +19,20 @@
 #include <core/workers.h>
 #include <datawizard/coherency.h>
 #include <profiling/bound.h>
+#include <debug/starpu_debug_helpers.h>
 
 void _starpu_debug_display_structures_size(void)
 {
-	fprintf(stderr, "struct starpu_task\t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_task\t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_task), (unsigned) sizeof(struct starpu_task));
-	fprintf(stderr, "struct starpu_job_s\t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_job_s\t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_job_s), (unsigned) sizeof(struct starpu_job_s));
-	fprintf(stderr, "struct starpu_data_state_t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_data_state_t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_data_state_t), (unsigned) sizeof(struct starpu_data_state_t));
-	fprintf(stderr, "struct starpu_tag_s\t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_tag_s\t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_tag_s), (unsigned) sizeof(struct starpu_tag_s));
-	fprintf(stderr, "struct starpu_cg_s\t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_cg_s\t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_cg_s), (unsigned) sizeof(struct starpu_cg_s));
-	fprintf(stderr, "struct starpu_worker_s\t\t%d bytes\t(%x)\n",
+	fprintf(stderr, "struct starpu_worker_s\t\t%u bytes\t(%x)\n",
 			(unsigned) sizeof(struct starpu_worker_s), (unsigned) sizeof(struct starpu_worker_s));
 }

src/debug/traces/starpu_fxt.c

@@ -80,7 +80,7 @@ static unsigned get_colour_symbol_blue(char *name)
 }
 
 static uint64_t last_codelet_hash[STARPU_NMAXWORKERS];
-static double last_codelet_start[STARPU_NMAXWORKERS];
+static float last_codelet_start[STARPU_NMAXWORKERS];
 static char last_codelet_symbol[128][STARPU_NMAXWORKERS];
 
 /* If more than a period of time has elapsed, we flush the profiling info,
@@ -92,7 +92,7 @@ static double accumulated_exec_time[STARPU_NMAXWORKERS];
 
 LIST_TYPE(symbol_name,
 	char *name;
-);
+)
 
 static symbol_name_list_t symbol_list;
 
@@ -101,7 +101,7 @@ LIST_TYPE(communication,
 	float comm_start;	
 	float bandwidth;
 	unsigned node;
-);
+)
 
 static communication_list_t communication_list;
 
@@ -130,7 +130,7 @@ static int register_worker_id(unsigned long tid)
 
 	/* create a new key in the htable */
 	char *tidstr = malloc(16*sizeof(char));
-	sprintf(tidstr, "%ld", tid);
+	sprintf(tidstr, "%lu", tid);
 
 	ENTRY item;
 		item.key = tidstr;
@@ -151,7 +151,7 @@ static int register_worker_id(unsigned long tid)
 static int find_worker_id(unsigned long tid)
 {
 	char tidstr[16];
-	sprintf(tidstr, "%ld", tid);
+	sprintf(tidstr, "%lu", tid);
 
 	ENTRY item;
 		item.key = tidstr;
@@ -300,7 +300,7 @@ static void create_paje_state_if_not_found(char *name)
 	unsigned hash_symbol_green = get_colour_symbol_green(name);
 	unsigned hash_symbol_blue = get_colour_symbol_blue(name);
 
-	fprintf(stderr, "name %s hash red %d green %d blue %d \n", name, hash_symbol_red, hash_symbol_green, hash_symbol_blue);
+	fprintf(stderr, "name %s hash red %u green %u blue %u \n", name, hash_symbol_red, hash_symbol_green, hash_symbol_blue);
 
 	uint32_t hash_sum = hash_symbol_red + hash_symbol_green + hash_symbol_blue;
 
@@ -375,10 +375,10 @@ static void handle_user_event(struct fxt_ev_64 *ev, struct starpu_fxt_options *o
 	worker = find_worker_id(ev->param[1]);
 	if (worker < 0)
 	{
-		fprintf(out_paje_file, "9       %f     event      %sp      %ld\n", get_event_time_stamp(ev, options), prefix, code);
+		fprintf(out_paje_file, "9       %f     event      %sp      %lu\n", get_event_time_stamp(ev, options), prefix, code);
 	}
 	else {
-		fprintf(out_paje_file, "9       %f     event      %s%"PRIu64"      %ld\n", get_event_time_stamp(ev, options), prefix, ev->param[1], code);
+		fprintf(out_paje_file, "9       %f     event      %s%"PRIu64"      %lu\n", get_event_time_stamp(ev, options), prefix, ev->param[1], code);
 	}
 }
 
@@ -454,8 +454,8 @@ static void handle_start_driver_copy(struct fxt_ev_64 *ev, struct starpu_fxt_opt
 
 	if (!options->no_bus)
 	{
-		fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%d      Co\n", get_event_time_stamp(ev, options), prefix, dst);
-		fprintf(out_paje_file, "18       %f	L      %sp	%d	%sMEMNODE%d	com_%d\n", get_event_time_stamp(ev, options), prefix, size, prefix, src, comid);
+		fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%u      Co\n", get_event_time_stamp(ev, options), prefix, dst);
+		fprintf(out_paje_file, "18       %f	L      %sp	%u	%sMEMNODE%u	com_%u\n", get_event_time_stamp(ev, options), prefix, size, prefix, src, comid);
 
 		/* create a structure to store the start of the communication, this will be matched later */
 		communication_t com = communication_new();
@@ -481,8 +481,8 @@ static void handle_end_driver_copy(struct fxt_ev_64 *ev, struct starpu_fxt_optio
 
 	if (!options->no_bus)
 	{
-		fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%d      No\n", get_event_time_stamp(ev, options), prefix, dst);
-		fprintf(out_paje_file, "19       %f	L      %sp	%d	%sMEMNODE%d	com_%d\n", get_event_time_stamp(ev, options), prefix, size, prefix, dst, comid);
+		fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%u      No\n", get_event_time_stamp(ev, options), prefix, dst);
+		fprintf(out_paje_file, "19       %f	L      %sp	%u	%sMEMNODE%u	com_%u\n", get_event_time_stamp(ev, options), prefix, size, prefix, dst, comid);
 
 		/* look for a data transfer to match */
 		communication_itor_t itor;
@@ -516,7 +516,7 @@ static void handle_memnode_event(struct fxt_ev_64 *ev, struct starpu_fxt_options
 {
 	unsigned memnode = ev->param[0];
 
-	fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%d      %s\n",
+	fprintf(out_paje_file, "10       %f     MS      %sMEMNODE%u      %s\n",
 		get_event_time_stamp(ev, options), options->file_prefix, memnode, eventstr);
 }
 
@@ -535,7 +535,7 @@ static void handle_job_push(struct fxt_ev_64 *ev, struct starpu_fxt_options *opt
 		fprintf(out_paje_file, "13       %f ntask %ssched %f\n", current_timestamp, options->file_prefix, (float)curq_size);
 
 
-	fprintf(activity_file, "cnt_ready\t%lf\t%ld\n", current_timestamp, curq_size);
+	fprintf(activity_file, "cnt_ready\t%lf\t%d\n", current_timestamp, curq_size);
 }
 
 static void handle_job_pop(struct fxt_ev_64 *ev, struct starpu_fxt_options *options)
@@ -547,14 +547,15 @@ static void handle_job_pop(struct fxt_ev_64 *ev, struct starpu_fxt_options *opti
 	if (!options->no_counter)
 		fprintf(out_paje_file, "13       %f ntask %ssched %f\n", current_timestamp, options->file_prefix, (float)curq_size);
 
-	fprintf(activity_file, "cnt_ready\t%lf\t%ld\n", current_timestamp, curq_size);
+	fprintf(activity_file, "cnt_ready\t%lf\t%d\n", current_timestamp, curq_size);
 }
 
+static
 void handle_update_task_cnt(struct fxt_ev_64 *ev, struct starpu_fxt_options *options)
 {
 	float current_timestamp = get_event_time_stamp(ev, options);
 	unsigned long nsubmitted = ev->param[0]; 
-	fprintf(activity_file, "cnt_submitted\t%lf\t%ld\n", current_timestamp, nsubmitted);
+	fprintf(activity_file, "cnt_submitted\t%lf\t%lu\n", current_timestamp, nsubmitted);
 }
 
 static void handle_codelet_tag_deps(struct fxt_ev_64 *ev)
@@ -675,7 +676,8 @@ static void handle_task_wait_for_all(void)
 	starpu_fxt_dag_add_sync_point();
 }
 
-void starpu_fxt_display_bandwidth(struct starpu_fxt_options *options)
+static
+void _starpu_fxt_display_bandwidth(struct starpu_fxt_options *options)
 {
 	float current_bandwidth = 0.0;
 	float current_bandwidth_per_node[32] = {0.0};
@@ -692,7 +694,7 @@ void starpu_fxt_display_bandwidth(struct starpu_fxt_options *options)
 				itor->comm_start, prefix, current_bandwidth);
 
 		current_bandwidth_per_node[itor->node] +=  itor->bandwidth;
-		fprintf(out_paje_file, "13  %f bw %sMEMNODE%d %f\n",
+		fprintf(out_paje_file, "13  %f bw %sMEMNODE%u %f\n",
 				itor->comm_start, prefix, itor->node, current_bandwidth_per_node[itor->node]);
 	}
 }
@@ -701,6 +703,7 @@ void starpu_fxt_display_bandwidth(struct starpu_fxt_options *options)
  *	Public functions
  */
 
+static
 void starpu_fxt_parse_new_file(char *filename_in, struct starpu_fxt_options *options)
 {
 	/* Open the trace file */
@@ -938,28 +941,33 @@ void starpu_fxt_options_init(struct starpu_fxt_options *options)
 
 }
 
+static
 void starpu_fxt_distrib_file_init(struct starpu_fxt_options *options)
 {
 	if (options->generate_distrib)
 		distrib_time = fopen(options->distrib_time_path, "w+");
 }
 
+static
 void starpu_fxt_distrib_file_close(struct starpu_fxt_options *options)
 {
 	if (options->generate_distrib)
 		fclose(distrib_time);
 }
 
+static
 void starpu_fxt_activity_file_init(struct starpu_fxt_options *options)
 {
 	activity_file = fopen(options->activity_path, "w+");
 }
 
+static
 void starpu_fxt_activity_file_close(void)
 {
 	fclose(activity_file);
 }
 
+static
 void starpu_fxt_paje_file_init(struct starpu_fxt_options *options)
 {
 	/* create a new file */
@@ -974,6 +982,7 @@ void starpu_fxt_paje_file_init(struct starpu_fxt_options *options)
 	starpu_fxt_write_paje_header(out_paje_file);
 }
 
+static
 void starpu_fxt_paje_file_close(void)
 {
 	fclose(out_paje_file);
@@ -1135,7 +1144,7 @@ void starpu_fxt_generate_trace(struct starpu_fxt_options *options)
 			starpu_fxt_display_mpi_transfers(options, rank_k, out_paje_file);
 	}
 
-	starpu_fxt_display_bandwidth(options);
+	_starpu_fxt_display_bandwidth(options);
 
 	/* close the different files */
 	starpu_fxt_paje_file_close();

src/debug/traces/starpu_fxt.h

@@ -19,6 +19,7 @@
 
 #include <starpu.h>
 #include <starpu_config.h>
+#include <common/config.h>
 
 #ifdef STARPU_USE_FXT
 

src/debug/traces/starpu_fxt_dag.c

@@ -16,6 +16,9 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <common/config.h>
+
+#ifdef STARPU_USE_FXT
 
 #include "starpu_fxt.h"
 
@@ -38,7 +41,7 @@ void starpu_fxt_dag_init(char *out_path)
 	fprintf(out_file, "\trankdir=LR;\n");
 
 	/* Create a new cluster */
-	fprintf(out_file, "subgraph cluster_%d {\n", cluster_cnt);
+	fprintf(out_file, "subgraph cluster_%u {\n", cluster_cnt);
 	fprintf(out_file, "\tcolor=black;\n");
 }
 
@@ -65,13 +68,13 @@ void starpu_fxt_dag_add_task_deps(unsigned long dep_prev, unsigned long dep_succ
 void starpu_fxt_dag_set_tag_done(uint64_t tag, const char *color)
 {
 
-	fprintf(out_file, "\t \"tag_%llx\" \[ style=filled, label=\"\", color=\"%s\"]\n", 
+	fprintf(out_file, "\t \"tag_%llx\" [ style=filled, label=\"\", color=\"%s\"]\n", 
 		(unsigned long long)tag, color);
 }
 
 void starpu_fxt_dag_set_task_done(unsigned long job_id, const char *label, const char *color)
 {
-	fprintf(out_file, "\t \"task_%lx\" \[ style=filled, label=\"%s\", color=\"%s\"]\n", job_id, label, color);
+	fprintf(out_file, "\t \"task_%lx\" [ style=filled, label=\"%s\", color=\"%s\"]\n", job_id, label, color);
 }
 
 void starpu_fxt_dag_add_sync_point(void)
@@ -82,6 +85,8 @@ void starpu_fxt_dag_add_sync_point(void)
 	cluster_cnt++;
 
 	/* Create a new cluster */
-	fprintf(out_file, "subgraph cluster_%d {\n", cluster_cnt);
+	fprintf(out_file, "subgraph cluster_%u {\n", cluster_cnt);
 	fprintf(out_file, "\tcolor=black;\n");
 }
+
+#endif /* STARPU_USE_FXT */

src/debug/traces/starpu_fxt_mpi.c

@@ -153,6 +153,7 @@ void starpu_fxt_mpi_add_recv_transfer(int src __attribute__((unused)), int dst,
 	mpi_recvs[dst][slot].date = date;
 }
 
+static
 struct mpi_transfer *try_to_match_send_transfer(int src __attribute__((unused)), int dst, int mpi_tag)
 {
 	unsigned slot;
@@ -208,8 +209,8 @@ static void display_all_transfers_from_trace(FILE *out_paje_file, int src)
 
 			unsigned long id = mpi_com_id++;
 			/* TODO replace 0 by a MPI program ? */
-			fprintf(out_paje_file, "18	%f	MPIL	MPIroot   %ld	mpi_%d_p	mpicom_%ld\n", start_date, size, /* XXX */src, id);
-			fprintf(out_paje_file, "19	%f	MPIL	MPIroot	  %ld	mpi_%d_p	mpicom_%ld\n", end_date, size, /* XXX */dst, id);
+			fprintf(out_paje_file, "18	%f	MPIL	MPIroot   %ld	mpi_%d_p	mpicom_%lu\n", start_date, size, /* XXX */src, id);
+			fprintf(out_paje_file, "19	%f	MPIL	MPIroot	  %ld	mpi_%d_p	mpicom_%lu\n", end_date, size, /* XXX */dst, id);
 		}
 		else
 		{

src/debug/traces/starpu_paje.c

@@ -15,111 +15,114 @@
  */
 
 #include "starpu_fxt.h"
+#include <common/config.h>
+
+#ifdef STARPU_USE_FXT
 
 void starpu_fxt_write_paje_header(FILE *file)
 {
-	fprintf(file, "\%%EventDef	PajeDefineContainerType	1\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	ContainerType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDefineEventType	2\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	ContainerType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDefineStateType	3\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	ContainerType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDefineVariableType	4\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	ContainerType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDefineLinkType	5\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	ContainerType	string\n");
-	fprintf(file, "\%%	SourceContainerType	string\n");
-	fprintf(file, "\%%	DestContainerType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDefineEntityValue	6\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	EntityType	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%	Color	color\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeCreateContainer	7\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Alias	string\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeDestroyContainer	8\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Name	string\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeNewEvent	9\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef PajeSetState 10\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajePushState	11\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajePopState	12\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeSetVariable	13\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	double\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeAddVariable	14\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	double\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeSubVariable	15\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	double\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeStartLink	18\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	string\n");
-	fprintf(file, "\%%	SourceContainer	string\n");
-	fprintf(file, "\%%	Key	string\n");
-	fprintf(file, "\%%EndEventDef\n");
-	fprintf(file, "\%%EventDef	PajeEndLink	19\n");
-	fprintf(file, "\%%	Time	date\n");
-	fprintf(file, "\%%	Type	string\n");
-	fprintf(file, "\%%	Container	string\n");
-	fprintf(file, "\%%	Value	string\n");
-	fprintf(file, "\%%	DestContainer	string\n");
-	fprintf(file, "\%%	Key	string\n");
-	fprintf(file, "\%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineContainerType	1\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	ContainerType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineEventType	2\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	ContainerType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineStateType	3\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	ContainerType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineVariableType	4\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	ContainerType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineLinkType	5\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	ContainerType	string\n");
+	fprintf(file, "%%	SourceContainerType	string\n");
+	fprintf(file, "%%	DestContainerType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDefineEntityValue	6\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	EntityType	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%	Color	color\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeCreateContainer	7\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Alias	string\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeDestroyContainer	8\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Name	string\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeNewEvent	9\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef PajeSetState 10\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajePushState	11\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajePopState	12\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeSetVariable	13\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	double\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeAddVariable	14\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	double\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeSubVariable	15\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	double\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeStartLink	18\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	string\n");
+	fprintf(file, "%%	SourceContainer	string\n");
+	fprintf(file, "%%	Key	string\n");
+	fprintf(file, "%%EndEventDef\n");
+	fprintf(file, "%%EventDef	PajeEndLink	19\n");
+	fprintf(file, "%%	Time	date\n");
+	fprintf(file, "%%	Type	string\n");
+	fprintf(file, "%%	Container	string\n");
+	fprintf(file, "%%	Value	string\n");
+	fprintf(file, "%%	DestContainer	string\n");
+	fprintf(file, "%%	Key	string\n");
+	fprintf(file, "%%EndEventDef\n");
 
 	fprintf(file, "                                        \n \
 	1       MPIP      0       \"MPI Program\"                      	\n \
@@ -152,4 +155,4 @@ void starpu_fxt_write_paje_header(FILE *file)
 	fprintf(file, "7      0.0 MPIroot      MPIP      0       root\n");
 }
 
-
+#endif

src/profiling/bound.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  * Copyright (C) 2010, 2011  Université de Bordeaux 1
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -756,7 +756,7 @@ static glp_prob *_starpu_bound_glp_resolve(int integer)
 		for (w = 0; w < nw; w++)
 			for (t = 0, tp = task_pools; tp; t++, tp = tp->next) {
 				char name[32];
-				snprintf(name, sizeof(name), "w%ut%un", w, t);
+				snprintf(name, sizeof(name), "w%dt%dn", w, t);
 				glp_set_col_name(lp, colnum(w, t), name);
 				if (integer)
 					glp_set_col_kind(lp, colnum(w, t), GLP_IV);
@@ -857,9 +857,9 @@ void starpu_bound_print(FILE *output, int integer __attribute__ ((unused))) {
 			fprintf(output, "%s key %x\n", tp->cl->model->symbol, (unsigned) tp->footprint);
 			for (w = 0; w < nw; w++)
 				if (integer)
-					fprintf(output, "\tw%ut%un %f", w, t, glp_mip_col_val(lp, colnum(w, t)));
+					fprintf(output, "\tw%dt%dn %f", w, t, glp_mip_col_val(lp, colnum(w, t)));
 				else
-					fprintf(output, "\tw%ut%un %f", w, t, glp_get_col_prim(lp, colnum(w, t)));
+					fprintf(output, "\tw%dt%dn %f", w, t, glp_get_col_prim(lp, colnum(w, t)));
 			fprintf(output, "\n");
 		}
 

src/profiling/profiling.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  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
@@ -105,7 +105,7 @@ void _starpu_profiling_init(void)
 		profiling = 1;
 }
 
-void starpu_profiling_terminate(void)
+void _starpu_profiling_terminate(void)
 {
 
 }

src/profiling/profiling.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  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
@@ -68,4 +68,6 @@ void _starpu_profiling_set_task_push_end_time(struct starpu_task *task);
 /* This function needs to be called before other starpu_profile_* functions */
 void _starpu_profiling_init(void);
 
+void _starpu_profiling_terminate(void);
+
 #endif // __PROFILING_H__

src/sched_policies/deque_modeling_policy_data_aware.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  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
@@ -201,6 +201,7 @@ static struct starpu_task *dmda_pop_every_task(void)
 	return new_list;
 }
 
+static
 int _starpu_fifo_push_sorted_task(struct starpu_fifo_taskq_s *fifo_queue, pthread_mutex_t *sched_mutex, pthread_cond_t *sched_cond, struct starpu_task *task)
 {
 	struct starpu_task_list *list = &fifo_queue->taskq;
@@ -399,7 +400,7 @@ static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 
 	double best_exp_end = 10e240;
 	double model_best = 0.0;
-	double penality_best = 0.0;
+	//double penality_best = 0.0;
 
 	int ntasks_best = -1;
 	double ntasks_best_end = 0.0;
@@ -515,12 +516,12 @@ static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 		 * so we force this measurement */
 		best = forced_best;
 		model_best = 0.0;
-		penality_best = 0.0;
+		//penality_best = 0.0;
 	}
 	else 
 	{
 		model_best = local_task_length[best];
-		penality_best = local_data_penalty[best];
+		//penality_best = local_data_penalty[best];
 	}
 
 	/* we should now have the best worker in variable "best" */

src/sched_policies/detect_combined_workers.c

@@ -145,6 +145,7 @@ static void find_combinations_without_hwloc(struct starpu_machine_topology_s *to
 }
 #endif
 
+#if 0
 static void combine_all_cpu_workers(struct starpu_machine_topology_s *topology)
 {
 	struct starpu_machine_config_s *config = _starpu_get_machine_config();
@@ -166,6 +167,7 @@ static void combine_all_cpu_workers(struct starpu_machine_topology_s *topology)
 		STARPU_ASSERT(ret >= 0);
 	}
 }
+#endif
 
 void _starpu_sched_find_worker_combinations(struct starpu_machine_topology_s *topology)
 {

src/sched_policies/heft.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2011  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
@@ -341,8 +341,8 @@ static int heft_push_task(struct starpu_task *task)
 	return _heft_push_task(task, 0);
 }
 
-static void heft_deinit(struct starpu_machine_topology_s *topology, 
-	 __attribute__ ((unused)) struct starpu_sched_policy_s *_policy) 
+static void heft_deinit(__attribute__ ((unused)) struct starpu_machine_topology_s *topology, 
+                        __attribute__ ((unused)) struct starpu_sched_policy_s *_policy) 
 {
 	unsigned workerid;
 	for (workerid = 0; workerid < nworkers; workerid++)

src/sched_policies/parallel_greedy.c

@@ -43,7 +43,7 @@ static void initialize_pgreedy_policy(struct starpu_machine_topology_s *topology
 
 	_starpu_sched_find_worker_combinations(topology);
 
-	unsigned workerid;
+	int workerid;
 	unsigned ncombinedworkers, nworkers;
 
 	nworkers = topology->nworkers;
@@ -66,7 +66,7 @@ static void initialize_pgreedy_policy(struct starpu_machine_topology_s *topology
 	
 	for (i = 0; i < ncombinedworkers; i++)
 	{
-		int workerid = nworkers + i;
+		workerid = nworkers + i;
 
 		/* Note that we ASSUME that the workers are sorted by size ! */
 		int *workers;

src/sched_policies/parallel_heft.c

@@ -26,8 +26,8 @@
 static pthread_mutex_t big_lock;
 
 static unsigned nworkers, ncombinedworkers;
-static enum starpu_perf_archtype applicable_perf_archtypes[STARPU_NARCH_VARIATIONS];
-static unsigned napplicable_perf_archtypes = 0;
+//static enum starpu_perf_archtype applicable_perf_archtypes[STARPU_NARCH_VARIATIONS];
+//static unsigned napplicable_perf_archtypes = 0;
 
 static pthread_cond_t sched_cond[STARPU_NMAXWORKERS];
 static pthread_mutex_t sched_mutex[STARPU_NMAXWORKERS];
@@ -207,7 +207,7 @@ static int _parallel_heft_push_task(struct starpu_task *task, unsigned prio)
 	int skip_worker[nworkers+ncombinedworkers];
 
 	double best_exp_end = DBL_MAX;
-	double penality_best = 0.0;
+	//double penality_best = 0.0;
 
 	int ntasks_best = -1;
 	double ntasks_best_end = 0.0;
@@ -329,12 +329,12 @@ static int _parallel_heft_push_task(struct starpu_task *task, unsigned prio)
 		 * with that arch we want to speed-up calibration time
 		 * so we force this measurement */
 		best = forced_best;
-		penality_best = 0.0;
+		//penality_best = 0.0;
 		best_exp_end = local_exp_end[best];
 	}
 	else 
 	{
-		penality_best = local_data_penalty[best];
+                //penality_best = local_data_penalty[best];
 		best_exp_end = local_exp_end[best];
 	}
 
@@ -408,14 +408,14 @@ static void initialize_parallel_heft_policy(struct starpu_machine_topology_s *to
 		used_perf_archtypes[perf_archtype] = 1;
 	}
 
-	napplicable_perf_archtypes = 0;
+//	napplicable_perf_archtypes = 0;
 
-	int arch;
-	for (arch = 0; arch < STARPU_NARCH_VARIATIONS; arch++)
-	{
-		if (used_perf_archtypes[arch])
-			applicable_perf_archtypes[napplicable_perf_archtypes++] = arch;
-	}
+//	int arch;
+//	for (arch = 0; arch < STARPU_NARCH_VARIATIONS; arch++)
+//	{
+//		if (used_perf_archtypes[arch])
+//			applicable_perf_archtypes[napplicable_perf_archtypes++] = arch;
+//	}
 }
 
 /* TODO: use post_exec_hook to fix the expected start */

src/sched_policies/work_stealing_policy.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 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
@@ -168,7 +168,7 @@ static struct starpu_task *ws_pop_task(void)
 	return task;
 }
 
-int ws_push_task(struct starpu_task *task)
+static int ws_push_task(struct starpu_task *task)
 {
 	starpu_job_t j = _starpu_get_job_associated_to_task(task);
 

src/util/starpu_insert_task_utils.c

@@ -27,6 +27,7 @@ struct insert_task_cb_wrapper {
 	void *arg_stack;
 };
 
+static
 void starpu_task_insert_callback_wrapper(void *_cl_arg_wrapper)
 {
 	struct insert_task_cb_wrapper *cl_arg_wrapper = _cl_arg_wrapper;