From owner-p4-projects@FreeBSD.ORG Thu Apr 19 06:00:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8690A16A403; Thu, 19 Apr 2007 06:00:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0279B16A402 for ; Thu, 19 Apr 2007 06:00:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E725913C459 for ; Thu, 19 Apr 2007 06:00:08 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3J608Ki005447 for ; Thu, 19 Apr 2007 06:00:08 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3J608j9005444 for perforce@freebsd.org; Thu, 19 Apr 2007 06:00:08 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 19 Apr 2007 06:00:08 GMT Message-Id: <200704190600.l3J608j9005444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 118394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2007 06:00:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=118394 Change 118394 by zec@zec_tca51 on 2007/04/19 05:59:49 Commit some stale s/vnet_base/vnet/ s/vnetb/vnet/ modifications from offline editing days... Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_fork.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_kse.c#5 edit .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#3 edit .. //depot/projects/vimage/src/sys/net/if_var.h#6 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#5 edit .. //depot/projects/vimage/src/sys/sys/kernel.h#3 edit .. //depot/projects/vimage/src/sys/sys/proc.h#7 edit .. //depot/projects/vimage/src/sys/sys/socketvar.h#4 edit .. //depot/projects/vimage/src/sys/sys/sysctl.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#5 (text+ko) ==== @@ -506,7 +506,7 @@ td2->td_sigmask = td->td_sigmask; td2->td_vimage = td->td_vimage; - td2->td_vnetb = NULL; /* XXX */ + td2->td_vnet = NULL; /* XXX */ td2->td_vnet_lpush = NULL; /* XXX */ /* ==== //depot/projects/vimage/src/sys/kern/kern_kse.c#5 (text+ko) ==== @@ -1021,7 +1021,7 @@ /* XXX don't forget refcounting in vimage */ td2->td_vimage = td->td_vimage; - td2->td_vnetb = NULL; /* XXX */ + td2->td_vnet = NULL; /* XXX */ td2->td_vnet_lpush = NULL; /* XXX */ thread_link(td2, ku->ku_proc); ==== //depot/projects/vimage/src/sys/kern/subr_pcpu.c#3 (text+ko) ==== @@ -131,7 +131,7 @@ db_show_mdpcpu(pc); #ifdef VIMAGE - db_printf("curvnetb = %p\n", pc->pc_curthread->td_vnetb); + db_printf("curvnet = %p\n", pc->pc_curthread->td_vnet); #endif #ifdef WITNESS ==== //depot/projects/vimage/src/sys/net/if_var.h#6 (text+ko) ==== @@ -186,7 +186,7 @@ TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ /* protected by if_addr_mtx */ void *if_pf_kif; - struct vnet_base *if_vnetb; /* network stack instance */ + struct vnet *if_vnet; /* network stack instance */ }; typedef void if_init_f_t(void *); ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#4 (text+ko) ==== @@ -119,7 +119,7 @@ void *inp_ppcb; /* pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* PCB list info */ -#define inp_vnetb inp_pcbinfo->vnetb +#define inp_vnet inp_pcbinfo->vnet struct socket *inp_socket; /* back pointer to socket */ /* list for this PCB's local port */ struct label *inp_label; /* MAC label */ @@ -233,7 +233,7 @@ u_int ipi_count; /* number of pcbs in this list */ u_quad_t ipi_gencnt; /* current generation count */ struct mtx ipi_mtx; - struct vnet_base *vnetb; + struct vnet *vnet; }; #define INP_LOCK_INIT(inp, d, t) \ ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#4 (text+ko) ==== @@ -73,7 +73,7 @@ struct syncache_head { struct mtx sch_mtx; TAILQ_HEAD(sch_head, syncache) sch_bucket; - struct vnet_base *sch_vnetb; + struct vnet *sch_vnet; struct callout sch_timer; int sch_nextc; u_int sch_length; ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ #include -struct vnet_base; +struct vnet; /* * Kernel variables for tcp. @@ -188,7 +188,7 @@ u_long snd_ssthresh_prev; /* ssthresh prior to retransmit */ tcp_seq snd_recover_prev; /* snd_recover prior to retransmit */ u_long t_badrxtwin; /* window for retransmit recovery */ - struct vnet_base *t_vnetb; /* back pointer to parent vnet */ + struct vnet *t_vnet; /* back pointer to parent vnet */ /* SACK related state */ int sack_enable; /* enable SACK for this connection */ int snd_numholes; /* number of holes seen by sender */ ==== //depot/projects/vimage/src/sys/sys/kernel.h#3 (text+ko) ==== @@ -162,7 +162,7 @@ SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ - SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnetb*/ + SI_SUB_VIMAGE_DONE = 0xef00000, /* clear curvnet*/ SI_SUB_SMP = 0xf000000, /* start the APs*/ SI_SUB_RUN_SCHEDULER = 0xfffffff /* scheduler*/ }; ==== //depot/projects/vimage/src/sys/sys/proc.h#7 (text+ko) ==== @@ -315,7 +315,7 @@ * copied explicitly in fork1() or thread_schedule_upcall(). */ struct vimage *td_vimage; /* (*) Current vimage */ - struct vnet_base *td_vnetb; /* (*) Effective vnet */ + struct vnet *td_vnet; /* (*) Effective vnet */ const char *td_vnet_lpush; /* (*) Debugging vnet push / pop */ }; ==== //depot/projects/vimage/src/sys/sys/socketvar.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ #include #include -struct vnet_base; +struct vnet; /* * Kernel structure per socket. @@ -67,7 +67,7 @@ short so_state; /* (b) internal state flags SS_* */ int so_qstate; /* (e) internal state flags SQ_* */ void *so_pcb; /* protocol control block */ - struct vnet_base *so_vnetb; /* network stack instance */ + struct vnet *so_vnet; /* network stack instance */ struct protosw *so_proto; /* (a) protocol handle */ /* * Variables for connection queuing. ==== //depot/projects/vimage/src/sys/sys/sysctl.h#4 (text+ko) ==== @@ -394,7 +394,7 @@ void *ptr; \ switch (subs) { \ case V_NET: \ - ptr = curthread->td_vimage->v_vnetb->mod_data[mod]; \ + ptr = curthread->td_vimage->v_vnet->mod_data[mod]; \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ default: \