lscpu: add cpu polarization to parseable output

When running in different dispatching mode the virtual cpus may
have different polarizations.
E.g. in "vertical" mode cpus may have a polarization of "vertical:high"
which means the virtual cpu has dedicated physical cpu assigned.
Print this information in the parsable output.

Note that this breaks the current rule that
a) the parseable output contains only numbers
b) these numbers are equal or increased in each line

Since however this new item must be selected with the "list" argument
this shouldn't be a problem.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/sys-utils/lscpu.1 b/sys-utils/lscpu.1
index 4795e91c8819cafde97f618c98e92b313127d528..f9b8fa443724691dd46650e49fa40729032db963 100644 (file)
--- a/sys-utils/lscpu.1
+++ b/sys-utils/lscpu.1
@@ -32,7 +32,7 @@ separate CPU cache columns. If no CPU caches are identified, then the cache
 columns are not printed at all.
 
 The \fIlist\fP argument is comma delimited list of the columns. Currently
-supported are CPU, Core, Node, Socket, Book and Cache columns. If the
+supported are CPU, Core, Node, Socket, Book, Cache and Polarization columns. If the
 \fIlist\fP argument is given then always all requested columns are printed in
 the defined order. The Cache columns are separated by ':'.
 

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index aba7ab8bf35354da1d79981bca6385650f9e82ed..65ff96ce12f64b56c757e54a7336291e7e337221 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -108,6 +108,23 @@ const char *disp_modes[] = {
        [DISP_VERTICAL]         = N_("vertical")
 };
 
+/* cpu polarization */
+enum {
+       POLAR_UNKNOWN   = 0,
+       POLAR_VLOW,
+       POLAR_VMEDIUM,
+       POLAR_VHIGH,
+       POLAR_HORIZONTAL
+};
+
+const char *polar_modes[] = {
+       [POLAR_UNKNOWN]         = "U",
+       [POLAR_VLOW]            = "VL",
+       [POLAR_VMEDIUM]         = "VM",
+       [POLAR_VHIGH]           = "VH",
+       [POLAR_HORIZONTAL]      = "H"
+};
+
 /* global description */
 struct lscpu_desc {
        char    *arch;
@@ -149,6 +166,8 @@ struct lscpu_desc {
 
        int             ncaches;
        struct cpu_cache *caches;
+
+       int             *polarization;  /* cpu polarization */
 };
 
 static size_t sysrootlen;
@@ -179,7 +198,8 @@ enum {
        COL_SOCKET,
        COL_NODE,
        COL_BOOK,
-       COL_CACHE
+       COL_CACHE,
+       COL_POLARIZATION
 };
 
 static const char *colnames[] =
@@ -189,7 +209,8 @@ static const char *colnames[] =
        [COL_SOCKET] = "Socket",
        [COL_NODE] = "Node",
        [COL_BOOK] = "Book",
-       [COL_CACHE] = "Cache"
+       [COL_CACHE] = "Cache",
+       [COL_POLARIZATION] = "Polarization"
 };
 
 
@@ -717,6 +738,29 @@ read_topology(struct lscpu_desc *desc, int num)
        if (book_siblings)
                add_cpuset_to_array(desc->bookmaps, &desc->nbooks, book_siblings);
 }
+static void
+read_polarization(struct lscpu_desc *desc, int num)
+{
+       char mode[64];
+
+       if (desc->dispatching < 0)
+               return;
+       if (!path_exist(_PATH_SYS_CPU "/cpu%d/polarization", num))
+               return;
+       if (!desc->polarization)
+               desc->polarization = xcalloc(desc->ncpus, sizeof(int));
+       path_getstr(mode, sizeof(mode), _PATH_SYS_CPU "/cpu%d/polarization", num);
+       if (strncmp(mode, "vertical:low", sizeof(mode)) == 0)
+               desc->polarization[num] = POLAR_VLOW;
+       else if (strncmp(mode, "vertical:medium", sizeof(mode)) == 0)
+               desc->polarization[num] = POLAR_VMEDIUM;
+       else if (strncmp(mode, "vertical:high", sizeof(mode)) == 0)
+               desc->polarization[num] = POLAR_VHIGH;
+       else if (strncmp(mode, "horizontal", sizeof(mode)) == 0)
+               desc->polarization[num] = POLAR_HORIZONTAL;
+       else
+               desc->polarization[num] = POLAR_UNKNOWN;
+}
 
 static int
 cachecmp(const void *a, const void *b)
@@ -868,6 +912,10 @@ print_parsable_cell(struct lscpu_desc *desc, int i, int col, int compatible)
                                putchar(',');
                }
                break;
+       case COL_POLARIZATION:
+               if (desc->polarization)
+                       printf("%s", polar_modes[desc->polarization[i]]);
+               break;
        }
 }
 
@@ -1181,6 +1229,7 @@ int main(int argc, char *argv[])
                        continue;
                read_topology(desc, i);
                read_cache(desc, i);
+               read_polarization(desc, i);
        }
 
        qsort(desc->caches, desc->ncaches, sizeof(struct cpu_cache), cachecmp);