From owner-p4-projects@FreeBSD.ORG Sun Mar 30 02:51:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09D1F1065672; Sun, 30 Mar 2008 02:51:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A24B6106566C for ; Sun, 30 Mar 2008 02:51:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94A798FC18 for ; Sun, 30 Mar 2008 02:51:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2U2ptri017321 for ; Sun, 30 Mar 2008 02:51:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2U2ptr3017319 for perforce@freebsd.org; Sun, 30 Mar 2008 02:51:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Mar 2008 02:51:55 GMT Message-Id: <200803300251.m2U2ptr3017319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138958 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: Sun, 30 Mar 2008 02:51:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=138958 Change 138958 by jb@jb_freebsd1 on 2008/03/30 02:51:23 IFC Affected files ... .. //depot/projects/dtrace/ports/UPDATING#63 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#18 integrate .. //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#8 integrate .. //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#10 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#19 integrate .. //depot/projects/dtrace/www/en/gnome/docs/volunteer.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/ports/UPDATING#63 (text+ko) ==== @@ -6,11 +6,18 @@ time you update your ports collection, before attempting any port upgrades. +20080330: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + www/mediawiki version is 1.12 now. 1.11 version was preserved on + www/mediawiki111 port. + 20080329: AFFECTS: users of www/phpadsnew AUTHOR: beech@FreeBSD.org - Phpadsnew has been replaced with www/openx. + Phpadsnew has been replaced with www/openx. To upgrade please do the following: 1. Install www/openx @@ -6267,4 +6274,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.608 2008/03/29 19:50:39 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.610 2008/03/30 00:20:48 miwi Exp $ ==== //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.53 2008/01/10 01:10:47 attilio Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.54 2008/03/29 23:24:54 jeff Exp $ */ #include @@ -103,11 +103,9 @@ struct mount *mp; struct vnode *lowervp; { - struct thread *td = curthread; /* XXX */ struct null_node_hashhead *hd; struct null_node *a; struct vnode *vp; - int error; ASSERT_VOP_LOCKED(lowervp, "null_hashget"); @@ -121,24 +119,15 @@ mtx_lock(&null_hashmtx); LIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp == lowervp && NULLTOV(a)->v_mount == mp) { - vp = NULLTOV(a); - VI_LOCK(vp); - mtx_unlock(&null_hashmtx); - /* - * We need to clear the OWEINACT flag here as this - * may lead vget() to try to lock our vnode which - * is already locked via lowervp. - */ - vp->v_iflag &= ~VI_OWEINACT; - error = vget(vp, LK_INTERLOCK, td); /* * Since we have the lower node locked the nullfs * node can not be in the process of recycling. If * it had been recycled before we grabed the lower * lock it would not have been found on the hash. */ - if (error) - panic("null_hashget: vget error %d", error); + vp = NULLTOV(a); + vref(vp); + mtx_unlock(&null_hashmtx); return (vp); } } @@ -155,11 +144,9 @@ struct mount *mp; struct null_node *xp; { - struct thread *td = curthread; /* XXX */ struct null_node_hashhead *hd; struct null_node *oxp; struct vnode *ovp; - int error; hd = NULL_NHASH(xp->null_lowervp); mtx_lock(&null_hashmtx); @@ -171,12 +158,8 @@ * operation. */ ovp = NULLTOV(oxp); - VI_LOCK(ovp); + vref(ovp); mtx_unlock(&null_hashmtx); - ovp->v_iflag &= ~VI_OWEINACT; - error = vget(ovp, LK_INTERLOCK, td); - if (error) - panic("null_hashins: vget error %d", error); return (ovp); } } ==== //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#13 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.29 2008/01/13 14:44:09 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.30 2008/03/29 23:30:40 jeff Exp $"); #include #include @@ -704,12 +704,9 @@ } if (vd != NULL) { - if (vget(vd->mv_vnode, 0, curthread) == 0) { - *vpp = vd->mv_vnode; - vn_lock(*vpp, LK_RETRY | LK_EXCLUSIVE); - return (0); - } - /* XXX if this can happen, we're in trouble */ + *vpp = vd->mv_vnode; + vget(*vpp, LK_RETRY | LK_EXCLUSIVE, curthread); + return (0); } error = getnewvnode("mqueue", mp, &mqfs_vnodeops, vpp); ==== //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#16 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.259 2008/03/24 04:17:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.260 2008/03/29 23:36:26 jeff Exp $"); #include "opt_mac.h" @@ -854,26 +854,16 @@ } /* - * Check that the vnode is still valid, and if so - * acquire requested lock. + * Acquire the requested lock and then check for validity. LK_RETRY + * permits vn_lock to return doomed vnodes. */ int _vn_lock(struct vnode *vp, int flags, char *file, int line) { int error; - /* - * With no lock type requested we're just polling for validity. - */ - if ((flags & LK_TYPE_MASK) == 0) { - error = 0; - if ((flags & LK_INTERLOCK) == 0) - VI_LOCK(vp); - if (vp->v_iflag & VI_DOOMED) - error = ENOENT; - VI_UNLOCK(vp); - return (error); - } + VNASSERT((flags & LK_TYPE_MASK) != 0, vp, + ("vn_lock called with no locktype.")); do { error = VOP_LOCK1(vp, flags, file, line); flags &= ~LK_INTERLOCK; /* Interlock is always dropped. */ ==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.152 2008/03/27 23:02:30 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.154 2008/03/30 00:27:48 mav Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -770,11 +770,9 @@ return (0); } - do { - v = node->nd_refs - 1; - } while (! atomic_cmpset_int(&node->nd_refs, v + 1, v)); + v = atomic_fetchadd_int(&node->nd_refs, -1); - if (v == 0) { /* we were the last */ + if (v == 1) { /* we were the last */ mtx_lock(&ng_namehash_mtx); node->nd_type->refs--; /* XXX maybe should get types lock? */ @@ -788,7 +786,7 @@ mtx_destroy(&node->nd_input_queue.q_mtx); NG_FREE_NODE(node); } - return (v); + return (v - 1); } /************************************************************************ @@ -959,15 +957,12 @@ if (hook == &ng_deadhook) { return; } - do { - v = hook->hk_refs; - } while (! atomic_cmpset_int(&hook->hk_refs, v, v - 1)); + + v = atomic_fetchadd_int(&hook->hk_refs, -1); if (v == 1) { /* we were the last */ - if (_NG_HOOK_NODE(hook)) { /* it'll probably be ng_deadnode */ + if (_NG_HOOK_NODE(hook)) /* it'll probably be ng_deadnode */ _NG_NODE_UNREF((_NG_HOOK_NODE(hook))); - hook->hk_node = NULL; - } NG_FREE_HOOK(hook); } } ==== //depot/projects/dtrace/www/en/gnome/docs/bugging.sgml#8 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -117,7 +117,7 @@ FreeBSD-specific, and you have a fix available, report it to both the FreeBSD GNOME team and the application's developers. This way, the application's developers can apply - the patch to CVS, and the FreeBSD GNOME team can apply the + the patch upstream, and the FreeBSD GNOME team can apply the patch immediately to the ports tree without needing to wait for the next release.

