diff options
| author | Adrian Reber <areber@redhat.com> | 2018-06-05 22:58:59 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@virtuozzo.com> | 2018-06-18 21:02:09 +0300 |
| commit | 23ff69a4b6f5a49e722d0aed45ae8d37643578f5 (patch) | |
| tree | 8bf3ba01d5ef74b7b8e495984824715ea9ca0a01 | |
| parent | 80a4d3cf8cf227c1d0aa45153a6324b16ae5a647 (diff) | |
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: Adrian Reber <areber@redhat.com>
Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
| -rw-r--r-- | test/zdtm/static/maps06.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/test/zdtm/static/maps06.c b/test/zdtm/static/maps06.c index 14dd90f43..7480d6b24 100644 --- a/test/zdtm/static/maps06.c +++ b/test/zdtm/static/maps06.c @@ -10,12 +10,12 @@ const char *test_author = "Andrei Vagin <avagin@openvz.org>"; char *filename; TEST_OPTION(filename, string, "file name", 1); -#define TEST_SIZE 10240 - int main(int argc, char ** argv) { void *start; int fd, i; + int ps = sysconf(_SC_PAGESIZE); + int test_size; test_init(argc, argv); @@ -23,21 +23,26 @@ int main(int argc, char ** argv) if (fd < 0) 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) return 1; - for (i = 0; i < TEST_SIZE; i++) { + for (i = 0; i < test_size; i++) { int *addr; - addr = mmap(start + i * 3 * 4096, 4096, + addr = mmap(start + i * 3 * ps, ps, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, 0); if (addr == MAP_FAILED) return 1; addr[0] = i * 2; - addr = mmap(start + (i * 3 + 1) * 4096, 4096, + addr = mmap(start + (i * 3 + 1) * ps, ps, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); if (addr == MAP_FAILED) @@ -49,12 +54,12 @@ int main(int argc, char ** argv) test_waitsig(); - for (i = 0; i < TEST_SIZE; i++) { + for (i = 0; i < test_size; i++) { int *addr; - addr = start + i * 3 * 4096; + addr = start + i * 3 * ps; if (addr[0] != i * 2) fail(); - addr = start + (i * 3 + 1) * 4096; + addr = start + (i * 3 + 1) * ps; if (addr[0] != i) fail(); } |