svn commit: r225829 - in user/attilio/vmcontention: . contrib/top
etc/mtree gnu/usr.bin/groff/tmac include
kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5
kerberos5/lib/libgssapi_ntlm kerberos5/...
Attilio Rao
attilio at FreeBSD.org
Wed Sep 28 12:13:16 UTC 2011
Author: attilio
Date: Wed Sep 28 12:13:15 2011
New Revision: 225829
URL: http://svn.freebsd.org/changeset/base/225829
Log:
MFC
Modified:
user/attilio/vmcontention/Makefile.inc1
user/attilio/vmcontention/UPDATING
user/attilio/vmcontention/etc/mtree/BSD.include.dist
user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local
user/attilio/vmcontention/include/Makefile
user/attilio/vmcontention/include/iso646.h
user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile
user/attilio/vmcontention/kerberos5/lib/libgssapi_krb5/Makefile
user/attilio/vmcontention/kerberos5/lib/libgssapi_ntlm/Makefile
user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile
user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile
user/attilio/vmcontention/kerberos5/lib/libheimntlm/Makefile
user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile
user/attilio/vmcontention/kerberos5/lib/libkadm5clnt/Makefile
user/attilio/vmcontention/kerberos5/lib/libkadm5srv/Makefile
user/attilio/vmcontention/kerberos5/lib/libkafs5/Makefile
user/attilio/vmcontention/kerberos5/lib/libkrb5/Makefile
user/attilio/vmcontention/kerberos5/lib/libroken/Makefile
user/attilio/vmcontention/lib/libc/locale/isspace.3
user/attilio/vmcontention/lib/libfetch/common.c
user/attilio/vmcontention/lib/libfetch/common.h
user/attilio/vmcontention/lib/libfetch/fetch.3
user/attilio/vmcontention/lib/libfetch/fetch.c
user/attilio/vmcontention/lib/libfetch/fetch.h
user/attilio/vmcontention/lib/libfetch/file.c
user/attilio/vmcontention/lib/libfetch/ftp.c
user/attilio/vmcontention/lib/libfetch/http.c
user/attilio/vmcontention/release/Makefile.sysinstall
user/attilio/vmcontention/sbin/hastctl/hastctl.c
user/attilio/vmcontention/sbin/hastd/activemap.c
user/attilio/vmcontention/sbin/hastd/control.c
user/attilio/vmcontention/sbin/hastd/ebuf.c
user/attilio/vmcontention/sbin/hastd/event.c
user/attilio/vmcontention/sbin/hastd/hast_proto.c
user/attilio/vmcontention/sbin/hastd/hooks.c
user/attilio/vmcontention/sbin/hastd/metadata.c
user/attilio/vmcontention/sbin/hastd/nv.c
user/attilio/vmcontention/sbin/hastd/parse.y
user/attilio/vmcontention/sbin/hastd/pjdlog.c
user/attilio/vmcontention/sbin/hastd/primary.c
user/attilio/vmcontention/sbin/hastd/proto_tcp.c
user/attilio/vmcontention/sbin/hastd/rangelock.c
user/attilio/vmcontention/sbin/hastd/secondary.c
user/attilio/vmcontention/sbin/hastd/subr.c
user/attilio/vmcontention/sbin/hastd/synch.h
user/attilio/vmcontention/share/examples/cvsup/stable-supfile
user/attilio/vmcontention/share/man/man4/smp.4
user/attilio/vmcontention/share/man/man9/ifnet.9
user/attilio/vmcontention/share/misc/committers-src.dot
user/attilio/vmcontention/sys/conf/newvers.sh
user/attilio/vmcontention/sys/dev/ahci/ahci.c
user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c
user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c
user/attilio/vmcontention/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
user/attilio/vmcontention/sys/dev/ath/if_ath.c
user/attilio/vmcontention/sys/dev/ath/if_athvar.h
user/attilio/vmcontention/sys/dev/usb/quirk/usb_quirk.c
user/attilio/vmcontention/sys/dev/usb/usbdevs
user/attilio/vmcontention/sys/kern/kern_clock.c
user/attilio/vmcontention/sys/kern/kern_exec.c
user/attilio/vmcontention/sys/kern/subr_kdb.c
user/attilio/vmcontention/sys/kern/subr_syscall.c
user/attilio/vmcontention/sys/kern/uipc_usrreq.c
user/attilio/vmcontention/sys/modules/ipfw/Makefile
user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_pfil.c
user/attilio/vmcontention/sys/sys/param.h
user/attilio/vmcontention/sys/ufs/ffs/ffs_snapshot.c
user/attilio/vmcontention/tools/make_libdeps.sh
user/attilio/vmcontention/usr.bin/compress/zopen.c
user/attilio/vmcontention/usr.bin/fetch/fetch.1
user/attilio/vmcontention/usr.bin/fetch/fetch.c
user/attilio/vmcontention/usr.bin/gzip/zuncompress.c
user/attilio/vmcontention/usr.bin/script/script.1
user/attilio/vmcontention/usr.bin/script/script.c
user/attilio/vmcontention/usr.sbin/mfiutil/mfi_show.c
user/attilio/vmcontention/usr.sbin/pkg_install/add/main.c
Directory Properties:
user/attilio/vmcontention/ (props changed)
user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/contrib/bind9/ (props changed)
user/attilio/vmcontention/contrib/binutils/ (props changed)
user/attilio/vmcontention/contrib/bzip2/ (props changed)
user/attilio/vmcontention/contrib/compiler-rt/ (props changed)
user/attilio/vmcontention/contrib/dialog/ (props changed)
user/attilio/vmcontention/contrib/ee/ (props changed)
user/attilio/vmcontention/contrib/expat/ (props changed)
user/attilio/vmcontention/contrib/file/ (props changed)
user/attilio/vmcontention/contrib/gcc/ (props changed)
user/attilio/vmcontention/contrib/gdb/ (props changed)
user/attilio/vmcontention/contrib/gdtoa/ (props changed)
user/attilio/vmcontention/contrib/gnu-sort/ (props changed)
user/attilio/vmcontention/contrib/groff/ (props changed)
user/attilio/vmcontention/contrib/less/ (props changed)
user/attilio/vmcontention/contrib/libpcap/ (props changed)
user/attilio/vmcontention/contrib/libstdc++/ (props changed)
user/attilio/vmcontention/contrib/llvm/ (props changed)
user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed)
user/attilio/vmcontention/contrib/ncurses/ (props changed)
user/attilio/vmcontention/contrib/netcat/ (props changed)
user/attilio/vmcontention/contrib/ntp/ (props changed)
user/attilio/vmcontention/contrib/one-true-awk/ (props changed)
user/attilio/vmcontention/contrib/openbsm/ (props changed)
user/attilio/vmcontention/contrib/openpam/ (props changed)
user/attilio/vmcontention/contrib/openresolv/ (props changed)
user/attilio/vmcontention/contrib/pf/ (props changed)
user/attilio/vmcontention/contrib/sendmail/ (props changed)
user/attilio/vmcontention/contrib/tcpdump/ (props changed)
user/attilio/vmcontention/contrib/tcsh/ (props changed)
user/attilio/vmcontention/contrib/tnftp/ (props changed)
user/attilio/vmcontention/contrib/top/ (props changed)
user/attilio/vmcontention/contrib/top/install-sh (props changed)
user/attilio/vmcontention/contrib/tzcode/stdtime/ (props changed)
user/attilio/vmcontention/contrib/tzcode/zic/ (props changed)
user/attilio/vmcontention/contrib/tzdata/ (props changed)
user/attilio/vmcontention/contrib/wpa/ (props changed)
user/attilio/vmcontention/contrib/xz/ (props changed)
user/attilio/vmcontention/crypto/openssh/ (props changed)
user/attilio/vmcontention/crypto/openssl/ (props changed)
user/attilio/vmcontention/gnu/lib/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/binutils/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/cc/cc_tools/ (props changed)
user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed)
user/attilio/vmcontention/lib/libc/ (props changed)
user/attilio/vmcontention/lib/libc/stdtime/ (props changed)
user/attilio/vmcontention/lib/libutil/ (props changed)
user/attilio/vmcontention/lib/libz/ (props changed)
user/attilio/vmcontention/sbin/ (props changed)
user/attilio/vmcontention/sbin/ipfw/ (props changed)
user/attilio/vmcontention/share/mk/bsd.arch.inc.mk (props changed)
user/attilio/vmcontention/share/zoneinfo/ (props changed)
user/attilio/vmcontention/sys/ (props changed)
user/attilio/vmcontention/sys/amd64/include/xen/ (props changed)
user/attilio/vmcontention/sys/boot/ (props changed)
user/attilio/vmcontention/sys/boot/i386/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/efi/ (props changed)
user/attilio/vmcontention/sys/boot/ia64/ski/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/boot1.chrp/ (props changed)
user/attilio/vmcontention/sys/boot/powerpc/ofw/ (props changed)
user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed)
user/attilio/vmcontention/sys/conf/ (props changed)
user/attilio/vmcontention/sys/contrib/dev/acpica/ (props changed)
user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed)
user/attilio/vmcontention/sys/contrib/pf/ (props changed)
user/attilio/vmcontention/sys/contrib/x86emu/ (props changed)
user/attilio/vmcontention/usr.bin/calendar/ (props changed)
user/attilio/vmcontention/usr.bin/csup/ (props changed)
user/attilio/vmcontention/usr.bin/procstat/ (props changed)
user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvctl/ (props changed)
user/attilio/vmcontention/usr.sbin/rtadvd/ (props changed)
user/attilio/vmcontention/usr.sbin/rtsold/ (props changed)
user/attilio/vmcontention/usr.sbin/zic/ (props changed)
Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================
--- user/attilio/vmcontention/Makefile.inc1 Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/Makefile.inc1 Wed Sep 28 12:13:15 2011 (r225829)
@@ -1218,7 +1218,8 @@ _startup_libs+= lib/libc
gnu/lib/libgcc__L: lib/libc__L
-_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
+_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
+ ${_kerberos5_lib_libheimntlm} \
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
lib/libbz2 lib/libcom_err lib/libcrypt \
@@ -1268,6 +1269,19 @@ secure/lib/libssh__L: lib/libgssapi__L k
_secure_lib= secure/lib
.endif
+.if ${MK_KERBEROS} != "no"
+kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
+kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+ kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
+kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L
+kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+ secure/lib/libcrypto__L kerberos5/lib/libroken__L
+kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
+ lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
+ kerberos5/lib/libroken__L
+kerberos5/lib/libroken__L: lib/libcrypt__L
+.endif
+
.if ${MK_GSSAPI} != "no"
_lib_libgssapi= lib/libgssapi
.endif
@@ -1279,6 +1293,7 @@ _lib_libipx= lib/libipx
.if ${MK_KERBEROS} != "no"
_kerberos5_lib= kerberos5/lib
_kerberos5_lib_libasn1= kerberos5/lib/libasn1
+_kerberos5_lib_libhdb= kerberos5/lib/libhdb
_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
_kerberos5_lib_libhx509= kerberos5/lib/libhx509
_kerberos5_lib_libroken= kerberos5/lib/libroken
Modified: user/attilio/vmcontention/UPDATING
==============================================================================
--- user/attilio/vmcontention/UPDATING Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/UPDATING Wed Sep 28 12:13:15 2011 (r225829)
@@ -9,8 +9,8 @@ handbook.
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
- FreeBSD 9.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
+ FreeBSD 10.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110923:
+ The stable/9 branch created in subversion. This corresponds to the
+ RELENG_9 branch in CVS.
+
20110913:
This commit modifies vfs_register() so that it uses a hash
calculation to set vfc_typenum, which is enabled by default.
Modified: user/attilio/vmcontention/etc/mtree/BSD.include.dist
==============================================================================
--- user/attilio/vmcontention/etc/mtree/BSD.include.dist Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/etc/mtree/BSD.include.dist Wed Sep 28 12:13:15 2011 (r225829)
@@ -96,6 +96,8 @@
..
bktr
..
+ ciss
+ ..
firewire
..
hwpmc
Modified: user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/gnu/usr.bin/groff/tmac/mdoc.local Wed Sep 28 12:13:15 2011 (r225829)
@@ -71,12 +71,13 @@
.ds doc-volume-as-arm arm
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~9.0
+.ds doc-default-operating-system FreeBSD\~10.0
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
.ds doc-operating-system-FreeBSD-8.3 8.3
.ds doc-operating-system-FreeBSD-9.0 9.0
+.ds doc-operating-system-FreeBSD-10.0 10.0
.
.\" Definitions not (yet) in doc-syms
.
Modified: user/attilio/vmcontention/include/Makefile
==============================================================================
--- user/attilio/vmcontention/include/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/include/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -39,7 +39,7 @@ LDIRS= bsm cam geom net net80211 netatal
sys vm
LSUBDIRS= cam/ata cam/scsi \
- dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
+ dev/acpica dev/an dev/bktr dev/ciss dev/firewire dev/hwpmc \
dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \
dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
Modified: user/attilio/vmcontention/include/iso646.h
==============================================================================
--- user/attilio/vmcontention/include/iso646.h Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/include/iso646.h Wed Sep 28 12:13:15 2011 (r225829)
@@ -29,6 +29,8 @@
#ifndef _ISO646_H_
#define _ISO646_H_
+#ifndef __cplusplus
+
#define and &&
#define and_eq &=
#define bitand &
@@ -41,4 +43,6 @@
#define xor ^
#define xor_eq ^=
+#endif /* !__cplusplus */
+
#endif /* !_ISO646_H_ */
Modified: user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,7 +1,10 @@
# $FreeBSD$
LIB= asn1
+LDFLAGS= -Wl,--no-undefined
INCS= asn1_err.h heim_asn1.h
+LDADD= -lcom_err -lroken
+DPADD= ${LIBCOM_ERR} ${LIBROKEN}
SRCS= asn1_err.c \
asn1_err.h \
Modified: user/attilio/vmcontention/kerberos5/lib/libgssapi_krb5/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libgssapi_krb5/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libgssapi_krb5/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,7 +1,7 @@
# $FreeBSD$
LIB= gssapi_krb5
-LDFLAGS= -Wl,-Bsymbolic
+LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
${LIBCOM_ERR} ${LIBCRYPT}
Modified: user/attilio/vmcontention/kerberos5/lib/libgssapi_ntlm/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libgssapi_ntlm/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libgssapi_ntlm/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,9 +1,9 @@
# $FreeBSD$
LIB= gssapi_ntlm
-LDFLAGS= -Wl,-Bsymbolic
-LDADD= -lkrb5 -lhx509 -lheimntlm -lroken
-DPADD= ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
+LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
+LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken
+DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
SRCS= accept_sec_context.c \
acquire_cred.c \
Modified: user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,9 +1,9 @@
# $FreeBSD$
LIB= gssapi_spnego
-LDFLAGS= -Wl,-Bsymbolic
-LDADD= -lgssapi -lasn1
-DPADD= ${LIBGSSAPI} ${LIBASN1}
+LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
+LDADD= -lgssapi -lasn1 -lroken
+DPADD= ${LIBGSSAPI} ${LIBASN1} ${LIBROKEN}
SRCS= accept_sec_context.c \
compat.c \
Modified: user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,9 @@
# $FreeBSD$
LIB= hdb
+LDFLAGS= -Wl,--no-undefined
+LDADD= -lasn1 -lcom_err -lkrb5 -lroken
+DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
INCS= hdb-private.h \
hdb-protos.h \
Modified: user/attilio/vmcontention/kerberos5/lib/libheimntlm/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libheimntlm/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libheimntlm/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,9 @@
# $FreeBSD$
LIB= heimntlm
+LDFLAGS= -Wl,--no-undefined
+LDADD= -lcrypto -lkrb5
+DPADD= ${LIBCRYPTO} ${LIBKRB5}
SRCS= ntlm.c
INCS= heimntlm.h heimntlm-protos.h
CFLAGS+=-I${KRB5DIR}/lib/ntlm
Modified: user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,7 +1,10 @@
# $FreeBSD$
LIB= hx509
+LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
+LDADD= -lasn1 -lcom_err -lcrypto -lroken
+DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN}
INCS= hx509-private.h \
hx509-protos.h \
Modified: user/attilio/vmcontention/kerberos5/lib/libkadm5clnt/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libkadm5clnt/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libkadm5clnt/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,9 @@
# $FreeBSD$
LIB= kadm5clnt
+LDFLAGS= -Wl,--no-undefined
+LDADD= -lcom_err -lkrb5 -lroken
+DPADD= ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
INCS= admin.h \
kadm5-private.h \
Modified: user/attilio/vmcontention/kerberos5/lib/libkadm5srv/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libkadm5srv/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libkadm5srv/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,9 @@
# $FreeBSD$
LIB= kadm5srv
+LDFLAGS= -Wl,--no-undefined
+LDADD= -lcom_err -lhdb -lkrb5 -lroken
+DPADD= ${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN}
VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
SRCS= acl.c \
Modified: user/attilio/vmcontention/kerberos5/lib/libkafs5/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libkafs5/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libkafs5/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,9 @@
# $FreeBSD$
LIB= kafs5
+LDFLAGS= -Wl,--no-undefined
+LDADD= -lasn1 -lkrb5 -lroken
+DPADD= ${LIBASN1} ${LIBKRB5} ${LIBROKEN}
INCS= kafs.h
MAN= kafs5.3
Modified: user/attilio/vmcontention/kerberos5/lib/libkrb5/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libkrb5/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libkrb5/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,7 +1,10 @@
# $FreeBSD$
LIB= krb5
+LDFLAGS= -Wl,--no-undefined
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
+LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken
+DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN}
INCS= heim_err.h \
heim_threads.h \
Modified: user/attilio/vmcontention/kerberos5/lib/libroken/Makefile
==============================================================================
--- user/attilio/vmcontention/kerberos5/lib/libroken/Makefile Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/kerberos5/lib/libroken/Makefile Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,6 +1,8 @@
# $FreeBSD$
LIB= roken
+LDADD= -lcrypt
+DPADD= ${LIBCRYPT}
INCS= roken.h roken-common.h
SRCS= base64.c \
Modified: user/attilio/vmcontention/lib/libc/locale/isspace.3
==============================================================================
--- user/attilio/vmcontention/lib/libc/locale/isspace.3 Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libc/locale/isspace.3 Wed Sep 28 12:13:15 2011 (r225829)
@@ -47,16 +47,16 @@
.Sh DESCRIPTION
The
.Fn isspace
-function tests for the white-space characters.
+function tests for white-space characters.
For any locale, this includes the following standard characters:
.Pp
.Bl -column \&`\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___
.It "\&``\et''\t``\en''\t``\ev''\t``\ef''\t``\er''\t`` ''"
.El
.Pp
-In the "C" locale
+In the "C" locale,
.Fn isspace
-successful test is limited to this characters only.
+returns non-zero for these characters only.
The value of the argument must be representable as an
.Vt "unsigned char"
or the value of
Modified: user/attilio/vmcontention/lib/libfetch/common.c
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/common.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/common.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/lib/libfetch/common.h
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/common.h Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/common.h Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/lib/libfetch/fetch.3
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/fetch.3 Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/fetch.3 Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 1998-2011 Dag-Erling Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 26, 2010
+.Dd September 27, 2011
.Dt FETCH 3
.Os
.Sh NAME
@@ -318,9 +318,19 @@ and
implement the FTP protocol as described in RFC959.
.Pp
If the
+.Ql P
+(not passive) flag is specified, an active (rather than passive)
+connection will be attempted.
+.Pp
+The
.Ql p
-(passive) flag is specified, a passive (rather than active) connection
-will be attempted.
+flag is supported for compatibility with earlier versions where active
+connections were the default.
+It has precedence over the
+.Ql P
+flag, so if both are specified,
+.Nm
+will use a passive connection.
.Pp
If the
.Ql l
@@ -475,9 +485,11 @@ connections will be bound.
.It Ev FTP_LOGIN
Default FTP login if none was provided in the URL.
.It Ev FTP_PASSIVE_MODE
-If set to anything but
+If set to
.Ql no ,
-forces the FTP code to use passive mode.
+forces the FTP code to use active mode.
+If set to any other value, forces passive mode even if the application
+requested active mode.
.It Ev FTP_PASSWORD
Default FTP password if the remote server requests one and none was
provided in the URL.
Modified: user/attilio/vmcontention/lib/libfetch/fetch.c
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/fetch.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/fetch.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/lib/libfetch/fetch.h
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/fetch.h Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/fetch.h Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2004 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/lib/libfetch/file.c
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/file.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/file.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/lib/libfetch/ftp.c
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/ftp.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/ftp.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 1998-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -633,13 +633,12 @@ ftp_transfer(conn_t *conn, const char *o
/* check flags */
low = CHECK_FLAG('l');
- pasv = CHECK_FLAG('p');
+ pasv = CHECK_FLAG('p') || !CHECK_FLAG('P');
verbose = CHECK_FLAG('v');
/* passive mode */
- if (!pasv)
- pasv = ((s = getenv("FTP_PASSIVE_MODE")) != NULL &&
- strncasecmp(s, "no", 2) != 0);
+ if ((s = getenv("FTP_PASSIVE_MODE")) != NULL)
+ pasv = (strncasecmp(s, "no", 2) != 0);
/* isolate filename */
filename = ftp_filename(file, &filenamelen, &type);
Modified: user/attilio/vmcontention/lib/libfetch/http.c
==============================================================================
--- user/attilio/vmcontention/lib/libfetch/http.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/lib/libfetch/http.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2000-2011 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/attilio/vmcontention/release/Makefile.sysinstall
==============================================================================
--- user/attilio/vmcontention/release/Makefile.sysinstall Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/release/Makefile.sysinstall Wed Sep 28 12:13:15 2011 (r225829)
@@ -24,16 +24,16 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=9.0-CURRENT
+#BUILDNAME=10.0-CURRENT
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
-BASE = 9.0
+BASE = 10.0
BUILDNAME?=${BASE}-${DATE}-SNAP
#
#CHROOTDIR=/junk/release
# If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_8
+#RELEASETAG=RELENG_9
#
# To test a release with a source tree containing patches and
# other work. This tree will get copied instead of getting the
@@ -72,7 +72,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP
#
# Subversion branch to build for src. If this is not set then it is
# automatically computed from RELEASETAG.
-#SVNBRANCH=stable/8
+#SVNBRANCH=stable/9
#
# Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we
# are building an official release. Otherwise, we are building for
@@ -588,7 +588,7 @@ release rerelease:
echo " for i in ${MAKEINDEXPORTS}" >> ${_MK}
echo " do" >> ${_MK}
echo " cd /usr/ports/\$${i}" >> ${_MK}
- echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK}
+ echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-yes} PATH=$${PATH} \\" >> ${_MK}
echo " make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK}
echo " done" >> ${_MK}
echo " cd /usr/ports" >> ${_MK}
Modified: user/attilio/vmcontention/sbin/hastctl/hastctl.c
==============================================================================
--- user/attilio/vmcontention/sbin/hastctl/hastctl.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/sbin/hastctl/hastctl.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <sys/sysctl.h>
-#include <assert.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
@@ -433,19 +432,19 @@ main(int argc, char *argv[])
pjdlog_debug_set(debug);
cfg = yy_config_parse(cfgpath, true);
- assert(cfg != NULL);
+ PJDLOG_ASSERT(cfg != NULL);
switch (cmd) {
case CMD_CREATE:
control_create(argc, argv, mediasize, extentsize, keepdirty);
/* NOTREACHED */
- assert(!"What are we doing here?!");
+ PJDLOG_ABORT("What are we doing here?!");
break;
case CMD_DUMP:
/* Dump metadata from local component of the given resource. */
control_dump(argc, argv);
/* NOTREACHED */
- assert(!"What are we doing here?!");
+ PJDLOG_ABORT("What are we doing here?!");
break;
case CMD_ROLE:
/* Change role for the given resources. */
@@ -476,7 +475,7 @@ main(int argc, char *argv[])
}
break;
default:
- assert(!"Impossible command!");
+ PJDLOG_ABORT("Impossible command!");
}
/* Setup control connection... */
@@ -523,7 +522,7 @@ main(int argc, char *argv[])
error = control_status(nv);
break;
default:
- assert(!"Impossible command!");
+ PJDLOG_ABORT("Impossible command!");
}
exit(error);
Modified: user/attilio/vmcontention/sbin/hastd/activemap.c
==============================================================================
--- user/attilio/vmcontention/sbin/hastd/activemap.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/sbin/hastd/activemap.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h> /* powerof2() */
#include <sys/queue.h>
-#include <assert.h>
#include <bitstring.h>
#include <errno.h>
#include <stdint.h>
@@ -41,7 +40,14 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
-#include <activemap.h>
+#include <pjdlog.h>
+
+#include "activemap.h"
+
+#ifndef PJDLOG_ASSERT
+#include <assert.h>
+#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)
+#endif
#define ACTIVEMAP_MAGIC 0xac71e4
struct activemap {
@@ -93,9 +99,9 @@ off2ext(const struct activemap *amp, off
{
int extent;
- assert(offset >= 0 && offset < amp->am_mediasize);
+ PJDLOG_ASSERT(offset >= 0 && offset < amp->am_mediasize);
extent = (offset >> amp->am_extentshift);
- assert(extent >= 0 && extent < amp->am_nextents);
+ PJDLOG_ASSERT(extent >= 0 && extent < amp->am_nextents);
return (extent);
}
@@ -104,9 +110,9 @@ ext2off(const struct activemap *amp, int
{
off_t offset;
- assert(extent >= 0 && extent < amp->am_nextents);
+ PJDLOG_ASSERT(extent >= 0 && extent < amp->am_nextents);
offset = ((off_t)extent << amp->am_extentshift);
- assert(offset >= 0 && offset < amp->am_mediasize);
+ PJDLOG_ASSERT(offset >= 0 && offset < amp->am_mediasize);
return (offset);
}
@@ -122,7 +128,7 @@ ext2reqs(const struct activemap *amp, in
if (ext < amp->am_nextents - 1)
return (((amp->am_extentsize - 1) / MAXPHYS) + 1);
- assert(ext == amp->am_nextents - 1);
+ PJDLOG_ASSERT(ext == amp->am_nextents - 1);
left = amp->am_mediasize % amp->am_extentsize;
if (left == 0)
left = amp->am_extentsize;
@@ -139,13 +145,13 @@ activemap_init(struct activemap **ampp,
{
struct activemap *amp;
- assert(ampp != NULL);
- assert(mediasize > 0);
- assert(extentsize > 0);
- assert(powerof2(extentsize));
- assert(sectorsize > 0);
- assert(powerof2(sectorsize));
- assert(keepdirty > 0);
+ PJDLOG_ASSERT(ampp != NULL);
+ PJDLOG_ASSERT(mediasize > 0);
+ PJDLOG_ASSERT(extentsize > 0);
+ PJDLOG_ASSERT(powerof2(extentsize));
+ PJDLOG_ASSERT(sectorsize > 0);
+ PJDLOG_ASSERT(powerof2(sectorsize));
+ PJDLOG_ASSERT(keepdirty > 0);
amp = malloc(sizeof(*amp));
if (amp == NULL)
@@ -225,10 +231,10 @@ keepdirty_add(struct activemap *amp, int
*/
if (amp->am_nkeepdirty >= amp->am_nkeepdirty_limit) {
kd = TAILQ_LAST(&->am_keepdirty, skeepdirty);
- assert(kd != NULL);
+ PJDLOG_ASSERT(kd != NULL);
TAILQ_REMOVE(&->am_keepdirty, kd, kd_next);
amp->am_nkeepdirty--;
- assert(amp->am_nkeepdirty > 0);
+ PJDLOG_ASSERT(amp->am_nkeepdirty > 0);
}
if (kd == NULL)
kd = malloc(sizeof(*kd));
@@ -261,7 +267,7 @@ keepdirty_free(struct activemap *amp)
amp->am_nkeepdirty--;
free(kd);
}
- assert(amp->am_nkeepdirty == 0);
+ PJDLOG_ASSERT(amp->am_nkeepdirty == 0);
}
/*
@@ -271,7 +277,7 @@ void
activemap_free(struct activemap *amp)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
amp->am_magic = 0;
@@ -293,8 +299,8 @@ activemap_write_start(struct activemap *
off_t end;
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(length > 0);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(length > 0);
modified = false;
end = offset + length - 1;
@@ -307,7 +313,7 @@ activemap_write_start(struct activemap *
* was modified and has to be flushed to disk.
*/
if (amp->am_memtab[ext]++ == 0) {
- assert(!bit_test(amp->am_memmap, ext));
+ PJDLOG_ASSERT(!bit_test(amp->am_memmap, ext));
bit_set(amp->am_memmap, ext);
amp->am_ndirty++;
}
@@ -329,8 +335,8 @@ activemap_write_complete(struct activema
off_t end;
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(length > 0);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(length > 0);
modified = false;
end = offset + length - 1;
@@ -342,8 +348,8 @@ activemap_write_complete(struct activema
* By returning true we inform the caller that on-disk bitmap
* was modified and has to be flushed to disk.
*/
- assert(amp->am_memtab[ext] > 0);
- assert(bit_test(amp->am_memmap, ext));
+ PJDLOG_ASSERT(amp->am_memtab[ext] > 0);
+ PJDLOG_ASSERT(bit_test(amp->am_memmap, ext));
if (--amp->am_memtab[ext] == 0) {
bit_clear(amp->am_memmap, ext);
amp->am_ndirty--;
@@ -365,15 +371,15 @@ activemap_extent_complete(struct activem
bool modified;
int reqs;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(extent >= 0 && extent < amp->am_nextents);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(extent >= 0 && extent < amp->am_nextents);
modified = false;
reqs = ext2reqs(amp, extent);
- assert(amp->am_memtab[extent] >= reqs);
+ PJDLOG_ASSERT(amp->am_memtab[extent] >= reqs);
amp->am_memtab[extent] -= reqs;
- assert(bit_test(amp->am_memmap, extent));
+ PJDLOG_ASSERT(bit_test(amp->am_memmap, extent));
if (amp->am_memtab[extent] == 0) {
bit_clear(amp->am_memmap, extent);
amp->am_ndirty--;
@@ -390,7 +396,7 @@ uint64_t
activemap_ndirty(const struct activemap *amp)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
return (amp->am_ndirty);
}
@@ -403,7 +409,7 @@ bool
activemap_differ(const struct activemap *amp)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
return (memcmp(amp->am_diskmap, amp->am_memmap,
amp->am_mapsize) != 0);
@@ -416,7 +422,7 @@ size_t
activemap_size(const struct activemap *amp)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
return (amp->am_mapsize);
}
@@ -429,7 +435,7 @@ size_t
activemap_ondisk_size(const struct activemap *amp)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
return (amp->am_diskmapsize);
}
@@ -442,8 +448,8 @@ activemap_copyin(struct activemap *amp,
{
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(size >= amp->am_mapsize);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(size >= amp->am_mapsize);
memcpy(amp->am_diskmap, buf, amp->am_mapsize);
memcpy(amp->am_memmap, buf, amp->am_mapsize);
@@ -481,8 +487,8 @@ activemap_merge(struct activemap *amp, c
bitstr_t *remmap = __DECONST(bitstr_t *, buf);
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(size >= amp->am_mapsize);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(size >= amp->am_mapsize);
bit_ffs(remmap, amp->am_nextents, &ext);
if (ext == -1) {
@@ -521,7 +527,7 @@ const unsigned char *
activemap_bitmap(struct activemap *amp, size_t *sizep)
{
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
if (sizep != NULL)
*sizep = amp->am_diskmapsize;
@@ -539,11 +545,11 @@ activemap_calc_ondisk_size(uint64_t medi
{
uint64_t nextents, mapsize;
- assert(mediasize > 0);
- assert(extentsize > 0);
- assert(powerof2(extentsize));
- assert(sectorsize > 0);
- assert(powerof2(sectorsize));
+ PJDLOG_ASSERT(mediasize > 0);
+ PJDLOG_ASSERT(extentsize > 0);
+ PJDLOG_ASSERT(powerof2(extentsize));
+ PJDLOG_ASSERT(sectorsize > 0);
+ PJDLOG_ASSERT(powerof2(sectorsize));
nextents = ((mediasize - 1) / extentsize) + 1;
mapsize = sizeof(bitstr_t) * bitstr_size(nextents);
@@ -558,7 +564,7 @@ activemap_sync_rewind(struct activemap *
{
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
bit_ffs(amp->am_syncmap, amp->am_nextents, &ext);
if (ext == -1) {
@@ -581,9 +587,9 @@ activemap_sync_offset(struct activemap *
off_t syncoff, left;
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
- assert(lengthp != NULL);
- assert(syncextp != NULL);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(lengthp != NULL);
+ PJDLOG_ASSERT(syncextp != NULL);
*syncextp = -1;
@@ -632,9 +638,10 @@ activemap_sync_offset(struct activemap *
if (left > MAXPHYS)
left = MAXPHYS;
- assert(left >= 0 && left <= MAXPHYS);
- assert(syncoff >= 0 && syncoff < amp->am_mediasize);
- assert(syncoff + left >= 0 && syncoff + left <= amp->am_mediasize);
+ PJDLOG_ASSERT(left >= 0 && left <= MAXPHYS);
+ PJDLOG_ASSERT(syncoff >= 0 && syncoff < amp->am_mediasize);
+ PJDLOG_ASSERT(syncoff + left >= 0 &&
+ syncoff + left <= amp->am_mediasize);
*lengthp = left;
return (syncoff);
@@ -651,7 +658,7 @@ activemap_need_sync(struct activemap *am
off_t end;
int ext;
- assert(amp->am_magic == ACTIVEMAP_MAGIC);
+ PJDLOG_ASSERT(amp->am_magic == ACTIVEMAP_MAGIC);
modified = false;
end = offset + length - 1;
@@ -659,7 +666,7 @@ activemap_need_sync(struct activemap *am
for (ext = off2ext(amp, offset); ext <= off2ext(amp, end); ext++) {
if (bit_test(amp->am_syncmap, ext)) {
/* Already marked for synchronization. */
- assert(bit_test(amp->am_memmap, ext));
+ PJDLOG_ASSERT(bit_test(amp->am_memmap, ext));
continue;
}
bit_set(amp->am_syncmap, ext);
Modified: user/attilio/vmcontention/sbin/hastd/control.c
==============================================================================
--- user/attilio/vmcontention/sbin/hastd/control.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/sbin/hastd/control.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/wait.h>
-#include <assert.h>
#include <errno.h>
#include <pthread.h>
#include <signal.h>
@@ -82,8 +81,8 @@ control_set_role_common(struct hastd_con
nv_add_string(nvout, name, "resource%u", no);
if (res == NULL) {
- assert(cfg != NULL);
- assert(name != NULL);
+ PJDLOG_ASSERT(cfg != NULL);
+ PJDLOG_ASSERT(name != NULL);
TAILQ_FOREACH(res, &cfg->hc_resources, hr_next) {
if (strcmp(res->hr_name, name) == 0)
@@ -94,7 +93,7 @@ control_set_role_common(struct hastd_con
return;
}
}
- assert(res != NULL);
+ PJDLOG_ASSERT(res != NULL);
/* Send previous role back. */
nv_add_string(nvout, role2str(res->hr_role), "role%u", no);
@@ -222,9 +221,9 @@ control_status(struct hastd_config *cfg,
struct hast_resource *res, const char *name, unsigned int no)
{
- assert(cfg != NULL);
- assert(nvout != NULL);
- assert(name != NULL);
+ PJDLOG_ASSERT(cfg != NULL);
+ PJDLOG_ASSERT(nvout != NULL);
+ PJDLOG_ASSERT(name != NULL);
/* Name is always needed. */
nv_add_string(nvout, name, "resource%u", no);
@@ -239,7 +238,7 @@ control_status(struct hastd_config *cfg,
return;
}
}
- assert(res != NULL);
+ PJDLOG_ASSERT(res != NULL);
nv_add_string(nvout, res->hr_provname, "provname%u", no);
nv_add_string(nvout, res->hr_localpath, "localpath%u", no);
nv_add_string(nvout, res->hr_remoteaddr, "remoteaddr%u", no);
@@ -267,7 +266,7 @@ control_status(struct hastd_config *cfg,
switch (res->hr_role) {
case HAST_ROLE_PRIMARY:
- assert(res->hr_workerpid != 0);
+ PJDLOG_ASSERT(res->hr_workerpid != 0);
/* FALLTHROUGH */
case HAST_ROLE_SECONDARY:
if (res->hr_workerpid != 0)
@@ -470,7 +469,7 @@ ctrl_thread(void *arg)
* something related to us has changes, it sends reload
* message to us.
*/
- assert(res->hr_role == HAST_ROLE_PRIMARY);
+ PJDLOG_ASSERT(res->hr_role == HAST_ROLE_PRIMARY);
primary_config_reload(res, nvin);
nv_add_int16(nvout, 0, "error");
break;
Modified: user/attilio/vmcontention/sbin/hastd/ebuf.c
==============================================================================
--- user/attilio/vmcontention/sbin/hastd/ebuf.c Wed Sep 28 11:57:10 2011 (r225828)
+++ user/attilio/vmcontention/sbin/hastd/ebuf.c Wed Sep 28 12:13:15 2011 (r225829)
@@ -32,15 +32,21 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <assert.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>
#include <strings.h>
#include <unistd.h>
+#include <pjdlog.h>
+
#include "ebuf.h"
+#ifndef PJDLOG_ASSERT
+#include <assert.h>
+#define PJDLOG_ASSERT(...) assert(__VA_ARGS__)
+#endif
+
#define EBUF_MAGIC 0xeb0f41c
struct ebuf {
/* Magic to assert the caller uses valid structure. */
@@ -91,7 +97,7 @@ void
ebuf_free(struct ebuf *eb)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
eb->eb_magic = 0;
@@ -103,7 +109,7 @@ int
ebuf_add_head(struct ebuf *eb, const void *data, size_t size)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
if (size > (size_t)(eb->eb_used - eb->eb_start)) {
/*
@@ -113,7 +119,7 @@ ebuf_add_head(struct ebuf *eb, const voi
if (ebuf_head_extend(eb, size) < 0)
return (-1);
}
- assert(size <= (size_t)(eb->eb_used - eb->eb_start));
+ PJDLOG_ASSERT(size <= (size_t)(eb->eb_used - eb->eb_start));
eb->eb_size += size;
eb->eb_used -= size;
@@ -130,7 +136,7 @@ int
ebuf_add_tail(struct ebuf *eb, const void *data, size_t size)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
if (size > (size_t)(eb->eb_end - (eb->eb_used + eb->eb_size))) {
/*
@@ -140,7 +146,8 @@ ebuf_add_tail(struct ebuf *eb, const voi
if (ebuf_tail_extend(eb, size) < 0)
return (-1);
}
- assert(size <= (size_t)(eb->eb_end - (eb->eb_used + eb->eb_size)));
+ PJDLOG_ASSERT(size <=
+ (size_t)(eb->eb_end - (eb->eb_used + eb->eb_size)));
/*
* If data is NULL the caller just wants to reserve space.
@@ -156,8 +163,8 @@ void
ebuf_del_head(struct ebuf *eb, size_t size)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
- assert(size <= eb->eb_size);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(size <= eb->eb_size);
eb->eb_used += size;
eb->eb_size -= size;
@@ -167,8 +174,8 @@ void
ebuf_del_tail(struct ebuf *eb, size_t size)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
- assert(size <= eb->eb_size);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(size <= eb->eb_size);
eb->eb_size -= size;
}
@@ -180,7 +187,7 @@ void *
ebuf_data(struct ebuf *eb, size_t *sizep)
{
- assert(eb != NULL && eb->eb_magic == EBUF_MAGIC);
+ PJDLOG_ASSERT(eb != NULL && eb->eb_magic == EBUF_MAGIC);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list