Date: Mon, 22 Oct 2007 13:24:25 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 127922 for review Message-ID: <200710221324.l9MDOPOj011311@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127922 Change 127922 by zec@zec_tpx32 on 2007/10/22 13:23:49 Use TD_TO_VXXX and P_TO_VXXX macros where appropriate... Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#13 edit .. //depot/projects/vimage/src/sys/kern/kern_fork.c#13 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#18 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#13 (text+ko) ==== @@ -415,11 +415,8 @@ LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); #if defined(VIMAGE) && defined(SCHED_4BSD) - if (p->p_ucred->cr_vimage->v_procg != - p->p_pptr->p_ucred->cr_vimage->v_procg) { - sched_load_reassign(p->p_ucred->cr_vimage->v_procg, - p->p_pptr->p_ucred->cr_vimage->v_procg); - } + if (P_TO_VPROCG(p) != P_TO_VPROCG(p->p_pptr)) + sched_load_reassign(P_TO_VPROCG(p), P_TO_VPROCG(p->p_pptr)); #endif sx_xunlock(&allproc_lock); @@ -723,9 +720,7 @@ nfound++; PROC_SLOCK(p); if (p->p_state == PRS_ZOMBIE) { -#ifdef VIMAGE - struct vimage *vp = p->p_ucred->cr_vimage; -#endif + INIT_VPROCG(P_TO_VPROCG(p)); if (rusage) { *rusage = p->p_ru; calcru(p, &rusage->ru_utime, &rusage->ru_stime); @@ -814,7 +809,7 @@ sx_xlock(&allproc_lock); nprocs--; #ifdef VIMAGE - vp->v_procg->nprocs--; + vprocg->nprocs--; #endif sx_xunlock(&allproc_lock); return (0); ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#13 (text+ko) ==== @@ -326,7 +326,7 @@ */ nprocs++; #ifdef VIMAGE - p1->p_ucred->cr_vimage->v_procg->nprocs++; + P_TO_VPROCG(p1)->nprocs++; #endif /* ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#18 (text+ko) ==== @@ -402,7 +402,7 @@ { INIT_VNET_INET6(curvnet); /* XXX this bellow is WRONG - MARKO */ - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); struct mbuf *m = *mp, *n; struct ip6_hdr *ip6, *nip6; struct icmp6_hdr *icmp6, *nicmp6; @@ -1165,7 +1165,7 @@ { INIT_VNET_INET6(curvnet); /* XXX this bellow is WRONG - MARKO */ - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); struct icmp6_nodeinfo *ni6, *nni6; struct mbuf *n = NULL; u_int16_t qtype;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710221324.l9MDOPOj011311>