- suppress typedefs

include/starpu_openmp.h

@@ -23,25 +23,25 @@
 typedef void *starpu_omp_lock_t; /* TODO: select a proper type */
 typedef void *starpu_omp_nest_lock_t; /* TODO: select a proper type */
 
-typedef enum e_starpu_omp_sched
+enum starpu_omp_sched_value
 {
 	starpu_omp_sched_undefined = 0,
 	starpu_omp_sched_static    = 1,
 	starpu_omp_sched_dynamic   = 2,
 	starpu_omp_sched_guided    = 3,
 	starpu_omp_sched_auto      = 4,
-} starpu_omp_sched_t;
+};
 
-typedef enum e_starpu_omp_proc_bind
+enum starpu_omp_proc_bind_value
 {
 	starpu_omp_proc_bind_false  = 0,
 	starpu_omp_proc_bind_true   = 1,
 	starpu_omp_proc_bind_master = 2,
 	starpu_omp_proc_bind_close  = 3,
 	starpu_omp_proc_bind_spread = 4,
-} starpu_omp_proc_bind_t;
+};
 
-typedef struct starpu_omp_parallel_region_attr
+struct starpu_omp_parallel_region_attr
 {
 	struct starpu_codelet  cl;
 	starpu_data_handle_t  *handles;
@@ -50,9 +50,9 @@ typedef struct starpu_omp_parallel_region_attr
 	unsigned  cl_arg_free;
 
 	int if_clause;
-} starpu_omp_parallel_region_attr_t;
+};
 
-typedef struct starpu_omp_task_region_attr
+struct starpu_omp_task_region_attr
 {
 	struct starpu_codelet  cl;
 	starpu_data_handle_t  *handles;
@@ -64,7 +64,7 @@ typedef struct starpu_omp_task_region_attr
 	int final_clause;
 	int untied_clause;
 	int mergeable_clause;
-} starpu_omp_task_region_attr_t;
+};
 
 #ifdef __cplusplus
 extern "C"
@@ -77,7 +77,7 @@ extern "C"
 extern int starpu_omp_init(void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_shutdown(void) __STARPU_OMP_NOTHROW;
 
-extern void starpu_omp_parallel_region(const starpu_omp_parallel_region_attr_t *attr) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_parallel_region(const struct starpu_omp_parallel_region_attr *attr) __STARPU_OMP_NOTHROW;
 
 extern void starpu_omp_barrier(void) __STARPU_OMP_NOTHROW;
 
@@ -91,7 +91,7 @@ extern void starpu_omp_critical(void (*f)(void *arg), void *arg, const char *nam
 extern void starpu_omp_critical_inline_begin(const char *name) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_critical_inline_end(const char *name) __STARPU_OMP_NOTHROW;
 
-extern void starpu_omp_task_region(const starpu_omp_task_region_attr_t *attr) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_task_region(const struct starpu_omp_task_region_attr *attr) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_taskwait(void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_taskgroup(void (*f)(void *arg), void *arg) __STARPU_OMP_NOTHROW;
 
@@ -121,8 +121,8 @@ extern int starpu_omp_get_dynamic (void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_set_nested (int nested) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_nested (void) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_cancellation(void) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_set_schedule (starpu_omp_sched_t kind, int modifier) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_get_schedule (starpu_omp_sched_t *kind, int *modifier) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_set_schedule (enum starpu_omp_sched_value kind, int modifier) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_get_schedule (enum starpu_omp_sched_value *kind, int *modifier) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_thread_limit (void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_set_max_active_levels (int max_levels) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_max_active_levels (void) __STARPU_OMP_NOTHROW;
@@ -131,7 +131,7 @@ extern int starpu_omp_get_ancestor_thread_num (int level) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_team_size (int level) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_active_level (void) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_in_final(void) __STARPU_OMP_NOTHROW;
-extern starpu_omp_proc_bind_t starpu_omp_get_proc_bind(void) __STARPU_OMP_NOTHROW;
+extern enum starpu_omp_proc_bind_value starpu_omp_get_proc_bind(void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_set_default_device(int device_num) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_default_device(void) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_num_devices(void) __STARPU_OMP_NOTHROW;

src/util/openmp_runtime_support_omp_api.c

@@ -114,7 +114,7 @@ int starpu_omp_get_cancellation(void)
 	return 0;
 }
 
-void starpu_omp_set_schedule (starpu_omp_sched_t kind, int modifier)
+void starpu_omp_set_schedule (enum starpu_omp_sched_value kind, int modifier)
 {
 	(void) kind;
 	(void) modifier;
@@ -123,7 +123,7 @@ void starpu_omp_set_schedule (starpu_omp_sched_t kind, int modifier)
 	assert(kind >= 1 && kind <=4);
 }
 
-void starpu_omp_get_schedule (starpu_omp_sched_t *kind, int *modifier)
+void starpu_omp_get_schedule (enum starpu_omp_sched_value *kind, int *modifier)
 {
 	(void) kind;
 	(void) modifier;
@@ -201,7 +201,7 @@ int starpu_omp_in_final(void)
 	return 0;
 }
 
-starpu_omp_proc_bind_t starpu_omp_get_proc_bind(void)
+enum starpu_omp_proc_bind_value starpu_omp_get_proc_bind(void)
 {
 	/* TODO: proc_bind not supported for now
 	 * assumre false */

tests/openmp/parallel_01.c

@@ -51,7 +51,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_02.c

@@ -55,7 +55,7 @@ void parallel_region_1_f(void *buffers[], void *args)
 	(void) args;
 	int worker_id;
 	pthread_t tid;
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	tid = pthread_self();
 	worker_id = starpu_worker_get_id();
 	printf("[tid %p] parallel region 1: task thread = %d\n", (void *)tid, worker_id);
@@ -68,7 +68,7 @@ void parallel_region_1_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_1_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_03.c

@@ -51,7 +51,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_barrier_01.c

@@ -59,7 +59,7 @@ void parallel_region_f(void *buffers[], void *args)
 int
 main (int argc, char *argv[]) {
 	pthread_t tid;
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;

tests/openmp/parallel_critical_01.c

@@ -66,7 +66,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	printf("<main>\n");

tests/openmp/parallel_critical_inline_01.c

@@ -69,7 +69,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	printf("<main>\n");

tests/openmp/parallel_critical_named_01.c

@@ -76,7 +76,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	printf("<main>\n");

tests/openmp/parallel_critical_named_inline_01.c

@@ -69,7 +69,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	printf("<main>\n");

tests/openmp/parallel_for_01.c

@@ -149,7 +149,7 @@ static void check_array(void)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_for_02.c

@@ -79,7 +79,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_for_ordered_01.c

@@ -167,7 +167,7 @@ static void check_array(void)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_master_01.c

@@ -66,7 +66,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));

tests/openmp/parallel_master_inline_01.c

@@ -60,7 +60,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));

tests/openmp/parallel_sections_01.c

@@ -95,7 +95,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_sections_combined_01.c

@@ -89,7 +89,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/parallel_single_inline_01.c

@@ -77,7 +77,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));

tests/openmp/parallel_single_nowait_01.c

@@ -66,7 +66,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));

