From: Jan Stancek <jstancek@redhat.com>
To: ltp-list@lists.sourceforge.net
Cc: Jeffrey Burke <jburke@redhat.com>
Subject: [LTP] [PATCH 2/2] move_pages: dont use hardcoded node numbers
Date: Fri, 25 May 2012 11:12:33 +0200 [thread overview]
Message-ID: <4FBF4D01.3090300@redhat.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
Use get_allowed_nodes() from move_pages_support to
pick first N nodes needed for test.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
.../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(-)
[-- Attachment #2: 0002-move_pages-dont-use-hardcoded-node-numbers.patch --]
[-- Type: text/x-patch, Size: 8532 bytes --]
diff --git a/testcases/kernel/syscalls/move_pages/move_pages02.c b/testcases/kernel/syscalls/move_pages/move_pages02.c
index cd0e914..efcd648 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages02.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages02.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages03.c b/testcases/kernel/syscalls/move_pages/move_pages03.c
index 791835b..b206dbb 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages03.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages03.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages04.c b/testcases/kernel/syscalls/move_pages/move_pages04.c
index 4de116b..0046cbf 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages04.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages04.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages05.c b/testcases/kernel/syscalls/move_pages/move_pages05.c
index 6b2334b..8ee31a6 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages05.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages05.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages06.c b/testcases/kernel/syscalls/move_pages/move_pages06.c
index 16e8206..362d6de 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages06.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages06.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages07.c b/testcases/kernel/syscalls/move_pages/move_pages07.c
index 2d2b1d8..1b65f53 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages07.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages07.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages08.c b/testcases/kernel/syscalls/move_pages/move_pages08.c
index 44c9acc..63c2a75 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages08.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages08.c
@@ -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++) {
diff --git a/testcases/kernel/syscalls/move_pages/move_pages09.c b/testcases/kernel/syscalls/move_pages/move_pages09.c
index 3a626e8..14c9115 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages09.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages09.c
@@ -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++) {
diff --git a/testcases/kernel/syscalls/move_pages/move_pages10.c b/testcases/kernel/syscalls/move_pages/move_pages10.c
index 7af861b..9ffc966 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages10.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages10.c
@@ -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
+ }
diff --git a/testcases/kernel/syscalls/move_pages/move_pages11.c b/testcases/kernel/syscalls/move_pages/move_pages11.c
index 747b9f0..7395281 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages11.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages11.c
@@ -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
+ }
[-- Attachment #3: Type: text/plain, Size: 395 bytes --]
------------------------------------------------------------------------------
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/
[-- Attachment #4: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
reply other threads:[~2012-05-25 9:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FBF4D01.3090300@redhat.com \
--to=jstancek@redhat.com \
--cc=jburke@redhat.com \
--cc=ltp-list@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox