Renaming public functions :

starpu_print_bus_bandwidth     => starpu_bus_print_bandwidth
starpu_get_handle_interface_id => starpu_handle_get_interface_id
starpu_get_current_task        => starpu_task_get_current

include/starpu_data_interfaces.h

@@ -385,7 +385,7 @@ void starpu_multiformat_data_register(starpu_data_handle_t *handle, uint32_t hom
 
 #define STARPU_MULTIFORMAT_GET_NX(interface)  (((struct starpu_multiformat_interface *)(interface))->nx)
 
-enum starpu_data_interface_id starpu_get_handle_interface_id(starpu_data_handle_t handle);
+enum starpu_data_interface_id starpu_handle_get_interface_id(starpu_data_handle_t handle);
 
 /* Lookup a ram pointer into a StarPU handle */
 extern starpu_data_handle_t starpu_data_lookup(const void *ptr);

include/starpu_perfmodel.h

@@ -208,7 +208,7 @@ void starpu_perfmodel_get_arch_name(enum starpu_perf_archtype arch, char *archna
 int starpu_list_models(FILE *output);
 
 void starpu_force_bus_sampling(void);
-void starpu_print_bus_bandwidth(FILE *f);
+void starpu_bus_print_bandwidth(FILE *f);
 
 #ifdef __cplusplus
 }

include/starpu_task.h

@@ -305,7 +305,7 @@ void starpu_display_codelet_stats(struct starpu_codelet *cl);
 /* Return the task currently executed by the worker, or NULL if this is called
  * either from a thread that is not a task or simply because there is no task
  * being executed at the moment. */
-struct starpu_task *starpu_get_current_task(void);
+struct starpu_task *starpu_task_get_current(void);
 
 #ifdef __cplusplus
 }

mpi/starpu_mpi_datatype.c

