Prefixing of src/common/fxt.h (1st step)

find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_APPS_KEY\b"/STARPU_FUT_APPS_KEY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_CPU_KEY\b"/STARPU_FUT_CPU_KEY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_CUDA_KEY\b"/STARPU_FUT_CUDA_KEY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_WORKER_INIT_START\b"/STARPU_FUT_WORKER_INIT_START/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_WORKER_INIT_END\b"/STARPU_FUT_WORKER_INIT_END/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_CODELET_BODY\b"/STARPU_FUT_START_CODELET_BODY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_CODELET_BODY\b"/STARPU_FUT_END_CODELET_BODY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_JOB_PUSH\b"/STARPU_FUT_JOB_PUSH/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_JOB_POP\b"/STARPU_FUT_JOB_POP/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_FETCH_INPUT\b"/STARPU_FUT_START_FETCH_INPUT/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_FETCH_INPUT\b"/STARPU_FUT_END_FETCH_INPUT/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_PUSH_OUTPUT\b"/STARPU_FUT_START_PUSH_OUTPUT/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_PUSH_OUTPUT\b"/STARPU_FUT_END_PUSH_OUTPUT/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_CODELET_TAG\b"/STARPU_FUT_CODELET_TAG/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_CODELET_TAG_DEPS\b"/STARPU_FUT_CODELET_TAG_DEPS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_DATA_COPY\b"/STARPU_FUT_DATA_COPY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_WORK_STEALING\b"/STARPU_FUT_WORK_STEALING/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_WORKER_DEINIT_START\b"/STARPU_FUT_WORKER_DEINIT_START/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_WORKER_DEINIT_END\b"/STARPU_FUT_WORKER_DEINIT_END/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_USER_DEFINED_START\b"/STARPU_FUT_USER_DEFINED_START/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_USER_DEFINED_END\b"/STARPU_FUT_USER_DEFINED_END/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_NEW_MEM_NODE\b"/STARPU_FUT_NEW_MEM_NODE/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_CALLBACK\b"/STARPU_FUT_START_CALLBACK/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_CALLBACK\b"/STARPU_FUT_END_CALLBACK/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_TASK_DONE\b"/STARPU_FUT_TASK_DONE/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_ALLOC\b"/STARPU_FUT_START_ALLOC/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_ALLOC\b"/STARPU_FUT_END_ALLOC/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_ALLOC_REUSE\b"/STARPU_FUT_START_ALLOC_REUSE/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_ALLOC_REUSE\b"/STARPU_FUT_END_ALLOC_REUSE/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_MEMRECLAIM\b"/STARPU_FUT_START_MEMRECLAIM/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_MEMRECLAIM\b"/STARPU_FUT_END_MEMRECLAIM/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_DRIVER_COPY\b"/STARPU_FUT_START_DRIVER_COPY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_DRIVER_COPY\b"/STARPU_FUT_END_DRIVER_COPY/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_START_PROGRESS\b"/STARPU_FUT_START_PROGRESS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_END_PROGRESS\b"/STARPU_FUT_END_PROGRESS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bFUT_USER_EVENT\b"/STARPU_FUT_USER_EVENT/g

src/common/fxt.h

@@ -31,59 +31,59 @@
 #include <starpu.h>
 
 /* some key to identify the worker kind */
-#define FUT_APPS_KEY	0x100
-#define FUT_CPU_KEY	0x101
-#define FUT_CUDA_KEY	0x102
+#define STARPU_FUT_APPS_KEY	0x100
+#define STARPU_FUT_CPU_KEY	0x101
+#define STARPU_FUT_CUDA_KEY	0x102
 
-#define FUT_WORKER_INIT_START	0x5133
-#define FUT_WORKER_INIT_END	0x5134
+#define STARPU_FUT_WORKER_INIT_START	0x5133
+#define STARPU_FUT_WORKER_INIT_END	0x5134
 
-#define	FUT_START_CODELET_BODY	0x5103
-#define	FUT_END_CODELET_BODY	0x5104
+#define	STARPU_FUT_START_CODELET_BODY	0x5103
+#define	STARPU_FUT_END_CODELET_BODY	0x5104
 
-#define FUT_JOB_PUSH		0x5105
-#define FUT_JOB_POP		0x5106
+#define STARPU_FUT_JOB_PUSH		0x5105
+#define STARPU_FUT_JOB_POP		0x5106
 
