Prefixing of src/common/timing.h

find . -type f -not -name "*svn*"|xargs sed -i s/"\btick_s\b"/starpu_tick_s/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btick_t\b"/starpu_tick_t/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bu_tick\b"/starpu_u_tick/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bGET_TICK\b"/STARPU_GET_TICK/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btiming_init\b"/_starpu_timing_init/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btiming_delay\b"/_starpu_timing_delay/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\btiming_now\b"/_starpu_timing_now/g

examples/cholesky/dw_cholesky.c

@@ -223,7 +223,7 @@ void initialize_system(float **A, unsigned dim, unsigned pinned)
 	
 	starpu_helper_init_cublas();
 
-	timing_init();
+	_starpu_timing_init();
 
 	if (pinned)
 	{

examples/cholesky/dw_cholesky_grain.c

@@ -252,7 +252,7 @@ void initialize_system(float **A, unsigned dim, unsigned pinned)
 
 	starpu_helper_init_cublas();
 
-	timing_init();
+	_starpu_timing_init();
 
 	if (pinned)
 	{

examples/cholesky/dw_cholesky_no_stride.c

@@ -261,7 +261,7 @@ int main(int argc, char **argv)
 
 	starpu_helper_init_cublas();
 
-	timing_init();
+	_starpu_timing_init();
 
 	for (y = 0; y < nblocks; y++)
 	for (x = 0; x < nblocks; x++)

examples/heat/dw_factolu.c

@@ -691,7 +691,7 @@ void initialize_system(float **A, float **B, unsigned dim, unsigned pinned)
 {
 	starpu_init(NULL);
 
-	timing_init();
+	_starpu_timing_init();
 
 	starpu_helper_init_cublas();
 

src/common/timing.c

@@ -22,7 +22,7 @@
 				- (long long)((t1).ts.tv_sec*1e9) + (long long)(t1).ts.tv_nsec)
 #define TIMING_DELAY(t1, t2) _starpu_tick2usec(TICK_DIFF((t1), (t2)))
 
-void timing_init(void)
+void _starpu_timing_init(void)
 {
 }
 
@@ -31,7 +31,7 @@ inline double _starpu_tick2usec(long long t)
   return (double)(t)/1000;
 }
 
-inline double timing_delay(tick_t *t1, tick_t *t2)
+inline double _starpu_timing_delay(starpu_tick_t *t1, starpu_tick_t *t2)
 {
 	double d1, d2;
 
@@ -42,10 +42,10 @@ inline double timing_delay(tick_t *t1, tick_t *t2)
 }
 
 /* returns the current time in us */
-inline double timing_now(void)
+inline double _starpu_timing_now(void)
 {
-	tick_t tick_now;
+	starpu_tick_t tick_now;
-	GET_TICK(tick_now);
+	STARPU_GET_TICK(tick_now);
 
 	return _starpu_tick2usec(((tick_now).ts.tv_sec*1e9) + (tick_now).ts.tv_nsec);
 }
@@ -63,9 +63,9 @@ static unsigned long long residual = 0;
 
 static int inited = 0;
 
-void timing_init(void)
+void _starpu_timing_init(void)
 {
-  static tick_t t1, t2;
+  static starpu_tick_t t1, t2;
   int i;
 
   if (inited) return;
@@ -74,18 +74,18 @@ void timing_init(void)
   
   for(i = 0; i < 20; i++)
     {
-      GET_TICK(t1);
+      STARPU_GET_TICK(t1);
-      GET_TICK(t2);
+      STARPU_GET_TICK(t2);
       residual = STARPU_MIN(residual, TICK_RAW_DIFF(t1, t2));
     }
   
   {
     struct timeval tv1,tv2;
     
-    GET_TICK(t1);
+    STARPU_GET_TICK(t1);
     gettimeofday(&tv1,0);
     usleep(500000);
-    GET_TICK(t2);
+    STARPU_GET_TICK(t2);
     gettimeofday(&tv2,0);
     scale = ((tv2.tv_sec*1e6 + tv2.tv_usec) -
 	     (tv1.tv_sec*1e6 + tv1.tv_usec)) / 
@@ -100,15 +100,15 @@ inline double _starpu_tick2usec(long long t)
   return (double)(t)*scale;
 }
 
-inline double timing_delay(tick_t *t1, tick_t *t2)
+inline double _starpu_timing_delay(starpu_tick_t *t1, starpu_tick_t *t2)
 {
 	return TIMING_DELAY(*t1, *t2);
 }
 
-inline double timing_now(void)
+inline double _starpu_timing_now(void)
 {
-	tick_t tick_now;
+	starpu_tick_t tick_now;
-	GET_TICK(tick_now);
+	STARPU_GET_TICK(tick_now);
 
 	return _starpu_tick2usec(tick_now.tick);
 }

src/common/timing.h

@@ -18,10 +18,10 @@
 #define TIMING_H
 
 /*
- * -- Initialiser la bibliothèque avec timing_init();
+ * -- Initialiser la bibliothèque avec _starpu_timing_init();
  * -- Mémoriser un timestamp :
- *  tick_t t;
+ *  starpu_tick_t t;
- *  GET_TICK(t);
+ *  STARPU_GET_TICK(t);
  * -- Calculer un intervalle en microsecondes :
  *  TIMING_DELAY(t1, t2);
  */
@@ -40,15 +40,15 @@
 #endif
 
 /* we use the usual gettimeofday method */
-typedef struct tick_s
+typedef struct starpu_tick_s
 {
 	struct timespec ts;
-} tick_t;
+} starpu_tick_t;
-#define GET_TICK(t) clock_gettime(CLOCK_MONOTONIC, &((t).ts))
+#define STARPU_GET_TICK(t) clock_gettime(CLOCK_MONOTONIC, &((t).ts))
 
 #else // !STARPU_HAVE_CLOCK_GETTIME
 
-typedef union u_tick
+typedef union starpu_u_tick
 {
   uint64_t tick;
 
@@ -58,24 +58,24 @@ typedef union u_tick
     uint32_t high;
   }
   sub;
-} tick_t;
+} starpu_tick_t;
 
 #if defined(__i386__) || defined(__pentium__) || defined(__pentiumpro__) || defined(__i586__) || defined(__i686__) || defined(__k6__) || defined(__k7__) || defined(__x86_64__)
