From: Karel Zak <kzak@redhat.com>
Date: Tue, 14 Jan 2014 12:56:27 +0000 (+0100)
Subject: lscpu: sort NUMA nodes to keep output human readable
X-Git-Tag: v2.25-rc1~647
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39c758d140602e635b1943080834df41fa7c9ac1;p=thirdparty%2Futil-linux.git

lscpu: sort NUMA nodes to keep output human readable

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 0e937e1cd1..b8840ef90a 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -925,6 +925,13 @@ static inline int is_node_dirent(struct dirent *d)
 		isdigit_string(d->d_name + 4);
 }
 
+static int
+nodecmp(const void *ap, const void *bp)
+{
+	int *a = (int *) ap, *b = (int *) bp;
+	return *a - *b;
+}
+
 static void
 read_nodes(struct lscpu_desc *desc)
 {
@@ -960,6 +967,7 @@ read_nodes(struct lscpu_desc *desc)
 							_("Failed to extract the node number"));
 		}
 		closedir(dir);
+		qsort(desc->idx2nodenum, desc->nnodes, sizeof(int), nodecmp);
 	}
 
 	/* information about how nodes share different CPUs */