summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>2022-10-18 11:23:15 +0200
committerDmitry V. Levin <ldv@strace.io>2022-12-22 08:00:00 +0000
commit2f36e9f9e9fc6824fdba2bac693bad74d99418d5 (patch)
treee4243897411c5716afe2584ba36ce1251b70f399
parent945d51be3f302d43ae24866a63af8d6079f38a97 (diff)
downloadstrace-2f36e9f9e9fc6824fdba2bac693bad74d99418d5.tar.gz
src: introduce tprint_arg_name_end helper
* src/defs.h (tprint_arg_name_end): New function. * src/clone.c (SYS_FUNC(clone)): Use it. Co-authored-by: Dmitry V. Levin <ldv@strace.io>
-rw-r--r--src/clone.c6
-rw-r--r--src/print_fields.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/src/clone.c b/src/clone.c
index 5cf11a709..8d384abe2 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -77,11 +77,13 @@ SYS_FUNC(clone)
tprints_arg_name_begin("child_stack");
printaddr(tcp->u_arg[ARG_STACK]);
+ tprint_arg_name_end();
tprint_arg_next();
#ifdef ARG_STACKSIZE
if (ARG_STACKSIZE != -1) {
tprints_arg_name_begin("stack_size");
PRINT_VAL_X(tcp->u_arg[ARG_STACKSIZE]);
+ tprint_arg_name_end();
tprint_arg_next();
}
#endif
@@ -97,6 +99,7 @@ SYS_FUNC(clone)
} else {
printsignal(sig);
}
+ tprint_arg_name_end();
/*
* TODO on syscall entry:
* We can clear CLONE_PTRACE here since it is an ancient hack
@@ -123,16 +126,19 @@ SYS_FUNC(clone)
printnum_pid(tcp, addr, PT_TID);
else
printnum_fd(tcp, addr);
+ tprint_arg_name_end();
}
if (flags & CLONE_SETTLS) {
tprint_arg_next();
tprints_arg_name_begin("tls");
print_tls_arg(tcp, tcp->u_arg[ARG_TLS]);
+ tprint_arg_name_end();
}
if (flags & (CLONE_CHILD_SETTID|CLONE_CHILD_CLEARTID)) {
tprint_arg_next();
tprints_arg_name_begin("child_tidptr");
printaddr(tcp->u_arg[ARG_CTID]);
+ tprint_arg_name_end();
}
}
return RVAL_TID;
diff --git a/src/print_fields.h b/src/print_fields.h
index 12d6655af..df53b2c3b 100644
--- a/src/print_fields.h
+++ b/src/print_fields.h
@@ -278,6 +278,11 @@ tprints_arg_name_begin(const char *name)
}
static inline void
+tprint_arg_name_end(void)
+{
+}
+
+static inline void
tprints_arg_begin(const char *name)
{
STRACE_PRINTF("%s(", name);