From owner-svn-src-user@FreeBSD.ORG Sun Jul 18 04:27:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA6AC106564A; Sun, 18 Jul 2010 04:27:39 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA3448FC0C; Sun, 18 Jul 2010 04:27:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6I4RdYe040685; Sun, 18 Jul 2010 04:27:39 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6I4RdLA040683; Sun, 18 Jul 2010 04:27:39 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007180427.o6I4RdLA040683@svn.freebsd.org> From: Doug Barton Date: Sun, 18 Jul 2010 04:27:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210202 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2010 04:27:39 -0000 Author: dougb Date: Sun Jul 18 04:27:39 2010 New Revision: 210202 URL: http://svn.freebsd.org/changeset/base/210202 Log: 1. Use nice for the make commands that actually build stuff 2. Improve the the messages for fetching and updating INDEX 3. Add some whitespace in checkdepends() after removing stale data 4. If we're doing -F don't bother to initialize $PACKAGES Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Jul 18 00:24:01 2010 (r210201) +++ user/dougb/portmaster/portmaster Sun Jul 18 04:27:39 2010 (r210202) @@ -369,7 +369,7 @@ pm_cd_pd () { builtin cd $pd/$1 2>/dev/ pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; - /usr/bin/make $PM_MAKE_ARGS $*; ); } + nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_make_b () { /usr/bin/make $PM_MAKE_ARGS BEFOREPORTMK=bpm $*; } pm_mktemp () { /usr/bin/mktemp -t f-${PM_PARENT_PID}-$1 || fail "mktemp for $1 failed"; } @@ -385,7 +385,7 @@ pm_install_s () { $PM_SU_CMD /usr/b -g wheel -m 644 $1 $2; } pm_make_s () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; - $PM_SU_CMD /usr/bin/make $PM_MAKE_ARGS $*; ); } + $PM_SU_CMD nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_mkdir_s () { $PM_SU_CMD /bin/mkdir -p $1; } pm_pkg_delete_s () { $PM_SU_CMD /usr/sbin/pkg_delete $*; } pm_rm_s () { $PM_SU_CMD /bin/rm $*; } @@ -532,11 +532,12 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then $index_fetch 2>/dev/null && do_index_fetch=no_index_fetch; } [ "$do_index_fetch" = yes_index_fetch ] && { - pm_sv 'Updating INDEX file'; $PM_SU_CMD $index_fetch; } + pm_sv 'Fetching new INDEX file'; $PM_SU_CMD $index_fetch; } if [ ${index_time:-0} -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then temp_index=`pm_mktemp index` bunzip2 < ${PM_INDEX}.bz2 > $temp_index + pm_sv 'Installing new INDEX file' pm_install_s $temp_index $PM_INDEX unlink $temp_index unset temp_index @@ -724,10 +725,11 @@ IFS=' echo -n " ===>>> Delete this dependency data? y/n [n] " read answer case "$answer" in - [yY]) unset prev_line line ; continue ;; + [yY]) unset prev_line line ; echo '' ; continue ;; esac else echo " ===>>> Try ${0##*/} --check-depends" + echo '' fi fi @@ -2531,7 +2533,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S [ -z "$NO_BACKUP" ] && init_packages [ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE - if [ -n "$MAKE_PACKAGE" ]; then + if [ -n "$MAKE_PACKAGE" -a -z "$FETCH_ONLY" ]; then init_packages_var if [ ! -d "$PACKAGES" ]; then From owner-svn-src-user@FreeBSD.ORG Mon Jul 19 07:28:35 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F54B1065673; Mon, 19 Jul 2010 07:28:35 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4E5ED8FC22; Mon, 19 Jul 2010 07:28:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6J7SZwD097912; Mon, 19 Jul 2010 07:28:35 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6J7SZVK097910; Mon, 19 Jul 2010 07:28:35 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007190728.o6J7SZVK097910@svn.freebsd.org> From: Juli Mallett Date: Mon, 19 Jul 2010 07:28:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210229 - user/jmallett/octeon/sys/mips/cavium X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 07:28:35 -0000 Author: jmallett Date: Mon Jul 19 07:28:35 2010 New Revision: 210229 URL: http://svn.freebsd.org/changeset/base/210229 Log: Actually, the ticker isn't variable. XXX Neither is the plain MIPS one that is registered as being, right? This seems to be the cause of my neverending t_delta nightmares. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c Mon Jul 19 02:26:59 2010 (r210228) +++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c Mon Jul 19 07:28:35 2010 (r210229) @@ -362,7 +362,7 @@ platform_start(__register_t a0, __regist mips_timer_init_params(platform_counter_freq, 0); - set_cputicker(octeon_get_ticks, cvmx_sysinfo_get()->cpu_clock_hz, 1); + set_cputicker(octeon_get_ticks, cvmx_sysinfo_get()->cpu_clock_hz, 0); #ifdef SMP /* From owner-svn-src-user@FreeBSD.ORG Mon Jul 19 19:40:39 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66D55106566B; Mon, 19 Jul 2010 19:40:39 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5386A8FC12; Mon, 19 Jul 2010 19:40:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JJedjL063146; Mon, 19 Jul 2010 19:40:39 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6JJedNa063136; Mon, 19 Jul 2010 19:40:39 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007191940.o6JJedNa063136@svn.freebsd.org> From: Juli Mallett Date: Mon, 19 Jul 2010 19:40:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210250 - user/jmallett/octeon/sys/netinet/libalias X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 19:40:39 -0000 Author: jmallett Date: Mon Jul 19 19:40:38 2010 New Revision: 210250 URL: http://svn.freebsd.org/changeset/base/210250 Log: Unbreak compiling libalias modules into the kernel; o) Make the 'handlers' array static to each file since without a unique name there is a symbol collision in the kernel (why linker sets aren't simply used, I don't know.) o) Modify sysinit orders to run module inits after the initialization of the rwlock they require. In this branch because it was blocking an Octeon user; I don't have an interest in libalias in general and will leave it to someone else to decide whether to commit this to trunk. Modified: user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c user/jmallett/octeon/sys/netinet/libalias/alias_irc.c user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c user/jmallett/octeon/sys/netinet/libalias/libalias.3 Modified: user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_cuseeme.c Mon Jul 19 19:40:38 2010 (r210250) @@ -91,7 +91,7 @@ protohandlerout(struct libalias *la, str } /* Kernel module definition. */ -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 120, .dir = OUT, @@ -138,7 +138,7 @@ alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_cuseeme, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_cuseeme, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_cuseeme, 1); MODULE_DEPEND(alias_cuseeme, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_dummy.c Mon Jul 19 19:40:38 2010 (r210250) @@ -101,7 +101,7 @@ protohandler(struct libalias *la, struct * ITS EXACT NAME: handlers. */ -struct proto_handler handlers [] = { +static struct proto_handler handlers [] = { { .pri = 666, .dir = IN|OUT, @@ -140,7 +140,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_dummy, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_dummy, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_dummy, 1); MODULE_DEPEND(alias_dummy, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_ftp.c Mon Jul 19 19:40:38 2010 (r210250) @@ -124,7 +124,7 @@ protohandler(struct libalias *la, struct return (0); } -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 80, .dir = OUT, @@ -163,7 +163,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_ftp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_ftp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_ftp, 1); MODULE_DEPEND(alias_ftp, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_irc.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_irc.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_irc.c Mon Jul 19 19:40:38 2010 (r210250) @@ -117,7 +117,7 @@ protohandler(struct libalias *la, struct return (0); } -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 90, .dir = OUT, @@ -157,7 +157,7 @@ moduledata_t alias_mod = { /* Kernel module definition. */ #ifdef _KERNEL -DECLARE_MODULE(alias_irc, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_irc, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_irc, 1); MODULE_DEPEND(alias_irc, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_nbt.c Mon Jul 19 19:40:38 2010 (r210250) @@ -127,7 +127,7 @@ protohandler2out(struct libalias *la, st } /* Kernel module definition. */ -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 130, .dir = IN|OUT, @@ -180,7 +180,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_nbt, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_nbt, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_nbt, 1); MODULE_DEPEND(alias_nbt, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_pptp.c Mon Jul 19 19:40:38 2010 (r210250) @@ -133,7 +133,7 @@ protohandlergreout(struct libalias *la, } /* Kernel module definition. */ -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 200, .dir = IN, @@ -197,7 +197,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_pptp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_pptp, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_pptp, 1); MODULE_DEPEND(alias_pptp, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_skinny.c Mon Jul 19 19:40:38 2010 (r210250) @@ -76,7 +76,7 @@ protohandler(struct libalias *la, struct return (0); } -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 110, .dir = IN|OUT, @@ -115,7 +115,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_skinny, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_skinny, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_skinny, 1); MODULE_DEPEND(alias_skinny, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/alias_smedia.c Mon Jul 19 19:40:38 2010 (r210250) @@ -160,7 +160,7 @@ protohandler(struct libalias *la, struct return (0); } -struct proto_handler handlers[] = { +static struct proto_handler handlers[] = { { .pri = 100, .dir = OUT, @@ -199,7 +199,7 @@ moduledata_t alias_mod = { }; #ifdef _KERNEL -DECLARE_MODULE(alias_smedia, alias_mod, SI_SUB_DRIVERS, SI_ORDER_SECOND); +DECLARE_MODULE(alias_smedia, alias_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); MODULE_VERSION(alias_smedia, 1); MODULE_DEPEND(alias_smedia, libalias, 1, 1, 1); #endif Modified: user/jmallett/octeon/sys/netinet/libalias/libalias.3 ============================================================================== --- user/jmallett/octeon/sys/netinet/libalias/libalias.3 Mon Jul 19 19:19:33 2010 (r210249) +++ user/jmallett/octeon/sys/netinet/libalias/libalias.3 Mon Jul 19 19:40:38 2010 (r210250) @@ -1276,7 +1276,7 @@ module. From .Pa alias_dummy.c : .Bd -literal -struct proto_handler handlers [] = {{666, IN|OUT, UDP|TCP, +static struct proto_handler handlers [] = {{666, IN|OUT, UDP|TCP, &fingerprint, &protohandler}}; .Ed .Pp From owner-svn-src-user@FreeBSD.ORG Mon Jul 19 21:24:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02A52106566C; Mon, 19 Jul 2010 21:24:49 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E825A8FC08; Mon, 19 Jul 2010 21:24:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JLOmqw086971; Mon, 19 Jul 2010 21:24:48 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6JLOmwc086969; Mon, 19 Jul 2010 21:24:48 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007192124.o6JLOmwc086969@svn.freebsd.org> From: Juli Mallett Date: Mon, 19 Jul 2010 21:24:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210258 - user/jmallett/octeon/sys/mips/cavium/octe X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 21:24:49 -0000 Author: jmallett Date: Mon Jul 19 21:24:48 2010 New Revision: 210258 URL: http://svn.freebsd.org/changeset/base/210258 Log: Lock the transmitted packet queue from the time we start preparing a packet through when we free any transmitted packets. Without doing this we are vulnerable to several nasty races involving packets being freed out of order, freed twice, etc. The atomic operations are good as far as they go, but they don't provide for consistency with the packet freeing. Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c Mon Jul 19 21:13:07 2010 (r210257) +++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-tx.c Mon Jul 19 21:24:48 2010 (r210258) @@ -198,6 +198,7 @@ int cvm_oct_xmit(struct mbuf *m, struct pko_command.s.ipoffp1 = ETHER_HDR_LEN + 1; } + IF_LOCK(&priv->tx_free_queue[qos]); if (USE_ASYNC_IOBDMA) { /* Get the number of mbufs in use by the hardware */ CVMX_SYNCIOBDMA; @@ -241,13 +242,12 @@ int cvm_oct_xmit(struct mbuf *m, struct /* Free mbufs not in use by the hardware */ if (_IF_QLEN(&priv->tx_free_queue[qos]) > in_use) { - IF_LOCK(&priv->tx_free_queue[qos]); while (_IF_QLEN(&priv->tx_free_queue[qos]) > in_use) { _IF_DEQUEUE(&priv->tx_free_queue[qos], m); m_freem(m); } - IF_UNLOCK(&priv->tx_free_queue[qos]); } + IF_UNLOCK(&priv->tx_free_queue[qos]); return dropped; } From owner-svn-src-user@FreeBSD.ORG Mon Jul 19 22:28:08 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 404E71065673; Mon, 19 Jul 2010 22:28:08 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3344F8FC15; Mon, 19 Jul 2010 22:28:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6JMS8Ra001444; Mon, 19 Jul 2010 22:28:08 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6JMS8ee001443; Mon, 19 Jul 2010 22:28:08 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007192228.o6JMS8ee001443@svn.freebsd.org> From: Juli Mallett Date: Mon, 19 Jul 2010 22:28:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210266 - user/jmallett/octeon/sys/mips/cavium/octe X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2010 22:28:08 -0000 Author: jmallett Date: Mon Jul 19 22:28:07 2010 New Revision: 210266 URL: http://svn.freebsd.org/changeset/base/210266 Log: Poll on interface init, rather than waiting for a combination of timers and interrupts to eventually do the poll and yield a status update such that we can see the link status change. This fixes problems with interfaces hanging on first configuration. Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c Modified: user/jmallett/octeon/sys/mips/cavium/octe/octe.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/octe.c Mon Jul 19 21:50:43 2010 (r210265) +++ user/jmallett/octeon/sys/mips/cavium/octe/octe.c Mon Jul 19 22:28:07 2010 (r210266) @@ -265,6 +265,8 @@ octe_init(void *arg) cvm_oct_common_set_mac_address(ifp, IF_LLADDR(ifp)); + if (priv->poll != NULL) + priv->poll(ifp); if (priv->miibus != NULL) mii_mediachg(device_get_softc(priv->miibus)); From owner-svn-src-user@FreeBSD.ORG Tue Jul 20 04:16:51 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA4C01065679; Tue, 20 Jul 2010 04:16:51 +0000 (UTC) (envelope-from pgollucci@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E4188FC1B; Tue, 20 Jul 2010 04:16:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6K4GpF1081869; Tue, 20 Jul 2010 04:16:51 GMT (envelope-from pgollucci@svn.freebsd.org) Received: (from pgollucci@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6K4GpIB081868; Tue, 20 Jul 2010 04:16:51 GMT (envelope-from pgollucci@svn.freebsd.org) Message-Id: <201007200416.o6K4GpIB081868@svn.freebsd.org> From: "Philip M. Gollucci" Date: Tue, 20 Jul 2010 04:16:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210277 - user/pgollucci X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2010 04:16:51 -0000 Author: pgollucci (ports committer) Date: Tue Jul 20 04:16:51 2010 New Revision: 210277 URL: http://svn.freebsd.org/changeset/base/210277 Log: init my dir Added: user/pgollucci/ From owner-svn-src-user@FreeBSD.ORG Tue Jul 20 04:46:05 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79204106566B; Tue, 20 Jul 2010 04:46:05 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 603ED8FC0C; Tue, 20 Jul 2010 04:46:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6K4k59M088322; Tue, 20 Jul 2010 04:46:05 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6K4k58G088310; Tue, 20 Jul 2010 04:46:05 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007200446.o6K4k58G088310@svn.freebsd.org> From: Juli Mallett Date: Tue, 20 Jul 2010 04:46:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210278 - in user/jmallett/octeon: . bin/pkill bin/sh cddl/compat/opensolaris/include cddl/compat/opensolaris/misc cddl/contrib/opensolaris/cmd/plockstat cddl/contrib/opensolaris/cmd/py... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2010 04:46:05 -0000 Author: jmallett Date: Tue Jul 20 04:46:04 2010 New Revision: 210278 URL: http://svn.freebsd.org/changeset/base/210278 Log: Merge from head. Some of the style changes in the merge of my MIPS work are probably wrong and need some hand-fixing. Added: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/plockstat/ - copied from r210277, head/cddl/contrib/opensolaris/cmd/plockstat/ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/pyzfs/ - copied from r210277, head/cddl/contrib/opensolaris/cmd/pyzfs/ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/i386/ - copied from r210277, head/cddl/contrib/opensolaris/lib/libdtrace/i386/ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libdtrace/sparc/ - copied from r210277, head/cddl/contrib/opensolaris/lib/libdtrace/sparc/ user/jmallett/octeon/cddl/contrib/opensolaris/lib/pyzfs/ - copied from r210277, head/cddl/contrib/opensolaris/lib/pyzfs/ user/jmallett/octeon/etc/periodic/security/460.chkportsum - copied unchanged from r210277, head/etc/periodic/security/460.chkportsum user/jmallett/octeon/gnu/usr.bin/binutils/as/powerpc64-freebsd/ - copied from r210277, head/gnu/usr.bin/binutils/as/powerpc64-freebsd/ user/jmallett/octeon/gnu/usr.bin/binutils/gdb/Makefile.powerpc64 - copied unchanged from r210277, head/gnu/usr.bin/binutils/gdb/Makefile.powerpc64 user/jmallett/octeon/gnu/usr.bin/binutils/ld/Makefile.powerpc64 - copied unchanged from r210277, head/gnu/usr.bin/binutils/ld/Makefile.powerpc64 user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64 - copied unchanged from r210277, head/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64 user/jmallett/octeon/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64 - copied unchanged from r210277, head/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64 user/jmallett/octeon/gnu/usr.bin/gdb/arch/powerpc64/ - copied from r210277, head/gnu/usr.bin/gdb/arch/powerpc64/ user/jmallett/octeon/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c - copied unchanged from r210277, head/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c user/jmallett/octeon/lib/csu/powerpc64/ - copied from r210277, head/lib/csu/powerpc64/ user/jmallett/octeon/lib/libc/powerpc64/ - copied from r210277, head/lib/libc/powerpc64/ user/jmallett/octeon/lib/libkvm/kvm_powerpc64.c - copied unchanged from r210277, head/lib/libkvm/kvm_powerpc64.c user/jmallett/octeon/lib/libthr/arch/powerpc64/ - copied from r210277, head/lib/libthr/arch/powerpc64/ user/jmallett/octeon/lib/libthread_db/arch/powerpc64/ - copied from r210277, head/lib/libthread_db/arch/powerpc64/ user/jmallett/octeon/libexec/rtld-elf/powerpc64/ - copied from r210277, head/libexec/rtld-elf/powerpc64/ user/jmallett/octeon/secure/lib/libcrypto/opensslconf-powerpc64.h - copied unchanged from r210277, head/secure/lib/libcrypto/opensslconf-powerpc64.h user/jmallett/octeon/share/doc/psd/15.yacc/ss10 - copied unchanged from r210277, head/share/doc/psd/15.yacc/ss10 user/jmallett/octeon/share/doc/psd/15.yacc/ss11 - copied unchanged from r210277, head/share/doc/psd/15.yacc/ss11 user/jmallett/octeon/share/doc/psd/15.yacc/ss_ - copied unchanged from r210277, head/share/doc/psd/15.yacc/ss_ user/jmallett/octeon/share/man/man4/fdt.4 - copied unchanged from r210277, head/share/man/man4/fdt.4 user/jmallett/octeon/share/man/man4/fdtbus.4 - copied unchanged from r210277, head/share/man/man4/fdtbus.4 user/jmallett/octeon/share/man/man4/simplebus.4 - copied unchanged from r210277, head/share/man/man4/simplebus.4 user/jmallett/octeon/sys/arm/at91/at91_aicreg.h - copied unchanged from r210277, head/sys/arm/at91/at91_aicreg.h user/jmallett/octeon/sys/arm/at91/at91_pio_sam9.h - copied unchanged from r210277, head/sys/arm/at91/at91_pio_sam9.h user/jmallett/octeon/sys/arm/at91/at91_pit.c - copied unchanged from r210277, head/sys/arm/at91/at91_pit.c user/jmallett/octeon/sys/arm/at91/at91_pitreg.h - copied unchanged from r210277, head/sys/arm/at91/at91_pitreg.h user/jmallett/octeon/sys/arm/at91/at91sam9.c - copied unchanged from r210277, head/sys/arm/at91/at91sam9.c user/jmallett/octeon/sys/arm/at91/at91sam9_machdep.c - copied unchanged from r210277, head/sys/arm/at91/at91sam9_machdep.c user/jmallett/octeon/sys/arm/at91/at91sam9g20reg.h - copied unchanged from r210277, head/sys/arm/at91/at91sam9g20reg.h user/jmallett/octeon/sys/arm/at91/board_hl201.c - copied unchanged from r210277, head/sys/arm/at91/board_hl201.c user/jmallett/octeon/sys/arm/at91/files.at91sam9 - copied unchanged from r210277, head/sys/arm/at91/files.at91sam9 user/jmallett/octeon/sys/arm/at91/if_macb.c - copied unchanged from r210277, head/sys/arm/at91/if_macb.c user/jmallett/octeon/sys/arm/at91/if_macbreg.h - copied unchanged from r210277, head/sys/arm/at91/if_macbreg.h user/jmallett/octeon/sys/arm/at91/if_macbvar.h - copied unchanged from r210277, head/sys/arm/at91/if_macbvar.h user/jmallett/octeon/sys/arm/at91/std.at91sam9 - copied unchanged from r210277, head/sys/arm/at91/std.at91sam9 user/jmallett/octeon/sys/arm/at91/std.hl201 - copied unchanged from r210277, head/sys/arm/at91/std.hl201 user/jmallett/octeon/sys/arm/conf/HL201 - copied unchanged from r210277, head/sys/arm/conf/HL201 user/jmallett/octeon/sys/arm/conf/HL201.hints - copied unchanged from r210277, head/sys/arm/conf/HL201.hints user/jmallett/octeon/sys/boot/ofw/libofw/ppc64_elf_freebsd.c - copied unchanged from r210277, head/sys/boot/ofw/libofw/ppc64_elf_freebsd.c user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c - copied unchanged from r210277, head/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/ - copied from r210277, head/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/ user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h - copied unchanged from r210277, head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/intel/dtrace/ - copied from r210277, head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/ user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/ - copied from r210277, head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/ user/jmallett/octeon/sys/conf/ldscript.mips.64 - copied unchanged from r210277, head/sys/conf/ldscript.mips.64 user/jmallett/octeon/sys/conf/ldscript.powerpc64 - copied unchanged from r210277, head/sys/conf/ldscript.powerpc64 user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtcompile.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtcompile.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtcompiler.h - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtcompiler.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtfield.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtfield.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtio.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtio.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtsubtable.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtsubtable.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttable.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttable.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttemplate.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttemplate.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dttemplate.h - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dttemplate.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/dtutils.c - copied unchanged from r210277, head/sys/contrib/dev/acpica/compiler/dtutils.c user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu - copied unchanged from r210277, head/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu - copied unchanged from r210277, head/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu user/jmallett/octeon/sys/dev/cfi/cfi_bus_fdt.c - copied unchanged from r210277, head/sys/dev/cfi/cfi_bus_fdt.c user/jmallett/octeon/sys/dev/fdt/fdt_powerpc.c - copied unchanged from r210277, head/sys/dev/fdt/fdt_powerpc.c user/jmallett/octeon/sys/dev/quicc/quicc_bfe_fdt.c - copied unchanged from r210277, head/sys/dev/quicc/quicc_bfe_fdt.c user/jmallett/octeon/sys/dev/tsec/if_tsec_fdt.c - copied unchanged from r210277, head/sys/dev/tsec/if_tsec_fdt.c user/jmallett/octeon/sys/kern/kern_clocksource.c - copied unchanged from r210277, head/sys/kern/kern_clocksource.c user/jmallett/octeon/sys/mips/conf/XLR64 - copied unchanged from r210277, head/sys/mips/conf/XLR64 user/jmallett/octeon/sys/modules/iwnfw/iwn6050/ - copied from r210277, head/sys/modules/iwnfw/iwn6050/ user/jmallett/octeon/sys/powerpc/aim/locore32.S - copied unchanged from r210277, head/sys/powerpc/aim/locore32.S user/jmallett/octeon/sys/powerpc/aim/locore64.S - copied unchanged from r210277, head/sys/powerpc/aim/locore64.S user/jmallett/octeon/sys/powerpc/aim/slb.c - copied unchanged from r210277, head/sys/powerpc/aim/slb.c user/jmallett/octeon/sys/powerpc/aim/swtch32.S - copied unchanged from r210277, head/sys/powerpc/aim/swtch32.S user/jmallett/octeon/sys/powerpc/aim/swtch64.S - copied unchanged from r210277, head/sys/powerpc/aim/swtch64.S user/jmallett/octeon/sys/powerpc/aim/trap_subr32.S - copied unchanged from r210277, head/sys/powerpc/aim/trap_subr32.S user/jmallett/octeon/sys/powerpc/aim/trap_subr64.S - copied unchanged from r210277, head/sys/powerpc/aim/trap_subr64.S user/jmallett/octeon/sys/powerpc/conf/GENERIC64 - copied unchanged from r210277, head/sys/powerpc/conf/GENERIC64 user/jmallett/octeon/sys/powerpc/include/fdt.h - copied unchanged from r210277, head/sys/powerpc/include/fdt.h user/jmallett/octeon/sys/powerpc/include/slb.h - copied unchanged from r210277, head/sys/powerpc/include/slb.h user/jmallett/octeon/sys/powerpc/mpc85xx/ds1553_bus_fdt.c - copied unchanged from r210277, head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c user/jmallett/octeon/sys/powerpc/mpc85xx/openpic_fdt.c - copied unchanged from r210277, head/sys/powerpc/mpc85xx/openpic_fdt.c user/jmallett/octeon/sys/powerpc/mpc85xx/pci_fdt.c - copied unchanged from r210277, head/sys/powerpc/mpc85xx/pci_fdt.c user/jmallett/octeon/sys/powerpc/powerpc/elf32_machdep.c - copied unchanged from r210277, head/sys/powerpc/powerpc/elf32_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/elf64_machdep.c - copied unchanged from r210277, head/sys/powerpc/powerpc/elf64_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/exec_machdep.c - copied unchanged from r210277, head/sys/powerpc/powerpc/exec_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/sigcode32.S - copied unchanged from r210277, head/sys/powerpc/powerpc/sigcode32.S user/jmallett/octeon/sys/powerpc/powerpc/sigcode64.S - copied unchanged from r210277, head/sys/powerpc/powerpc/sigcode64.S user/jmallett/octeon/tools/regression/bin/sh/parser/only-redir1.0 - copied unchanged from r210277, head/tools/regression/bin/sh/parser/only-redir1.0 user/jmallett/octeon/usr.bin/truss/powerpc64-fbsd.c - copied unchanged from r210277, head/usr.bin/truss/powerpc64-fbsd.c user/jmallett/octeon/usr.bin/xlint/arch/powerpc64/ - copied from r210277, head/usr.bin/xlint/arch/powerpc64/ user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh - copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/detect-emulation.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/get-packages.sh - copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/get-packages.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-packages.sh - copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend-query/list-packages.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/functions-packages.sh - copied unchanged from r210277, head/usr.sbin/pc-sysinstall/backend/functions-packages.sh Deleted: user/jmallett/octeon/share/doc/psd/15.yacc/ss.. user/jmallett/octeon/share/doc/psd/15.yacc/ssA user/jmallett/octeon/share/doc/psd/15.yacc/ssB user/jmallett/octeon/sys/amd64/acpica/Makefile user/jmallett/octeon/sys/amd64/acpica/genwakecode.sh user/jmallett/octeon/sys/amd64/acpica/genwakedata.sh user/jmallett/octeon/sys/arm/include/bootinfo.h user/jmallett/octeon/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu user/jmallett/octeon/sys/dev/cfi/cfi_bus_lbc.c user/jmallett/octeon/sys/dev/fdt/fdt_arm.c user/jmallett/octeon/sys/dev/quicc/quicc_bfe_ocp.c user/jmallett/octeon/sys/dev/tsec/if_tsec_ocp.c user/jmallett/octeon/sys/dev/uart/uart_bus_ocp.c user/jmallett/octeon/sys/mips/include/asmacros.h user/jmallett/octeon/sys/pc98/cbus/clock.c user/jmallett/octeon/sys/powerpc/aim/swtch.S user/jmallett/octeon/sys/powerpc/include/bootinfo.h user/jmallett/octeon/sys/powerpc/include/ocpbus.h user/jmallett/octeon/sys/powerpc/mpc85xx/ds1553_bus_lbc.c user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.c user/jmallett/octeon/sys/powerpc/mpc85xx/ocpbus.h user/jmallett/octeon/sys/powerpc/mpc85xx/opic.c user/jmallett/octeon/sys/powerpc/mpc85xx/pci_ocp.c user/jmallett/octeon/sys/powerpc/powerpc/elf_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/sigcode.S user/jmallett/octeon/sys/x86/x86/timeevents.c user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh Modified: user/jmallett/octeon/Makefile.inc1 user/jmallett/octeon/ObsoleteFiles.inc user/jmallett/octeon/UPDATING user/jmallett/octeon/bin/pkill/pkill.1 user/jmallett/octeon/bin/sh/parser.c user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c user/jmallett/octeon/cddl/contrib/opensolaris/cmd/ztest/ztest.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c user/jmallett/octeon/contrib/binutils/bfd/elf64-ppc.c user/jmallett/octeon/contrib/binutils/ld/emultempl/elf32.em user/jmallett/octeon/contrib/binutils/ld/lexsup.c user/jmallett/octeon/contrib/gcc/config/rs6000/freebsd.h user/jmallett/octeon/contrib/gdb/gdb/ppcfbsd-tdep.c user/jmallett/octeon/contrib/gdb/gdb/solib-svr4.c user/jmallett/octeon/etc/defaults/periodic.conf user/jmallett/octeon/etc/gettytab user/jmallett/octeon/etc/periodic/security/Makefile user/jmallett/octeon/games/pom/pom.6 user/jmallett/octeon/games/pom/pom.c user/jmallett/octeon/gnu/lib/csu/Makefile user/jmallett/octeon/gnu/lib/libgcc/Makefile user/jmallett/octeon/gnu/usr.bin/binutils/as/Makefile user/jmallett/octeon/gnu/usr.bin/binutils/gdb/Makefile user/jmallett/octeon/gnu/usr.bin/binutils/libbfd/Makefile user/jmallett/octeon/gnu/usr.bin/cc/Makefile.tgt user/jmallett/octeon/gnu/usr.bin/cc/cc_tools/Makefile user/jmallett/octeon/gnu/usr.bin/cc/include/Makefile user/jmallett/octeon/gnu/usr.bin/dialog/dialog.1 user/jmallett/octeon/gnu/usr.bin/dtc/Makefile user/jmallett/octeon/include/Makefile user/jmallett/octeon/lib/Makefile user/jmallett/octeon/lib/bind/config.mk user/jmallett/octeon/lib/libarchive/libarchive.3 user/jmallett/octeon/lib/libc/Makefile user/jmallett/octeon/lib/libc/compat-43/sigcompat.c user/jmallett/octeon/lib/libc/gen/_thread_init.c user/jmallett/octeon/lib/libc/gmon/gmon.c user/jmallett/octeon/lib/libc/net/sctp_sys_calls.c user/jmallett/octeon/lib/libc/posix1e/acl_from_text.c user/jmallett/octeon/lib/libc/posix1e/acl_from_text_nfs4.c user/jmallett/octeon/lib/libc/posix1e/acl_support.h user/jmallett/octeon/lib/libc/stdlib/malloc.c user/jmallett/octeon/lib/libc/sys/ptrace.2 user/jmallett/octeon/lib/libjail/jail.c user/jmallett/octeon/lib/libjail/jail_getid.c user/jmallett/octeon/lib/liblzma/config.h user/jmallett/octeon/lib/libstand/Makefile user/jmallett/octeon/lib/libstand/printf.c user/jmallett/octeon/lib/libthr/thread/thr_sig.c user/jmallett/octeon/lib/msun/Makefile user/jmallett/octeon/libexec/rtld-elf/Makefile user/jmallett/octeon/libexec/rtld-elf/Symbol.map user/jmallett/octeon/release/Makefile user/jmallett/octeon/release/picobsd/qemu/PICOBSD user/jmallett/octeon/release/picobsd/qemu/crunch.conf user/jmallett/octeon/sbin/dhclient/dhclient.c user/jmallett/octeon/sbin/geom/class/virstor/geom_virstor.c user/jmallett/octeon/sbin/ipfw/dummynet.c user/jmallett/octeon/sbin/iscontrol/iscontrol.8 user/jmallett/octeon/sbin/kldload/kldload.8 user/jmallett/octeon/sbin/kldload/kldload.c user/jmallett/octeon/share/doc/psd/15.yacc/Makefile user/jmallett/octeon/share/man/man3/queue.3 user/jmallett/octeon/share/man/man3/tree.3 user/jmallett/octeon/share/man/man4/Makefile user/jmallett/octeon/share/man/man4/ath.4 user/jmallett/octeon/share/man/man4/u3g.4 user/jmallett/octeon/share/man/man4/uhso.4 user/jmallett/octeon/share/man/man5/rc.conf.5 user/jmallett/octeon/share/misc/committers-ports.dot user/jmallett/octeon/share/misc/committers-src.dot user/jmallett/octeon/share/mk/Makefile user/jmallett/octeon/share/mk/bsd.cpu.mk user/jmallett/octeon/share/mk/bsd.endian.mk user/jmallett/octeon/share/mk/sys.mk user/jmallett/octeon/sys/amd64/acpica/acpi_wakecode.S user/jmallett/octeon/sys/amd64/amd64/cpu_switch.S user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/amd64/amd64/trap.c user/jmallett/octeon/sys/amd64/conf/GENERIC user/jmallett/octeon/sys/amd64/conf/GENERIC.hints user/jmallett/octeon/sys/amd64/conf/NOTES user/jmallett/octeon/sys/amd64/include/clock.h user/jmallett/octeon/sys/amd64/include/cpu.h user/jmallett/octeon/sys/amd64/include/pmap.h user/jmallett/octeon/sys/amd64/include/segments.h user/jmallett/octeon/sys/arm/at91/at91_pmc.c user/jmallett/octeon/sys/arm/at91/at91_pmcreg.h user/jmallett/octeon/sys/arm/include/fdt.h user/jmallett/octeon/sys/arm/include/metadata.h user/jmallett/octeon/sys/arm/mv/common.c user/jmallett/octeon/sys/arm/mv/discovery/std.db78xxx user/jmallett/octeon/sys/arm/mv/kirkwood/std.db88f6xxx user/jmallett/octeon/sys/arm/mv/kirkwood/std.sheevaplug user/jmallett/octeon/sys/arm/mv/mv_machdep.c user/jmallett/octeon/sys/arm/mv/orion/std.db88f5xxx user/jmallett/octeon/sys/boot/Makefile user/jmallett/octeon/sys/boot/common/Makefile.inc user/jmallett/octeon/sys/boot/fdt/Makefile user/jmallett/octeon/sys/boot/fdt/dts/mpc8555cds.dts user/jmallett/octeon/sys/boot/ficl/Makefile user/jmallett/octeon/sys/boot/ia64/common/exec.c user/jmallett/octeon/sys/boot/ia64/efi/version user/jmallett/octeon/sys/boot/ofw/Makefile.inc user/jmallett/octeon/sys/boot/ofw/libofw/Makefile user/jmallett/octeon/sys/boot/ofw/libofw/libofw.h user/jmallett/octeon/sys/boot/powerpc/Makefile.inc user/jmallett/octeon/sys/boot/powerpc/boot1.chrp/Makefile user/jmallett/octeon/sys/boot/powerpc/ofw/Makefile user/jmallett/octeon/sys/boot/powerpc/ofw/conf.c user/jmallett/octeon/sys/boot/powerpc/ofw/ldscript.powerpc user/jmallett/octeon/sys/boot/powerpc/ofw/metadata.c user/jmallett/octeon/sys/boot/powerpc/uboot/Makefile user/jmallett/octeon/sys/boot/powerpc/uboot/ldscript.powerpc user/jmallett/octeon/sys/boot/uboot/Makefile.inc user/jmallett/octeon/sys/boot/uboot/common/metadata.c user/jmallett/octeon/sys/cam/ata/ata_xpt.c user/jmallett/octeon/sys/cddl/boot/zfs/zfsimpl.h user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/misc.h user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/policy.h user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/sid.h user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/uio.h user/jmallett/octeon/sys/cddl/compat/opensolaris/sys/vnode.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h user/jmallett/octeon/sys/compat/svr4/svr4_filio.c user/jmallett/octeon/sys/conf/Makefile.powerpc user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/conf/files.amd64 user/jmallett/octeon/sys/conf/files.arm user/jmallett/octeon/sys/conf/files.i386 user/jmallett/octeon/sys/conf/files.pc98 user/jmallett/octeon/sys/conf/files.powerpc user/jmallett/octeon/sys/conf/kern.mk user/jmallett/octeon/sys/conf/kern.post.mk user/jmallett/octeon/sys/conf/kern.pre.mk user/jmallett/octeon/sys/conf/kmod.mk user/jmallett/octeon/sys/conf/options.arm user/jmallett/octeon/sys/conf/options.powerpc user/jmallett/octeon/sys/contrib/dev/acpica/acpica_prep.sh user/jmallett/octeon/sys/contrib/dev/acpica/changes.txt user/jmallett/octeon/sys/contrib/dev/acpica/common/adisasm.c user/jmallett/octeon/sys/contrib/dev/acpica/common/adwalk.c user/jmallett/octeon/sys/contrib/dev/acpica/common/dmextern.c user/jmallett/octeon/sys/contrib/dev/acpica/common/dmrestag.c user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtable.c user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbdump.c user/jmallett/octeon/sys/contrib/dev/acpica/common/dmtbinfo.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslanalyze.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompile.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.l user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.y user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asldefine.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslerror.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslfiles.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslglobal.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asllookup.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslmain.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslopt.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslpredef.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslstartup.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltransform.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltree.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltypes.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslutils.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbcmds.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbdisply.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbexec.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbfileio.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbhistry.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbinput.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbutils.c user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmobject.c user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmopcode.c user/jmallett/octeon/sys/contrib/dev/acpica/disassembler/dmresrc.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsinit.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmethod.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsmthdat.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsobject.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsopcode.c user/jmallett/octeon/sys/contrib/dev/acpica/dispatcher/dsutils.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpe.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeblk.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeinit.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeutil.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evrgnini.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evxface.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evxfevnt.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exdump.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exfldio.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exprep.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exregion.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exsystem.c user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwgpe.c user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwsleep.c user/jmallett/octeon/sys/contrib/dev/acpica/hardware/hwvalid.c user/jmallett/octeon/sys/contrib/dev/acpica/include/acconfig.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acdisasm.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acevents.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acexcep.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acglobal.h user/jmallett/octeon/sys/contrib/dev/acpica/include/achware.h user/jmallett/octeon/sys/contrib/dev/acpica/include/aclocal.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acnamesp.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acobject.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acoutput.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acpixf.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acpredef.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acstruct.h user/jmallett/octeon/sys/contrib/dev/acpica/include/actbl.h user/jmallett/octeon/sys/contrib/dev/acpica/include/actbl2.h user/jmallett/octeon/sys/contrib/dev/acpica/include/actypes.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acutils.h user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsaccess.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsalloc.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsdump.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsinit.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsnames.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsparse.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsrepair.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsrepair2.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nssearch.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsutils.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nswalk.c user/jmallett/octeon/sys/contrib/dev/acpica/namespace/nsxfobj.c user/jmallett/octeon/sys/contrib/dev/acpica/osunixxf.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utglobal.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utmisc.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/uttrack.c user/jmallett/octeon/sys/ddb/db_command.c user/jmallett/octeon/sys/dev/acpica/Osd/OsdHardware.c user/jmallett/octeon/sys/dev/acpica/Osd/OsdMemory.c user/jmallett/octeon/sys/dev/acpica/acpi.c user/jmallett/octeon/sys/dev/acpica/acpi_button.c user/jmallett/octeon/sys/dev/acpica/acpi_ec.c user/jmallett/octeon/sys/dev/acpica/acpi_hpet.c user/jmallett/octeon/sys/dev/acpica/acpi_lid.c user/jmallett/octeon/sys/dev/agp/agp.c user/jmallett/octeon/sys/dev/aic7xxx/aic79xx.reg user/jmallett/octeon/sys/dev/aic7xxx/aic7xxx.reg user/jmallett/octeon/sys/dev/aic7xxx/aicasm/aicasm_gram.y user/jmallett/octeon/sys/dev/ata/ata-all.c user/jmallett/octeon/sys/dev/ata/ata-disk.c user/jmallett/octeon/sys/dev/ata/ata-pci.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-acerlabs.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-amd.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-highpoint.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-intel.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-ite.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-jmicron.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-marvell.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-nvidia.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-promise.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-siliconimage.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-sis.c user/jmallett/octeon/sys/dev/ata/chipsets/ata-via.c user/jmallett/octeon/sys/dev/ath/if_ath.c user/jmallett/octeon/sys/dev/bce/if_bce.c user/jmallett/octeon/sys/dev/bce/if_bcereg.h user/jmallett/octeon/sys/dev/bge/if_bge.c user/jmallett/octeon/sys/dev/bge/if_bgereg.h user/jmallett/octeon/sys/dev/bktr/bktr_core.c user/jmallett/octeon/sys/dev/bwi/if_bwi_pci.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/cxgb/common/cxgb_ael1002.c user/jmallett/octeon/sys/dev/cxgb/common/cxgb_common.h user/jmallett/octeon/sys/dev/cxgb/common/cxgb_t3_hw.c user/jmallett/octeon/sys/dev/cxgb/cxgb_adapter.h user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c user/jmallett/octeon/sys/dev/cxgb/cxgb_sge.c user/jmallett/octeon/sys/dev/e1000/if_em.c user/jmallett/octeon/sys/dev/e1000/if_igb.c user/jmallett/octeon/sys/dev/e1000/if_lem.c user/jmallett/octeon/sys/dev/fb/vesa.c user/jmallett/octeon/sys/dev/fdt/fdt_common.c user/jmallett/octeon/sys/dev/fdt/fdt_common.h user/jmallett/octeon/sys/dev/fdt/fdt_pci.c user/jmallett/octeon/sys/dev/fdt/simplebus.c user/jmallett/octeon/sys/dev/flash/mx25l.c (contents, props changed) user/jmallett/octeon/sys/dev/flash/mx25lreg.h (contents, props changed) user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.c user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.h user/jmallett/octeon/sys/dev/iicbus/iicbus.c user/jmallett/octeon/sys/dev/ipmi/ipmi_smbios.c user/jmallett/octeon/sys/dev/iwn/if_iwn.c user/jmallett/octeon/sys/dev/iwn/if_iwnreg.h user/jmallett/octeon/sys/dev/iwn/if_iwnvar.h user/jmallett/octeon/sys/dev/md/md.c user/jmallett/octeon/sys/dev/mpt/mpt.c user/jmallett/octeon/sys/dev/mpt/mpt.h user/jmallett/octeon/sys/dev/mpt/mpt_pci.c user/jmallett/octeon/sys/dev/ofw/ofw_if.m user/jmallett/octeon/sys/dev/ofw/ofw_standard.c user/jmallett/octeon/sys/dev/ofw/openfirm.c user/jmallett/octeon/sys/dev/ofw/openfirm.h user/jmallett/octeon/sys/dev/pci/pcireg.h user/jmallett/octeon/sys/dev/sec/sec.c user/jmallett/octeon/sys/dev/sge/if_sge.c user/jmallett/octeon/sys/dev/sge/if_sgereg.h user/jmallett/octeon/sys/dev/sk/if_sk.c user/jmallett/octeon/sys/dev/syscons/scvgarndr.c user/jmallett/octeon/sys/dev/tsec/if_tsec.c user/jmallett/octeon/sys/dev/tsec/if_tsec.h user/jmallett/octeon/sys/dev/twa/tw_cl.h user/jmallett/octeon/sys/dev/twa/tw_cl_share.h user/jmallett/octeon/sys/dev/uart/uart_bus_fdt.c user/jmallett/octeon/sys/dev/uart/uart_cpu_powerpc.c user/jmallett/octeon/sys/dev/usb/net/uhso.c user/jmallett/octeon/sys/dev/usb/serial/uplcom.c user/jmallett/octeon/sys/dev/usb/usbdevs user/jmallett/octeon/sys/dev/usb/wlan/if_run.c user/jmallett/octeon/sys/fs/nfs/nfs_commonport.c user/jmallett/octeon/sys/fs/nfs/nfs_var.h user/jmallett/octeon/sys/fs/nfsclient/nfs_clport.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clrpcops.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clstate.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clsubs.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clvnops.c user/jmallett/octeon/sys/fs/nfsclient/nfsnode.h user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdstate.c user/jmallett/octeon/sys/fs/unionfs/union_subr.c user/jmallett/octeon/sys/geom/cache/g_cache.h user/jmallett/octeon/sys/i386/conf/GENERIC.hints user/jmallett/octeon/sys/i386/conf/NOTES user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/i386/include/clock.h user/jmallett/octeon/sys/i386/include/cpu.h user/jmallett/octeon/sys/i386/include/pmap.h user/jmallett/octeon/sys/ia64/acpica/acpi_machdep.c user/jmallett/octeon/sys/ia64/ia64/autoconf.c user/jmallett/octeon/sys/ia64/ia64/mca.c user/jmallett/octeon/sys/ia64/include/md_var.h user/jmallett/octeon/sys/isa/syscons_isa.c user/jmallett/octeon/sys/kern/kern_clock.c user/jmallett/octeon/sys/kern/kern_exec.c user/jmallett/octeon/sys/kern/kern_ktrace.c user/jmallett/octeon/sys/kern/kern_resource.c user/jmallett/octeon/sys/kern/kern_sig.c user/jmallett/octeon/sys/kern/kern_tc.c user/jmallett/octeon/sys/kern/kern_thread.c user/jmallett/octeon/sys/kern/sched_ule.c user/jmallett/octeon/sys/kern/subr_prf.c user/jmallett/octeon/sys/kern/subr_trap.c user/jmallett/octeon/sys/kern/subr_unit.c user/jmallett/octeon/sys/kern/uipc_mbuf.c user/jmallett/octeon/sys/kern/vfs_bio.c user/jmallett/octeon/sys/kern/vfs_syscalls.c user/jmallett/octeon/sys/mips/atheros/ar71xxreg.h user/jmallett/octeon/sys/mips/atheros/if_arge.c user/jmallett/octeon/sys/mips/atheros/if_argevar.h user/jmallett/octeon/sys/mips/conf/XLRN32 user/jmallett/octeon/sys/mips/include/asm.h user/jmallett/octeon/sys/mips/include/clock.h user/jmallett/octeon/sys/mips/include/cpu.h user/jmallett/octeon/sys/mips/include/cpuregs.h user/jmallett/octeon/sys/mips/include/db_machdep.h user/jmallett/octeon/sys/mips/include/md_var.h user/jmallett/octeon/sys/mips/include/runq.h user/jmallett/octeon/sys/mips/include/tlb.h user/jmallett/octeon/sys/mips/mips/cache_mipsNN.c user/jmallett/octeon/sys/mips/mips/cpu.c user/jmallett/octeon/sys/mips/mips/db_trace.c user/jmallett/octeon/sys/mips/mips/exception.S user/jmallett/octeon/sys/mips/mips/fp.S user/jmallett/octeon/sys/mips/mips/locore.S user/jmallett/octeon/sys/mips/mips/machdep.c user/jmallett/octeon/sys/mips/mips/mpboot.S user/jmallett/octeon/sys/mips/mips/pm_machdep.c user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/psraccess.S user/jmallett/octeon/sys/mips/mips/support.S user/jmallett/octeon/sys/mips/mips/swtch.S user/jmallett/octeon/sys/mips/mips/trap.c user/jmallett/octeon/sys/mips/mips/vm_machdep.c user/jmallett/octeon/sys/mips/rmi/dev/xlr/rge.c user/jmallett/octeon/sys/mips/rmi/iodi.c user/jmallett/octeon/sys/mips/rmi/on_chip.c user/jmallett/octeon/sys/mips/rmi/xlr_machdep.c user/jmallett/octeon/sys/mips/rmi/xlr_pci.c user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c user/jmallett/octeon/sys/modules/Makefile user/jmallett/octeon/sys/modules/acpi/acpi/Makefile user/jmallett/octeon/sys/modules/cas/Makefile user/jmallett/octeon/sys/modules/hwpmc/Makefile user/jmallett/octeon/sys/modules/iwnfw/Makefile user/jmallett/octeon/sys/modules/iwnfw/iwn6000/Makefile user/jmallett/octeon/sys/modules/opensolaris/Makefile user/jmallett/octeon/sys/modules/sound/driver/Makefile user/jmallett/octeon/sys/modules/zfs/Makefile user/jmallett/octeon/sys/net/pfil.h user/jmallett/octeon/sys/net/radix.c user/jmallett/octeon/sys/netgraph/ng_ipfw.c user/jmallett/octeon/sys/netgraph/ng_pipe.c user/jmallett/octeon/sys/netgraph/ng_source.c user/jmallett/octeon/sys/netgraph/ng_source.h user/jmallett/octeon/sys/netinet/ipfw/dn_heap.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c user/jmallett/octeon/sys/netinet/libalias/alias_sctp.h user/jmallett/octeon/sys/netinet/siftr.c user/jmallett/octeon/sys/nfsclient/nfs_subs.c user/jmallett/octeon/sys/nfsclient/nfs_vnops.c user/jmallett/octeon/sys/nfsclient/nfsnode.h user/jmallett/octeon/sys/pc98/conf/GENERIC.hints user/jmallett/octeon/sys/pci/if_rl.c user/jmallett/octeon/sys/powerpc/aim/copyinout.c user/jmallett/octeon/sys/powerpc/aim/locore.S user/jmallett/octeon/sys/powerpc/aim/machdep.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c user/jmallett/octeon/sys/powerpc/aim/mp_cpudep.c user/jmallett/octeon/sys/powerpc/aim/nexus.c user/jmallett/octeon/sys/powerpc/aim/ofw_machdep.c user/jmallett/octeon/sys/powerpc/aim/platform_chrp.c user/jmallett/octeon/sys/powerpc/aim/trap.c user/jmallett/octeon/sys/powerpc/aim/vm_machdep.c user/jmallett/octeon/sys/powerpc/booke/locore.S user/jmallett/octeon/sys/powerpc/booke/machdep.c user/jmallett/octeon/sys/powerpc/booke/platform_bare.c user/jmallett/octeon/sys/powerpc/booke/pmap.c user/jmallett/octeon/sys/powerpc/booke/swtch.S user/jmallett/octeon/sys/powerpc/booke/vm_machdep.c user/jmallett/octeon/sys/powerpc/conf/DEFAULTS user/jmallett/octeon/sys/powerpc/conf/GENERIC user/jmallett/octeon/sys/powerpc/conf/MPC85XX user/jmallett/octeon/sys/powerpc/conf/NOTES user/jmallett/octeon/sys/powerpc/cpufreq/pcr.c user/jmallett/octeon/sys/powerpc/include/_align.h user/jmallett/octeon/sys/powerpc/include/_bus.h user/jmallett/octeon/sys/powerpc/include/_inttypes.h user/jmallett/octeon/sys/powerpc/include/_limits.h user/jmallett/octeon/sys/powerpc/include/_stdint.h user/jmallett/octeon/sys/powerpc/include/_types.h user/jmallett/octeon/sys/powerpc/include/asm.h user/jmallett/octeon/sys/powerpc/include/atomic.h user/jmallett/octeon/sys/powerpc/include/bus.h user/jmallett/octeon/sys/powerpc/include/cpufunc.h user/jmallett/octeon/sys/powerpc/include/db_machdep.h user/jmallett/octeon/sys/powerpc/include/elf.h user/jmallett/octeon/sys/powerpc/include/frame.h user/jmallett/octeon/sys/powerpc/include/hid.h user/jmallett/octeon/sys/powerpc/include/md_var.h user/jmallett/octeon/sys/powerpc/include/metadata.h user/jmallett/octeon/sys/powerpc/include/param.h user/jmallett/octeon/sys/powerpc/include/pcb.h user/jmallett/octeon/sys/powerpc/include/pcpu.h user/jmallett/octeon/sys/powerpc/include/pmap.h user/jmallett/octeon/sys/powerpc/include/proc.h user/jmallett/octeon/sys/powerpc/include/profile.h user/jmallett/octeon/sys/powerpc/include/psl.h user/jmallett/octeon/sys/powerpc/include/pte.h user/jmallett/octeon/sys/powerpc/include/reg.h user/jmallett/octeon/sys/powerpc/include/runq.h user/jmallett/octeon/sys/powerpc/include/smp.h user/jmallett/octeon/sys/powerpc/include/spr.h user/jmallett/octeon/sys/powerpc/include/sr.h user/jmallett/octeon/sys/powerpc/include/trap_aim.h user/jmallett/octeon/sys/powerpc/include/ucontext.h user/jmallett/octeon/sys/powerpc/include/vmparam.h user/jmallett/octeon/sys/powerpc/mpc85xx/atpic.c user/jmallett/octeon/sys/powerpc/mpc85xx/i2c.c user/jmallett/octeon/sys/powerpc/mpc85xx/lbc.c user/jmallett/octeon/sys/powerpc/mpc85xx/lbc.h user/jmallett/octeon/sys/powerpc/mpc85xx/mpc85xx.c user/jmallett/octeon/sys/powerpc/mpc85xx/mpc85xx.h user/jmallett/octeon/sys/powerpc/mpc85xx/nexus.c user/jmallett/octeon/sys/powerpc/ofw/ofw_real.c user/jmallett/octeon/sys/powerpc/ofw/ofw_syscons.c user/jmallett/octeon/sys/powerpc/powermac/grackle.c user/jmallett/octeon/sys/powerpc/powermac/hrowpic.c user/jmallett/octeon/sys/powerpc/powerpc/bcopy.c user/jmallett/octeon/sys/powerpc/powerpc/bus_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/busdma_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/cpu.c user/jmallett/octeon/sys/powerpc/powerpc/db_interface.c user/jmallett/octeon/sys/powerpc/powerpc/db_trace.c user/jmallett/octeon/sys/powerpc/powerpc/genassym.c user/jmallett/octeon/sys/powerpc/powerpc/in_cksum.c user/jmallett/octeon/sys/powerpc/powerpc/intr_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/mp_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/openpic.c user/jmallett/octeon/sys/powerpc/powerpc/setjmp.S user/jmallett/octeon/sys/powerpc/powerpc/stack_machdep.c user/jmallett/octeon/sys/powerpc/powerpc/syncicache.c user/jmallett/octeon/sys/powerpc/powerpc/sys_machdep.c user/jmallett/octeon/sys/sparc64/include/intr_machdep.h user/jmallett/octeon/sys/sparc64/sparc64/exception.S user/jmallett/octeon/sys/sparc64/sparc64/genassym.c user/jmallett/octeon/sys/sun4v/conf/DEFAULTS user/jmallett/octeon/sys/sun4v/include/intr_machdep.h user/jmallett/octeon/sys/sun4v/sun4v/exception.S user/jmallett/octeon/sys/sys/cdefs.h user/jmallett/octeon/sys/sys/elf_common.h user/jmallett/octeon/sys/sys/ktrace.h user/jmallett/octeon/sys/sys/param.h user/jmallett/octeon/sys/sys/pcpu.h user/jmallett/octeon/sys/sys/proc.h user/jmallett/octeon/sys/sys/resource.h user/jmallett/octeon/sys/sys/resourcevar.h user/jmallett/octeon/sys/sys/signalvar.h user/jmallett/octeon/sys/sys/sysctl.h user/jmallett/octeon/sys/sys/systm.h user/jmallett/octeon/sys/vm/vm_page.c user/jmallett/octeon/sys/vm/vm_page.h user/jmallett/octeon/sys/x86/isa/atrtc.c user/jmallett/octeon/sys/x86/isa/clock.c user/jmallett/octeon/sys/x86/x86/local_apic.c user/jmallett/octeon/tools/tools/ncpus/biosmptable.c user/jmallett/octeon/usr.bin/calendar/calendars/calendar.freebsd user/jmallett/octeon/usr.bin/col/col.c user/jmallett/octeon/usr.bin/gcore/elfcore.c user/jmallett/octeon/usr.bin/gcore/extern.h user/jmallett/octeon/usr.bin/gcore/gcore.1 user/jmallett/octeon/usr.bin/gcore/gcore.c user/jmallett/octeon/usr.bin/getopt/getopt.1 user/jmallett/octeon/usr.bin/ktrace/ktrace.1 user/jmallett/octeon/usr.bin/make/str.c user/jmallett/octeon/usr.bin/netstat/if.c user/jmallett/octeon/usr.bin/systat/vmstat.c user/jmallett/octeon/usr.bin/xlint/lint1/mem1.c user/jmallett/octeon/usr.sbin/acpi/acpidump/acpi_user.c user/jmallett/octeon/usr.sbin/acpi/iasl/Makefile user/jmallett/octeon/usr.sbin/config/config.8 user/jmallett/octeon/usr.sbin/config/config.y user/jmallett/octeon/usr.sbin/config/configvers.h user/jmallett/octeon/usr.sbin/config/main.c user/jmallett/octeon/usr.sbin/config/mkmakefile.c user/jmallett/octeon/usr.sbin/config/mkoptions.c user/jmallett/octeon/usr.sbin/crunch/crunchide/Makefile user/jmallett/octeon/usr.sbin/crunch/crunchide/exec_elf32.c user/jmallett/octeon/usr.sbin/fifolog/lib/fifolog_reader.c user/jmallett/octeon/usr.sbin/freebsd-update/freebsd-update.8 user/jmallett/octeon/usr.sbin/jls/jls.c user/jmallett/octeon/usr.sbin/mountd/exports.5 user/jmallett/octeon/usr.sbin/nfsdumpstate/nfsdumpstate.c user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/Makefile user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-config.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/Makefile user/jmallett/octeon/usr.sbin/pc-sysinstall/backend/functions-ftp.sh user/jmallett/octeon/usr.sbin/pc-sysinstall/doc/help-index user/jmallett/octeon/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8 user/jmallett/octeon/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh user/jmallett/octeon/usr.sbin/sysinstall/Makefile user/jmallett/octeon/usr.sbin/sysinstall/devices.c user/jmallett/octeon/usr.sbin/sysinstall/install.c user/jmallett/octeon/usr.sbin/sysinstall/install.cfg user/jmallett/octeon/usr.sbin/sysinstall/label.c user/jmallett/octeon/usr.sbin/sysinstall/menus.c user/jmallett/octeon/usr.sbin/sysinstall/msg.c user/jmallett/octeon/usr.sbin/sysinstall/network.c user/jmallett/octeon/usr.sbin/sysinstall/sysinstall.h user/jmallett/octeon/usr.sbin/tzsetup/tzsetup.c user/jmallett/octeon/usr.sbin/uhsoctl/uhsoctl.c Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/cddl/contrib/opensolaris/ (props changed) user/jmallett/octeon/share/mk/bsd.arch.inc.mk (props changed) user/jmallett/octeon/sys/cddl/contrib/opensolaris/ (props changed) user/jmallett/octeon/sys/contrib/dev/acpica/ (props changed) Modified: user/jmallett/octeon/Makefile.inc1 ============================================================================== --- user/jmallett/octeon/Makefile.inc1 Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/Makefile.inc1 Tue Jul 20 04:46:04 2010 (r210278) @@ -128,7 +128,7 @@ TARGET= ${TARGET_ARCH} TARGET?= ${MACHINE} TARGET_ARCH?= ${MACHINE_ARCH} -KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -262,34 +262,47 @@ WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 +.if ${TARGET_ARCH} == "amd64" .if empty(TARGET_CPUTYPE) LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 .else LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif -LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ +LIB32CPUFLAGS+= -mfancy-math-387 +LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ + MACHINE_CPU="i686 mmx sse sse2" \ + LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="${AS} --32" + +.elif ${TARGET_ARCH} == "powerpc64" +.if empty(TARGET_CPUTYPE) +LIB32CPUFLAGS= -mcpu=powerpc +.else +LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} +.endif +LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc \ + LD="${LD} -m elf32ppc" +.endif + + +LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \ -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 # Yes, the flags are redundant. -LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ VERSION="${VERSION}" \ - MACHINE=i386 \ - MACHINE_ARCH=i386 \ - MACHINE_CPU="i686 mmx sse sse2" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ CC="${CC} ${LIB32FLAGS}" \ CXX="${CXX} ${LIB32FLAGS}" \ OBJC="${OBJC} ${LIB32FLAGS}" \ - LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ - AS="${AS} --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 @@ -336,7 +349,7 @@ _worldtmp: @echo "--------------------------------------------------------------" .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} -.if ${TARGET_ARCH} == "amd64" +.if defined(LIB32TMP) rm -rf ${LIB32TMP} .endif .else @@ -380,7 +393,7 @@ _cleanobj: @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} -.if ${TARGET_ARCH} == "amd64" +.if defined(LIB32TMP) ${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/} .endif .endif @@ -428,7 +441,7 @@ everything: @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all -.if ${TARGET_ARCH} == "amd64" +.if defined(LIB32TMP) build32: @echo @echo "--------------------------------------------------------------" @@ -510,7 +523,7 @@ WMAKE_TGTS+= _cleanobj _obj _build-tools WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" +.if defined(LIB32TMP) && ${MK_LIB32} != "no" WMAKE_TGTS+= build32 .endif @@ -660,7 +673,7 @@ reinstall: @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" +.if defined(LIB32TMP) && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif @@ -669,7 +682,7 @@ redistribute: @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute -.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" +.if defined(LIB32TMP) && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \ DISTRIBUTION=lib32 .endif @@ -705,8 +718,12 @@ KERNCONF=${KERNFAST} KERNCONF= ${KERNEL} KERNWARN= .else +.if ${TARGET_ARCH} == "powerpc64" +KERNCONF?= GENERIC64 +.else KERNCONF?= GENERIC .endif +.endif INSTKERNNAME?= kernel KERNSRCDIR?= ${.CURDIR}/sys @@ -1108,8 +1125,12 @@ _prereq_libs= gnu/lib/libssp/libssp_nons # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_ARCH}-elf +.elif exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) _startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf +.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) +_startup_libs+= lib/csu/${MACHINE_ARCH} .else _startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif @@ -1456,9 +1477,11 @@ _xi-links: DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) -FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \ +.if exists(${KERNCONFDIR}/${KERNCONF}) +FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \ ${KERNCONFDIR}/${KERNCONF} .endif +.endif .endif Modified: user/jmallett/octeon/ObsoleteFiles.inc ============================================================================== --- user/jmallett/octeon/ObsoleteFiles.inc Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/ObsoleteFiles.inc Tue Jul 20 04:46:04 2010 (r210278) @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100706: removed pc-sysinstall's detect-vmware.sh +OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh # 20100701: [powerpc] removed .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/intr.h Modified: user/jmallett/octeon/UPDATING ============================================================================== --- user/jmallett/octeon/UPDATING Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/UPDATING Tue Jul 20 04:46:04 2010 (r210278) @@ -23,6 +23,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. ln -s aj /etc/malloc.conf.) +20100713: + Due to the import of powerpc64 support, all existing powerpc kernel + configuration files must be updated with a machine directive like this: + machine powerpc powerpc + + In addition, an updated config(8) is required to build powerpc kernels + after this change. + +20100713: + A new version of ZFS (version 15) has been merged to -HEAD. + This version uses a python library for the following subcommands: + zfs allow, zfs unallow, zfs groupspace, zfs userspace. + For full functionality of these commands the following port must + be installed: sysutils/py-zfs + 20100429: 'vm_page's are now hashed by physical address to an array of mutexes. Currently this is only used to serialize access to hold_count. Over @@ -964,6 +979,22 @@ COMMON ITEMS: path, and has the highest probability of being successful. Please try this approach before reporting problems with a major version upgrade. + ZFS notes + --------- + When upgrading the boot ZFS pool to a new version, always follow + these two steps: + + 1.) recompile and reinstall the ZFS boot loader and boot block + (this is part of "make buildworld" and "make installworld") + + 2.) update the ZFS boot block on your boot drive + + The following example updates the ZFS boot block on the first + partition (freebsd-boot) of a GPT partitioned drive ad0: + "gpart bootcode -p /boot/gptzfsboot -i 1 ad0" + + Non-boot pools do not need these updates. + To build a kernel ----------------- If you are updating from a prior version of FreeBSD (even one just Modified: user/jmallett/octeon/bin/pkill/pkill.1 ============================================================================== --- user/jmallett/octeon/bin/pkill/pkill.1 Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/bin/pkill/pkill.1 Tue Jul 20 04:46:04 2010 (r210278) @@ -53,7 +53,7 @@ .Ar pattern ... .Nm pkill .Op Fl Ar signal -.Op Fl ILafinovx +.Op Fl ILafilnovx .Op Fl F Ar pidfile .Op Fl G Ar gid .Op Fl M Ar core Modified: user/jmallett/octeon/bin/sh/parser.c ============================================================================== --- user/jmallett/octeon/bin/sh/parser.c Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/bin/sh/parser.c Tue Jul 20 04:46:04 2010 (r210278) @@ -554,6 +554,7 @@ TRACE(("expecting DO got %s %s\n", tokna checkkwd = 1; break; /* Handle an empty command like other simple commands. */ + case TBACKGND: case TSEMI: case TAND: case TOR: @@ -609,8 +610,7 @@ simplecmd(union node **rpp, union node * { union node *args, **app; union node **orig_rpp = rpp; - union node *n = NULL, *n2; - int negate = 0; + union node *n = NULL; /* If we don't have any redirections already, then we must reset */ /* rpp to be the address of the local redir variable. */ @@ -626,12 +626,6 @@ simplecmd(union node **rpp, union node * */ orig_rpp = rpp; - while (readtoken() == TNOT) { - TRACE(("command: TNOT recognized\n")); - negate = !negate; - } - tokpushback++; - for (;;) { if (readtoken() == TWORD) { n = (union node *)stalloc(sizeof (struct narg)); @@ -657,7 +651,7 @@ simplecmd(union node **rpp, union node * n->type = NDEFUN; n->narg.next = command(); funclinno = 0; - goto checkneg; + return n; } else { tokpushback++; break; @@ -670,16 +664,7 @@ simplecmd(union node **rpp, union node * n->ncmd.backgnd = 0; n->ncmd.args = args; n->ncmd.redirect = redir; - -checkneg: - if (negate) { - n2 = (union node *)stalloc(sizeof (struct nnot)); - n2->type = NNOT; - n2->nnot.com = n; - return n2; - } - else - return n; + return n; } STATIC union node * Modified: user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h ============================================================================== --- user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/cddl/compat/opensolaris/include/mnttab.h Tue Jul 20 04:46:04 2010 (r210278) @@ -3,10 +3,13 @@ #ifndef _OPENSOLARIS_MNTTAB_H_ #define _OPENSOLARIS_MNTTAB_H_ +#include +#include + #include #include -#define MNTTAB _PATH_DEVNULL +#define MNTTAB _PATH_DEVZERO #define MNT_LINE_MAX 1024 #define umount2(p, f) unmount(p, f) @@ -17,7 +20,12 @@ struct mnttab { char *mnt_fstype; char *mnt_mntopts; }; +#define extmnttab mnttab int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp); +int getmntent(FILE *fp, struct mnttab *mp); +char *hasmntopt(struct mnttab *mnt, char *opt); + +void statfs2mnttab(struct statfs *sfs, struct mnttab *mp); #endif /* !_OPENSOLARIS_MNTTAB_H_ */ Modified: user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c ============================================================================== --- user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/cddl/compat/opensolaris/misc/fsshare.c Tue Jul 20 04:46:04 2010 (r210278) @@ -110,11 +110,11 @@ getline(FILE *fd, const char *skip) * * Recognized keywords: * - * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet + * ro, maproot, mapall, mask, network, sec, alldirs, public, webnfs, index, quiet * */ static const char *known_opts[] = { "ro", "maproot", "mapall", "mask", - "network", "alldirs", "public", "webnfs", "index", "quiet", NULL }; + "network", "sec", "alldirs", "public", "webnfs", "index", "quiet", NULL }; static char * translate_opts(const char *shareopts) { Modified: user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c ============================================================================== --- user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/cddl/compat/opensolaris/misc/mnttab.c Tue Jul 20 04:46:04 2010 (r210278) @@ -36,6 +36,9 @@ __FBSDID("$FreeBSD$"); #include #include #include + +#include +#include #include #include #include @@ -88,75 +91,126 @@ optadd(char *mntopts, size_t size, const strlcat(mntopts, opt, size); } -int -getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp) +void +statfs2mnttab(struct statfs *sfs, struct mnttab *mp) { - static struct statfs *sfs = NULL; static char mntopts[MNTMAXSTR]; - struct opt *o; - long i, n, flags; + long flags; - if (sfs != NULL) { - free(sfs); - sfs = NULL; - } mntopts[0] = '\0'; - n = getfsstat(NULL, 0, MNT_NOWAIT); - if (n == -1) - return (-1); - n = sizeof(*sfs) * (n + 8); - sfs = malloc(n); - if (sfs == NULL) - return (-1); - n = getfsstat(sfs, n, MNT_WAIT); - if (n == -1) { - free(sfs); - sfs = NULL; - return (-1); + flags = sfs->f_flags; +#define OPTADD(opt) optadd(mntopts, sizeof(mntopts), (opt)) + if (flags & MNT_RDONLY) + OPTADD(MNTOPT_RO); + else + OPTADD(MNTOPT_RW); + if (flags & MNT_NOSUID) + OPTADD(MNTOPT_NOSUID); + else + OPTADD(MNTOPT_SETUID); + if (flags & MNT_UPDATE) + OPTADD(MNTOPT_REMOUNT); + if (flags & MNT_NOATIME) + OPTADD(MNTOPT_NOATIME); + else + OPTADD(MNTOPT_ATIME); + OPTADD(MNTOPT_NOXATTR); + if (flags & MNT_NOEXEC) + OPTADD(MNTOPT_NOEXEC); + else + OPTADD(MNTOPT_EXEC); +#undef OPTADD + mp->mnt_special = sfs->f_mntfromname; + mp->mnt_mountp = sfs->f_mntonname; + mp->mnt_fstype = sfs->f_fstypename; + mp->mnt_mntopts = mntopts; +} + +static struct statfs *gsfs = NULL; +static int allfs = 0; + +static int +statfs_init(void) +{ + struct statfs *sfs; + int error; + + if (gsfs != NULL) { + free(gsfs); + gsfs = NULL; } - for (i = 0; i < n; i++) { + allfs = getfsstat(NULL, 0, MNT_WAIT); + if (allfs == -1) + goto fail; + gsfs = malloc(sizeof(gsfs[0]) * allfs * 2); + if (gsfs == NULL) + goto fail; + allfs = getfsstat(gsfs, (long)(sizeof(gsfs[0]) * allfs * 2), + MNT_WAIT); + if (allfs == -1) + goto fail; + sfs = realloc(gsfs, allfs * sizeof(gsfs[0])); + if (sfs != NULL) + gsfs = sfs; + return (0); +fail: + error = errno; + if (gsfs != NULL) + free(gsfs); + gsfs = NULL; + allfs = 0; + return (error); +} + +int +getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp) +{ + struct statfs *sfs; + int i, error; + + error = statfs_init(); + if (error != 0) + return (error); + + for (i = 0; i < allfs; i++) { if (mrefp->mnt_special != NULL && - strcmp(mrefp->mnt_special, sfs[i].f_mntfromname) != 0) { + strcmp(mrefp->mnt_special, gsfs[i].f_mntfromname) != 0) { continue; } if (mrefp->mnt_mountp != NULL && - strcmp(mrefp->mnt_mountp, sfs[i].f_mntonname) != 0) { + strcmp(mrefp->mnt_mountp, gsfs[i].f_mntonname) != 0) { continue; } if (mrefp->mnt_fstype != NULL && - strcmp(mrefp->mnt_fstype, sfs[i].f_fstypename) != 0) { + strcmp(mrefp->mnt_fstype, gsfs[i].f_fstypename) != 0) { continue; } - flags = sfs[i].f_flags; -#define OPTADD(opt) optadd(mntopts, sizeof(mntopts), (opt)) - if (flags & MNT_RDONLY) - OPTADD(MNTOPT_RO); - else - OPTADD(MNTOPT_RW); - if (flags & MNT_NOSUID) - OPTADD(MNTOPT_NOSUID); - else - OPTADD(MNTOPT_SETUID); - if (flags & MNT_UPDATE) - OPTADD(MNTOPT_REMOUNT); - if (flags & MNT_NOATIME) - OPTADD(MNTOPT_NOATIME); - else - OPTADD(MNTOPT_ATIME); - OPTADD(MNTOPT_NOXATTR); - if (flags & MNT_NOEXEC) - OPTADD(MNTOPT_NOEXEC); - else - OPTADD(MNTOPT_EXEC); -#undef OPTADD - mgetp->mnt_special = sfs[i].f_mntfromname; - mgetp->mnt_mountp = sfs[i].f_mntonname; - mgetp->mnt_fstype = sfs[i].f_fstypename; - mgetp->mnt_mntopts = mntopts; + statfs2mnttab(&gsfs[i], mgetp); return (0); } - free(sfs); - sfs = NULL; return (-1); } + +int +getmntent(FILE *fp, struct mnttab *mp) +{ + struct statfs *sfs; + int error, nfs; + + nfs = (int)lseek(fileno(fp), 0, SEEK_CUR); + if (nfs == -1) + return (errno); + /* If nfs is 0, we want to refresh out cache. */ + if (nfs == 0 || gsfs == NULL) { + error = statfs_init(); + if (error != 0) + return (error); + } + if (nfs >= allfs) + return (-1); + statfs2mnttab(&gsfs[nfs], mp); + if (lseek(fileno(fp), 1, SEEK_CUR) == -1) + return (errno); + return (0); +} Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.8 Tue Jul 20 04:46:04 2010 (r210278) @@ -1,23 +1,8 @@ '\" te -.\" CDDL HEADER START -.\" -.\" The contents of this file are subject to the terms of the -.\" Common Development and Distribution License (the "License"). -.\" You may not use this file except in compliance with the License. -.\" -.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -.\" or http://www.opensolaris.org/os/licensing. -.\" See the License for the specific language governing permissions -.\" and limitations under the License. -.\" -.\" When distributing Covered Code, include this CDDL HEADER in each -.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE. -.\" If applicable, add the following below this CDDL HEADER, with the -.\" fields enclosed by brackets "[]" replaced with your own identifying -.\" information: Portions Copyright [yyyy] [name of copyright owner] -.\" -.\" CDDL HEADER END .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved. +.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. +.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. +.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] .TH zdb 1M "31 Oct 2005" "SunOS 5.11" "System Administration Commands" .SH NAME zdb \- ZFS debugger Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jul 20 04:16:51 2010 (r210277) +++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Jul 20 04:46:04 2010 (r210278) @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -87,8 +87,8 @@ static void usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsv] [-U cachefile_path] " - "[-S user:cksumalg] " + "Usage: %s [-udibcsvL] [-U cachefile_path] [-t txg]\n" + "\t [-S user:cksumalg] " "dataset [object...]\n" " %s -C [pool]\n" " %s -l dev\n" @@ -102,12 +102,16 @@ usage(void) (void) fprintf(stderr, " -C cached pool configuration\n"); (void) fprintf(stderr, " -i intent logs\n"); (void) fprintf(stderr, " -b block statistics\n"); - (void) fprintf(stderr, " -c checksum all data blocks\n"); + (void) fprintf(stderr, " -m metaslabs\n"); + (void) fprintf(stderr, " -c checksum all metadata (twice for " + "all data) blocks\n"); (void) fprintf(stderr, " -s report stats on zdb's I/O\n"); (void) fprintf(stderr, " -S : -- " "dump blkptr signatures\n"); (void) fprintf(stderr, " -v verbose (applies to all others)\n"); (void) fprintf(stderr, " -l dump label contents\n"); + (void) fprintf(stderr, " -L disable leak tracking (do not " + "load spacemaps)\n"); (void) fprintf(stderr, " -U cachefile_path -- use alternate " "cachefile\n"); (void) fprintf(stderr, " -R read and display block from a " @@ -115,12 +119,19 @@ usage(void) (void) fprintf(stderr, " -e Pool is exported/destroyed/" "has altroot\n"); (void) fprintf(stderr, " -p (use with -e)\n"); + (void) fprintf(stderr, " -t highest txg to use when " + "searching for uberblocks\n"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); exit(1); } +/* + * Called for usage errors that are discovered after a call to spa_open(), + * dmu_bonus_hold(), or pool_match(). abort() is called for other errors. + */ + static void fatal(const char *fmt, ...) { @@ -132,7 +143,7 @@ fatal(const char *fmt, ...) va_end(ap); (void) fprintf(stderr, "\n"); - abort(); + exit(1); } static void @@ -205,7 +216,7 @@ dump_packed_nvlist(objset_t *os, uint64_ size_t nvsize = *(uint64_t *)data; char *packed = umem_alloc(nvsize, UMEM_NOFAIL); - VERIFY(0 == dmu_read(os, object, 0, nvsize, packed)); + VERIFY(0 == dmu_read(os, object, 0, nvsize, packed, DMU_READ_PREFETCH)); VERIFY(nvlist_unpack(packed, nvsize, &nv, 0) == 0); @@ -431,7 +442,7 @@ dump_spacemap(objset_t *os, space_map_ob alloc = 0; for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) { VERIFY(0 == dmu_read(os, smo->smo_object, offset, - sizeof (entry), &entry)); + sizeof (entry), &entry, DMU_READ_PREFETCH)); if (SM_DEBUG_DECODE(entry)) { (void) printf("\t\t[%4llu] %s: txg %llu, pass %llu\n", (u_longlong_t)(offset / sizeof (entry)), @@ -463,6 +474,21 @@ dump_spacemap(objset_t *os, space_map_ob } static void +dump_metaslab_stats(metaslab_t *msp) +{ + char maxbuf[5]; + space_map_t *sm = &msp->ms_map; + avl_tree_t *t = sm->sm_pp_root; + int free_pct = sm->sm_space * 100 / sm->sm_size; + + nicenum(space_map_maxsize(sm), maxbuf); + + (void) printf("\t %20s %10lu %7s %6s %4s %4d%%\n", + "segments", avl_numnodes(t), "maxsize", maxbuf, + "freepct", free_pct); +} + +static void dump_metaslab(metaslab_t *msp) { char freebuf[5]; @@ -472,22 +498,28 @@ dump_metaslab(metaslab_t *msp) nicenum(msp->ms_map.sm_size - smo->smo_alloc, freebuf); - if (dump_opt['d'] <= 5) { - (void) printf("\t%10llx %10llu %5s\n", - (u_longlong_t)msp->ms_map.sm_start, - (u_longlong_t)smo->smo_object, - freebuf); - return; - } - (void) printf( - "\tvdev %llu offset %08llx spacemap %4llu free %5s\n", + "\tvdev %5llu offset %12llx spacemap %6llu free %5s\n", (u_longlong_t)vd->vdev_id, (u_longlong_t)msp->ms_map.sm_start, (u_longlong_t)smo->smo_object, freebuf); - ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift)); + if (dump_opt['m'] > 1) { + mutex_enter(&msp->ms_lock); + VERIFY(space_map_load(&msp->ms_map, zfs_metaslab_ops, + SM_FREE, &msp->ms_smo, spa->spa_meta_objset) == 0); + dump_metaslab_stats(msp); + space_map_unload(&msp->ms_map); + mutex_exit(&msp->ms_lock); + } + + if (dump_opt['d'] > 5 || dump_opt['m'] > 2) { + ASSERT(msp->ms_map.sm_size == (1ULL << vd->vdev_ms_shift)); + + mutex_enter(&msp->ms_lock); + dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map); + mutex_exit(&msp->ms_lock); + } - dump_spacemap(spa->spa_meta_objset, smo, &msp->ms_map); } static void @@ -502,14 +534,12 @@ dump_metaslabs(spa_t *spa) for (c = 0; c < rvd->vdev_children; c++) { vd = rvd->vdev_child[c]; - (void) printf("\n vdev %llu\n\n", (u_longlong_t)vd->vdev_id); + (void) printf("\t%-10s %-19s %-15s %-10s\n", + "vdev", "offset", "spacemap", "free"); + (void) printf("\t%10s %19s %15s %10s\n", + "----------", "-------------------", + "---------------", "-------------"); - if (dump_opt['d'] <= 5) { - (void) printf("\t%10s %10s %5s\n", - "offset", "spacemap", "free"); - (void) printf("\t%10s %10s %5s\n", - "------", "--------", "----"); - } for (m = 0; m < vd->vdev_ms_count; m++) dump_metaslab(vd->vdev_ms[m]); (void) printf("\n"); @@ -517,44 +547,52 @@ dump_metaslabs(spa_t *spa) } static void +dump_dtl_seg(space_map_t *sm, uint64_t start, uint64_t size) +{ + char *prefix = (void *)sm; + + (void) printf("%s [%llu,%llu) length %llu\n", + prefix, + (u_longlong_t)start, + (u_longlong_t)(start + size), + (u_longlong_t)(size)); +} + +static void dump_dtl(vdev_t *vd, int indent) { - avl_tree_t *t = &vd->vdev_dtl_map.sm_root; - space_seg_t *ss; - vdev_t *pvd; - int c; + spa_t *spa = vd->vdev_spa; + boolean_t required; + char *name[DTL_TYPES] = { "missing", "partial", "scrub", "outage" }; + char prefix[256]; + + spa_vdev_state_enter(spa); + required = vdev_dtl_required(vd); + (void) spa_vdev_state_exit(spa, NULL, 0); if (indent == 0) (void) printf("\nDirty time logs:\n\n"); - (void) printf("\t%*s%s\n", indent, "", + (void) printf("\t%*s%s [%s]\n", indent, "", vd->vdev_path ? vd->vdev_path : - vd->vdev_parent ? vd->vdev_ops->vdev_op_type : - spa_name(vd->vdev_spa)); - - for (ss = avl_first(t); ss; ss = AVL_NEXT(t, ss)) { - /* - * Everything in this DTL must appear in all parent DTL unions. - */ - for (pvd = vd; pvd; pvd = pvd->vdev_parent) - ASSERT(vdev_dtl_contains(&pvd->vdev_dtl_map, - ss->ss_start, ss->ss_end - ss->ss_start)); - (void) printf("\t%*soutage [%llu,%llu] length %llu\n", - indent, "", - (u_longlong_t)ss->ss_start, - (u_longlong_t)ss->ss_end - 1, - (u_longlong_t)(ss->ss_end - ss->ss_start)); - } - - (void) printf("\n"); + vd->vdev_parent ? vd->vdev_ops->vdev_op_type : spa_name(spa), + required ? "DTL-required" : "DTL-expendable"); - if (dump_opt['d'] > 5 && vd->vdev_children == 0) { - dump_spacemap(vd->vdev_spa->spa_meta_objset, &vd->vdev_dtl, - &vd->vdev_dtl_map); - (void) printf("\n"); + for (int t = 0; t < DTL_TYPES; t++) { + space_map_t *sm = &vd->vdev_dtl[t]; + if (sm->sm_space == 0) + continue; + (void) snprintf(prefix, sizeof (prefix), "\t%*s%s", + indent + 2, "", name[t]); + mutex_enter(sm->sm_lock); + space_map_walk(sm, dump_dtl_seg, (void *)prefix); + mutex_exit(sm->sm_lock); + if (dump_opt['d'] > 5 && vd->vdev_children == 0) + dump_spacemap(spa->spa_meta_objset, + &vd->vdev_dtl_smo, sm); } - for (c = 0; c < vd->vdev_children; c++) + for (int c = 0; c < vd->vdev_children; c++) dump_dtl(vd->vdev_child[c], indent + 4); } @@ -668,7 +706,8 @@ visit_indirect(spa_t *spa, const dnode_p break; fill += cbp->blk_fill; } - ASSERT3U(fill, ==, bp->blk_fill); + if (!err) + ASSERT3U(fill, ==, bp->blk_fill); (void) arc_buf_remove_ref(buf, &buf); } @@ -904,6 +943,7 @@ dump_uidgid(objset_t *os, znode_phys_t * /* first find the fuid object. It lives in the master node */ VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_FUID_TABLES, 8, 1, &fuid_obj) == 0); + zfs_fuid_avl_tree_create(&idx_tree, &domain_tree); (void) zfs_fuid_table_load(os, fuid_obj, &idx_tree, &domain_tree); fuid_table_loaded = B_TRUE; @@ -1007,6 +1047,8 @@ static object_viewer_t *object_viewer[DM dump_packed_nvlist, /* FUID nvlist size */ dump_zap, /* DSL dataset next clones */ dump_zap, /* DSL scrub queue */ + dump_zap, /* ZFS user/group used */ + dump_zap, /* ZFS user/group quota */ }; static void @@ -1070,6 +1112,14 @@ dump_object(objset_t *os, uint64_t objec } if (verbosity >= 4) { + (void) printf("\tdnode flags: %s%s\n", + (dn->dn_phys->dn_flags & DNODE_FLAG_USED_BYTES) ? + "USED_BYTES " : "", + (dn->dn_phys->dn_flags & DNODE_FLAG_USERUSED_ACCOUNTED) ? + "USERUSED_ACCOUNTED " : ""); + (void) printf("\tdnode maxblkid: %llu\n", + (longlong_t)dn->dn_phys->dn_maxblkid); + object_viewer[doi.doi_bonus_type](os, object, bonus, bsize); object_viewer[doi.doi_type](os, object, NULL, 0); *print_header = 1; @@ -1124,7 +1174,7 @@ dump_dir(objset_t *os) uint64_t object, object_count; uint64_t refdbytes, usedobjs, scratch; char numbuf[8]; - char blkbuf[BP_SPRINTF_LEN]; + char blkbuf[BP_SPRINTF_LEN + 20]; char osname[MAXNAMELEN]; char *type = "UNKNOWN"; int verbosity = dump_opt['d']; @@ -1150,8 +1200,8 @@ dump_dir(objset_t *os) nicenum(refdbytes, numbuf); if (verbosity >= 4) { - (void) strcpy(blkbuf, ", rootbp "); - sprintf_blkptr(blkbuf + strlen(blkbuf), + (void) sprintf(blkbuf + strlen(blkbuf), ", rootbp "); + (void) sprintf_blkptr(blkbuf + strlen(blkbuf), BP_SPRINTF_LEN - strlen(blkbuf), os->os->os_rootbp); } else { blkbuf[0] = '\0'; @@ -1186,7 +1236,12 @@ dump_dir(objset_t *os) } dump_object(os, 0, verbosity, &print_header); - object_count = 1; + object_count = 0; + if (os->os->os_userused_dnode && + os->os->os_userused_dnode->dn_type != 0) { + dump_object(os, DMU_USERUSED_OBJECT, verbosity, &print_header); + dump_object(os, DMU_GROUPUSED_OBJECT, verbosity, &print_header); + } object = 0; while ((error = dmu_object_next(os, &object, B_FALSE, 0)) == 0) { @@ -1198,8 +1253,10 @@ dump_dir(objset_t *os) (void) printf("\n"); - if (error != ESRCH) - fatal("dmu_object_next() = %d", error); + if (error != ESRCH) { + (void) fprintf(stderr, "dmu_object_next() = %d\n", error); + abort(); + } } static void @@ -1390,7 +1447,8 @@ static space_map_ops_t zdb_space_map_ops zdb_space_map_unload, NULL, /* alloc */ zdb_space_map_claim, - NULL /* free */ + NULL, /* free */ + NULL /* maxsize */ }; static void @@ -1489,8 +1547,9 @@ zdb_count_block(spa_t *spa, zdb_cb_t *zc } } - VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, - NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); + if (!dump_opt['L']) + VERIFY(zio_wait(zio_claim(NULL, spa, spa_first_txg(spa), bp, + NULL, NULL, ZIO_FLAG_MUSTSUCCEED)) == 0); } static int @@ -1499,13 +1558,25 @@ zdb_blkptr_cb(spa_t *spa, blkptr_t *bp, { zdb_cb_t *zcb = arg; char blkbuf[BP_SPRINTF_LEN]; + dmu_object_type_t type; + boolean_t is_l0_metadata; if (bp == NULL) return (0); - zdb_count_block(spa, zcb, bp, BP_GET_TYPE(bp)); + type = BP_GET_TYPE(bp); + + zdb_count_block(spa, zcb, bp, type); - if (dump_opt['c'] || dump_opt['S']) { + /* + * if we do metadata-only checksumming there's no need to checksum + * indirect blocks here because it is done during traverse + */ + is_l0_metadata = (BP_GET_LEVEL(bp) == 0 && type < DMU_OT_NUMTYPES && + dmu_ot[type].ot_metadata); + + if (dump_opt['c'] > 1 || dump_opt['S'] || + (dump_opt['c'] && is_l0_metadata)) { int ioerr, size; void *data; @@ -1517,7 +1588,7 @@ zdb_blkptr_cb(spa_t *spa, blkptr_t *bp, free(data); /* We expect io errors on intent log */ - if (ioerr && BP_GET_TYPE(bp) != DMU_OT_INTENT_LOG) { + if (ioerr && type != DMU_OT_INTENT_LOG) { zcb->zcb_haderrors = 1; zcb->zcb_errors[ioerr]++; @@ -1565,9 +1636,12 @@ dump_block_stats(spa_t *spa) int c, e; if (!dump_opt['S']) { - (void) printf("\nTraversing all blocks to %sverify" - " nothing leaked ...\n", - dump_opt['c'] ? "verify checksums and " : ""); + (void) printf("\nTraversing all blocks %s%s%s%s%s...\n", + (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "", + (dump_opt['c'] == 1) ? "metadata " : "", + dump_opt['c'] ? "checksums " : "", + (dump_opt['c'] && !dump_opt['L']) ? "and verify " : "", + !dump_opt['L'] ? "nothing leaked " : ""); } /* @@ -1578,7 +1652,8 @@ dump_block_stats(spa_t *spa) * it's not part of any space map) is a double allocation, * reference to a freed block, or an unclaimed log block. */ - zdb_leak_init(spa); + if (!dump_opt['L']) + zdb_leak_init(spa); /* * If there's a deferred-free bplist, process that first. @@ -1620,7 +1695,8 @@ dump_block_stats(spa_t *spa) /* * Report any leaked segments. */ - zdb_leak_fini(spa); + if (!dump_opt['L']) + zdb_leak_fini(spa); /* * If we're interested in printing out the blkptr signatures, @@ -1646,14 +1722,16 @@ dump_block_stats(spa_t *spa) tzb = &zcb.zcb_type[ZB_TOTAL][DMU_OT_TOTAL]; if (tzb->zb_asize == alloc + logalloc) { - (void) printf("\n\tNo leaks (block sum matches space" - " maps exactly)\n"); + if (!dump_opt['L']) + (void) printf("\n\tNo leaks (block sum matches space" + " maps exactly)\n"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Jul 20 05:14:28 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E6151065677; Tue, 20 Jul 2010 05:14:28 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9CE8FC1B; Tue, 20 Jul 2010 05:14:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6K5ESZ5094718; Tue, 20 Jul 2010 05:14:28 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6K5ESJj094715; Tue, 20 Jul 2010 05:14:28 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201007200514.o6K5ESJj094715@svn.freebsd.org> From: Juli Mallett Date: Tue, 20 Jul 2010 05:14:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210279 - in user/jmallett/octeon/sys/mips: cavium mips X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2010 05:14:28 -0000 Author: jmallett Date: Tue Jul 20 05:14:27 2010 New Revision: 210279 URL: http://svn.freebsd.org/changeset/base/210279 Log: Fix after merge. Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c user/jmallett/octeon/sys/mips/mips/pmap.c Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octeon_mp.c Tue Jul 20 04:46:04 2010 (r210278) +++ user/jmallett/octeon/sys/mips/cavium/octeon_mp.c Tue Jul 20 05:14:27 2010 (r210279) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -95,7 +96,7 @@ platform_init_ap(int cpuid) */ clock_int_mask = hard_int_mask(5); ipi_int_mask = hard_int_mask(platform_ipi_intrnum()); - set_intr_mask(ALL_INT_MASK & ~(ipi_int_mask | clock_int_mask)); + set_intr_mask(MIPS_SR_INT_MASK & ~(ipi_int_mask | clock_int_mask)); mips_wbflush(); } Modified: user/jmallett/octeon/sys/mips/mips/pmap.c ============================================================================== --- user/jmallett/octeon/sys/mips/mips/pmap.c Tue Jul 20 04:46:04 2010 (r210278) +++ user/jmallett/octeon/sys/mips/mips/pmap.c Tue Jul 20 05:14:27 2010 (r210279) @@ -453,8 +453,6 @@ again: } } #endif - -#endif /* * Allocate segment table for the kernel */ From owner-svn-src-user@FreeBSD.ORG Thu Jul 22 07:47:51 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E565F106566B; Thu, 22 Jul 2010 07:47:50 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4E758FC1B; Thu, 22 Jul 2010 07:47:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6M7loFi081208; Thu, 22 Jul 2010 07:47:50 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6M7lowa081207; Thu, 22 Jul 2010 07:47:50 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007220747.o6M7lowa081207@svn.freebsd.org> From: Doug Barton Date: Thu, 22 Jul 2010 07:47:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210367 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2010 07:47:51 -0000 Author: dougb Date: Thu Jul 22 07:47:50 2010 New Revision: 210367 URL: http://svn.freebsd.org/changeset/base/210367 Log: First (fairly complete) version of changing the behavior of the -G option. In the original version of portmaster the concept of 2 distinct passes through the dependency tree, the first to do all the 'make config's and the second to build everything was intrinsic to the design. When released publicly there were a non-trivial number of users who objected to the idea of having 'make config' be mandatory, so I added the -G option to disable the whole first pass. However as time went on, more and more features were added that depended on the first pass, so it was necessary to rethink how -G works. In this version, the 2-pass design is now universal, and the only thing -G does is suppress the actual OPTIONS dialog. This has several benefits: 1. Now all features are available to -G users 2. The new method of suppressing the OPTIONS dialog is 100% effective (thus it's no longer necessary to use BATCH to truly suppress them 3. The --force-config option now overrides -G so users who really hate OPTIONS can have -G in their rc file, but still have it available by using --force-config on the command line Lots of variables, functions, and text have been modified to substitute out references to "config" in favor of "first pass" I'm going to finish realigning the whitespace in a different pass Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Jul 22 05:53:12 2010 (r210366) +++ user/dougb/portmaster/portmaster Thu Jul 22 07:47:50 2010 (r210367) @@ -213,7 +213,7 @@ safe_exit () { # Save state for the parent process to read back in echo "CUR_DEPS='$CUR_DEPS'" >> $IPC_SAVE echo "dep_of_deps='$dep_of_deps'" >> $IPC_SAVE - if [ -z "$CONFIG_ONLY" ]; then + if [ -z "$PM_FIRST_PASS" ]; then echo "DISPLAY_LIST='$DISPLAY_LIST'" >> $IPC_SAVE echo "INSTALLED_LIST='$INSTALLED_LIST'" >> $IPC_SAVE @@ -273,7 +273,7 @@ usage () { echo "${0##*/} [-b D|d] -e " echo "${0##*/} [-b D|d] -s" echo '' - echo "${0##*/} [--force-config] [-aftv] -F" + echo "${0##*/} [--force-config|-G] [-aftv] -F" echo '' echo "${0##*/} --clean-distfiles" echo "${0##*/} --clean-distfiles-all" @@ -287,15 +287,15 @@ usage () { echo "${0##*/} -h|--help" echo "${0##*/} --version" echo '' - echo "--force-config 'make config' for all ports" + echo "--force-config 'make config' for all ports (overrides -G)" echo "-C prevents 'make clean' from being run before building" - echo "-G prevents recursive 'make config' (overrides --force-config)" + echo "-G prevents 'make config'" echo "-H hide details of the port build and install in a log file" echo "-K prevents 'make clean' from being run after building" echo '-B prevents creation of the backup package for the installed port' echo '-b create and keep a backup package of an installed port' echo '-g create a package of the new port' - echo '-n run through configure, but do not make or install any ports' + echo '-n run through all steps, but do not make or install any ports' echo '-t recurse dependencies thoroughly, using all-depends-list' echo '-v verbose output' echo '-w save old shared libraries before deinstall' @@ -345,7 +345,7 @@ usage () { echo '-e expunge a port via pkg_delete, and remove its distfiles' echo '-s clean out stale ports that used to be depended on' echo '' - echo '[--force-config] [-aftv] -F fetch distfiles only (mutually exclusive of -G)' + echo '[--force-config|-G] [-aftv] -F fetch distfiles only' echo '' echo '--clean-distfiles offer to delete stale distfiles' echo '--clean-distfiles-all delete stale distfiles without prompting' @@ -368,7 +368,7 @@ pm_cd_pd () { builtin cd $pd/$1 2>/dev/ fail "Cannot cd to port directory: $pd/$1"; } pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; - unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; + unset -v MASTER_RB_LIST PM_FP_SEEN_LIST; nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_make_b () { /usr/bin/make $PM_MAKE_ARGS BEFOREPORTMK=bpm $*; } pm_mktemp () { /usr/bin/mktemp -t f-${PM_PARENT_PID}-$1 || @@ -384,7 +384,7 @@ pm_find_s () { $PM_SU_CMD /usr/b pm_install_s () { $PM_SU_CMD /usr/bin/install -o root \ -g wheel -m 644 $1 $2; } pm_make_s () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; - unset -v MASTER_RB_LIST CONFIG_SEEN_LIST; + unset -v MASTER_RB_LIST PM_FP_SEEN_LIST; $PM_SU_CMD nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_mkdir_s () { $PM_SU_CMD /bin/mkdir -p $1; } pm_pkg_delete_s () { $PM_SU_CMD /usr/sbin/pkg_delete $*; } @@ -478,7 +478,7 @@ for var in "$@" ; do --check-port-dbdir) CHECK_PORT_DBDIR=check_port_dbdir ;; --list-origins) LIST_ORIGINS=list_origins ;; --show-work) SHOW_WORK=show ; RECURSE_THOROUGH=thorough ;; - --force-config) export FORCE_CONFIG=force_config ;; + --force-config) export PM_FORCE_CONFIG=pm_force_config ;; --*) echo "Illegal option $var" ; echo '' echo "===>>> Try ${0##*/} --help"; exit 1 ;; *) newopts="$newopts $var" ;; @@ -1092,7 +1092,8 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop C) DONT_PRE_CLEAN=Copt; ARGS="-C $ARGS" ;; D) DONT_SCRUB_DISTFILES=Dopt; ARGS="-D $ARGS" ;; F) FETCH_ONLY=Fopt; ARGS="-F $ARGS" ;; - G) NO_RECURSIVE_CONFIG=Gopt; ARGS="-G $ARGS" ;; + G) [ -z "$PM_FORCE_CONFIG" ] && { + PM_NO_MAKE_CONFIG=Gopt; ARGS="-G $ARGS"; } ;; H) HIDE_BUILD=Hopt; ARGS="-H $ARGS" ;; K) DONT_POST_CLEAN=Kopt; ARGS="-K $ARGS" ;; L) LIST_PLUS=Lopt ;; @@ -1171,15 +1172,9 @@ if [ -n "$ALWAYS_SCRUB_DISTFILES" -a -n test_command_line ALWAYS_SCRUB_DISTFILES DONT_SCRUB_DISTFILES || fail "The -d and -D options are mutually exclusive" fi -if [ -n "$NO_RECURSIVE_CONFIG" ]; then - [ -n "$FETCH_ONLY" ] && unset NO_RECURSIVE_CONFIG - [ -n "$PM_PACKAGES_BUILD" ] && - fail 'The --packages-build and -G options are mutually exclusive' - [ -n "$PM_DEL_BUILD_ONLY" ] && - fail 'The --delete-build-only and -G options are mutually exclusive' - [ -n "$FORCE_CONFIG" ] && - fail 'The --force-config and -G options are mutually exclusive' -fi + +[ -n "$PM_NO_MAKE_CONFIG" -a -n "$PM_FORCE_CONFIG" ] && unset PM_NO_MAKE_CONFIG + if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then if [ -n "$FETCH_ONLY" -o -n "$RESTART" -o -n "$UPDATE_ALL" -o \ -n "$EXPUNGE" -o -n "$PM_FORCE" -o -n "$NO_ACTION" -o \ @@ -1985,18 +1980,18 @@ update_port () { [ -n "$2" ] && update_to=" to $2" echo "===>>> Launching child to update ${1#$pd/}${update_to}" - if [ -z "$NO_RECURSIVE_CONFIG" ]; then +# local deps dep_of_deps=$(( $dep_of_deps + 1 )) - if [ -n "$CONFIG_ONLY" ]; then + if [ -n "$PM_FIRST_PASS" ]; then num_of_deps=$(( $num_of_deps + 1 )) update_build_l $1 fi deps=" (${dep_of_deps}/${num_of_deps})" - fi +# if [ -n "$PM_DEPTH" ]; then echo " ${PM_DEPTH}>> ${1#$pd/}" @@ -2008,10 +2003,10 @@ update_port () { fi [ -n "$doing_dep_check" -o \ - \( -n "$UPDATE_ALL" -a -n "$CONFIG_ONLY" \) ] && + \( -n "$UPDATE_ALL" -a -n "$PM_FIRST_PASS" \) ] && unset NO_DEP_UPDATES - if [ -z "$NO_ACTION" -o -n "$CONFIG_ONLY" ]; then + if [ -z "$NO_ACTION" -o -n "$PM_FIRST_PASS" ]; then ($0 $ARGS $1) || fail "Update for $1 failed" . $IPC_SAVE else @@ -2025,8 +2020,8 @@ update_port () { echo '' elif [ -n "$UPDATE_REQ_BYS" ]; then return 0 - elif [ -n "$CONFIG_ONLY" -a -z "$PM_PACKAGES" ]; then - echo "===>>> Continuing 'make config' dependency check for $portdir" + elif [ -n "$PM_FIRST_PASS" -a -z "$PM_PACKAGES" ]; then + echo "===>>> Continuing initial dependency check for $portdir" else term_printf " ${PM_DEPTH#* }${deps}" echo "===>>> Returning to dependency check for $portdir" @@ -2106,9 +2101,9 @@ dependency_check () { else if [ -n "$SHOW_WORK" ]; then echo '' - elif [ -n "$CONFIG_ONLY" -a -z "$PM_PACKAGES" ]; then - echo "===>>> Starting recursive 'make config' check" - else +# +# + elif [ -z "$PM_VERBOSE" ]; then echo "===>>> Starting dependency check" fi fi @@ -2153,7 +2148,7 @@ dependency_check () { local d_port origin iport udf # Do not export, for THIS parent process only - [ -n "$CONFIG_ONLY" ] && doing_dep_check=doing_dep_check + [ -n "$PM_FIRST_PASS" ] && doing_dep_check=doing_dep_check for d_port in $d_port_list; do origin="${d_port#$pd/}" if [ -n "$SHOW_WORK" ]; then @@ -2169,8 +2164,8 @@ dependency_check () { echo "===>>> Checking dependency: $origin" # Do this first to catch out of date dependencies - if [ -n "$CONFIG_ONLY" ]; then - case "$CONFIG_SEEN_LIST" in *:${origin}:*) continue ;; esac + if [ -n "$PM_FIRST_PASS" ]; then + case "$PM_FP_SEEN_LIST" in *:${origin}:*) continue ;; esac fi [ -z "$URB_YES" ] && @@ -2242,22 +2237,22 @@ dependency_check () { update_port $origin fi done - [ -n "$CONFIG_ONLY" ] && unset doing_dep_check + [ -n "$PM_FIRST_PASS" ] && unset doing_dep_check if [ -n "$SHOW_WORK" ]; then safe_exit - elif [ -n "$CONFIG_ONLY" -a -z "$PM_PACKAGES" ]; then - echo "===>>> Recursive 'make config' check complete for $portdir" + elif [ -n "$PM_FIRST_PASS" -a -z "$PM_PACKAGES" ]; then + echo "===>>> Initial dependency check complete for $portdir" case "$PM_DEPTH" in *\>\>*) echo " $PM_DEPTH" ;; esac else echo "===>>> Dependency check complete for $portdir" case "$PM_DEPTH" in *\>\>*) echo " $PM_DEPTH" ;; *) if [ "$PM_PARENT_PORT" = All ]; then - if [ -z "$NO_RECURSIVE_CONFIG" ]; then +# local deps deps=" (${dep_of_deps}/${num_of_deps})" - fi +# term_printf " >> ${upg_port:-$portdir}${deps}" else term_printf @@ -2279,7 +2274,7 @@ create_master_rb_list () { [ -n "$MASTER_RB_LIST" ] && export MASTER_RB_LIST=" $MASTER_RB_LIST" } -post_config () { +post_first_pass () { local action if [ $num_of_deps -gt 0 ]; then @@ -2316,7 +2311,7 @@ echo " all of the above try adding echo "===>>> Starting $action for $* <<<===" echo '' - unset CONFIG_SEEN_LIST CONFIG_ONLY + unset PM_FP_SEEN_LIST PM_FIRST_PASS dep_of_deps=0 @@ -2408,7 +2403,7 @@ multiport () { echo "===>>> Working on multiple ports:" echo -e $portlist - if [ -n "$CONFIG_ONLY" ]; then + if [ -n "$PM_FIRST_PASS" ]; then if [ -n "$PM_BUILD_ONLY_LIST" ]; then PM_BUILD_ONLY_LIST=pmp_doing_build_deps for port in $worklist; do @@ -2429,7 +2424,7 @@ multiport () { done check_fetch_only - post_config multiple ports + post_first_pass multiple ports fi export PM_BUILDING=pmbuildingmultiport @@ -2455,8 +2450,10 @@ multiport () { } make_config () { + local config_type + config_type=config-conditional - [ -n "$FORCE_CONFIG" ] && config_type=config + [ -n "$PM_FORCE_CONFIG" ] && config_type=config pm_sv Running \'make $config_type\' pm_cd_pd $portdir pm_make_s $config_type @@ -2517,10 +2514,10 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S fi fi - if [ -z "$NO_RECURSIVE_CONFIG" ]; then - CONFIG_SEEN_LIST=':' ; CONFIG_ONLY=config_only +# + PM_FP_SEEN_LIST=':' ; PM_FIRST_PASS=pm_first_pass NO_DEP_UPDATES=no_dep_updates ; build_l='' - export CONFIG_SEEN_LIST CONFIG_ONLY NO_DEP_UPDATES build_l + export PM_FP_SEEN_LIST PM_FIRST_PASS NO_DEP_UPDATES build_l if [ -n "$PM_BUILD_ONLY_LIST" ]; then run_dl_g='' ; build_only_dl_g='' ; rundep_list='' @@ -2529,7 +2526,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S if [ -n "$PM_DEL_BUILD_ONLY" ]; then build_deps_il='' ; export build_deps_il fi - fi +# [ -z "$NO_BACKUP" ] && init_packages [ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE @@ -2558,7 +2555,7 @@ fi # This has to come after the initialization, it uses all the same stuff if [ -n "$UPDATE_ALL" ]; then -all_config () { +all_first_pass () { local iport origin for iport in $@; do @@ -2580,7 +2577,7 @@ all_config () { CUR_DEPS="${CUR_DEPS}${iport}:"; continue; } - case "$CONFIG_SEEN_LIST" in *:${origin}:*) continue ;; esac + case "$PM_FP_SEEN_LIST" in *:${origin}:*) continue ;; esac [ -n "$PM_BUILD_ONLY_LIST" ] && run_dl_g="$run_dl_g ${pd}/${origin} " @@ -2590,7 +2587,7 @@ all_config () { PM_DEPTH= check_for_updates $iport $origin || fail 'Update failed' - CONFIG_SEEN_LIST="${CONFIG_SEEN_LIST}${origin}:" + PM_FP_SEEN_LIST="${PM_FP_SEEN_LIST}${origin}:" done } [ -n "$DI_FILES" ] && (read_distinfos)& @@ -2603,23 +2600,21 @@ all_config () { [ -n "$PM_BUILD_ONLY_LIST" ] && PM_BUILD_ONLY_LIST=pmp_doing_build_deps - if [ -n "$CONFIG_ONLY" ]; then + if [ -n "$PM_FIRST_PASS" ]; then [ -n "$FETCH_ONLY" ] && export ALL_FETCH=all_fetch - [ -z "$PM_PACKAGES" ] && - echo "===>>> Checking ports for recursive 'make config'" [ -n "$PM_VERBOSE" ] && { echo '' ; echo "===>>> Root ports:"; } - all_config $roots + all_first_pass $roots [ -n "$PM_VERBOSE" ] && { echo '' ; echo "===>>> Trunk ports:"; } - all_config $trunks + all_first_pass $trunks [ -n "$PM_VERBOSE" ] && { echo '' ; echo "===>>> Branch ports:"; } - all_config $branches + all_first_pass $branches [ -n "$PM_VERBOSE" ] && { echo '' ; echo "===>>> Leaf ports:"; } - all_config $leaves + all_first_pass $leaves check_fetch_only if [ -n "$NO_DEP_UPDATES" ]; then @@ -2627,7 +2622,7 @@ all_config () { safe_exit fi - post_config for ports that need updating + post_first_pass for ports that need updating [ -n "$PM_BUILD_ONLY_LIST" ] && clean_build_only_list fi @@ -2654,15 +2649,15 @@ all_config () { continue fi - if [ -z "$NO_RECURSIVE_CONFIG" ]; then +# check_interactive $iport || continue # We got here, so we know we have to build it update_port $iport - else - [ -n "$PM_VERBOSE" ] && - echo "===>>> Checking installed port: $iport" - check_for_updates $iport || fail 'Update failed' - fi +# +# +# +# +# done echo "===>>> Update check of installed ports complete" ; echo '' @@ -2775,7 +2770,7 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th # Outdent if [ $dep_of_deps -gt 0 ]; then dep_of_deps=$(( $dep_of_deps - 1 )) - if [ -n "$CONFIG_ONLY" ]; then + if [ -n "$PM_FIRST_PASS" ]; then num_of_deps=$(( $num_of_deps - 1 )) build_l="${build_l%\\t*}" fi @@ -2792,7 +2787,8 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th fi ;; esac - elif [ -n "$NO_RECURSIVE_CONFIG" -o -n "$URB_YES" ]; then +# + elif [ -n "$URB_YES" ]; then echo '' echo "===>>> $upg_port has an +IGNOREME file, ignoring" echo '' @@ -2803,7 +2799,7 @@ fi # START # Should only be reached for multiport already built as a dependency -case "$CONFIG_SEEN_LIST" in *:${portdir}:*) safe_exit ;; esac +case "$PM_FP_SEEN_LIST" in *:${portdir}:*) safe_exit ;; esac [ -z "$PM_INDEX_ONLY" ] && { pm_cd $pd/$portdir || no_valid_port; } @@ -2814,7 +2810,7 @@ else PM_DEPTH="${PM_DEPTH}>> ${upg_port:-$portdir} " fi -if [ -n "$CONFIG_ONLY" -a "$$" -eq "$PM_PARENT_PID" ]; then +if [ -n "$PM_FIRST_PASS" -a "$$" -eq "$PM_PARENT_PID" ]; then if [ -n "$upg_port" ]; then update_build_l $upg_port else @@ -2838,7 +2834,7 @@ check_state || { [ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && { echo ''; (read_distinfos)& } -# Do these things first time through, with or without 'make config' +# Do these things first time through if [ -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then dofetch () { local fetchlog allfiles @@ -2859,7 +2855,7 @@ dofetch () { [ -z "$PM_PACKAGES" ] && master_sites=`pm_make_b -V MASTER_SITES` if [ -n "$master_sites" ]; then - # PATCHFILES may get added post-config, but we want to + # PATCHFILES may get added after the first pass, but we want to # do as much of this as we can, as early as we can, and # patch files are usually small anyway. distfiles=`pm_make -V ALLFILES | sed -e 's# *$##g'` @@ -2899,13 +2895,13 @@ dofetch () { fi fi # [ -z "$PM_INDEX_ONLY" ] -if [ -n "$CONFIG_ONLY" ]; then +if [ -n "$PM_FIRST_PASS" ]; then [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && PM_BUILD_ONLY_LIST=pmp_doing_build_deps - [ -z "$PM_PACKAGES" ] && make_config + [ -z "$PM_PACKAGES" -a -z "$PM_NO_MAKE_CONFIG" ] && make_config - CONFIG_SEEN_LIST="${CONFIG_SEEN_LIST}${portdir}:" + PM_FP_SEEN_LIST="${PM_FP_SEEN_LIST}${portdir}:" dep_check_type='build-depends-list run-depends-list' [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list @@ -2916,7 +2912,7 @@ if [ -n "$CONFIG_ONLY" ]; then if [ ! "$$" -eq "$PM_PARENT_PID" ]; then # Save state for the parent process to read back in - echo "CONFIG_SEEN_LIST='$CONFIG_SEEN_LIST'" > $IPC_SAVE + echo "PM_FP_SEEN_LIST='$PM_FP_SEEN_LIST'" > $IPC_SAVE if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then echo "build_only_dl_g='$build_only_dl_g'" >> $IPC_SAVE @@ -2967,7 +2963,7 @@ if [ -n "$CONFIG_ONLY" ]; then fi check_fetch_only - post_config $portdir + post_first_pass $portdir fi [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain @@ -2995,12 +2991,13 @@ if [ -z "$NO_DEP_UPDATES" ]; then dependency_check all-depends-list fi [ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir -elif [ -z "$NO_RECURSIVE_CONFIG" -a "$$" -eq "$PM_PARENT_PID" ]; then +# +elif [ "$$" -eq "$PM_PARENT_PID" ]; then echo "===>>> All dependencies are up to date" echo '' fi -if [ -n "$NO_ACTION" -a -z "$CONFIG_ONLY" ]; then +if [ -n "$NO_ACTION" -a -z "$PM_FIRST_PASS" ]; then [ -n "$PM_VERBOSE" ] && echo "===>>> Build canceled due to -n flag" safe_exit fi @@ -3227,7 +3224,7 @@ fi if [ -z "$use_package" ]; then if [ -n "$PM_PACKAGES" ]; then - make_config + [ -z "$PM_NO_MAKE_CONFIG" ] && make_config if [ -z "$RECURSE_THOROUGH" ]; then echo "===>>> Starting check for build dependencies" @@ -3262,6 +3259,8 @@ if [ -z "$use_package" ]; then echo "===>>> Logging build to $port_log" fi + [ -n "$PM_NO_MAKE_CONFIG" ] && PM_MAKE_ARGS="$PM_MAKE_ARGS -D_OPTIONS_OK" + eval pm_make $port_log_args || fail "make failed for $portdir" else [ -z "$local_package" ] && { From owner-svn-src-user@FreeBSD.ORG Thu Jul 22 22:42:54 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C27D1065670; Thu, 22 Jul 2010 22:42:54 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4CC428FC1A; Thu, 22 Jul 2010 22:42:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6MMgsVx086483; Thu, 22 Jul 2010 22:42:54 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6MMgraW086481; Thu, 22 Jul 2010 22:42:53 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007222242.o6MMgraW086481@svn.freebsd.org> From: Doug Barton Date: Thu, 22 Jul 2010 22:42:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210395 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2010 22:42:54 -0000 Author: dougb Date: Thu Jul 22 22:42:53 2010 New Revision: 210395 URL: http://svn.freebsd.org/changeset/base/210395 Log: Add the --clean-packages[-all] feature This works similarly to --clean-distfiles[-all] in that it searches the $PACKAGES directory for out of date packages, and either offers to delete them, or with -all deletes them without prompting. It also cleans out stale symlinks and empty directories. This necessitates moving init_packages_var() and parse_index() so they can be used by the new feature. The idea for grabbing the ORIGIN from the package's +CONTENTS file and checking to see if it is up to date came from: Alexey Markov Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Jul 22 21:31:35 2010 (r210394) +++ user/dougb/portmaster/portmaster Thu Jul 22 22:42:53 2010 (r210395) @@ -278,6 +278,9 @@ usage () { echo "${0##*/} --clean-distfiles" echo "${0##*/} --clean-distfiles-all" echo '' + echo "${0##*/} [--index] --clean-packages" + echo "${0##*/} [--index] --clean-packages-all" + echo '' echo "${0##*/} --check-depends" echo '' echo "${0##*/} --check-port-dbdir [-v]" @@ -350,6 +353,9 @@ usage () { echo '--clean-distfiles offer to delete stale distfiles' echo '--clean-distfiles-all delete stale distfiles without prompting' echo '' + echo '[--index] --clean-packages offer to delete stale packages' + echo '[--index] --clean-distfiles-all delete stale packages without prompting' + echo '' echo '--check-depends cross-check and update dependency information for all ports' echo '' echo "--check-port-dbdir [-v] check for stale entries in $port_dbdir" @@ -474,6 +480,8 @@ for var in "$@" ; do --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; --clean-distfiles-all) CLEAN_DISTFILES=clean_distfiles_all ; ALL=cda ;; + --clean-packages) CLEAN_PACKAGES=clean_packages ;; + --clean-packages-all) CLEAN_PACKAGES=clean_packages_all ; ALL=cdp ;; --check-depends) CHECK_DEPENDS=check_depends ;; --check-port-dbdir) CHECK_PORT_DBDIR=check_port_dbdir ;; --list-origins) LIST_ORIGINS=list_origins ;; @@ -936,6 +944,46 @@ find_glob_dirs () { return 1 } +init_packages_var () { + # Global: PACKAGES + + [ -n "$PACKAGES" ] && return + + PACKAGES=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES 2>/dev/null` + if [ -z "$PACKAGES" ]; then + if [ -d /usr/ports/packages -a -w /usr/ports/packages ]; then + PACKAGES='/usr/ports/packages' + else + if [ -d /usr/ports/ -a -w /usr/ports/ ]; then + PACKAGES='/usr/ports/packages' + else + fail 'The value of PACKAGES cannot be empty and the directory must be writable' + fi + fi + fi + export PACKAGES +} + +parse_index () { + local pd line + + [ -z "$pd" -a -n "$PM_INDEX_ONLY" ] && pd=/usr/ports + + line=`grep -m1 .*\|${pd}/${1}\|.* $PM_INDEX` || return 1 + + case "$2" in + name) echo ${line%%|*} ;; + localbase) echo $line | cut -f 3 -d\| ;; + comment) echo $line | cut -f 4 -d\| ;; + descr) echo $line | cut -f 5 -d\| ;; + maintainer) echo $line | cut -f 6 -d\| ;; + category) echo $line | cut -f 7 -d\| ;; + b-deps) echo $line | cut -f 8 -d\| ;; + r-deps) echo $line | cut -f 9 -d\| ;; + www) echo $line | cut -f 10 -d\| ;; + esac +} + #=============== End functions relevant to --features and main =============== #=============== Begin code relevant only to --features =============== @@ -968,6 +1016,71 @@ if [ -n "$CLEAN_DISTFILES" ]; then safe_exit fi +# XXX +if [ -n "$CLEAN_PACKAGES" ]; then + init_packages_var + + echo "===>>> Checking for stale packages" + for package in `find $PACKAGES -type f | sort`; do + origin=`tar -O -zxvf $package '+CONTENTS' 2>/dev/null | grep '@comment ORIGIN:'` || { + fail Empty origin in $package; } + origin=${origin#@comment ORIGIN:} + + if [ -z "$PM_INDEX" ]; then + if [ -d "$pd/$origin" ]; then + pm_cd $pd/$origin && port_ver=`pm_make -V PKGNAME` + [ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?" + else + echo "===>>> The origin for ${package##*/} ($origin) is missing" + fi + else + port_ver=`parse_index $origin name` + fi + + if [ -n "$port_ver" ]; then + if [ "${port_ver}.tbz" = "${package##*/}" ]; then + echo "===>>> ${package##*/} is up to date" + continue + fi + + echo "===>>> Package version: ${package##*/} Latest version: $port_ver" + + if [ -d "${pdb}/${package##*/}" ]; then + echo " ===>>> ${package##*/} matches the installed version" + else + echo " ===>>> ${package##*/} is out of date" + fi + else + echo "===>>> ${package#$PACKAGES/}" + fi + + if [ -z "$ALL" ]; then + echo -n " ===>>> Delete stale package: ${package##*/}? y/n [y] " + read answer + case "$answer" in + [nN]*) continue ;; + esac + fi + + echo " ===>>> Deleting $package" + pm_unlink_s $package + done + + echo "===>>> Deleting stale symlinks" + pm_cd $PACKAGES || fail "Cannot cd to $PACKAGES" + for link in `find . -type l` ; do + if [ ! -e "$link" ]; then + echo " ===>>> ${link#./}" + $PM_SU_CMD /bin/unlink $link + fi + done + + echo "===>>> Deleting empty directories (if any)" + pm_find_s . -type d -empty -delete + + safe_exit +fi + if [ -n "$CHECK_DEPENDS" ]; then d_orig_ok=':' IFS=' @@ -1206,26 +1319,6 @@ check_state () { return 0 } -parse_index () { - local pd line - - [ -z "$pd" -a -n "$PM_INDEX_ONLY" ] && pd=/usr/ports - - line=`grep -m1 .*\|${pd}/${1}\|.* $PM_INDEX` || return 1 - - case "$2" in - name) echo ${line%%|*} ;; - localbase) echo $line | cut -f 3 -d\| ;; - comment) echo $line | cut -f 4 -d\| ;; - descr) echo $line | cut -f 5 -d\| ;; - maintainer) echo $line | cut -f 6 -d\| ;; - category) echo $line | cut -f 7 -d\| ;; - b-deps) echo $line | cut -f 8 -d\| ;; - r-deps) echo $line | cut -f 9 -d\| ;; - www) echo $line | cut -f 10 -d\| ;; - esac -} - check_pkg_version () { local iport port_ver udf @@ -1353,26 +1446,6 @@ check_for_updates () { return 0 } -init_packages_var () { - # Global: PACKAGES - - [ -n "$PACKAGES" ] && return - - PACKAGES=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES 2>/dev/null` - if [ -z "$PACKAGES" ]; then - if [ -d /usr/ports/packages -a -w /usr/ports/packages ]; then - PACKAGES='/usr/ports/packages' - else - if [ -d /usr/ports/ -a -w /usr/ports/ ]; then - PACKAGES='/usr/ports/packages' - else -fail 'The value of PACKAGES cannot be empty and the directory must be writable' - fi - fi - fi - export PACKAGES -} - init_packages () { # Global: pbu From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 05:42:51 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E4E31065672; Fri, 23 Jul 2010 05:42:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E195F8FC0A; Fri, 23 Jul 2010 05:42:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6N5gnV8092467; Fri, 23 Jul 2010 05:42:49 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N5gnlq092466; Fri, 23 Jul 2010 05:42:49 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007230542.o6N5gnlq092466@svn.freebsd.org> From: Doug Barton Date: Fri, 23 Jul 2010 05:42:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210399 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 05:42:51 -0000 Author: dougb Date: Fri Jul 23 05:42:49 2010 New Revision: 210399 URL: http://svn.freebsd.org/changeset/base/210399 Log: Add an option to log actions after the run is complete. To enable it define PM_LOG in your rc file as the path of the file you want to log to. If using PM_SU_CMD make sure that the directory or file is writable by the unprivileged user. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Jul 22 23:30:24 2010 (r210398) +++ user/dougb/portmaster/portmaster Fri Jul 23 05:42:49 2010 (r210399) @@ -180,16 +180,31 @@ parent_exit () { if [ -n "$INSTALLED_LIST" ]; then if [ -n "$UPDATE_ALL" -o -n "$PM_MULTI_PORTS" ]; then show_list=all - else + elif [ -z "$show_list" ]; then case "$INSTALLED_LIST" in *\\n\\t*) show_list=all ;; *\\n) show_list=one ;; esac fi + if [ -n "$PM_LOG" ]; then + if [ -f "$PM_LOG" ]; then + echo '' >> $PM_LOG + elif [ -e "$PM_LOG" -o -L "$PM_LOG" ]; then + echo "===>>> Warning: $PM_LOG exists, but is not a regular file" + else + local new_pm_log + + new_pm_log=`pm_mktemp pm_log` && + mv $new_pm_log $PM_LOG + fi + date >> $PM_LOG + fi case "$show_list" in all) echo "===>>> The following actions were performed:" - echo -e $INSTALLED_LIST ;; - one) echo "===>>> $ilist complete" ; echo '' ;; + echo -e $INSTALLED_LIST + [ -n "$PM_LOG" ] && echo -e $INSTALLED_LIST >> $PM_LOG ;; + one) echo "===>>> $ilist complete" ; echo '' + [ -n "$PM_LOG" ] && echo " $ilist" >> $PM_LOG ;; esac fi From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 06:01:31 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1950C106566B; Fri, 23 Jul 2010 06:01:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0842F8FC17; Fri, 23 Jul 2010 06:01:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6N61UdG097465; Fri, 23 Jul 2010 06:01:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N61U58097463; Fri, 23 Jul 2010 06:01:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007230601.o6N61U58097463@svn.freebsd.org> From: Doug Barton Date: Fri, 23 Jul 2010 06:01:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210400 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 06:01:31 -0000 Author: dougb Date: Fri Jul 23 06:01:30 2010 New Revision: 210400 URL: http://svn.freebsd.org/changeset/base/210400 Log: If --local-packagedir and ${LOCAL_PACKAGEDIR}/All/${new_port}.tbz exists just use it, don't bother dereferencing $LATEST_LINK. This is faster, but it also solves the problem recenctly mentioned on -ports where packages/Latest/perl links to perl-5.10.x, even with 5.12.x installed and the 5.12.x package exists in packages/All Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jul 23 05:42:49 2010 (r210399) +++ user/dougb/portmaster/portmaster Fri Jul 23 06:01:30 2010 (r210400) @@ -1031,7 +1031,6 @@ if [ -n "$CLEAN_DISTFILES" ]; then safe_exit fi -# XXX if [ -n "$CLEAN_PACKAGES" ]; then init_packages_var @@ -3175,7 +3174,11 @@ fetch_package () { echo "===>>> Checking package repository for latest available version" if [ -n "$LOCAL_PACKAGEDIR" ]; then - if [ -z "$PM_INDEX_ONLY" ]; then + if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then + local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz + latest_pv=${local_package##*/} + fi + if [ -z "$latest_pv" -a -z "$PM_INDEX_ONLY" ]; then s=`pm_make -V LATEST_LINK` if [ -r "${LOCAL_PACKAGEDIR}/Latest/${s}.tbz" ]; then local_package=${LOCAL_PACKAGEDIR}/Latest/${s}.tbz @@ -3185,11 +3188,6 @@ fetch_package () { [ -n "$PM_VERBOSE" ] && echo "===>>> No local package for $new_port exists, attempting fetch" fi - else - if [ -r "${LOCAL_PACKAGEDIR}/All/${new_port}.tbz" ]; then - local_package=${LOCAL_PACKAGEDIR}/All/${new_port}.tbz - latest_pv=${local_package##*/} - fi fi fi From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 07:38:30 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EF7F106570D; Fri, 23 Jul 2010 07:38:30 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F8CA8FC29; Fri, 23 Jul 2010 07:38:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6N7cU2Y021551; Fri, 23 Jul 2010 07:38:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N7cUZ8021549; Fri, 23 Jul 2010 07:38:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007230738.o6N7cUZ8021549@svn.freebsd.org> From: Doug Barton Date: Fri, 23 Jul 2010 07:38:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210402 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 07:38:30 -0000 Author: dougb Date: Fri Jul 23 07:38:30 2010 New Revision: 210402 URL: http://svn.freebsd.org/changeset/base/210402 Log: Finalize the deprecations of /etc/portmaster.rc, -u and -p s/distfiles/packages/ for the --clean-packages-all in usage() Full path to nice Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jul 23 06:30:01 2010 (r210401) +++ user/dougb/portmaster/portmaster Fri Jul 23 07:38:30 2010 (r210402) @@ -21,15 +21,16 @@ if [ -z "$PM_PARENT_PID" ]; then fi export PM_PARENT_PID TMPDIR UPGRADE_TOOL PATH - set -o allexport - # Read a global rc file first if [ -r /etc/portmaster.rc ]; then echo '' ; echo "===>>> WARNING" echo ' Your portmaster.rc is in /etc, however support for the file in this' - echo ' location is deprecated, and will be removed in a future version.' + echo ' location has been removed.' echo '' ; echo ' The proper location for this file is /usr/local/etc' - echo '' ; sleep 5 ; . /etc/portmaster.rc + exit 1 fi + + set -o allexport + # Read a global rc file first [ -r /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc # Read a local one next, and allow the command line to override @@ -317,7 +318,6 @@ usage () { echo '-t recurse dependencies thoroughly, using all-depends-list' echo '-v verbose output' echo '-w save old shared libraries before deinstall' - echo "-u DEPRECATED" echo '[-R] -f always rebuild ports (overrides -i)' echo '-i interactive update -- ask whether to rebuild ports' echo '-D no cleaning of distfiles' @@ -369,7 +369,7 @@ usage () { echo '--clean-distfiles-all delete stale distfiles without prompting' echo '' echo '[--index] --clean-packages offer to delete stale packages' - echo '[--index] --clean-distfiles-all delete stale packages without prompting' + echo '[--index] --clean-packages-all delete stale packages without prompting' echo '' echo '--check-depends cross-check and update dependency information for all ports' echo '' @@ -390,7 +390,7 @@ pm_cd_pd () { builtin cd $pd/$1 2>/dev/ pm_kill () { /bin/kill $* >/dev/null 2>/dev/null; } pm_make () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST PM_FP_SEEN_LIST; - nice /usr/bin/make $PM_MAKE_ARGS $*; ); } + /usr/bin/nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_make_b () { /usr/bin/make $PM_MAKE_ARGS BEFOREPORTMK=bpm $*; } pm_mktemp () { /usr/bin/mktemp -t f-${PM_PARENT_PID}-$1 || fail "mktemp for $1 failed"; } @@ -406,7 +406,7 @@ pm_install_s () { $PM_SU_CMD /usr/b -g wheel -m 644 $1 $2; } pm_make_s () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l; unset -v MASTER_RB_LIST PM_FP_SEEN_LIST; - $PM_SU_CMD nice /usr/bin/make $PM_MAKE_ARGS $*; ); } + $PM_SU_CMD /usr/bin/nice /usr/bin/make $PM_MAKE_ARGS $*; ); } pm_mkdir_s () { $PM_SU_CMD /bin/mkdir -p $1; } pm_pkg_delete_s () { $PM_SU_CMD /usr/sbin/pkg_delete $*; } pm_rm_s () { $PM_SU_CMD /bin/rm $*; } @@ -1240,8 +1240,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop ;; n) NO_ACTION=nopt; ARGS="-n $ARGS" ;; o) REPLACE_ORIGIN=oopt ;; - p) echo "===>>> The -p option has been deprecated" ; echo '' - portdir="${OPTARG#$pd/}" ; portdir=${portdir%/} ;; + p) fail 'The -p option has been deprecated' ;; r) UPDATE_REQ_BYS=ropt if [ -d "$pdb/$OPTARG" ]; then glob_dirs=$OPTARG @@ -1255,7 +1254,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop portdir=`origin_from_pdb ${glob_dirs##*/}` ; unset glob_dirs ;; s) CLEAN_STALE=sopt ;; t) RECURSE_THOROUGH=topt; ARGS="-t $ARGS" ;; - u) echo "===>>> The -u option has been deprecated" ; echo '' ;; + u) fail 'The -u option has been deprecated' ;; v) PM_VERBOSE=vopt; ARGS="-v $ARGS" ;; w) SAVE_SHARED=wopt; ARGS="-w $ARGS" ;; x) case "$OPTARG" in @@ -1268,6 +1267,8 @@ done shift $(( $OPTIND - 1 )) unset -f packages_init cross_idx +[ -n "$UNATTENDED" ] && fail 'The -u option has been deprecated' + [ -n "$PM_EXCL" ] && export PM_EXCL test_command_line () { From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 08:23:31 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14719106566C; Fri, 23 Jul 2010 08:23:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02D2D8FC19; Fri, 23 Jul 2010 08:23:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6N8NUnf032052; Fri, 23 Jul 2010 08:23:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N8NUZ0032051; Fri, 23 Jul 2010 08:23:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007230823.o6N8NUZ0032051@svn.freebsd.org> From: Doug Barton Date: Fri, 23 Jul 2010 08:23:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210405 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 08:23:31 -0000 Author: dougb Date: Fri Jul 23 08:23:30 2010 New Revision: 210405 URL: http://svn.freebsd.org/changeset/base/210405 Log: In --clean-packages if a package after the first has a missing ORIGIN port_ver will still contain the value from the previous port, so fix this. Reported by: Alexey Markov Further improve the messages to the user for this feature. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jul 23 08:20:14 2010 (r210404) +++ user/dougb/portmaster/portmaster Fri Jul 23 08:23:30 2010 (r210405) @@ -1046,9 +1046,13 @@ if [ -n "$CLEAN_PACKAGES" ]; then [ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?" else echo "===>>> The origin for ${package##*/} ($origin) is missing" + unset port_ver fi else - port_ver=`parse_index $origin name` + if ! port_ver=`parse_index $origin name`; then + echo "===>>> Cannot determine latest version of ${package##*/} from INDEX" + unset port_ver + fi fi if [ -n "$port_ver" ]; then @@ -1064,10 +1068,10 @@ if [ -n "$CLEAN_PACKAGES" ]; then else echo " ===>>> ${package##*/} is out of date" fi - else - echo "===>>> ${package#$PACKAGES/}" fi + echo " ===>>> Path: ${package}" + if [ -z "$ALL" ]; then echo -n " ===>>> Delete stale package: ${package##*/}? y/n [y] " read answer @@ -1080,7 +1084,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then pm_unlink_s $package done - echo "===>>> Deleting stale symlinks" + echo '' ; echo "===>>> Deleting stale symlinks" pm_cd $PACKAGES || fail "Cannot cd to $PACKAGES" for link in `find . -type l` ; do if [ ! -e "$link" ]; then @@ -1089,7 +1093,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then fi done - echo "===>>> Deleting empty directories (if any)" + echo '' ; echo "===>>> Deleting empty directories (if any)" pm_find_s . -type d -empty -delete safe_exit From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 12:51:24 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B44D1065677; Fri, 23 Jul 2010 12:51:24 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D57E08FC1A; Fri, 23 Jul 2010 12:51:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NCpNHs094822; Fri, 23 Jul 2010 12:51:23 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6NCpN9t094820; Fri, 23 Jul 2010 12:51:23 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201007231251.o6NCpN9t094820@svn.freebsd.org> From: Adrian Chadd Date: Fri, 23 Jul 2010 12:51:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210411 - user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 12:51:24 -0000 Author: adrian Date: Fri Jul 23 12:51:23 2010 New Revision: 210411 URL: http://svn.freebsd.org/changeset/base/210411 Log: Bring over an NF calibration fix from the latest linux wireless-testing ath9k code. The inline comment explains what is going on - on the ar5416 and ar9160 (at least) writing -50 to the CCA registers during Noise Floor calibration can result in the RX side going deaf. This has been tested on an SR-71 (AR9160 based) 11n MiniPCI card. The initial NF calibration on startup takes longer than the initial CCA register loading. It may be possible this occurs during periodic recalibrations. Obtained from: Linux Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Modified: user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c ============================================================================== --- user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Fri Jul 23 12:30:29 2010 (r210410) +++ user/adrian/if_ath_devel/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Fri Jul 23 12:51:23 2010 (r210411) @@ -552,6 +552,22 @@ ar5416LoadNF(struct ath_hal *ah, const s } /* + * We timed out waiting for the noisefloor to load, probably due to an + * in-progress rx. Simply return here and allow the load plenty of time + * to complete before the next calibration interval. We need to avoid + * trying to load -50 (which happens below) while the previous load is + * still in progress as this can cause rx deafness. Instead by returning + * here, the baseband nf cal will just be capped by our present + * noisefloor until the next calibration timer. + */ + if (j == 1000) { + HALDEBUG(ah, HAL_DEBUG_ANY, "Timeout while waiting for nf " + "to load: AR_PHY_AGC_CONTROL=0x%x\n", + OS_REG_READ(ah, AR_PHY_AGC_CONTROL)); + return; + } + + /* * Restore maxCCAPower register parameter again so that we're not capped * by the median we just loaded. This will be initial (and max) value * of next noise floor calibration the baseband does. From owner-svn-src-user@FreeBSD.ORG Fri Jul 23 23:58:57 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 918961065679; Fri, 23 Jul 2010 23:58:57 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 757D68FC16; Fri, 23 Jul 2010 23:58:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NNwvJZ056480; Fri, 23 Jul 2010 23:58:57 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6NNwvZI056478; Fri, 23 Jul 2010 23:58:57 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007232358.o6NNwvZI056478@svn.freebsd.org> From: Doug Barton Date: Fri, 23 Jul 2010 23:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210440 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 23:58:57 -0000 Author: dougb Date: Fri Jul 23 23:58:57 2010 New Revision: 210440 URL: http://svn.freebsd.org/changeset/base/210440 Log: By popular demand, add an option to --clean-distfiles[-all] to allow a distfile to be valid if it matches ANY port in the tree, not just those installed. This requires building a distinfo list from all ports, so duplicate the relevant bits of read_distinfos() into read_distinfos_all(). The common elements are split into during the loop and after the loop, so making 4 functions total doesn't seem worth it. Add logic to --clean-distfiles to handle the -t option and call the right read_distinfos* function accordingly. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Jul 23 22:49:25 2010 (r210439) +++ user/dougb/portmaster/portmaster Fri Jul 23 23:58:57 2010 (r210440) @@ -291,8 +291,8 @@ usage () { echo '' echo "${0##*/} [--force-config|-G] [-aftv] -F" echo '' - echo "${0##*/} --clean-distfiles" - echo "${0##*/} --clean-distfiles-all" + echo "${0##*/} [-t] --clean-distfiles" + echo "${0##*/} [-t] --clean-distfiles-all" echo '' echo "${0##*/} [--index] --clean-packages" echo "${0##*/} [--index] --clean-packages-all" @@ -365,8 +365,9 @@ usage () { echo '' echo '[--force-config|-G] [-aftv] -F fetch distfiles only' echo '' - echo '--clean-distfiles offer to delete stale distfiles' - echo '--clean-distfiles-all delete stale distfiles without prompting' + echo '[-t] --clean-distfiles offer to delete stale distfiles' + echo '[-t] --clean-distfiles-all delete stale distfiles without prompting' + echo ' with -t distfile is valid from any port, not just those installed' echo '' echo '[--index] --clean-packages offer to delete stale packages' echo '[--index] --clean-packages-all delete stale packages without prompting' @@ -897,6 +898,40 @@ read_distinfos () { [ -e "${DI_FILES}-e" ] && unlink ${DI_FILES}-e } +read_distinfos_all () { + local origin distinfo disc1 f disc2 + + echo '############' > $DI_FILES # Make the file > 0 bytes + echo "===>>> Gathering distinfo list for all ports" + echo ' (This will take several minutes)' + echo '' + for origin in ${pd}/*/*; do + case "${origin#$pd/}" in + Mk/*|T*|distfiles/*|packages/*|*/[Mm]akefile) continue ;; esac + + [ -d "$origin" ] || continue + pm_cd $origin || continue + + if [ -s distinfo ]; then + distinfo=distinfo + else + distinfo=`pm_make -V MD5_FILE` + fi + + if [ -s "$distinfo" ]; then + grep '^MD5' $distinfo | while read disc1 f disc2; do + f=${f#(} ; f=${f%)} + echo $f >> $DI_FILES + done + fi + done + + # Tell safe_exit that we are done + [ -e "${DI_FILES}-e" ] && unlink ${DI_FILES}-e + sed -i -e 1s/############/%%%%%%%%%%%%/ $DI_FILES + [ -e "${DI_FILES}-e" ] && unlink ${DI_FILES}-e +} + globstrip () { local in @@ -1007,7 +1042,12 @@ if [ -n "$CLEAN_DISTFILES" ]; then # Set the file name here since we are usually called in a subshell DI_FILES=`pm_mktemp DI-FILES` - read_distinfos + + if [ "$1" != '-t' ]; then + read_distinfos + else + read_distinfos_all + fi echo "===>>> Checking for stale distfiles" for df in `find $DISTDIR -type f | sort`; do