PERFORCE change 147650 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Sun Aug 17 14:18:03 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147650
Change 147650 by bz at bz_dumpster on 2008/08/17 14:17:03
more V_
we are very close now...
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#7 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#5 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#7 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#6 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 (text+ko) ====
@@ -293,8 +293,8 @@
/* Sendbuffer is in units of 32KB.
*/
- if (tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE)
- req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15));
+ if (V_tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE)
+ req->param |= htonl(V_TX_SNDBUF(V_tcp_autosndbuf_max >> 15));
else {
req->param |= htonl(V_TX_SNDBUF(snd->sb_hiwat >> 15));
}
@@ -1215,7 +1215,7 @@
if (space > MAX_RCV_WND)
space = MAX_RCV_WND;
- if (tcp_do_rfc1323)
+ if (V_tcp_do_rfc1323)
for (; space > 65535 && wscale < 14; space >>= 1, ++wscale) ;
return (wscale);
@@ -1234,8 +1234,8 @@
rcv = so_sockbuf_rcv(so);
- if (tcp_do_autorcvbuf)
- wnd = tcp_autorcvbuf_max;
+ if (V_tcp_do_autorcvbuf)
+ wnd = V_tcp_autorcvbuf_max;
else
wnd = rcv->sb_hiwat;
@@ -3821,7 +3821,7 @@
#endif
toep->tp_state = tp->t_state;
- tcpstat.tcps_connects++;
+ V_tcpstat.tcps_connects++;
}
==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#8 (text+ko) ====
@@ -1260,13 +1260,13 @@
{
struct inpcb *inp;
- INP_INFO_RLOCK(&tcbinfo);
+ INP_INFO_RLOCK(&V_tcbinfo);
LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) {
INP_WLOCK(inp);
func(inp, arg);
INP_WUNLOCK(inp);
}
- INP_INFO_RUNLOCK(&tcbinfo);
+ INP_INFO_RUNLOCK(&V_tcbinfo);
}
struct socket *
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#10 (text+ko) ====
@@ -4569,15 +4569,15 @@
V_fw_verbose = 1;
#endif
#ifdef IPFIREWALL_VERBOSE_LIMIT
- verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
+ V_verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
#endif
if (V_fw_verbose == 0)
printf("disabled\n");
- else if (verbose_limit == 0)
+ else if (V_verbose_limit == 0)
printf("unlimited\n");
else
printf("limited to %d packets/entry by default\n",
- verbose_limit);
+ V_verbose_limit);
error = init_tables(&V_layer3_chain);
if (error) {
==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#8 (text+ko) ====
@@ -253,7 +253,7 @@
last = NULL;
hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr,
ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask);
- INP_INFO_RLOCK(&ripcbinfo);
+ INP_INFO_RLOCK(&V_ripcbinfo);
LIST_FOREACH(inp, &V_ripcbinfo.ipi_hashbase[hash], inp_hash) {
if (inp->inp_ip_p != proto)
continue;
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#5 (text+ko) ====
@@ -555,7 +555,7 @@
else
hc_entry->rmx_bandwidth =
(hc_entry->rmx_bandwidth + hcml->rmx_bandwidth) / 2;
- /* tcpstat.tcps_cachedbandwidth++; */
+ /* V_tcpstat.tcps_cachedbandwidth++; */
}
if (hcml->rmx_cwnd != 0) {
if (hc_entry->rmx_cwnd == 0)
@@ -563,7 +563,7 @@
else
hc_entry->rmx_cwnd =
(hc_entry->rmx_cwnd + hcml->rmx_cwnd) / 2;
- /* tcpstat.tcps_cachedcwnd++; */
+ /* V_tcpstat.tcps_cachedcwnd++; */
}
if (hcml->rmx_sendpipe != 0) {
if (hc_entry->rmx_sendpipe == 0)
@@ -571,7 +571,7 @@
else
hc_entry->rmx_sendpipe =
(hc_entry->rmx_sendpipe + hcml->rmx_sendpipe) /2;
- /* tcpstat.tcps_cachedsendpipe++; */
+ /* V_tcpstat.tcps_cachedsendpipe++; */
}
if (hcml->rmx_recvpipe != 0) {
if (hc_entry->rmx_recvpipe == 0)
@@ -579,7 +579,7 @@
else
hc_entry->rmx_recvpipe =
(hc_entry->rmx_recvpipe + hcml->rmx_recvpipe) /2;
- /* tcpstat.tcps_cachedrecvpipe++; */
+ /* V_tcpstat.tcps_cachedrecvpipe++; */
}
TAILQ_REMOVE(&hc_entry->rmx_head->hch_bucket, hc_entry, rmx_q);
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#7 (text+ko) ====
@@ -952,13 +952,13 @@
switch (iptos & IPTOS_ECN_MASK) {
case IPTOS_ECN_CE:
tp->t_flags |= TF_ECN_SND_ECE;
- tcpstat.tcps_ecn_ce++;
+ V_tcpstat.tcps_ecn_ce++;
break;
case IPTOS_ECN_ECT0:
- tcpstat.tcps_ecn_ect0++;
+ V_tcpstat.tcps_ecn_ect0++;
break;
case IPTOS_ECN_ECT1:
- tcpstat.tcps_ecn_ect1++;
+ V_tcpstat.tcps_ecn_ect1++;
break;
}
@@ -971,7 +971,7 @@
*/
if ((thflags & TH_ECE) &&
SEQ_LEQ(th->th_ack, tp->snd_recover)) {
- tcpstat.tcps_ecn_rcwnd++;
+ V_tcpstat.tcps_ecn_rcwnd++;
tcp_congestion_exp(tp);
}
}
@@ -1370,7 +1370,7 @@
if ((thflags & TH_ECE) && V_tcp_do_ecn) {
tp->t_flags |= TF_ECN_PERMIT;
- tcpstat.tcps_ecn_shs++;
+ V_tcpstat.tcps_ecn_shs++;
}
/*
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#3 (text+ko) ====
@@ -102,20 +102,20 @@
tcp_offload_twstart(struct tcpcb *tp)
{
- INP_INFO_WLOCK(&tcbinfo);
+ INP_INFO_WLOCK(&V_tcbinfo);
INP_WLOCK(tp->t_inpcb);
tcp_twstart(tp);
- INP_INFO_WUNLOCK(&tcbinfo);
+ INP_INFO_WUNLOCK(&V_tcbinfo);
}
struct tcpcb *
tcp_offload_close(struct tcpcb *tp)
{
- INP_INFO_WLOCK(&tcbinfo);
+ INP_INFO_WLOCK(&V_tcbinfo);
INP_WLOCK(tp->t_inpcb);
tp = tcp_close(tp);
- INP_INFO_WUNLOCK(&tcbinfo);
+ INP_INFO_WUNLOCK(&V_tcbinfo);
if (tp)
INP_WUNLOCK(tp->t_inpcb);
@@ -126,10 +126,10 @@
tcp_offload_drop(struct tcpcb *tp, int error)
{
- INP_INFO_WLOCK(&tcbinfo);
+ INP_INFO_WLOCK(&V_tcbinfo);
INP_WLOCK(tp->t_inpcb);
tp = tcp_drop(tp, error);
- INP_INFO_WUNLOCK(&tcbinfo);
+ INP_INFO_WUNLOCK(&V_tcbinfo);
if (tp)
INP_WUNLOCK(tp->t_inpcb);
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#8 (text+ko) ====
@@ -906,7 +906,7 @@
else
#endif
ip->ip_tos |= IPTOS_ECN_ECT0;
- tcpstat.tcps_ecn_ect0++;
+ V_tcpstat.tcps_ecn_ect0++;
}
/*
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#10 (text+ko) ====
@@ -450,7 +450,7 @@
}
(void) syncache_respond(sc);
- tcpstat.tcps_sc_retransmitted++;
+ V_tcpstat.tcps_sc_retransmitted++;
syncache_timeout(sc, sch, 0);
}
if (!TAILQ_EMPTY(&(sch)->sch_bucket))
@@ -544,7 +544,7 @@
log(LOG_DEBUG, "%s; %s: Spurious RST without matching "
"syncache entry (possibly syncookie only), "
"segment ignored\n", s, __func__);
- tcpstat.tcps_badrst++;
+ V_tcpstat.tcps_badrst++;
goto done;
}
@@ -574,7 +574,7 @@
log(LOG_DEBUG, "%s; %s: RST with invalid SEQ %u != "
"IRS %u (+WND %u), segment ignored\n",
s, __func__, th->th_seq, sc->sc_irs, sc->sc_wnd);
- tcpstat.tcps_badrst++;
+ V_tcpstat.tcps_badrst++;
}
done:
@@ -969,9 +969,9 @@
{
int rc;
- INP_INFO_WLOCK(&tcbinfo);
+ INP_INFO_WLOCK(&V_tcbinfo);
rc = syncache_expand(inc, to, th, lsop, m);
- INP_INFO_WUNLOCK(&tcbinfo);
+ INP_INFO_WUNLOCK(&V_tcbinfo);
return (rc);
}
@@ -1377,7 +1377,7 @@
if (sc->sc_flags & SCF_ECN) {
th->th_flags |= TH_ECE;
- tcpstat.tcps_ecn_shs++;
+ V_tcpstat.tcps_ecn_shs++;
}
/* Tack on the TCP options. */
==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#5 (text+ko) ====
==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#11 (text+ko) ====
@@ -544,7 +544,7 @@
* Check the minimum TTL for socket.
*/
INP_RLOCK(inp);
- INP_INFO_RUNLOCK(&udbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) {
INP_RUNLOCK(inp);
goto badunlocked;
@@ -892,7 +892,7 @@
laddr = inp->inp_laddr;
lport = inp->inp_lport;
if (src.sin_family == AF_INET) {
- INP_INFO_LOCK_ASSERT(&udbinfo);
+ INP_INFO_LOCK_ASSERT(&V_udbinfo);
if ((lport == 0) ||
(laddr.s_addr == INADDR_ANY &&
src.sin_addr.s_addr == INADDR_ANY)) {
@@ -943,7 +943,7 @@
inp->inp_lport == 0 ||
sin->sin_addr.s_addr == INADDR_ANY ||
sin->sin_addr.s_addr == INADDR_BROADCAST) {
- INP_INFO_LOCK_ASSERT(&udbinfo);
+ INP_INFO_LOCK_ASSERT(&V_udbinfo);
error = in_pcbconnect_setup(inp, addr, &laddr.s_addr,
&lport, &faddr.s_addr, &fport, NULL,
td->td_ucred);
@@ -957,7 +957,7 @@
/* Commit the local port if newly assigned. */
if (inp->inp_laddr.s_addr == INADDR_ANY &&
inp->inp_lport == 0) {
- INP_INFO_WLOCK_ASSERT(&udbinfo);
+ INP_INFO_WLOCK_ASSERT(&V_udbinfo);
INP_WLOCK_ASSERT(inp);
/*
* Remember addr if jailed, to prevent
==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#9 (text+ko) ====
@@ -1974,7 +1974,7 @@
}
last = in6p;
}
- INP_INFO_RUNLOCK(&ripcbinfo);
+ INP_INFO_RUNLOCK(&V_ripcbinfo);
if (last) {
if (last->in6p_flags & IN6P_CONTROLOPTS)
ip6_savecontrol(last, m, &opts);
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#6 (text+ko) ====
@@ -443,7 +443,7 @@
switch (ln->ln_state) {
case ND6_LLINFO_INCOMPLETE:
- if (ln->ln_asked < nd6_mmaxtries) {
+ if (ln->ln_asked < V_nd6_mmaxtries) {
ln->ln_asked++;
nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
nd6_ns_output(ifp, NULL, dst, ln, 0);
==== //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#7 (text+ko) ====
@@ -210,7 +210,7 @@
}
last = in6p;
}
- INP_INFO_RUNLOCK(&ripcbinfo);
+ INP_INFO_RUNLOCK(&V_ripcbinfo);
#ifdef IPSEC
/*
* Check AH/ESP integrity.
==== //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#6 (text+ko) ====
@@ -345,7 +345,7 @@
return (IPPROTO_DONE);
}
INP_RLOCK(inp);
- INP_INFO_RUNLOCK(&udbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
udp6_append(inp, m, off, &fromsa);
INP_RUNLOCK(inp);
return (IPPROTO_DONE);
More information about the p4-projects
mailing list