minor fixes to follow coding conventions

examples/filters/fmultiple_submit.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2017                                     CNRS
+ * Copyright (C) 2017, 2018                               CNRS
  * Copyright (C) 2015,2017                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -117,7 +117,8 @@ int main(void)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Disable codelet on CPUs if we have a CUDA device, to force remote execution on the CUDA device */
-	if (starpu_cuda_worker_get_count()) {
+	if (starpu_cuda_worker_get_count())
+	{
 		cl_check_scale.cpu_funcs[0] = NULL;
 		cl_check_scale.cpu_funcs_name[0] = NULL;
 	}

examples/filters/fmultiple_submit_implicit.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2017                                     CNRS
+ * Copyright (C) 2017, 2018                               CNRS
  * Copyright (C) 2015,2017                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -164,7 +164,8 @@ int main(void)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Disable codelet on CPUs if we have a CUDA device, to force remote execution on the CUDA device */
-	if (starpu_cuda_worker_get_count()) {
+	if (starpu_cuda_worker_get_count())
+	{
 		cl_check_scale.cpu_funcs[0] = NULL;
 		cl_check_scale.cpu_funcs_name[0] = NULL;
 		cl_check.cpu_funcs[0] = NULL;

examples/filters/fmultiple_submit_readonly.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2017                                     CNRS
+ * Copyright (C) 2017, 2018                               CNRS
  * Copyright (C) 2015,2017                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -165,7 +165,8 @@ int main(void)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Disable codelet on CPUs if we have a CUDA device, to force remote execution on the CUDA device */
-	if (starpu_cuda_worker_get_count()) {
+	if (starpu_cuda_worker_get_count())
+	{
 		cl_check_scale.cpu_funcs[0] = NULL;
 		cl_check_scale.cpu_funcs_name[0] = NULL;
 		cl_check.cpu_funcs[0] = NULL;

examples/sched_ctx/parallel_tasks_reuse_handle.c

@@ -1,10 +1,8 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C)                                          Inria
- * Copyright (C)                                          CNRS
  * Copyright (C) 2015-2016                                Université de Bordeaux
- * Copyright (C) 2015,2017                                Inria
- * Copyright (C) 2015-2017                                CNRS
+ * Copyright (C) 2015,2017                                Inria
+ * Copyright (C) 2015-2018                                CNRS
  *
  * 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
@@ -17,226 +15,226 @@
  *
  * See the GNU Lesser General Public License in COPYING.LGPL for more details.
  */
-
-#include <starpu.h>
-#include <omp.h>
-#include <pthread.h>
-
-#ifdef STARPU_QUICK_CHECK
-#define NTASKS 64
-#define SIZE   40
-#define LOOPS  4
-#else
-#define NTASKS 100
-#define SIZE   400
-#define LOOPS  10
-#endif
-
-#define N_NESTED_CTXS 2
-
-struct context
-{
-	int ncpus;
-	int *cpus;
-	unsigned id;
-};
-
-/* Helper for the task that will initiate everything */
-void parallel_task_prologue_init_once_and_for_all(void * sched_ctx_)
-{
-	fprintf(stderr, "%p: %s -->\n", (void*)pthread_self(), __func__);
-	int sched_ctx = *(int *)sched_ctx_;
-	int *cpuids = NULL;
-	int ncpuids = 0;
-	starpu_sched_ctx_get_available_cpuids(sched_ctx, &cpuids, &ncpuids);
-
-#pragma omp parallel num_threads(ncpuids)
-	{
-		starpu_sched_ctx_bind_current_thread_to_cpuid(cpuids[omp_get_thread_num()]);
-	}
-
-	omp_set_num_threads(ncpuids);
-	free(cpuids);
-	fprintf(stderr, "%p: %s <--\n", (void*)pthread_self(), __func__);
-	return;
-}
-
-void noop(void * buffers[], void * cl_arg)
-{
-	(void)buffers;
-	(void)cl_arg;
-}
-
-static struct starpu_codelet init_parallel_worker_cl=
-{
-	.cpu_funcs = {noop},
-	.nbuffers = 0,
-	.name = "init_parallel_worker"
-};
-
-/* function called to initialize the parallel "workers" */
-void parallel_task_init_one_context(unsigned * context_id)
-{
-	struct starpu_task * t;
-	int ret;
-
-	t = starpu_task_build(&init_parallel_worker_cl,
-			      STARPU_SCHED_CTX, *context_id,
-			      0);
-	t->destroy = 1;
-	t->prologue_callback_pop_func=parallel_task_prologue_init_once_and_for_all;
-	if (t->prologue_callback_pop_arg_free)
-		free(t->prologue_callback_pop_arg);
-	t->prologue_callback_pop_arg=context_id;
-	t->prologue_callback_pop_arg_free=0;
-
-	ret = starpu_task_submit(t);
-	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-}
-
-struct context main_context;
-struct context *contexts;
-void parallel_task_init()
-{
-	/* Context creation */
-	main_context.ncpus = starpu_cpu_worker_get_count();
-	main_context.cpus = (int *) malloc(main_context.ncpus*sizeof(int));
-	fprintf(stderr, "ncpus : %d \n",main_context.ncpus);
-
-	starpu_worker_get_ids_by_type(STARPU_CPU_WORKER, main_context.cpus, main_context.ncpus);
-
-	main_context.id = starpu_sched_ctx_create(main_context.cpus,
-						  main_context.ncpus,"main_ctx",
-						  STARPU_SCHED_CTX_POLICY_NAME,"prio",
-						  0);
-
-	/* Initialize nested contexts */
-	contexts = malloc(sizeof(struct context)*N_NESTED_CTXS);
-	int cpus_per_context = main_context.ncpus/N_NESTED_CTXS;
-	int i;
-	for(i = 0; i < N_NESTED_CTXS; i++)
-	{
-		contexts[i].ncpus = cpus_per_context;
-		if (i == N_NESTED_CTXS-1)
-			contexts[i].ncpus += main_context.ncpus%N_NESTED_CTXS;
-		contexts[i].cpus = main_context.cpus+i*cpus_per_context;
-	}
-
-	for(i = 0; i < N_NESTED_CTXS; i++)
-		contexts[i].id = starpu_sched_ctx_create(contexts[i].cpus,
-							 contexts[i].ncpus,"nested_ctx",
-							 STARPU_SCHED_CTX_NESTED,main_context.id,
-							 0);
-
-	for (i = 0; i < N_NESTED_CTXS; i++)
-	{
-		parallel_task_init_one_context(&contexts[i].id);
-	}
-
-	starpu_task_wait_for_all();
-	starpu_sched_ctx_set_context(&main_context.id);
-}
-
-void parallel_task_deinit()
-{
-	int i;
-	for (i=0; i<N_NESTED_CTXS;i++)
-		starpu_sched_ctx_delete(contexts[i].id);
-	free(contexts);
-	free(main_context.cpus);
-}
-
-/* Codelet SUM */
-static void sum_cpu(void * descr[], void *cl_arg)
-{
-	(void)cl_arg;
-	double *v_dst = (double *) STARPU_VECTOR_GET_PTR(descr[0]);
-	double *v_src0 = (double *) STARPU_VECTOR_GET_PTR(descr[1]);
-	double *v_src1 = (double *) STARPU_VECTOR_GET_PTR(descr[2]);
-	int size = STARPU_VECTOR_GET_NX(descr[0]);
-
-	int i, k;
-	for (k=0;k<LOOPS;k++)
-	{
-#pragma omp parallel for
-		for (i=0; i<size; i++)
-		{
-			v_dst[i]+=v_src0[i]+v_src1[i];
-		}
-	}
-}
-
-static struct starpu_codelet sum_cl =
-{
-	.cpu_funcs = {sum_cpu, NULL},
-	.nbuffers = 3,
-	.modes={STARPU_RW,STARPU_R, STARPU_R}
-};
-
-int main(void)
-{
-	int ntasks = NTASKS;
-	int ret, j, k;
-	unsigned ncpus = 0;
-
-	ret = starpu_init(NULL);
-	if (ret == -ENODEV)
-		return 77;
-	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
-
-	if (starpu_cpu_worker_get_count() < N_NESTED_CTXS)
-	{
-		starpu_shutdown();
-		return 77;
-	}
-
-	parallel_task_init();
-
-	/* Data preparation */
-	double array1[SIZE];
-	double array2[SIZE];
-
-	memset(array1, 0, sizeof(double));
-	int i;
-	for (i=0;i<SIZE;i++)
-	{
-		array2[i]=i*2;
-	}
-
-	starpu_data_handle_t handle1;
-	starpu_data_handle_t handle2;
-
-	starpu_vector_data_register(&handle1, 0, (uintptr_t)array1, SIZE, sizeof(double));
-	starpu_vector_data_register(&handle2, 0, (uintptr_t)array2, SIZE, sizeof(double));
-
-	for (i = 0; i < ntasks; i++)
-	{
-		struct starpu_task * t;
-		t=starpu_task_build(&sum_cl,
-				    STARPU_RW,handle1,
-				    STARPU_R,handle2,
-				    STARPU_R,handle1,
-				    STARPU_SCHED_CTX, main_context.id,
-				    0);
-		t->destroy = 1;
-		t->possibly_parallel = 1;
-
-		ret=starpu_task_submit(t);
-		if (ret == -ENODEV)
-			goto out;
-		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
-	}
-
-
-
-out:
-	/* wait for all tasks at the end*/
-	starpu_task_wait_for_all();
-
-	starpu_data_unregister(handle1);
-	starpu_data_unregister(handle2);
-	parallel_task_deinit();
-
-	starpu_shutdown();
-	return 0;
-}
+
+#include <starpu.h>
+#include <omp.h>
+#include <pthread.h>
+
+#ifdef STARPU_QUICK_CHECK
+#define NTASKS 64
+#define SIZE   40
+#define LOOPS  4
+#else
+#define NTASKS 100
+#define SIZE   400
+#define LOOPS  10
+#endif
+
+#define N_NESTED_CTXS 2
+
+struct context
+{
+	int ncpus;
+	int *cpus;
+	unsigned id;
+};
+
+/* Helper for the task that will initiate everything */
+void parallel_task_prologue_init_once_and_for_all(void * sched_ctx_)
+{
+	fprintf(stderr, "%p: %s -->\n", (void*)pthread_self(), __func__);
+	int sched_ctx = *(int *)sched_ctx_;
+	int *cpuids = NULL;
+	int ncpuids = 0;
+	starpu_sched_ctx_get_available_cpuids(sched_ctx, &cpuids, &ncpuids);
+
+#pragma omp parallel num_threads(ncpuids)
+	{
+		starpu_sched_ctx_bind_current_thread_to_cpuid(cpuids[omp_get_thread_num()]);
+	}
+
+	omp_set_num_threads(ncpuids);
+	free(cpuids);
+	fprintf(stderr, "%p: %s <--\n", (void*)pthread_self(), __func__);
+	return;
+}
+
+void noop(void * buffers[], void * cl_arg)
+{
+	(void)buffers;
+	(void)cl_arg;
+}
+
+static struct starpu_codelet init_parallel_worker_cl=
+{
+	.cpu_funcs = {noop},
+	.nbuffers = 0,
+	.name = "init_parallel_worker"
+};
+
+/* function called to initialize the parallel "workers" */
+void parallel_task_init_one_context(unsigned * context_id)
+{
+	struct starpu_task * t;
+	int ret;
+
+	t = starpu_task_build(&init_parallel_worker_cl,
+			      STARPU_SCHED_CTX, *context_id,
+			      0);
+	t->destroy = 1;
+	t->prologue_callback_pop_func=parallel_task_prologue_init_once_and_for_all;
+	if (t->prologue_callback_pop_arg_free)
+		free(t->prologue_callback_pop_arg);
+	t->prologue_callback_pop_arg=context_id;
+	t->prologue_callback_pop_arg_free=0;
+
+	ret = starpu_task_submit(t);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
+}
+
+struct context main_context;
+struct context *contexts;
+void parallel_task_init()
+{
+	/* Context creation */
+	main_context.ncpus = starpu_cpu_worker_get_count();
+	main_context.cpus = (int *) malloc(main_context.ncpus*sizeof(int));
+	fprintf(stderr, "ncpus : %d \n",main_context.ncpus);
+
+	starpu_worker_get_ids_by_type(STARPU_CPU_WORKER, main_context.cpus, main_context.ncpus);
+
+	main_context.id = starpu_sched_ctx_create(main_context.cpus,
+						  main_context.ncpus,"main_ctx",
+						  STARPU_SCHED_CTX_POLICY_NAME,"prio",
+						  0);
+
+	/* Initialize nested contexts */
+	contexts = malloc(sizeof(struct context)*N_NESTED_CTXS);
+	int cpus_per_context = main_context.ncpus/N_NESTED_CTXS;
+	int i;
+	for(i = 0; i < N_NESTED_CTXS; i++)
+	{
+		contexts[i].ncpus = cpus_per_context;
+		if (i == N_NESTED_CTXS-1)
+			contexts[i].ncpus += main_context.ncpus%N_NESTED_CTXS;
+		contexts[i].cpus = main_context.cpus+i*cpus_per_context;
+	}
+
+	for(i = 0; i < N_NESTED_CTXS; i++)
+		contexts[i].id = starpu_sched_ctx_create(contexts[i].cpus,
+							 contexts[i].ncpus,"nested_ctx",
+							 STARPU_SCHED_CTX_NESTED,main_context.id,
+							 0);
+
+	for (i = 0; i < N_NESTED_CTXS; i++)
+	{
+		parallel_task_init_one_context(&contexts[i].id);
+	}
+
+	starpu_task_wait_for_all();
+	starpu_sched_ctx_set_context(&main_context.id);
+}
+
+void parallel_task_deinit()
+{
+	int i;
+	for (i=0; i<N_NESTED_CTXS;i++)
+		starpu_sched_ctx_delete(contexts[i].id);
+	free(contexts);
+	free(main_context.cpus);
+}
+
+/* Codelet SUM */
+static void sum_cpu(void * descr[], void *cl_arg)
+{
+	(void)cl_arg;
+	double *v_dst = (double *) STARPU_VECTOR_GET_PTR(descr[0]);
+	double *v_src0 = (double *) STARPU_VECTOR_GET_PTR(descr[1]);
+	double *v_src1 = (double *) STARPU_VECTOR_GET_PTR(descr[2]);
+	int size = STARPU_VECTOR_GET_NX(descr[0]);
+
+	int i, k;
+	for (k=0;k<LOOPS;k++)
+	{
+#pragma omp parallel for
+		for (i=0; i<size; i++)
+		{
+			v_dst[i]+=v_src0[i]+v_src1[i];
+		}
+	}
+}
+
+static struct starpu_codelet sum_cl =
+{
+	.cpu_funcs = {sum_cpu, NULL},
+	.nbuffers = 3,
+	.modes={STARPU_RW,STARPU_R, STARPU_R}
+};
+
+int main(void)
+{
+	int ntasks = NTASKS;
+	int ret, j, k;
+	unsigned ncpus = 0;
+
+	ret = starpu_init(NULL);
+	if (ret == -ENODEV)
+		return 77;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
+
+	if (starpu_cpu_worker_get_count() < N_NESTED_CTXS)
+	{
+		starpu_shutdown();
+		return 77;
+	}
+
+	parallel_task_init();
+
+	/* Data preparation */
+	double array1[SIZE];
+	double array2[SIZE];
+
+	memset(array1, 0, sizeof(double));
+	int i;
+	for (i=0;i<SIZE;i++)
+	{
+		array2[i]=i*2;
+	}
+
+	starpu_data_handle_t handle1;
+	starpu_data_handle_t handle2;
+
+	starpu_vector_data_register(&handle1, 0, (uintptr_t)array1, SIZE, sizeof(double));
+	starpu_vector_data_register(&handle2, 0, (uintptr_t)array2, SIZE, sizeof(double));
+
+	for (i = 0; i < ntasks; i++)
+	{
+		struct starpu_task * t;
+		t=starpu_task_build(&sum_cl,
+				    STARPU_RW,handle1,
+				    STARPU_R,handle2,
+				    STARPU_R,handle1,
+				    STARPU_SCHED_CTX, main_context.id,
+				    0);
+		t->destroy = 1;
+		t->possibly_parallel = 1;
+
+		ret=starpu_task_submit(t);
+		if (ret == -ENODEV)
+			goto out;
+		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
+	}
+
+
+
+out:
+	/* wait for all tasks at the end*/
+	starpu_task_wait_for_all();
+
+	starpu_data_unregister(handle1);
+	starpu_data_unregister(handle2);
+	parallel_task_deinit();
+
+	starpu_shutdown();
+	return 0;
+}

src/common/graph.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2016-2017                                CNRS
+ * Copyright (C) 2016-2018                                CNRS
  * Copyright (C) 2016-2017                                Université de Bordeaux
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -24,7 +24,8 @@ MULTILIST_CREATE_TYPE(_starpu_graph_node, top)
 MULTILIST_CREATE_TYPE(_starpu_graph_node, bottom)
 MULTILIST_CREATE_TYPE(_starpu_graph_node, dropped)
 
-struct _starpu_graph_node {
+struct _starpu_graph_node
+{
 	starpu_pthread_mutex_t mutex;	/* protects access to the job */
 	struct _starpu_job *job;	/* pointer to the job, if it is still alive, NULL otherwise */
 

src/core/dependencies/cg.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2012                                     Inria
  * Copyright (C) 2010-2012,2014-2018                      Université de Bordeaux
- * Copyright (C) 2010-2013,2015-2017                      CNRS
+ * Copyright (C) 2010-2013,2015-2018                      CNRS
  *
  * 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
@@ -237,17 +237,20 @@ void _starpu_notify_cg(void *pred STARPU_ATTRIBUTE_UNUSED, struct _starpu_cg *cg
 
 				job_successors = &j->job_successors;
 #ifdef STARPU_DEBUG
-				if (!j->task->regenerate) {
+				if (!j->task->regenerate)
+				{
 					unsigned i;
 					/* Remove backward cg pointers for easier debugging */
-					if (job_successors->deps) {
+					if (job_successors->deps)
+					{
 						for (i = 0; i < job_successors->ndeps; i++)
 							if (job_successors->deps[i] == cg)
 								break;
 						STARPU_ASSERT(i < job_successors->ndeps);
 						job_successors->done[i] = 1;
 					}
-					if (cg->deps) {
+					if (cg->deps)
+					{
 						for (i = 0; i < cg->ndeps; i++)
 							if (cg->deps[i] == pred)
 								break;

src/core/jobs.h

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2011,2014                                Inria
  * Copyright (C) 2008-2017                                Université de Bordeaux
- * Copyright (C) 2010-2011,2013-2015,2017                 CNRS
+ * Copyright (C) 2010-2011,2013-2015,2017,2018            CNRS
  * Copyright (C) 2011                                     Télécom-SudParis
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -68,8 +68,8 @@ struct _starpu_data_descr
 MULTILIST_CREATE_TYPE(_starpu_job, all_submitted)
 #endif
 /* A job is the internal representation of a task. */
-struct _starpu_job {
-
+struct _starpu_job
+{
 	/* Each job is attributed a unique id. */
 	unsigned long job_id;
 

src/core/simgrid.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2012-2013,2015-2017                      CNRS
+ * Copyright (C) 2012-2013,2015-2018                      CNRS
  * Copyright (C) 2016-2017                                Inria
  * Copyright (C) 2012-2018                                Université de Bordeaux
  *
@@ -302,7 +302,8 @@ int main(int argc, char **argv)
 
         /* Already initialized?  It probably has been done through a
          * constructor and MSG_process_attach, directly jump to real main */
-	if (simgrid_started == 3) {
+	if (simgrid_started == 3)
+	{
 		return do_starpu_main(argc, argv);
 	}
 
@@ -455,7 +456,8 @@ void _starpu_simgrid_deinit(void)
 
 #if SIMGRID_VERSION_MAJOR > 3 || (SIMGRID_VERSION_MAJOR == 3 && SIMGRID_VERSION_MINOR >= 13)
 	/* clean-atexit introduced in simgrid 3.13 */
-	if ( xbt_cfg_get_boolean("clean-atexit")) {
+	if ( xbt_cfg_get_boolean("clean-atexit"))
+	{
 		_starpu_simgrid_deinit_late();
 	}
 #endif

src/core/topology.h

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2014,2017                                Inria
  * Copyright (C) 2009-2017                                Université de Bordeaux
- * Copyright (C) 2010-2011,2015,2017                      CNRS
+ * Copyright (C) 2010-2011,2015,2017,2018                 CNRS
  *
  * 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
@@ -30,7 +30,8 @@ struct _starpu_machine_config;
 #ifndef STARPU_SIMGRID
 #ifdef STARPU_HAVE_HWLOC
 /* This is allocated for each hwloc object */
-struct _starpu_hwloc_userdata {
+struct _starpu_hwloc_userdata
+{
 	struct _starpu_worker_list *worker_list; /* List of workers running on this obj */
 	unsigned ngpus; /* Number of GPUs sharing this PCI link */
 };

tests/disk/mem_reclaim.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2015-2017                                CNRS
+ * Copyright (C) 2015-2018                                CNRS
  * Copyright (C) 2017                                     Inria
  * Copyright (C) 2015-2017                                Université de Bordeaux
  * Copyright (C) 2013                                     Corentin Salingue
@@ -64,11 +64,13 @@ int main(void)
 static int (*any_to_any)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node, void *async_data);
 
 /* We need a ram-to-ram copy for NUMA machine, use any_to_any for that */
-static int ram_to_ram(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node) {
+static int ram_to_ram(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node)
+{
 	return any_to_any(src_interface, src_node, dst_interface, dst_node, NULL);
 }
 
-const struct starpu_data_copy_methods my_vector_copy_data_methods_s = {
+const struct starpu_data_copy_methods my_vector_copy_data_methods_s =
+{
 	.ram_to_ram = ram_to_ram
 };
 struct starpu_data_interface_ops starpu_interface_my_vector_ops;

tools/dev/checker/starpu_check_braces.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2016-2017                                CNRS
+# Copyright (C) 2016-2018                                CNRS
 #
 # 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
@@ -17,20 +17,23 @@
 SHOW=cat
 SHOW=less
 
+my_grep()
+{
+    cat $2 | grep -v ".${3}:[0-9]*:[[:space:]]*${1}$" | grep -v printf | grep -v define | grep -v '\\' | grep -v '//' > /tmp/braces2
+    if test -s /tmp/braces2
+    then
+	$SHOW /tmp/braces2
+    fi
+}
+
 DIRS="tools src tests examples mpi"
 for d in ${1:-$DIRS}
 do
     for ext in c h cl cu doxy
     do
-	grep -rsn "{" $d |grep ".${ext}:" | grep -v "}" | grep -v ".${ext}:[0-9]*:[[:space:]]*{$" > /tmp/braces
-	if test -s /tmp/braces
-	then
-	    $SHOW /tmp/braces
-	fi
-	grep -rsn "}" $d |grep ".${ext}:" | grep -v "{" | grep -v "};" | grep -v ".${ext}:[0-9]*:[[:space:]]*};*$" > /tmp/braces
-	if test -s /tmp/braces
-	then
-	    $SHOW /tmp/braces
-	fi
+	grep -rsn "{" $d |grep ".${ext}:" | grep -v "}" > /tmp/braces
+	my_grep "{" /tmp/braces $ext
+	grep -rsn "}" $d |grep ".${ext}:" | grep -v "{" | grep -v "};" > /tmp/braces
+	my_grep "}" /tmp/braces $ext
     done
 done