-#define FUT_START_FETCH_INPUT	0x5107
-#define FUT_END_FETCH_INPUT	0x5108
-#define FUT_START_PUSH_OUTPUT	0x5109
-#define FUT_END_PUSH_OUTPUT	0x5110
+#define STARPU_FUT_START_FETCH_INPUT	0x5107
+#define STARPU_FUT_END_FETCH_INPUT	0x5108
+#define STARPU_FUT_START_PUSH_OUTPUT	0x5109
+#define STARPU_FUT_END_PUSH_OUTPUT	0x5110
 
-#define FUT_CODELET_TAG		0x5111
-#define FUT_CODELET_TAG_DEPS	0x5112
+#define STARPU_FUT_CODELET_TAG		0x5111
+#define STARPU_FUT_CODELET_TAG_DEPS	0x5112
 
-#define FUT_DATA_COPY		0x5113
-#define FUT_WORK_STEALING	0x5114
+#define STARPU_FUT_DATA_COPY		0x5113
+#define STARPU_FUT_WORK_STEALING	0x5114
 
-#define FUT_WORKER_DEINIT_START	0x5135
-#define FUT_WORKER_DEINIT_END	0x5136
+#define STARPU_FUT_WORKER_DEINIT_START	0x5135
+#define STARPU_FUT_WORKER_DEINIT_END	0x5136
 
-#define FUT_USER_DEFINED_START	0x5116
-#define FUT_USER_DEFINED_END	0x5117
+#define STARPU_FUT_USER_DEFINED_START	0x5116
+#define STARPU_FUT_USER_DEFINED_END	0x5117
 
-#define	FUT_NEW_MEM_NODE	0x5118
+#define	STARPU_FUT_NEW_MEM_NODE	0x5118
 
-#define	FUT_START_CALLBACK	0x5119
-#define	FUT_END_CALLBACK	0x5120
+#define	STARPU_FUT_START_CALLBACK	0x5119
+#define	STARPU_FUT_END_CALLBACK	0x5120
 
-#define	FUT_TASK_DONE		0x5121
+#define	STARPU_FUT_TASK_DONE		0x5121
 
-#define	FUT_START_ALLOC		0x5122
-#define	FUT_END_ALLOC		0x5123
+#define	STARPU_FUT_START_ALLOC		0x5122
+#define	STARPU_FUT_END_ALLOC		0x5123
 
-#define	FUT_START_ALLOC_REUSE	0x5128
-#define	FUT_END_ALLOC_REUSE	0x5129
+#define	STARPU_FUT_START_ALLOC_REUSE	0x5128
+#define	STARPU_FUT_END_ALLOC_REUSE	0x5129
 
-#define	FUT_START_MEMRECLAIM	0x5124
-#define	FUT_END_MEMRECLAIM	0x5125
+#define	STARPU_FUT_START_MEMRECLAIM	0x5124
+#define	STARPU_FUT_END_MEMRECLAIM	0x5125
 
-#define	FUT_START_DRIVER_COPY	0x5126
-#define	FUT_END_DRIVER_COPY	0x5127
+#define	STARPU_FUT_START_DRIVER_COPY	0x5126
+#define	STARPU_FUT_END_DRIVER_COPY	0x5127
 
-#define	FUT_START_PROGRESS	0x5130
-#define	FUT_END_PROGRESS	0x5131
+#define	STARPU_FUT_START_PROGRESS	0x5130
+#define	STARPU_FUT_END_PROGRESS	0x5131
 
-#define FUT_USER_EVENT		0x5132
+#define STARPU_FUT_USER_EVENT		0x5132
 
 #ifdef STARPU_USE_FXT
 #include <sys/syscall.h> /* pour les définitions de SYS_xxx */
@@ -110,15 +110,15 @@ do {									\
 	sprintf((char *)args, "%s", str);				\
 } while (0);
 
-/* workerkind = FUT_CPU_KEY for instance */
+/* workerkind = STARPU_FUT_CPU_KEY for instance */
 #define TRACE_NEW_MEM_NODE(nodeid)			\
-	FUT_DO_PROBE2(FUT_NEW_MEM_NODE, nodeid, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_NEW_MEM_NODE, nodeid, syscall(SYS_gettid));
 
 #define TRACE_WORKER_INIT_START(workerkind,memnode)	\