==== //depot/projects/dtrace/www/en/gnome/docs/develfaq.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -44,7 +44,7 @@ versions are committed to the FreeBSD CVS tree. This document is about the development branch. The current development branch is GNOME &gnomedevelver;. -
  • CVS - Often newer-than-new, the CVS HEAD versions of GNOME +
  • SVN - Often newer-than-new, the SVN trunk versions of GNOME applications and libraries are alpha quality, or often completely unbuildable. The FreeBSD GNOME project pays attention to, but does not track the alpha quality code.
    • @@ -110,20 +110,7 @@ into your main ports tree. From there, you can use portupgrade or portmaster to upgrade from &gnomever; to &gnomedevelver; and stay up-to-date afterwards. - NOTE: if this is a first-time upgrade from &gnomever; to - &gnomedevelver; you must run portupgrade or - portmaster command:

    - 
    -portupgrade -o textproc/rarian textproc/scrollkeeper
-portupgrade -a
-
-or
-
-portmaster -o textproc/rarian textproc/scrollkeeper
-portmaster -a
-
    -

    The long answer is that keeping up-to-date with the GNOME development branch is complicated. Sometimes components change in a way that makes portupgrade or portmaster @@ -171,7 +158,7 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.20.0 is now out, and ports and packages are +

    GNOME 2.22.0 is now out, and ports and packages are up-to-date. Keep those bug reports coming.

    • ==== //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#19 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -41,7 +41,7 @@ fonts?
  • How can I control what fonts are anti-aliased? -
  • How do I edit my GNOME 2 menus? +
  • How do I edit my GNOME menus?
  • How do I use GTK+ 2 resource settings for GTK+ 2 applications when not in a GNOME environment?
  • How do I configure settings for GNOME 1.4 @@ -308,32 +308,32 @@

    I installed GNOME &gnomever;, but I am missing application foo. What gives?

    -

    Only the core desktop is included in the +

    Only the core Desktop is included in the gnome2 package. Here are some other GNOME - meta-ports that offer convenient groupings of popular GNOME 2 + meta-ports that offer convenient groupings of popular GNOME software.

    Send any feedback to