-#  define GET_TICK(t) __asm__ volatile("rdtsc" : "=a" ((t).sub.low), "=d" ((t).sub.high))
+#  define STARPU_GET_TICK(t) __asm__ volatile("rdtsc" : "=a" ((t).sub.low), "=d" ((t).sub.high))
 #else
 //#  error "Processeur non-supporté par timing.h"
 /* XXX */
-//#warning "unsupported processor GET_TICK returns 0"
+//#warning "unsupported processor STARPU_GET_TICK returns 0"
-#  define GET_TICK(t) do {} while(0);
+#  define STARPU_GET_TICK(t) do {} while(0);
 #endif
 
 #endif // STARPU_HAVE_CLOCK_GETTIME
 
-void __attribute__ ((unused)) timing_init(void);
+void __attribute__ ((unused)) _starpu_timing_init(void);
 inline double __attribute__ ((unused)) _starpu_tick2usec(long long t);
-inline double __attribute__ ((unused)) timing_delay(tick_t *t1, tick_t *t2);
+inline double __attribute__ ((unused)) _starpu_timing_delay(starpu_tick_t *t1, starpu_tick_t *t2);
 
-inline double __attribute__ ((unused)) timing_now(void);
+inline double __attribute__ ((unused)) _starpu_timing_now(void);
 
 #endif /* TIMING_H */
 

src/core/mechanisms/deque_queues.c

@@ -60,7 +60,7 @@ struct starpu_jobq_s *_starpu_create_deque(void)
 	deque->njobs = 0;
 	deque->nprocessed = 0;
 
-	deque->exp_start = timing_now();
+	deque->exp_start = _starpu_timing_now();
 	deque->exp_len = 0.0;
 	deque->exp_end = deque->exp_start;
 

src/core/mechanisms/fifo_queues.c

