Browse Source

- update api for combined sections

Olivier Aumage 11 years ago
parent
commit
571e00557c
2 changed files with 3 additions and 3 deletions
  1. 1 1
      include/starpu_openmp.h
  2. 2 2
      src/util/openmp_runtime_support.c

+ 1 - 1
include/starpu_openmp.h

@@ -110,7 +110,7 @@ extern void starpu_omp_ordered_inline_end(void) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_ordered(void (*f)(void *arg), void *arg) __STARPU_OMP_NOTHROW;
 
 extern void starpu_omp_sections(unsigned long long nb_sections, void (**section_f)(void *arg), void **section_arg, int nowait) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_sections_combined(unsigned long long nb_sections, void (*section_f)(unsigned long long section_num, void *arg), void **section_arg, int nowait) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_sections_combined(unsigned long long nb_sections, void (*section_f)(unsigned long long section_num, void *arg), void *section_arg, int nowait) __STARPU_OMP_NOTHROW;
 
 extern void starpu_omp_set_num_threads(int threads) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_get_num_threads() __STARPU_OMP_NOTHROW;

+ 2 - 2
src/util/openmp_runtime_support.c

@@ -1929,7 +1929,7 @@ void starpu_omp_sections(unsigned long long nb_sections, void (**section_f)(void
 	}
 }
 
-void starpu_omp_sections_combined(unsigned long long nb_sections, void (*section_f)(unsigned long long section_num, void *arg), void **section_arg, int nowait)
+void starpu_omp_sections_combined(unsigned long long nb_sections, void (*section_f)(unsigned long long section_num, void *arg), void *section_arg, int nowait)
 {
 	struct starpu_omp_task *task = STARPU_PTHREAD_GETSPECIFIC(omp_task_key);
 	struct starpu_omp_region *parallel_region = task->owner_region;
@@ -1942,7 +1942,7 @@ void starpu_omp_sections_combined(unsigned long long nb_sections, void (*section
 		if (sections->next_section_num < nb_sections)
 		{
 			section_num = sections->next_section_num;
-			arg = section_arg[sections->next_section_num];
+			arg = section_arg;
 			sections->next_section_num ++;
 		}
 		else