|
 |
6717ab |
diff -up util-linux-2.23.2/sys-utils/lscpu.c.kzak util-linux-2.23.2/sys-utils/lscpu.c
|
|
|
6717ab |
--- util-linux-2.23.2/sys-utils/lscpu.c.kzak 2014-01-14 14:02:52.228996385 +0100
|
|
|
6717ab |
+++ util-linux-2.23.2/sys-utils/lscpu.c 2014-01-14 14:04:08.109795733 +0100
|
|
|
6717ab |
@@ -815,6 +815,13 @@ static inline int is_node_dirent(struct
|
|
|
6717ab |
isdigit_string(d->d_name + 4);
|
|
|
6717ab |
}
|
|
|
6717ab |
|
|
|
6717ab |
+static int
|
|
|
6717ab |
+nodecmp(const void *ap, const void *bp)
|
|
|
6717ab |
+{
|
|
|
6717ab |
+ int *a = (int *) ap, *b = (int *) bp;
|
|
|
6717ab |
+ return *a - *b;
|
|
|
6717ab |
+}
|
|
|
6717ab |
+
|
|
|
6717ab |
static void
|
|
|
6717ab |
read_nodes(struct lscpu_desc *desc)
|
|
|
6717ab |
{
|
|
|
6717ab |
@@ -850,6 +857,7 @@ read_nodes(struct lscpu_desc *desc)
|
|
|
6717ab |
_("Failed to extract the node number"));
|
|
|
6717ab |
}
|
|
|
6717ab |
closedir(dir);
|
|
|
6717ab |
+ qsort(desc->idx2nodenum, desc->nnodes, sizeof(int), nodecmp);
|
|
|
6717ab |
}
|
|
|
6717ab |
|
|
|
6717ab |
/* information about how nodes share different CPUs */
|
|
|
6717ab |
diff -up util-linux-2.23.2/tests/expected/lscpu/lscpu-x86_64-64cpu.kzak util-linux-2.23.2/tests/expected/lscpu/lscpu-x86_64-64cpu
|
|
|
6717ab |
--- util-linux-2.23.2/tests/expected/lscpu/lscpu-x86_64-64cpu.kzak 2013-06-13 09:46:10.551651742 +0200
|
|
|
6717ab |
+++ util-linux-2.23.2/tests/expected/lscpu/lscpu-x86_64-64cpu 2014-01-14 14:04:29.662022613 +0100
|
|
|
6717ab |
@@ -4,7 +4,7 @@ On-line CPU(s) list: 0-63
|
|
|
6717ab |
Thread(s) per core: 2
|
|
|
6717ab |
Core(s) per socket: 8
|
|
|
6717ab |
Socket(s): 4
|
|
|
6717ab |
-NUMA node(s): 1
|
|
|
6717ab |
+NUMA node(s): 3
|
|
|
6717ab |
Vendor ID: GenuineIntel
|
|
|
6717ab |
CPU family: 6
|
|
|
6717ab |
Model: 46
|
|
|
6717ab |
@@ -18,72 +18,74 @@ L1i cache: 32K
|
|
|
6717ab |
L2 cache: 256K
|
|
|
6717ab |
L3 cache: 18432K
|
|
|
6717ab |
NUMA node0 CPU(s): 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62
|
|
|
6717ab |
+NUMA node2 CPU(s): 1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61
|
|
|
6717ab |
+NUMA node3 CPU(s): 3,7,11,15,19,23,27,31,35,39,43,47,51,55,59,63
|
|
|
6717ab |
|
|
|
6717ab |
# The following is the parsable format, which can be fed to other
|
|
|
6717ab |
# programs. Each different item in every column has an unique ID
|
|
|
6717ab |
# starting from zero.
|
|
|
6717ab |
# CPU,Core,Socket,Node,,L1d,L1i,L2,L3
|
|
|
6717ab |
0,0,0,0,,0,0,0,0
|
|
|
6717ab |
-1,1,1,,,1,1,1,1
|
|
|
6717ab |
+1,1,1,2,,1,1,1,1
|
|
|
6717ab |
2,2,2,0,,2,2,2,2
|
|
|
6717ab |
-3,3,3,,,3,3,3,3
|
|
|
6717ab |
+3,3,3,3,,3,3,3,3
|
|
|
6717ab |
4,4,0,0,,4,4,4,0
|
|
|
6717ab |
-5,5,1,,,5,5,5,1
|
|
|
6717ab |
+5,5,1,2,,5,5,5,1
|
|
|
6717ab |
6,6,2,0,,6,6,6,2
|
|
|
6717ab |
-7,7,3,,,7,7,7,3
|
|
|
6717ab |
+7,7,3,3,,7,7,7,3
|
|
|
6717ab |
8,8,0,0,,8,8,8,0
|
|
|
6717ab |
-9,9,1,,,9,9,9,1
|
|
|
6717ab |
+9,9,1,2,,9,9,9,1
|
|
|
6717ab |
10,10,2,0,,10,10,10,2
|
|
|
6717ab |
-11,11,3,,,11,11,11,3
|
|
|
6717ab |
+11,11,3,3,,11,11,11,3
|
|
|
6717ab |
12,12,0,0,,12,12,12,0
|
|
|
6717ab |
-13,13,1,,,13,13,13,1
|
|
|
6717ab |
+13,13,1,2,,13,13,13,1
|
|
|
6717ab |
14,14,2,0,,14,14,14,2
|
|
|
6717ab |
-15,15,3,,,15,15,15,3
|
|
|
6717ab |
+15,15,3,3,,15,15,15,3
|
|
|
6717ab |
16,16,0,0,,16,16,16,0
|
|
|
6717ab |
-17,17,1,,,17,17,17,1
|
|
|
6717ab |
+17,17,1,2,,17,17,17,1
|
|
|
6717ab |
18,18,2,0,,18,18,18,2
|
|
|
6717ab |
-19,19,3,,,19,19,19,3
|
|
|
6717ab |
+19,19,3,3,,19,19,19,3
|
|
|
6717ab |
20,20,0,0,,20,20,20,0
|
|
|
6717ab |
-21,21,1,,,21,21,21,1
|
|
|
6717ab |
+21,21,1,2,,21,21,21,1
|
|
|
6717ab |
22,22,2,0,,22,22,22,2
|
|
|
6717ab |
-23,23,3,,,23,23,23,3
|
|
|
6717ab |
+23,23,3,3,,23,23,23,3
|
|
|
6717ab |
24,24,0,0,,24,24,24,0
|
|
|
6717ab |
-25,25,1,,,25,25,25,1
|
|
|
6717ab |
+25,25,1,2,,25,25,25,1
|
|
|
6717ab |
26,26,2,0,,26,26,26,2
|
|
|
6717ab |
-27,27,3,,,27,27,27,3
|
|
|
6717ab |
+27,27,3,3,,27,27,27,3
|
|
|
6717ab |
28,28,0,0,,28,28,28,0
|
|
|
6717ab |
-29,29,1,,,29,29,29,1
|
|
|
6717ab |
+29,29,1,2,,29,29,29,1
|
|
|
6717ab |
30,30,2,0,,30,30,30,2
|
|
|
6717ab |
-31,31,3,,,31,31,31,3
|
|
|
6717ab |
+31,31,3,3,,31,31,31,3
|
|
|
6717ab |
32,0,0,0,,0,0,0,0
|
|
|
6717ab |
-33,1,1,,,1,1,1,1
|
|
|
6717ab |
+33,1,1,2,,1,1,1,1
|
|
|
6717ab |
34,2,2,0,,2,2,2,2
|
|
|
6717ab |
-35,3,3,,,3,3,3,3
|
|
|
6717ab |
+35,3,3,3,,3,3,3,3
|
|
|
6717ab |
36,4,0,0,,4,4,4,0
|
|
|
6717ab |
-37,5,1,,,5,5,5,1
|
|
|
6717ab |
+37,5,1,2,,5,5,5,1
|
|
|
6717ab |
38,6,2,0,,6,6,6,2
|
|
|
6717ab |
-39,7,3,,,7,7,7,3
|
|
|
6717ab |
+39,7,3,3,,7,7,7,3
|
|
|
6717ab |
40,8,0,0,,8,8,8,0
|
|
|
6717ab |
-41,9,1,,,9,9,9,1
|
|
|
6717ab |
+41,9,1,2,,9,9,9,1
|
|
|
6717ab |
42,10,2,0,,10,10,10,2
|
|
|
6717ab |
-43,11,3,,,11,11,11,3
|
|
|
6717ab |
+43,11,3,3,,11,11,11,3
|
|
|
6717ab |
44,12,0,0,,12,12,12,0
|
|
|
6717ab |
-45,13,1,,,13,13,13,1
|
|
|
6717ab |
+45,13,1,2,,13,13,13,1
|
|
|
6717ab |
46,14,2,0,,14,14,14,2
|
|
|
6717ab |
-47,15,3,,,15,15,15,3
|
|
|
6717ab |
+47,15,3,3,,15,15,15,3
|
|
|
6717ab |
48,16,0,0,,16,16,16,0
|
|
|
6717ab |
-49,17,1,,,17,17,17,1
|
|
|
6717ab |
+49,17,1,2,,17,17,17,1
|
|
|
6717ab |
50,18,2,0,,18,18,18,2
|
|
|
6717ab |
-51,19,3,,,19,19,19,3
|
|
|
6717ab |
+51,19,3,3,,19,19,19,3
|
|
|
6717ab |
52,20,0,0,,20,20,20,0
|
|
|
6717ab |
-53,21,1,,,21,21,21,1
|
|
|
6717ab |
+53,21,1,2,,21,21,21,1
|
|
|
6717ab |
54,22,2,0,,22,22,22,2
|
|
|
6717ab |
-55,23,3,,,23,23,23,3
|
|
|
6717ab |
+55,23,3,3,,23,23,23,3
|
|
|
6717ab |
56,24,0,0,,24,24,24,0
|
|
|
6717ab |
-57,25,1,,,25,25,25,1
|
|
|
6717ab |
+57,25,1,2,,25,25,25,1
|
|
|
6717ab |
58,26,2,0,,26,26,26,2
|
|
|
6717ab |
-59,27,3,,,27,27,27,3
|
|
|
6717ab |
+59,27,3,3,,27,27,27,3
|
|
|
6717ab |
60,28,0,0,,28,28,28,0
|
|
|
6717ab |
-61,29,1,,,29,29,29,1
|
|
|
6717ab |
+61,29,1,2,,29,29,29,1
|
|
|
6717ab |
62,30,2,0,,30,30,30,2
|
|
|
6717ab |
-63,31,3,,,31,31,31,3
|
|
|
6717ab |
+63,31,3,3,,31,31,31,3
|