Quellcode durchsuchen

- use more consistent naming

Olivier Aumage vor 10 Jahren
Ursprung
Commit
e577005007
3 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
  1. 4 4
      include/starpu_openmp.h
  2. 4 4
      src/util/openmp_runtime_support.c
  3. 4 4
      tests/openmp/taskgroup_02.c

+ 4 - 4
include/starpu_openmp.h

@@ -100,8 +100,8 @@ extern void starpu_omp_critical_inline_end(const char *name) __STARPU_OMP_NOTHRO
 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;
-extern void starpu_omp_taskgroup_begin(void) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_taskgroup_end(void) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_taskgroup_inline_begin(void) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_taskgroup_inline_end(void) __STARPU_OMP_NOTHROW;
 
 extern void starpu_omp_for(void (*f)(unsigned long long _first_i, unsigned long long _nb_i, void *arg), void *arg, unsigned long long nb_iterations, unsigned long long chunk, int schedule, int ordered, int nowait) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_for_inline_first(unsigned long long nb_iterations, unsigned long long chunk, int schedule, int ordered, unsigned long long *_first_i, unsigned long long *_nb_i) __STARPU_OMP_NOTHROW;
@@ -156,8 +156,8 @@ extern void starpu_omp_destroy_nest_lock (starpu_omp_nest_lock_t *lock) __STARPU
 extern void starpu_omp_set_nest_lock (starpu_omp_nest_lock_t *lock) __STARPU_OMP_NOTHROW;
 extern void starpu_omp_unset_nest_lock (starpu_omp_nest_lock_t *lock) __STARPU_OMP_NOTHROW;
 extern int starpu_omp_test_nest_lock (starpu_omp_nest_lock_t *lock) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_atomic_fallback_start(void) __STARPU_OMP_NOTHROW;
-extern void starpu_omp_atomic_fallback_end(void) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_atomic_fallback_inline_begin(void) __STARPU_OMP_NOTHROW;
+extern void starpu_omp_atomic_fallback_inline_end(void) __STARPU_OMP_NOTHROW;
 extern double starpu_omp_get_wtime (void) __STARPU_OMP_NOTHROW;
 extern double starpu_omp_get_wtick (void) __STARPU_OMP_NOTHROW;
 

+ 4 - 4
src/util/openmp_runtime_support.c

@@ -1708,7 +1708,7 @@ void starpu_omp_taskgroup(void (*f)(void *arg), void *arg)
 	task->task_group = task_group.p_previous_task_group;
 }
 
-void starpu_omp_taskgroup_begin(void)
+void starpu_omp_taskgroup_inline_begin(void)
 {
 	struct starpu_omp_task *task = STARPU_PTHREAD_GETSPECIFIC(omp_task_key);
 	struct starpu_omp_task_group *p_task_group = malloc(sizeof(*p_task_group));
@@ -1720,7 +1720,7 @@ void starpu_omp_taskgroup_begin(void)
 	task->task_group = p_task_group;
 }
 
-void starpu_omp_taskgroup_end(void)
+void starpu_omp_taskgroup_inline_end(void)
 {
 	struct starpu_omp_task *task = STARPU_PTHREAD_GETSPECIFIC(omp_task_key);
 	_starpu_spin_lock(&task->lock);
@@ -2383,14 +2383,14 @@ int starpu_omp_test_nest_lock (starpu_omp_nest_lock_t *nest_lock)
 	return _starpu_omp_nest_lock_test(&nest_lock->internal);
 }
 
-void starpu_omp_atomic_fallback_start(void)
+void starpu_omp_atomic_fallback_inline_begin(void)
 {
 	struct starpu_omp_device *device = get_caller_device();
 	_starpu_spin_lock(&device->atomic_lock);
 
 }
 
-void starpu_omp_atomic_fallback_end(void)
+void starpu_omp_atomic_fallback_inline_end(void)
 {
 	struct starpu_omp_device *device = get_caller_device();
 	_starpu_spin_unlock(&device->atomic_lock);

+ 4 - 4
tests/openmp/taskgroup_02.c

@@ -83,14 +83,14 @@ void parallel_region_f(void *buffers[], void *args)
 	worker_id = starpu_worker_get_id();
 	printf("[tid %p] task thread = %d: implicit task \"f\"\n", (void *)tid, worker_id);
 	
-	starpu_omp_taskgroup_begin();
+	starpu_omp_taskgroup_inline_begin();
 	taskgroup_f((void *)&i);
-	starpu_omp_taskgroup_end();
+	starpu_omp_taskgroup_inline_end();
 	printf("[tid %p] task thread = %d: implicit task \"f\": taskgroup\n", (void *)tid, worker_id);
 
-	starpu_omp_taskgroup_begin();
+	starpu_omp_taskgroup_inline_begin();
 	taskgroup_f((void *)&i);
-	starpu_omp_taskgroup_end();
+	starpu_omp_taskgroup_inline_end();
 	printf("[tid %p] task thread = %d: implicit task \"f\": taskgroup\n", (void *)tid, worker_id);
 
 	memset(&attr, 0, sizeof(attr));