fxt: fix STARPU_TRACES macros when fxt is not enabled

src/common/fxt.h

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2009-2013  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -367,49 +367,49 @@ do {										\
 #else // !STARPU_USE_FXT
 
 /* Dummy macros in case FxT is disabled */
-#define _STARPU_TRACE_NEW_MEM_NODE(nodeid)	do {} while(0);
-#define _STARPU_TRACE_WORKER_INIT_START(a,b,c)	do {} while(0);
-#define _STARPU_TRACE_WORKER_INIT_END		do {} while(0);
-#define _STARPU_TRACE_START_CODELET_BODY(job)	do {} while(0);
-#define _STARPU_TRACE_END_CODELET_BODY(job, nimpl, a)	do {} while(0);
-#define _STARPU_TRACE_START_CALLBACK(job)	do {} while(0);
-#define _STARPU_TRACE_END_CALLBACK(job)		do {} while(0);
-#define _STARPU_TRACE_JOB_PUSH(task, prio)	do {} while(0);
-#define _STARPU_TRACE_JOB_POP(task, prio)	do {} while(0);
-#define _STARPU_TRACE_UPDATE_TASK_CNT(counter)	do {} while(0);
-#define _STARPU_TRACE_START_FETCH_INPUT(job)	do {} while(0);
-#define _STARPU_TRACE_END_FETCH_INPUT(job)	do {} while(0);
-#define _STARPU_TRACE_START_PUSH_OUTPUT(job)	do {} while(0);
-#define _STARPU_TRACE_END_PUSH_OUTPUT(job)	do {} while(0);
-#define _STARPU_TRACE_TAG(tag, job)	do {} while(0);
-#define _STARPU_TRACE_TAG_DEPS(a, b)	do {} while(0);
-#define _STARPU_TRACE_TASK_DEPS(a, b)		do {} while(0);
-#define _STARPU_TRACE_GHOST_TASK_DEPS(a, b)	do {} while(0);
-#define _STARPU_TRACE_TASK_DONE(a)		do {} while(0);
-#define _STARPU_TRACE_TAG_DONE(a)		do {} while(0);
-#define _STARPU_TRACE_DATA_COPY(a, b, c)		do {} while(0);
-#define _STARPU_TRACE_START_DRIVER_COPY(a,b,c,d)	do {} while(0);
-#define _STARPU_TRACE_END_DRIVER_COPY(a,b,c,d)	do {} while(0);
-#define _STARPU_TRACE_START_DRIVER_COPY_ASYNC(a,b)	do {} while(0);
-#define _STARPU_TRACE_END_DRIVER_COPY_ASYNC(a,b)	do {} while(0);
-#define _STARPU_TRACE_WORK_STEALING(a, b)	do {} while(0);
-#define _STARPU_TRACE_WORKER_DEINIT_START	do {} while(0);
-#define _STARPU_TRACE_WORKER_DEINIT_END(a)	do {} while(0);
-#define _STARPU_TRACE_WORKER_SLEEP_START		do {} while(0);
-#define _STARPU_TRACE_WORKER_SLEEP_END		do {} while(0);
-#define _STARPU_TRACE_USER_DEFINED_START		do {} while(0);
-#define _STARPU_TRACE_USER_DEFINED_END		do {} while(0);
-#define _STARPU_TRACE_START_ALLOC(memnode)	do {} while(0);
-#define _STARPU_TRACE_END_ALLOC(memnode)		do {} while(0);
-#define _STARPU_TRACE_START_ALLOC_REUSE(a)	do {} while(0);
-#define _STARPU_TRACE_END_ALLOC_REUSE(a)		do {} while(0);
-#define _STARPU_TRACE_START_MEMRECLAIM(memnode)	do {} while(0);
-#define _STARPU_TRACE_END_MEMRECLAIM(memnode)	do {} while(0);
-#define _STARPU_TRACE_START_PROGRESS(memnode)	do {} while(0);
-#define _STARPU_TRACE_END_PROGRESS(memnode)	do {} while(0);
-#define _STARPU_TRACE_USER_EVENT(code)		do {} while(0);
-#define _STARPU_TRACE_SET_PROFILING(status)	do {} while(0);
-#define _STARPU_TRACE_TASK_WAIT_FOR_ALL		do {} while(0);
+#define _STARPU_TRACE_NEW_MEM_NODE(nodeid)	do {} while(0)
+#define _STARPU_TRACE_WORKER_INIT_START(a,b,c)	do {} while(0)
+#define _STARPU_TRACE_WORKER_INIT_END		do {} while(0)
+#define _STARPU_TRACE_START_CODELET_BODY(job)	do {} while(0)
+#define _STARPU_TRACE_END_CODELET_BODY(job, nimpl, a)	do {} while(0)
+#define _STARPU_TRACE_START_CALLBACK(job)	do {} while(0)
+#define _STARPU_TRACE_END_CALLBACK(job)		do {} while(0)
+#define _STARPU_TRACE_JOB_PUSH(task, prio)	do {} while(0)
+#define _STARPU_TRACE_JOB_POP(task, prio)	do {} while(0)
+#define _STARPU_TRACE_UPDATE_TASK_CNT(counter)	do {} while(0)
+#define _STARPU_TRACE_START_FETCH_INPUT(job)	do {} while(0)
+#define _STARPU_TRACE_END_FETCH_INPUT(job)	do {} while(0)
+#define _STARPU_TRACE_START_PUSH_OUTPUT(job)	do {} while(0)
+#define _STARPU_TRACE_END_PUSH_OUTPUT(job)	do {} while(0)
+#define _STARPU_TRACE_TAG(tag, job)	do {} while(0)
+#define _STARPU_TRACE_TAG_DEPS(a, b)	do {} while(0)
+#define _STARPU_TRACE_TASK_DEPS(a, b)		do {} while(0)
+#define _STARPU_TRACE_GHOST_TASK_DEPS(a, b)	do {} while(0)
+#define _STARPU_TRACE_TASK_DONE(a)		do {} while(0)
+#define _STARPU_TRACE_TAG_DONE(a)		do {} while(0)
+#define _STARPU_TRACE_DATA_COPY(a, b, c)		do {} while(0)
+#define _STARPU_TRACE_START_DRIVER_COPY(a,b,c,d)	do {} while(0)
+#define _STARPU_TRACE_END_DRIVER_COPY(a,b,c,d)	do {} while(0)
+#define _STARPU_TRACE_START_DRIVER_COPY_ASYNC(a,b)	do {} while(0)
+#define _STARPU_TRACE_END_DRIVER_COPY_ASYNC(a,b)	do {} while(0)
+#define _STARPU_TRACE_WORK_STEALING(a, b)	do {} while(0)
+#define _STARPU_TRACE_WORKER_DEINIT_START	do {} while(0)
+#define _STARPU_TRACE_WORKER_DEINIT_END(a)	do {} while(0)
+#define _STARPU_TRACE_WORKER_SLEEP_START		do {} while(0)
+#define _STARPU_TRACE_WORKER_SLEEP_END		do {} while(0)
+#define _STARPU_TRACE_USER_DEFINED_START		do {} while(0)
+#define _STARPU_TRACE_USER_DEFINED_END		do {} while(0)
+#define _STARPU_TRACE_START_ALLOC(memnode)	do {} while(0)
+#define _STARPU_TRACE_END_ALLOC(memnode)		do {} while(0)
+#define _STARPU_TRACE_START_ALLOC_REUSE(a)	do {} while(0)
+#define _STARPU_TRACE_END_ALLOC_REUSE(a)		do {} while(0)
+#define _STARPU_TRACE_START_MEMRECLAIM(memnode)	do {} while(0)
+#define _STARPU_TRACE_END_MEMRECLAIM(memnode)	do {} while(0)
+#define _STARPU_TRACE_START_PROGRESS(memnode)	do {} while(0)
+#define _STARPU_TRACE_END_PROGRESS(memnode)	do {} while(0)
+#define _STARPU_TRACE_USER_EVENT(code)		do {} while(0)
+#define _STARPU_TRACE_SET_PROFILING(status)	do {} while(0)
+#define _STARPU_TRACE_TASK_WAIT_FOR_ALL		do {} while(0)
 
 #endif // STARPU_USE_FXT
 

src/drivers/cpu/driver_cpu.c

@@ -350,7 +350,7 @@ int _starpu_cpu_driver_run_once(struct starpu_driver *d STARPU_ATTRIBUTE_UNUSED)
 
 int _starpu_cpu_driver_deinit(struct starpu_driver *d STARPU_ATTRIBUTE_UNUSED)
 {
-	_STARPU_TRACE_WORKER_DEINIT_START
+	_STARPU_TRACE_WORKER_DEINIT_START;
 
 	struct _starpu_worker *cpu_worker;
 	cpu_worker = _starpu_get_local_worker_key();

src/drivers/cuda/driver_cuda.c

@@ -423,7 +423,7 @@ int _starpu_cuda_driver_init(struct starpu_driver *d)
 	snprintf(args->short_name, sizeof(args->short_name), "CUDA %u", devid);
 	_STARPU_DEBUG("cuda (%s) dev id %u thread is ready to run on CPU %d !\n", devname, devid, args->bindid);
 
-	_STARPU_TRACE_WORKER_INIT_END
+	_STARPU_TRACE_WORKER_INIT_END;
 
 	/* tell the main thread that this one is ready */
 	_STARPU_PTHREAD_MUTEX_LOCK(&args->mutex);
@@ -496,7 +496,7 @@ int _starpu_cuda_driver_deinit(struct starpu_driver *d)
 	STARPU_ASSERT(args);
 	unsigned memnode = args->memory_node;
 
-	_STARPU_TRACE_WORKER_DEINIT_START
+	_STARPU_TRACE_WORKER_DEINIT_START;
 
 	_starpu_handle_all_pending_node_data_requests(memnode);
 

src/drivers/driver_common/driver_common.c

@@ -167,7 +167,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *args, int wor
 
 		if (_starpu_worker_get_status(workerid) != STATUS_SLEEPING)
 		{
-			_STARPU_TRACE_WORKER_SLEEP_START
+			_STARPU_TRACE_WORKER_SLEEP_START;
 			_starpu_worker_restart_sleeping(workerid);
 			_starpu_worker_set_status(workerid, STATUS_SLEEPING);
 		}
@@ -199,7 +199,7 @@ struct starpu_task *_starpu_get_worker_task(struct _starpu_worker *args, int wor
 
 	if (_starpu_worker_get_status(workerid) == STATUS_SLEEPING)
 	{
-		_STARPU_TRACE_WORKER_SLEEP_END
+		_STARPU_TRACE_WORKER_SLEEP_END;
 		_starpu_worker_stop_sleeping(workerid);
 		_starpu_worker_set_status(workerid, STATUS_UNKNOWN);
 	}

src/drivers/opencl/driver_opencl.c

@@ -621,7 +621,7 @@ int _starpu_opencl_driver_init(struct starpu_driver *d)
 
 	_STARPU_DEBUG("OpenCL (%s) dev id %d thread is ready to run on CPU %d !\n", devname, devid, args->bindid);
 
-	_STARPU_TRACE_WORKER_INIT_END
+	_STARPU_TRACE_WORKER_INIT_END;
 
 	/* tell the main thread that this one is ready */
 	_STARPU_PTHREAD_MUTEX_LOCK(&args->mutex);
@@ -692,7 +692,7 @@ int _starpu_opencl_driver_run_once(struct starpu_driver *d)
 
 int _starpu_opencl_driver_deinit(struct starpu_driver *d)
 {
-	_STARPU_TRACE_WORKER_DEINIT_START
+	_STARPU_TRACE_WORKER_DEINIT_START;
 
 	struct _starpu_worker* args;
 	args = _starpu_opencl_get_worker_from_driver(d);