Author: zont
Date: Wed Oct 3 14:28:55 2012
New Revision: 241162
URL: http://svn.freebsd.org/changeset/base/241162
Log:
MFC r239501:
- Use pid_t type instead of just int.
MFC r239611:
- Put arguments for print_syscall_ret() function in proper order.
Bug was introduced in r192025.
MFC r239898:
- Remove unused variables.
- Fix warnings about comparing signed and unsigned ints.
MFC r240005:
- Style(9) cleanup.
MFC r240364:
- Remove unused variables.
- Remove redundant return after err(3) call.
MFC r240393:
- Fix detaching under some circumstances.
When truss is detaching from very active process it is possible to
hang on waitpid(2) in restore_proc() forever, because
ptrace(PT_SYSCALL) must be called before detaching, to allow the
debugging process to continue execution. Also when truss called with
'-c' argument, it does not print anything after detach, because it
immediately exits from restore_proc().
To fix these two problems make detaching deferred, but then it is
impossible to detach from a process which does not do any system call.
To fix this issue use sigaction(2) instead of signal(3) to disable
SA_RESTART flag for waitpid(2) that makes it non-restartable. Remove
global variable child_pid, because now detaching is handled in context
where child's pid is known.
MFC r240562:
- Make truss thread-aware.
Approved by: kib (mentor)
Modified:
stable/9/usr.bin/truss/amd64-fbsd.c
stable/9/usr.bin/truss/amd64-fbsd32.c
stable/9/usr.bin/truss/amd64-linux32.c
stable/9/usr.bin/truss/extern.h
stable/9/usr.bin/truss/i386-fbsd.c
stable/9/usr.bin/truss/i386-linux.c
stable/9/usr.bin/truss/ia64-fbsd.c
stable/9/usr.bin/truss/main.c
stable/9/usr.bin/truss/mips-fbsd.c
stable/9/usr.bin/truss/powerpc-fbsd.c
stable/9/usr.bin/truss/powerpc64-fbsd.c
stable/9/usr.bin/truss/setup.c
stable/9/usr.bin/truss/sparc64-fbsd.c
stable/9/usr.bin/truss/syscall.h
stable/9/usr.bin/truss/syscalls.c
stable/9/usr.bin/truss/truss.h
Directory Properties:
stable/9/usr.bin/truss/ (props changed)
Modified: stable/9/usr.bin/truss/amd64-fbsd.c
==============================================================================
--- stable/9/usr.bin/truss/amd64-fbsd.c Wed Oct 3 13:51:03 2012
(r241161)
+++ stable/9/usr.bin/truss/amd64-fbsd.c Wed Oct 3 14:28:55 2012
(r241162)
@@ -62,8 +62,6 @@ static const char rcsid[] =
#include "syscall.h"
#include "extern.h"
-static int cpid = -1;
-
#include "syscalls.h"
static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]);
@@ -77,29 +75,35 @@ static int nsyscalls = sizeof(syscallnam
* 'struct syscall' describes the system call; it may be NULL, however,
* if we don't know about this particular system call yet.
*/
-static struct freebsd_syscall {
+struct freebsd_syscall {
struct syscall *sc;
const char *name;
int number;
unsigned long *args;
int nargs; /* number of arguments -- *not* number of words! */
char **s_args; /* the printable arguments */
-} fsc;
+};
+
+static struct freebsd_syscall *
+alloc_fsc(void)
+{
+
+ return (malloc(sizeof(struct freebsd_syscall)));
+}
/* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void) {
- if (fsc.args) {
- free(fsc.args);
- }
- if (fsc.s_args) {
- int i;
- for (i = 0; i < fsc.nargs; i++)
- if (fsc.s_args[i])
- free(fsc.s_args[i]);
- free(fsc.s_args);
- }
- memset(&fsc, 0, sizeof(fsc));
+static void
+free_fsc(struct freebsd_syscall *fsc)
+{
+ int i;
+
+ free(fsc->args);
+ if (fsc->s_args) {
+ for (i = 0; i < fsc->nargs; i++)
+ free(fsc->s_args[i]);
+ free(fsc->s_args);
+ }
+ free(fsc);
}
/*
@@ -110,147 +114,147 @@ clear_fsc(void) {
*/
void
-amd64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
- struct reg regs;
- int syscall_num;
- int i, reg;
- struct syscall *sc;
-
- cpid = trussinfo->curthread->tid;
-
- clear_fsc();
- if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0)
- {
- fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
- return;
- }
-
- /*
- * FreeBSD has two special kinds of system call redirctions --
- * SYS_syscall, and SYS___syscall. The former is the old syscall()
- * routine, basically; the latter is for quad-aligned arguments.
- */
- reg = 0;
- syscall_num = regs.r_rax;
- switch (syscall_num) {
- case SYS_syscall:
- case SYS___syscall:
- syscall_num = regs.r_rdi;
- reg++;
- break;
- }
-
- fsc.number = syscall_num;
- fsc.name =
- (syscall_num < 0 || syscall_num >= nsyscalls) ? NULL :
syscallnames[syscall_num];
- if (!fsc.name) {
- fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num);
- }
-
- if (fsc.name && (trussinfo->flags & FOLLOWFORKS)
- && ((!strcmp(fsc.name, "fork")
- || !strcmp(fsc.name, "rfork")
- || !strcmp(fsc.name, "vfork"))))
- {
- trussinfo->curthread->in_fork = 1;
- }
-
- if (nargs == 0)
- return;
-
- fsc.args = malloc((1+nargs) * sizeof(unsigned long));
- for (i = 0; i < nargs && reg < 6; i++, reg++) {
- switch (reg) {
- case 0: fsc.args[i] = regs.r_rdi; break;
- case 1: fsc.args[i] = regs.r_rsi; break;
- case 2: fsc.args[i] = regs.r_rdx; break;
- case 3: fsc.args[i] = regs.r_rcx; break;
- case 4: fsc.args[i] = regs.r_r8; break;
- case 5: fsc.args[i] = regs.r_r9; break;
- }
- }
- if (nargs > i) {
- struct ptrace_io_desc iorequest;
- iorequest.piod_op = PIOD_READ_D;
- iorequest.piod_offs = (void *)(regs.r_rsp + sizeof(register_t));
- iorequest.piod_addr = &fsc.args[i];
- iorequest.piod_len = (nargs - i) * sizeof(register_t);
- ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0);
- if (iorequest.piod_len == 0)
- return;
- }
-
- sc = get_syscall(fsc.name);
- if (sc) {
- fsc.nargs = sc->nargs;
- } else {
+amd64_syscall_entry(struct trussinfo *trussinfo, int nargs)
+{
+ struct ptrace_io_desc iorequest;
+ struct reg regs;
+ struct freebsd_syscall *fsc;
+ struct syscall *sc;
+ lwpid_t tid;
+ int i, reg, syscall_num;
+
+ tid = trussinfo->curthread->tid;
+
+ if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) {
+ fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+ return;
+ }
+
+ /*
+ * FreeBSD has two special kinds of system call redirctions --
+ * SYS_syscall, and SYS___syscall. The former is the old syscall()
+ * routine, basically; the latter is for quad-aligned arguments.
+ */
+ reg = 0;
+ syscall_num = regs.r_rax;
+ switch (syscall_num) {
+ case SYS_syscall:
+ case SYS___syscall:
+ syscall_num = regs.r_rdi;
+ reg++;
+ break;
+ }
+
+ fsc = alloc_fsc();
+ if (fsc == NULL)
+ return;
+ fsc->number = syscall_num;
+ fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
+ NULL : syscallnames[syscall_num];
+ if (!fsc->name) {
+ fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n",
+ syscall_num);
+ }
+
+ if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
+ (strcmp(fsc->name, "fork") == 0 ||
+ strcmp(fsc->name, "rfork") == 0 ||
+ strcmp(fsc->name, "vfork") == 0))
+ trussinfo->curthread->in_fork = 1;
+
+ if (nargs == 0)
+ return;
+
+ fsc->args = malloc((1 + nargs) * sizeof(unsigned long));
+ for (i = 0; i < nargs && reg < 6; i++, reg++) {
+ switch (reg) {
+ case 0: fsc->args[i] = regs.r_rdi; break;
+ case 1: fsc->args[i] = regs.r_rsi; break;
+ case 2: fsc->args[i] = regs.r_rdx; break;
+ case 3: fsc->args[i] = regs.r_rcx; break;
+ case 4: fsc->args[i] = regs.r_r8; break;
+ case 5: fsc->args[i] = regs.r_r9; break;
+ }
+ }
+ if (nargs > i) {
+ iorequest.piod_op = PIOD_READ_D;
+ iorequest.piod_offs = (void *)(regs.r_rsp + sizeof(register_t));
+ iorequest.piod_addr = &fsc->args[i];
+ iorequest.piod_len = (nargs - i) * sizeof(register_t);
+ ptrace(PT_IO, tid, (caddr_t)&iorequest, 0);
+ if (iorequest.piod_len == 0)
+ return;
+ }
+
+ sc = get_syscall(fsc->name);
+ if (sc)
+ fsc->nargs = sc->nargs;
+ else {
#if DEBUG
- fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n",
- fsc.name, nargs);
+ fprintf(trussinfo->outfile, "unknown syscall %s -- setting "
+ "args to %d\n", fsc->name, nargs);
#endif
- fsc.nargs = nargs;
- }
+ fsc->nargs = nargs;
+ }
- fsc.s_args = calloc(1, (1+fsc.nargs) * sizeof(char*));
- fsc.sc = sc;
+ fsc->s_args = calloc(1, (1 + fsc->nargs) * sizeof(char *));
+ fsc->sc = sc;
- /*
- * At this point, we set up the system call arguments.
- * We ignore any OUT ones, however -- those are arguments that
- * are set by the system call, and so are probably meaningless
- * now. This doesn't currently support arguments that are
- * passed in *and* out, however.
- */
-
- if (fsc.name) {
+ /*
+ * At this point, we set up the system call arguments.
+ * We ignore any OUT ones, however -- those are arguments that
+ * are set by the system call, and so are probably meaningless
+ * now. This doesn't currently support arguments that are
+ * passed in *and* out, however.
+ */
+ if (fsc->name) {
#if DEBUG
- fprintf(stderr, "syscall %s(", fsc.name);
+ fprintf(stderr, "syscall %s(", fsc->name);
#endif
- for (i = 0; i < fsc.nargs; i++) {
+ for (i = 0; i < fsc->nargs; i++) {
#if DEBUG
- fprintf(stderr, "0x%lx%s",
- sc
- ? fsc.args[sc->args[i].offset]
- : fsc.args[i],
- i < (fsc.nargs - 1) ? "," : "");
+ fprintf(stderr, "0x%lx%s", sc ?
+ fsc->args[sc->args[i].offset] : fsc->args[i],
+ i < (fsc->nargs - 1) ? "," : "");
#endif
- if (sc && !(sc->args[i].type & OUT)) {
- fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo);
- }
- }
+ if (sc && !(sc->args[i].type & OUT)) {
+ fsc->s_args[i] = print_arg(&sc->args[i],
+ fsc->args, 0, trussinfo);
+ }
+ }
#if DEBUG
- fprintf(stderr, ")\n");
+ fprintf(stderr, ")\n");
#endif
- }
+ }
#if DEBUG
- fprintf(trussinfo->outfile, "\n");
+ fprintf(trussinfo->outfile, "\n");
#endif
- if (fsc.name != NULL &&
- (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit"))) {
-
- /* XXX
- * This could be done in a more general
- * manner but it still wouldn't be very pretty.
- */
- if (!strcmp(fsc.name, "execve")) {
- if ((trussinfo->flags & EXECVEARGS) == 0)
- if (fsc.s_args[1]) {
- free(fsc.s_args[1]);
- fsc.s_args[1] = NULL;
- }
- if ((trussinfo->flags & EXECVEENVS) == 0)
- if (fsc.s_args[2]) {
- free(fsc.s_args[2]);
- fsc.s_args[2] = NULL;
- }
- }
-
- }
-
- return;
+ if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0)) {
+ /*
+ * XXX
+ * This could be done in a more general
+ * manner but it still wouldn't be very pretty.
+ */
+ if (strcmp(fsc->name, "execve") == 0) {
+ if ((trussinfo->flags & EXECVEARGS) == 0) {
+ if (fsc->s_args[1]) {
+ free(fsc->s_args[1]);
+ fsc->s_args[1] = NULL;
+ }
+ }
+ if ((trussinfo->flags & EXECVEENVS) == 0) {
+ if (fsc->s_args[2]) {
+ free(fsc->s_args[2]);
+ fsc->s_args[2] = NULL;
+ }
+ }
+ }
+ }
+ trussinfo->curthread->fsc = fsc;
}
/*
@@ -263,68 +267,72 @@ amd64_syscall_entry(struct trussinfo *tr
long
amd64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
{
- struct reg regs;
- long retval;
- int i;
- int errorp;
- struct syscall *sc;
-
- if (fsc.name == NULL)
- return (-1);
-
- cpid = trussinfo->curthread->tid;
-
- if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0)
- {
- fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
- return (-1);
- }
- retval = regs.r_rax;
- errorp = !!(regs.r_rflags & PSL_C);
-
- /*
- * This code, while simpler than the initial versions I used, could
- * stand some significant cleaning.
- */
-
- sc = fsc.sc;
- if (!sc) {
- for (i = 0; i < fsc.nargs; i++)
- asprintf(&fsc.s_args[i], "0x%lx", fsc.args[i]);
- } else {
- /*
- * Here, we only look for arguments that have OUT masked in --
- * otherwise, they were handled in the syscall_entry function.
- */
- for (i = 0; i < sc->nargs; i++) {
- char *temp;
- if (sc->args[i].type & OUT) {
+ struct reg regs;
+ struct freebsd_syscall *fsc;
+ struct syscall *sc;
+ lwpid_t tid;
+ long retval;
+ int errorp, i;
+
+ if (trussinfo->curthread->fsc == NULL)
+ return (-1);
+
+ tid = trussinfo->curthread->tid;
+
+ if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) {
+ fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+ return (-1);
+ }
+
+ retval = regs.r_rax;
+ errorp = !!(regs.r_rflags & PSL_C);
+
/*
- * If an error occurred, than don't bothe getting the data;
- * it may not be valid.
+ * This code, while simpler than the initial versions I used, could
+ * stand some significant cleaning.
*/
- if (errorp)
- asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]);
- else
- temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo);
- fsc.s_args[i] = temp;
- }
- }
- }
-
- if (fsc.name != NULL &&
- (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit"))) {
- trussinfo->curthread->in_syscall = 1;
- }
-
- /*
- * It would probably be a good idea to merge the error handling,
- * but that complicates things considerably.
- */
-
- print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp,
- retval, fsc.sc);
- clear_fsc();
- return (retval);
+ fsc = trussinfo->curthread->fsc;
+ sc = fsc->sc;
+ if (!sc) {
+ for (i = 0; i < fsc->nargs; i++)
+ asprintf(&fsc->s_args[i], "0x%lx", fsc->args[i]);
+ } else {
+ /*
+ * Here, we only look for arguments that have OUT masked in --
+ * otherwise, they were handled in the syscall_entry function.
+ */
+ for (i = 0; i < sc->nargs; i++) {
+ char *temp;
+ if (sc->args[i].type & OUT) {
+ /*
+ * If an error occurred, then don't bother
+ * getting the data; it may not be valid.
+ */
+ if (errorp) {
+ asprintf(&temp, "0x%lx",
+ fsc->args[sc->args[i].offset]);
+ } else {
+ temp = print_arg(&sc->args[i],
+ fsc->args, retval, trussinfo);
+ }
+ fsc->s_args[i] = temp;
+ }
+ }
+ }
+
+ if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0))
+ trussinfo->curthread->in_syscall = 1;
+
+ /*
+ * It would probably be a good idea to merge the error handling,
+ * but that complicates things considerably.
+ */
+
+ print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
+ retval, fsc->sc);
+ free_fsc(fsc);
+
+ return (retval);
}
Modified: stable/9/usr.bin/truss/amd64-fbsd32.c
==============================================================================
--- stable/9/usr.bin/truss/amd64-fbsd32.c Wed Oct 3 13:51:03 2012
(r241161)
+++ stable/9/usr.bin/truss/amd64-fbsd32.c Wed Oct 3 14:28:55 2012
(r241162)
@@ -43,8 +43,8 @@ static const char rcsid[] =
*/
#include <sys/types.h>
-#include <sys/syscall.h>
#include <sys/ptrace.h>
+#include <sys/syscall.h>
#include <machine/reg.h>
#include <machine/psl.h>
@@ -62,8 +62,6 @@ static const char rcsid[] =
#include "syscall.h"
#include "extern.h"
-static int cpid = -1;
-
#include "freebsd32_syscalls.h"
static int nsyscalls = sizeof(freebsd32_syscallnames) /
@@ -78,7 +76,7 @@ static int nsyscalls = sizeof(freebsd32_
* 'struct syscall' describes the system call; it may be NULL, however,
* if we don't know about this particular system call yet.
*/
-static struct freebsd32_syscall {
+struct freebsd32_syscall {
struct syscall *sc;
const char *name;
int number;
@@ -86,25 +84,29 @@ static struct freebsd32_syscall {
unsigned int *args32;
int nargs; /* number of arguments -- *not* number of words! */
char **s_args; /* the printable arguments */
-} fsc;
+};
+
+static struct freebsd32_syscall *
+alloc_fsc(void)
+{
+
+ return (malloc(sizeof(struct freebsd32_syscall)));
+}
/* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void) {
- if (fsc.args) {
- free(fsc.args);
- }
- if (fsc.args32) {
- free(fsc.args32);
- }
- if (fsc.s_args) {
- int i;
- for (i = 0; i < fsc.nargs; i++)
- if (fsc.s_args[i])
- free(fsc.s_args[i]);
- free(fsc.s_args);
- }
- memset(&fsc, 0, sizeof(fsc));
+static void
+free_fsc(struct freebsd32_syscall *fsc)
+{
+ int i;
+
+ free(fsc->args);
+ free(fsc->args32);
+ if (fsc->s_args) {
+ for (i = 0; i < fsc->nargs; i++)
+ free(fsc->s_args[i]);
+ free(fsc->s_args);
+ }
+ free(fsc);
}
/*
@@ -115,145 +117,145 @@ clear_fsc(void) {
*/
void
-amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs) {
- struct reg regs;
- int syscall_num;
- int i;
- unsigned long parm_offset;
- struct syscall *sc = NULL;
- struct ptrace_io_desc iorequest;
- cpid = trussinfo->curthread->tid;
-
- clear_fsc();
-
- if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0)
- {
- fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
- return;
- }
- parm_offset = regs.r_rsp + sizeof(int);
-
- /*
- * FreeBSD has two special kinds of system call redirctions --
- * SYS_syscall, and SYS___syscall. The former is the old syscall()
- * routine, basically; the latter is for quad-aligned arguments.
- */
- syscall_num = regs.r_rax;
- switch (syscall_num) {
- case SYS_syscall:
- syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0);
- parm_offset += sizeof(int);
- break;
- case SYS___syscall:
- syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0);
- parm_offset += sizeof(quad_t);
- break;
- }
-
- fsc.number = syscall_num;
- fsc.name =
- (syscall_num < 0 || syscall_num >= nsyscalls) ? NULL :
- freebsd32_syscallnames[syscall_num];
- if (!fsc.name) {
- fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num);
- }
-
- if (fsc.name && (trussinfo->flags & FOLLOWFORKS)
- && ((!strcmp(fsc.name, "fork")
- || !strcmp(fsc.name, "rfork")
- || !strcmp(fsc.name, "vfork"))))
- {
- trussinfo->curthread->in_fork = 1;
- }
-
- if (nargs == 0)
- return;
-
- fsc.args32 = malloc((1+nargs) * sizeof(unsigned int));
- iorequest.piod_op = PIOD_READ_D;
- iorequest.piod_offs = (void *)parm_offset;
- iorequest.piod_addr = fsc.args32;
- iorequest.piod_len = (1+nargs) * sizeof(unsigned int);
- ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0);
- if (iorequest.piod_len == 0)
- return;
-
- fsc.args = malloc((1+nargs) * sizeof(unsigned long));
- for (i = 0; i < nargs + 1; i++)
- fsc.args[i] = fsc.args32[i];
-
- if (fsc.name)
- sc = get_syscall(fsc.name);
- if (sc) {
- fsc.nargs = sc->nargs;
- } else {
+amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs)
+{
+ struct ptrace_io_desc iorequest;
+ struct reg regs;
+ struct freebsd32_syscall *fsc;
+ struct syscall *sc;
+ lwpid_t tid;
+ unsigned long parm_offset;
+ int i, syscall_num;
+
+ tid = trussinfo->curthread->tid;
+
+ if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) {
+ fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+ return;
+ }
+ parm_offset = regs.r_rsp + sizeof(int);
+
+ /*
+ * FreeBSD has two special kinds of system call redirctions --
+ * SYS_syscall, and SYS___syscall. The former is the old syscall()
+ * routine, basically; the latter is for quad-aligned arguments.
+ */
+ syscall_num = regs.r_rax;
+ switch (syscall_num) {
+ case SYS_syscall:
+ syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0);
+ parm_offset += sizeof(int);
+ break;
+ case SYS___syscall:
+ syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0);
+ parm_offset += sizeof(quad_t);
+ break;
+ }
+
+ fsc = alloc_fsc();
+ if (fsc == NULL)
+ return;
+ fsc->number = syscall_num;
+ fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
+ NULL : freebsd32_syscallnames[syscall_num];
+ if (!fsc->name) {
+ fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n",
+ syscall_num);
+ }
+
+ if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
+ (strcmp(fsc->name, "fork") == 0 ||
+ strcmp(fsc->name, "rfork") == 0 ||
+ strcmp(fsc->name, "vfork") == 0))
+ trussinfo->curthread->in_fork = 1;
+
+ if (nargs == 0)
+ return;
+
+ fsc->args32 = malloc((1 + nargs) * sizeof(unsigned int));
+ iorequest.piod_op = PIOD_READ_D;
+ iorequest.piod_offs = (void *)parm_offset;
+ iorequest.piod_addr = fsc->args32;
+ iorequest.piod_len = (1 + nargs) * sizeof(unsigned int);
+ ptrace(PT_IO, tid, (caddr_t)&iorequest, 0);
+ if (iorequest.piod_len == 0)
+ return;
+
+ fsc->args = malloc((1 + nargs) * sizeof(unsigned long));
+ for (i = 0; i < nargs + 1; i++)
+ fsc->args[i] = fsc->args32[i];
+
+ sc = NULL;
+ if (fsc->name)
+ sc = get_syscall(fsc->name);
+ if (sc)
+ fsc->nargs = sc->nargs;
+ else {
#if DEBUG
- fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n",
- fsc.name, nargs);
+ fprintf(trussinfo->outfile, "unknown syscall %s -- setting "
+ "args to %d\n", fsc->name, nargs);
#endif
- fsc.nargs = nargs;
- }
+ fsc->nargs = nargs;
+ }
- fsc.s_args = calloc(1, (1+fsc.nargs) * sizeof(char*));
- fsc.sc = sc;
+ fsc->s_args = calloc(1, (1 + fsc->nargs) * sizeof(char *));
+ fsc->sc = sc;
- /*
- * At this point, we set up the system call arguments.
- * We ignore any OUT ones, however -- those are arguments that
- * are set by the system call, and so are probably meaningless
- * now. This doesn't currently support arguments that are
- * passed in *and* out, however.
- */
-
- if (fsc.name) {
+ /*
+ * At this point, we set up the system call arguments.
+ * We ignore any OUT ones, however -- those are arguments that
+ * are set by the system call, and so are probably meaningless
+ * now. This doesn't currently support arguments that are
+ * passed in *and* out, however.
+ */
+ if (fsc->name) {
#if DEBUG
- fprintf(stderr, "syscall %s(", fsc.name);
+ fprintf(stderr, "syscall %s(", fsc->name);
#endif
- for (i = 0; i < fsc.nargs; i++) {
+ for (i = 0; i < fsc->nargs; i++) {
#if DEBUG
- fprintf(stderr, "0x%x%s",
- sc
- ? fsc.args[sc->args[i].offset]
- : fsc.args[i],
- i < (fsc.nargs - 1) ? "," : "");
+ fprintf(stderr, "0x%x%s", sc ?
+ fsc->args[sc->args[i].offset] : fsc->args[i],
+ i < (fsc->nargs - 1) ? "," : "");
#endif
- if (sc && !(sc->args[i].type & OUT)) {
- fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo);
- }
- }
+ if (sc && !(sc->args[i].type & OUT)) {
+ fsc->s_args[i] = print_arg(&sc->args[i],
+ fsc->args, 0, trussinfo);
+ }
+ }
#if DEBUG
- fprintf(stderr, ")\n");
+ fprintf(stderr, ")\n");
#endif
- }
+ }
#if DEBUG
- fprintf(trussinfo->outfile, "\n");
+ fprintf(trussinfo->outfile, "\n");
#endif
- if (fsc.name != NULL &&
- (!strcmp(fsc.name, "freebsd32_execve") || !strcmp(fsc.name, "exit"))) {
-
- /* XXX
- * This could be done in a more general
- * manner but it still wouldn't be very pretty.
- */
- if (!strcmp(fsc.name, "freebsd32_execve")) {
- if ((trussinfo->flags & EXECVEARGS) == 0)
- if (fsc.s_args[1]) {
- free(fsc.s_args[1]);
- fsc.s_args[1] = NULL;
- }
- if ((trussinfo->flags & EXECVEENVS) == 0)
- if (fsc.s_args[2]) {
- free(fsc.s_args[2]);
- fsc.s_args[2] = NULL;
- }
- }
-
- }
-
- return;
+ if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0)) {
+ /*
+ * XXX
+ * This could be done in a more general
+ * manner but it still wouldn't be very pretty.
+ */
+ if (strcmp(fsc->name, "freebsd32_execve") == 0) {
+ if ((trussinfo->flags & EXECVEARGS) == 0) {
+ if (fsc->s_args[1]) {
+ free(fsc->s_args[1]);
+ fsc->s_args[1] = NULL;
+ }
+ }
+ if ((trussinfo->flags & EXECVEENVS) == 0) {
+ if (fsc->s_args[2]) {
+ free(fsc->s_args[2]);
+ fsc->s_args[2] = NULL;
+ }
+ }
+ }
+ }
+ trussinfo->curthread->fsc = fsc;
}
/*
@@ -266,68 +268,72 @@ amd64_fbsd32_syscall_entry(struct trussi
long
amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num
__unused)
{
- struct reg regs;
- long retval;
- int i;
- int errorp;
- struct syscall *sc;
-
- if (fsc.name == NULL)
- return (-1);
- cpid = trussinfo->curthread->tid;
-
- if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0)
- {
- fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
- return (-1);
- }
-
- retval = regs.r_rax;
- errorp = !!(regs.r_rflags & PSL_C);
-
- /*
- * This code, while simpler than the initial versions I used, could
- * stand some significant cleaning.
- */
-
- sc = fsc.sc;
- if (!sc) {
- for (i = 0; i < fsc.nargs; i++)
- asprintf(&fsc.s_args[i], "0x%lx", fsc.args[i]);
- } else {
- /*
- * Here, we only look for arguments that have OUT masked in --
- * otherwise, they were handled in the syscall_entry function.
- */
- for (i = 0; i < sc->nargs; i++) {
- char *temp;
- if (sc->args[i].type & OUT) {
+ struct reg regs;
+ struct freebsd32_syscall *fsc;
+ struct syscall *sc;
+ lwpid_t tid;
+ long retval;
+ int errorp, i;
+
+ if (trussinfo->curthread->fsc == NULL)
+ return (-1);
+
+ tid = trussinfo->curthread->tid;
+
+ if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) {
+ fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+ return (-1);
+ }
+
+ retval = regs.r_rax;
+ errorp = !!(regs.r_rflags & PSL_C);
+
/*
- * If an error occurred, then don't bother getting the data;
- * it may not be valid.
+ * This code, while simpler than the initial versions I used, could
+ * stand some significant cleaning.
*/
- if (errorp)
- asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]);
- else
- temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo);
- fsc.s_args[i] = temp;
- }
- }
- }
-
- if (fsc.name != NULL &&
- (!strcmp(fsc.name, "freebsd32_execve") || !strcmp(fsc.name, "exit"))) {
- trussinfo->curthread->in_syscall = 1;
- }
-
- /*
- * It would probably be a good idea to merge the error handling,
- * but that complicates things considerably.
- */
-
- print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp,
- retval, fsc.sc);
- clear_fsc();
- return (retval);
+ fsc = trussinfo->curthread->fsc;
+ sc = fsc->sc;
+ if (!sc) {
+ for (i = 0; i < fsc->nargs; i++)
+ asprintf(&fsc->s_args[i], "0x%lx", fsc->args[i]);
+ } else {
+ /*
+ * Here, we only look for arguments that have OUT masked in --
+ * otherwise, they were handled in the syscall_entry function.
+ */
+ for (i = 0; i < sc->nargs; i++) {
+ char *temp;
+ if (sc->args[i].type & OUT) {
+ /*
+ * If an error occurred, then don't bother
+ * getting the data; it may not be valid.
+ */
+ if (errorp) {
+ asprintf(&temp, "0x%lx",
+ fsc->args[sc->args[i].offset]);
+ } else {
+ temp = print_arg(&sc->args[i],
+ fsc->args, retval, trussinfo);
+ }
+ fsc->s_args[i] = temp;
+ }
+ }
+ }
+
+ if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0))
+ trussinfo->curthread->in_syscall = 1;
+
+ /*
+ * It would probably be a good idea to merge the error handling,
+ * but that complicates things considerably.
+ */
+
+ print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
+ retval, fsc->sc);
+ free_fsc(fsc);
+
+ return (retval);
}
Modified: stable/9/usr.bin/truss/amd64-linux32.c
==============================================================================
--- stable/9/usr.bin/truss/amd64-linux32.c Wed Oct 3 13:51:03 2012
(r241161)
+++ stable/9/usr.bin/truss/amd64-linux32.c Wed Oct 3 14:28:55 2012
(r241162)
@@ -59,8 +59,6 @@ static const char rcsid[] =
#include "syscall.h"
#include "extern.h"
-static int cpid = -1;
-
#include "linux32_syscalls.h"
static int nsyscalls =
@@ -75,26 +73,34 @@ static int nsyscalls =
* 'struct syscall' describes the system call; it may be NULL, however,
* if we don't know about this particular system call yet.
*/
-static struct linux_syscall {
+struct linux_syscall {
struct syscall *sc;
const char *name;
int number;
unsigned long args[5];
int nargs; /* number of arguments -- *not* number of words! */
char **s_args; /* the printable arguments */
-} fsc;
+};
+
+static struct linux_syscall *
+alloc_fsc(void)
+{
+
+ return (malloc(sizeof(struct linux_syscall)));
+}
/* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void) {
- if (fsc.s_args) {
- int i;
- for (i = 0; i < fsc.nargs; i++)
- if (fsc.s_args[i])
- free(fsc.s_args[i]);
- free(fsc.s_args);
- }
- memset(&fsc, 0, sizeof(fsc));
+static void
+free_fsc(struct linux_syscall *fsc)
+{
+ int i;
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
