diff options
author | attilio <attilio@FreeBSD.org> | 2014-03-18 21:32:03 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2014-03-18 21:32:03 +0000 |
commit | 25d02685fb9a0b8a8d88ca2cbae60e0833751c87 (patch) | |
tree | 52f16d847312dbecffa181ca47bb40bb8d4c7362 /usr.bin | |
parent | 6e8d0a1f822edbd44debeec9d7a6709c3ea840f1 (diff) | |
download | FreeBSD-src-25d02685fb9a0b8a8d88ca2cbae60e0833751c87.zip FreeBSD-src-25d02685fb9a0b8a8d88ca2cbae60e0833751c87.tar.gz |
Remove dead code from umtx support:
- Retire long time unused (basically always unused) sys__umtx_lock()
and sys__umtx_unlock() syscalls
- struct umtx and their supporting definitions
- UMUTEX_ERROR_CHECK flag
- Retire UMTX_OP_LOCK/UMTX_OP_UNLOCK from _umtx_op() syscall
__FreeBSD_version is not bumped yet because it is expected that further
breakages to the umtx interface will follow up in the next days.
However there will be a final bump when necessary.
Sponsored by: EMC / Isilon storage division
Reviewed by: jhb
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/truss/syscall.h | 3 | ||||
-rw-r--r-- | usr.bin/truss/syscalls.c | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h index b0d3461..20be475 100644 --- a/usr.bin/truss/syscall.h +++ b/usr.bin/truss/syscall.h @@ -21,7 +21,6 @@ * Pollfd -- a pointer to an array of struct pollfd. Prints .fd and .events. * Fd_set -- a pointer to an array of fd_set. Prints the fds that are set. * Sigaction -- a pointer to a struct sigaction. Prints all elements. - * Umtx -- a pointer to a struct umtx. Prints the value of owner. * Sigset -- a pointer to a sigset_t. Prints the signals that are set. * Sigprocmask -- the first argument to sigprocmask(). Prints the name. * Kevent -- a pointer to an array of struct kevents. Prints all elements. @@ -38,7 +37,7 @@ enum Argtype { None = 1, Hex, Octal, Int, Name, Ptr, Stat, Ioctl, Quad, Signal, Sockaddr, StringArray, Timespec, Timeval, Itimerval, Pollfd, Fd_set, Sigaction, Fcntl, Mprot, Mmapflags, Whence, Readlinkres, - Umtx, Sigset, Sigprocmask, Kevent, Sockdomain, Socktype, Open, + Sigset, Sigprocmask, Kevent, Sockdomain, Socktype, Open, Fcntlflag, Rusage, BinString, Shutdown, Resource, Rlimit, Timeval2, Pathconf, Rforkflags, ExitStatus, Waitoptions, Idtype, Procctl }; diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index 06c2511..7bba59a 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -215,10 +215,6 @@ static struct syscall syscalls[] = { .args = { { Timespec, 0 } } }, { .name = "kevent", .ret_type = 0, .nargs = 6, .args = { { Int, 0 }, { Kevent, 1 }, { Int, 2 }, { Kevent | OUT, 3 }, { Int, 4 }, { Timespec, 5 } } }, - { .name = "_umtx_lock", .ret_type = 0, .nargs = 1, - .args = { { Umtx, 0 } } }, - { .name = "_umtx_unlock", .ret_type = 0, .nargs = 1, - .args = { { Umtx, 0 } } }, { .name = "sigprocmask", .ret_type = 0, .nargs = 3, .args = { { Sigprocmask, 0 }, { Sigset, 1 }, { Sigset | OUT, 2 } } }, { .name = "unmount", .ret_type = 1, .nargs = 2, @@ -723,15 +719,6 @@ print_arg(struct syscall_args *sc, unsigned long *args, long retval, } break; } - case Umtx: { - struct umtx umtx; - if (get_struct(pid, (void *)args[sc->offset], &umtx, - sizeof(umtx)) != -1) - asprintf(&tmp, "{ 0x%lx }", (long)umtx.u_owner); - else - asprintf(&tmp, "0x%lx", args[sc->offset]); - break; - } case Timespec: { struct timespec ts; if (get_struct(pid, (void *)args[sc->offset], &ts, |