PERFORCE change 145476 for review
Ed Schouten
ed at FreeBSD.org
Sat Jul 19 18:24:51 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=145476
Change 145476 by ed at ed_dull on 2008/07/19 18:24:09
Integrate the latest source, to do some performance benchmarks.
Affected files ...
.. //depot/projects/mpsafetty/bin/mv/mv.c#2 integrate
.. //depot/projects/mpsafetty/bin/ps/ps.c#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/amd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/apmd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/bsnmpd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/bthidd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/devd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ftp-proxy#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ftpd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/hcsecd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/idmapd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/keyserv#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/lockd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/lpd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/mountd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/moused#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/nfsd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/nscd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ntpd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/powerd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/rpcbind#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/rtadvd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/rwho#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/sdpd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/sendmail#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/sshd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/statd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/timed#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ugidfw#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/watchdogd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ypbind#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/yppasswdd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ypserv#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ypset#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ypupdated#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/ypxfrd#2 integrate
.. //depot/projects/mpsafetty/etc/rc.firewall#2 integrate
.. //depot/projects/mpsafetty/lib/libc/gen/signal.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/mpsafetty/lib/msun/Makefile#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/Makefile#3 integrate
.. //depot/projects/mpsafetty/share/man/man9/accept_filter.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/accf_data.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/accf_dns.9#1 branch
.. //depot/projects/mpsafetty/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/mpsafetty/sys/conf/NOTES#2 integrate
.. //depot/projects/mpsafetty/sys/conf/files#2 integrate
.. //depot/projects/mpsafetty/sys/conf/options#2 integrate
.. //depot/projects/mpsafetty/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/jme/if_jme.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ohci.c#2 integrate
.. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rename.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_autoconf.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/mpsafetty/sys/modules/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/modules/accf_dns/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/accf_dns.c#1 branch
.. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/mpsafetty/sys/sys/_task.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/imgact.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/interrupt.h#2 integrate
.. //depot/projects/mpsafetty/sys/sys/taskqueue.h#2 integrate
.. //depot/projects/mpsafetty/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/gcore/elfcore.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/yacc/skeleton.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/pw/pwupd.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/sysinstall/package.c#2 integrate
Differences ...
==== //depot/projects/mpsafetty/bin/mv/mv.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.50 2007/12/27 11:33:42 dds Exp $");
+__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.51 2008/07/19 00:13:26 delphij Exp $");
#include <sys/types.h>
#include <sys/acl.h>
@@ -70,10 +70,10 @@
int fflg, iflg, nflg, vflg;
-int copy(char *, char *);
-int do_move(char *, char *);
-int fastcopy(char *, char *, struct stat *);
-void usage(void);
+static int copy(const char *, const char *);
+static int do_move(const char *, const char *);
+static int fastcopy(const char *, const char *, struct stat *);
+static void usage(void);
int
main(int argc, char *argv[])
@@ -154,8 +154,8 @@
exit(rval);
}
-int
-do_move(char *from, char *to)
+static int
+do_move(const char *from, const char *to)
{
struct stat sb;
int ask, ch, first;
@@ -254,8 +254,8 @@
fastcopy(from, to, &sb) : copy(from, to));
}
-int
-fastcopy(char *from, char *to, struct stat *sbp)
+static int
+fastcopy(const char *from, const char *to, struct stat *sbp)
{
struct timeval tval[2];
static u_int blen;
@@ -360,8 +360,8 @@
return (0);
}
-int
-copy(char *from, char *to)
+static int
+copy(const char *from, const char *to)
{
struct stat sb;
int pid, status;
@@ -438,7 +438,7 @@
return (0);
}
-void
+static void
usage(void)
{
==== //depot/projects/mpsafetty/bin/ps/ps.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.113 2007/11/08 22:31:28 jhb Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.114 2008/07/18 14:55:22 kevlo Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -213,7 +213,7 @@
init_list(&uidlist, addelem_uid, sizeof(uid_t), "user");
memf = nlistf = _PATH_DEVNULL;
while ((ch = getopt(argc, argv, PS_ARGS)) != -1)
- switch ((char)ch) {
+ switch (ch) {
case 'A':
/*
* Exactly the same as `-ax'. This has been
==== //depot/projects/mpsafetty/etc/rc.d/amd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.22 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: amd
# REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
# BEFORE: DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/apmd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/apmd,v 1.14 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: apmd
# REQUIRE: DAEMON apm
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/bsnmpd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.1 2005/04/17 10:47:58 glebius Exp $
+# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.2 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: bsnmpd
# REQUIRE: NETWORKING syslogd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/bthidd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/bthidd,v 1.1 2006/09/07 22:25:08 emax Exp $
+# $FreeBSD: src/etc/rc.d/bthidd,v 1.2 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: bthidd
# REQUIRE: DAEMON hcsecd
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/devd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/devd,v 1.10 2006/09/21 14:29:32 brooks Exp $
+# $FreeBSD: src/etc/rc.d/devd,v 1.11 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: devd
# REQUIRE: netif network_ipv6
# BEFORE: NETWORKING mountcritremote
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ftp-proxy#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.2 2007/12/08 22:27:18 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.3 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ftp-proxy
# REQUIRE: DAEMON pf
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ftpd#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ftpd,v 1.1 2006/01/21 18:08:15 yar Exp $
+# $FreeBSD: src/etc/rc.d/ftpd,v 1.2 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ftpd
# REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/hcsecd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hcsecd,v 1.5 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/hcsecd,v 1.6 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: hcsecd
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/idmapd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/idmapd,v 1.1 2006/10/15 14:19:06 ceri Exp $
+# $FreeBSD: src/etc/rc.d/idmapd,v 1.2 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: idmapd
# REQUIRE: rpcbind
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/keyserv#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/keyserv,v 1.4 2007/12/08 22:27:18 dougb Exp $
+# $FreeBSD: src/etc/rc.d/keyserv,v 1.5 2008/07/16 19:50:29 dougb Exp $
#
# Start keyserv if we are running Secure RPC
@@ -8,6 +8,7 @@
# PROVIDE: keyserv
# REQUIRE: ypbind
# BEFORE: DAEMON
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/lockd#2 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
-# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $
+# $FreeBSD: src/etc/rc.d/lockd,v 1.22 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: lockd
# REQUIRE: nfsserver nfsclient nfsd rpcbind statd
# BEFORE: DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/lpd#2 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/lpd,v 1.9 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/lpd,v 1.10 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: lpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/mountd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/mountd,v 1.20 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/mountd,v 1.21 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: mountd
# REQUIRE: NETWORKING nfsserver rpcbind quota
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/moused#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/moused,v 1.13 2008/06/23 04:46:54 mtm Exp $
+# $FreeBSD: src/etc/rc.d/moused,v 1.14 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: moused
# REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/nfsd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/nfsd,v 1.14 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.15 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: nfsd
# REQUIRE: mountd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/nscd#2 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.7 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: nscd
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable nscd:
==== //depot/projects/mpsafetty/etc/rc.d/ntpd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ntpd,v 1.14 2008/05/12 11:49:16 flz Exp $
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.15 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ntpd
# REQUIRE: DAEMON ntpdate cleanvar devfs
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/powerd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/powerd,v 1.4 2006/08/27 11:04:39 cperciva Exp $
+# $FreeBSD: src/etc/rc.d/powerd,v 1.5 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: powerd
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/rpcbind#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/rpcbind,v 1.13 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/rpcbind,v 1.14 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: rpcbind
# REQUIRE: NETWORKING ntpdate syslogd named
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/rtadvd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/rtadvd,v 1.11 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/rtadvd,v 1.12 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: rtadvd
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/rwho#2 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/rwho,v 1.5 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/rwho,v 1.6 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: rwho
# REQUIRE: DAEMON
# BEFORE: LOGIN
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/sdpd#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/sdpd,v 1.5 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/sdpd,v 1.6 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: sdpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/sendmail#2 (text+ko) ====
@@ -1,12 +1,13 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/sendmail,v 1.18 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/sendmail,v 1.19 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: mail
# REQUIRE: LOGIN cleanvar
# we make mail start late, so that things like .forward's are not
# processed until the system is fully operational
+# KEYWORD: shutdown
# XXX - Get together with sendmail mantainer to figure out how to
# better handle SENDMAIL_ENABLE and 3rd party MTAs.
==== //depot/projects/mpsafetty/etc/rc.d/sshd#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/sshd,v 1.13 2007/12/08 07:20:22 dougb Exp $
+# $FreeBSD: src/etc/rc.d/sshd,v 1.14 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: sshd
# REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/statd#2 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
-# $FreeBSD: src/etc/rc.d/statd,v 1.20 2008/06/27 15:45:17 mtm Exp $
+# $FreeBSD: src/etc/rc.d/statd,v 1.21 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: statd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/timed#2 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/timed,v 1.6 2007/12/08 07:20:23 dougb Exp $
+# $FreeBSD: src/etc/rc.d/timed,v 1.7 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: timed
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ugidfw#2 (text+ko) ====
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ugidfw,v 1.6 2007/12/08 22:26:30 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ugidfw,v 1.7 2008/07/16 19:50:29 dougb Exp $
# PROVIDE: ugidfw
# BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/watchdogd#2 (text+ko) ====
@@ -24,12 +24,12 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/watchdogd,v 1.5 2005/01/16 03:12:03 obrien Exp $
+# $FreeBSD: src/etc/rc.d/watchdogd,v 1.6 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: watchdogd
# REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ypbind#2 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypbind,v 1.11 2007/12/08 07:20:23 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ypbind,v 1.12 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ypbind
# REQUIRE: ypserv
# BEFORE: DAEMON
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/yppasswdd#2 (text+ko) ====
@@ -1,11 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.12 2007/12/08 07:20:23 dougb Exp $
+# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.13 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: yppasswdd
# REQUIRE: ypserv ypbind
# BEFORE: LOGIN
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ypserv#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypserv,v 1.13 2007/12/08 07:20:23 dougb Exp $
+# $FreeBSD: src/etc/rc.d/ypserv,v 1.14 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ypserv
# REQUIRE: rpcbind
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ypset#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypset,v 1.7 2006/12/30 22:53:20 yar Exp $
+# $FreeBSD: src/etc/rc.d/ypset,v 1.8 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ypset
# REQUIRE: ypbind
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ypupdated#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypupdated,v 1.6 2006/12/30 22:53:20 yar Exp $
+# $FreeBSD: src/etc/rc.d/ypupdated,v 1.7 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ypupdated
# REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.d/ypxfrd#2 (text+ko) ====
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.8 2006/12/30 22:53:20 yar Exp $
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.9 2008/07/16 19:50:29 dougb Exp $
#
# PROVIDE: ypxfrd
# REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/mpsafetty/etc/rc.firewall#2 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.firewall,v 1.55 2008/06/06 07:17:04 keramida Exp $
+# $FreeBSD: src/etc/rc.firewall,v 1.56 2008/07/17 20:00:18 danger Exp $
#
#
@@ -194,6 +194,7 @@
${fwcmd} add deny tcp from any to any setup
# Allow DNS queries out in the world
+ ${fwcmd} add pass tcp from me to any 53 setup keep-state
${fwcmd} add pass udp from me to any 53 keep-state
# Allow NTP queries out in the world
@@ -294,6 +295,7 @@
${fwcmd} add pass tcp from any to any setup
# Allow DNS queries out in the world
+ ${fwcmd} add pass tcp from ${oip} to any 53 setup keep-state
${fwcmd} add pass udp from ${oip} to any 53 keep-state
# Allow NTP queries out in the world
==== //depot/projects/mpsafetty/lib/libc/gen/signal.3#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)signal.3 8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.42 2007/01/09 00:27:55 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/signal.3,v 1.43 2008/07/17 21:54:23 simon Exp $
.\"
.Dd June 7, 2004
.Dt SIGNAL 3
@@ -181,10 +181,12 @@
For some system calls, if a signal is caught while the call is
executing and the call is prematurely terminated,
the call is automatically restarted.
-(The handler is installed using the
+Any handler installed with
+.Xr signal 3
+will have the
.Dv SA_RESTART
-flag with
-.Xr sigaction 2 . )
+flag set, meaning that any restartable system call will not return on
+receipt of a signal.
The affected system calls include
.Xr read 2 ,
.Xr write 2 ,
==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#2 (text+ko) ====
@@ -70,9 +70,9 @@
* | | 8 kB |
* | | 12 kB |
* | | ... |
- * | | 1008 kB |
* | | 1012 kB |
* | | 1016 kB |
+ * | | 1020 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.172 2008/06/10 15:46:18 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.173 2008/07/18 19:35:44 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -292,11 +292,7 @@
#define RUN_MAX_OVRHD 0x0000003dU
#define RUN_MAX_OVRHD_RELAX 0x00001800U
-/*
- * Put a cap on small object run size. This overrides RUN_MAX_OVRHD. Note
- * that small runs must be small enough that page offsets can fit within the
- * CHUNK_MAP_POS_MASK bits.
- */
+/* Put a cap on small object run size. This overrides RUN_MAX_OVRHD. */
#define RUN_MAX_SMALL_2POW 15
#define RUN_MAX_SMALL (1U << RUN_MAX_SMALL_2POW)
@@ -444,8 +440,10 @@
/* Tree of extents. */
typedef struct extent_node_s extent_node_t;
struct extent_node_s {
+#ifdef MALLOC_DSS
/* Linkage for the size/address-ordered tree. */
rb_node(extent_node_t) link_szad;
+#endif
/* Linkage for the address-ordered tree. */
rb_node(extent_node_t) link_ad;
@@ -466,15 +464,67 @@
typedef struct arena_s arena_t;
typedef struct arena_bin_s arena_bin_t;
-/*
- * Each map element contains several flags, plus page position for runs that
- * service small allocations.
- */
-typedef uint8_t arena_chunk_map_t;
-#define CHUNK_MAP_UNTOUCHED 0x80U
-#define CHUNK_MAP_DIRTY 0x40U
-#define CHUNK_MAP_LARGE 0x20U
-#define CHUNK_MAP_POS_MASK 0x1fU
+/* Each element of the chunk map corresponds to one page within the chunk. */
+typedef struct arena_chunk_map_s arena_chunk_map_t;
+struct arena_chunk_map_s {
+ /*
+ * Linkage for run trees. There are two disjoint uses:
+ *
+ * 1) arena_t's runs_avail tree.
+ * 2) arena_run_t conceptually uses this linkage for in-use non-full
+ * runs, rather than directly embedding linkage.
+ */
+ rb_node(arena_chunk_map_t) link;
+
+ /*
+ * Run address (or size) and various flags are stored together. The bit
+ * layout looks like (assuming 32-bit system):
+ *
+ * ???????? ???????? ????---- ---kdzla
+ *
+ * ? : Unallocated: Run address for first/last pages, unset for internal
+ * pages.
+ * Small: Run address.
+ * Large: Run size for first page, unset for trailing pages.
+ * - : Unused.
+ * k : key?
+ * d : dirty?
+ * z : zeroed?
+ * l : large?
+ * a : allocated?
+ *
+ * Following are example bit patterns for the three types of runs.
+ *
+ * r : run address
+ * s : run size
+ * x : don't care
+ * - : 0
+ * [dzla] : bit set
+ *
+ * Unallocated:
+ * ssssssss ssssssss ssss---- --------
+ * xxxxxxxx xxxxxxxx xxxx---- ----d---
+ * ssssssss ssssssss ssss---- -----z--
+ *
+ * Small:
+ * rrrrrrrr rrrrrrrr rrrr---- -------a
+ * rrrrrrrr rrrrrrrr rrrr---- -------a
+ * rrrrrrrr rrrrrrrr rrrr---- -------a
+ *
+ * Large:
+ * ssssssss ssssssss ssss---- ------la
+ * -------- -------- -------- ------la
+ * -------- -------- -------- ------la
+ */
+ size_t bits;
+#define CHUNK_MAP_KEY ((size_t)0x10U)
+#define CHUNK_MAP_DIRTY ((size_t)0x08U)
+#define CHUNK_MAP_ZEROED ((size_t)0x04U)
+#define CHUNK_MAP_LARGE ((size_t)0x02U)
+#define CHUNK_MAP_ALLOCATED ((size_t)0x01U)
+};
+typedef rb_tree(arena_chunk_map_t) arena_avail_tree_t;
+typedef rb_tree(arena_chunk_map_t) arena_run_tree_t;
/* Arena chunk header. */
typedef struct arena_chunk_s arena_chunk_t;
@@ -482,42 +532,19 @@
/* Arena that owns the chunk. */
arena_t *arena;
- /* 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
- * detection of empty chunks fast.
- */
- size_t pages_used;
-
/* Number of dirty pages. */
size_t ndirty;
- /*
- * 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_t nodes;
- extent_node_t *nodes_past;
-
- /*
- * Map of pages within chunk that keeps track of free/large/small. For
- * free runs, only the map entries for the first and last pages are
- * kept up to date, so that free runs can be quickly coalesced.
- */
+ /* Map of pages within chunk that keeps track of free/large/small. */
arena_chunk_map_t map[1]; /* Dynamically sized. */
};
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. */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list