Skip to contentSkip to conversation

move_pages: dont use hardcoded node numbers

PATCH In review Jan Stancek 1 participant 1 message May 25, 2012

lore
Share & tools
lore

Jan Stancek

author
#0 lore raw

PATCH 2/2 move_pages: dont use hardcoded node numbers

Use get_allowed_nodes() from move_pages_support to pick first N nodes needed for test.

Signed-off-by Jan Stancek <[email protected]>
---
 .../kernel/syscalls/move_pages/move_pages02.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages03.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages04.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages05.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages06.c      |   10 ++++++++--
 .../kernel/syscalls/move_pages/move_pages07.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages08.c      |   12 ++++++++++--
 .../kernel/syscalls/move_pages/move_pages09.c      |    8 +++++++-
 .../kernel/syscalls/move_pages/move_pages10.c      |   13 ++++++++++---
 .../kernel/syscalls/move_pages/move_pages11.c      |   13 ++++++++++---
 10 files changed, 95 insertions(+), 26 deletions(-)
testcases/kernel/syscalls/move_pages/move_pages02.c +10 -3
index cd0e914..efcd648 100644
@@ -83,8 +83,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -156,4 +163,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages03.c +10 -3
index 791835b..b206dbb 100644
@@ -122,8 +122,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node ;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -223,4 +230,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages04.c +10 -3
index 4de116b..0046cbf 100644
@@ -89,8 +89,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -175,4 +182,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages05.c +10 -3
index 6b2334b..8ee31a6 100644
@@ -123,8 +123,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -237,4 +244,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages06.c +8 -2
index 16e8206..362d6de 100644
@@ -83,8 +83,14 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
+	unsigned int from_node;
 	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -152,4 +158,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages07.c +10 -3
index 2d2b1d8..1b65f53 100644
@@ -83,8 +83,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -163,4 +170,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages08.c +10 -2
index 44c9acc..63c2a75 100644
@@ -81,8 +81,16 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
+
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
testcases/kernel/syscalls/move_pages/move_pages09.c +7 -1
index 3a626e8..14c9115 100644
@@ -81,7 +81,13 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
+	unsigned int from_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
testcases/kernel/syscalls/move_pages/move_pages10.c +10 -3
index 7af861b..9ffc966 100644
@@ -83,8 +83,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -151,4 +158,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }
testcases/kernel/syscalls/move_pages/move_pages11.c +10 -3
index 747b9f0..7395281 100644
@@ -122,8 +122,15 @@ int main(int argc, char **argv)
 #if HAVE_NUMA_MOVE_PAGES
 	unsigned int i;
 	int lc;			/* loop counter */
-	unsigned int from_node = 0;
-	unsigned int to_node = 1;
+	unsigned int from_node;
+	unsigned int to_node;
+	int num_allowed_nodes;
+	int *allowed_nodes;
+
+	get_allowed_nodes(&num_allowed_nodes, &allowed_nodes);
+	from_node = allowed_nodes[0];
+	to_node = allowed_nodes[1];
+	free(allowed_nodes);
 
 	/* check for looping state if -i option is given */
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -241,4 +248,4 @@ void cleanup(void)
 	 */
 	TEST_CLEANUP;
 
- }
\ No newline at end of file
+ }

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list