Skip to content

Commit bda3974

Browse files
harish-24andikleen
authored andcommitted
numademo: Use first two nodes instead of node 0 and 1
Numademo test tries to use nodes 0 and 1 to set bitmask. This is affecting the systems which does not have such node numbering. E.g: available: 4 nodes (4-7) Instead use the first two nodes of the list. Also use the counter i to determine every 8th node (FRACT_NODE)to run the regression tests replacing the node number. Signed-off-by: Harish <[email protected]>
1 parent 6ff436b commit bda3974

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

numademo.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ void test(enum test type)
335335

336336
memtest("memory interleaved on all nodes", numa_alloc_interleaved(msize));
337337
for (i = 0; i < numnodes; i++) {
338-
if (regression_testing && (node_to_use[i] % fract_nodes)) {
338+
if (regression_testing && (i % fract_nodes)) {
339339
/* for regression testing (-t) do only every eighth node */
340340
continue;
341341
}
@@ -386,10 +386,10 @@ void test(enum test type)
386386

387387
if (numnodes > 0) {
388388
numa_bitmask_clearall(nodes);
389-
numa_bitmask_setbit(nodes, 0);
390-
numa_bitmask_setbit(nodes, 1);
389+
numa_bitmask_setbit(nodes, node_to_use[0]);
390+
numa_bitmask_setbit(nodes, node_to_use[1]);
391391
numa_set_interleave_mask(nodes);
392-
memtest("manual interleaving on node 0/1", numa_alloc(msize));
392+
memtest("manual interleaving on first two nodes", numa_alloc(msize));
393393
printf("current interleave node %d\n", numa_get_interleave_node());
394394
}
395395

@@ -402,7 +402,7 @@ void test(enum test type)
402402
for (i = 0; i < numnodes; i++) {
403403
int oldhn = numa_preferred();
404404

405-
if (regression_testing && (node_to_use[i] % fract_nodes)) {
405+
if (regression_testing && (i % fract_nodes)) {
406406
/* for regression testing (-t) do only every eighth node */
407407
continue;
408408
}
@@ -416,9 +416,9 @@ void test(enum test type)
416416

417417
if (numnodes >= 2) {
418418
numa_bitmask_clearall(nodes);
419-
numa_bitmask_setbit(nodes, 0);
420-
numa_bitmask_setbit(nodes, 1);
421-
memtest("memory interleaved on node 0/1",
419+
numa_bitmask_setbit(nodes, node_to_use[0]);
420+
numa_bitmask_setbit(nodes, node_to_use[1]);
421+
memtest("memory interleaved on first two nodes",
422422
numa_alloc_interleaved_subset(msize, nodes));
423423
}
424424

0 commit comments

Comments
 (0)