Date: Sun, 16 Sep 2012 14:38:01 +0000 (UTC) From: Andrey Zonov <zont@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r240562 - head/usr.bin/truss Message-ID: <201209161438.q8GEc14B008266@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zont Date: Sun Sep 16 14:38:01 2012 New Revision: 240562 URL: http://svn.freebsd.org/changeset/base/240562 Log: - Make truss thread-aware. Approved by: kib (mentor) MFC after: 2 weeks Modified: head/usr.bin/truss/amd64-fbsd.c head/usr.bin/truss/amd64-fbsd32.c head/usr.bin/truss/amd64-linux32.c head/usr.bin/truss/i386-fbsd.c head/usr.bin/truss/i386-linux.c head/usr.bin/truss/ia64-fbsd.c head/usr.bin/truss/main.c head/usr.bin/truss/mips-fbsd.c head/usr.bin/truss/powerpc-fbsd.c head/usr.bin/truss/powerpc64-fbsd.c head/usr.bin/truss/setup.c head/usr.bin/truss/sparc64-fbsd.c head/usr.bin/truss/syscalls.c head/usr.bin/truss/truss.h Modified: head/usr.bin/truss/amd64-fbsd.c ============================================================================== --- head/usr.bin/truss/amd64-fbsd.c Sun Sep 16 13:13:02 2012 (r240561) +++ head/usr.bin/truss/amd64-fbsd.c Sun Sep 16 14:38:01 2012 (r240562) @@ -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,30 +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) +static void +free_fsc(struct freebsd_syscall *fsc) { int i; - if (fsc.args) - free(fsc.args); - if (fsc.s_args) { - for (i = 0; i < fsc.nargs; i++) - if (fsc.s_args[i]) - free(fsc.s_args[i]); - free(fsc.s_args); + free(fsc->args); + if (fsc->s_args) { + for (i = 0; i < fsc->nargs; i++) + free(fsc->s_args[i]); + free(fsc->s_args); } - memset(&fsc, 0, sizeof(fsc)); + free(fsc); } /* @@ -115,14 +118,14 @@ amd64_syscall_entry(struct trussinfo *tr { struct ptrace_io_desc iorequest; struct reg regs; + struct freebsd_syscall *fsc; struct syscall *sc; + lwpid_t tid; int i, reg, syscall_num; - clear_fsc(); - - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return; } @@ -142,57 +145,60 @@ amd64_syscall_entry(struct trussinfo *tr break; } - fsc.number = syscall_num; - fsc.name = (syscall_num < 0 || syscall_num >= nsyscalls) ? + 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) { + 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)) + 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)); + 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; + 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_addr = &fsc->args[i]; iorequest.piod_len = (nargs - i) * sizeof(register_t); - ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + ptrace(PT_IO, tid, (caddr_t)&iorequest, 0); if (iorequest.piod_len == 0) return; } - sc = get_syscall(fsc.name); + sc = get_syscall(fsc->name); if (sc) - fsc.nargs = sc->nargs; + fsc->nargs = sc->nargs; else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting " - "args to %d\n", fsc.name, nargs); + "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. @@ -202,19 +208,19 @@ amd64_syscall_entry(struct trussinfo *tr * passed in *and* out, however. */ - if (fsc.name) { + 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) ? "," : ""); + 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); + fsc->s_args[i] = print_arg(&sc->args[i], + fsc->args, 0, trussinfo); } } #if DEBUG @@ -226,30 +232,29 @@ amd64_syscall_entry(struct trussinfo *tr fprintf(trussinfo->outfile, "\n"); #endif - if (fsc.name != NULL && (strcmp(fsc.name, "execve") == 0 || - strcmp(fsc.name, "exit") == 0)) { + 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 (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 (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; + if (fsc->s_args[2]) { + free(fsc->s_args[2]); + fsc->s_args[2] = NULL; } } } } - - return; + trussinfo->curthread->fsc = fsc; } /* @@ -263,16 +268,18 @@ long amd64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { struct reg regs; + struct freebsd_syscall *fsc; struct syscall *sc; + lwpid_t tid; long retval; int errorp, i; - if (fsc.name == NULL) + if (trussinfo->curthread->fsc == NULL) return (-1); - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return (-1); } @@ -285,10 +292,11 @@ amd64_syscall_exit(struct trussinfo *tru * stand some significant cleaning. */ - sc = fsc.sc; + 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]); + 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 -- @@ -303,18 +311,18 @@ amd64_syscall_exit(struct trussinfo *tru */ if (errorp) { asprintf(&temp, "0x%lx", - fsc.args[sc->args[i].offset]); + fsc->args[sc->args[i].offset]); } else { temp = print_arg(&sc->args[i], - fsc.args, retval, trussinfo); + fsc->args, retval, trussinfo); } - fsc.s_args[i] = temp; + fsc->s_args[i] = temp; } } } - if (fsc.name != NULL && (strcmp(fsc.name, "execve") == 0 || - strcmp(fsc.name, "exit") == 0)) + if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 || + strcmp(fsc->name, "exit") == 0)) trussinfo->curthread->in_syscall = 1; /* @@ -322,9 +330,9 @@ amd64_syscall_exit(struct trussinfo *tru * but that complicates things considerably. */ - print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, - retval, fsc.sc); - clear_fsc(); + print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp, + retval, fsc->sc); + free_fsc(fsc); return (retval); } Modified: head/usr.bin/truss/amd64-fbsd32.c ============================================================================== --- head/usr.bin/truss/amd64-fbsd32.c Sun Sep 16 13:13:02 2012 (r240561) +++ head/usr.bin/truss/amd64-fbsd32.c Sun Sep 16 14:38:01 2012 (r240562) @@ -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) +static void +free_fsc(struct freebsd32_syscall *fsc) { int i; - if (fsc.args) - free(fsc.args); - if (fsc.args32) - free(fsc.args32); - if (fsc.s_args) { - for (i = 0; i < fsc.nargs; i++) - if (fsc.s_args[i]) - free(fsc.s_args[i]); - free(fsc.s_args); + 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); } - memset(&fsc, 0, sizeof(fsc)); + free(fsc); } /* @@ -119,15 +121,15 @@ amd64_fbsd32_syscall_entry(struct trussi { 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; - clear_fsc(); - - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return; } @@ -141,60 +143,63 @@ amd64_fbsd32_syscall_entry(struct trussi syscall_num = regs.r_rax; switch (syscall_num) { case SYS_syscall: - syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0); + 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, cpid, (caddr_t)parm_offset, 0); + syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0); parm_offset += sizeof(quad_t); break; } - fsc.number = syscall_num; - fsc.name = (syscall_num < 0 || syscall_num >= nsyscalls) ? + 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) { + 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)) + 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)); + 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_addr = fsc->args32; iorequest.piod_len = (1 + nargs) * sizeof(unsigned int); - ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0); + ptrace(PT_IO, tid, (caddr_t)&iorequest, 0); if (iorequest.piod_len == 0) return; - fsc.args = malloc((1 + nargs) * sizeof(unsigned long)); + fsc->args = malloc((1 + nargs) * sizeof(unsigned long)); for (i = 0; i < nargs + 1; i++) - fsc.args[i] = fsc.args32[i]; + fsc->args[i] = fsc->args32[i]; sc = NULL; - if (fsc.name) - sc = get_syscall(fsc.name); + if (fsc->name) + sc = get_syscall(fsc->name); if (sc) - fsc.nargs = sc->nargs; + fsc->nargs = sc->nargs; else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting " - "args to %d\n", fsc.name, nargs); + "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. @@ -204,19 +209,19 @@ amd64_fbsd32_syscall_entry(struct trussi * passed in *and* out, however. */ - if (fsc.name) { + 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) ? "," : ""); + 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); + fsc->s_args[i] = print_arg(&sc->args[i], + fsc->args, 0, trussinfo); } } #if DEBUG @@ -228,30 +233,29 @@ amd64_fbsd32_syscall_entry(struct trussi fprintf(trussinfo->outfile, "\n"); #endif - if (fsc.name != NULL && (strcmp(fsc.name, "freebsd32_execve") == 0|| - strcmp(fsc.name, "exit") == 0)) { + 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 (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 (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; + if (fsc->s_args[2]) { + free(fsc->s_args[2]); + fsc->s_args[2] = NULL; } } } } - - return; + trussinfo->curthread->fsc = fsc; } /* @@ -265,16 +269,18 @@ long amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused) { struct reg regs; + struct freebsd32_syscall *fsc; struct syscall *sc; + lwpid_t tid; long retval; int errorp, i; - if (fsc.name == NULL) + if (trussinfo->curthread->fsc == NULL) return (-1); - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return (-1); } @@ -287,10 +293,11 @@ amd64_fbsd32_syscall_exit(struct trussin * stand some significant cleaning. */ - sc = fsc.sc; + 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]); + 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 -- @@ -305,18 +312,18 @@ amd64_fbsd32_syscall_exit(struct trussin */ if (errorp) { asprintf(&temp, "0x%lx", - fsc.args[sc->args[i].offset]); + fsc->args[sc->args[i].offset]); } else { temp = print_arg(&sc->args[i], - fsc.args, retval, trussinfo); + fsc->args, retval, trussinfo); } - fsc.s_args[i] = temp; + fsc->s_args[i] = temp; } } } - if (fsc.name != NULL && (strcmp(fsc.name, "freebsd32_execve") == 0 || - strcmp(fsc.name, "exit") == 0)) + if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_execve") == 0 || + strcmp(fsc->name, "exit") == 0)) trussinfo->curthread->in_syscall = 1; /* @@ -324,9 +331,9 @@ amd64_fbsd32_syscall_exit(struct trussin * but that complicates things considerably. */ - print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, - retval, fsc.sc); - clear_fsc(); + print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp, + retval, fsc->sc); + free_fsc(fsc); return (retval); } Modified: head/usr.bin/truss/amd64-linux32.c ============================================================================== --- head/usr.bin/truss/amd64-linux32.c Sun Sep 16 13:13:02 2012 (r240561) +++ head/usr.bin/truss/amd64-linux32.c Sun Sep 16 14:38:01 2012 (r240562) @@ -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,28 +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) +static void +free_fsc(struct linux_syscall *fsc) { int i; - if (fsc.s_args) { - for (i = 0; i < fsc.nargs; i++) - if (fsc.s_args[i]) - free(fsc.s_args[i]); - free(fsc.s_args); + if (fsc->s_args) { + for (i = 0; i < fsc->nargs; i++) + free(fsc->s_args[i]); + free(fsc->s_args); } - memset(&fsc, 0, sizeof(fsc)); + free(fsc); } /* @@ -110,31 +114,34 @@ void amd64_linux32_syscall_entry(struct trussinfo *trussinfo, int nargs) { struct reg regs; + struct linux_syscall *fsc; struct syscall *sc; + lwpid_t tid; int i, syscall_num; - clear_fsc(); - - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return; } syscall_num = regs.r_rax; - fsc.number = syscall_num; - fsc.name = (syscall_num < 0 || syscall_num >= nsyscalls) ? + fsc = alloc_fsc(); + if (fsc == NULL) + return; + fsc->number = syscall_num; + fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ? NULL : linux32_syscallnames[syscall_num]; - if (!fsc.name) { + if (!fsc->name) { fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } - if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && - (strcmp(fsc.name, "linux_fork") == 0|| - strcmp(fsc.name, "linux_vfork") == 0)) + if (fsc->name && (trussinfo->flags & FOLLOWFORKS) && + (strcmp(fsc->name, "linux_fork") == 0 || + strcmp(fsc->name, "linux_vfork") == 0)) trussinfo->curthread->in_fork = 1; if (nargs == 0) @@ -148,25 +155,25 @@ amd64_linux32_syscall_entry(struct truss * that have more than five arguments? */ - fsc.args[0] = regs.r_rbx; - fsc.args[1] = regs.r_rcx; - fsc.args[2] = regs.r_rdx; - fsc.args[3] = regs.r_rsi; - fsc.args[4] = regs.r_rdi; + fsc->args[0] = regs.r_rbx; + fsc->args[1] = regs.r_rcx; + fsc->args[2] = regs.r_rdx; + fsc->args[3] = regs.r_rsi; + fsc->args[4] = regs.r_rdi; - sc = get_syscall(fsc.name); + sc = get_syscall(fsc->name); if (sc) - fsc.nargs = sc->nargs; + fsc->nargs = sc->nargs; else { #if DEBUG fprintf(trussinfo->outfile, "unknown syscall %s -- setting " - "args to %d\n", fsc.name, nargs); + "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. @@ -176,19 +183,19 @@ amd64_linux32_syscall_entry(struct truss * passed in *and* out, however. */ - if (fsc.name) { + 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) ? "," : ""); + 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); + fsc->s_args[i] = print_arg(&sc->args[i], + fsc->args, 0, trussinfo); } } #if DEBUG @@ -200,30 +207,29 @@ amd64_linux32_syscall_entry(struct truss fprintf(trussinfo->outfile, "\n"); #endif - if (fsc.name != NULL && (strcmp(fsc.name, "linux_execve") == 0 || - strcmp(fsc.name, "exit") == 0)) { + if (fsc->name != NULL && (strcmp(fsc->name, "linux_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, "linux_execve") == 0) { + if (strcmp(fsc->name, "linux_execve") == 0) { if ((trussinfo->flags & EXECVEARGS) == 0) { - if (fsc.s_args[1]) { - free(fsc.s_args[1]); - fsc.s_args[1] = NULL; + 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; + if (fsc->s_args[2]) { + free(fsc->s_args[2]); + fsc->s_args[2] = NULL; } } } } - - return; + trussinfo->curthread->fsc = fsc; } /* @@ -246,16 +252,18 @@ amd64_linux32_syscall_exit(struct trussi int syscall_num __unused) { struct reg regs; + struct linux_syscall *fsc; struct syscall *sc; + lwpid_t tid; long retval; int errorp, i; - if (fsc.name == NULL) + if (trussinfo->curthread->fsc == NULL) return (-1); - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return (-1); } @@ -268,10 +276,11 @@ amd64_linux32_syscall_exit(struct trussi * stand some significant cleaning. */ - sc = fsc.sc; + 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]); + 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 -- @@ -286,12 +295,12 @@ amd64_linux32_syscall_exit(struct trussi */ if (errorp) { asprintf(&temp, "0x%lx", - fsc.args[sc->args[i].offset]); + fsc->args[sc->args[i].offset]); } else { temp = print_arg(&sc->args[i], - fsc.args, retval, trussinfo); + fsc->args, retval, trussinfo); } - fsc.s_args[i] = temp; + fsc->s_args[i] = temp; } } } @@ -308,13 +317,13 @@ amd64_linux32_syscall_exit(struct trussi } } - if (fsc.name != NULL && (strcmp(fsc.name, "linux_execve") == 0 || - strcmp(fsc.name, "exit") == 0)) + if (fsc->name != NULL && (strcmp(fsc->name, "linux_execve") == 0 || + strcmp(fsc->name, "exit") == 0)) trussinfo->curthread->in_syscall = 1; - print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp, - errorp ? i : retval, fsc.sc); - clear_fsc(); + print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp, + errorp ? i : retval, fsc->sc); + free_fsc(fsc); return (retval); } Modified: head/usr.bin/truss/i386-fbsd.c ============================================================================== --- head/usr.bin/truss/i386-fbsd.c Sun Sep 16 13:13:02 2012 (r240561) +++ head/usr.bin/truss/i386-fbsd.c Sun Sep 16 14:38:01 2012 (r240562) @@ -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,30 +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) +static void +free_fsc(struct freebsd_syscall *fsc) { int i; - if (fsc.args) - free(fsc.args); - if (fsc.s_args) { - for (i = 0; i < fsc.nargs; i++) - if (fsc.s_args[i]) - free(fsc.s_args[i]); - free(fsc.s_args); + free(fsc->args); + if (fsc->s_args) { + for (i = 0; i < fsc->nargs; i++) + free(fsc->s_args[i]); + free(fsc->s_args); } - memset(&fsc, 0, sizeof(fsc)); + free(fsc); } /* @@ -115,15 +118,15 @@ i386_syscall_entry(struct trussinfo *tru { struct ptrace_io_desc iorequest; struct reg regs; + struct freebsd_syscall *fsc; struct syscall *sc; + lwpid_t tid; unsigned int parm_offset; int i, syscall_num; - clear_fsc(); - - cpid = trussinfo->curthread->tid; + tid = trussinfo->curthread->tid; - if (ptrace(PT_GETREGS, cpid, (caddr_t)®s, 0) < 0) { + if (ptrace(PT_GETREGS, tid, (caddr_t)®s, 0) < 0) { fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n"); return; } @@ -137,56 +140,59 @@ i386_syscall_entry(struct trussinfo *tru syscall_num = regs.r_eax; switch (syscall_num) { case SYS_syscall: - syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0); + 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, cpid, (caddr_t)parm_offset, 0); + syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0); parm_offset += sizeof(quad_t); break; } - fsc.number = syscall_num; - fsc.name = (syscall_num < 0 || syscall_num >= nsyscalls) ? + 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) { + if (!fsc->name) { fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num); } - if (fsc.name && (trussinfo->flags & FOLLOWFORKS) && *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209161438.q8GEc14B008266>