diff options
| author | ed <ed@FreeBSD.org> | 2010-02-07 15:42:15 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2010-02-07 15:42:15 +0000 |
| commit | 760cf1fda368db2d149f89b1f413f19386474fb0 (patch) | |
| tree | 23c8914435e12a6a0a31bc1ac8379c94f6d73ad8 | |
| parent | f834d13a707ba2387db122f54d3ffb49e8a68eda (diff) | |
| download | FreeBSD-src-760cf1fda368db2d149f89b1f413f19386474fb0.zip FreeBSD-src-760cf1fda368db2d149f89b1f413f19386474fb0.tar.gz | |
Remove statistics from the TTY queues.
I added counters to see how often fast copying to userspace was actually
performed, which was only useful during development. Remove these
statistics now we know it to be effective.
| -rw-r--r-- | sys/kern/tty_inq.c | 10 | ||||
| -rw-r--r-- | sys/kern/tty_outq.c | 12 |
2 files changed, 0 insertions, 22 deletions
diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index bef6270..b0e9b18 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -61,13 +61,6 @@ __FBSDID("$FreeBSD$"); * the outq, we'll stick to 128 byte blocks here. */ -/* Statistics. */ -static unsigned long ttyinq_nfast = 0; -SYSCTL_ULONG(_kern, OID_AUTO, tty_inq_nfast, CTLFLAG_RD, - &ttyinq_nfast, 0, "Unbuffered reads to userspace on input"); -static unsigned long ttyinq_nslow = 0; -SYSCTL_ULONG(_kern, OID_AUTO, tty_inq_nslow, CTLFLAG_RD, - &ttyinq_nslow, 0, "Buffered reads to userspace on input"); static int ttyinq_flush_secure = 1; SYSCTL_INT(_kern, OID_AUTO, tty_inq_flush_secure, CTLFLAG_RW, &ttyinq_flush_secure, 0, "Zero buffers while flushing"); @@ -201,8 +194,6 @@ ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, * the write pointer to a new block. */ if (cend == TTYINQ_DATASIZE || cend == ti->ti_end) { - atomic_add_long(&ttyinq_nfast, 1); - /* * Fast path: zero copy. Remove the first block, * so we can unlock the TTY temporarily. @@ -239,7 +230,6 @@ ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, TTYINQ_RECYCLE(ti, tib); } else { char ob[TTYINQ_DATASIZE - 1]; - atomic_add_long(&ttyinq_nslow, 1); /* * Slow path: store data in a temporary buffer. diff --git a/sys/kern/tty_outq.c b/sys/kern/tty_outq.c index f429a92..d5ed221 100644 --- a/sys/kern/tty_outq.c +++ b/sys/kern/tty_outq.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/lock.h> #include <sys/queue.h> -#include <sys/sysctl.h> #include <sys/systm.h> #include <sys/tty.h> #include <sys/uio.h> @@ -52,14 +51,6 @@ __FBSDID("$FreeBSD$"); * output. */ -/* Statistics. */ -static unsigned long ttyoutq_nfast = 0; -SYSCTL_ULONG(_kern, OID_AUTO, tty_outq_nfast, CTLFLAG_RD, - &ttyoutq_nfast, 0, "Unbuffered reads to userspace on output"); -static unsigned long ttyoutq_nslow = 0; -SYSCTL_ULONG(_kern, OID_AUTO, tty_outq_nslow, CTLFLAG_RD, - &ttyoutq_nslow, 0, "Buffered reads to userspace on output"); - struct ttyoutq_block { struct ttyoutq_block *tob_next; char tob_data[TTYOUTQ_DATASIZE]; @@ -236,8 +227,6 @@ ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio) * the write pointer to a new block. */ if (cend == TTYOUTQ_DATASIZE || cend == to->to_end) { - atomic_add_long(&ttyoutq_nfast, 1); - /* * Fast path: zero copy. Remove the first block, * so we can unlock the TTY temporarily. @@ -258,7 +247,6 @@ ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio) TTYOUTQ_RECYCLE(to, tob); } else { char ob[TTYOUTQ_DATASIZE - 1]; - atomic_add_long(&ttyoutq_nslow, 1); /* * Slow path: store data in a temporary buffer. |