tests/openmp/parallel_single_wait_01.c

@@ -66,7 +66,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	pthread_t tid;
 	tid = pthread_self();
 	memset(&attr, 0, sizeof(attr));

tests/openmp/task_01.c

@@ -55,7 +55,7 @@ void parallel_region_f(void *buffers[], void *args)
 	(void) args;
 	int worker_id;
 	pthread_t tid;
-	starpu_omp_task_region_attr_t attr;
+	struct starpu_omp_task_region_attr attr;
 
 	tid = pthread_self();
 	worker_id = starpu_worker_get_id();
@@ -76,7 +76,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/task_02.c

@@ -84,7 +84,7 @@ void task_region_g(void *buffers[], void *args)
 
 	{
 		starpu_data_handle_t task_vector_handle;
-		starpu_omp_task_region_attr_t attr;
+		struct starpu_omp_task_region_attr attr;
 		int i;
 
 		task_vector_handle = starpu_data_lookup(v);
@@ -132,7 +132,7 @@ void master_g1(void *arg)
 void master_g2(void *arg)
 {
 	starpu_data_handle_t region_vector_handle;
-	starpu_omp_task_region_attr_t attr;
+	struct starpu_omp_task_region_attr attr;
 	int i;
 
 	region_vector_handle = starpu_data_lookup(global_vector);
@@ -184,7 +184,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;

tests/openmp/taskgroup_01.c

@@ -51,7 +51,7 @@ void task_region_g(void *buffers[], void *args)
 
 void taskgroup_f(void *arg)
 {
-	starpu_omp_task_region_attr_t attr;
+	struct starpu_omp_task_region_attr attr;
 	int *p_i = (int *)arg;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0]  = task_region_g;
@@ -76,7 +76,7 @@ void parallel_region_f(void *buffers[], void *args)
 	(void) args;
 	int worker_id;
 	pthread_t tid;
-	starpu_omp_task_region_attr_t attr;
+	struct starpu_omp_task_region_attr attr;
 	int i = 0;
 
 	tid = pthread_self();
@@ -108,7 +108,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;

tests/openmp/taskwait_01.c

@@ -55,7 +55,7 @@ void parallel_region_f(void *buffers[], void *args)
 	(void) args;
 	int worker_id;
 	pthread_t tid;
-	starpu_omp_task_region_attr_t attr;
+	struct starpu_omp_task_region_attr attr;
 	int i = 0;
 
 	tid = pthread_self();
@@ -94,7 +94,7 @@ void parallel_region_f(void *buffers[], void *args)
 
 int
 main (int argc, char *argv[]) {
-	starpu_omp_parallel_region_attr_t attr;
+	struct starpu_omp_parallel_region_attr attr;
 	memset(&attr, 0, sizeof(attr));
 	attr.cl.cpu_funcs[0] = parallel_region_f;
 	attr.cl.where        = STARPU_CPU;