SoW-2019-0002: Dynamic Snapshot

[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 ead6fe3870be9b31595d9f4c55d0deed08b0f39c..29472572f50678fd528d649a0b9e9b1dad07dcb3 100644 (file)
--- a/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c
+++ b/tests/utils/testapp/gen-syscall-events/gen-syscall-events.c
@@ -13,6 +13,41 @@
 #include "utils.h"
 
 #define MAX_LEN 16
+
+static
+int open_read_close(const char *path)
+{
+       int fd, ret;
+       char buf[MAX_LEN];
+       /*
+        * Start generating syscalls. We use syscall(2) to prevent libc to change
+        * the underlying syscall. e.g. calling openat(2) instead of open(2).
+        */
+       fd = syscall(SYS_openat, AT_FDCWD, path, O_RDONLY);
+       if (fd < 0) {
+               perror("open");
+               ret = -1;
+               goto error;
+       }
+
+       ret = syscall(SYS_read, fd, buf, MAX_LEN);
+       if (ret < 0) {
+               perror("read");
+               ret = -1;
+               goto error;
+       }
+
+       ret = syscall(SYS_close, fd);
+       if (ret == -1) {
+               perror("close");
+               ret = -1;
+               goto error;
+       }
+
+error:
+       return ret;
+}
+
 /*
  * The process waits for the creation of a file passed as argument from an
  * external processes to execute a syscall and exiting. This is useful for tests
@@ -21,8 +56,7 @@
  */
 int main(int argc, char **argv)
 {
-       int fd, ret;
-       char buf[MAX_LEN];
+       int ret;
        char *start_file;
 
        if (argc != 2) {
@@ -47,23 +81,14 @@ 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).
         */
-       fd = syscall(SYS_openat, AT_FDCWD, "/proc/cpuinfo", O_RDONLY);
-       if (fd < 0) {
-               perror("open");
-               ret = -1;
-               goto error;
-       }
-
-       ret = syscall(SYS_read, fd, buf, MAX_LEN);
-       if (ret < 0) {
-               perror("read");
+       ret = open_read_close("/proc/cpuinfo");
+       if (ret == -1) {
                ret = -1;
                goto error;
        }
 
-       ret = syscall(SYS_close, fd);
+       ret = open_read_close("/proc/cmdline");
        if (ret == -1) {
-               perror("close");
                ret = -1;
                goto error;
        }