From: bluhm Date: Mon, 5 Feb 2018 14:53:26 +0000 (+0000) Subject: Remove tcp_acounts, some tcp_usrreq() counting from 1981. Also X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=541bbb28f9abca6bed470d002d61bc222e9d7efb;p=openbsd Remove tcp_acounts, some tcp_usrreq() counting from 1981. Also remove the #ifdef KPROF which seems to be unused since that year. OK mpi@ --- diff --git a/sys/conf/defines b/sys/conf/defines index f5ce63c2d97..711bba76cf6 100644 --- a/sys/conf/defines +++ b/sys/conf/defines @@ -1,4 +1,3 @@ -/:#if.*[ \t]*KPROF/d /:#if.*[ \t]*PGINPROF/d /:#if.*[ \t]*TRACE/d /:#if.*[ \t]*lint/d diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h index 8a3000ae827..8434b896760 100644 --- a/sys/netinet/tcp_fsm.h +++ b/sys/netinet/tcp_fsm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_fsm.h,v 1.8 2004/07/06 13:52:31 markus Exp $ */ +/* $OpenBSD: tcp_fsm.h,v 1.9 2018/02/05 14:53:26 bluhm Exp $ */ /* $NetBSD: tcp_fsm.h,v 1.6 1994/10/14 16:01:48 mycroft Exp $ */ /* @@ -75,10 +75,6 @@ u_char tcp_outflags[TCP_NSTATES] = { }; #endif /* TCPOUTFLAGS */ -#ifdef KPROF -int tcp_acounts[TCP_NSTATES][PRU_NREQ]; -#endif /* KPROF */ - #ifdef TCPSTATES const char *tcpstates[] = { "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD", diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 3502c908827..cd7f7e398dd 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.166 2018/02/03 16:14:26 bluhm Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.167 2018/02/05 14:53:26 bluhm Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -171,9 +171,6 @@ tcp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, /* tp might get 0 when using socket splicing */ if (tp == NULL) return (0); -#ifdef KPROF - tcp_acounts[tp->t_state][req]++; -#endif ostate = tp->t_state; switch (req) { @@ -631,9 +628,6 @@ tcp_detach(struct socket *so) /* tp might get 0 when using socket splicing */ if (tp == NULL) return (0); -#ifdef KPROF - tcp_acounts[tp->t_state][req]++; -#endif ostate = tp->t_state; /*