Use /proc/litmus/domains to set up affinity masks

This patch replaces the algorithm used to compute CPU affinity masks.
The old algorithm was fragile and would break on systems with multiple
levels of shared caches. (As found on some older Intel chips, and as
one would probably find on a system with hyper-threading enabled.) The
bug stems from fact that Linux enumerates consecutive CPUs in a way
that distributes them across the physical system, thereby reducing
contention resources (e.g., cache).

Cluster size no longer needs to be provided now that cluster/CPU
mappings are explicit in /proc/litmus/domains/.

This keeps the following migration functions, but marks them as
deprecated:
  - be_migrate_to_cluster()
  - cluster_to_first_cpu()
  - partition_to_cpu()

Although the deprecated interfaces are supported, the implementations
for these functions call the new be_migrate_to_domain() and
domain_to_first_cpu() functions.

[bbb: resolved several merge conflicts]

2 files changed, 6 insertions, 14 deletions

diff --git a/bin/rt_launch.c b/bin/rt_launch.c
index 93f10d5..5e29893 100644
--- a/bin/rt_launch.c
+++ b/bin/rt_launch.c
@@ -42,7 +42,7 @@ void usage(char *error) {
 }
 
 
-#define OPTSTR "p:z:c:vwq:"
+#define OPTSTR "p:c:vwq:"
 
 int main(int argc, char** argv) 
 {
@@ -51,7 +51,6 @@ int main(int argc, char** argv)
         lt_t period;
         int migrate = 0;
         int cluster = 0;
-        int cluster_size = 1;
         int opt;
         int verbose = 0;
         int wait = 0;
@@ -71,9 +70,6 @@ int main(int argc, char** argv)
                         cluster = atoi(optarg);
                         migrate = 1;
                         break;
-                case 'z':
-                        cluster_size = atoi(optarg);
-                        break;
                 case 'q':
                         priority = atoi(optarg);
                         if (!litmus_is_valid_fixed_prio(priority))
@@ -114,11 +110,11 @@ int main(int argc, char** argv)
         info.argv      = argv + optind + 2;
         info.wait      = wait;
         if (migrate) {
-                ret = be_migrate_to_cluster(cluster, cluster_size);
+                ret = be_migrate_to_domain(cluster);
                 if (ret < 0)
                         bail_out("could not migrate to target partition or cluster");
         }
-        ret = __create_rt_task(launch, &info, cluster, cluster_size, wcet, period,
+        ret = __create_rt_task(launch, &info, cluster, wcet, period,
                                 priority, class);
 
 
diff --git a/bin/rtspin.c b/bin/rtspin.c
index 167741d..b4156cc 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -184,7 +184,7 @@ static int job(double exec_time, double program_end, int lock_od, double cs_leng
         }
 }
 
-#define OPTSTR "p:z:c:wlveo:f:s:q:X:L:Q:"
+#define OPTSTR "p:c:wlveo:f:s:q:X:L:Q:"
 int main(int argc, char** argv)
 {
         int ret;
@@ -194,7 +194,6 @@ int main(int argc, char** argv)
         unsigned int priority = LITMUS_LOWEST_PRIORITY;
         int migrate = 0;
         int cluster = 0;
-        int cluster_size = 1;
         int opt;
         int wait = 0;
         int test_loop = 0;
@@ -226,9 +225,6 @@ int main(int argc, char** argv)
                         cluster = atoi(optarg);
                         migrate = 1;
                         break;
-                case 'z':
-                        cluster_size = atoi(optarg);
-                        break;
                 case 'q':
                         priority = atoi(optarg);
                         if (!litmus_is_valid_fixed_prio(priority))
@@ -326,7 +322,7 @@ int main(int argc, char** argv)
                 duration += period_ms * 0.001 * (num_jobs - 1);
 
         if (migrate) {
-                ret = be_migrate_to_cluster(cluster, cluster_size);
+                ret = be_migrate_to_domain(cluster);
                 if (ret < 0)
                         bail_out("could not migrate to target partition or cluster.");
         }
@@ -339,7 +335,7 @@ int main(int argc, char** argv)
         param.budget_policy = (want_enforcement) ?
                         PRECISE_ENFORCEMENT : NO_ENFORCEMENT;
         if (migrate)
-                param.cpu = cluster_to_first_cpu(cluster, cluster_size);
+                param.cpu = domain_to_first_cpu(cluster);
         ret = set_rt_task_param(gettid(), &param);
         if (ret < 0)
                 bail_out("could not setup rt task params");