drop now-unused variable

src/core/combined_workers.c

@@ -125,12 +125,12 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 #ifdef CPU_OR
 		CPU_OR(&combined_worker->cpu_set,
 			&combined_worker->cpu_set,
-			&config->workers[id].initial_cpu_set);
+			&config->workers[id].cpu_set);
 #else
 		int j;
 		for (j = 0; j < CPU_SETSIZE; j++)
 		{
-			if (CPU_ISSET(j, &config->workers[id].initial_cpu_set))
+			if (CPU_ISSET(j, &config->workers[id].cpu_set))
 				CPU_SET(j, &combined_worker->cpu_set);
 		}
 #endif
@@ -139,7 +139,7 @@ int starpu_combined_worker_assign_workerid(int nworkers, int workerid_array[])
 #ifdef STARPU_HAVE_HWLOC
 		hwloc_bitmap_or(combined_worker->hwloc_cpu_set,
 				combined_worker->hwloc_cpu_set,
-				config->workers[id].initial_hwloc_cpu_set);
+				config->workers[id].hwloc_cpu_set);
 #endif
 #endif
 	}

src/core/sched_ctx.c

@@ -234,7 +234,7 @@ static void _starpu_sched_ctx_create_hwloc_tree(struct _starpu_sched_ctx *sched_
 		{
 			hwloc_bitmap_or(sched_ctx->hwloc_workers_set,
 					sched_ctx->hwloc_workers_set,
-					config->workers[worker].initial_hwloc_cpu_set);
+					config->workers[worker].hwloc_cpu_set);
 		}
 
 	}

src/core/topology.c

@@ -1278,10 +1278,8 @@ _starpu_init_workers_binding (struct _starpu_machine_config *config, int no_mp_c
 
 #ifdef __GLIBC__
 		/* Save the initial cpuset */
-		CPU_ZERO(&workerarg->initial_cpu_set);
-		CPU_SET(workerarg->bindid, &workerarg->initial_cpu_set);
-		CPU_ZERO(&workerarg->current_cpu_set);
-		CPU_SET(workerarg->bindid, &workerarg->current_cpu_set);
+		CPU_ZERO(&workerarg->cpu_set);
+		CPU_SET(workerarg->bindid, &workerarg->cpu_set);
 #endif /* __GLIBC__ */
 
 #ifdef STARPU_HAVE_HWLOC
@@ -1295,9 +1293,7 @@ _starpu_init_workers_binding (struct _starpu_machine_config *config, int no_mp_c
 		worker_obj->userdata = &config->workers[worker];
 
 		/* Clear the cpu set and set the cpu */
-		workerarg->initial_hwloc_cpu_set =
-			hwloc_bitmap_dup (worker_obj->cpuset);
-		workerarg->current_hwloc_cpu_set =
+		workerarg->hwloc_cpu_set =
 			hwloc_bitmap_dup (worker_obj->cpuset);
 #endif
 	}
@@ -1340,8 +1336,7 @@ _starpu_destroy_topology (
 	{
 #ifdef STARPU_HAVE_HWLOC
 		struct _starpu_worker *workerarg = &config->workers[worker];
-		hwloc_bitmap_free(workerarg->initial_hwloc_cpu_set);
-		hwloc_bitmap_free(workerarg->current_hwloc_cpu_set);
+		hwloc_bitmap_free(workerarg->hwloc_cpu_set);
 #endif
 	}
 

src/core/workers.c

@@ -396,7 +396,7 @@ void _starpu_worker_init(struct _starpu_worker *worker, unsigned fut_key)
 
         _STARPU_DEBUG("worker %d is ready on logical cpu %d\n", devid, worker->bindid);
 #ifdef STARPU_HAVE_HWLOC
-	_STARPU_DEBUG("worker %d cpuset start at %d\n", devid, hwloc_bitmap_first(worker->initial_hwloc_cpu_set));
+	_STARPU_DEBUG("worker %d cpuset start at %d\n", devid, hwloc_bitmap_first(worker->hwloc_cpu_set));
 #endif
 
 	_starpu_memory_node_set_local_key(&worker->memory_node);

src/core/workers.h

@@ -106,12 +106,10 @@ struct _starpu_worker
 	unsigned parallel_sect;
 
 #ifdef __GLIBC__
-	cpu_set_t initial_cpu_set;
-	cpu_set_t current_cpu_set;
+	cpu_set_t cpu_set;
 #endif /* __GLIBC__ */
 #ifdef STARPU_HAVE_HWLOC
-	hwloc_bitmap_t initial_hwloc_cpu_set;
-	hwloc_bitmap_t current_hwloc_cpu_set;
+	hwloc_bitmap_t hwloc_cpu_set;
 #endif
 };