]> granicus.if.org Git - strace/commitdiff
process.c: move get_robust_list parser to a separate file
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 11 Dec 2014 19:25:02 +0000 (19:25 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 11 Dec 2014 19:25:02 +0000 (19:25 +0000)
* get_robust_list.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* process.c (sys_get_robust_list): Move to get_robust_list.c.

Makefile.am
get_robust_list.c [new file with mode: 0644]
process.c

index f72fd076b2eea9973394d2ae11f663febd6e17de..917e08c7b07524fff07cdc09e253ec1692efcb5e 100644 (file)
@@ -34,6 +34,7 @@ strace_SOURCES =      \
        fallocate.c     \
        fanotify.c      \
        file.c          \
+       get_robust_list.c \
        getcpu.c        \
        getcwd.c        \
        inotify.c       \
diff --git a/get_robust_list.c b/get_robust_list.c
new file mode 100644 (file)
index 0000000..1b667ca
--- /dev/null
@@ -0,0 +1,29 @@
+#include "defs.h"
+
+int
+sys_get_robust_list(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
+       } else {
+               void *addr;
+               size_t len;
+
+               if (syserror(tcp) ||
+                   !tcp->u_arg[1] ||
+                   umove(tcp, tcp->u_arg[1], &addr) < 0) {
+                       tprintf("%#lx, ", tcp->u_arg[1]);
+               } else {
+                       tprintf("[%p], ", addr);
+               }
+
+               if (syserror(tcp) ||
+                   !tcp->u_arg[2] ||
+                   umove(tcp, tcp->u_arg[2], &len) < 0) {
+                       tprintf("%#lx", tcp->u_arg[2]);
+               } else {
+                       tprintf("[%lu]", (unsigned long) len);
+               }
+       }
+       return 0;
+}
index ea73594df0324cc29efe369339439004c85afb0a..46b980f02af0137b5a602878e23553405f9e1107 100644 (file)
--- a/process.c
+++ b/process.c
@@ -2201,31 +2201,3 @@ sys_futex(struct tcb *tcp)
        }
        return 0;
 }
-
-int
-sys_get_robust_list(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
-       } else {
-               void *addr;
-               size_t len;
-
-               if (syserror(tcp) ||
-                   !tcp->u_arg[1] ||
-                   umove(tcp, tcp->u_arg[1], &addr) < 0) {
-                       tprintf("%#lx, ", tcp->u_arg[1]);
-               } else {
-                       tprintf("[%p], ", addr);
-               }
-
-               if (syserror(tcp) ||
-                   !tcp->u_arg[2] ||
-                   umove(tcp, tcp->u_arg[2], &len) < 0) {
-                       tprintf("%#lx", tcp->u_arg[2]);
-               } else {
-                       tprintf("[%lu]", (unsigned long) len);
-               }
-       }
-       return 0;
-}