@@ -133,7 +133,7 @@ static handle_to_datatype_func handle_to_datatype_funcs[STARPU_NINTERFACES_ID] =
 
 int starpu_mpi_handle_to_datatype(starpu_data_handle_t data_handle, MPI_Datatype *datatype)
 {
-	enum starpu_data_interface_id id = starpu_get_handle_interface_id(data_handle);
+	enum starpu_data_interface_id id = starpu_handle_get_interface_id(data_handle);
 
 	handle_to_datatype_func func = handle_to_datatype_funcs[id];
 

socl/src/task.c

@@ -19,7 +19,7 @@
 #include "event.h"
 
 static void task_release_callback(void *arg) {
-  starpu_task task = starpu_get_current_task();
+  starpu_task task = starpu_task_get_current();
   cl_command cmd = (cl_command)arg;
   
   cl_event ev = command_event_get(cmd);

src/core/jobs.c

@@ -177,7 +177,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j, unsigned job_is_alrea
 		/* Perhaps we have nested callbacks (eg. with chains of empty
 		 * tasks). So we store the current task and we will restore it
 		 * later. */
-		struct starpu_task *current_task = starpu_get_current_task();
+		struct starpu_task *current_task = starpu_task_get_current();
 
 		_starpu_set_current_task(task);
 

src/core/perfmodel/perfmodel_bus.c

@@ -1033,7 +1033,7 @@ static void write_bus_bandwidth_file_content(void)
 	fclose(f);
 }
 
-void starpu_print_bus_bandwidth(FILE *f)
+void starpu_bus_print_bandwidth(FILE *f)
 {
 	int src, dst, maxnode;
 

src/core/task.c

@@ -130,7 +130,7 @@ void starpu_task_destroy(struct starpu_task *task)
 
    /* If starpu_task_destroy is called in a callback, we just set the destroy
       flag. The task will be destroyed after the callback returns */
-   if (task == starpu_get_current_task()
+   if (task == starpu_task_get_current()
        && _starpu_get_local_worker_status() == STATUS_CALLBACK)
    {
 
@@ -633,7 +633,7 @@ void _starpu_initialize_current_task_key(void)
 /* Return the task currently executed by the worker, or NULL if this is called
  * either from a thread that is not a task or simply because there is no task
  * being executed at the moment. */
-struct starpu_task *starpu_get_current_task(void)
+struct starpu_task *starpu_task_get_current(void)
 {
 	return (struct starpu_task *) pthread_getspecific(current_task_key);
 }

src/datawizard/footprint.c

@@ -53,7 +53,7 @@ uint32_t _starpu_compute_buffers_footprint(struct starpu_perfmodel *model, enum
 
 uint32_t _starpu_compute_data_footprint(starpu_data_handle_t handle)
 {
-	uint32_t interfaceid = (uint32_t)starpu_get_handle_interface_id(handle);
+	uint32_t interfaceid = (uint32_t)starpu_handle_get_interface_id(handle);
 
 	uint32_t handle_footprint = handle->ops->footprint(handle);
 

src/datawizard/interfaces/data_interface.c

@@ -572,7 +572,7 @@ void starpu_data_invalidate(starpu_data_handle_t handle)
 	starpu_data_release(handle);
 }
 
-enum starpu_data_interface_id starpu_get_handle_interface_id(starpu_data_handle_t handle)
+enum starpu_data_interface_id starpu_handle_get_interface_id(starpu_data_handle_t handle)
 {
 	return handle->ops->interfaceid;
 }

src/drivers/opencl/driver_opencl_utils.c

@@ -263,7 +263,7 @@ cl_int starpu_opencl_unload_opencl(struct starpu_opencl_program *opencl_programs
 int starpu_opencl_collect_stats(cl_event event STARPU_ATTRIBUTE_UNUSED)
 {
 #if defined(CL_PROFILING_CLOCK_CYCLE_COUNT)||defined(CL_PROFILING_STALL_CYCLE_COUNT)||defined(CL_PROFILING_POWER_CONSUMED)
-	struct starpu_task *task = starpu_get_current_task();
+	struct starpu_task *task = starpu_task_get_current();
 	struct starpu_task_profiling_info *info = task->profiling_info;
 #endif
 

tests/core/declare_deps_in_callback.c

@@ -30,7 +30,7 @@ static void callback(void *arg)
 	struct starpu_task *taskA, *taskB;
 	int ret;
 
-	taskA = starpu_get_current_task();
+	taskA = starpu_task_get_current();
 	taskB = (struct starpu_task *) arg;
 
 	starpu_task_declare_deps_array(taskB, 1, &taskA);

tests/core/get_current_task.c

@@ -27,14 +27,14 @@ static void check_task_func(void *descr[], void *arg)
 {
 	/* We check that the returned task is valid from the codelet */
 	struct starpu_task *task = (struct starpu_task *) arg;
-	STARPU_ASSERT(task == starpu_get_current_task());
+	STARPU_ASSERT(task == starpu_task_get_current());
 }
 
 static void check_task_callback(void *arg)
 {
 	/* We check that the returned task is valid from the callback */
 	struct starpu_task *task = (struct starpu_task *) arg;
-	STARPU_ASSERT(task == starpu_get_current_task());
+	STARPU_ASSERT(task == starpu_task_get_current());
 }
 
 static struct starpu_codelet dummy_cl =

tests/core/regenerate.c

@@ -31,7 +31,7 @@ static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 
 static void callback(void *arg __attribute__ ((unused)))
 {
-	struct starpu_task *task = starpu_get_current_task();
+	struct starpu_task *task = starpu_task_get_current();
 
 	cnt++;
 

tests/core/wait_all_regenerable_tasks.c

@@ -26,7 +26,7 @@ static unsigned ntasks = 1024;
 
 static void callback(void *arg)
 {
-	struct starpu_task *task = starpu_get_current_task();
+	struct starpu_task *task = starpu_task_get_current();
 
 	unsigned *cnt = (unsigned *) arg;
 

tools/dev/rename.sed

@@ -136,3 +136,7 @@ s/\bSTARPU_GET_CSR_COLIND\b/STARPU_CSR_GET_COLIND/g
 s/\bSTARPU_GET_CSR_ROWPTR\b/STARPU_CSR_GET_ROWPTR/g
 s/\bSTARPU_GET_CSR_FIRSTENTRY\b/STARPU_CSR_GET_FIRSTENTRY/g
 s/\bSTARPU_GET_CSR_ELEMSIZE\b/STARPU_CSR_GET_ELEMSIZE/g
+s/\bstarpu_print_bus_bandwidth\b/starpu_bus_print_bandwidth/g
+s/\bstarpu_get_handle_interface_id\b/starpu_handle_get_interface_id/g
+s/\bstarpu_get_current_task\b/starpu_task_get_current/g
+

tools/starpu_machine_display.c

@@ -91,7 +91,7 @@ int main(int argc, char **argv)
 
 	display_all_combined_workers();
 
-	starpu_print_bus_bandwidth(stdout);
+	starpu_bus_print_bandwidth(stdout);
 
 	starpu_shutdown();