Merge from trunk @12435:12439

src/common/fxt.h

@@ -269,10 +269,10 @@ do {									\
 #ifndef FUT_RAW_PROBE7
 #define FUT_RAW_PROBE7(CODE,P1,P2,P3,P4,P5,P6,P7) do {		\
 		if(fut_active) {					\
-			unsigned long *args __attribute__((unused))=	\
+			unsigned long *__args __attribute__((unused))=	\
 				fut_getstampedbuffer(CODE,		\
 						     FUT_SIZE(7)); \
-			*(args++)=(unsigned long)(P1);*(args++)=(unsigned long)(P2);*(args++)=(unsigned long)(P3);*(args++)=(unsigned long)(P4);*(args++)=(unsigned long)(P5);*(args++)=(unsigned long)(P6);*(args++)=(unsigned long)(P7);				\
+			*(__args++)=(unsigned long)(P1);*(__args++)=(unsigned long)(P2);*(__args++)=(unsigned long)(P3);*(__args++)=(unsigned long)(P4);*(__args++)=(unsigned long)(P5);*(__args++)=(unsigned long)(P6);*(__args++)=(unsigned long)(P7);				\
 				}					\
 	} while (0)
 #endif
@@ -721,7 +721,7 @@ do {										\
 #define _STARPU_TRACE_BARRIER_WAIT_BEGIN()		do {} while(0)
 #define _STARPU_TRACE_BARRIER_WAIT_END()			do {} while(0)
 #define _STARPU_TRACE_MEMORY_FULL(size)				do {} while(0)
-#define _STARPU_TRACE_MEMORY_FULL(workerid,size)		do {} while(0)
+#define _STARPU_TRACE_DATA_LOAD(workerid,size)		do {} while(0)
 #define _STARPU_TRACE_START_UNPARTITION(handle, memnode)	do {} while(0)
 #define _STARPU_TRACE_END_UNPARTITION(handle, memnode)		do {} while(0)
 #define _STARPU_TRACE_SCHED_COMPONENT_PUSH_PRIO(workerid, ntasks, exp_len)	do {} while(0)

src/datawizard/coherency.c

@@ -738,7 +738,7 @@ int _starpu_fetch_task_input(struct _starpu_job *j)
 #endif
 	}
 
-	_STARPU_TRACE_DATA_LOAD(workerid,total_size)
+	_STARPU_TRACE_DATA_LOAD(workerid,total_size);
 	/* Now that we have taken the data locks in locking order, fill the codelet interfaces in function order.  */
 	for (index = 0; index < nbuffers; index++)
 	{

tools/starpu_fxt_data_trace.c

@@ -16,7 +16,7 @@ static void usage()
 	fprintf(stderr, "   -v, --version       output version information and exit\n\n");
 	fprintf(stderr, "    filename           specify the FxT trace input file.\n");
 	fprintf(stderr, "    codeletX           specify the codelet name to profile (by default, all codelets are profiled)\n");
-        fprintf(stderr, "Reports bugs to <"PACKAGE_BUGREPORT">.");
+        fprintf(stderr, "Report bugs to <"PACKAGE_BUGREPORT">.");
         fprintf(stderr, "\n");
 }
 

tools/starpu_fxt_stats.c

@@ -47,7 +47,7 @@ static void usage(char **argv)
         fprintf(stderr, "   -o <output file>    specify the output file\n");
 	fprintf(stderr, "   -h, --help          display this help and exit\n");
 	fprintf(stderr, "   -v, --version       output version information and exit\n\n");
-        fprintf(stderr, "Reports bugs to <"PACKAGE_BUGREPORT">.");
+        fprintf(stderr, "Report bugs to <"PACKAGE_BUGREPORT">.");
         fprintf(stderr, "\n");
 }
 

tools/starpu_fxt_tool.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011-2013  Universite de Bordeaux 1
+ * Copyright (C) 2011-2014  Universite de Bordeaux 1
  * Copyright (C) 2012-2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ static void usage(char **argv)
         fprintf(stderr, "   -no-bus             set the FxT no bus option\n");
 	fprintf(stderr, "   -h, --help          display this help and exit\n");
 	fprintf(stderr, "   -v, --version       output version information and exit\n\n");
-        fprintf(stderr, "Reports bugs to <"PACKAGE_BUGREPORT">.");
+        fprintf(stderr, "Report bugs to <"PACKAGE_BUGREPORT">.");
         fprintf(stderr, "\n");
 }
 

tools/starpu_lp2paje.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2011, 2013  Université de Bordeaux 1
+ * Copyright (C) 2010-2011, 2013-2014  Université de Bordeaux 1
  *
  * 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
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 		}
 		fprintf(stderr, "Convert schedule optimized by lp into the Paje format\n\n");
 		fprintf(stderr, "Usage: lp_solve file.lp | %s > paje.trace\n", PROGNAME);
-		fprintf(stderr, "Reports bugs to <"PACKAGE_BUGREPORT">.");
+		fprintf(stderr, "Report bugs to <"PACKAGE_BUGREPORT">.");
 		fprintf(stderr, "\n");
 		exit(EXIT_SUCCESS);
 	}

tools/starpu_perfmodel_display.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2013  Université de Bordeaux 1
+ * Copyright (C) 2011, 2013-2014  Université de Bordeaux 1
  * Copyright (C) 2011, 2012, 2013  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Télécom-SudParis
  *
@@ -59,7 +59,7 @@ static void usage()
 	fprintf(stderr, "   -d                  display the directory storing performance models\n");
 	fprintf(stderr, "   -h, --help          display this help and exit\n");
 	fprintf(stderr, "   -v, --version       output version information and exit\n\n");
-        fprintf(stderr, "Reports bugs to <"PACKAGE_BUGREPORT">.");
+        fprintf(stderr, "Report bugs to <"PACKAGE_BUGREPORT">.");
         fprintf(stderr, "\n");
 }