Sfoglia il codice sorgente

Fix unused variables in the drivers.

CUDA driver: renamed "memory_node" to "memnode" for consistency with the other drivers.
Cyril Roelandt 12 anni fa
parent
commit
73df999d54

+ 3 - 2
src/drivers/cpu/driver_cpu.c

@@ -113,13 +113,14 @@ int _starpu_cpu_driver_init(struct starpu_driver *d)
 	cpu_worker = _starpu_get_worker_from_driver(d);
 	STARPU_ASSERT(cpu_worker);
 
-	unsigned memnode = cpu_worker->memory_node;
 	int devid = cpu_worker->devid;
 
 #ifdef STARPU_USE_FXT
 	_starpu_fxt_register_thread(cpu_worker->bindid);
-#endif
+
+	unsigned memnode = cpu_worker->memory_node;
 	_STARPU_TRACE_WORKER_INIT_START(_STARPU_FUT_CPU_KEY, devid, memnode);
+#endif
 
 	_starpu_bind_thread_on_cpu(cpu_worker->config, cpu_worker->bindid);
 

+ 3 - 2
src/drivers/cuda/driver_cuda.c

@@ -331,12 +331,13 @@ int _starpu_cuda_driver_init(struct starpu_driver *d)
 	STARPU_ASSERT(args);
 
 	int devid = args->devid;
-	unsigned memory_node = args->memory_node;
 
 #ifdef STARPU_USE_FXT
 	_starpu_fxt_register_thread(args->bindid);
+
+	unsigned memnode = args->memnode;
+	_STARPU_TRACE_WORKER_INIT_START(_STARPU_FUT_CUDA_KEY, devid, memnode);
 #endif
-	_STARPU_TRACE_WORKER_INIT_START(_STARPU_FUT_CUDA_KEY, devid, memory_node);
 
 	_starpu_bind_thread_on_cpu(args->config, args->bindid);
 

+ 1 - 1
src/drivers/opencl/driver_opencl.c

@@ -439,10 +439,10 @@ int _starpu_opencl_driver_init(struct starpu_driver *d)
 
 #ifdef USE_FXT
 	fxt_register_thread(args->bindid);
-#endif
 
 	unsigned memnode = args->memory_node;
 	_STARPU_TRACE_WORKER_INIT_START(_STARPU_FUT_OPENCL_KEY, devid, memnode);
+#endif
 
 	_starpu_bind_thread_on_cpu(args->config, args->bindid);