Prefixing of src/common/fxt.h (2nd step)

find . -type f -not -name "*svn*"|xargs sed -i s/"\bstart_fxt_profiling\b"/_starpu_start_fxt_profiling/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bstop_fxt_profiling\b"/_starpu_stop_fxt_profiling/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bfxt_register_thread\b"/_starpu_fxt_register_thread/g

examples/mult/dw_mult.c

@@ -199,7 +199,7 @@ static starpu_codelet cl = {
 static void launch_codelets(void)
 {
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(0);
+	_starpu_fxt_register_thread(0);
 #endif
 	/* partition the work into slices */
 	unsigned taskx, tasky;

examples/mult/dw_mult_no_stride.c

@@ -348,7 +348,7 @@ static void submit_new_iter(unsigned x, unsigned y, unsigned iter)
 static void launch_codelets(void)
 {
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(0);
+	_starpu_fxt_register_thread(0);
 #endif
 	/* partition the work into slices */
 	unsigned taskx, tasky;

examples/mult/dw_mult_no_stride_no_tag.c

@@ -376,7 +376,7 @@ static void callback_func_3(void *arg)
 static void launch_codelets(void)
 {
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(0);
+	_starpu_fxt_register_thread(0);
 #endif
 	/* partition the work into slices */
 	unsigned taskx, tasky;

examples/strassen/test_strassen.c

@@ -114,7 +114,7 @@ void init_problem(void)
 	unsigned i,j;
 
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(0);
+	_starpu_fxt_register_thread(0);
 #endif
 
 	A = malloc(dim*dim*sizeof(float));

src/common/fxt.c

@@ -48,7 +48,7 @@ static void profile_set_tracefile(char *fmt, ...)
 	strcat(PROF_FILE_USER, suffix);
 }
 
-void start_fxt_profiling(void)
+void _starpu_start_fxt_profiling(void)
 {
 	unsigned threadid;
 
@@ -64,7 +64,7 @@ void start_fxt_profiling(void)
 
 	threadid = syscall(SYS_gettid);
 
-	atexit(stop_fxt_profiling);
+	atexit(_starpu_stop_fxt_profiling);
 
 	if(fut_setup(PROF_BUFFER_SIZE, FUT_KEYMASKALL, threadid) < 0) {
 		perror("fut_setup");
@@ -76,7 +76,7 @@ void start_fxt_profiling(void)
 	return;
 }
 
-void stop_fxt_profiling(void)
+void _starpu_stop_fxt_profiling(void)
 {
 	if (!written)
 	{
@@ -90,7 +90,7 @@ void stop_fxt_profiling(void)
 	}
 }
 
-void fxt_register_thread(unsigned cpuid)
+void _starpu_fxt_register_thread(unsigned cpuid)
 {
 	FUT_DO_PROBE2(FUT_NEW_LWP_CODE, cpuid, syscall(SYS_gettid));
 }

src/common/fxt.h

@@ -90,9 +90,9 @@
 #include <fxt/fxt.h>
 #include <fxt/fut.h>
 
-void start_fxt_profiling(void);
-void stop_fxt_profiling(void);
-void fxt_register_thread(unsigned);
+void _starpu_start_fxt_profiling(void);
+void _starpu_stop_fxt_profiling(void);
+void _starpu_fxt_register_thread(unsigned);
 
 /* sometimes we need something a little more specific than the wrappers from
  * FxT */

src/core/workers.c

@@ -224,7 +224,7 @@ int starpu_init(struct starpu_conf *user_conf)
 	srand(2008);
 	
 #ifdef STARPU_USE_FXT
-	start_fxt_profiling();
+	_starpu_start_fxt_profiling();
 #endif
 	
 	_starpu_open_debug_logfile();
@@ -450,7 +450,7 @@ void starpu_shutdown(void)
 	_starpu_destroy_topology(&config);
 
 #ifdef STARPU_USE_FXT
-	stop_fxt_profiling();
+	_starpu_stop_fxt_profiling();
 #endif
 
 	_starpu_close_debug_logfile();

src/drivers/cpu/driver_cpu.c

@@ -99,7 +99,7 @@ void *_starpu_cpu_worker(void *arg)
 	struct starpu_worker_s *cpu_arg = arg;
 
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(cpu_arg->bindid);
+	_starpu_fxt_register_thread(cpu_arg->bindid);
 #endif
 	TRACE_WORKER_INIT_START(STARPU_FUT_CPU_KEY, cpu_arg->memory_node);
 

src/drivers/cuda/driver_cuda.c

@@ -171,7 +171,7 @@ void *_starpu_cuda_worker(void *arg)
 	unsigned memory_node = args->memory_node;
 
 #ifdef STARPU_USE_FXT
-	fxt_register_thread(args->bindid);
+	_starpu_fxt_register_thread(args->bindid);
 #endif
 	TRACE_WORKER_INIT_START(STARPU_FUT_CUDA_KEY, memory_node);