include: code cleaning

	- curly brackets on a individual line
        - delete trailing whitespaces

include/starpu.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-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
@@ -44,10 +44,12 @@ typedef unsigned long long uint64_t;
 #include <starpu_expert.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-struct starpu_conf {
+struct starpu_conf
+{
 	/* which scheduling policy should be used ? (NULL for default) */
 	const char *sched_policy_name;
 	struct starpu_sched_policy *sched_policy;
@@ -108,7 +110,8 @@ int starpu_combined_worker_get_id(void);
 int starpu_combined_worker_get_size(void);
 int starpu_combined_worker_get_rank(void);
 
-enum starpu_archtype {
+enum starpu_archtype
+{
 	STARPU_CPU_WORKER, /* CPU core */
 	STARPU_CUDA_WORKER, /* NVIDIA CUDA device */
 	STARPU_OPENCL_WORKER, /* OpenCL CUDA device */

include/starpu_bound.h

@@ -25,7 +25,8 @@
 #include <stdio.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /* Start recording tasks (resets stats).  `deps' tells whether dependencies

include/starpu_cuda.h

@@ -26,7 +26,8 @@
 #include <starpu_config.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 void starpu_cublas_report_error(const char *func, const char *file, int line, cublasStatus status);

include/starpu_data.h

@@ -29,10 +29,12 @@ typedef struct _starpu_data_state* starpu_data_handle_t;
 #include <starpu_data_filters.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-enum starpu_access_mode {
+enum starpu_access_mode
+{
 	STARPU_R=(1<<0),
 	STARPU_W=(1<<1),
 	STARPU_RW=(STARPU_R|STARPU_W),
@@ -40,7 +42,8 @@ enum starpu_access_mode {
 	STARPU_REDUX=(1<<3)
 };
 
-struct starpu_buffer_descr {
+struct starpu_buffer_descr
+{
 	starpu_data_handle_t handle;
 	enum starpu_access_mode mode;
 };
@@ -63,13 +66,16 @@ int starpu_data_acquire(starpu_data_handle_t handle, enum starpu_access_mode mod
 int starpu_data_acquire_cb(starpu_data_handle_t handle,
 			   enum starpu_access_mode mode, void (*callback)(void *), void *arg);
 #ifdef __GCC__
-#  define STARPU_DATA_ACQUIRE_CB(handle, mode, code) do { \
-	void callback(void *arg) { \
-		code; \
-		starpu_data_release(handle); \
-	} \
-	starpu_data_acquire_cb(handle, mode, callback, NULL); \
-} while(0)
+#  define STARPU_DATA_ACQUIRE_CB(handle, mode, code) do \
+	{ \						\
+		void callback(void *arg)		\
+		{					\
+			code;				\
+			starpu_data_release(handle);  	\
+		}			      		\
+		starpu_data_acquire_cb(handle, mode, callback, NULL);	\
+	}						\
+	while(0)
 #endif
 
 void starpu_data_release(starpu_data_handle_t handle);

include/starpu_data_filters.h

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Mehdi Juhoor <mjuhoor@gmail.com>
- * 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
@@ -26,12 +26,14 @@
 #include <starpu_config.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 struct starpu_data_interface_ops;
 
-struct starpu_data_filter {
+struct starpu_data_filter
+{
 	void (*filter_func)(void *father_interface, void *child_interface, struct starpu_data_filter *, unsigned id, unsigned nparts);
         unsigned (*get_nchildren)(struct starpu_data_filter *, starpu_data_handle_t initial_handle);
         struct starpu_data_interface_ops *(*get_child_ops)(struct starpu_data_filter *, unsigned id);

include/starpu_data_interfaces.h

@@ -39,14 +39,16 @@ typedef void *cudaStream_t;
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /* The following structures are used to describe data interfaces */
 
 /* This structure contains the different methods to transfer data between the
  * different types of memory nodes */
-struct starpu_data_copy_methods {
+struct starpu_data_copy_methods
+{
 	/* src type is ram */
 	int (*ram_to_ram)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
 	int (*ram_to_cuda)(void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node);
@@ -88,7 +90,8 @@ struct starpu_data_copy_methods {
 #endif
 };
 
-enum starpu_data_interface_id {
+enum starpu_data_interface_id
+{
 	STARPU_MATRIX_INTERFACE_ID=0,
 	STARPU_BLOCK_INTERFACE_ID=1,
 	STARPU_VECTOR_INTERFACE_ID=2,
@@ -100,7 +103,8 @@ enum starpu_data_interface_id {
 	STARPU_NINTERFACES_ID=8 /* number of data interfaces */
 };
 
-struct starpu_data_interface_ops {
+struct starpu_data_interface_ops
+{
 	/* Register an existing interface into a data handle. */
 	void (*register_data_handle)(starpu_data_handle_t handle,
 					uint32_t home_node, void *data_interface);
@@ -153,7 +157,8 @@ void *starpu_handle_get_local_ptr(starpu_data_handle_t handle);
 void *starpu_data_get_interface_on_node(starpu_data_handle_t handle, unsigned memory_node);
 
 /* Matrix interface for dense matrices */
-struct starpu_matrix_interface {
+struct starpu_matrix_interface
+{
 	uintptr_t ptr;
         uintptr_t dev_handle;
         size_t offset;
@@ -182,7 +187,8 @@ size_t starpu_matrix_get_elemsize(starpu_data_handle_t handle);
 
 /* BLOCK interface for 3D dense blocks */
 /* TODO: rename to 3dmatrix? */
-struct starpu_block_interface {
+struct starpu_block_interface
+{
 	uintptr_t ptr;
         uintptr_t dev_handle;
         size_t offset;
@@ -215,7 +221,8 @@ size_t starpu_block_get_elemsize(starpu_data_handle_t handle);
 #define STARPU_BLOCK_GET_ELEMSIZE(interface)	(((struct starpu_block_interface *)(interface))->elemsize)
 
 /* vector interface for contiguous (non-strided) buffers */
-struct starpu_vector_interface {
+struct starpu_vector_interface
+{
 	uintptr_t ptr;
         uintptr_t dev_handle;
         size_t offset;
@@ -235,7 +242,8 @@ uintptr_t starpu_vector_get_local_ptr(starpu_data_handle_t handle);
 #define STARPU_VECTOR_GET_ELEMSIZE(interface)	(((struct starpu_vector_interface *)(interface))->elemsize)
 
 /* variable interface for a single data (not a vector, a matrix, a list, ...) */
-struct starpu_variable_interface {
+struct starpu_variable_interface
+{
 	uintptr_t ptr;
 	size_t elemsize;
 };
@@ -257,7 +265,8 @@ uintptr_t starpu_variable_get_local_ptr(starpu_data_handle_t handle);
 void starpu_void_data_register(starpu_data_handle_t *handleptr);
 
 /* CSR interface for sparse matrices (compressed sparse row representation) */
-struct starpu_csr_interface {
+struct starpu_csr_interface
+{
 	uint32_t nnz; /* number of non-zero entries */
 	uint32_t nrow; /* number of rows */
 	uintptr_t nzval; /* non-zero values */
@@ -291,7 +300,8 @@ size_t starpu_csr_get_elemsize(starpu_data_handle_t handle);
 
 /* BCSR interface for sparse matrices (blocked compressed sparse row
  * representation) */
-struct starpu_bcsr_interface {
+struct starpu_bcsr_interface
+{
 	uint32_t nnz; /* number of non-zero BLOCKS */
 	uint32_t nrow; /* number of rows (in terms of BLOCKS) */
 
@@ -328,7 +338,8 @@ size_t starpu_bcsr_get_elemsize(starpu_data_handle_t handle);
 /*
  * Multiformat interface
  */
-struct starpu_multiformat_data_interface_ops {
+struct starpu_multiformat_data_interface_ops
+{
 	size_t cpu_elemsize;
 #ifdef STARPU_USE_OPENCL
 	size_t opencl_elemsize;
@@ -342,7 +353,8 @@ struct starpu_multiformat_data_interface_ops {
 #endif
 };
 
-struct starpu_multiformat_interface {
+struct starpu_multiformat_interface
+{
 	void *cpu_ptr;
 #ifdef STARPU_USE_CUDA
 	void *cuda_ptr;

include/starpu_expert.h

@@ -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
  *
  * 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
@@ -22,7 +22,8 @@
 #include <starpu_config.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 void starpu_wake_all_blocked_workers(void);

include/starpu_opencl.h

@@ -27,7 +27,8 @@
 #include <starpu_config.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 void starpu_opencl_display_error(const char *func, const char *file, int line, const char *msg, cl_int status);
@@ -45,7 +46,8 @@ static inline void starpu_opencl_report_error(const char *func, const char *file
 #define STARPU_OPENCL_REPORT_ERROR_WITH_MSG(msg, status)			\
 	starpu_opencl_display_error(__starpu_func__, __FILE__, __LINE__, msg, status)
 
-struct starpu_opencl_program {
+struct starpu_opencl_program
+{
         cl_program programs[STARPU_MAXOPENCLDEVS];
 };
 

include/starpu_perfmodel.h

@@ -30,20 +30,22 @@
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 struct starpu_htbl32_node;
 struct starpu_history_list;
 struct starpu_buffer_descr;
 
-/* 
+/*
    it is possible that we have multiple versions of the same kind of workers,
    for instance multiple GPUs or even different CPUs within the same machine
    so we do not use the archtype enum type directly for performance models
 */
 
-enum starpu_perf_archtype {
+enum starpu_perf_archtype
+{
 	STARPU_CPU_DEFAULT = 0,
 	/* CPU combined workers between 0 and STARPU_MAXCPUS-1 */
 	STARPU_CUDA_DEFAULT = STARPU_MAXCPUS,
@@ -54,9 +56,10 @@ enum starpu_perf_archtype {
 
 #define STARPU_NARCH_VARIATIONS	(STARPU_GORDON_DEFAULT+1)
 
-struct starpu_history_entry {
+struct starpu_history_entry
+{
 	//double measured;
-	
+
 	/* mean_n = 1/n sum */
 	double mean;
 
@@ -89,17 +92,20 @@ struct starpu_history_entry {
 #endif
 };
 
-struct starpu_history_list {
+struct starpu_history_list
+{
 	struct starpu_history_list *next;
 	struct starpu_history_entry *entry;
 };
 
-struct starpu_model_list {
+struct starpu_model_list
+{
 	struct starpu_model_list *next;
 	struct starpu_perfmodel *model;
 };
 
-struct starpu_regression_model {
+struct starpu_regression_model
+{
 	/* sum of ln(measured) */
 	double sumlny;
 
@@ -126,7 +132,8 @@ struct starpu_regression_model {
 	unsigned nsample;
 };
 
-struct starpu_per_arch_perfmodel {
+struct starpu_per_arch_perfmodel
+{
 	double (*cost_model)(struct starpu_buffer_descr *t); /* returns expected duration in µs */
 
 	/* internal variables */
@@ -139,7 +146,8 @@ struct starpu_per_arch_perfmodel {
 #endif
 };
 
-enum starpu_perfmodel_type {
+enum starpu_perfmodel_type
+{
 	STARPU_PER_ARCH,	/* Application-provided per-arch cost model function */
 	STARPU_COMMON,		/* Application-provided common cost model function, with per-arch factor */
 	STARPU_HISTORY_BASED,	/* Automatic history-based cost model */
@@ -147,7 +155,8 @@ enum starpu_perfmodel_type {
 	STARPU_NL_REGRESSION_BASED	/* Automatic non-linear regression-based cost model (a * size ^ b + c) */
 };
 
-struct starpu_perfmodel {
+struct starpu_perfmodel
+{
 	/* which model is used for that task ? */
 	enum starpu_perfmodel_type type;
 

include/starpu_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
@@ -25,13 +25,15 @@
 
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #define STARPU_PROFILING_DISABLE	0
 #define STARPU_PROFILING_ENABLE		1
 
-struct starpu_task_profiling_info {
+struct starpu_task_profiling_info
+{
 	/* Task submission */
 	struct timespec submit_time;
 
@@ -66,7 +68,8 @@ struct starpu_task_profiling_info {
 };
 
 /* The timing is provided since the previous call to starpu_worker_get_profiling_info */
-struct starpu_worker_profiling_info {
+struct starpu_worker_profiling_info
+{
 	struct timespec start_time;
 	struct timespec total_time;
 	struct timespec executing_time;
@@ -78,7 +81,8 @@ struct starpu_worker_profiling_info {
 	double power_consumed;
 };
 
-struct starpu_bus_profiling_info {
+struct starpu_bus_profiling_info
+{
 	struct timespec start_time;
 	struct timespec total_time;
 	int long long transferred_bytes;
@@ -90,7 +94,7 @@ void starpu_set_profiling_id(int new_id);
 
 /* This function sets the profiling status:
  * - enable with STARPU_PROFILING_ENABLE
- * - disable with STARPU_PROFILING_DISABLE 
+ * - disable with STARPU_PROFILING_DISABLE
  * Negative return values indicate an error, otherwise the previous status is
  * returned. Calling this function resets the profiling measurements. */
 int starpu_profiling_status_set(int status);

include/starpu_scheduler.h

@@ -31,12 +31,14 @@
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 struct starpu_task;
 
-struct starpu_machine_topology {
+struct starpu_machine_topology
+{
 	unsigned nworkers;
 
 	unsigned ncombinedworkers;
@@ -59,7 +61,7 @@ struct starpu_machine_topology {
 
 	/* Where to bind workers ? */
 	unsigned workers_bindid[STARPU_NMAXWORKERS];
-	
+
 	/* Which GPU(s) do we use for CUDA ? */
 	unsigned workers_cuda_gpuid[STARPU_NMAXWORKERS];
 
@@ -70,7 +72,8 @@ struct starpu_machine_topology {
 /* This structure contains all the methods that implement a scheduling policy.
  * An application may specify which scheduling strategy in the "sched_policy"
  * field of the starpu_conf structure passed to the starpu_init function. */
-struct starpu_sched_policy {
+struct starpu_sched_policy
+{
 	/* Initialize the scheduling policy. */
 	void (*init_sched)(struct starpu_machine_topology *, struct starpu_sched_policy *);
 

include/starpu_task.h

@@ -53,7 +53,8 @@
 #define STARPU_TASK_BLOCKED_ON_DATA	7
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 typedef uint64_t starpu_tag_t;
@@ -71,11 +72,12 @@ typedef uint8_t starpu_gordon_func_t; /* Cell SPU */
 
 
 /*
- * A codelet describes the various function 
+ * A codelet describes the various function
  * that may be called from a worker
  */
 struct starpu_task;
-struct starpu_codelet {
+struct starpu_codelet
+{
 	/* where can it be performed ? */
 	uint32_t where;
 	int (*can_execute)(unsigned workerid, struct starpu_task *task, unsigned nimpl);
@@ -115,7 +117,8 @@ struct starpu_codelet {
 typedef struct starpu_codelet starpu_codelet_gcc;
 #endif /* STARPU_GCC_PLUGIN */
 
-struct starpu_task {
+struct starpu_task
+{
 	struct starpu_codelet *cl;
 
 	/* arguments managed by the DSM */
@@ -126,7 +129,7 @@ struct starpu_task {
 	void *cl_arg;
 	/* in case the argument buffer has to be uploaded explicitely */
 	size_t cl_arg_size;
-	
+
 	/* when the task is done, callback_func(callback_arg) is called */
 	void (*callback_func)(void *);
 	void *callback_arg;
@@ -136,7 +139,7 @@ struct starpu_task {
 
 	/* options for the task execution */
 	unsigned synchronous; /* if set, a call to push is blocking */
-	int priority; /* STARPU_MAX_PRIO = most important 
+	int priority; /* STARPU_MAX_PRIO = most important
         		: STARPU_MIN_PRIO = least important */
 
 	/* in case the task has to be executed on a specific worker */
@@ -163,7 +166,7 @@ struct starpu_task {
 
 	/* If this flag is set, the task will be re-submitted to StarPU once it
 	 * has been executed. This flag must not be set if the destroy flag is
-	 * set too. */ 
+	 * set too. */
 	int regenerate;
 
 	unsigned status;

include/starpu_task_bundle.h

@@ -27,17 +27,20 @@
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-struct starpu_task_bundle_entry {
+struct starpu_task_bundle_entry
+{
 	struct starpu_task *task;
 	struct starpu_task_bundle_entry *next;
 };
 
 /* The task bundle structure describes a list of tasks that should be scheduled
  * together whenever possible. */
-struct starpu_task_bundle {
+struct starpu_task_bundle
+{
 	/* Mutex protecting the bundle */
 #if defined(_MSC_VER)
 	void *mutex;

include/starpu_task_list.h

@@ -20,10 +20,12 @@
 #include <starpu_task.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-struct starpu_task_list {
+struct starpu_task_list
+{
 	struct starpu_task *head;
 	struct starpu_task *tail;
 };

include/starpu_top.h

@@ -23,16 +23,19 @@
 #include <time.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-enum starpu_top_data_type {
+enum starpu_top_data_type
+{
 	STARPU_TOP_DATA_BOOLEAN,
 	STARPU_TOP_DATA_INTEGER,
 	STARPU_TOP_DATA_FLOAT
 };
 
-struct starpu_top_data {
+struct starpu_top_data
+{
 	unsigned int id;
 	const char* name;
 	int int_min_value;
@@ -44,14 +47,16 @@ struct starpu_top_data {
 	struct starpu_top_data * next;
 };
 
-enum starpu_top_param_type {
+enum starpu_top_param_type
+{
 	STARPU_TOP_PARAM_BOOLEAN,
 	STARPU_TOP_PARAM_INTEGER,
 	STARPU_TOP_PARAM_FLOAT,
 	STARPU_TOP_PARAM_ENUM
 };
 
-struct starpu_top_param {
+struct starpu_top_param
+{
 	unsigned int id;
 	const char* name;
 	enum starpu_top_param_type type;
@@ -66,7 +71,8 @@ struct starpu_top_param {
 	struct starpu_top_param * next;
 };
 
-enum starpu_top_message_type {
+enum starpu_top_message_type
+{
 	TOP_TYPE_GO,
 	TOP_TYPE_SET,
 	TOP_TYPE_CONTINUE,

include/starpu_util.h

@@ -26,7 +26,8 @@
 #include <starpu_perfmodel.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #define STARPU_POISON_PTR	((void *)0xdeadbeef)
@@ -61,11 +62,13 @@ extern "C" {
 
 #if defined(__i386__) || defined(__x86_64__)
 
-static __inline unsigned starpu_cmpxchg(unsigned *ptr, unsigned old, unsigned next) {
+static __inline unsigned starpu_cmpxchg(unsigned *ptr, unsigned old, unsigned next)
+{
 	__asm__ __volatile__("lock cmpxchgl %2,%1": "+a" (old), "+m" (*ptr) : "q" (next) : "memory");
 	return old;
 }
-static __inline unsigned starpu_xchg(unsigned *ptr, unsigned next) {
+static __inline unsigned starpu_xchg(unsigned *ptr, unsigned next)
+{
 	/* Note: xchg is always locked already */
 	__asm__ __volatile__("xchgl %1,%0": "+m" (*ptr), "+q" (next) : : "memory");
 	return next;
@@ -74,9 +77,11 @@ static __inline unsigned starpu_xchg(unsigned *ptr, unsigned next) {
 #endif
 
 #define STARPU_ATOMIC_SOMETHING(name,expr) \
-static __inline unsigned starpu_atomic_##name(unsigned *ptr, unsigned value) { \
+static __inline unsigned starpu_atomic_##name(unsigned *ptr, unsigned value) \
+{ \
 	unsigned old, next; \
-	while (1) { \
+	while (1) \
+	{ \
 		old = *ptr; \
 		next = expr; \
 		if (starpu_cmpxchg(ptr, old, next) == old) \
@@ -132,7 +137,8 @@ STARPU_ATOMIC_SOMETHING(or, old | value)
 #include <starpu_task.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 static __inline int starpu_get_env_number(const char *str)
@@ -140,7 +146,8 @@ static __inline int starpu_get_env_number(const char *str)
 	char *strval;
 
 	strval = getenv(str);
-	if (strval) {
+	if (strval)
+	{
 		/* the env variable was actually set */
 		unsigned val;
 		char *check;
@@ -151,7 +158,8 @@ static __inline int starpu_get_env_number(const char *str)
 		/* fprintf(stderr, "ENV %s WAS %d\n", str, val); */
 		return val;
 	}
-	else {
+	else
+	{
 		/* there is no such env variable */
 		/* fprintf("There was no %s ENV\n", str); */
 		return -1;
@@ -163,7 +171,8 @@ void starpu_trace_user_event(unsigned long code);
 
 #define STARPU_FXT_MAX_FILES	64
 
-struct starpu_fxt_codelet_event {
+struct starpu_fxt_codelet_event
+{
 	char symbol[256]; /* name of the codelet */
 	int workerid;
 	enum starpu_perf_archtype archtype;
@@ -172,7 +181,8 @@ struct starpu_fxt_codelet_event {
 	float time;
 };
 
-struct starpu_fxt_options {
+struct starpu_fxt_options
+{
 	unsigned per_task_colour;
 	unsigned no_counter;
 	unsigned no_bus;