Rename field id of the struct starpu_worker_s in devid

src/core/topology.c

@@ -213,7 +213,7 @@ static int _starpu_init_machine_config(struct starpu_machine_config_s *config,
 		config->workers[config->nworkers + cudagpu].arch = STARPU_CUDA_WORKER;
 		int devid = _starpu_get_next_gpuid(config);
 		enum starpu_perf_archtype arch = STARPU_CUDA_DEFAULT + devid;
-		config->workers[config->nworkers + cudagpu].id = devid;
+		config->workers[config->nworkers + cudagpu].devid = devid;
 		config->workers[config->nworkers + cudagpu].perf_arch = arch; 
 		config->workers[config->nworkers + cudagpu].worker_mask = STARPU_CUDA;
 		config->worker_mask |= STARPU_CUDA;
@@ -282,7 +282,7 @@ static int _starpu_init_machine_config(struct starpu_machine_config_s *config,
 	{
 		config->workers[config->nworkers + cpu].arch = STARPU_CPU_WORKER;
 		config->workers[config->nworkers + cpu].perf_arch = STARPU_CPU_DEFAULT;
-		config->workers[config->nworkers + cpu].id = cpu;
+		config->workers[config->nworkers + cpu].devid = cpu;
 		config->workers[config->nworkers + cpu].worker_mask = STARPU_CPU;
 		config->worker_mask |= STARPU_CPU;
 	}
@@ -497,7 +497,7 @@ static void _starpu_init_workers_binding(struct starpu_machine_config_s *config)
 				if (may_bind_automatically)
 				{
 					/* StarPU is allowed to bind threads automatically */
-					preferred_binding = _starpu_get_gpu_affinity_vector(workerarg->id);
+					preferred_binding = _starpu_get_gpu_affinity_vector(workerarg->devid);
 					npreferred = config->nhwcpus;
 				}
 				is_a_set_of_accelerators = 0;

src/core/workers.h

@@ -67,7 +67,7 @@ struct starpu_worker_s {
 	uint32_t worker_mask; /* what is the type of worker ? */
 	enum starpu_perf_archtype perf_arch; /* in case there are different models of the same arch */
 	pthread_t worker_thread; /* the thread which runs the worker */
-	int id; /* which cpu/gpu/etc is controlled by the workker ? */
+	int devid; /* which cpu/gpu/etc is controlled by the workker ? */
 	int bindid; /* which cpu is the driver bound to ? */
 	int workerid; /* uniquely identify the worker among all processing units types */
         pthread_cond_t ready_cond; /* indicate when the worker is ready */

src/drivers/cpu/driver_cpu.c

@@ -85,7 +85,7 @@ static int execute_job_on_cpu(starpu_job_t j, struct starpu_worker_s *cpu_args)
 		cpu_args->jobq->total_computation_time_error += error;
 
 		if (calibrate_model)
-			_starpu_update_perfmodel_history(j, cpu_args->arch, cpu_args->id, measured);
+			_starpu_update_perfmodel_history(j, cpu_args->arch, cpu_args->devid, measured);
 	}
 //#endif
 
@@ -106,7 +106,7 @@ void *_starpu_cpu_worker(void *arg)
 	_starpu_bind_thread_on_cpu(cpu_arg->config, cpu_arg->bindid);
 
 #ifdef STARPU_VERBOSE
-        fprintf(stderr, "cpu worker %d is ready on logical cpu %d\n", cpu_arg->id, cpu_arg->bindid);
+        fprintf(stderr, "cpu worker %d is ready on logical cpu %d\n", cpu_arg->devid, cpu_arg->bindid);
 #endif
 
 	_starpu_set_local_memory_node_key(&cpu_arg->memory_node);
@@ -115,7 +115,7 @@ void *_starpu_cpu_worker(void *arg)
 
 	_starpu_set_local_worker_key(cpu_arg);
 
-	snprintf(cpu_arg->name, 32, "CPU %d", cpu_arg->id);
+	snprintf(cpu_arg->name, 32, "CPU %d", cpu_arg->devid);
 
 	/* this is only useful (and meaningful) is there is a single
 	   memory node "related" to that queue */
@@ -209,7 +209,7 @@ void *_starpu_cpu_worker(void *arg)
 		ratio = cpu_arg->jobq->total_computation_time_error/cpu_arg->jobq->total_computation_time;
 	}
 
-	_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);
+	_starpu_print_to_logfile("MODEL ERROR: CPU %d ERROR %lf EXEC %lf RATIO %lf NTASKS %d\n", cpu_arg->devid, cpu_arg->jobq->total_computation_time_error, cpu_arg->jobq->total_computation_time, ratio, cpu_arg->jobq->total_job_performed);
 #endif
 
 	STARPU_TRACE_WORKER_DEINIT_END(STARPU_FUT_CPU_KEY);

src/drivers/cuda/driver_cuda.c

@@ -153,7 +153,7 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 		args->jobq->total_computation_time_error += error;
 
 		if (calibrate_model)
-			_starpu_update_perfmodel_history(j, args->perf_arch, (unsigned)args->id, measured);
+			_starpu_update_perfmodel_history(j, args->perf_arch, (unsigned)args->devid, measured);
 	}
 
 	args->jobq->total_job_performed++;
@@ -167,7 +167,7 @@ void *_starpu_cuda_worker(void *arg)
 {
 	struct starpu_worker_s* args = arg;
 
-	int devid = args->id;
+	int devid = args->devid;
 	unsigned memory_node = args->memory_node;
 
 #ifdef STARPU_USE_FXT
@@ -204,7 +204,7 @@ void *_starpu_cuda_worker(void *arg)
 	struct cudaDeviceProp prop;
 	cudaGetDeviceProperties(&prop, devid);
 	strncpy(devname, prop.name, 128);
-	snprintf(args->name, 32, "CUDA %d (%s)", args->id, devname);
+	snprintf(args->name, 32, "CUDA %d (%s)", args->devid, devname);
 
 #ifdef STARPU_VERBOSE
 	fprintf(stderr, "cuda (%s) dev id %d thread is ready to run on CPU %d !\n", devname, devid, args->bindid);
@@ -297,7 +297,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);
+	_starpu_print_to_logfile("MODEL ERROR: CUDA %d ERROR %lf EXEC %lf RATIO %lf NTASKS %d\n", args->devid, args->jobq->total_computation_time_error, args->jobq->total_computation_time, ratio, args->jobq->total_job_performed);
 #endif
 
 	STARPU_TRACE_WORKER_DEINIT_END(STARPU_FUT_CUDA_KEY);