Commit 0bb02253 authored by Adrian Reber's avatar Adrian Reber Committed by Pavel Emelyanov

zdtm/static/maps06: removed hardcoded page-size

zdtm/static/maps06 failed on systems with different page-size than 4096.
This changes maps06 to use sysconf(_SC_PAGESIZE) instead.
Signed-off-by: 's avatarAdrian Reber <areber@redhat.com>
Reviewed-by: 's avatarDmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent d324645d
...@@ -10,12 +10,12 @@ const char *test_author = "Andrei Vagin <avagin@openvz.org>"; ...@@ -10,12 +10,12 @@ const char *test_author = "Andrei Vagin <avagin@openvz.org>";
char *filename; char *filename;
TEST_OPTION(filename, string, "file name", 1); TEST_OPTION(filename, string, "file name", 1);
#define TEST_SIZE 10240
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
void *start; void *start;
int fd, i; int fd, i;
int ps = sysconf(_SC_PAGESIZE);
int test_size;
test_init(argc, argv); test_init(argc, argv);
...@@ -23,21 +23,26 @@ int main(int argc, char ** argv) ...@@ -23,21 +23,26 @@ int main(int argc, char ** argv)
if (fd < 0) if (fd < 0)
return 1; return 1;
ftruncate(fd, 4096); ftruncate(fd, ps);
if (ps == 0x1000)
test_size = 10240;
else
test_size = 512;
start = mmap(0, 4096 * TEST_SIZE * 4, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); start = mmap(0, ps * test_size * 4, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
if (start == MAP_FAILED) if (start == MAP_FAILED)
return 1; return 1;
for (i = 0; i < TEST_SIZE; i++) { for (i = 0; i < test_size; i++) {
int *addr; int *addr;
addr = mmap(start + i * 3 * 4096, 4096, addr = mmap(start + i * 3 * ps, ps,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, 0); MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, 0);
if (addr == MAP_FAILED) if (addr == MAP_FAILED)
return 1; return 1;
addr[0] = i * 2; addr[0] = i * 2;
addr = mmap(start + (i * 3 + 1) * 4096, 4096, addr = mmap(start + (i * 3 + 1) * ps, ps,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
if (addr == MAP_FAILED) if (addr == MAP_FAILED)
...@@ -49,12 +54,12 @@ int main(int argc, char ** argv) ...@@ -49,12 +54,12 @@ int main(int argc, char ** argv)
test_waitsig(); test_waitsig();
for (i = 0; i < TEST_SIZE; i++) { for (i = 0; i < test_size; i++) {
int *addr; int *addr;
addr = start + i * 3 * 4096; addr = start + i * 3 * ps;
if (addr[0] != i * 2) if (addr[0] != i * 2)
fail(); fail();
addr = start + (i * 3 + 1) * 4096; addr = start + (i * 3 + 1) * ps;
if (addr[0] != i) if (addr[0] != i)
fail(); fail();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment