PERFORCE change 144256 for review
John Birrell
jb at FreeBSD.org
Sun Jun 29 03:13:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144256
Change 144256 by jb at freebsd3 on 2008/06/29 03:13:13
IF7
Affected files ...
.. //depot/projects/dtrace7/src/contrib/top/top.X#2 integrate
.. //depot/projects/dtrace7/src/contrib/top/top.c#4 integrate
.. //depot/projects/dtrace7/src/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/initrandom#3 integrate
.. //depot/projects/dtrace7/src/games/morse/morse.6#2 integrate
.. //depot/projects/dtrace7/src/games/morse/morse.c#2 integrate
.. //depot/projects/dtrace7/src/gnu/lib/libstdc++/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/cvs/contrib/Makefile#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/dtrace7/src/include/Makefile#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/gen/valloc.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.c#3 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/rb.h#1 branch
.. //depot/projects/dtrace7/src/libexec/rpc.rstatd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/libexec/rpc.rstatd/rstat_proc.c#2 integrate
.. //depot/projects/dtrace7/src/release/scripts/src-install.sh#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/ciss.4#4 integrate
.. //depot/projects/dtrace7/src/share/man/man4/cpufreq.4#2 integrate
.. //depot/projects/dtrace7/src/share/mk/bsd.cpu.mk#6 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/intr_machdep.h#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/intr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/common/ufsread.c#3 integrate
.. //depot/projects/dtrace7/src/sys/boot/forth/support.4th#2 integrate
.. //depot/projects/dtrace7/src/sys/boot/i386/libi386/biossmap.c#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#13 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/dtrace7/src/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/cpufreq/ichss.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/dc/if_dc.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/atphy.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/atphyreg.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/brgphy.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/brgphyreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mpt/mpt_user.c#1 branch
.. //depot/projects/dtrace7/src/sys/fs/cd9660/cd9660_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/dtrace7/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/cpufreq/est.c#4 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/dtrace7/src/sys/kern/bus_if.m#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mib.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#3 integrate
.. //depot/projects/dtrace7/src/sys/modules/mpt/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#7 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_nat.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_nat.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/libalias/alias_local.h#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/nfsmb.c#3 integrate
.. //depot/projects/dtrace7/src/sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/dtrace7/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/intr_machdep.h#4 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/intr_machdep.c#5 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/bus.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/interrupt.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/mount.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/mpt_ioctl.h#1 branch
.. //depot/projects/dtrace7/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/dtrace7/src/usr.bin/cksum/cksum.c#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/globals.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/hash_tables.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/main.c#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/make.1#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/make/parse.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/shar/shar.sh#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/whereis/whereis.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/config/main.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/Makefile#4 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/main.c#5 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/add/perform.c#4 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/create/main.c#4 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/lib/file.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/lib/lib.h#5 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/lib/url.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/updating/main.c#3 integrate
Differences ...
==== //depot/projects/dtrace7/src/contrib/top/top.X#2 (text+ko) ====
@@ -1,6 +1,6 @@
.\" NOTE: changes to the manual page for "top" should be made in the
.\" file "top.X" and NOT in the file "top.1".
-.\" $FreeBSD: src/contrib/top/top.X,v 1.20 2007/05/04 15:42:58 rafan Exp $
+.\" $FreeBSD: src/contrib/top/top.X,v 1.20.2.1 2008/06/25 22:13:24 ru Exp $
.nr N %topn%
.nr D %delay%
.TH TOP 1 Local
@@ -10,7 +10,7 @@
.SH SYNOPSIS
.B top
[
-.B \-abCHIijnqStuv
+.B \-abCHIijnPqStuv
] [
.BI \-d count
] [
@@ -119,6 +119,9 @@
Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq
mode.
.TP
+.B \-P
+Display per-cpu CPU usage statistics.
+.TP
.B \-q
Renice
.I top
==== //depot/projects/dtrace7/src/contrib/top/top.c#4 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.23.2.2 2008/04/09 19:08:43 peter Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.23.2.3 2008/06/25 22:13:24 ru Exp $
*/
/*
@@ -283,7 +283,7 @@
optind = 1;
}
- while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF)
+ while ((i = getopt(ac, av, "CSIHPabijnquvs:d:U:m:o:t")) != EOF)
{
switch(i)
{
@@ -412,14 +412,10 @@
pcpu_stats = Yes;
break;
- case 'p':
- pcpu_stats = No;
- break;
-
default:
fprintf(stderr,
"Top version %s\n"
-"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n"
+"Usage: %s [-abCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n"
" [-U username] [number]\n",
version_string(), myname);
exit(1);
==== //depot/projects/dtrace7/src/etc/mtree/BSD.include.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120 2007/10/03 05:51:20 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.120.2.1 2008/06/27 04:42:19 jhb Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -102,6 +102,10 @@
..
lmc
..
+ mpt
+ mpilib
+ ..
+ ..
ofw
..
pbio
==== //depot/projects/dtrace7/src/etc/rc.d/initrandom#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.7.2.1 2008/06/03 11:39:39 ru Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.7.2.3 2008/06/27 04:42:19 jhb Exp $
#
# PROVIDE: initrandom
==== //depot/projects/dtrace7/src/games/morse/morse.6#2 (text+ko) ====
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)bcd.6 8.1 (Berkeley) 5/31/93
-.\" $FreeBSD: src/games/morse/morse.6,v 1.17 2005/06/07 21:43:16 ru Exp $
+.\" $FreeBSD: src/games/morse/morse.6,v 1.17.10.1 2008/06/19 23:25:00 scf Exp $
.\"
.Dd June 7, 2005
.Dt MORSE 6
@@ -172,7 +172,8 @@
.Sh FILES
.Bl -tag -width ".Pa /dev/speaker" -compact
.It Pa /dev/speaker
-speaker device file
+.Xr speaker 4
+device file
.El
.Sh SEE ALSO
.Xr speaker 4
@@ -180,7 +181,7 @@
Sound support for
.Nm
added by
-.An Lyndon Nerenberg (VE7TCP/VE6BBM) Aq lyndon at orthanc.com .
+.An Lyndon Nerenberg (VE6BBM) Aq lyndon at orthanc.ca .
.Pp
Ability to key an external device added by
.An J\(:org Wunsch
==== //depot/projects/dtrace7/src/games/morse/morse.c#2 (text+ko) ====
@@ -32,8 +32,8 @@
*/
/*
- * Taught to send *real* morse by Lyndon Nerenberg (VE7TCP/VE6BBM)
- * <lyndon at orthanc.com>
+ * Taught to send *real* morse by Lyndon Nerenberg (VE6BBM)
+ * <lyndon at orthanc.ca>
*/
#ifndef lint
@@ -47,7 +47,7 @@
static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/games/morse/morse.c,v 1.21 2005/11/11 09:57:32 ru Exp $";
+ "$FreeBSD: src/games/morse/morse.c,v 1.21.2.1 2008/06/19 23:25:00 scf Exp $";
#endif /* not lint */
#include <sys/time.h>
@@ -483,7 +483,8 @@
printf(" %s\n", s);
} else {
for (; *s; ++s)
- printf(" %s", *s == '.' ? "dit" : "dah");
+ printf(" %s", *s == '.' ? *(s + 1) == '\0' ? "dit" :
+ "di" : "dah");
printf("\n");
}
}
==== //depot/projects/dtrace7/src/gnu/lib/libstdc++/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61.2.1 2008/06/20 00:13:37 kan Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
@@ -93,7 +93,7 @@
CLEANFILES+= atomicity.cc
INCSGROUPS= BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
- TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0
+ TARGETHDRS THRHDRS DEBUGHDRS TR1HDRS PBHDRS0 PBHDRS1
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/4.2
STDHDRS= std_algorithm.h std_bitset.h std_complex.h std_deque.h \
@@ -208,6 +208,20 @@
PBHDRS0:= ${PBHDRS0:S;^;${SRCDIR}/include/ext/pb_ds/;}
PBHDRS0DIR= ${CXXINCLUDEDIR}/ext/pb_ds
+PBHDRS1 = \
+ basic_types.hpp \
+ cond_dealtor.hpp \
+ constructors_destructor_fn_imps.hpp \
+ container_base_dispatch.hpp \
+ map_debug_base.hpp \
+ priority_queue_base_dispatch.hpp \
+ standard_policies.hpp \
+ tree_trace_base.hpp \
+ type_utils.hpp \
+ types_traits.hpp
+PBHDRS1:= ${PBHDRS1:S;^;${SRCDIR}/include/ext/pb_ds/detail/;}
+PBHDRS1DIR= ${CXXINCLUDEDIR}/ext/pb_ds/detail
+
PBHDRS+= \
basic_tree_policy/basic_tree_policy_base.hpp \
basic_tree_policy/null_node_metadata.hpp \
==== //depot/projects/dtrace7/src/gnu/usr.bin/cvs/contrib/Makefile#2 (text+ko) ====
@@ -1,4 +1,6 @@
-# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.18 2005/06/03 15:08:29 imp Exp $
+# $FreeBSD: src/gnu/usr.bin/cvs/contrib/Makefile,v 1.18.10.1 2008/06/22 00:13:19 peter Exp $
+
+.POSIX:
.include "../Makefile.inc"
@@ -20,12 +22,12 @@
.SUFFIXES: .sh .pl .in
.sh:
- cp $< $@
+ cp ${.IMPSRC} ${.TARGET}
.pl:
- sed -e 's,xPERL_PATHx,$(PERLPATH),' $< > $@
+ sed -e 's,xPERL_PATHx,$(PERLPATH),' ${.IMPSRC} > ${.TARGET}
.in:
- sed -e 's, at CSH@,/bin/csh,' -e 's, at PERL@,$(PERLPATH),' $< > $@
+ sed -e 's, at CSH@,/bin/csh,' -e 's, at PERL@,$(PERLPATH),' ${.IMPSRC} > ${.TARGET}
.include <bsd.prog.mk>
==== //depot/projects/dtrace7/src/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.59.2.2 2008/06/04 06:05:12 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.59.2.4 2008/06/27 04:42:19 jhb Exp $
.\"
.\" %beginstrip%
.
==== //depot/projects/dtrace7/src/include/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
+# $FreeBSD: src/include/Makefile,v 1.276.2.1 2008/06/27 04:42:19 jhb Exp $
#
# Doing a "make install" builds /usr/include.
@@ -59,6 +59,8 @@
ufs/ffs ufs/ufs
#LSUBDIRS+= netatm/ipatm netatm/sigpvc netatm/spans netatm/uni
+LSUBSUBDIRS= dev/mpt/mpilib
+
.if ${MACHINE_ARCH} == "powerpc"
_dev_powermac_nvram= dev/powermac_nvram
.endif
@@ -72,7 +74,7 @@
.endif
.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS= netgraph/bluetooth/include
+LSUBSUBDIRS+= netgraph/bluetooth/include
.endif
# XXX unconditionally needed by <netsmb/netbios.h>
==== //depot/projects/dtrace7/src/lib/libc/gen/valloc.3#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)valloc.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.14 2007/03/28 18:55:44 jasone Exp $
+.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.14.2.1 2008/06/24 21:00:48 wollman Exp $
.\"
-.Dd September 13, 2005
+.Dd October 30, 2007
.Dt VALLOC 3
.Os
.Sh NAME
@@ -46,7 +46,6 @@
function is obsoleted by
.Xr posix_memalign 3 ,
which can be used to request page-aligned allocations.
-.Ef
.Pp
The
.Fn valloc
==== //depot/projects/dtrace7/src/lib/libc/stdlib/malloc.c#3 (text+ko) ====
@@ -70,9 +70,9 @@
* | | 8 kB |
* | | 12 kB |
* | | ... |
- * | | 1004 kB |
* | | 1008 kB |
* | | 1012 kB |
+ * | | 1016 kB |
* |=====================================|
* | Huge | 1 MB |
* | | 2 MB |
@@ -128,7 +128,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147.2.2 2008/03/07 22:39:38 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147.2.3 2008/06/16 23:42:05 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -142,7 +142,6 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/sysctl.h>
-#include <sys/tree.h>
#include <sys/uio.h>
#include <sys/ktrace.h> /* Must come after several other sys/ includes. */
@@ -175,6 +174,8 @@
#endif
#include <assert.h>
+#include "rb.h"
+
#ifdef MALLOC_DEBUG
/* Disable inlining to make debugging easier. */
# define inline
@@ -213,6 +214,11 @@
# define SIZEOF_PTR_2POW 2
# define NO_TLS
#endif
+#ifdef __mips__
+# define QUANTUM_2POW_MIN 3
+# define SIZEOF_PTR_2POW 2
+# define NO_TLS
+#endif
#ifdef __powerpc__
# define QUANTUM_2POW_MIN 4
# define SIZEOF_PTR_2POW 2
@@ -439,10 +445,10 @@
typedef struct extent_node_s extent_node_t;
struct extent_node_s {
/* Linkage for the size/address-ordered tree. */
- RB_ENTRY(extent_node_s) link_szad;
+ rb_node(extent_node_t) link_szad;
/* Linkage for the address-ordered tree. */
- RB_ENTRY(extent_node_s) link_ad;
+ rb_node(extent_node_t) link_ad;
/* Pointer to the extent that this tree node is responsible for. */
void *addr;
@@ -450,10 +456,7 @@
/* Total region size. */
size_t size;
};
-typedef struct extent_tree_szad_s extent_tree_szad_t;
-RB_HEAD(extent_tree_szad_s, extent_node_s);
-typedef struct extent_tree_ad_s extent_tree_ad_t;
-RB_HEAD(extent_tree_ad_s, extent_node_s);
+typedef rb_tree(extent_node_t) extent_tree_t;
/******************************************************************************/
/*
@@ -479,8 +482,11 @@
/* Arena that owns the chunk. */
arena_t *arena;
- /* Linkage for the arena's chunk tree. */
- RB_ENTRY(arena_chunk_s) link;
+ /* Linkage for the arena's chunks_all tree. */
+ rb_node(arena_chunk_t) link_all;
+
+ /* Linkage for the arena's chunks_dirty tree. */
+ rb_node(arena_chunk_t) link_dirty;
/*
* Number of pages in use. This is maintained in order to make
@@ -495,7 +501,7 @@
* Tree of extent nodes that are embedded in the arena chunk header
* page(s). These nodes are used by arena_chunk_node_alloc().
*/
- extent_tree_ad_t nodes;
+ extent_tree_t nodes;
extent_node_t *nodes_past;
/*
@@ -505,13 +511,12 @@
*/
arena_chunk_map_t map[1]; /* Dynamically sized. */
};
-typedef struct arena_chunk_tree_s arena_chunk_tree_t;
-RB_HEAD(arena_chunk_tree_s, arena_chunk_s);
+typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
typedef struct arena_run_s arena_run_t;
struct arena_run_s {
/* Linkage for run trees. */
- RB_ENTRY(arena_run_s) link;
+ rb_node(arena_run_t) link;
#ifdef MALLOC_DEBUG
uint32_t magic;
@@ -530,8 +535,7 @@
/* Bitmask of in-use regions (0: in use, 1: free). */
unsigned regs_mask[1]; /* Dynamically sized. */
};
-typedef struct arena_run_tree_s arena_run_tree_t;
-RB_HEAD(arena_run_tree_s, arena_run_s);
+typedef rb_tree(arena_run_t) arena_run_tree_t;
struct arena_bin_s {
/*
@@ -583,15 +587,25 @@
arena_stats_t stats;
#endif
+ /* Tree of all chunks this arena manages. */
+ arena_chunk_tree_t chunks_all;
+
/*
- * Tree of chunks this arena manages.
+ * Tree of dirty-page-containing chunks this arena manages. This tree
+ * is maintained in addition to chunks_all in order to make
+ * deallocation O(lg d), where 'd' is the size of chunks_dirty.
+ *
+ * Without this tree, deallocation would be O(a), where 'a' is the size
+ * of chunks_all. Since dirty pages are purged in descending memory
+ * order, it would not be difficult to trigger something approaching
+ * worst case behavior with a series of large deallocations.
*/
- arena_chunk_tree_t chunks;
+ arena_chunk_tree_t chunks_dirty;
/*
* In order to avoid rapid chunk allocation/deallocation when an arena
* oscillates right on the cusp of needing a new chunk, cache the most
- * recently freed chunk. The spare is left in the arena's chunk tree
+ * recently freed chunk. The spare is left in the arena's chunk trees
* until it is deleted.
*
* There is one spare chunk per arena, rather than one spare total, in
@@ -613,11 +627,11 @@
* using one set of nodes, since one is needed for first-best-fit run
* allocation, and the other is needed for coalescing.
*/
- extent_tree_szad_t runs_avail_szad;
- extent_tree_ad_t runs_avail_ad;
+ extent_tree_t runs_avail_szad;
+ extent_tree_t runs_avail_ad;
/* Tree of this arena's allocated (in-use) runs. */
- extent_tree_ad_t runs_alloced_ad;
+ extent_tree_t runs_alloced_ad;
#ifdef MALLOC_BALANCE
/*
@@ -694,7 +708,7 @@
static malloc_mutex_t huge_mtx;
/* Tree of chunks that are stand-alone huge allocations. */
-static extent_tree_ad_t huge;
+static extent_tree_t huge;
#ifdef MALLOC_DSS
/*
@@ -715,8 +729,8 @@
* address space. Depending on function, different tree orderings are needed,
* which is why there are two trees with the same contents.
*/
-static extent_tree_szad_t dss_chunks_szad;
-static extent_tree_ad_t dss_chunks_ad;
+static extent_tree_t dss_chunks_szad;
+static extent_tree_t dss_chunks_ad;
#endif
#ifdef MALLOC_STATS
@@ -1282,8 +1296,10 @@
malloc_mutex_lock(&base_mtx);
/* Make sure there's enough space for the allocation. */
if ((uintptr_t)base_next_addr + csize > (uintptr_t)base_past_addr) {
- if (base_pages_alloc(csize))
+ if (base_pages_alloc(csize)) {
+ malloc_mutex_unlock(&base_mtx);
return (NULL);
+ }
}
/* Allocate. */
ret = base_next_addr;
@@ -1431,9 +1447,9 @@
return (ret);
}
-/* Generate red-black tree code for size/address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_szad_s, extent_node_s, link_szad,
- extent_szad_comp)
+/* Wrap red-black tree macros in functions. */
+rb_wrap(__unused static, extent_tree_szad_, extent_tree_t, extent_node_t,
+ link_szad, extent_szad_comp)
static inline int
extent_ad_comp(extent_node_t *a, extent_node_t *b)
@@ -1444,8 +1460,9 @@
return ((a_addr > b_addr) - (a_addr < b_addr));
}
-/* Generate red-black tree code for address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_ad_s, extent_node_s, link_ad, extent_ad_comp)
+/* Wrap red-black tree macros in functions. */
+rb_wrap(__unused static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad,
+ extent_ad_comp)
/*
* End extent tree code.
@@ -1511,6 +1528,13 @@
chunk_alloc_dss(size_t size)
{
+ /*
+ * sbrk() uses a signed increment argument, so take care not to
+ * interpret a huge allocation request as a negative increment.
+ */
+ if ((intptr_t)size < 0)
+ return (NULL);
+
malloc_mutex_lock(&dss_mtx);
if (dss_prev != (void *)-1) {
intptr_t incr;
@@ -1561,14 +1585,14 @@
key.addr = NULL;
key.size = size;
malloc_mutex_lock(&dss_mtx);
- node = RB_NFIND(extent_tree_szad_s, &dss_chunks_szad, &key);
+ node = extent_tree_szad_nsearch(&dss_chunks_szad, &key);
if (node != NULL) {
void *ret = node->addr;
/* Remove node from the tree. */
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
if (node->size == size) {
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
} else {
/*
@@ -1579,7 +1603,7 @@
assert(node->size > size);
node->addr = (void *)((uintptr_t)node->addr + size);
node->size -= size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1719,7 +1743,7 @@
extent_node_t *node, *prev, key;
key.addr = (void *)((uintptr_t)chunk + size);
- node = RB_NFIND(extent_tree_ad_s, &dss_chunks_ad, &key);
+ node = extent_tree_ad_nsearch(&dss_chunks_ad, &key);
/* Try to coalesce forward. */
if (node != NULL && node->addr == key.addr) {
/*
@@ -1727,10 +1751,10 @@
* not change the position within dss_chunks_ad, so only
* remove/insert from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = chunk;
node->size += size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
} else {
/*
* Coalescing forward failed, so insert a new node. Drop
@@ -1744,12 +1768,12 @@
return (NULL);
node->addr = chunk;
node->size = size;
- RB_INSERT(extent_tree_ad_s, &dss_chunks_ad, node);
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_ad_insert(&dss_chunks_ad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
/* Try to coalesce backward. */
- prev = RB_PREV(extent_tree_ad_s, &dss_chunks_ad, node);
+ prev = extent_tree_ad_prev(&dss_chunks_ad, node);
if (prev != NULL && (void *)((uintptr_t)prev->addr + prev->size) ==
chunk) {
/*
@@ -1757,13 +1781,13 @@
* not change the position within dss_chunks_ad, so only
* remove/insert node from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, prev);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, prev);
+ extent_tree_szad_remove(&dss_chunks_szad, prev);
+ extent_tree_ad_remove(&dss_chunks_ad, prev);
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = prev->addr;
node->size += prev->size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
base_node_dealloc(prev);
}
@@ -1803,10 +1827,8 @@
dss_max = (void *)((intptr_t)dss_prev - (intptr_t)size);
if (node != NULL) {
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad,
- node);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad,
- node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1991,8 +2013,11 @@
return ((a_chunk > b_chunk) - (a_chunk < b_chunk));
}
-/* Generate red-black tree code for arena chunks. */
-RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp)
+/* Wrap red-black tree macros in functions. */
+rb_wrap(__unused static, arena_chunk_tree_all_, arena_chunk_tree_t,
+ arena_chunk_t, link_all, arena_chunk_comp)
+rb_wrap(__unused static, arena_chunk_tree_dirty_, arena_chunk_tree_t,
+ arena_chunk_t, link_dirty, arena_chunk_comp)
static inline int
arena_run_comp(arena_run_t *a, arena_run_t *b)
@@ -2006,17 +2031,18 @@
return ((a_run > b_run) - (a_run < b_run));
}
-/* Generate red-black tree code for arena runs. */
-RB_GENERATE_STATIC(arena_run_tree_s, arena_run_s, link, arena_run_comp)
+/* Wrap red-black tree macros in functions. */
+rb_wrap(__unused static, arena_run_tree_, arena_run_tree_t, arena_run_t, link,
+ arena_run_comp)
static extent_node_t *
arena_chunk_node_alloc(arena_chunk_t *chunk)
{
extent_node_t *ret;
- ret = RB_MIN(extent_tree_ad_s, &chunk->nodes);
+ ret = extent_tree_ad_first(&chunk->nodes);
if (ret != NULL)
- RB_REMOVE(extent_tree_ad_s, &chunk->nodes, ret);
+ extent_tree_ad_remove(&chunk->nodes, ret);
else {
ret = chunk->nodes_past;
chunk->nodes_past = (extent_node_t *)
@@ -2034,7 +2060,7 @@
{
node->addr = (void *)node;
- RB_INSERT(extent_tree_ad_s, &chunk->nodes, node);
+ extent_tree_ad_insert(&chunk->nodes, node);
}
static inline void *
@@ -2205,18 +2231,19 @@
bool zero)
{
arena_chunk_t *chunk;
- size_t run_ind, total_pages, need_pages, rem_pages, i;
+ size_t old_ndirty, run_ind, total_pages, need_pages, rem_pages, i;
extent_node_t *nodeA, *nodeB, key;
/* Insert a node into runs_alloced_ad for the first part of the run. */
chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
+ old_ndirty = chunk->ndirty;
nodeA = arena_chunk_node_alloc(chunk);
nodeA->addr = run;
nodeA->size = size;
- RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeA);
+ extent_tree_ad_insert(&arena->runs_alloced_ad, nodeA);
key.addr = run;
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ nodeB = extent_tree_ad_search(&arena->runs_avail_ad, &key);
assert(nodeB != NULL);
run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
@@ -2253,7 +2280,7 @@
}
/* Keep track of trailing unused pages for later use. */
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeB);
if (rem_pages > 0) {
/*
* Update nodeB in runs_avail_*. Its position within
@@ -2261,14 +2288,16 @@
*/
nodeB->addr = (void *)((uintptr_t)nodeB->addr + size);
nodeB->size -= size;
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
} else {
/* Remove nodeB from runs_avail_*. */
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_avail_ad, nodeB);
arena_chunk_node_dealloc(chunk, nodeB);
}
chunk->pages_used += need_pages;
+ if (chunk->ndirty == 0 && old_ndirty > 0)
+ arena_chunk_tree_dirty_remove(&arena->chunks_dirty, chunk);
}
static arena_chunk_t *
@@ -2290,7 +2319,7 @@
chunk->arena = arena;
- RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
+ arena_chunk_tree_all_insert(&arena->chunks_all, chunk);
/*
* Claim that no pages are in use, since the header is merely
@@ -2310,7 +2339,7 @@
arena_chunk_header_npages));
/* Initialize the tree of unused extent nodes. */
- RB_INIT(&chunk->nodes);
+ extent_tree_ad_new(&chunk->nodes);
chunk->nodes_past = (extent_node_t *)QUANTUM_CEILING(
(uintptr_t)&chunk->map[chunk_npages]);
}
@@ -2320,8 +2349,8 @@
node->addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
node->size = chunksize - (arena_chunk_header_npages << pagesize_2pow);
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_INSERT(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_insert(&arena->runs_avail_szad, node);
+ extent_tree_ad_insert(&arena->runs_avail_ad, node);
return (chunk);
}
@@ -2332,9 +2361,13 @@
extent_node_t *node, key;
if (arena->spare != NULL) {
- RB_REMOVE(arena_chunk_tree_s, &chunk->arena->chunks,
+ arena_chunk_tree_all_remove(&chunk->arena->chunks_all,
arena->spare);
- arena->ndirty -= arena->spare->ndirty;
+ if (arena->spare->ndirty > 0) {
+ arena_chunk_tree_dirty_remove(
+ &chunk->arena->chunks_dirty, arena->spare);
+ arena->ndirty -= arena->spare->ndirty;
+ }
chunk_dealloc((void *)arena->spare, chunksize);
#ifdef MALLOC_STATS
arena->stats.mapped -= chunksize;
@@ -2344,15 +2377,15 @@
/*
* Remove run from the runs trees, regardless of whether this chunk
* will be cached, so that the arena does not use it. Dirty page
- * flushing only uses the chunks tree, so leaving this chunk in that
- * tree is sufficient for that purpose.
+ * flushing only uses the chunks_dirty tree, so leaving this chunk in
+ * the chunks_* trees is sufficient for that purpose.
*/
key.addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
- node = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ node = extent_tree_ad_search(&arena->runs_avail_ad, &key);
assert(node != NULL);
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_remove(&arena->runs_avail_szad, node);
+ extent_tree_ad_remove(&arena->runs_avail_ad, node);
arena_chunk_node_dealloc(chunk, node);
arena->spare = chunk;
@@ -2372,7 +2405,7 @@
/* Search the arena's chunks for the lowest best fit. */
key.addr = NULL;
key.size = size;
- node = RB_NFIND(extent_tree_szad_s, &arena->runs_avail_szad, &key);
+ node = extent_tree_szad_nsearch(&arena->runs_avail_szad, &key);
if (node != NULL) {
run = (arena_run_t *)node->addr;
arena_run_split(arena, run, size, small, zero);
@@ -2396,13 +2429,21 @@
arena_purge(arena_t *arena)
{
arena_chunk_t *chunk;
+ size_t i, npages;
#ifdef MALLOC_DEBUG
size_t ndirty;
ndirty = 0;
- RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) {
+ rb_foreach_begin(arena_chunk_t, link_all, &arena->chunks_all, chunk) {
+ ndirty += chunk->ndirty;
+ } rb_foreach_end(arena_chunk_t, link_all, &arena->chunks_all, chunk)
+ assert(ndirty == arena->ndirty);
+
+ ndirty = 0;
+ rb_foreach_begin(arena_chunk_t, link_dirty, &arena->chunks_dirty,
+ chunk) {
ndirty += chunk->ndirty;
- }
+ } rb_foreach_end(arena_chunk_t, link_dirty, &arena->chunks_dirty, chunk)
assert(ndirty == arena->ndirty);
#endif
assert(arena->ndirty > opt_dirty_max);
@@ -2413,46 +2454,47 @@
/*
* Iterate downward through chunks until enough dirty memory has been
+ * purged. Terminate as soon as possible in order to minimize the
+ * number of system calls, even if a chunk has only been partially
* purged.
*/
- RB_FOREACH_REVERSE(chunk, arena_chunk_tree_s, &arena->chunks) {
- if (chunk->ndirty > 0) {
- size_t i;
+ while (arena->ndirty > (opt_dirty_max >> 1)) {
+ chunk = arena_chunk_tree_dirty_last(&arena->chunks_dirty);
+ assert(chunk != NULL);
- for (i = chunk_npages - 1; i >=
- arena_chunk_header_npages; i--) {
- if (chunk->map[i] & CHUNK_MAP_DIRTY) {
- size_t npages;
+ for (i = chunk_npages - 1; chunk->ndirty > 0; i--) {
+ assert(i >= arena_chunk_header_npages);
- chunk->map[i] = (CHUNK_MAP_LARGE |
- CHUNK_MAP_POS_MASK);
- chunk->ndirty--;
- arena->ndirty--;
- /* Find adjacent dirty run(s). */
- for (npages = 1; i >
- arena_chunk_header_npages &&
- (chunk->map[i - 1] &
- CHUNK_MAP_DIRTY); npages++) {
- i--;
- chunk->map[i] = (CHUNK_MAP_LARGE
- | CHUNK_MAP_POS_MASK);
- chunk->ndirty--;
- arena->ndirty--;
- }
+ if (chunk->map[i] & CHUNK_MAP_DIRTY) {
+ chunk->map[i] = (CHUNK_MAP_LARGE |
+ CHUNK_MAP_POS_MASK);
+ /* Find adjacent dirty run(s). */
+ for (npages = 1; i > arena_chunk_header_npages
+ && (chunk->map[i - 1] & CHUNK_MAP_DIRTY);
+ npages++) {
+ i--;
+ chunk->map[i] = (CHUNK_MAP_LARGE
+ | CHUNK_MAP_POS_MASK);
+ }
+ chunk->ndirty -= npages;
+ arena->ndirty -= npages;
- madvise((void *)((uintptr_t)chunk + (i
- << pagesize_2pow)), pagesize *
- npages, MADV_FREE);
+ madvise((void *)((uintptr_t)chunk + (i <<
+ pagesize_2pow)), pagesize * npages,
+ MADV_FREE);
#ifdef MALLOC_STATS
- arena->stats.nmadvise++;
- arena->stats.purged += npages;
+ arena->stats.nmadvise++;
+ arena->stats.purged += npages;
#endif
- if (arena->ndirty <= (opt_dirty_max >>
- 1))
- return;
- }
+ if (arena->ndirty <= (opt_dirty_max >> 1))
+ break;
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list