-	FUT_DO_PROBE3(FUT_WORKER_INIT_START, workerkind, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE3(STARPU_FUT_WORKER_INIT_START, workerkind, memnode, syscall(SYS_gettid));
 
 #define TRACE_WORKER_INIT_END				\
-	FUT_DO_PROBE1(FUT_WORKER_INIT_END, syscall(SYS_gettid));
+	FUT_DO_PROBE1(STARPU_FUT_WORKER_INIT_END, syscall(SYS_gettid));
 
 #define TRACE_START_CODELET_BODY(job)					\
 do {									\
@@ -126,46 +126,46 @@ do {									\
 	if (model && model->symbol)					\
 	{								\
 		/* we include the symbol name */			\
-		FUT_DO_PROBE3STR(FUT_START_CODELET_BODY, job, syscall(SYS_gettid), 1, model->symbol);\
+		FUT_DO_PROBE3STR(STARPU_FUT_START_CODELET_BODY, job, syscall(SYS_gettid), 1, model->symbol);\
 	}								\
 	else {								\
-		FUT_DO_PROBE3(FUT_START_CODELET_BODY, job, syscall(SYS_gettid), 0);\
+		FUT_DO_PROBE3(STARPU_FUT_START_CODELET_BODY, job, syscall(SYS_gettid), 0);\
 	}								\
 } while(0);
 
 
 #define TRACE_END_CODELET_BODY(job)	\
-	FUT_DO_PROBE2(FUT_END_CODELET_BODY, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_CODELET_BODY, job, syscall(SYS_gettid));
 
 #define TRACE_START_CALLBACK(job)	\
-	FUT_DO_PROBE2(FUT_START_CALLBACK, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_CALLBACK, job, syscall(SYS_gettid));
 
 #define TRACE_END_CALLBACK(job)	\
-	FUT_DO_PROBE2(FUT_END_CALLBACK, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_CALLBACK, job, syscall(SYS_gettid));
 
 #define TRACE_JOB_PUSH(task, prio)	\
-	FUT_DO_PROBE3(FUT_JOB_PUSH, task, prio, syscall(SYS_gettid));
+	FUT_DO_PROBE3(STARPU_FUT_JOB_PUSH, task, prio, syscall(SYS_gettid));
 
 #define TRACE_JOB_POP(task, prio)	\
-	FUT_DO_PROBE3(FUT_JOB_POP, task, prio, syscall(SYS_gettid));
+	FUT_DO_PROBE3(STARPU_FUT_JOB_POP, task, prio, syscall(SYS_gettid));
 
 #define TRACE_START_FETCH_INPUT(job)	\
-	FUT_DO_PROBE2(FUT_START_FETCH_INPUT, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_FETCH_INPUT, job, syscall(SYS_gettid));
 
 #define TRACE_END_FETCH_INPUT(job)	\
-	FUT_DO_PROBE2(FUT_END_FETCH_INPUT, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_FETCH_INPUT, job, syscall(SYS_gettid));
 
 #define TRACE_START_PUSH_OUTPUT(job)	\
-	FUT_DO_PROBE2(FUT_START_PUSH_OUTPUT, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_PUSH_OUTPUT, job, syscall(SYS_gettid));
 
 #define TRACE_END_PUSH_OUTPUT(job)	\
-	FUT_DO_PROBE2(FUT_END_PUSH_OUTPUT, job, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_PUSH_OUTPUT, job, syscall(SYS_gettid));
 
 #define TRACE_CODELET_TAG(tag, job)	\
-	FUT_DO_PROBE2(FUT_CODELET_TAG, tag, job)
+	FUT_DO_PROBE2(STARPU_FUT_CODELET_TAG, tag, job)
 
 #define TRACE_CODELET_TAG_DEPS(tag_child, tag_father)	\
-	FUT_DO_PROBE2(FUT_CODELET_TAG_DEPS, tag_child, tag_father)
+	FUT_DO_PROBE2(STARPU_FUT_CODELET_TAG_DEPS, tag_child, tag_father)
 
 #define TRACE_TASK_DONE(tag)							\
 do {										\
@@ -176,63 +176,63 @@ do {										\
 		&& job->task->cl->model->symbol)				\
 	{									\
 		char *symbol = job->task->cl->model->symbol;			\
-		FUT_DO_PROBE3STR(FUT_TASK_DONE, tag->id, syscall(SYS_gettid), 1, symbol);\
+		FUT_DO_PROBE3STR(STARPU_FUT_TASK_DONE, tag->id, syscall(SYS_gettid), 1, symbol);\
 	}									\
 	else {									\
-		FUT_DO_PROBE3(FUT_TASK_DONE, tag->id, syscall(SYS_gettid), 0);	\
+		FUT_DO_PROBE3(STARPU_FUT_TASK_DONE, tag->id, syscall(SYS_gettid), 0);	\
 	}									\
 } while(0);
 
 #define TRACE_DATA_COPY(src_node, dst_node, size)	\
-	FUT_DO_PROBE3(FUT_DATA_COPY, src_node, dst_node, size)
+	FUT_DO_PROBE3(STARPU_FUT_DATA_COPY, src_node, dst_node, size)
 
 #define TRACE_START_DRIVER_COPY(src_node, dst_node, size, com_id)	\
-	FUT_DO_PROBE4(FUT_START_DRIVER_COPY, src_node, dst_node, size, com_id)
+	FUT_DO_PROBE4(STARPU_FUT_START_DRIVER_COPY, src_node, dst_node, size, com_id)
 
 #define TRACE_END_DRIVER_COPY(src_node, dst_node, size, com_id)	\
-	FUT_DO_PROBE4(FUT_END_DRIVER_COPY, src_node, dst_node, size, com_id)
+	FUT_DO_PROBE4(STARPU_FUT_END_DRIVER_COPY, src_node, dst_node, size, com_id)
 
 #define TRACE_WORK_STEALING(empty_q, victim_q)		\
-	FUT_DO_PROBE2(FUT_WORK_STEALING, empty_q, victim_q)
+	FUT_DO_PROBE2(STARPU_FUT_WORK_STEALING, empty_q, victim_q)
 
 #define TRACE_WORKER_DEINIT_START			\
-	FUT_DO_PROBE1(FUT_WORKER_DEINIT_START, syscall(SYS_gettid));
+	FUT_DO_PROBE1(STARPU_FUT_WORKER_DEINIT_START, syscall(SYS_gettid));
 
 #define TRACE_WORKER_DEINIT_END(workerkind)		\
-	FUT_DO_PROBE2(FUT_WORKER_DEINIT_END, workerkind, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_WORKER_DEINIT_END, workerkind, syscall(SYS_gettid));
 
 #define TRACE_USER_DEFINED_START	\
-	FUT_DO_PROBE1(FUT_USER_DEFINED_START, syscall(SYS_gettid));
+	FUT_DO_PROBE1(STARPU_FUT_USER_DEFINED_START, syscall(SYS_gettid));
 
 #define TRACE_USER_DEFINED_END		\
-	FUT_DO_PROBE1(FUT_USER_DEFINED_END, syscall(SYS_gettid));
+	FUT_DO_PROBE1(STARPU_FUT_USER_DEFINED_END, syscall(SYS_gettid));
 
 #define TRACE_START_ALLOC(memnode)		\
-	FUT_DO_PROBE2(FUT_START_ALLOC, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_ALLOC, memnode, syscall(SYS_gettid));
 	
 #define TRACE_END_ALLOC(memnode)		\
-	FUT_DO_PROBE2(FUT_END_ALLOC, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_ALLOC, memnode, syscall(SYS_gettid));
 
 #define TRACE_START_ALLOC_REUSE(memnode)		\
-	FUT_DO_PROBE2(FUT_START_ALLOC_REUSE, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_ALLOC_REUSE, memnode, syscall(SYS_gettid));
 	
 #define TRACE_END_ALLOC_REUSE(memnode)		\
-	FUT_DO_PROBE2(FUT_END_ALLOC_REUSE, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_ALLOC_REUSE, memnode, syscall(SYS_gettid));
 	
 #define TRACE_START_MEMRECLAIM(memnode)		\
-	FUT_DO_PROBE2(FUT_START_MEMRECLAIM, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_MEMRECLAIM, memnode, syscall(SYS_gettid));
 	
 #define TRACE_END_MEMRECLAIM(memnode)		\
-	FUT_DO_PROBE2(FUT_END_MEMRECLAIM, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_MEMRECLAIM, memnode, syscall(SYS_gettid));
 	
 #define TRACE_START_PROGRESS(memnode)		\
-	FUT_DO_PROBE2(FUT_START_PROGRESS, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_START_PROGRESS, memnode, syscall(SYS_gettid));
 
 #define TRACE_END_PROGRESS(memnode)		\
-	FUT_DO_PROBE2(FUT_END_PROGRESS, memnode, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_END_PROGRESS, memnode, syscall(SYS_gettid));
 	
 #define TRACE_USER_EVENT(code)			\
-	FUT_DO_PROBE2(FUT_USER_EVENT, code, syscall(SYS_gettid));
+	FUT_DO_PROBE2(STARPU_FUT_USER_EVENT, code, syscall(SYS_gettid));
 
 #else // !STARPU_USE_FXT
 

src/drivers/cpu/driver_cpu.c

@@ -101,7 +101,7 @@ void *_starpu_cpu_worker(void *arg)
 #ifdef STARPU_USE_FXT
 	fxt_register_thread(cpu_arg->bindid);
 #endif
-	TRACE_WORKER_INIT_START(FUT_CPU_KEY, cpu_arg->memory_node);
+	TRACE_WORKER_INIT_START(STARPU_FUT_CPU_KEY, cpu_arg->memory_node);
 
 	_starpu_bind_thread_on_cpu(cpu_arg->config, cpu_arg->bindid);
 
@@ -207,7 +207,7 @@ void *_starpu_cpu_worker(void *arg)
 	_starpu_print_to_logfile("MODEL ERROR: CPU %d ERROR %lf EXEC %lf RATIO %lf NTASKS %d\n", cpu_arg->id, cpu_arg->jobq->total_computation_time_error, cpu_arg->jobq->total_computation_time, ratio, cpu_arg->jobq->total_job_performed);
 #endif
 
-	TRACE_WORKER_DEINIT_END(FUT_CPU_KEY);
+	TRACE_WORKER_DEINIT_END(STARPU_FUT_CPU_KEY);
 
 	pthread_exit(NULL);
 }

src/drivers/cuda/driver_cuda.c

@@ -173,7 +173,7 @@ void *_starpu_cuda_worker(void *arg)
 #ifdef STARPU_USE_FXT
 	fxt_register_thread(args->bindid);
 #endif
-	TRACE_WORKER_INIT_START(FUT_CUDA_KEY, memory_node);
+	TRACE_WORKER_INIT_START(STARPU_FUT_CUDA_KEY, memory_node);
 
 	_starpu_bind_thread_on_cpu(args->config, args->bindid);
 
@@ -295,7 +295,7 @@ void *_starpu_cuda_worker(void *arg)
 	_starpu_print_to_logfile("MODEL ERROR: CUDA %d ERROR %lf EXEC %lf RATIO %lf NTASKS %d\n", args->id, args->jobq->total_computation_time_error, args->jobq->total_computation_time, ratio, args->jobq->total_job_performed);
 #endif
 
-	TRACE_WORKER_DEINIT_END(FUT_CUDA_KEY);
+	TRACE_WORKER_DEINIT_END(STARPU_FUT_CUDA_KEY);
 
 	pthread_exit(NULL);
 

tools/fxt-stats.c

@@ -83,13 +83,13 @@ int main(int argc, char **argv)
 		__attribute__ ((unused)) int nbparam = ev.nb_params;
 
 		switch (ev.code) {
-			case FUT_DATA_COPY:
+			case STARPU_FUT_DATA_COPY:
 				handle_data_copy();
 				break;
-			case FUT_JOB_POP:
+			case STARPU_FUT_JOB_POP:
 				njob++;
 				break;
-			case FUT_WORK_STEALING:
+			case STARPU_FUT_WORK_STEALING:
 				nws++;
 				break;
 			default:

tools/fxt-tool.c

@@ -181,13 +181,13 @@ static void handle_worker_init_start(void)
 	int workerid = register_worker_id(ev.param[2]);
 
 	switch (ev.param[0]) {
-		case FUT_APPS_KEY:
+		case STARPU_FUT_APPS_KEY:
 			set_next_other_worker_color(workerid);
 			break;
-		case FUT_CPU_KEY:
+		case STARPU_FUT_CPU_KEY:
 			set_next_cpu_worker_color(workerid);
 			break;
-		case FUT_CUDA_KEY:
+		case STARPU_FUT_CUDA_KEY:
 			set_next_cuda_worker_color(workerid);
 			break;
 		default:
@@ -650,123 +650,123 @@ void parse_new_file(char *filename_in, char *file_prefix, uint64_t file_offset)
 		}
 
 		switch (ev.code) {
-			case FUT_WORKER_INIT_START:
+			case STARPU_FUT_WORKER_INIT_START:
 				handle_worker_init_start();
 				break;
 
-			case FUT_WORKER_INIT_END:
+			case STARPU_FUT_WORKER_INIT_END:
 				handle_worker_init_end();
 				break;
 
-			case FUT_NEW_MEM_NODE:
+			case STARPU_FUT_NEW_MEM_NODE:
 				handle_new_mem_node();
 				break;
 
 			/* detect when the workers were idling or not */
-			case FUT_START_CODELET_BODY:
+			case STARPU_FUT_START_CODELET_BODY:
 				handle_start_codelet_body();
 				break;
-			case FUT_END_CODELET_BODY:
+			case STARPU_FUT_END_CODELET_BODY:
 				handle_end_codelet_body();
 				break;
 
-			case FUT_START_CALLBACK:
+			case STARPU_FUT_START_CALLBACK:
 				handle_start_callback();
 				break;
-			case FUT_END_CALLBACK:
+			case STARPU_FUT_END_CALLBACK:
 				handle_end_callback();
 				break;
 
 			/* monitor stack size */
-			case FUT_JOB_PUSH:
+			case STARPU_FUT_JOB_PUSH:
 				if (!no_counter)
 				handle_job_push();
 				break;
-			case FUT_JOB_POP:
+			case STARPU_FUT_JOB_POP:
 				if (!no_counter)
 				handle_job_pop();
 				break;
 
 			/* check the memory transfer overhead */
-			case FUT_START_FETCH_INPUT:
+			case STARPU_FUT_START_FETCH_INPUT:
 				handle_worker_status("Fi");
 				break;
 
-			case FUT_START_PUSH_OUTPUT:
+			case STARPU_FUT_START_PUSH_OUTPUT:
 				handle_worker_status("Po");
 				break;
 
-			case FUT_START_PROGRESS:
+			case STARPU_FUT_START_PROGRESS:
 				handle_worker_status("P");
 				break;
 
-			case FUT_END_FETCH_INPUT:
-			case FUT_END_PROGRESS:
-			case FUT_END_PUSH_OUTPUT:
+			case STARPU_FUT_END_FETCH_INPUT:
+			case STARPU_FUT_END_PROGRESS:
+			case STARPU_FUT_END_PUSH_OUTPUT:
 				handle_worker_status("B");
 				break;
 
-			case FUT_CODELET_TAG:
+			case STARPU_FUT_CODELET_TAG:
 				/* XXX */
 				break;
 
-			case FUT_CODELET_TAG_DEPS:
+			case STARPU_FUT_CODELET_TAG_DEPS:
 				handle_codelet_tag_deps();
 				break;
 
-			case FUT_TASK_DONE:
+			case STARPU_FUT_TASK_DONE:
 				handle_task_done();
 				break;
 
-			case FUT_DATA_COPY:
+			case STARPU_FUT_DATA_COPY:
 				if (!no_bus)
 				handle_data_copy();
 				break;
 
-			case FUT_START_DRIVER_COPY:
+			case STARPU_FUT_START_DRIVER_COPY:
 				if (!no_bus)
 				handle_start_driver_copy();
 				break;
 
-			case FUT_END_DRIVER_COPY:
+			case STARPU_FUT_END_DRIVER_COPY:
 				if (!no_bus)
 				handle_end_driver_copy();
 				break;
 
-			case FUT_WORK_STEALING:
+			case STARPU_FUT_WORK_STEALING:
 				/* XXX */
 				break;
 
-			case FUT_WORKER_DEINIT_START:
+			case STARPU_FUT_WORKER_DEINIT_START:
 				handle_worker_deinit_start();
 				break;
 
-			case FUT_WORKER_DEINIT_END:
+			case STARPU_FUT_WORKER_DEINIT_END:
 				handle_worker_deinit_end();
 				break;
 
-			case FUT_START_ALLOC:
+			case STARPU_FUT_START_ALLOC:
 				if (!no_bus)
 				handle_memnode_event("A");
 				break;
 
-			case FUT_START_ALLOC_REUSE:
+			case STARPU_FUT_START_ALLOC_REUSE:
 				if (!no_bus)
 				handle_memnode_event("Ar");
 				break;
 
-			case FUT_START_MEMRECLAIM:
+			case STARPU_FUT_START_MEMRECLAIM:
 				handle_memnode_event("R");
 				break;
 
-			case FUT_END_ALLOC:
-			case FUT_END_ALLOC_REUSE:
-			case FUT_END_MEMRECLAIM:
+			case STARPU_FUT_END_ALLOC:
+			case STARPU_FUT_END_ALLOC_REUSE:
+			case STARPU_FUT_END_MEMRECLAIM:
 				if (!no_bus)
 				handle_memnode_event("No");
 				break;
 
-			case FUT_USER_EVENT:
+			case STARPU_FUT_USER_EVENT:
 				handle_user_event();
 				break;