PERFORCE change 149222 for review
Marko Zec
zec at FreeBSD.org
Thu Sep 4 20:04:57 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149222
Change 149222 by zec at zec_tpx32 on 2008/09/04 20:04:32
Random reasonable and unreasonable whitespace / junk redux.
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#18 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#13 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#2 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#10 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#15 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#4 (text+ko) ====
@@ -750,20 +750,16 @@
#define V_fw_one_pass VNET_IPFW(fw_one_pass)
#define V_fw_enable VNET_IPFW(fw_enable)
#define V_fw6_enable VNET_IPFW(fw6_enable)
-
#define V_set_disable VNET_IPFW(set_disable)
#define V_fw_deny_unknown_exthdrs VNET_IPFW(fw_deny_unknown_exthdrs)
#define V_fw_verbose VNET_IPFW(fw_verbose)
#define V_verbose_limit VNET_IPFW(verbose_limit)
-
#define V_fw_debug VNET_IPFW(fw_debug)
#define V_autoinc_step VNET_IPFW(autoinc_step)
-
#define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v)
#define V_layer3_chain VNET_IPFW(layer3_chain)
#define V_dyn_buckets VNET_IPFW(dyn_buckets)
#define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets)
-
#define V_dyn_ack_lifetime VNET_IPFW(dyn_ack_lifetime)
#define V_dyn_syn_lifetime VNET_IPFW(dyn_syn_lifetime)
#define V_dyn_fin_lifetime VNET_IPFW(dyn_fin_lifetime)
@@ -777,7 +773,6 @@
#define V_static_len VNET_IPFW(static_len)
#define V_dyn_count VNET_IPFW(dyn_count)
#define V_dyn_max VNET_IPFW(dyn_max)
-
#define V_norule_counter VNET_IPFW(norule_counter)
#define V_ipfw_timeout VNET_IPFW(ipfw_timeout)
#define V_ifaddr_event_tag VNET_IPFW(ifaddr_event_tag)
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#18 (text+ko) ====
@@ -633,7 +633,6 @@
return 1;
}
-
static __inline int
hash_packet6(struct ipfw_flow_id *id)
{
==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#8 (text+ko) ====
@@ -79,7 +79,7 @@
struct icmpstat icmpstat;
SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats,
- CTLFLAG_RW, icmpstat, icmpstat, "");
+ CTLFLAG_RW, icmpstat, icmpstat, "");
static int icmpmaskrepl = 0;
SYSCTL_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW,
==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#2 (text+ko) ====
@@ -194,7 +194,6 @@
#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl)
#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask)
#define V_in_multihead VNET_INET(in_multihead)
-
#define V_llinfo_arp VNET_INET(llinfo_arp)
#define V_arpt_prune VNET_INET(arpt_prune)
#define V_arpt_keep VNET_INET(arpt_keep)
@@ -203,7 +202,6 @@
#define V_arp_proxyall VNET_INET(arp_proxyall)
#define V_subnetsarelocal VNET_INET(subnetsarelocal)
#define V_sameprefixcarponly VNET_INET(sameprefixcarponly)
-
#define V_ipforwarding VNET_INET(ipforwarding)
#define V_ipstealth VNET_INET(ipstealth)
#define V_ipfastforward_active VNET_INET(ipfastforward_active)
@@ -214,13 +212,11 @@
#define V_ip_id VNET_INET(ip_id)
#define V_ip_do_randomid VNET_INET(ip_do_randomid)
#define V_ip_checkinterface VNET_INET(ip_checkinterface)
-
#define V_ipq VNET_INET(ipq)
#define V_ipq_zone VNET_INET(ipq_zone)
#define V_nipq VNET_INET(nipq)
#define V_maxnipq VNET_INET(maxnipq)
#define V_maxfragsperpacket VNET_INET(maxfragsperpacket)
-
#define V_tcb VNET_INET(tcb)
#define V_tcbinfo VNET_INET(tcbinfo)
#define V_tcpstat VNET_INET(tcpstat)
@@ -229,7 +225,6 @@
#define V_tcp_hc_callout VNET_INET(tcp_hc_callout)
#define V_tcp_syncache VNET_INET(tcp_syncache)
#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail)
-
#define V_tcp_mssdflt VNET_INET(tcp_mssdflt)
#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt)
#define V_tcp_minmss VNET_INET(tcp_minmss)
@@ -269,38 +264,30 @@
#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize)
#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen)
#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows)
-
#define V_isn_secret VNET_INET(isn_secret)
#define V_isn_last_reseed VNET_INET(isn_last_reseed)
#define V_isn_offset VNET_INET(isn_offset)
#define V_isn_offset_old VNET_INET(isn_offset_old)
#define V_isn_ctx VNET_INET(isn_ctx)
-
#define V_udb VNET_INET(udb)
#define V_udbinfo VNET_INET(udbinfo)
#define V_udpstat VNET_INET(udpstat)
#define V_udp_blackhole VNET_INET(udp_blackhole)
-
#define V_ripcb VNET_INET(ripcb)
#define V_ripcbinfo VNET_INET(ripcbinfo)
#define V_ip_mrouter VNET_INET(ip_mrouter)
-
#define V_rsvp_on VNET_INET(rsvp_on)
#define V_ip_rsvp_on VNET_INET(ip_rsvp_on)
#define V_ip_rsvpd VNET_INET(ip_rsvpd)
-
#define V_icmpstat VNET_INET(icmpstat)
#define V_ipstat VNET_INET(ipstat)
#define V_igmpstat VNET_INET(igmpstat)
-
#define V_router_info_head VNET_INET(router_info_head)
-
#define V_rtq_timeout VNET_INET(rtq_timeout)
#define V_rtq_reallyold VNET_INET(rtq_reallyold)
#define V_rtq_minreallyold VNET_INET(rtq_minreallyold)
#define V_rtq_toomany VNET_INET(rtq_toomany)
#define V_rtq_timer VNET_INET(rtq_timer)
-
#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto)
#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto)
#define V_ipport_firstauto VNET_INET(ipport_firstauto)
@@ -315,7 +302,6 @@
#define V_ipport_stoprandom VNET_INET(ipport_stoprandom)
#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs)
#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount)
-
#define V_divcb VNET_INET(divcb)
#define V_divcbinfo VNET_INET(divcbinfo)
#endif /* !_NETINET_VINET_H_ */
==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#13 (text+ko) ====
@@ -393,8 +393,7 @@
icmp6_input(struct mbuf **mp, int *offp, int proto)
{
INIT_VNET_INET6(curvnet);
- /* XXX this below is WRONG - MARKO */
- INIT_VPROCG(TD_TO_VPROCG(curthread));
+ INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */
struct mbuf *m = *mp, *n;
struct ip6_hdr *ip6, *nip6;
struct icmp6_hdr *icmp6, *nicmp6;
@@ -1167,8 +1166,7 @@
ni6_input(struct mbuf *m, int off)
{
INIT_VNET_INET6(curvnet);
- /* XXX this bellow is WRONG - MARKO */
- INIT_VPROCG(TD_TO_VPROCG(curthread));
+ INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */
struct icmp6_nodeinfo *ni6, *nni6;
struct mbuf *n = NULL;
u_int16_t qtype;
==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#11 (text+ko) ====
@@ -534,7 +534,7 @@
* ND6 timer routine to expire default route list and prefix list
*/
void
-nd6_timer(void *ignored_arg)
+nd6_timer(void *arg)
{
INIT_VNET_INET6((struct vnet *) arg);
int s;
@@ -1898,7 +1898,7 @@
}
static void
-nd6_slowtimo(void *ignored_arg)
+nd6_slowtimo(void *arg)
{
CURVNET_SET((struct vnet *) arg);
INIT_VNET_NET((struct vnet *) arg);
==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#2 (text+ko) ====
@@ -165,33 +165,26 @@
* Symbol translation macros
*/
#define V_in6_ifaddr VNET_INET6(in6_ifaddr)
-
#define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets)
#define V_frag6_nfrags VNET_INET6(frag6_nfrags)
#define V_ip6q VNET_INET6(ip6q)
-
#define V_ip6_forward_rt VNET_INET6(ip6_forward_rt)
-
#define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy)
#define V_addrsel_policytab VNET_INET6(addrsel_policytab)
#define V_in6_maxmtu VNET_INET6(in6_maxmtu)
#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal)
-
#define V_rtq_minreallyold6 VNET_INET6(rtq_minreallyold6)
#define V_rtq_reallyold6 VNET_INET6(rtq_reallyold6)
#define V_rtq_toomany6 VNET_INET6(rtq_toomany6)
-
#define V_ip6stat VNET_INET6(ip6stat)
#define V_rip6stat VNET_INET6(rip6stat)
#define V_icmp6stat VNET_INET6(icmp6stat)
-
#define V_rtq_timeout6 VNET_INET6(rtq_timeout6)
#define V_rtq_timer6 VNET_INET6(rtq_timer6)
#define V_rtq_mtutimer VNET_INET6(rtq_mtutimer)
#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch)
#define V_nd6_timer_ch VNET_INET6(nd6_timer_ch)
#define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch)
-
#define V_nd6_inuse VNET_INET6(nd6_inuse)
#define V_nd6_allocated VNET_INET6(nd6_allocated)
#define V_llinfo_nd6 VNET_INET6(llinfo_nd6)
@@ -199,16 +192,12 @@
#define V_nd_prefix VNET_INET6(nd_prefix)
#define V_nd6_defifp VNET_INET6(nd6_defifp)
#define V_nd6_defifindex VNET_INET6(nd6_defifindex)
-
#define V_sid_default VNET_INET6(sid_default)
-
#define V_dadq VNET_INET6(dadq)
#define V_dad_init VNET_INET6(dad_init)
-
//#define V_icmp6errppslim VNET_INET6(icmp6errppslim)
#define V_icmp6errpps_count VNET_INET6(icmp6errpps_count)
//#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo)
-
#define V_ip6_forwarding VNET_INET6(ip6_forwarding)
#define V_ip6_sendredirects VNET_INET6(ip6_sendredirects)
#define V_ip6_defhlim VNET_INET6(ip6_defhlim)
@@ -227,7 +216,6 @@
#define V_ip6_keepfaith VNET_INET6(ip6_keepfaith)
#define V_ip6stealth VNET_INET6(ip6stealth)
#define V_ip6_log_time VNET_INET6(ip6_log_time)
-
#define V_pmtu_expire VNET_INET6(pmtu_expire)
#define V_pmtu_probe VNET_INET6(pmtu_probe)
#define V_rip6_sendspace VNET_INET6(rip6_sendspace)
@@ -262,14 +250,11 @@
#define V_ip6_desync_factor VNET_INET6(ip6_desync_factor)
#define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime)
#define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime)
-
#define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver)
#define V_pim6 VNET_INET6(pim6)
#define V_mrt6debug VNET_INET6(mrt6debug)
#define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance)
-
#define V_ip6_use_defzone VNET_INET6(ip6_use_defzone)
-
#define V_ip6_opts VNET_INET6(ip6_opts)
#endif /* !_NETINET6_VINET6_H_ */
==== //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#10 (text+ko) ====
@@ -69,8 +69,7 @@
uint32_t namelen;
uint32_t ngroups, i;
uint32_t junk;
-/* XXX VIMAGE */
- INIT_VPROCG(TD_TO_VPROCG(&thread0));
+ INIT_VPROCG(TD_TO_VPROCG(&thread0)); /* XXX revisit - fixme! */
mtx_lock(&hostname_mtx);
if (xdrs->x_op == XDR_ENCODE) {
==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#15 (text+ko) ====
@@ -65,7 +65,7 @@
#define V_GLOBAL 0
#define V_NET 1
#define V_PROCG 2
-#define V_CPU 3
+#define V_CPU 3
#define VNET_MOD_NONE -1
/*statefull modules */
@@ -97,7 +97,7 @@
#define VNET_MOD_DYNAMIC_START 32
#define VNET_MOD_MAX 64
-/* Needed for ugly sysctl virtualization macros */
+/* Needed for ugly sysctl virtualization macros for vnet minor modules */
#define V_MOD_vnet_net VNET_MOD_NET
#define V_MOD_vnet_netgraph VNET_MOD_NETGRAPH
#define V_MOD_vnet_inet VNET_MOD_INET
@@ -107,6 +107,7 @@
#define V_MOD_vnet_gif VNET_MOD_GIF
#define V_MOD_vnet_ipsec VNET_MOD_IPSEC
+/* vprocg and vcpu major modules do not have minor modules like vnet does */
#define V_MOD_vprocg 0
#define V_MOD_vcpu 0
@@ -404,35 +405,6 @@
char _hostname[MAXHOSTNAMELEN];
char _domainname[MAXHOSTNAMELEN];
-
- int _morphing_symlinks;
-
-#if 0
- long _cp_time[CPUSTATES];
-
- struct loadavg _averunnable; /* from kern/kern_synch.c */
- int _sched_tdcnt; /* from kern/sched_4bsd.c */
- int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */
-
- u_int proc_limit; /* max. number of processes */
-
- struct msgbuf *msgbufp;
- int msgbuftrigger;
- int msg_seqn;
-
- pid_t log_open_pid;
- int log_sc_state;
- struct selinfo log_sc_selp;
- struct sigio *log_sc_sigio;
- struct callout log_sc_callout;
-
- struct timeval boottime;
- long boottdelta_sec;
-
- char chroot[MAXPATHLEN]; /* assigned/inherited from parent */
-
- int big_brother; /* manage procs in all child vprocgs */
-#endif
};
struct vcpu {
@@ -443,58 +415,8 @@
u_int _acc_statcalls; /* statclocks since last avg update*/
u_int _avg1_fixp; /* "fast" avg in 16:16 bit fixedpoint */
u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */
-
-#if 0
- u_int cpu_min; /* Guaranteed CPU share */
- u_int cpu_max; /* Maximum average CPU usage */
- u_int intr_limit; /* Limit on CPU usage in intr ctx */
- u_int cpu_weight; /* Prop. share scheduling priority */
- u_int cpu_elimit; /* Dynamic soft CPU usage limit */
- u_int schedstamp; /* Prop. share scheduler tmp var */
- u_int forcedmin; /* Prop. share scheduler tmp var */
-#endif
};
#endif /* VIMAGE */
-struct vi_req {
- int req_action; /* What to do with this reqest? */
- u_int vi_cpu_min; /* Guaranteed CPU share */
- u_int vi_cpu_max; /* Maximum average CPU usage */
- u_int vi_cpu_weight; /* Prop. share scheduling priority */
- int vi_intr_limit; /* Limit on CPU usage in intr ctx */
- int vi_maxsockets;
- u_short vi_proc_limit; /* max. number of processes */
- u_short vi_proc_count; /* current number of processes */
- u_short vi_child_limit; /* max. number of child vnets */
- u_short vi_child_count; /* current number of child vnets */
- int vi_if_count; /* current number network interfaces */
- int vi_sock_count;
- char vi_name[MAXPATHLEN];
- char vi_chroot[MAXPATHLEN];
- char vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */
- u_int cp_time_avg;
- struct loadavg averunnable;
-};
-
-#define VI_CREATE 0x00000001
-#define VI_DESTROY 0x00000002
-#define VI_MODIFY 0x00000004
-#define VI_SWITCHTO 0x00000008
-#define VI_IFACE 0x00000010
-
-#define VI_GET 0x00000100
-#define VI_GETNEXT 0x00000200
-#define VI_GETNEXT_RECURSE 0x00000300
-
-#define VI_SET_CPU_MIN 0x00001000
-#define VI_SET_CPU_MAX 0x00002000
-#define VI_SET_CPU_WEIGHT 0x00004000
-#define VI_SET_INTR_LIMIT 0x00008000
-#define VI_SET_PROC_LIMIT 0x00010000
-#define VI_SET_CHILD_LIMIT 0x00020000
-#define VI_SET_SOCK_LIMIT 0x00040000
-#define VI_SET_NAME 0x00100000
-#define VI_SET_CHROOT 0x00200000
-
#endif /* !_SYS_VIMAGE_H_ */
More information about the p4-projects
mailing list