@@ -56,7 +56,7 @@ struct starpu_jobq_s *_starpu_create_fifo(void)
 	fifo->njobs = 0;
 	fifo->nprocessed = 0;
 
-	fifo->exp_start = timing_now();
+	fifo->exp_start = _starpu_timing_now();
 	fifo->exp_len = 0.0;
 	fifo->exp_end = fifo->exp_start;
 

src/core/mechanisms/stack_queues.c

@@ -52,7 +52,7 @@ struct starpu_jobq_s *_starpu_create_stack(void)
 	stack->njobs = 0;
 	stack->nprocessed = 0;
 
-	stack->exp_start = timing_now();
+	stack->exp_start = _starpu_timing_now();
 	stack->exp_len = 0.0;
 	stack->exp_end = stack->exp_start;
 

src/core/policies/deque-modeling-policy-data-aware.c

@@ -34,7 +34,7 @@ static starpu_job_t dmda_pop_task(struct starpu_jobq_s *q)
 		double model = j->predicted;
 	
 		fifo->exp_len -= model;
-		fifo->exp_start = timing_now() + model;
+		fifo->exp_start = _starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 	}	
 
@@ -82,8 +82,8 @@ static int _dmda_push_task(struct starpu_jobq_s *q __attribute__ ((unused)) , st
 	{
 		fifo = queue_array[worker]->queue;
 
-		fifo->exp_start = STARPU_MAX(fifo->exp_start, timing_now());
+		fifo->exp_start = STARPU_MAX(fifo->exp_start, _starpu_timing_now());
-		fifo->exp_end = STARPU_MAX(fifo->exp_end, timing_now());
+		fifo->exp_end = STARPU_MAX(fifo->exp_end, _starpu_timing_now());
 
 		if ((queue_array[worker]->who & task->cl->where) == 0)
 		{

src/core/policies/deque-modeling-policy.c

@@ -32,7 +32,7 @@ static starpu_job_t dm_pop_task(struct starpu_jobq_s *q)
 		double model = j->predicted;
 	
 		fifo->exp_len -= model;
-		fifo->exp_start = timing_now() + model;
+		fifo->exp_start = _starpu_timing_now() + model;
 		fifo->exp_end = fifo->exp_start + fifo->exp_len;
 	}	
 
@@ -54,7 +54,7 @@ static struct starpu_job_list_s *dm_pop_every_task(struct starpu_jobq_s *q, uint
 			double model = i->predicted;
 	
 			fifo->exp_len -= model;
-			fifo->exp_start = timing_now() + model;
+			fifo->exp_start = _starpu_timing_now() + model;
 			fifo->exp_end = fifo->exp_start + fifo->exp_len;
 		}
 	}
@@ -82,8 +82,8 @@ static int _dm_push_task(struct starpu_jobq_s *q __attribute__ ((unused)), starp
 		
 		fifo = queue_array[worker]->queue;
 
-		fifo->exp_start = STARPU_MAX(fifo->exp_start, timing_now());
+		fifo->exp_start = STARPU_MAX(fifo->exp_start, _starpu_timing_now());
-		fifo->exp_end = STARPU_MAX(fifo->exp_end, timing_now());
+		fifo->exp_end = STARPU_MAX(fifo->exp_end, _starpu_timing_now());
 
 		if ((queue_array[worker]->who & task->cl->where) == 0)
 		{

src/core/workers.c

@@ -229,7 +229,7 @@ int starpu_init(struct starpu_conf *user_conf)
 	
 	_starpu_open_debug_logfile();
 
-	timing_init();
+	_starpu_timing_init();
 
 	_starpu_load_bus_performance_files();
 

src/drivers/cpu/driver_cpu.c

@@ -23,8 +23,8 @@
 static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 {
 	int ret;
-	tick_t codelet_start, codelet_end;
+	starpu_tick_t codelet_start, codelet_end;
-	tick_t codelet_start_comm, codelet_end_comm;
+	starpu_tick_t codelet_start_comm, codelet_end_comm;
 
 	unsigned calibrate_model = 0;
 	struct starpu_task *task = j->task;
@@ -37,12 +37,12 @@ static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 		calibrate_model = 1;
 
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
-		GET_TICK(codelet_start_comm);
+		STARPU_GET_TICK(codelet_start_comm);
 
 	ret = _starpu_fetch_task_input(task, 0);
 
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
-		GET_TICK(codelet_end_comm);
+		STARPU_GET_TICK(codelet_end_comm);
 
 	if (ret != 0) {
 		/* there was not enough memory so the codelet cannot be executed right now ... */
@@ -53,7 +53,7 @@ static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 	TRACE_START_CODELET_BODY(j);
 
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
-		GET_TICK(codelet_start);
+		STARPU_GET_TICK(codelet_start);
 
 	cpu_args->status = STATUS_EXECUTING;
 	cl_func func = cl->cpu_func;
@@ -62,7 +62,7 @@ static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 	cl->per_worker_stats[cpu_args->workerid]++;
 	
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
-		GET_TICK(codelet_end);
+		STARPU_GET_TICK(codelet_end);
 
 	TRACE_END_CODELET_BODY(j);
 	cpu_args->status = STATUS_UNKNOWN;
@@ -72,8 +72,8 @@ static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 //#ifdef STARPU_MODEL_DEBUG
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
 	{
-		double measured = timing_delay(&codelet_start, &codelet_end);
+		double measured = _starpu_timing_delay(&codelet_start, &codelet_end);
-		double measured_comm = timing_delay(&codelet_start_comm, &codelet_end_comm);
+		double measured_comm = _starpu_timing_delay(&codelet_start_comm, &codelet_end_comm);
 
 //		fprintf(stderr, "%d\t%d\n", (int)j->penality, (int)measured_comm);
 		cpu_args->jobq->total_computation_time += measured;

src/drivers/cuda/driver_cuda.c

@@ -87,8 +87,8 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 	struct starpu_task *task = j->task;
 
 	cudaError_t cures;
-	tick_t codelet_start, codelet_end;
+	starpu_tick_t codelet_start, codelet_end;
-	tick_t codelet_start_comm, codelet_end_comm;
+	starpu_tick_t codelet_start_comm, codelet_end_comm;
 	
 	unsigned calibrate_model = 0;
 
@@ -105,7 +105,7 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 		cures = cudaThreadSynchronize();
 		if (STARPU_UNLIKELY(cures))
 			STARPU_CUDA_REPORT_ERROR(cures);
-		GET_TICK(codelet_start_comm);
+		STARPU_GET_TICK(codelet_start_comm);
 	}
 
 	ret = _starpu_fetch_task_input(task, mask);
@@ -121,7 +121,7 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 		cures = cudaThreadSynchronize();
 		if (STARPU_UNLIKELY(cures))
 			STARPU_CUDA_REPORT_ERROR(cures);
-		GET_TICK(codelet_end_comm);
+		STARPU_GET_TICK(codelet_end_comm);
 	}
 
 	TRACE_START_CODELET_BODY(j);
@@ -129,12 +129,12 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 	args->status = STATUS_EXECUTING;
 	cl_func func = cl->cuda_func;
 	STARPU_ASSERT(func);
-	GET_TICK(codelet_start);
+	STARPU_GET_TICK(codelet_start);
 	func(task->interface, task->cl_arg);
 
 	cl->per_worker_stats[args->workerid]++;
 
-	GET_TICK(codelet_end);
+	STARPU_GET_TICK(codelet_end);
 
 	args->status = STATUS_UNKNOWN;
 
@@ -142,8 +142,8 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 
 	if (calibrate_model || STARPU_BENCHMARK_COMM)
 	{
-		double measured = timing_delay(&codelet_start, &codelet_end);
+		double measured = _starpu_timing_delay(&codelet_start, &codelet_end);
-		double measured_comm = timing_delay(&codelet_start_comm, &codelet_end_comm);
+		double measured_comm = _starpu_timing_delay(&codelet_start_comm, &codelet_end_comm);
 
 		args->jobq->total_computation_time += measured;
 		args->jobq->total_communication_time += measured_comm;