Cleanup: always use sysconf to get the page size

[lttng-tools.git] / tests / utils / testapp / gen-syscall-events / gen-syscall-events.c

diff --git a/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c b/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c
index 1ec29139e4f5d760c56d5ba27cdab4ab374a8ae1..6a246867d39c824422e0db778ecdf85ef46528fc 100644 (file)
--- a/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c
+++ b/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c
@@ -37,7 +37,7 @@ void prefault_string(const char *p)
                 * for reading.
                 */
                asm volatile("" : : "m"(*p));
-               p += PAGE_SIZE;
+               p += sysconf(_SC_PAGE_SIZE);
        }
 }
 
@@ -88,16 +88,18 @@ error:
 int main(int argc, char **argv)
 {
        int ret;
-       char *start_file;
+       const char *start_file, *path1, *path2;
 
-       if (argc != 2) {
+       if (argc != 4) {
                fprintf(stderr, "Error: Missing argument\n");
-               fprintf(stderr, "USAGE: %s PATH_WAIT_FILE\n", argv[0]);
+               fprintf(stderr, "USAGE: %s PATH_WAIT_FILE PATH1_TO_OPEN PATH2_TO_OPEN\n", argv[0]);
                ret = -1;
                goto error;
        }
 
        start_file = argv[1];
+       path1 = argv[2];
+       path2 = argv[3];
 
        /*
         * Wait for the start_file to be created by an external process
@@ -112,13 +114,13 @@ int main(int argc, char **argv)
         * Start generating syscalls. We use syscall(2) to prevent libc to change
         * the underlying syscall. e.g. calling openat(2) instead of open(2).
         */
-       ret = open_read_close("/proc/cpuinfo");
+       ret = open_read_close(path1);
        if (ret == -1) {
                ret = -1;
                goto error;
        }
 
-       ret = open_read_close("/proc/cmdline");
+       ret = open_read_close(path2);
        if (ret == -1) {
                ret = -1;
                goto error;