svn commit: r290863 - head/tools/tools/locale

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 14:19:08 2015
New Revision: 290863
URL: https://svnweb.freebsd.org/changeset/base/290863

Log:
  Allow to generate the locale when the source directory is not /usr/src

Modified:
  head/tools/tools/locale/Makefile

Modified: head/tools/tools/locale/Makefile
==
--- head/tools/tools/locale/MakefileSun Nov 15 13:09:08 2015
(r290862)
+++ head/tools/tools/locale/MakefileSun Nov 15 14:19:08 2015
(r290863)
@@ -41,15 +41,15 @@ install:
 .for t in ${TYPES}
 .  if ${KNOWN:M${t}}
rm -rf ${.CURDIR}/${t}.draft
-   rm -rf ${DESTDIR}/usr/src/share/${t}
-   mv ${.CURDIR}/${t} ${DESTDIR}/usr/src/share/
+   rm -rf ${.CURDIR}/../../../share/${t}
+   mv ${.CURDIR}/${t} ${.CURDIR}/../../../share/${t}
 .  endif
 .endfor
 
 post-install:
 .for t in ${TYPES}
 .  if ${KNOWN:M${t}}
-   (cd ${DESTDIR}/usr/src/share/${t} && \
+   (cd ${.CURDIR}/../../../share/${t} && \
make && make install && make clean)
 .  endif
 .endfor
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290014 - in stable/10: lib/libthr/arch/amd64 lib/libthr/arch/i386 libexec/rtld-elf/amd64 libexec/rtld-elf/i386 share/mk

[Konstantin Belousov]

On Sat, Nov 14, 2015 at 06:30:13PM +, David Chisnall wrote:
> On 26 Oct 2015, at 16:21, Eric van Gyzen  wrote:
> > 
> > One counter-argument to this change is that most applications already
> >  use SIMD, and the number of applications and amount of SIMD usage
> >  are only increasing.
> 
> Note that SSE and SIMD are not the same thing.  The x86-64 ABI uses SSE 
> registers for floating point arguments, so even a purely scalar application 
> that uses floating point will end up faulting in the SSE state.  This is not 
> the case on IA32, where x87 registers are used (though when compiling for 
> i686, SSE is used by default because register allocation for x87 is a huge 
> pain).
> 

Is it ?  If SSE is used on i686 (AKA >= Pentium Pro) by default,
this is a huge bug.

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290014 - in stable/10: lib/libthr/arch/amd64 lib/libthr/arch/i386 libexec/rtld-elf/amd64 libexec/rtld-elf/i386 share/mk

[Bruce Evans]

On Sun, 15 Nov 2015, Konstantin Belousov wrote:


On Sat, Nov 14, 2015 at 06:30:13PM +, David Chisnall wrote:

On 26 Oct 2015, at 16:21, Eric van Gyzen  wrote:


One counter-argument to this change is that most applications already
 use SIMD, and the number of applications and amount of SIMD usage
 are only increasing.


Note that SSE and SIMD are not the same thing.  The x86-64 ABI uses SSE 
registers for floating point arguments, so even a purely scalar application 
that uses floating point will end up faulting in the SSE state.  This is not 
the case on IA32, where x87 registers are used (though when compiling for i686, 
SSE is used by default because register allocation for x87 is a huge pain).


Is it ?  If SSE is used on i686 (AKA >= Pentium Pro) by default,
this is a huge bug.


clang is not as broken as that.  It needs excessive setting of -march to
get SSE instructions and of course a runtime arch that has SSE to execute
them.  I usually see it by forcing -march=core2 or -march=native on a
host arch that has SSE.

Using SSE instead of x87 on i386 is a usually a small pessimization except
in large functions where the x87 register set is too small or non-scalar
SSE can be used, since the i386 ABI requires returning results in x87
registers and the conversions between SSE and x87 for this have large
latency.  But clang doesn't understand the x87 very well, so it tends to
be faster using SSE despite this.  Strangely, it appears to understand the
x87 better on amd64 than on i386 -- better than gcc on amd64, but worse
than gcc on i386.  I think this is mostly because to kill SSE for
arithmetic on i386 on arches that support it, all use of SSE must be
killed using -mno-sse or -march=lower.  -mfpmath=387 to give fine control
of this is still broken in clang: -march=i386 -mfpmath=387 works, but
-march=core2 -mfpmath=387 fails with "'387' not supported.  Similarly for
any arch that supports sse, or with -mfpmath=sse on an arch where clang
wants to use x87.

gcc supports -mfpmath=387 even on amd64.  This is just slower, and usually
not more accurate, since the ABI forces conversons on function return.

Bruce
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290865 - head/tools/tools/locale/tools

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 14:34:29 2015
New Revision: 290865
URL: https://svnweb.freebsd.org/changeset/base/290865

Log:
  Generate in the FreeBSD keyword when generating the Makefiles

Modified:
  head/tools/tools/locale/tools/cldr2def.pl

Modified: head/tools/tools/locale/tools/cldr2def.pl
==
--- head/tools/tools/locale/tools/cldr2def.pl   Sun Nov 15 14:19:56 2015
(r290864)
+++ head/tools/tools/locale/tools/cldr2def.pl   Sun Nov 15 14:34:29 2015
(r290865)
@@ -831,6 +831,7 @@ sub make_makefile {
}
open(FOUT, ">$TYPE.draft/Makefile");
print FOUT <

Re: svn commit: r290620 - head/lib/libc/locale

[Alexey Dokuchaev]

On Sun, Nov 15, 2015 at 02:26:21PM +0100, Baptiste Daroussin wrote:
> On Sun, Nov 15, 2015 at 01:19:27PM +, Alexey Dokuchaev wrote:
> > On Tue, Nov 10, 2015 at 07:34:35AM +, Alexey Dokuchaev wrote:
> > > On Mon, Nov 09, 2015 at 10:11:37PM +, Baptiste Daroussin wrote:
> > > > New Revision: 290620
> > > > URL: https://svnweb.freebsd.org/changeset/base/290620
> > > > 
> > > > Log:
> > > >   Readd ascii.c forgotten in r290618
> > > > 
> > > > Added:
> > > >   head/lib/libc/locale/ascii.c   (contents, props changed)
> > > 
> > > I think it should've been repocopied.
> > 
> > Am I wrong?
> 
> yes and no.
> 
> actually the new ascii.c is based on none.c and not from the old ascii.c

This is nice piece of information that could've made in the commit log. :)

> This one should have been repocopied but I have no idea how to fix
> afterward without messing up even more the history.

Hmm, wouldn't the following work?:

  svn cp .../ascii.c@last-rev-before-replace ascii.c
  
  svn ci -m '... explaining the need for repocopy and that the new ascii.c
is based on none.c' ascii.c

./danfe
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290864 - head/tools/tools/locale/etc

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 14:19:56 2015
New Revision: 290864
URL: https://svnweb.freebsd.org/changeset/base/290864

Log:
  Add ISO8859-1 everywhere ISO8859-15 exists

Modified:
  head/tools/tools/locale/etc/charmaps.xml

Modified: head/tools/tools/locale/etc/charmaps.xml
==
--- head/tools/tools/locale/etc/charmaps.xmlSun Nov 15 14:19:08 2015
(r290863)
+++ head/tools/tools/locale/etc/charmaps.xmlSun Nov 15 14:19:56 2015
(r290864)
@@ -42,28 +42,28 @@
countries="BG" />
  







   

















https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290840 - head/etc

[Ian Lepore]

On Sun, 2015-11-15 at 03:04 +, Garrett Cooper wrote:
> Author: ngie
> Date: Sun Nov 15 03:04:39 2015
> New Revision: 290840
> URL: https://svnweb.freebsd.org/changeset/base/290840
> 
> Log:
>   Setup the symlink to /sys to mirror one's current source, e.g. if
> my source
>   tree was /usr/src/svn, /sys would point to usr/src/svn
>   
>   This fixes the assumption that the source tree will always exist at
>   ${DESTDIR}/usr/src
>   
>   MFC after: 1 week
>   PR: 76362
>   Reported by: Scot Hetzel 
>   Sponsored by: EMC / Isilon Storage Division
> 
> Modified:
>   head/etc/Makefile
> 
> Modified: head/etc/Makefile
> =
> =
> --- head/etc/Makefile Sun Nov 15 01:50:17 2015(r290839
> )
> +++ head/etc/Makefile Sun Nov 15 03:04:39 2015(r290840
> )
> @@ -408,7 +408,7 @@ distrib-dirs: ${MTREES:N/*} distrib-clea
>   ${METALOG.add} ; \
>   done; true
>  .endif
> - ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
> + ${INSTALL_SYMLINK} ${SRCTOP:C/^\///}/sys ${DESTDIR}/sys
>  .if ${MK_MAN} != "no"
>   cd ${DESTDIR}${SHAREDIR}/man; \
>   for mandir in man*; do \
> 

This might make some sense if DESTDIR is empty or /, but with most uses
of non-empty DESTDIR this is just going to make a symlink to some
random place that likely won't even exist on the running system.  If
source code is later installed to that DESTDIR as well, the /sys link
will just be broken in a way that's likely to lead to very confusing
errors.

-- Ian

___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290866 - in head: . etc/mtree share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef share/timedef

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 14:51:10 2015
New Revision: 290866
URL: https://svnweb.freebsd.org/changeset/base/290866

Log:
  Regenerate locales after readding ISO8859-1 for locales that have ISO8859-15
  
  Requested by: arche

Added:
  head/share/ctypedef/ca_IT.ISO8859-1.src
 - copied unchanged from r290865, head/share/ctypedef/ca_IT.ISO8859-15.src
  head/share/ctypedef/ja_JP.eucJP.src
 - copied unchanged from r290865, head/share/ctypedef/ja_JP.SJIS.src
  head/share/ctypedef/zh_Hans_CN.eucCN.src
 - copied unchanged from r290865, head/share/ctypedef/zh_Hans_CN.GB18030.src
  head/share/monetdef/de_AT.ISO8859-1.src   (contents, props changed)
  head/share/monetdef/en_IE.ISO8859-1.src   (contents, props changed)
  head/share/monetdef/nl_NL.ISO8859-1.src   (contents, props changed)
  head/share/monetdef/sv_FI.ISO8859-1.src   (contents, props changed)
Deleted:
  head/share/ctypedef/ca_IT.ISO8859-15.src
  head/share/ctypedef/ja_JP.SJIS.src
  head/share/ctypedef/zh_Hans_CN.GB18030.src
  head/share/monetdef/sk_SK.ISO8859-2.src
Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/share/colldef/Makefile
  head/share/ctypedef/Makefile
  head/share/monetdef/Makefile
  head/share/msgdef/Makefile
  head/share/numericdef/Makefile
  head/share/timedef/Makefile

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Sun Nov 15 14:34:29 2015(r290865)
+++ head/ObsoleteFiles.inc  Sun Nov 15 14:51:10 2015(r290866)
@@ -49,69 +49,6 @@ OLD_FILES+=usr/share/locale/zh_TW.UTF-8/
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
-OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
-OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
-OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
-OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
-OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
-OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
-OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE

svn commit: r290867 - in head/sys: netinet6 netpfil/pf

[Alexander V. Chernikov]

Author: melifaro
Date: Sun Nov 15 16:02:22 2015
New Revision: 290867
URL: https://svnweb.freebsd.org/changeset/base/290867

Log:
  Bring back the ability of passing cached route via nd6_output_ifp().

Modified:
  head/sys/netinet6/ip6_forward.c
  head/sys/netinet6/ip6_output.c
  head/sys/netinet6/nd6.c
  head/sys/netinet6/nd6.h
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netinet6/ip6_forward.c
==
--- head/sys/netinet6/ip6_forward.c Sun Nov 15 14:51:10 2015
(r290866)
+++ head/sys/netinet6/ip6_forward.c Sun Nov 15 16:02:22 2015
(r290867)
@@ -571,7 +571,7 @@ pass:
goto bad;
}
 
-   error = nd6_output_ifp(rt->rt_ifp, origifp, m, dst);
+   error = nd6_output_ifp(rt->rt_ifp, origifp, m, dst, NULL);
if (error) {
in6_ifstat_inc(rt->rt_ifp, ifs6_out_discard);
IP6STAT_INC(ip6s_cantforward);

Modified: head/sys/netinet6/ip6_output.c
==
--- head/sys/netinet6/ip6_output.c  Sun Nov 15 14:51:10 2015
(r290866)
+++ head/sys/netinet6/ip6_output.c  Sun Nov 15 16:02:22 2015
(r290867)
@@ -935,7 +935,7 @@ passout:
m->m_pkthdr.len);
ifa_free(>ia_ifa);
}
-   error = nd6_output_ifp(ifp, origifp, m, dst);
+   error = nd6_output_ifp(ifp, origifp, m, dst, NULL);
goto done;
}
 
@@ -1034,7 +1034,7 @@ sendorfree:
counter_u64_add(ia->ia_ifa.ifa_obytes,
m->m_pkthdr.len);
}
-   error = nd6_output_ifp(ifp, origifp, m, dst);
+   error = nd6_output_ifp(ifp, origifp, m, dst, NULL);
} else
m_freem(m);
}

Modified: head/sys/netinet6/nd6.c
==
--- head/sys/netinet6/nd6.c Sun Nov 15 14:51:10 2015(r290866)
+++ head/sys/netinet6/nd6.c Sun Nov 15 16:02:22 2015(r290867)
@@ -1905,7 +1905,7 @@ nd6_grab_holdchain(struct llentry *ln, s
 
 int
 nd6_output_ifp(struct ifnet *ifp, struct ifnet *origifp, struct mbuf *m,
-struct sockaddr_in6 *dst)
+struct sockaddr_in6 *dst, struct route *ro)
 {
int error;
int ip6len;
@@ -1944,7 +1944,7 @@ nd6_output_ifp(struct ifnet *ifp, struct
if ((ifp->if_flags & IFF_LOOPBACK) == 0)
origifp = ifp;
 
-   error = (*ifp->if_output)(origifp, m, (struct sockaddr *)dst, NULL);
+   error = (*ifp->if_output)(origifp, m, (struct sockaddr *)dst, ro);
return (error);
 }
 
@@ -2192,7 +2192,7 @@ nd6_flush_holdchain(struct ifnet *ifp, s
while (m_head) {
m = m_head;
m_head = m_head->m_nextpkt;
-   error = nd6_output_ifp(ifp, origifp, m, dst);
+   error = nd6_output_ifp(ifp, origifp, m, dst, NULL);
}
 
/*

Modified: head/sys/netinet6/nd6.h
==
--- head/sys/netinet6/nd6.h Sun Nov 15 14:51:10 2015(r290866)
+++ head/sys/netinet6/nd6.h Sun Nov 15 16:02:22 2015(r290867)
@@ -422,7 +422,7 @@ int nd6_flush_holdchain(struct ifnet *, 
 int nd6_add_ifa_lle(struct in6_ifaddr *);
 void nd6_rem_ifa_lle(struct in6_ifaddr *, int);
 int nd6_output_ifp(struct ifnet *, struct ifnet *, struct mbuf *,
-struct sockaddr_in6 *);
+struct sockaddr_in6 *, struct route *);
 
 /* nd6_nbr.c */
 void nd6_na_input(struct mbuf *, int, int);

Modified: head/sys/netpfil/pf/pf.c
==
--- head/sys/netpfil/pf/pf.cSun Nov 15 14:51:10 2015(r290866)
+++ head/sys/netpfil/pf/pf.cSun Nov 15 16:02:22 2015(r290867)
@@ -5588,7 +5588,7 @@ pf_route6(struct mbuf **m, struct pf_rul
if (IN6_IS_SCOPE_EMBED(_addr))
dst.sin6_addr.s6_addr16[1] = htons(ifp->if_index);
if ((u_long)m0->m_pkthdr.len <= ifp->if_mtu)
-   nd6_output_ifp(ifp, ifp, m0, );
+   nd6_output_ifp(ifp, ifp, m0, , NULL);
else {
in6_ifstat_inc(ifp, ifs6_in_toobig);
if (r->rt != PF_DUPTO)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290857 - head/sys/kern

[Ivan Klymenko]

On Sun, 15 Nov 2015 12:10:52 + (UTC)
Edward Tomasz Napierala  wrote:

> Author: trasz
> Date: Sun Nov 15 12:10:51 2015
> New Revision: 290857
> URL: https://svnweb.freebsd.org/changeset/base/290857
> 
> Log:
>   Speed up rctl operation with large rulesets, by holding the lock
>   during iteration instead of relocking it for each traversed rule.
>   
>   Reviewed by:mjg@
>   MFC after:  1 month
>   Sponsored by:   The FreeBSD Foundation
>   Differential Revision:  https://reviews.freebsd.org/D4110
> 
> Modified:
>   head/sys/kern/kern_jail.c
>   head/sys/kern/kern_loginclass.c
>   head/sys/kern/kern_racct.c
>   head/sys/kern/kern_rctl.c
>   head/sys/kern/kern_resource.c
> 
> Modified: head/sys/kern/kern_jail.c

/usr/local/libexec/ccache/world/cc -target x86_64-unknown-freebsd11.0 
--sysroot=/media/da0s1/obj/usr/src/tmp -B/media/da0s1/obj/usr/src/tmp/usr/bin 
-c -O2 -pipe -fno-strict-aliasing -march=native  -nostdinc  -I. -I/usr/src/sys 
-I/usr/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include 
opt_global.h  -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer 
-mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -msoft-float  
-fno-asynchronous-unwind-tables -ffreestanding -fwrapv -fstack-protector -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes 
-Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign 
-D__printf__=__freebsd_kprintf__  -Wmissing-include-dirs 
-fdiagnostics-show-option  -Wno-unknown-pragmas  
-Wno-error-tautological-compare -Wno-error-empty-body  
-Wno-error-parentheses-equality -Wno-error-unused-function  
-Wno-error-pointer-sign -Wno-error-shift-negative-value  -O3 -fvectorize 
-fslp-vectorize -fblocks -fcolor-diagnostics -mno-
 aes -mno-avx  -std=iso9899:1999 -Werror  /usr/src/sys/kern/kern_jail.c
/usr/src/sys/kern/kern_jail.c:4482:1: error: conflicting types for 
'prison_racct_foreach'
prison_racct_foreach(void (*callback)(struct racct *racct,
^
/usr/src/sys/sys/jail.h:407:6: note: previous declaration is here
void prison_racct_foreach(void (*callback)(struct racct *racct,
 ^
1 error generated.
*** Error code 1

Stop.
make[2]: stopped in /media/da0s1/obj/usr/src/sys/mk11
*** Error code 1

Stop.
make[1]: stopped in /usr/src
*** Error code 1

Stop.
make: stopped in /usr/src
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290860 - head/lib/libc/tests/stdio

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 12:48:42 2015
New Revision: 290860
URL: https://svnweb.freebsd.org/changeset/base/290860

Log:
  Remove unused variables to fix building world

Modified:
  head/lib/libc/tests/stdio/fmemopen2_test.c
  head/lib/libc/tests/stdio/getdelim_test.c
  head/lib/libc/tests/stdio/perror_test.c
  head/lib/libc/tests/stdio/scanfloat_test.c

Modified: head/lib/libc/tests/stdio/fmemopen2_test.c
==
--- head/lib/libc/tests/stdio/fmemopen2_test.c  Sun Nov 15 12:44:31 2015
(r290859)
+++ head/lib/libc/tests/stdio/fmemopen2_test.c  Sun Nov 15 12:48:42 2015
(r290860)
@@ -105,10 +105,9 @@ ATF_TC_WITHOUT_HEAD(test_autoalloc);
 ATF_TC_BODY(test_autoalloc, tc)
 {
/* Let fmemopen allocate the buffer. */
-   char str[] = "A quick test";
FILE *fp;
long pos;
-   size_t nofw, nofr, i;
+   size_t nofw, i;
int rc;
 
/* Open a FILE * using fmemopen. */

Modified: head/lib/libc/tests/stdio/getdelim_test.c
==
--- head/lib/libc/tests/stdio/getdelim_test.c   Sun Nov 15 12:44:31 2015
(r290859)
+++ head/lib/libc/tests/stdio/getdelim_test.c   Sun Nov 15 12:48:42 2015
(r290860)
@@ -113,7 +113,6 @@ ATF_TC_BODY(getline_basic, tc)
 ATF_TC_WITHOUT_HEAD(stream_error);
 ATF_TC_BODY(stream_error, tc)
 {
-   FILE *fp;
char *line;
size_t linecap;
 

Modified: head/lib/libc/tests/stdio/perror_test.c
==
--- head/lib/libc/tests/stdio/perror_test.c Sun Nov 15 12:44:31 2015
(r290859)
+++ head/lib/libc/tests/stdio/perror_test.c Sun Nov 15 12:48:42 2015
(r290860)
@@ -48,7 +48,7 @@ static char tmpfil[PATH_MAX];
 ATF_TC_WITHOUT_HEAD(perror_test);
 ATF_TC_BODY(perror_test, tc)
 {
-   char buf[512], lbuf[512];
+   char lbuf[512];
int i;
char *s;
 

Modified: head/lib/libc/tests/stdio/scanfloat_test.c
==
--- head/lib/libc/tests/stdio/scanfloat_test.c  Sun Nov 15 12:44:31 2015
(r290859)
+++ head/lib/libc/tests/stdio/scanfloat_test.c  Sun Nov 15 12:48:42 2015
(r290860)
@@ -58,7 +58,6 @@ ATF_TC_BODY(normalized_numbers, tc)
long double ld = 0.0;
double d = 0.0;
float f = 0.0;
-   char *endp;
 
buf[0] = '\0';
ATF_REQUIRE(setlocale(LC_NUMERIC, ""));
@@ -157,7 +156,6 @@ ATF_TC_BODY(infinities_and_nans, tc)
long double ld = 0.0;
double d = 0.0;
float f = 0.0;
-   char *endp;
 
ATF_REQUIRE(setlocale(LC_NUMERIC, "C"));
 
@@ -205,11 +203,8 @@ ATF_TC_BODY(infinities_and_nans, tc)
 ATF_TC_WITHOUT_HEAD(rounding_tests);
 ATF_TC_BODY(rounding_tests, tc)
 {
-   char buf[128];
long double ld = 0.0;
double d = 0.0;
-   float f = 0.0;
-   char *endp;
 
ATF_REQUIRE(setlocale(LC_NUMERIC, "C"));
 
@@ -287,10 +282,6 @@ ATF_TC_BODY(rounding_tests, tc)
 ATF_TC_WITHOUT_HEAD(strtod);
 ATF_TC_BODY(strtod, tc)
 {
-   char buf[128];
-   long double ld = 0.0;
-   double d = 0.0;
-   float f = 0.0;
char *endp;
 
ATF_REQUIRE(setlocale(LC_NUMERIC, "C"));
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290861 - head/sys/sys

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Nov 15 12:50:14 2015
New Revision: 290861
URL: https://svnweb.freebsd.org/changeset/base/290861

Log:
  Doh, commit in a wrong directory.  Fix r290857.
  
  MFC after:1 month
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/sys/jail.h
  head/sys/sys/loginclass.h
  head/sys/sys/resourcevar.h

Modified: head/sys/sys/jail.h
==
--- head/sys/sys/jail.h Sun Nov 15 12:48:42 2015(r290860)
+++ head/sys/sys/jail.h Sun Nov 15 12:50:14 2015(r290861)
@@ -405,7 +405,8 @@ char *prison_name(struct prison *, struc
 int prison_priv_check(struct ucred *cred, int priv);
 int sysctl_jail_param(SYSCTL_HANDLER_ARGS);
 void prison_racct_foreach(void (*callback)(struct racct *racct,
-void *arg2, void *arg3), void *arg2, void *arg3);
+void *arg2, void *arg3), void (*pre)(void), void (*post)(void),
+void *arg2, void *arg3);
 struct prison_racct *prison_racct_find(const char *name);
 void prison_racct_hold(struct prison_racct *prr);
 void prison_racct_free(struct prison_racct *prr);

Modified: head/sys/sys/loginclass.h
==
--- head/sys/sys/loginclass.h   Sun Nov 15 12:48:42 2015(r290860)
+++ head/sys/sys/loginclass.h   Sun Nov 15 12:50:14 2015(r290861)
@@ -48,6 +48,7 @@ void  loginclass_hold(struct loginclass *
 void   loginclass_free(struct loginclass *lc);
 struct loginclass  *loginclass_find(const char *name);
 void   loginclass_racct_foreach(void (*callback)(struct racct *racct,
-   void *arg2, void *arg3), void *arg2, void *arg3);
+   void *arg2, void *arg3), void (*pre)(void), void (*post)(void),
+   void *arg2, void *arg3);
 
 #endif /* !_SYS_LOGINCLASS_H_ */

Modified: head/sys/sys/resourcevar.h
==
--- head/sys/sys/resourcevar.h  Sun Nov 15 12:48:42 2015(r290860)
+++ head/sys/sys/resourcevar.h  Sun Nov 15 12:50:14 2015(r290861)
@@ -156,7 +156,8 @@ void uihashinit(void);
 voiduihold(struct uidinfo *uip);
 #ifdef RACCT
 voidui_racct_foreach(void (*callback)(struct racct *racct,
-   void *arg2, void *arg3), void *arg2, void *arg3);
+   void *arg2, void *arg3), void (*pre)(void), void (*post)(void),
+   void *arg2, void *arg3);
 #endif
 
 #endif /* _KERNEL */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290862 - head/share/locale-links

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 13:09:08 2015
New Revision: 290862
URL: https://svnweb.freebsd.org/changeset/base/290862

Log:
  Simplify a bit the aliases generation

Modified:
  head/share/locale-links/Makefile

Modified: head/share/locale-links/Makefile
==
--- head/share/locale-links/MakefileSun Nov 15 12:50:14 2015
(r290861)
+++ head/share/locale-links/MakefileSun Nov 15 13:09:08 2015
(r290862)
@@ -4,24 +4,18 @@ LOCALEDIR=${SHAREDIR}/locale
 LC_FILES=  LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC \
LC_TIME
 
-# We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some
-# of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it
-# We won't alias zh_Hans_CN or zh_Hans_UTF8 though
-.for CN in GB18030 GB2312 GBK UTF-8 eucCN
-.for f in ${LC_FILES}
-SYMLINKS+= zh_Hans_CN.${CN}/${f} ${LOCALEDIR}/zh_CN.${CN}/${f}
-.endfor
-.endfor
-
-.for HK in Big5HKSCS UTF-8
-.for f in ${LC_FILES}
-SYMLINKS+= zh_Hant_HK.${HK}/${f} ${LOCALEDIR}/zh_HK.${HK}/${f}
-.endfor
-.endfor
+ALIASES=   zh_Hans_CN.GB18030 zh_CN.GB18030 \
+   zh_Hans_CN.GB2312 zh_CN.GB2312 \
+   zh_Hans_CN.GBK zh_CN.GBK \
+   zh_Hans_CN.eucCN zh_CN.eucCN \
+   zh_Hant_HK.Big5HKSCS zh_HK.Big5HKSCS \
+   zh_Hant_HK.UTF-8 zh_HK.UTF-8 \
+   zh_Hant_TW.Big5 zh_TW.Big5 \
+   zh_Hant_TW.UTF-8 zh_TW.UTF-8
 
-.for TW in Big5 UTF-8
+.for from to in ${ALIASES}
 .for f in ${LC_FILES}
-SYMLINKS+= zh_Hant_TW.${TW}/${f} ${LOCALEDIR}/zh_TW.${TW}/${f}
+SYMLINKS+= ${from}/${f} ${LOCALEDIR}/${to}/${f}
 .endfor
 .endfor
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290855 - head/sys/dev/ata/chipsets

[Alexander Motin]

Author: mav
Date: Sun Nov 15 10:58:01 2015
New Revision: 290855
URL: https://svnweb.freebsd.org/changeset/base/290855

Log:
  Increase reset assertion time from 10 to 100us.
  
  On my own tests I see no effect from this change, but I also can't
  reproduce the reported problem in general.
  
  PR:   127391
  PR:   204554
  Submitted by: s...@iranger.com
  MFC after:2 weeks

Modified:
  head/sys/dev/ata/chipsets/ata-intel.c

Modified: head/sys/dev/ata/chipsets/ata-intel.c
==
--- head/sys/dev/ata/chipsets/ata-intel.c   Sun Nov 15 07:14:17 2015
(r290854)
+++ head/sys/dev/ata/chipsets/ata-intel.c   Sun Nov 15 10:58:01 2015
(r290855)
@@ -422,7 +422,7 @@ ata_intel_reset(device_t dev)
mask |= (1 << smap[1]);
pci_write_config(parent, 0x92,
pci_read_config(parent, 0x92, 2) & ~mask, 2);
-   DELAY(10);
+   DELAY(100);
pci_write_config(parent, 0x92,
pci_read_config(parent, 0x92, 2) | mask, 2);
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290856 - head/contrib/netbsd-tests/lib/libc/stdio

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 11:18:37 2015
New Revision: 290856
URL: https://svnweb.freebsd.org/changeset/base/290856

Log:
  also skip the definition of ':fopen_regular' to avoid the build to fail due to
  unused variables defined by ATF macros

Modified:
  head/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c

Modified: head/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c
==
--- head/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c  Sun Nov 15 10:58:01 
2015(r290855)
+++ head/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c  Sun Nov 15 11:18:37 
2015(r290856)
@@ -303,6 +303,7 @@ ATF_TC_BODY(fopen_perm, tc)
ATF_REQUIRE_ERRNO(EACCES, fopen("/bin/ls", "w+") == NULL);
 }
 
+#ifdef __NetBSD__
 ATF_TC(fopen_regular);
 ATF_TC_HEAD(fopen_regular, tc)
 {
@@ -335,6 +336,7 @@ ATF_TC_BODY(fopen_regular, tc)
}
}
 }
+#endif
 
 ATF_TC_WITH_CLEANUP(fopen_seek);
 ATF_TC_HEAD(fopen_seek, tc)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290828 - head/sys/net

[Alexander V . Chernikov]

Well, initially it was my mistake :) Anyway, AF_UNSPEC was better than 
non-deterministic "i".
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290861 - head/sys/sys

[Ivan Klymenko]

On Sun, 15 Nov 2015 12:50:15 + (UTC)
Edward Tomasz Napierala  wrote:

> Author: trasz
> Date: Sun Nov 15 12:50:14 2015
> New Revision: 290861
> URL: https://svnweb.freebsd.org/changeset/base/290861
> 
> Log:
>   Doh, commit in a wrong directory.  Fix r290857.
>   
>   MFC after:  1 month
>   Sponsored by:   The FreeBSD Foundation
> 
> Modified:
>   head/sys/sys/jail.h
>   head/sys/sys/loginclass.h
>   head/sys/sys/resourcevar.h
> 
> Modified: head/sys/sys/jail.h
> 

Thanks!
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290620 - head/lib/libc/locale

[Alexey Dokuchaev]

On Tue, Nov 10, 2015 at 07:34:35AM +, Alexey Dokuchaev wrote:
> On Mon, Nov 09, 2015 at 10:11:37PM +, Baptiste Daroussin wrote:
> > New Revision: 290620
> > URL: https://svnweb.freebsd.org/changeset/base/290620
> > 
> > Log:
> >   Readd ascii.c forgotten in r290618
> > 
> > Added:
> >   head/lib/libc/locale/ascii.c   (contents, props changed)
> 
> I think it should've been repocopied.

Am I wrong?

./danfe
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290857 - head/sys/kern

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Nov 15 12:10:51 2015
New Revision: 290857
URL: https://svnweb.freebsd.org/changeset/base/290857

Log:
  Speed up rctl operation with large rulesets, by holding the lock
  during iteration instead of relocking it for each traversed rule.
  
  Reviewed by:  mjg@
  MFC after:1 month
  Sponsored by: The FreeBSD Foundation
  Differential Revision:https://reviews.freebsd.org/D4110

Modified:
  head/sys/kern/kern_jail.c
  head/sys/kern/kern_loginclass.c
  head/sys/kern/kern_racct.c
  head/sys/kern/kern_rctl.c
  head/sys/kern/kern_resource.c

Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c   Sun Nov 15 11:18:37 2015(r290856)
+++ head/sys/kern/kern_jail.c   Sun Nov 15 12:10:51 2015(r290857)
@@ -4480,15 +4480,20 @@ SYSCTL_JAIL_PARAM(_allow_mount, zfs, CTL
 #ifdef RACCT
 void
 prison_racct_foreach(void (*callback)(struct racct *racct,
-void *arg2, void *arg3), void *arg2, void *arg3)
+void *arg2, void *arg3), void (*pre)(void), void (*post)(void),
+void *arg2, void *arg3)
 {
struct prison_racct *prr;
 
ASSERT_RACCT_ENABLED();
 
sx_slock(_lock);
+   if (pre != NULL)
+   (pre)();
LIST_FOREACH(prr, _racct, prr_next)
(callback)(prr->prr_racct, arg2, arg3);
+   if (post != NULL)
+   (post)();
sx_sunlock(_lock);
 }
 

Modified: head/sys/kern/kern_loginclass.c
==
--- head/sys/kern/kern_loginclass.c Sun Nov 15 11:18:37 2015
(r290856)
+++ head/sys/kern/kern_loginclass.c Sun Nov 15 12:10:51 2015
(r290857)
@@ -234,12 +234,17 @@ sys_setloginclass(struct thread *td, str
 
 void
 loginclass_racct_foreach(void (*callback)(struct racct *racct,
-void *arg2, void *arg3), void *arg2, void *arg3)
+void *arg2, void *arg3), void (*pre)(void), void (*post)(void),
+void *arg2, void *arg3)
 {
struct loginclass *lc;
 
rw_rlock(_lock);
+   if (pre != NULL)
+   (pre)();
LIST_FOREACH(lc, , lc_next)
(callback)(lc->lc_racct, arg2, arg3);
+   if (post != NULL)
+   (post)();
rw_runlock(_lock);
 }

Modified: head/sys/kern/kern_racct.c
==
--- head/sys/kern/kern_racct.c  Sun Nov 15 11:18:37 2015(r290856)
+++ head/sys/kern/kern_racct.c  Sun Nov 15 12:10:51 2015(r290857)
@@ -1156,6 +1156,7 @@ racct_decay_resource(struct racct *racct
int64_t r_old, r_new;
 
ASSERT_RACCT_ENABLED();
+   mtx_assert(_lock, MA_OWNED);
 
resource = *(int *)res;
r_old = racct->r_resources[resource];
@@ -1164,9 +1165,21 @@ racct_decay_resource(struct racct *racct
if (r_old <= 0)
return;
 
-   mtx_lock(_lock);
r_new = r_old * RACCT_DECAY_FACTOR / FSCALE;
racct->r_resources[resource] = r_new;
+}
+
+static void
+racct_decay_pre(void)
+{
+
+   mtx_lock(_lock);
+}
+
+static void
+racct_decay_post(void)
+{
+
mtx_unlock(_lock);
 }
 
@@ -1176,9 +1189,12 @@ racct_decay(int resource)
 
ASSERT_RACCT_ENABLED();
 
-   ui_racct_foreach(racct_decay_resource, , NULL);
-   loginclass_racct_foreach(racct_decay_resource, , NULL);
-   prison_racct_foreach(racct_decay_resource, , NULL);
+   ui_racct_foreach(racct_decay_resource, racct_decay_pre,
+   racct_decay_post, , NULL);
+   loginclass_racct_foreach(racct_decay_resource, racct_decay_pre,
+   racct_decay_post, , NULL);
+   prison_racct_foreach(racct_decay_resource, racct_decay_pre,
+   racct_decay_post, , NULL);
 }
 
 static void

Modified: head/sys/kern/kern_rctl.c
==
--- head/sys/kern/kern_rctl.c   Sun Nov 15 11:18:37 2015(r290856)
+++ head/sys/kern/kern_rctl.c   Sun Nov 15 12:10:51 2015(r290857)
@@ -1150,16 +1150,29 @@ rctl_rule_add(struct rctl_rule *rule)
 }
 
 static void
+rctl_rule_pre_callback(void)
+{
+
+   rw_wlock(_lock);
+}
+
+static void
+rctl_rule_post_callback(void)
+{
+
+   rw_wunlock(_lock);
+}
+
+static void
 rctl_rule_remove_callback(struct racct *racct, void *arg2, void *arg3)
 {
struct rctl_rule *filter = (struct rctl_rule *)arg2;
int found = 0;
 
ASSERT_RACCT_ENABLED();
+   rw_assert(_lock, RA_WLOCKED);
 
-   rw_wlock(_lock);
found += rctl_racct_remove_rules(racct, filter);
-   rw_wunlock(_lock);
 
*((int *)arg3) += found;
 }
@@ -1186,12 +1199,15 @@ rctl_rule_remove(struct rctl_rule *filte
return (ESRCH);
}
 
-   loginclass_racct_foreach(rctl_rule_remove_callback, filter,
-   (void *));
-   ui_racct_foreach(rctl_rule_remove_callback, filter,
-   (void *));
-

svn commit: r290859 - in head: . etc/mtree share/locale-links

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 12:44:31 2015
New Revision: 290859
URL: https://svnweb.freebsd.org/changeset/base/290859

Log:
  Rework locale-links to not make symlinks on directories but symlinks on files
  
  The goal here is to make the upgrade seamless for users
  Add aliases for zh_HK
  Remove bad symlinks created by previous bad upgrade procedure.
  Complete ObsoleteFiles.inc with more locales that have been removed

Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/share/locale-links/Makefile

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Sun Nov 15 12:16:08 2015(r290858)
+++ head/ObsoleteFiles.inc  Sun Nov 15 12:44:31 2015(r290859)
@@ -38,9 +38,185 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151115: Fox bad upgrade scheme
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
+OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
+OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
+OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
+OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
+OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
+OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
+OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
+OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
+OLD_FILES+=usr

Re: svn commit: r290620 - head/lib/libc/locale

[Baptiste Daroussin]

On Sun, Nov 15, 2015 at 01:19:27PM +, Alexey Dokuchaev wrote:
> On Tue, Nov 10, 2015 at 07:34:35AM +, Alexey Dokuchaev wrote:
> > On Mon, Nov 09, 2015 at 10:11:37PM +, Baptiste Daroussin wrote:
> > > New Revision: 290620
> > > URL: https://svnweb.freebsd.org/changeset/base/290620
> > > 
> > > Log:
> > >   Readd ascii.c forgotten in r290618
> > > 
> > > Added:
> > >   head/lib/libc/locale/ascii.c   (contents, props changed)
> > 
> > I think it should've been repocopied.
> 
> Am I wrong?
> 
yes and no.

actually the new ascii.c is based on none.c and not from the old ascii.c

This one should have been repocopied but I have no idea how to fix afterward
without messing up even more the history.

Bapt


signature.asc
Description: PGP signature

svn commit: r290873 - head/tools/build/mk

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 19:58:05 2015
New Revision: 290873
URL: https://svnweb.freebsd.org/changeset/base/290873

Log:
  Update the list of files to be removed in case world is built WITHOUT_LOCALES

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 19:30:56 
2015(r290872)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 19:58:05 
2015(r290873)
@@ -4247,12 +4247,6 @@ OLD_FILES+=usr/share/locale/af_ZA.ISO885
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
@@ -4265,6 +4259,42 @@ OLD_FILES+=usr/share/locale/am_ET.UTF-8/
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
@@ -4475,12 +4505,6 @@ OLD_FILES+=usr/share/locale/en_AU.ISO885
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
@@ -4499,12 +4523,6 @@ OLD_FILES+=usr/share/locale/en_CA.ISO885
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
-OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 

svn commit: r290874 - head/tools/build/mk

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 20:00:00 2015
New Revision: 290874
URL: https://svnweb.freebsd.org/changeset/base/290874

Log:
  Remove trailing spaces at end of lines

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 19:58:05 
2015(r290873)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 20:00:00 
2015(r290874)
@@ -2774,15 +2774,15 @@ OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
-OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz   
+OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
-OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz  
+OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
-OLD_FILES+=usr/share/man/man3/iconvlist.3.gz   
+OLD_FILES+=usr/share/man/man3/iconvlist.3.gz
 .endif
 
 .if ${MK_INET6} == no
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290868 - head/lib/libc/tests/net

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 18:45:04 2015
New Revision: 290868
URL: https://svnweb.freebsd.org/changeset/base/290868

Log:
  Fix -Wformat issues
  
  X-MFC with: r290563
  MFC after: 1 week
  Reported by: gcc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/tests/net/ether_test.c

Modified: head/lib/libc/tests/net/ether_test.c
==
--- head/lib/libc/tests/net/ether_test.cSun Nov 15 16:02:22 2015
(r290867)
+++ head/lib/libc/tests/net/ether_test.cSun Nov 15 18:45:04 2015
(r290868)
@@ -65,7 +65,7 @@ ATF_TC_BODY(ether_line_bad_1, tc)
char hostname[256];
 
ATF_REQUIRE_MSG(ether_line(ether_line_bad_1_string, , hostname) != 0,
-   "ether_line succeeded unexpectedly", errno);
+   "ether_line succeeded unexpectedly; errno=%d", errno);
 }
 
 static const char *ether_line_bad_2_string = "x x";
@@ -77,7 +77,7 @@ ATF_TC_BODY(ether_line_bad_2, tc)
char hostname[256];
 
ATF_REQUIRE_MSG(ether_line(ether_line_bad_2_string, , hostname) != 0,
-   "ether_line succeeded unexpectedly", errno);
+   "ether_line succeeded unexpectedly; errno=%d", errno);
 }
 
 static const char *ether_aton_string = "01:23:45:67:89:ab";
@@ -92,7 +92,7 @@ ATF_TC_BODY(ether_aton_r, tc)
 
ep = ether_aton_r(ether_aton_string, );
 
-   ATF_REQUIRE_MSG(ep != NULL, "ether_aton_r failed", errno);
+   ATF_REQUIRE_MSG(ep != NULL, "ether_aton_r failed; errno=%d", errno);
ATF_REQUIRE_MSG(ep == ,
"ether_aton_r returned different pointers; %p != %p", ep, );
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290870 - head/share/mk

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 18:51:48 2015
New Revision: 290870
URL: https://svnweb.freebsd.org/changeset/base/290870

Log:
  Add NO_WERROR and WARNS to PROG_OVERRIDE_VARS for bsd.prog.mk compatibility
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.progs.mk

Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk  Sun Nov 15 18:49:31 2015(r290869)
+++ head/share/mk/bsd.progs.mk  Sun Nov 15 18:51:48 2015(r290870)
@@ -41,8 +41,8 @@ PROG ?= $t
 
 .if defined(PROG)
 # just one of many
-PROG_OVERRIDE_VARS +=  BINDIR BINGRP BINOWN BINMODE DPSRCS MAN PROGNAME \
-   SRCS
+PROG_OVERRIDE_VARS +=  BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
+   PROGNAME SRCS WARNS
 PROG_VARS +=   CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \
LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290871 - head/lib/libc/tests/stdio

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 18:56:58 2015
New Revision: 290871
URL: https://svnweb.freebsd.org/changeset/base/290871

Log:
  Disable -Wformat with scanfloat_test when compiling with gcc to avoid a
  "use of assignment suppression and length modifier together in scanf format"
  warning on line 90 (it's intentional)
  
  MFC after: 1 week
  X-MFC with: r290537, r290856, r290860
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libc/tests/stdio/Makefile

Modified: head/lib/libc/tests/stdio/Makefile
==
--- head/lib/libc/tests/stdio/Makefile  Sun Nov 15 18:51:48 2015
(r290870)
+++ head/lib/libc/tests/stdio/Makefile  Sun Nov 15 18:56:58 2015
(r290871)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include 
+
 ATF_TESTS_C+=  fdopen_test
 ATF_TESTS_C+=  fmemopen2_test
 ATF_TESTS_C+=  fopen2_test
@@ -32,6 +34,12 @@ LDADD.printfloat_test+=  -lm
 DPADD.scanfloat_test+= ${LIBM}
 LDADD.scanfloat_test+= -lm
 
+.if ${COMPILER_TYPE} == "gcc"
+# 90: use of assignment suppression and length modifier together in scanf 
format
+PROG_OVERRIDE_VARS+=   NO_WFORMAT
+NO_WFORMAT.scanfloat_test=
+.endif
+
 .include "../Makefile.netbsd-tests"
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290875 - in stable/10: lib/libc/tests/string tools/regression/lib/libc/string

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:08:34 2015
New Revision: 290875
URL: https://svnweb.freebsd.org/changeset/base/290875

Log:
  MFC r290539:
  
  Integrate tools/regression/lib/libc/string into the FreeBSD test suite
  as lib/libc/tests/string
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/lib/libc/tests/string/stpncpy_test.c
 - copied unchanged from r290539, head/lib/libc/tests/string/stpncpy_test.c
  stable/10/lib/libc/tests/string/strerror_test.c
 - copied unchanged from r290539, head/lib/libc/tests/string/strerror_test.c
  stable/10/lib/libc/tests/string/wcscasecmp_test.c
 - copied unchanged from r290539, 
head/lib/libc/tests/string/wcscasecmp_test.c
  stable/10/lib/libc/tests/string/wcsnlen_test.c
 - copied unchanged from r290539, head/lib/libc/tests/string/wcsnlen_test.c
Deleted:
  stable/10/tools/regression/lib/libc/string/
Modified:
  stable/10/lib/libc/tests/string/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/tests/string/Makefile
==
--- stable/10/lib/libc/tests/string/MakefileSun Nov 15 20:00:00 2015
(r290874)
+++ stable/10/lib/libc/tests/string/MakefileSun Nov 15 20:08:34 2015
(r290875)
@@ -1,6 +1,9 @@
 # $FreeBSD$
 
-.include 
+ATF_TESTS_C+=  stpncpy_test
+ATF_TESTS_C+=  strerror2_test
+ATF_TESTS_C+=  wcscasecmp_test
+ATF_TESTS_C+=  wcsnlen_test
 
 TESTSDIR=  ${TESTSBASE}/lib/libc/string
 
@@ -22,6 +25,8 @@ NETBSD_ATF_TESTS_C+=  strrchr
 NETBSD_ATF_TESTS_C+=   strspn
 NETBSD_ATF_TESTS_C+=   swab
 
+SRCS.strerror2_test=   strerror_test.c
+
 .include "../Makefile.netbsd-tests"
 
 LDADD.memchr+= -lmd

Copied: stable/10/lib/libc/tests/string/stpncpy_test.c (from r290539, 
head/lib/libc/tests/string/stpncpy_test.c)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/10/lib/libc/tests/string/stpncpy_test.c  Sun Nov 15 20:08:34 
2015(r290875, copy of r290539, 
head/lib/libc/tests/string/stpncpy_test.c)
@@ -0,0 +1,110 @@
+/*-
+ * Copyright (c) 2009 David Schultz 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+static char *
+makebuf(size_t len, int guard_at_end)
+{
+   char *buf;
+   size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE;
+
+   buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+   assert(buf);
+   if (guard_at_end) {
+   assert(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
+   return (buf + alloc_size - PAGE_SIZE - len);
+   } else {
+   assert(munmap(buf, PAGE_SIZE) == 0);
+   return (buf + PAGE_SIZE);
+   }
+}
+
+static void
+test_stpncpy(const char *s)
+{
+   char *src, *dst;
+   size_t size, len, bufsize, x;
+   int i, j;
+
+   size = strlen(s) + 1;
+   for (i = 0; i <= 1; i++) {
+   for (j = 0; j <= 1; j++) {
+   for (bufsize = 0; bufsize <= size + 10; bufsize++) {
+   src = makebuf(size, i);
+   memcpy(src, s, size);
+   dst = makebuf(bufsize, j);
+   memset(dst, 'X', bufsize);
+   len = (bufsize < size) ? bufsize : size - 1;
+   assert(stpncpy(dst, src, bufsize) == dst+len);
+   

svn commit: r290876 - in stable/10: lib/libc/tests/stdlib tools/regression/lib/libc/stdlib

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:11:55 2015
New Revision: 290876
URL: https://svnweb.freebsd.org/changeset/base/290876

Log:
  MFC r290538:
  
  Integrate tools/regression/lib/libc/stdlib into the FreeBSD test suite
  as lib/libc/tests/stdlib
  
  - Make the code a bit more style(9) compliant
  - Convert a sizeof(x)/sizeof(x[0]) to nitems
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/lib/libc/tests/stdlib/heapsort_test.c
 - copied unchanged from r290538, head/lib/libc/tests/stdlib/heapsort_test.c
  stable/10/lib/libc/tests/stdlib/mergesort_test.c
 - copied unchanged from r290538, 
head/lib/libc/tests/stdlib/mergesort_test.c
  stable/10/lib/libc/tests/stdlib/qsort_test.c
 - copied unchanged from r290538, head/lib/libc/tests/stdlib/qsort_test.c
  stable/10/lib/libc/tests/stdlib/test-sort.h
 - copied unchanged from r290538, head/lib/libc/tests/stdlib/test-sort.h
Deleted:
  stable/10/tools/regression/lib/libc/stdlib/
Modified:
  stable/10/lib/libc/tests/stdlib/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/tests/stdlib/Makefile
==
--- stable/10/lib/libc/tests/stdlib/MakefileSun Nov 15 20:08:34 2015
(r290875)
+++ stable/10/lib/libc/tests/stdlib/MakefileSun Nov 15 20:11:55 2015
(r290876)
@@ -1,11 +1,13 @@
 # $FreeBSD$
 
-.include 
+ATF_TESTS_C+=  heapsort_test
+ATF_TESTS_C+=  mergesort_test
+ATF_TESTS_C+=  qsort_test
 
 TESTSDIR=  ${TESTSBASE}/lib/libc/stdlib
 
 # TODO: t_getenv_thread, t_mi_vector_hash
-NETBSD_ATF_TESTS_C=abs_test
+NETBSD_ATF_TESTS_C+=   abs_test
 NETBSD_ATF_TESTS_C+=   atoi_test
 NETBSD_ATF_TESTS_C+=   div_test
 NETBSD_ATF_TESTS_C+=   getenv_test
@@ -30,6 +32,8 @@ BINDIR=   ${TESTSDIR}
 #PROGS+=   h_atexit
 PROGS+=h_getopt h_getopt_long
 
+CFLAGS+=   -I${.CURDIR}
+
 .for t in h_getopt h_getopt_long
 CFLAGS.$t+=-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
 LDFLAGS.$t+=   -L${LIBNETBSD_OBJDIR}

Copied: stable/10/lib/libc/tests/stdlib/heapsort_test.c (from r290538, 
head/lib/libc/tests/stdlib/heapsort_test.c)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/10/lib/libc/tests/stdlib/heapsort_test.c Sun Nov 15 20:11:55 
2015(r290876, copy of r290538, 
head/lib/libc/tests/stdlib/heapsort_test.c)
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (C) 2004 Maxim Sobolev 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Test for heapsort() routine.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+
+#include "test-sort.h"
+
+ATF_TC_WITHOUT_HEAD(heapsort_test);
+ATF_TC_BODY(heapsort_test, tc)
+{
+   int sresvector[IVEC_LEN];
+   int testvector[IVEC_LEN];
+   int i, j;
+
+   for (j = 2; j < IVEC_LEN; j++) {
+   /* Populate test vectors */
+   for (i = 0; i < j; i++)
+   testvector[i] = sresvector[i] = initvector[i];
+
+   /* Sort using heapsort(3) */
+   heapsort(testvector, j, sizeof(testvector[0]), sorthelp);
+   /* Sort using reference slow sorting routine */
+   ssort(sresvector, j);
+
+   /* Compare results */
+   for (i = 0; i < j; i++)
+   ATF_CHECK_MSG(testvector[i] == sresvector[i],
+   "item at index %d didn't match: %d != %d",
+   i, testvector[i], sresvector[i]);
+   }
+}
+
+ATF_TP_ADD_TCS(tp)
+{

svn commit: r290877 - stable/10/sys/boot/common

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:14:54 2015
New Revision: 290877
URL: https://svnweb.freebsd.org/changeset/base/290877

Log:
  MFC r289896:
  
  Make vers.c creation atomic by using a temporary file, then moving
  the temporary file to vers.c at the end of the script
  
  The previous logic wrote out to vers.c multiple times, so the file
  could be incorrectly interpreted as being completely written out
  after one of the echo calls with recursive make, when in reality it
  was only partially written.
  
  Also, in the event the build was interrupted when creating vers.c
  (small race window), it would have a leftover file that needed to
  be cleaned up before resuming the build.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/sys/boot/common/newvers.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/common/newvers.sh
==
--- stable/10/sys/boot/common/newvers.shSun Nov 15 20:11:55 2015
(r290876)
+++ stable/10/sys/boot/common/newvers.shSun Nov 15 20:14:54 2015
(r290877)
@@ -32,12 +32,16 @@
 #
 #  @(#)newvers.sh  8.1 (Berkeley) 4/20/94
 
+tempfile=$(mktemp tmp.XX) || exit
+trap "rm -f $tempfile" EXIT INT TERM
+
 LC_ALL=C; export LC_ALL
 u=${USER-root} h=${HOSTNAME-`hostname`} t=`date`
 #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
 r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
 
-echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > vers.c
-echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
+echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > $tempfile
+echo "char bootprog_rev[] = \"${r}\";" >> $tempfile
+echo "char bootprog_date[] = \"${t}\";" >> $tempfile
+echo "char bootprog_maker[] = \"${u}@${h}\";" >> $tempfile
+mv $tempfile vers.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290878 - stable/9/sys/boot/common

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:20:03 2015
New Revision: 290878
URL: https://svnweb.freebsd.org/changeset/base/290878

Log:
  MFstable/10 r290877:
  
  MFC r289896:
  
  Make vers.c creation atomic by using a temporary file, then moving
  the temporary file to vers.c at the end of the script
  
  The previous logic wrote out to vers.c multiple times, so the file
  could be incorrectly interpreted as being completely written out
  after one of the echo calls with recursive make, when in reality it
  was only partially written.
  
  Also, in the event the build was interrupted when creating vers.c
  (small race window), it would have a leftover file that needed to
  be cleaned up before resuming the build.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/9/sys/boot/common/newvers.sh
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/common/newvers.sh
==
--- stable/9/sys/boot/common/newvers.sh Sun Nov 15 20:14:54 2015
(r290877)
+++ stable/9/sys/boot/common/newvers.sh Sun Nov 15 20:20:03 2015
(r290878)
@@ -32,12 +32,16 @@
 #
 #  @(#)newvers.sh  8.1 (Berkeley) 4/20/94
 
+tempfile=$(mktemp tmp.XX) || exit
+trap "rm -f $tempfile" EXIT INT TERM
+
 LC_ALL=C; export LC_ALL
 u=${USER-root} h=${HOSTNAME-`hostname`} t=`date`
 #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
 r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
 
-echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > vers.c
-echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
+echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > $tempfile
+echo "char bootprog_rev[] = \"${r}\";" >> $tempfile
+echo "char bootprog_date[] = \"${t}\";" >> $tempfile
+echo "char bootprog_maker[] = \"${u}@${h}\";" >> $tempfile
+mv $tempfile vers.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290879 - in stable/10: share/man/man4 share/man/man5 tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:23:09 2015
New Revision: 290879
URL: https://svnweb.freebsd.org/changeset/base/290879

Log:
  MFC r290659,r290660:
  
  r290659:
  
  - Move ng_bluetooth.4 under MK_BLUETOOTH != no
  - Move all section 5 bluetooth manpages under MK_BLUETOOTH != no
  
  PR: 193260
  Reported by: Philippe Michel 
  Sponsored by: EMC / Isilon Storage Division
  
  r290660:
  
  Move the MK_BLUETOOTH block down below the architecture specific sections by 
the
  other generic options
  
  PR: 193260
  Sponsored by: EMC / Isilon Storage Divisions

Modified:
  stable/10/share/man/man4/Makefile
  stable/10/share/man/man5/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/Makefile
==
--- stable/10/share/man/man4/Makefile   Sun Nov 15 20:20:03 2015
(r290878)
+++ stable/10/share/man/man4/Makefile   Sun Nov 15 20:23:09 2015
(r290879)
@@ -297,7 +297,6 @@ MAN=aac.4 \
ng_atm.4 \
ngatmbase.4 \
ng_atmllc.4 \
-   ng_bluetooth.4 \
ng_bpf.4 \
ng_bridge.4 \
ng_bt3c.4 \
@@ -816,6 +815,10 @@ _nvram2env.4=  nvram2env.4
 SUBDIR=man4.${MACHINE_CPUARCH}
 .endif
 
+.if ${MK_BLUETOOTH} != "no"
+MAN+=  ng_bluetooth.4
+.endif
+
 .if ${MK_CCD} != "no"
 _ccd.4=ccd.4
 .endif

Modified: stable/10/share/man/man5/Makefile
==
--- stable/10/share/man/man5/Makefile   Sun Nov 15 20:20:03 2015
(r290878)
+++ stable/10/share/man/man5/Makefile   Sun Nov 15 20:23:09 2015
(r290879)
@@ -7,9 +7,6 @@
 MAN=   acct.5 \
ar.5 \
a.out.5 \
-   bluetooth.device.conf.5 \
-   bluetooth.hosts.5 \
-   bluetooth.protocols.5 \
${_boot.config.5} \
core.5 \
devfs.5 \
@@ -83,6 +80,12 @@ MLINKS+=resolver.5 resolv.conf.5
 MAN+=  autofs.5
 .endif
 
+.if ${MK_BLUETOOTH} != "no"
+MAN+=  bluetooth.device.conf.5 \
+   bluetooth.hosts.5 \
+   bluetooth.protocols.5
+.endif
+
 .if ${MK_FREEBSD_UPDATE} != "no"
 MAN+=  freebsd-update.conf.5
 .endif

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sun Nov 15 20:20:03 
2015(r290878)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sun Nov 15 20:23:09 
2015(r290879)
@@ -296,6 +296,10 @@ OLD_FILES+=usr/share/man/man3/sdp_regist
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
+OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290880 - in stable/9: share/man/man4 share/man/man5 tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:25:26 2015
New Revision: 290880
URL: https://svnweb.freebsd.org/changeset/base/290880

Log:
  MFstable/10 r290879:
  
  MFC r290659,r290660:
  
  r290659:
  
  - Move ng_bluetooth.4 under MK_BLUETOOTH != no
  - Move all section 5 bluetooth manpages under MK_BLUETOOTH != no
  
  PR: 193260
  Reported by: Philippe Michel 
  Sponsored by: EMC / Isilon Storage Division
  
  r290660:
  
  Move the MK_BLUETOOTH block down below the architecture specific sections by 
the
  other generic options
  
  PR: 193260
  Sponsored by: EMC / Isilon Storage Divisions

Modified:
  stable/9/share/man/man4/Makefile
  stable/9/share/man/man5/Makefile
  stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/9/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man5/   (props changed)
  stable/9/tools/   (props changed)
  stable/9/tools/build/   (props changed)

Modified: stable/9/share/man/man4/Makefile
==
--- stable/9/share/man/man4/MakefileSun Nov 15 20:23:09 2015
(r290879)
+++ stable/9/share/man/man4/MakefileSun Nov 15 20:25:26 2015
(r290880)
@@ -275,7 +275,6 @@ MAN=aac.4 \
ng_atm.4 \
ngatmbase.4 \
ng_atmllc.4 \
-   ng_bluetooth.4 \
ng_bpf.4 \
ng_bridge.4 \
ng_bt3c.4 \
@@ -751,6 +750,10 @@ _nvram2env.4=  nvram2env.4
 SUBDIR=man4.${MACHINE_CPUARCH}
 .endif
 
+.if ${MK_BLUETOOTH} != "no"
+MAN+=  ng_bluetooth.4
+.endif
+
 .if ${MK_CCD} != "no"
 _ccd.4=ccd.4
 .endif

Modified: stable/9/share/man/man5/Makefile
==
--- stable/9/share/man/man5/MakefileSun Nov 15 20:23:09 2015
(r290879)
+++ stable/9/share/man/man5/MakefileSun Nov 15 20:25:26 2015
(r290880)
@@ -7,9 +7,6 @@
 MAN=   acct.5 \
ar.5 \
a.out.5 \
-   bluetooth.device.conf.5 \
-   bluetooth.hosts.5 \
-   bluetooth.protocols.5 \
${_boot.config.5} \
core.5 \
devfs.5 \
@@ -79,6 +76,12 @@ MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
 
+.if ${MK_BLUETOOTH} != "no"
+MAN+=  bluetooth.device.conf.5 \
+   bluetooth.hosts.5 \
+   bluetooth.protocols.5
+.endif
+
 .if ${MK_FREEBSD_UPDATE} != "no"
 MAN+=  freebsd-update.conf.5
 .endif

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 20:23:09 
2015(r290879)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc   Sun Nov 15 20:25:26 
2015(r290880)
@@ -460,6 +460,10 @@ OLD_FILES+=usr/share/man/man3/sdp_regist
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
+OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
+OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290881 - stable/10/lib/libc/tests/gen

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:30:54 2015
New Revision: 290881
URL: https://svnweb.freebsd.org/changeset/base/290881

Log:
  MFC r290571:
  
  Fix some TAP -> ATF conversion errors
  
  - Remove a leftover printf from when this was a TAP based testcase
  - Catch mmap failures properly
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/lib/libc/tests/gen/arc4random_test.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/tests/gen/arc4random_test.c
==
--- stable/10/lib/libc/tests/gen/arc4random_test.c  Sun Nov 15 20:25:26 
2015(r290880)
+++ stable/10/lib/libc/tests/gen/arc4random_test.c  Sun Nov 15 20:30:54 
2015(r290881)
@@ -30,10 +30,12 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+
 #include 
 
 /*
@@ -56,14 +58,9 @@ ATF_TC_BODY(test_arc4random, tc)
pid_t pid;
char c;
 
-   printf("1..1\n");
-
page = mmap(NULL, sizeof(struct shared_page), PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0);
-   if (page == MAP_FAILED) {
-   printf("fail 1 - mmap\n");
-   exit(1);
-   }
+   ATF_REQUIRE_MSG(page != MAP_FAILED, "mmap failed; errno=%d", errno);
 
arc4random_buf(, 1);
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290882 - stable/10/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:44:01 2015
New Revision: 290882
URL: https://svnweb.freebsd.org/changeset/base/290882

Log:
  MFC r290260,r290262:
  
  r290260:
  
  Document undocumented long options for -t cd9660
  
  Note which options have been implemented and which options haven't
  been implemented
  
  Submitted as the following NetBSD PRs: bin/50390 and bin/50392
  
  Sponsored by: EMC / Isilon Storage Division
  
  r290262:
  
  Fix spelling of `isolevel` cd9660 option
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/usr.sbin/makefs/makefs.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/makefs/makefs.8
==
--- stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:30:54 2015
(r290881)
+++ stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:44:01 2015
(r290882)
@@ -301,10 +301,10 @@ The following keywords are supported:
 .It Sy allow-deep-trees
 Allow the directory structure to exceed the maximum specified in
 the spec.
-.\" .It Sy allow-illegal-chars
-.\" Unknown
-.\" .It Sy allow-lowercase
-.\" Unknown
+.It Sy allow-illegal-chars
+Allow illegal characters in filenames. This option is not implemented.
+.It Sy allow-lowercase
+Allow lowercase characters in filenames. This option is not implemented.
 .It Sy allow-max-name
 Allow 37 instead of 33 characters for filenames by omitting the
 version id.
@@ -318,6 +318,8 @@ Use the
 extension to encode
 .Tn RISC OS
 metadata.
+.It Sy bootimagedir
+Boot image directory. This option is not implemented.
 .It Sy chrp-boot
 Write an MBR partition table to the image to allow older CHRP hardware to
 boot.
@@ -338,6 +340,16 @@ or
 Load a generic boot image into the first 32K of the cd9660 image.
 .It Sy hard-disk-boot
 Boot image is a hard disk image.
+.It Sy isolevel
+An integer representing the ISO 9660 interchange level where
+.Dq level
+is either
+.Ql 1
+or
+.Ql 2 .
+.Dq level
+.Ql 3
+is not implemented.
 .It Sy keep-bad-images
 Do not throw away images whose write was aborted due to an error.
 For debugging purposes.
@@ -351,14 +363,16 @@ Boot image is a
 ElTorito image.
 .It Sy no-trailing-padding
 Do not pad the image (apparently Linux needs the padding).
-.\" .It Sy omit-trailing-period
-.\" Unknown
+.It Sy omit-trailing-period
+Omit trailing periods in filenames.
 .It Sy preparer
 Preparer ID of the image.
 .It Sy publisher
 Publisher ID of the image.
 .It Sy rockridge
 Use RockRidge extensions (for longer filenames, etc.).
+.It Sy verbose
+Turns on verbose output.
 .It Sy volumeid
 Volume set identifier of the image.
 .El
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290883 - head/lib/libc/sparc64/fpu

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 15 20:44:22 2015
New Revision: 290883
URL: https://svnweb.freebsd.org/changeset/base/290883

Log:
  Fix unused-but-set-variable
  
  Spotted by:   gcc 5.2

Modified:
  head/lib/libc/sparc64/fpu/fpu.c

Modified: head/lib/libc/sparc64/fpu/fpu.c
==
--- head/lib/libc/sparc64/fpu/fpu.c Sun Nov 15 20:44:01 2015
(r290882)
+++ head/lib/libc/sparc64/fpu/fpu.c Sun Nov 15 20:44:22 2015
(r290883)
@@ -270,7 +270,7 @@ __fpu_execute(struct utrapframe *uf, str
 u_long tstate)
 {
struct fpn *fp;
-   int opf, rs1, rs2, rd, type, mask, cx, cond;
+   int opf, rs1, rs2, rd, type, mask, cx, cond __unused;
u_long reg, fsr;
u_int space[4];
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290884 - stable/10/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:48:10 2015
New Revision: 290884
URL: https://svnweb.freebsd.org/changeset/base/290884

Log:
  MFC r290259,r290601:
  
  r290259:
  
  Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53
  
  Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and
  options have been omitted.
  
  Obtained from: NetBSD
  Sponsored by: EMC / Isilon Storage Division
  
  r290601:
  
  Follow up to r290259 dealing with makefs(8)
  
  - Don't use contractions (don't -> do not)
  - Change "throw away" to "discard" when describing the -o keep-bad-images 
option
  - Revert author e-mail split I brought over from NetBSD, effectively reverting
the change bapt made in r267668
  
  Submitted by: bjk
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/usr.sbin/makefs/makefs.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/makefs/makefs.8
==
--- stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:44:22 2015
(r290883)
+++ stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:48:10 2015
(r290884)
@@ -44,10 +44,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl DxZ
-.Op Fl B Ar byte-order
+.Op Fl B Ar endian
 .Op Fl b Ar free-blocks
 .Op Fl d Ar debug-mask
-.Op Fl F Ar specfile
+.Op Fl F Ar mtree-specfile
 .Op Fl f Ar free-files
 .Op Fl M Ar minimum-size
 .Op Fl m Ar maximum-size
@@ -69,9 +69,9 @@ from the directory tree
 .Ar directory
 or from the mtree manifest
 .Ar manifest .
-If optional directory tree
+If any optional directory trees are passed in the
 .Ar extra-directory
-is passed, then the directory tree of each argument will be merged
+arguments, then the directory tree of each argument will be merged
 into the
 .Ar directory
 or
@@ -82,9 +82,9 @@ No special devices or privileges are req
 .Pp
 The options are as follows:
 .Bl -tag -width flag
-.It Fl B Ar byte-order
+.It Fl B Ar endian
 Set the byte order of the image to
-.Ar byte-order .
+.Ar endian .
 Valid byte orders are
 .Ql 4321 ,
 .Ql big ,
@@ -114,9 +114,9 @@ Enable various levels of debugging, depe
 set in
 .Ar debug-mask .
 XXX: document these
-.It Fl F Ar specfile
+.It Fl F Ar mtree-specfile
 Use
-.Ar specfile
+.Ar mtree-specfile
 as an
 .Xr mtree 8
 .Sq specfile
@@ -174,13 +174,13 @@ Set the maximum size of the file system 
 .Ar maximum-size .
 An error will be raised if the target file system needs to be larger
 than this to accommodate the provided directory tree.
-.It Fl N Ar dbdir
+.It Fl N Ar userdb-dir
 Use the user database text file
 .Pa master.passwd
 and group database text file
 .Pa group
 from
-.Ar dbdir ,
+.Ar userdb-dir ,
 rather than using the results from the system's
 .Xr getpwnam 3
 and
@@ -226,7 +226,9 @@ ISO 9660 file system.
 .It Fl x
 Exclude file system nodes not explicitly listed in the specfile.
 .It Fl Z
-Create the image as a sparse file.
+Create a sparse file for
+.Sy ffs .
+This is useful for virtual machine images.
 .El
 .Pp
 Where sizes are specified, a decimal number of bytes is expected.
@@ -351,7 +353,7 @@ or
 .Ql 3
 is not implemented.
 .It Sy keep-bad-images
-Do not throw away images whose write was aborted due to an error.
+Do not discard images whose write was aborted due to an error.
 For debugging purposes.
 .It Sy label
 Label name of the image.
@@ -386,9 +388,8 @@ The
 utility appeared in
 .Nx 1.6 .
 .Sh AUTHORS
-.An Luke Mewburn
-.Aq lu...@netbsd.org
-(original program)
+.An Luke Mewburn Aq Mt lu...@netbsd.org
+(original program),
 .An Daniel Watt ,
 .An Walter Deignan ,
 .An Ryan Gabrys ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290885 - stable/10/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:49:03 2015
New Revision: 290885
URL: https://svnweb.freebsd.org/changeset/base/290885

Log:
  Bump .Dd

Modified:
  stable/10/usr.sbin/makefs/makefs.8

Modified: stable/10/usr.sbin/makefs/makefs.8
==
--- stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:48:10 2015
(r290884)
+++ stable/10/usr.sbin/makefs/makefs.8  Sun Nov 15 20:49:03 2015
(r290885)
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 29, 2015
+.Dd November 15, 2015
 .Dt MAKEFS 8
 .Os
 .Sh NAME
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290886 - in stable/9/share/man: man4 man4/man4.powerpc man7 man9

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:16:13 2015
New Revision: 290886
URL: https://svnweb.freebsd.org/changeset/base/290886

Log:
  MFstable/10 r233422:
  
  r233422 (by joel):
  
  Remove superfluous paragraph macro.
  
  Command used:
$ svn merge --accept mine-conflict -c 233422 ^/stable/10
  
  Conflicts:
share/man/man4/netmap.4
share/man/man9/locking.9 (

Modified:
  stable/9/share/man/man4/acpi_hp.4
  stable/9/share/man/man4/adv.4
  stable/9/share/man/man4/ahc.4
  stable/9/share/man/man4/atkbd.4
  stable/9/share/man/man4/bridge.4
  stable/9/share/man/man4/cas.4
  stable/9/share/man/man4/cc_vegas.4
  stable/9/share/man/man4/cy.4
  stable/9/share/man/man4/dpms.4
  stable/9/share/man/man4/ed.4
  stable/9/share/man/man4/em.4
  stable/9/share/man/man4/epair.4
  stable/9/share/man/man4/fdc.4
  stable/9/share/man/man4/fwohci.4
  stable/9/share/man/man4/gem.4
  stable/9/share/man/man4/geom_fox.4
  stable/9/share/man/man4/geom_uzip.4
  stable/9/share/man/man4/hptiop.4
  stable/9/share/man/man4/igb.4
  stable/9/share/man/man4/ip.4
  stable/9/share/man/man4/isp.4
  stable/9/share/man/man4/man4.powerpc/bm.4
  stable/9/share/man/man4/man4.powerpc/snd_ai2s.4
  stable/9/share/man/man4/man4.powerpc/snd_davbus.4
  stable/9/share/man/man4/netmap.4
  stable/9/share/man/man4/ng_netflow.4
  stable/9/share/man/man4/nvram2env.4
  stable/9/share/man/man4/oce.4
  stable/9/share/man/man4/ppbus.4
  stable/9/share/man/man4/snd_emu10kx.4
  stable/9/share/man/man4/snd_hda.4
  stable/9/share/man/man4/u3g.4
  stable/9/share/man/man7/mailaddr.7
  stable/9/share/man/man9/DB_COMMAND.9
  stable/9/share/man/man9/fail.9
  stable/9/share/man/man9/lock.9
  stable/9/share/man/man9/make_dev.9
Directory Properties:
  stable/9/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man7/   (props changed)
  stable/9/share/man/man9/   (props changed)

Modified: stable/9/share/man/man4/acpi_hp.4
==
--- stable/9/share/man/man4/acpi_hp.4   Sun Nov 15 20:49:03 2015
(r290885)
+++ stable/9/share/man/man4/acpi_hp.4   Sun Nov 15 21:16:13 2015
(r290886)
@@ -244,7 +244,6 @@ Set maximum detail level for /dev/hpcmi 
 .Bd -literal -offset indent
 sysctl dev.acpi_hp.0.cmi_detail=7
 .Ed
-.Pp
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr acpi_wmi 4 ,

Modified: stable/9/share/man/man4/adv.4
==
--- stable/9/share/man/man4/adv.4   Sun Nov 15 20:49:03 2015
(r290885)
+++ stable/9/share/man/man4/adv.4   Sun Nov 15 21:16:13 2015
(r290886)
@@ -66,7 +66,6 @@ host adapter chips.
 The following tables list the AdvanSys products using these chips,
 their bus attachment type, maximum sync rate, and the maximum number of
 commands that can be handled by the adapter concurrently.
-.Pp
 .Bd -ragged -offset indent
 .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " Footnotes
 Connectivity Products:
@@ -104,7 +103,6 @@ This board has been sold by SIIG as the 
 This board has been sold by SIIG as the Fast SCSI Pro PCI.
 .El
 .Ed
-.Pp
 .Bd -ragged -offset indent
 .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " Commands
 Single Channel Products:
@@ -121,7 +119,6 @@ ABP970PCI No 10MHz  
 ABP970U   PCI No 20MHz   240
 .El
 .Ed
-.Pp
 .Bd -ragged -offset indent
 .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " "Channels "
 Multi Channel Products (Commands are per-channel):

Modified: stable/9/share/man/man4/ahc.4
==
--- stable/9/share/man/man4/ahc.4   Sun Nov 15 20:49:03 2015
(r290885)
+++ stable/9/share/man/man4/ahc.4   Sun Nov 15 21:16:13 2015
(r290886)
@@ -146,7 +146,6 @@ driver.
 Note that wide and twin channel features, although always supported
 by a particular chip, may be disabled in a particular motherboard or card
 design.
-.Pp
 .Bd -ragged -offset indent
 .Bl -column "aic7770 " "10 " "EISA/VL  " "10MHz " "16bit " "SCBs " Features
 .Em "Chip   MIPSBus  MaxSync   MaxWidth  SCBs  Features"

Modified: stable/9/share/man/man4/atkbd.4
==
--- stable/9/share/man/man4/atkbd.4 Sun Nov 15 20:49:03 2015
(r290885)
+++ stable/9/share/man/man4/atkbd.4 Sun Nov 15 21:16:13 2015
(r290886)
@@ -144,7 +144,6 @@ command.
 This option will disable this feature and prevent the user from
 changing key assignment.
 .El
-.Pp
 .Ss Driver Flags
 The
 .Nm

Modified: stable/9/share/man/man4/bridge.4
==
--- stable/9/share/man/man4/bridge.4Sun Nov 15 20:49:03 2015
(r290885)
+++ stable/9/share/man/man4/bridge.4Sun Nov 15 21:16:13 2015 

svn commit: r290887 - in stable/9: lib/libc/db/man lib/libc/gen lib/libc/net lib/libc/rpc lib/libc/sys lib/libcam lib/libdevstat lib/libradius sbin/bsdlabel sbin/newfs_msdos share/man/man4 share/ma...

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:27:50 2015
New Revision: 290887
URL: https://svnweb.freebsd.org/changeset/base/290887

Log:
  MFstable/10 r231564:
  r231564 (by ed):
  
  Globally replace u_int*_t from (non-contributed) man pages.
  
  The reasoning behind this, is that if we are consistent in our
  documentation about the uint*_t stuff, people will be less tempted to
  write new code that uses the non-standard types.
  
  I am not going to bump the man page dates, as these changes can be
  considered style nits. The meaning of the man pages is unaffected.

Modified:
  stable/9/lib/libc/db/man/hash.3
  stable/9/lib/libc/gen/arc4random.3
  stable/9/lib/libc/net/nsdispatch.3
  stable/9/lib/libc/rpc/rpc.3
  stable/9/lib/libc/rpc/rpc_clnt_create.3
  stable/9/lib/libc/sys/getdirentries.2
  stable/9/lib/libc/sys/nfssvc.2
  stable/9/lib/libcam/cam.3
  stable/9/lib/libcam/cam_cdbparse.3
  stable/9/lib/libdevstat/devstat.3
  stable/9/lib/libradius/libradius.3
  stable/9/sbin/bsdlabel/bsdlabel.8
  stable/9/sbin/newfs_msdos/newfs_msdos.8
  stable/9/share/man/man4/agp.4
  stable/9/share/man/man4/icmp6.4
  stable/9/share/man/man4/ip6.4
  stable/9/share/man/man4/mem.4
  stable/9/share/man/man4/mtio.4
  stable/9/share/man/man4/natm.4
  stable/9/share/man/man4/net80211.4
  stable/9/share/man/man4/ng_async.4
  stable/9/share/man/man4/ng_bridge.4
  stable/9/share/man/man4/ng_btsocket.4
  stable/9/share/man/man4/ng_car.4
  stable/9/share/man/man4/ng_ccatm.4
  stable/9/share/man/man4/ng_cisco.4
  stable/9/share/man/man4/ng_etf.4
  stable/9/share/man/man4/ng_hci.4
  stable/9/share/man/man4/ng_l2cap.4
  stable/9/share/man/man4/ng_l2tp.4
  stable/9/share/man/man4/ng_mppc.4
  stable/9/share/man/man4/ng_one2many.4
  stable/9/share/man/man4/ng_ppp.4
  stable/9/share/man/man4/ng_pppoe.4
  stable/9/share/man/man4/ng_pptpgre.4
  stable/9/share/man/man4/ppi.4
  stable/9/share/man/man5/fs.5
  stable/9/share/man/man9/MD5.9
  stable/9/share/man/man9/bios.9
  stable/9/share/man/man9/bus_space.9
  stable/9/share/man/man9/crypto.9
  stable/9/share/man/man9/device_set_flags.9
  stable/9/share/man/man9/devstat.9
  stable/9/share/man/man9/eventtimers.9
  stable/9/share/man/man9/get_cyclecount.9
  stable/9/share/man/man9/mbchain.9
  stable/9/share/man/man9/mbuf_tags.9
  stable/9/share/man/man9/mdchain.9
  stable/9/share/man/man9/netisr.9
  stable/9/share/man/man9/random.9
  stable/9/share/man/man9/rijndael.9
  stable/9/share/man/man9/zone.9
  stable/9/usr.bin/m4/lib/ohash_interval.3
  stable/9/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/sys/   (props changed)
  stable/9/lib/libcam/   (props changed)
  stable/9/lib/libradius/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/bsdlabel/   (props changed)
  stable/9/sbin/newfs_msdos/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man5/   (props changed)
  stable/9/share/man/man9/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/m4/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/bsnmpd/   (props changed)

Modified: stable/9/lib/libc/db/man/hash.3
==
--- stable/9/lib/libc/db/man/hash.3 Sun Nov 15 21:16:13 2015
(r290886)
+++ stable/9/lib/libc/db/man/hash.3 Sun Nov 15 21:27:50 2015
(r290887)
@@ -65,7 +65,7 @@ typedef struct {
u_int ffactor;
u_int nelem;
u_int cachesize;
-   u_int32_t (*hash)(const void *, size_t);
+   uint32_t (*hash)(const void *, size_t);
int lorder;
 } HASHINFO;
 .Ed

Modified: stable/9/lib/libc/gen/arc4random.3
==
--- stable/9/lib/libc/gen/arc4random.3  Sun Nov 15 21:16:13 2015
(r290886)
+++ stable/9/lib/libc/gen/arc4random.3  Sun Nov 15 21:27:50 2015
(r290887)
@@ -44,12 +44,12 @@
 .Lb libc
 .Sh SYNOPSIS
 .In stdlib.h
-.Ft u_int32_t
+.Ft uint32_t
 .Fn arc4random "void"
 .Ft void
 .Fn arc4random_buf "void *buf" "size_t nbytes"
-.Ft u_int32_t
-.Fn arc4random_uniform "u_int32_t upper_bound"
+.Ft uint32_t
+.Fn arc4random_uniform "uint32_t upper_bound"
 .Ft void
 .Fn arc4random_stir "void"
 .Ft void

Modified: stable/9/lib/libc/net/nsdispatch.3
==
--- stable/9/lib/libc/net/nsdispatch.3  Sun Nov 15 21:16:13 2015
(r290886)
+++ stable/9/lib/libc/net/nsdispatch.3  Sun Nov 15 21:27:50 2015
(r290887)
@@ -129,7 +129,7 @@ structures, which have the following for
 .Bd -literal -offset indent
 typedef struct _ns_src {
const char  *src;
-   u_int32_tflags;
+   uint32_t flags;
 } ns_src;
 .Ed
 .Bd -ragged 

svn commit: r290889 - stable/9/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:44:10 2015
New Revision: 290889
URL: https://svnweb.freebsd.org/changeset/base/290889

Log:
  MFstable/10 r290882,r290884,r290885:
  
  r290882:
  
  MFC r290260,r290262:
  
  r290260:
  
  Document undocumented long options for -t cd9660
  
  Note which options have been implemented and which options haven't
  been implemented
  
  Submitted as the following NetBSD PRs: bin/50390 and bin/50392
  
  Sponsored by: EMC / Isilon Storage Division
  
  r290262:
  
  Fix spelling of `isolevel` cd9660 option
  
  Sponsored by: EMC / Isilon Storage Division
  
  r290884:
  
  MFC r290259,r290601:
  
  r290259:
  
  Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53
  
  Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and
  options have been omitted.
  
  Obtained from: NetBSD
  Sponsored by: EMC / Isilon Storage Division
  
  r290601:
  
  Follow up to r290259 dealing with makefs(8)
  
  - Don't use contractions (don't -> do not)
  - Change "throw away" to "discard" when describing the -o keep-bad-images 
option
  - Revert author e-mail split I brought over from NetBSD, effectively reverting
the change bapt made in r267668
  
  Submitted by: bjk
  Sponsored by: EMC / Isilon Storage Division
  
  r290885:
  
  Bump .Dd

Modified:
  stable/9/usr.sbin/makefs/makefs.8
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/makefs/   (props changed)

Modified: stable/9/usr.sbin/makefs/makefs.8
==
--- stable/9/usr.sbin/makefs/makefs.8   Sun Nov 15 21:41:51 2015
(r290888)
+++ stable/9/usr.sbin/makefs/makefs.8   Sun Nov 15 21:44:10 2015
(r290889)
@@ -35,7 +35,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 29, 2015
+.Dd November 15, 2015
 .Dt MAKEFS 8
 .Os
 .Sh NAME
@@ -44,10 +44,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl DxZ
-.Op Fl B Ar byte-order
+.Op Fl B Ar endian
 .Op Fl b Ar free-blocks
 .Op Fl d Ar debug-mask
-.Op Fl F Ar specfile
+.Op Fl F Ar mtree-specfile
 .Op Fl f Ar free-files
 .Op Fl M Ar minimum-size
 .Op Fl m Ar maximum-size
@@ -69,9 +69,9 @@ from the directory tree
 .Ar directory
 or from the mtree manifest
 .Ar manifest .
-If optional directory tree
+If any optional directory trees are passed in the
 .Ar extra-directory
-is passed, then the directory tree of each argument will be merged
+arguments, then the directory tree of each argument will be merged
 into the
 .Ar directory
 or
@@ -82,9 +82,9 @@ No special devices or privileges are req
 .Pp
 The options are as follows:
 .Bl -tag -width flag
-.It Fl B Ar byte-order
+.It Fl B Ar endian
 Set the byte order of the image to
-.Ar byte-order .
+.Ar endian .
 Valid byte orders are
 .Ql 4321 ,
 .Ql big ,
@@ -114,9 +114,9 @@ Enable various levels of debugging, depe
 set in
 .Ar debug-mask .
 XXX: document these
-.It Fl F Ar specfile
+.It Fl F Ar mtree-specfile
 Use
-.Ar specfile
+.Ar mtree-specfile
 as an
 .Xr mtree 8
 .Sq specfile
@@ -174,13 +174,13 @@ Set the maximum size of the file system 
 .Ar maximum-size .
 An error will be raised if the target file system needs to be larger
 than this to accommodate the provided directory tree.
-.It Fl N Ar dbdir
+.It Fl N Ar userdb-dir
 Use the user database text file
 .Pa master.passwd
 and group database text file
 .Pa group
 from
-.Ar dbdir ,
+.Ar userdb-dir ,
 rather than using the results from the system's
 .Xr getpwnam 3
 and
@@ -226,7 +226,9 @@ ISO 9660 file system.
 .It Fl x
 Exclude file system nodes not explicitly listed in the specfile.
 .It Fl Z
-Create the image as a sparse file.
+Create a sparse file for
+.Sy ffs .
+This is useful for virtual machine images.
 .El
 .Pp
 Where sizes are specified, a decimal number of bytes is expected.
@@ -301,10 +303,10 @@ The following keywords are supported:
 .It Sy allow-deep-trees
 Allow the directory structure to exceed the maximum specified in
 the spec.
-.\" .It Sy allow-illegal-chars
-.\" Unknown
-.\" .It Sy allow-lowercase
-.\" Unknown
+.It Sy allow-illegal-chars
+Allow illegal characters in filenames. This option is not implemented.
+.It Sy allow-lowercase
+Allow lowercase characters in filenames. This option is not implemented.
 .It Sy allow-max-name
 Allow 37 instead of 33 characters for filenames by omitting the
 version id.
@@ -318,6 +320,8 @@ Use the
 extension to encode
 .Tn RISC OS
 metadata.
+.It Sy bootimagedir
+Boot image directory. This option is not implemented.
 .It Sy chrp-boot
 Write an MBR partition table to the image to allow older CHRP hardware to
 boot.
@@ -338,8 +342,18 @@ or
 Load a generic boot image into the first 32K of the cd9660 image.
 .It Sy hard-disk-boot
 Boot image is a hard disk image.
+.It Sy isolevel
+An integer representing the ISO 9660 interchange level where
+.Dq level
+is either
+.Ql 1
+or
+.Ql 2 .
+.Dq level
+.Ql 3
+is not implemented.
 .It Sy keep-bad-images
-Do not throw away images whose write was aborted due to 

svn commit: r290892 - in stable/10: etc/mtree lib/libarchive lib/libarchive/test lib/libarchive/tests usr.bin/cpio usr.bin/cpio/test usr.bin/cpio/tests usr.bin/tar usr.bin/tar/test usr.bin/tar/tests

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 22:13:41 2015
New Revision: 290892
URL: https://svnweb.freebsd.org/changeset/base/290892

Log:
  MFC r289195:
  
  Integrate the tests from lib/libarchive, usr.bin/cpio, and usr.bin/tar in to
  the FreeBSD test suite
  
  functional_test.sh was ported from bin/sh/tests/functional_test.sh, as a
  small wrapper around libarchive_test, bsdcpio_test, and bsdtar_test provided
  by upstream.
  
  A handful of testcases in lib/libarchive/tests have been disabled as they
  were failing when run with kyua test (see BROKEN_TESTS in
  lib/libarchive/tests/Makefile)
  
  As a sidenote: this removes the check/test targets from the Makefiles as they
  don't match the pattern used in the rest of the FreeBSD test suite.
  
  Sponsored by: EMC / Isilon Storage Division
  
  Conflicts:
lib/libarchive/test
usr.bin/cpio/test

Added:
  stable/10/lib/libarchive/tests/
 - copied from r289195, head/lib/libarchive/tests/
  stable/10/usr.bin/cpio/tests/
 - copied from r289195, head/usr.bin/cpio/tests/
  stable/10/usr.bin/tar/tests/
 - copied from r289195, head/usr.bin/tar/tests/
Deleted:
  stable/10/lib/libarchive/test/
  stable/10/usr.bin/cpio/test/
  stable/10/usr.bin/tar/test/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/lib/libarchive/Makefile
  stable/10/lib/libarchive/tests/Makefile
  stable/10/usr.bin/cpio/Makefile
  stable/10/usr.bin/cpio/tests/Makefile
  stable/10/usr.bin/tar/Makefile
  stable/10/usr.bin/tar/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist  Sun Nov 15 21:58:04 2015
(r290891)
+++ stable/10/etc/mtree/BSD.tests.dist  Sun Nov 15 22:13:41 2015
(r290892)
@@ -80,6 +80,8 @@
 test-programs
 ..
 ..
+libarchive
+..
 libc
 c063
 ..
@@ -348,6 +350,8 @@
 ..
 cmp
 ..
+cpio
+..
 col
 ..
 comm
@@ -380,6 +384,8 @@
 regress.multitest.out
 ..
 ..
+tar
+..
 timeout
 ..
 tr

Modified: stable/10/lib/libarchive/Makefile
==
--- stable/10/lib/libarchive/Makefile   Sun Nov 15 21:58:04 2015
(r290891)
+++ stable/10/lib/libarchive/Makefile   Sun Nov 15 22:13:41 2015
(r290892)
@@ -410,11 +410,8 @@ MLINKS+=   archive_write_set_options.3 arc
 MLINKS+=   archive_write_set_options.3 archive_write_set_option.3
 MLINKS+=   libarchive.3 archive.3
 
-.PHONY: check test clean-test
-check test:
-   cd ${.CURDIR}/test && make obj && make test
-
-clean-test:
-   cd ${.CURDIR}/test && make clean
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
 
 .include 

Modified: stable/10/lib/libarchive/tests/Makefile
==
--- head/lib/libarchive/tests/Makefile  Mon Oct 12 18:31:21 2015
(r289195)
+++ stable/10/lib/libarchive/tests/Makefile Sun Nov 15 22:13:41 2015
(r290892)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+SRCTOP=${.CURDIR:H:H:H}
+TESTSDIR=  ${TESTSBASE}/lib/libarchive
+
 LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+= functional_test
@@ -249,7 +252,8 @@ SRCS.libarchive_test=   \
 DPSRCS.libarchive_test= \
list.h
 
-LIBADD.libarchive_test=archive
+DPADD.libarchive_test= ${LIBARCHIVE}
+LDADD.libarchive_test= -larchive
 
 .PATH: ${LIBARCHIVEDIR}/test_utils
 SRCS.libarchive_test+= test_utils.c

Modified: stable/10/usr.bin/cpio/Makefile
==
--- stable/10/usr.bin/cpio/Makefile Sun Nov 15 21:58:04 2015
(r290891)
+++ stable/10/usr.bin/cpio/Makefile Sun Nov 15 22:13:41 2015
(r290892)
@@ -40,12 +40,8 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1
 SYMLINKS=bsdcpio ${BINDIR}/cpio
 MLINKS= bsdcpio.1 cpio.1
 
-.PHONY: check test clean-test
-
-check test: $(PROG) bsdcpio.1.gz
-   cd ${.CURDIR}/test && make obj && make test
-
-clean-test:
-   cd ${.CURDIR}/test && make clean
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
 
 .include 

Modified: stable/10/usr.bin/cpio/tests/Makefile
==
--- head/usr.bin/cpio/tests/MakefileMon Oct 12 18:31:21 2015
(r289195)
+++ stable/10/usr.bin/cpio/tests/Makefile   Sun Nov 15 22:13:41 2015
(r290892)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+SRCTOP=${.CURDIR:H:H:H}
+TESTSDIR=  ${TESTSBASE}/usr.bin/cpio
+
 LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+= functional_test
@@ -81,7 +84,8 @@ DPSRCS.bsdcpio_test= \
 .PATH: ${LIBARCHIVEDIR}/test_utils
 SRCS.bsdcpio_test+=   

svn commit: r290894 - in stable/10: etc/mtree tests/sys tests/sys/acl

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:37:00 2015
New Revision: 290894
URL: https://svnweb.freebsd.org/changeset/base/290894

Log:
  MFC r289446:
  
  Integrate tools/regression/acltools into the FreeBSD test suite as 
tests/sys/acl
  
  - Make the requirements more complete for the testcases
  - Detect prerequisites so the tests won't fail (zfs.ko is loaded, zpool(1)
is available, ACL support is enabled with UFS, etc).
  - Work with temporary files/directories/mountpoints that work with atf/kyua
  - Limit the testcases to work on temporary filesystems to reduce tainting the
test host
  
  Reviewed by: trasz (earlier version)
  Differential Revision: https://reviews.freebsd.org/D3810

Added:
  stable/10/tests/sys/acl/
 - copied from r289446, head/tests/sys/acl/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/tests/sys/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist  Sun Nov 15 23:54:34 2015
(r290893)
+++ stable/10/etc/mtree/BSD.tests.dist  Mon Nov 16 00:37:00 2015
(r290894)
@@ -188,6 +188,8 @@
 ..
 ..
 sys
+acl
+..
 aio
 ..
 fifo

Modified: stable/10/tests/sys/Makefile
==
--- stable/10/tests/sys/MakefileSun Nov 15 23:54:34 2015
(r290893)
+++ stable/10/tests/sys/MakefileMon Nov 16 00:37:00 2015
(r290894)
@@ -4,6 +4,7 @@
 
 TESTSDIR= ${TESTSBASE}/sys
 
+TESTS_SUBDIRS+=acl
 TESTS_SUBDIRS+=aio
 TESTS_SUBDIRS+=fifo
 TESTS_SUBDIRS+=file
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290895 - stable/10/tools/regression/acltools

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:37:53 2015
New Revision: 290895
URL: https://svnweb.freebsd.org/changeset/base/290895

Log:
  Remove tools/regression/acltools
  
  Should have been done with r290894
  
  Sponsored by: EMC / Isilon Storage Division

Deleted:
  stable/10/tools/regression/acltools/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290896 - in stable/10: . lib/libc/tests/c063 lib/libc/tests/setjmp lib/libc/tests/string

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:50:53 2015
New Revision: 290896
URL: https://svnweb.freebsd.org/changeset/base/290896

Log:
  MFC r290255:
  
  Add _test suffix to multiple tests in lib/libc to conform to the design noted
  in the FreeBSD Test Suite wiki
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/ObsoleteFiles.inc
  stable/10/lib/libc/tests/c063/Makefile
  stable/10/lib/libc/tests/setjmp/Makefile
  stable/10/lib/libc/tests/string/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/ObsoleteFiles.inc
==
--- stable/10/ObsoleteFiles.inc Mon Nov 16 00:37:53 2015(r290895)
+++ stable/10/ObsoleteFiles.inc Mon Nov 16 00:50:53 2015(r290896)
@@ -38,6 +38,37 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151115: added missing _test suffix on multiple tests in lib/libc
+OLD_FILES+=usr/tests/lib/libc/c063/faccessat
+OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
+OLD_FILES+=usr/tests/lib/libc/c063/fchownat
+OLD_FILES+=usr/tests/lib/libc/c063/fexecve
+OLD_FILES+=usr/tests/lib/libc/c063/fstatat
+OLD_FILES+=usr/tests/lib/libc/c063/linkat
+OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
+OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
+OLD_FILES+=usr/tests/lib/libc/c063/mknodat
+OLD_FILES+=usr/tests/lib/libc/c063/openat
+OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/renameat
+OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/utimensat
+OLD_FILES+=usr/tests/lib/libc/string/memchr
+OLD_FILES+=usr/tests/lib/libc/string/memcpy
+OLD_FILES+=usr/tests/lib/libc/string/memmem
+OLD_FILES+=usr/tests/lib/libc/string/memset
+OLD_FILES+=usr/tests/lib/libc/string/strcat
+OLD_FILES+=usr/tests/lib/libc/string/strchr
+OLD_FILES+=usr/tests/lib/libc/string/strcmp
+OLD_FILES+=usr/tests/lib/libc/string/strcpy
+OLD_FILES+=usr/tests/lib/libc/string/strcspn
+OLD_FILES+=usr/tests/lib/libc/string/strerror
+OLD_FILES+=usr/tests/lib/libc/string/strlen
+OLD_FILES+=usr/tests/lib/libc/string/strpbrk
+OLD_FILES+=usr/tests/lib/libc/string/strrchr
+OLD_FILES+=usr/tests/lib/libc/string/strspn
+OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151025: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz

Modified: stable/10/lib/libc/tests/c063/Makefile
==
--- stable/10/lib/libc/tests/c063/Makefile  Mon Nov 16 00:37:53 2015
(r290895)
+++ stable/10/lib/libc/tests/c063/Makefile  Mon Nov 16 00:50:53 2015
(r290896)
@@ -4,20 +4,20 @@ TESTSDIR= ${TESTSBASE}/lib/libc/c063
 
 #TODO: t_o_search, t_utimensat
 
-NETBSD_ATF_TESTS_C=faccessat
-NETBSD_ATF_TESTS_C+=   fchmodat
-NETBSD_ATF_TESTS_C+=   fchownat
-NETBSD_ATF_TESTS_C+=   fexecve
-NETBSD_ATF_TESTS_C+=   fstatat
-NETBSD_ATF_TESTS_C+=   linkat
-NETBSD_ATF_TESTS_C+=   mkdirat
-NETBSD_ATF_TESTS_C+=   mkfifoat
-NETBSD_ATF_TESTS_C+=   mknodat
-NETBSD_ATF_TESTS_C+=   openat
-NETBSD_ATF_TESTS_C+=   readlinkat
-NETBSD_ATF_TESTS_C+=   renameat
-NETBSD_ATF_TESTS_C+=   symlinkat
-NETBSD_ATF_TESTS_C+=   unlinkat
+NETBSD_ATF_TESTS_C=faccessat_test
+NETBSD_ATF_TESTS_C+=   fchmodat_test
+NETBSD_ATF_TESTS_C+=   fchownat_test
+NETBSD_ATF_TESTS_C+=   fexecve_test
+NETBSD_ATF_TESTS_C+=   fstatat_test
+NETBSD_ATF_TESTS_C+=   linkat_test
+NETBSD_ATF_TESTS_C+=   mkdirat_test
+NETBSD_ATF_TESTS_C+=   mkfifoat_test
+NETBSD_ATF_TESTS_C+=   mknodat_test
+NETBSD_ATF_TESTS_C+=   openat_test
+NETBSD_ATF_TESTS_C+=   readlinkat_test
+NETBSD_ATF_TESTS_C+=   renameat_test
+NETBSD_ATF_TESTS_C+=   symlinkat_test
+NETBSD_ATF_TESTS_C+=   unlinkat_test
 
 CFLAGS+= -D_INCOMPLETE_XOPEN_C063
 

Modified: stable/10/lib/libc/tests/setjmp/Makefile
==
--- stable/10/lib/libc/tests/setjmp/MakefileMon Nov 16 00:37:53 2015
(r290895)
+++ stable/10/lib/libc/tests/setjmp/MakefileMon Nov 16 00:50:53 2015
(r290896)
@@ -2,11 +2,11 @@
 
 TESTSDIR=  ${TESTSBASE}/lib/libc/setjmp
 
-NETBSD_ATF_TESTS_C=t_setjmp
-NETBSD_ATF_TESTS_C+=   t_threadjmp
+NETBSD_ATF_TESTS_C=setjmp_test
+NETBSD_ATF_TESTS_C+=   threadjmp_test
 
-DPADD.t_threadjmp+= ${LIBPTHREAD}
-LDADD.t_threadjmp+= -lpthread
+DPADD.threadjmp_test+= ${LIBPTHREAD}
+LDADD.threadjmp_test+= -lpthread
 
 WARNS?=4
 

Modified: stable/10/lib/libc/tests/string/Makefile
==
--- stable/10/lib/libc/tests/string/MakefileMon Nov 16 00:37:53 2015
(r290895)
+++ stable/10/lib/libc/tests/string/MakefileMon Nov 16 00:50:53 2015
(r290896)
@@ -9,30 +9,30 @@ TESTSDIR= ${TESTSBASE}/lib/libc/string
 
 # TODO: popcount, stresep
 
-NETBSD_ATF_TESTS_C+=   memchr

svn commit: r290897 - stable/10

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:52:31 2015
New Revision: 290897
URL: https://svnweb.freebsd.org/changeset/base/290897

Log:
  Follow up to r290255
  
  The utimensat testcase was never integrated into stable/10 because
  the syscall is not present on stable/10
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/ObsoleteFiles.inc

Modified: stable/10/ObsoleteFiles.inc
==
--- stable/10/ObsoleteFiles.inc Mon Nov 16 00:50:53 2015(r290896)
+++ stable/10/ObsoleteFiles.inc Mon Nov 16 00:52:31 2015(r290897)
@@ -53,7 +53,6 @@ OLD_FILES+=usr/tests/lib/libc/c063/readl
 OLD_FILES+=usr/tests/lib/libc/c063/renameat
 OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
-OLD_FILES+=usr/tests/lib/libc/c063/utimensat
 OLD_FILES+=usr/tests/lib/libc/string/memchr
 OLD_FILES+=usr/tests/lib/libc/string/memcpy
 OLD_FILES+=usr/tests/lib/libc/string/memmem
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290898 - in stable/10: etc/mtree usr.bin/limits usr.bin/limits/tests

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 00:58:31 2015
New Revision: 290898
URL: https://svnweb.freebsd.org/changeset/base/290898

Log:
  MFC r290567:
  
  Add some basic tests that exercise cputime limits with limits(1)
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/usr.bin/limits/tests/
 - copied from r290567, head/usr.bin/limits/tests/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/usr.bin/limits/Makefile
  stable/10/usr.bin/limits/tests/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist  Mon Nov 16 00:52:31 2015
(r290897)
+++ stable/10/etc/mtree/BSD.tests.dist  Mon Nov 16 00:58:31 2015
(r290898)
@@ -374,6 +374,8 @@
 ..
 lastcomm
 ..
+limits
+..
 m4
 ..
 ncal

Modified: stable/10/usr.bin/limits/Makefile
==
--- stable/10/usr.bin/limits/Makefile   Mon Nov 16 00:52:31 2015
(r290897)
+++ stable/10/usr.bin/limits/Makefile   Mon Nov 16 00:58:31 2015
(r290898)
@@ -1,7 +1,13 @@
 # $FreeBSD$
 
+.include 
+
 PROG=  limits
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=   tests
+.endif
+
 .include 

Modified: stable/10/usr.bin/limits/tests/Makefile
==
--- head/usr.bin/limits/tests/Makefile  Mon Nov  9 01:05:31 2015
(r290567)
+++ stable/10/usr.bin/limits/tests/Makefile Mon Nov 16 00:58:31 2015
(r290898)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+TESTSDIR=  ${TESTSBASE}/usr.bin/limits
+
 ATF_TESTS_SH+= limits_test
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290891 - stable/9/usr.bin/tar

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:58:04 2015
New Revision: 290891
URL: https://svnweb.freebsd.org/changeset/base/290891

Log:
  MFstable/10 r290890:
  
  MFC r283245:
  
  r283245 (by imp):
  
  Remove stray DEBUG_FLAGS=-g that snuck in with r184761.

Modified:
  stable/9/usr.bin/tar/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/tar/   (props changed)

Modified: stable/9/usr.bin/tar/Makefile
==
--- stable/9/usr.bin/tar/Makefile   Sun Nov 15 21:56:15 2015
(r290890)
+++ stable/9/usr.bin/tar/Makefile   Sun Nov 15 21:58:04 2015
(r290891)
@@ -38,7 +38,6 @@ CFLAGS+=  -I${LIBARCHIVEDIR}/tar -I${LIBA
 CFLAGS+=   -I${LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=  bsdtar ${BINDIR}/tar
 MLINKS=bsdtar.1 tar.1
-DEBUG_FLAGS=-g
 
 .PHONY: check test clean-test
 check test: $(PROG) bsdtar.1.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290893 - in stable/10: bin/setfacl lib/libc/posix1e share/man/man9 sys/cddl/compat/opensolaris/kern sys/cddl/contrib/opensolaris/uts/common/sys sys/kern sys/sys tools/regression/acltools

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 23:54:34 2015
New Revision: 290893
URL: https://svnweb.freebsd.org/changeset/base/290893

Log:
  MFC r289195:
  
  Integrate the tests from lib/libarchive, usr.bin/cpio, and usr.bin/tar in to
  the FreeBSD test suite
  
  functional_test.sh was ported from bin/sh/tests/functional_test.sh, as a
  small wrapper around libarchive_test, bsdcpio_test, and bsdtar_test provided
  by upstream.
  
  A handful of testcases in lib/libarchive/tests have been disabled as they
  were failing when run with kyua test (see BROKEN_TESTS in
  lib/libarchive/tests/Makefile)
  
  As a sidenote: this removes the check/test targets from the Makefiles as they
  don't match the pattern used in the rest of the FreeBSD test suite.
  
  Sponsored by: EMC / Isilon Storage Division
  
  Conflicts:
lib/libarchive/test
usr.bin/cpio/test

Modified:
  stable/10/bin/setfacl/setfacl.1
  stable/10/lib/libc/posix1e/acl_add_flag_np.3
  stable/10/lib/libc/posix1e/acl_support_nfs4.c
  stable/10/share/man/man9/acl.9
  stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c
  stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  stable/10/sys/kern/subr_acl_nfs4.c
  stable/10/sys/sys/acl.h
  stable/10/tools/regression/acltools/tools-crossfs.test
  stable/10/tools/regression/acltools/tools-nfs4-psarc.test
  stable/10/tools/regression/acltools/tools-nfs4-trivial.test
  stable/10/tools/regression/acltools/tools-nfs4.test
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/setfacl/setfacl.1
==
--- stable/10/bin/setfacl/setfacl.1 Sun Nov 15 22:13:41 2015
(r290892)
+++ stable/10/bin/setfacl/setfacl.1 Sun Nov 15 23:54:34 2015
(r290893)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 1, 2013
+.Dd September 4, 2015
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -378,9 +378,11 @@ dir_inherit
 inherit_only
 .It n
 no_propagate
+.It I
+inherited
 .El
 .Pp
-Inheritance flags may be only set on directories.
+Other than the "inherited" flag, inheritance flags may be only set on 
directories.
 .It Ar "ACL type"
 The ACL type field is either
 .Dq Li allow

Modified: stable/10/lib/libc/posix1e/acl_add_flag_np.3
==
--- stable/10/lib/libc/posix1e/acl_add_flag_np.3Sun Nov 15 22:13:41 
2015(r290892)
+++ stable/10/lib/libc/posix1e/acl_add_flag_np.3Sun Nov 15 23:54:34 
2015(r290893)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 30, 2014
+.Dd September 4, 2015
 .Dt ACL_ADD_FLAG_NP 3
 .Os
 .Sh NAME
@@ -56,6 +56,7 @@ Valid values are:
 .It ACL_ENTRY_DIRECTORY_INHERIT Ta "Will be inherited by directories."
 .It ACL_ENTRY_NO_PROPAGATE_INHERIT Ta "Will not propagate."
 .It ACL_ENTRY_INHERIT_ONLY Ta "Inherit-only."
+.It ACL_ENTRY_INHERITED Ta "Inherited from parent"
 .El
 .Sh RETURN VALUES
 .Rv -std acl_add_flag_np

Modified: stable/10/lib/libc/posix1e/acl_support_nfs4.c
==
--- stable/10/lib/libc/posix1e/acl_support_nfs4.c   Sun Nov 15 22:13:41 
2015(r290892)
+++ stable/10/lib/libc/posix1e/acl_support_nfs4.c   Sun Nov 15 23:54:34 
2015(r290893)
@@ -48,6 +48,7 @@ struct flagnames_struct a_flags[] =
  { ACL_ENTRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'},
  { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'},
  { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'},
+ { ACL_ENTRY_INHERITED, "inherited", 'I' },
  /*
   * There is no ACE_IDENTIFIER_GROUP here - SunOS does not show it
   * in the "flags" field.  There is no ACE_OWNER, ACE_GROUP or

Modified: stable/10/share/man/man9/acl.9
==
--- stable/10/share/man/man9/acl.9  Sun Nov 15 22:13:41 2015
(r290892)
+++ stable/10/share/man/man9/acl.9  Sun Nov 15 23:54:34 2015
(r290893)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 18, 2009
+.Dd September 4, 2015
 .Dt ACL 9
 .Os
 .Sh NAME
@@ -203,7 +203,13 @@ The following values are valid:
 .It Dv ACL_ENTRY_DIRECTORY_INHERIT
 .It Dv ACL_ENTRY_NO_PROPAGATE_INHERIT
 .It Dv ACL_ENTRY_INHERIT_ONLY
+.It Dv ACL_ENTRY_INHERITED
 .El
+The
+.Dv ACL_ENTRY_INHERITED
+flag is set on an ACE that has been inherited from its parent.
+It may also be set programmatically, and is valid on both files
+and directories.
 .El
 .Sh SEE ALSO
 .Xr acl 3 ,

Modified: stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c
==
--- stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_acl.cSun Nov 
15 22:13:41 2015(r290892)
+++ stable/10/sys/cddl/compat/opensolaris/kern/opensolaris_acl.cSun Nov 
15 23:54:34 2015(r290893)
@@ -64,6 +64,8 @@ struct zfs2bsd flags[] = {{ACE_FILE_INHE
 

svn commit: r290888 - in stable/9: sbin/camcontrol sbin/kldload sbin/newfs share/man/man3 share/man/man4 usr.sbin/bluetooth/l2ping usr.sbin/ctladm usr.sbin/makefs usr.sbin/mptutil usr.sbin/services...

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:41:51 2015
New Revision: 290888
URL: https://svnweb.freebsd.org/changeset/base/290888

Log:
  MFstable/10 r249373:
  
  r249373 (by joel):
  
  Remove contractions.
  
  Command used:
$ svn merge --accept mine-full -c r249373 ^/stable/10
  
  Conflicts:
share/man/man9/locking.9
share/man/man9/zone.9
usr.bin/patch

Modified:
  stable/9/sbin/camcontrol/camcontrol.8
  stable/9/sbin/kldload/kldload.8
  stable/9/sbin/newfs/newfs.8
  stable/9/share/man/man3/fpgetround.3
  stable/9/share/man/man4/ng_tag.4
  stable/9/share/man/man4/sdhci.4
  stable/9/usr.sbin/bluetooth/l2ping/l2ping.8
  stable/9/usr.sbin/ctladm/ctladm.8
  stable/9/usr.sbin/makefs/makefs.8
  stable/9/usr.sbin/mptutil/mptutil.8
  stable/9/usr.sbin/services_mkdb/services_mkdb.8
Directory Properties:
  stable/9/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/camcontrol/   (props changed)
  stable/9/sbin/kldload/   (props changed)
  stable/9/sbin/newfs/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man3/   (props changed)
  stable/9/share/man/man4/   (props changed)
  stable/9/share/man/man9/   (props changed)
  stable/9/usr.bin/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/ctladm/   (props changed)
  stable/9/usr.sbin/makefs/   (props changed)
  stable/9/usr.sbin/mptutil/   (props changed)
  stable/9/usr.sbin/services_mkdb/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.8
==
--- stable/9/sbin/camcontrol/camcontrol.8   Sun Nov 15 21:27:50 2015
(r290887)
+++ stable/9/sbin/camcontrol/camcontrol.8   Sun Nov 15 21:41:51 2015
(r290888)
@@ -401,7 +401,7 @@ There are a couple of options to modify 
 .It Fl c
 Just print out a count of LUNs, not the actual LUN numbers.
 .It Fl l
-Just print out the LUNs, and don't print out the count.
+Just print out the LUNs, and do not print out the count.
 .It Fl r Ar reporttype
 Specify the type of report to request from the target:
 .Bl -tag -width 012345678

Modified: stable/9/sbin/kldload/kldload.8
==
--- stable/9/sbin/kldload/kldload.8 Sun Nov 15 21:27:50 2015
(r290887)
+++ stable/9/sbin/kldload/kldload.8 Sun Nov 15 21:41:51 2015
(r290888)
@@ -63,7 +63,7 @@ in the current directory.
 The following options are available:
 .Bl -tag -width indent
 .It Fl n
-Don't try to load module if already loaded.
+Do not try to load module if already loaded.
 .It Fl v
 Be more verbose.
 .It Fl q

Modified: stable/9/sbin/newfs/newfs.8
==
--- stable/9/sbin/newfs/newfs.8 Sun Nov 15 21:27:50 2015(r290887)
+++ stable/9/sbin/newfs/newfs.8 Sun Nov 15 21:41:51 2015(r290888)
@@ -226,7 +226,7 @@ See
 for more details on how to set this option.
 .It Fl p Ar partition
 The partition name (a..h) you want to use in case the underlying image
-is a file, so you don't have access to individual partitions through the
+is a file, so you do not have access to individual partitions through the
 filesystem.
 Can also be used with a device, e.g.
 .Nm

Modified: stable/9/share/man/man3/fpgetround.3
==
--- stable/9/share/man/man3/fpgetround.3Sun Nov 15 21:27:50 2015
(r290887)
+++ stable/9/share/man/man3/fpgetround.3Sun Nov 15 21:41:51 2015
(r290888)
@@ -164,7 +164,7 @@ and
 .Fn fpsetprec
 functions provide functionality unavailable on many platforms.
 At present, they are implemented only on the i386 and amd64 platforms.
-Changing precision isn't a supported feature:
+Changing precision is not a supported feature:
 it may be ineffective when code is compiled to take advantage of SSE,
 and many library functions and compiler optimizations depend upon the
 default precision for correct behavior.

Modified: stable/9/share/man/man4/ng_tag.4
==
--- stable/9/share/man/man4/ng_tag.4Sun Nov 15 21:27:50 2015
(r290887)
+++ stable/9/share/man/man4/ng_tag.4Sun Nov 15 21:41:51 2015
(r290888)
@@ -284,7 +284,7 @@ ngctl msg ngdc: sethookout { thisHook=\e
   tag_id=412 }
 .Ed
 .Pp
-Don't forget to program
+Do not forget to program
 .Xr ng_bpf 4
 .Dq Li ipfw
 hook with the above expression (see

Modified: stable/9/share/man/man4/sdhci.4
==
--- stable/9/share/man/man4/sdhci.4 Sun Nov 15 21:27:50 2015
(r290887)
+++ stable/9/share/man/man4/sdhci.4 Sun Nov 15 21:41:51 2015
(r290888)
@@ -83,4 +83,4 @@ TI PCIXX21/XX11
 Many of existing SD controller chips have some nonstandard requirements,
 

svn commit: r290890 - stable/10/usr.bin/tar

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 21:56:15 2015
New Revision: 290890
URL: https://svnweb.freebsd.org/changeset/base/290890

Log:
  MFC r283245:
  
  r283245 (by imp):
  
  Remove stray DEBUG_FLAGS=-g that snuck in with r184761.

Modified:
  stable/10/usr.bin/tar/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/tar/Makefile
==
--- stable/10/usr.bin/tar/Makefile  Sun Nov 15 21:44:10 2015
(r290889)
+++ stable/10/usr.bin/tar/Makefile  Sun Nov 15 21:56:15 2015
(r290890)
@@ -39,7 +39,6 @@ CFLAGS+=  -I${LIBARCHIVEDIR}/tar -I${LIBA
 CFLAGS+=   -I${LIBARCHIVEDIR}/libarchive_fe
 SYMLINKS=  bsdtar ${BINDIR}/tar
 MLINKS=bsdtar.1 tar.1
-DEBUG_FLAGS=-g
 
 .PHONY: check test clean-test
 check test: $(PROG) bsdtar.1.gz
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290903 - head/usr.sbin/ypbind

[Marcelo Araujo]

Author: araujo
Date: Mon Nov 16 03:18:40 2015
New Revision: 290903
URL: https://svnweb.freebsd.org/changeset/base/290903

Log:
  Don't need cast malloc.
  
  Approved by:  rodrigc (mentor)
  Differential Revision:D4117

Modified:
  head/usr.sbin/ypbind/ypbind.c

Modified: head/usr.sbin/ypbind/ypbind.c
==
--- head/usr.sbin/ypbind/ypbind.c   Mon Nov 16 02:27:38 2015
(r290902)
+++ head/usr.sbin/ypbind/ypbind.c   Mon Nov 16 03:18:40 2015
(r290903)
@@ -199,7 +199,7 @@ rejecting.", *argp);
res.ypbind_resp_u.ypbind_error = YPBIND_ERR_RESC;
return ();
}
-   ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
+   ypdb = malloc(sizeof *ypdb);
if (ypdb == NULL) {
syslog(LOG_WARNING, "malloc: %m");
res.ypbind_resp_u.ypbind_error = YPBIND_ERR_RESC;
@@ -452,7 +452,7 @@ main(int argc, char *argv[])
errx(1, "unable to register (YPBINDPROG, YPBINDVERS, tcp)");
 
/* build initial domain binding, make it "unsuccessful" */
-   ypbindlist = (struct _dom_binding *)malloc(sizeof *ypbindlist);
+   ypbindlist = malloc(sizeof *ypbindlist);
if (ypbindlist == NULL)
errx(1, "malloc");
bzero(ypbindlist, sizeof *ypbindlist);
@@ -886,7 +886,7 @@ rpc_received(char *dom, struct sockaddr_
if (ypdb == NULL) {
if (force == 0)
return;
-   ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
+   ypdb = malloc(sizeof *ypdb);
if (ypdb == NULL) {
syslog(LOG_WARNING, "malloc: %m");
return;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290899 - stable/10/lib/libc/rpc

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 01:09:25 2015
New Revision: 290899
URL: https://svnweb.freebsd.org/changeset/base/290899

Log:
  MFC r290253:
  
  Remove unnecessary `if (x)` tests before calling `free(x)`; free(3)
  already employs this check
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/lib/libc/rpc/clnt_bcast.c
  stable/10/lib/libc/rpc/clnt_vc.c
  stable/10/lib/libc/rpc/getnetconfig.c
  stable/10/lib/libc/rpc/mt_misc.c
  stable/10/lib/libc/rpc/rpc_soc.c
  stable/10/lib/libc/rpc/rpcb_clnt.c
  stable/10/lib/libc/rpc/svc.c
  stable/10/lib/libc/rpc/svc_dg.c
  stable/10/lib/libc/rpc/svc_simple.c
  stable/10/lib/libc/rpc/svc_vc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/rpc/clnt_bcast.c
==
--- stable/10/lib/libc/rpc/clnt_bcast.c Mon Nov 16 00:58:31 2015
(r290898)
+++ stable/10/lib/libc/rpc/clnt_bcast.c Mon Nov 16 01:09:25 2015
(r290899)
@@ -631,13 +631,10 @@ rpc_broadcast_exp(prog, vers, proc, xarg
}   /* The giant for loop */
 
 done_broad:
-   if (inbuf)
-   (void) free(inbuf);
-   if (outbuf)
-   (void) free(outbuf);
+   free(inbuf);
+   free(outbuf);
 #ifdef PORTMAP
-   if (outbuf_pmap)
-   (void) free(outbuf_pmap);
+   free(outbuf_pmap);
 #endif /* PORTMAP */
for (i = 0; i < fdlistno; i++) {
(void)_close(fdlist[i].fd);

Modified: stable/10/lib/libc/rpc/clnt_vc.c
==
--- stable/10/lib/libc/rpc/clnt_vc.cMon Nov 16 00:58:31 2015
(r290898)
+++ stable/10/lib/libc/rpc/clnt_vc.cMon Nov 16 01:09:25 2015
(r290899)
@@ -666,8 +666,7 @@ clnt_vc_destroy(cl)
(void)_close(ct->ct_fd);
}
XDR_DESTROY(&(ct->ct_xdrs));
-   if (ct->ct_addr.buf)
-   free(ct->ct_addr.buf);
+   free(ct->ct_addr.buf);
mem_free(ct, sizeof(struct ct_data));
if (cl->cl_netid && cl->cl_netid[0])
mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);

Modified: stable/10/lib/libc/rpc/getnetconfig.c
==
--- stable/10/lib/libc/rpc/getnetconfig.c   Mon Nov 16 00:58:31 2015
(r290898)
+++ stable/10/lib/libc/rpc/getnetconfig.c   Mon Nov 16 01:09:25 2015
(r290899)
@@ -164,8 +164,7 @@ __nc_error()
if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) {
nc_addr = (int *)malloc(sizeof (int));
if (thr_setspecific(nc_key, (void *) nc_addr) != 0) {
-   if (nc_addr)
-   free(nc_addr);
+   free(nc_addr);
return (_error);
}
*nc_addr = 0;
@@ -419,7 +418,7 @@ void *handlep;
 
 while (q != NULL) {
p = q->next;
-   if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
+   free(q->ncp->nc_lookups);
free(q->ncp);
free(q->linep);
free(q);
@@ -541,8 +540,7 @@ freenetconfigent(netconfigp)
 {
 if (netconfigp != NULL) {
free(netconfigp->nc_netid); /* holds all netconfigp's strings */
-   if (netconfigp->nc_lookups != NULL)
-   free(netconfigp->nc_lookups);
+   free(netconfigp->nc_lookups);
free(netconfigp);
 }
 return;
@@ -631,8 +629,7 @@ struct netconfig *ncp;  /* where to put r
 } else {
char *cp;   /* tmp string */
 
-   if (ncp->nc_lookups != NULL)/* from last visit */
-   free(ncp->nc_lookups);
+   free(ncp->nc_lookups); /* from last visit */
ncp->nc_lookups = NULL;
ncp->nc_nlookups = 0;
while ((cp = tokenp) != NULL) {

Modified: stable/10/lib/libc/rpc/mt_misc.c
==
--- stable/10/lib/libc/rpc/mt_misc.cMon Nov 16 00:58:31 2015
(r290898)
+++ stable/10/lib/libc/rpc/mt_misc.cMon Nov 16 01:09:25 2015
(r290899)
@@ -106,8 +106,7 @@ __rpc_createerr()
rce_addr = (struct rpc_createerr *)
malloc(sizeof (struct rpc_createerr));
if (thr_setspecific(rce_key, (void *) rce_addr) != 0) {
-   if (rce_addr)
-   free(rce_addr);
+   free(rce_addr);
return (_createerr);
}
memset(rce_addr, 0, sizeof (struct rpc_createerr));

Modified: stable/10/lib/libc/rpc/rpc_soc.c
==
--- stable/10/lib/libc/rpc/rpc_soc.cMon Nov 16 00:58:31 2015
(r290898)
+++ stable/10/lib/libc/rpc/rpc_soc.cMon Nov 16 01:09:25 2015
(r290899)
@@ -472,8 +472,7 @@ 

svn commit: r290900 - head/sbin/restore

[John-Mark Gurney]

Author: jmg
Date: Mon Nov 16 01:29:58 2015
New Revision: 290900
URL: https://svnweb.freebsd.org/changeset/base/290900

Log:
  If you backup a large file that is mostly holes, previously we'd issue
  a seek for every block...  For large (Exabyte sized files) this would
  issue lots of unneeded seeks, so combine them...
  
  Thanks for the work Jan, sorry took so long to commit...  And an item
  completed off the IdeasPage!
  
  Submitted by: Jan Sucan

Modified:
  head/sbin/restore/tape.c

Modified: head/sbin/restore/tape.c
==
--- head/sbin/restore/tape.cMon Nov 16 01:09:25 2015(r290899)
+++ head/sbin/restore/tape.cMon Nov 16 01:29:58 2015(r290900)
@@ -107,6 +107,7 @@ static char *setupextattr(int);
 static void xtrattr(char *, long);
 static void set_extattr_link(char *, void *, int);
 static void set_extattr_fd(int, char *, void *, int);
+static void skiphole(void (*)(char *, long), long *);
 static int  gethead(struct s_spcl *);
 static void readtape(char *);
 static void setdumpnum(void);
@@ -927,6 +928,20 @@ skipfile(void)
 }
 
 /*
+ * Skip a hole in an output file
+ */
+static void
+skiphole(void (*skip)(char *, long), long *seekpos)
+{
+   char buf[MAXBSIZE];
+
+   if (*seekpos > 0) {
+   (*skip)(buf, *seekpos);
+   *seekpos = 0;
+   }
+}
+
+/*
  * Extract a file from the tape.
  * When an allocated block is found it is passed to the fill function;
  * when an unallocated block (hole) is found, a zeroed buffer is passed
@@ -938,14 +953,15 @@ getfile(void (*datafill)(char *, long), 
 {
int i;
off_t size;
+   long seekpos;
int curblk, attrsize;
void (*fillit)(char *, long);
-   static char clearedbuf[MAXBSIZE];
char buf[MAXBSIZE / TP_BSIZE][TP_BSIZE];
char junk[TP_BSIZE];
 
curblk = 0;
size = spcl.c_size;
+   seekpos = 0;
attrsize = spcl.c_extsize;
if (spcl.c_type == TS_END)
panic("ran off end of tape\n");
@@ -974,22 +990,30 @@ loop:
if (readmapflag || spcl.c_addr[i]) {
readtape([curblk++][0]);
if (curblk == fssize / TP_BSIZE) {
+   skiphole(skip, );
(*fillit)((char *)buf, (long)(size > TP_BSIZE ?
 fssize : (curblk - 1) * TP_BSIZE + size));
curblk = 0;
}
} else {
if (curblk > 0) {
+   skiphole(skip, );
(*fillit)((char *)buf, (long)(size > TP_BSIZE ?
 curblk * TP_BSIZE :
 (curblk - 1) * TP_BSIZE + size));
curblk = 0;
}
-   (*skip)(clearedbuf, (long)(size > TP_BSIZE ?
-   TP_BSIZE : size));
+   /*
+* We have a block of a hole. Don't skip it
+* now, because there may be next adjacent
+* block of the hole in the file. Postpone the
+* seek until next file write.
+*/
+   seekpos += (long)(size > TP_BSIZE ? TP_BSIZE : size);
}
if ((size -= TP_BSIZE) <= 0) {
if (size > -TP_BSIZE && curblk > 0) {
+   skiphole(skip, );
(*fillit)((char *)buf,
(long)((curblk * TP_BSIZE) + size));
curblk = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290900 - head/sbin/restore

[Alexey Dokuchaev]

On Mon, Nov 16, 2015 at 01:29:59AM +, John-Mark Gurney wrote:
> New Revision: 290900
> URL: https://svnweb.freebsd.org/changeset/base/290900
> 
> Log:
>   If you backup a large file that is mostly holes, previously we'd issue
>   a seek for every block...  For large (Exabyte sized files) this would
>   issue lots of unneeded seeks, so combine them...
> 
> [...]
> @@ -938,14 +953,15 @@ getfile(void (*datafill)(char *, long), 
>  {
>   int i;
>   off_t size;
> + long seekpos;

Briefly reading through tape.c, it looks like `long' is abused here (and in
other places).  IMHO we should try to fix these bugs, not add new misuses.

./danfe
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r290900 - head/sbin/restore

[John-Mark Gurney]

Alexey Dokuchaev wrote this message on Mon, Nov 16, 2015 at 02:08 +:
> On Mon, Nov 16, 2015 at 01:29:59AM +, John-Mark Gurney wrote:
> > New Revision: 290900
> > URL: https://svnweb.freebsd.org/changeset/base/290900
> > 
> > Log:
> >   If you backup a large file that is mostly holes, previously we'd issue
> >   a seek for every block...  For large (Exabyte sized files) this would
> >   issue lots of unneeded seeks, so combine them...
> > 
> > [...]
> > @@ -938,14 +953,15 @@ getfile(void (*datafill)(char *, long), 
> >  {
> > int i;
> > off_t size;
> > +   long seekpos;
> 
> Briefly reading through tape.c, it looks like `long' is abused here (and in
> other places).  IMHO we should try to fix these bugs, not add new misuses.

I agree...  I'll ask if Jan is interested in fixing it, but it may need
to be added to the IdeasPage...

It'd also be good to have a test of regression tests for restore such
that changes can be verified not to break things..

-- 
  John-Mark Gurney  Voice: +1 415 225 5579

 "All that I will do, has been done, All that I have, has not."
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290905 - in head: etc/mtree tests/sys/kern tests/sys/kern/acct

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 03:32:12 2015
New Revision: 290905
URL: https://svnweb.freebsd.org/changeset/base/290905

Log:
  Integrate acct(2) testcase in as tests/sys/kern/acct/acct_test
  
  The :encode_tv_random_million testcase fails the epsilon tests a few thousand
  times out of one million, so expect the testcase to fail
  
  MFC after: 1 week
  Submitted by: keramida
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/tests/sys/kern/acct/
 - copied from r290904, user/ngie/more-tests2/tests/sys/kern/acct/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tests/sys/kern/Makefile
Directory Properties:
  head/   (props changed)

Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist   Mon Nov 16 03:28:28 2015
(r290904)
+++ head/etc/mtree/BSD.tests.dist   Mon Nov 16 03:32:12 2015
(r290905)
@@ -373,6 +373,8 @@
 file
 ..
 kern
+acct
+..
 execve
 ..
 ..

Modified: head/tests/sys/kern/Makefile
==
--- head/tests/sys/kern/MakefileMon Nov 16 03:28:28 2015
(r290904)
+++ head/tests/sys/kern/MakefileMon Nov 16 03:32:12 2015
(r290905)
@@ -13,6 +13,7 @@ LDADD.unix_seqpacket_test+=   -lpthread
 
 WARNS?=5
 
+TESTS_SUBDIRS+=acct
 TESTS_SUBDIRS+=execve
 
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290908 - head/lib/libcrypt/tests

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 04:06:14 2015
New Revision: 290908
URL: https://svnweb.freebsd.org/changeset/base/290908

Log:
  Integrate contrib/netbsd-tests/lib/libcrypt/t_crypt.c in to the FreeBSD
  test suite as lib/libcrypt/crypt_test
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/lib/libcrypt/tests/Makefile

Modified: head/lib/libcrypt/tests/Makefile
==
--- head/lib/libcrypt/tests/MakefileMon Nov 16 04:04:05 2015
(r290907)
+++ head/lib/libcrypt/tests/MakefileMon Nov 16 04:06:14 2015
(r290908)
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
-# exercise libcrypt
+ATF_TESTS_C+= crypt_tests
 
-ATF_TESTS_C= crypt_tests
+NETBSD_ATF_TESTS_C+= crypt_test
 
 CFLAGS+= -I${.CURDIR:H}
 LIBADD=crypt
 
+.include 
+
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290909 - head/lib/libc/tests/sys

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 04:15:39 2015
New Revision: 290909
URL: https://svnweb.freebsd.org/changeset/base/290909

Log:
  Add some initial tests for SLIST and STAILQ macros
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/lib/libc/tests/sys/queue_test.c   (contents, props changed)
Modified:
  head/lib/libc/tests/sys/Makefile

Modified: head/lib/libc/tests/sys/Makefile
==
--- head/lib/libc/tests/sys/MakefileMon Nov 16 04:06:14 2015
(r290908)
+++ head/lib/libc/tests/sys/MakefileMon Nov 16 04:15:39 2015
(r290909)
@@ -2,6 +2,8 @@
 
 .include 
 
+ATF_TESTS_C+=  queue_test
+
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
 # swapcontext
 NETBSD_ATF_TESTS_C+=   access_test

Added: head/lib/libc/tests/sys/queue_test.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/libc/tests/sys/queue_test.cMon Nov 16 04:15:39 2015
(r290909)
@@ -0,0 +1,237 @@
+/*-
+ * Copyright (c) 2015 EMC Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+
+#include 
+
+ATF_TC(slist_test);
+ATF_TC_HEAD(slist_test, tc)
+{
+
+   atf_tc_set_md_var(tc, "descr", "SLIST macro feature tests");
+}
+
+ATF_TC_BODY(slist_test, tc)
+{
+   SLIST_HEAD(stailhead, entry) head = SLIST_HEAD_INITIALIZER(head);
+   struct entry {
+   SLIST_ENTRY(entry) entries;
+   int i;
+   } *n1, *n2, *n3, *np;
+   int i, j, length;
+
+   SLIST_INIT();
+
+   printf("Ensuring SLIST_EMPTY works\n");
+
+   ATF_REQUIRE(SLIST_EMPTY());
+
+   i = length = 0;
+
+   SLIST_FOREACH(np, , entries) {
+   length++;
+   }
+   ATF_REQUIRE_EQ(length, 0);
+
+   printf("Ensuring SLIST_INSERT_HEAD works\n");
+
+   n1 = malloc(sizeof(struct entry));
+   ATF_REQUIRE(n1 != NULL);
+   n1->i = i++;
+
+   SLIST_INSERT_HEAD(, n1, entries);
+
+   printf("Ensuring SLIST_FIRST returns element 1\n");
+   ATF_REQUIRE_EQ(SLIST_FIRST(), n1);
+
+   j = length = 0;
+   SLIST_FOREACH(np, , entries) {
+   ATF_REQUIRE_EQ_MSG(np->i, j,
+   "%d (entry counter) != %d (counter)", np->i, j);
+   j++;
+   length++;
+   }
+   ATF_REQUIRE_EQ(length, 1);
+
+   printf("Ensuring SLIST_INSERT_AFTER works\n");
+
+   n2 = malloc(sizeof(struct entry));
+   ATF_REQUIRE(n2 != NULL);
+   n2->i = i++;
+
+   SLIST_INSERT_AFTER(n1, n2, entries);
+
+   n3 = malloc(sizeof(struct entry));
+   ATF_REQUIRE(n3 != NULL);
+   n3->i = i++;
+
+   SLIST_INSERT_AFTER(n2, n3, entries);
+
+   j = length = 0;
+   SLIST_FOREACH(np, , entries) {
+   ATF_REQUIRE_EQ_MSG(np->i, j,
+   "%d (entry counter) != %d (counter)", np->i, j);
+   j++;
+   length++;
+   }
+   ATF_REQUIRE_EQ(length, 3);
+
+   printf("Ensuring SLIST_REMOVE_HEAD works\n");
+
+   printf("Ensuring SLIST_FIRST returns element 1\n");
+   ATF_REQUIRE_EQ(SLIST_FIRST(), n1);
+
+   SLIST_REMOVE_HEAD(, entries);
+
+   printf("Ensuring SLIST_FIRST now returns element 2\n");
+   ATF_REQUIRE_EQ(SLIST_FIRST(), n2);
+
+   j = 1; /* Starting point's 1 this time */
+   length = 0;
+   SLIST_FOREACH(np, , entries) {
+   ATF_REQUIRE_EQ_MSG(np->i, j,
+   "%d (entry counter) != %d (counter)", np->i, j);
+   

svn commit: r290911 - head/contrib/netbsd-tests/kernel

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 04:53:13 2015
New Revision: 290911
URL: https://svnweb.freebsd.org/changeset/base/290911

Log:
  Ignore EINTR from usleep(3) in try_locks(..)
  
  NetBSD's usleep(3) only returns -1/sets errno=EINVAL when `microseconds`
  is one million or more
  
  MFC after: 3 days
  Submitted by: pho
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/kernel/t_lockf.c

Modified: head/contrib/netbsd-tests/kernel/t_lockf.c
==
--- head/contrib/netbsd-tests/kernel/t_lockf.c  Mon Nov 16 04:28:00 2015
(r290910)
+++ head/contrib/netbsd-tests/kernel/t_lockf.c  Mon Nov 16 04:53:13 2015
(r290911)
@@ -102,6 +102,9 @@ trylocks(int id)
(void)fcntl(fd, F_SETLKW, );
 
if (usleep(sleeptime) < 0) 
+#if defined(__FreeBSD__)
+ if (errno != EINTR)
+#endif
  err(1, "usleep");
}
printf("%d: done\n", id);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290913 - head/contrib/netbsd-tests/kernel

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 05:28:14 2015
New Revision: 290913
URL: https://svnweb.freebsd.org/changeset/base/290913

Log:
  Port contrib/netbsd-tests/kernel/t_mqueue.c to FreeBSD
  
  - Add missing headers
  - Ensure mqueuefs is loaded
  - Make sure the mqueuefs path is absolute and relative to /
  - Cast the result of mq_open returning -1 to (mqd_t) to mute a compiler
warning
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/kernel/t_mqueue.c

Modified: head/contrib/netbsd-tests/kernel/t_mqueue.c
==
--- head/contrib/netbsd-tests/kernel/t_mqueue.c Mon Nov 16 04:56:14 2015
(r290912)
+++ head/contrib/netbsd-tests/kernel/t_mqueue.c Mon Nov 16 05:28:14 2015
(r290913)
@@ -6,6 +6,13 @@
  * This file is in the Public Domain.
  */
 
+#ifdef __FreeBSD__
+#include 
+#include 
+
+#include "freebsd_test_suite/macros.h"
+#endif
+
 #include 
 
 #include 
@@ -111,16 +118,28 @@ ATF_TC_BODY(mqueue, tc)
char template[32];
char mq_name[64];
 
+#ifdef __FreeBSD__
+   ATF_REQUIRE_KERNEL_MODULE("mqueuefs");
+#endif
+
strlcpy(template, "./t_mqueue.XX", sizeof(template));
tmpdir = mkdtemp(template);
ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed: %d", errno);
+#ifdef __FreeBSD__
+   snprintf(mq_name, sizeof(mq_name), "/t_mqueue");
+#else
snprintf(mq_name, sizeof(mq_name), "%s/mq", tmpdir);
+#endif
 
mqd_t mqfd;
 
mqfd = mq_open(mq_name, O_RDWR | O_CREAT,
S_IRUSR | S_IRWXG | S_IROTH, NULL);
+#ifdef __FreeBSD__
+   ATF_REQUIRE_MSG(mqfd != (mqd_t)-1, "mq_open failed: %d", errno);
+#else
ATF_REQUIRE_MSG(mqfd != -1, "mq_open failed: %d", errno);
+#endif
 
send_msgs(mqfd);
receive_msgs(mqfd);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290915 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon Nov 16 05:52:04 2015
New Revision: 290915
URL: https://svnweb.freebsd.org/changeset/base/290915

Log:
  VM daemon works in parallel with the pagedaemon threads, and, among
  other actions, swaps out kernel stacks of the processes.  On the other
  hand, currentl OOM logic which selects a process to kill in the
  critical condition, skips process with swapped-out thread.  Under some
  loads, this results in the big(gest) process being ignored by OOM.
  
  Do not skip a process which has inhibited thread due to the swap-out,
  in the OOM selection loop.  Note that killing such process requires
  the thread stack page-in, but sometimes this is the only way to
  recover.
  
  Reported and tested by:   pho
  Reviewed by:  alc
  Sponsored by: The FreeBSD Foundation
  MFC after:3 weeks

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cMon Nov 16 05:38:40 2015(r290914)
+++ head/sys/vm/vm_pageout.cMon Nov 16 05:52:04 2015(r290915)
@@ -1554,7 +1554,8 @@ vm_pageout_oom(int shortage)
if (!TD_ON_RUNQ(td) &&
!TD_IS_RUNNING(td) &&
!TD_IS_SLEEPING(td) &&
-   !TD_IS_SUSPENDED(td)) {
+   !TD_IS_SUSPENDED(td) &&
+   !TD_IS_SWAPPED(td)) {
thread_unlock(td);
breakout = 1;
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290919 - head/usr.sbin/ypserv

[Marcelo Araujo]

Author: araujo
Date: Mon Nov 16 06:17:12 2015
New Revision: 290919
URL: https://svnweb.freebsd.org/changeset/base/290919

Log:
  Don't need cast malloc.
  
  Approved by:  rodrigc (mentor)
  Differential Revision:D4175

Modified:
  head/usr.sbin/ypserv/yp_access.c
  head/usr.sbin/ypserv/yp_dblookup.c
  head/usr.sbin/ypserv/yp_dnslookup.c

Modified: head/usr.sbin/ypserv/yp_access.c
==
--- head/usr.sbin/ypserv/yp_access.cMon Nov 16 06:15:01 2015
(r290918)
+++ head/usr.sbin/ypserv/yp_access.cMon Nov 16 06:17:12 2015
(r290919)
@@ -129,7 +129,7 @@ load_securenets(void)
 
if ((fp = fopen(path, "r")) == NULL) {
if (errno == ENOENT) {
-   securenets = (struct securenet *)malloc(sizeof(struct 
securenet));
+   securenets = malloc(sizeof(struct securenet));
securenets->net.s_addr = INADDR_ANY;
securenets->mask.s_addr = INADDR_ANY;
securenets->next = NULL;
@@ -154,7 +154,7 @@ load_securenets(void)
continue;
}
 
-   tmp = (struct securenet *)malloc(sizeof(struct securenet));
+   tmp = malloc(sizeof(struct securenet));
 
if (!inet_aton((char *), (struct in_addr *)>net)) {
yp_error("badly formatted securenets entry: %s", addr1);

Modified: head/usr.sbin/ypserv/yp_dblookup.c
==
--- head/usr.sbin/ypserv/yp_dblookup.c  Mon Nov 16 06:15:01 2015
(r290918)
+++ head/usr.sbin/ypserv/yp_dblookup.c  Mon Nov 16 06:17:12 2015
(r290919)
@@ -103,13 +103,13 @@ yp_malloc_qent(void)
 {
register struct circleq_entry *q;
 
-   q = (struct circleq_entry *)malloc(sizeof(struct circleq_entry));
+   q = malloc(sizeof(struct circleq_entry));
if (q == NULL) {
yp_error("failed to malloc() circleq entry");
return(NULL);
}
bzero((char *)q, sizeof(struct circleq_entry));
-   q->dbptr = (struct dbent *)malloc(sizeof(struct dbent));
+   q->dbptr = malloc(sizeof(struct dbent));
if (q->dbptr == NULL) {
yp_error("failed to malloc() circleq entry");
free(q);

Modified: head/usr.sbin/ypserv/yp_dnslookup.c
==
--- head/usr.sbin/ypserv/yp_dnslookup.c Mon Nov 16 06:15:01 2015
(r290918)
+++ head/usr.sbin/ypserv/yp_dnslookup.c Mon Nov 16 06:17:12 2015
(r290919)
@@ -149,7 +149,7 @@ circleq_dnsentry *yp_malloc_dnsent(void)
 {
register struct circleq_dnsentry *q;
 
-   q = (struct circleq_dnsentry *)malloc(sizeof(struct circleq_dnsentry));
+   q = malloc(sizeof(struct circleq_dnsentry));
 
if (q == NULL) {
yp_error("failed to malloc() circleq dns entry");
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290918 - head/sys/mips/atheros

[Adrian Chadd]

Author: adrian
Date: Mon Nov 16 06:15:01 2015
New Revision: 290918
URL: https://svnweb.freebsd.org/changeset/base/290918

Log:
  Add QCA9533 to the list of SoCs that require IRQ's be ACKed.

Modified:
  head/sys/mips/atheros/apb.c

Modified: head/sys/mips/atheros/apb.c
==
--- head/sys/mips/atheros/apb.c Mon Nov 16 06:02:11 2015(r290917)
+++ head/sys/mips/atheros/apb.c Mon Nov 16 06:15:01 2015(r290918)
@@ -364,6 +364,8 @@ apb_filter(void *arg)
case AR71XX_SOC_AR9341:
case AR71XX_SOC_AR9342:
case AR71XX_SOC_AR9344:
+   case AR71XX_SOC_QCA9533:
+   case AR71XX_SOC_QCA9533_V2:
case AR71XX_SOC_QCA9556:
case AR71XX_SOC_QCA9558:
/* ACK/clear the given interrupt */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290906 - head/share/locale-links

[Craig Rodrigues]

Author: rodrigc
Date: Mon Nov 16 04:02:24 2015
New Revision: 290906
URL: https://svnweb.freebsd.org/changeset/base/290906

Log:
  Fix path for symlinks.
  
  Reviewed by:  ngie

Modified:
  head/share/locale-links/Makefile

Modified: head/share/locale-links/Makefile
==
--- head/share/locale-links/MakefileMon Nov 16 03:32:12 2015
(r290905)
+++ head/share/locale-links/MakefileMon Nov 16 04:02:24 2015
(r290906)
@@ -15,7 +15,7 @@ ALIASES=  zh_Hans_CN.GB18030 zh_CN.GB1803
 
 .for from to in ${ALIASES}
 .for f in ${LC_FILES}
-SYMLINKS+= ${from}/${f} ${LOCALEDIR}/${to}/${f}
+SYMLINKS+= ../${from}/${f} ${LOCALEDIR}/${to}/${f}
 .endfor
 .endfor
 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290907 - head/contrib/netbsd-tests/lib/libcrypt

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 04:04:05 2015
New Revision: 290907
URL: https://svnweb.freebsd.org/changeset/base/290907

Log:
  Expect all testcases dealing with invalid salts to fail on FreeBSD
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c

Modified: head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
==
--- head/contrib/netbsd-tests/lib/libcrypt/t_crypt.cMon Nov 16 04:02:24 
2015(r290906)
+++ head/contrib/netbsd-tests/lib/libcrypt/t_crypt.cMon Nov 16 04:04:05 
2015(r290907)
@@ -124,6 +124,10 @@ ATF_TC_HEAD(crypt_salts, tc)
 ATF_TC_BODY(crypt_salts, tc)
 {
for (size_t i = 0; tests[i].hash; i++) {
+#if defined(__FreeBSD__)
+   if (22 <= i)
+   atf_tc_expect_fail("Old-style/bad inputs fail on 
FreeBSD");
+#endif
char *hash = crypt(tests[i].pw, tests[i].hash);
if (!hash) {
ATF_CHECK_MSG(0, "Test %zu NULL\n", i);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290910 - head/sys/mips/atheros

[Adrian Chadd]

Author: adrian
Date: Mon Nov 16 04:28:00 2015
New Revision: 290910
URL: https://svnweb.freebsd.org/changeset/base/290910

Log:
  Add initial support for the QCA953x ("Honeybee") from Qualcomm Atheros.
  
  The QCA953x SoC is an integrated 2x2 2GHz 11n + MIPS24k core, with
  a 5 port FE switch, gige WAN port, and all the same stuff you'd find on
  its predecessor - the AR9331.
  
  However, buried deep in here somewhere is also a PCIe EP/RC for various
  applications and some other weird bits I don't yet know about.
  
  This is enough to get the reference board up and booting.  I haven't yet
  had it pass lots of packets - I need to finalise the ethernet switch
  bits and the GMAC configuration (ie, how the ethernet ports and switch
  are wired up) and I'll bring that in when I commit the base configuration
  files to use the thing.
  
  The wifi stuff will come much later.  I have to port that support from
  Linux ath9k and extend our vendor HAL to support it.
  
  The reference board (AP143) comes with 32MB RAM and 4MB flash, so in order
  to use it I need to get USB working fully so I can run root from there.
  
  Thankyou to Qualcomm Atheros for access to the reference design board.
  
  Details:
  
  * Add register definitions from openwrt;
  * It looks like a QCA955x but shrunk down to a QCA933x footprint, so
use the QCA955x bits and fix up the clock detection code to do the
QCA953x bits (they're very subtly different);
  * Teach GPIO about it;
  * Teach EHCI about it;
  * Teach if_arge about it;
  * Teach the CPU detection code about it.
  
  Tested:
  
  * AP143, QCA9533v2 SoC
  
  Obtained from:Linux, Linux OpenWRT

Added:
  head/sys/mips/atheros/qca953x_chip.c   (contents, props changed)
  head/sys/mips/atheros/qca953x_chip.h   (contents, props changed)
  head/sys/mips/atheros/qca953xreg.h   (contents, props changed)
Modified:
  head/sys/mips/atheros/ar71xx_ehci.c
  head/sys/mips/atheros/ar71xx_gpio.c
  head/sys/mips/atheros/ar71xx_setup.c
  head/sys/mips/atheros/ar71xx_setup.h
  head/sys/mips/atheros/files.ar71xx
  head/sys/mips/atheros/if_arge.c

Modified: head/sys/mips/atheros/ar71xx_ehci.c
==
--- head/sys/mips/atheros/ar71xx_ehci.c Mon Nov 16 04:15:39 2015
(r290909)
+++ head/sys/mips/atheros/ar71xx_ehci.c Mon Nov 16 04:28:00 2015
(r290910)
@@ -173,6 +173,8 @@ ar71xx_ehci_attach(device_t self)
case AR71XX_SOC_AR9341:
case AR71XX_SOC_AR9342:
case AR71XX_SOC_AR9344:
+   case AR71XX_SOC_QCA9533:
+   case AR71XX_SOC_QCA9533_V2:
case AR71XX_SOC_QCA9556:
case AR71XX_SOC_QCA9558:
sc->sc_flags |= EHCI_SCFLG_TT | EHCI_SCFLG_NORESTERM;

Modified: head/sys/mips/atheros/ar71xx_gpio.c
==
--- head/sys/mips/atheros/ar71xx_gpio.c Mon Nov 16 04:15:39 2015
(r290909)
+++ head/sys/mips/atheros/ar71xx_gpio.c Mon Nov 16 04:28:00 2015
(r290910)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "gpio_if.h"
@@ -102,9 +103,15 @@ static int ar71xx_gpio_pin_toggle(device
 static void
 ar71xx_gpio_function_enable(struct ar71xx_gpio_softc *sc, uint32_t mask)
 {
+
+   /*
+* XXX TODO: refactor this out into a per-chipset method.
+*/
if (ar71xx_soc == AR71XX_SOC_AR9341 ||
ar71xx_soc == AR71XX_SOC_AR9342 ||
ar71xx_soc == AR71XX_SOC_AR9344 ||
+   ar71xx_soc == AR71XX_SOC_QCA9533 ||
+   ar71xx_soc == AR71XX_SOC_QCA9533_V2 ||
ar71xx_soc == AR71XX_SOC_QCA9556 ||
ar71xx_soc == AR71XX_SOC_QCA9558)
GPIO_SET_BITS(sc, AR934X_GPIO_REG_FUNC, mask);
@@ -115,9 +122,15 @@ ar71xx_gpio_function_enable(struct ar71x
 static void
 ar71xx_gpio_function_disable(struct ar71xx_gpio_softc *sc, uint32_t mask)
 {
+
+   /*
+* XXX TODO: refactor this out into a per-chipset method.
+*/
if (ar71xx_soc == AR71XX_SOC_AR9341 ||
ar71xx_soc == AR71XX_SOC_AR9342 ||
ar71xx_soc == AR71XX_SOC_AR9344 ||
+   ar71xx_soc == AR71XX_SOC_QCA9533 ||
+   ar71xx_soc == AR71XX_SOC_QCA9533_V2 ||
ar71xx_soc == AR71XX_SOC_QCA9556 ||
ar71xx_soc == AR71XX_SOC_QCA9558)
GPIO_CLEAR_BITS(sc, AR934X_GPIO_REG_FUNC, mask);
@@ -182,6 +195,10 @@ ar71xx_gpio_pin_max(device_t dev, int *m
case AR71XX_SOC_AR9344:
*maxpin = AR934X_GPIO_COUNT - 1;
break;
+   case AR71XX_SOC_QCA9533:
+   case AR71XX_SOC_QCA9533_V2:
+   *maxpin = QCA953X_GPIO_COUNT - 1;
+   break;
case AR71XX_SOC_QCA9556:
case AR71XX_SOC_QCA9558:
*maxpin = 

svn commit: r290912 - head/tests/sys/kern

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 04:56:14 2015
New Revision: 290912
URL: https://svnweb.freebsd.org/changeset/base/290912

Log:
  Integrate contrib/netbsd-tests/kernel/t_lockf.c into the FreeBSD test suite as
  tests/sys/kern/lockf_test
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tests/sys/kern/Makefile

Modified: head/tests/sys/kern/Makefile
==
--- head/tests/sys/kern/MakefileMon Nov 16 04:53:13 2015
(r290911)
+++ head/tests/sys/kern/MakefileMon Nov 16 04:56:14 2015
(r290912)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+TESTSRC=   ${SRCTOP}/contrib/netbsd-tests/kernel
+
 TESTSDIR=  ${TESTSBASE}/sys/kern
 
 ATF_TESTS_C+=  kern_copyin
@@ -11,9 +13,13 @@ TEST_METADATA.unix_seqpacket_test+=  time
 LDADD.ptrace_test+=-lpthread
 LDADD.unix_seqpacket_test+=-lpthread
 
+NETBSD_ATF_TESTS_C+=   lockf_test
+
 WARNS?=5
 
 TESTS_SUBDIRS+=acct
 TESTS_SUBDIRS+=execve
 
+.include 
+
 .include 
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290914 - in head: etc/mtree tests/sys/kern tests/sys/kern/pipe tools/regression/pipe

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 05:38:40 2015
New Revision: 290914
URL: https://svnweb.freebsd.org/changeset/base/290914

Log:
  Integrate tools/regression/pipe in to the FreeBSD test suite as
  tests/sys/kern/pipe
  
  - Fix style(9) bugs
  - Fix compiler warnings
  - Use `nitems(x)` instead of `sizeof(x) / sizeof(*x)` pattern
  
  The testcases will be converted over to ATF eventually, but for now will be
  integrated in as plain C tests
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/tests/sys/kern/pipe/
 - copied from r290913, head/tools/regression/pipe/
  head/tests/sys/kern/pipe/big_pipe_test.c
 - copied, changed from r290911, head/tools/regression/pipe/bigpipetest.c
  head/tests/sys/kern/pipe/pipe_fstat_bug_test.c
 - copied, changed from r290911, head/tools/regression/pipe/pipe-fstatbug.c
  head/tests/sys/kern/pipe/pipe_ino_test.c
 - copied, changed from r290911, head/tools/regression/pipe/pipe-ino.c
  head/tests/sys/kern/pipe/pipe_overcommit1_test.c
 - copied, changed from r290911, 
head/tools/regression/pipe/pipe-overcommit1.c
  head/tests/sys/kern/pipe/pipe_overcommit2_test.c
 - copied, changed from r290911, 
head/tools/regression/pipe/pipe-overcommit2.c
  head/tests/sys/kern/pipe/pipe_reverse2_test.c
 - copied, changed from r290911, head/tools/regression/pipe/pipe-reverse2.c
  head/tests/sys/kern/pipe/pipe_reverse_test.c
 - copied, changed from r290911, head/tools/regression/pipe/pipe-reverse.c
  head/tests/sys/kern/pipe/pipe_wraparound_test.c
 - copied, changed from r290911, 
head/tools/regression/pipe/pipe-wraparound.c
Deleted:
  head/tests/sys/kern/pipe/bigpipetest.c
  head/tests/sys/kern/pipe/bigpipetest.t
  head/tests/sys/kern/pipe/pipe-fstatbug.c
  head/tests/sys/kern/pipe/pipe-ino.c
  head/tests/sys/kern/pipe/pipe-overcommit1.c
  head/tests/sys/kern/pipe/pipe-overcommit2.c
  head/tests/sys/kern/pipe/pipe-reverse.c
  head/tests/sys/kern/pipe/pipe-reverse2.c
  head/tests/sys/kern/pipe/pipe-wraparound.c
  head/tools/regression/pipe/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/tests/sys/kern/Makefile
  head/tests/sys/kern/pipe/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist   Mon Nov 16 05:28:14 2015
(r290913)
+++ head/etc/mtree/BSD.tests.dist   Mon Nov 16 05:38:40 2015
(r290914)
@@ -377,6 +377,8 @@
 ..
 execve
 ..
+pipe
+..
 ..
 kqueue
 ..

Modified: head/tests/sys/kern/Makefile
==
--- head/tests/sys/kern/MakefileMon Nov 16 05:28:14 2015
(r290913)
+++ head/tests/sys/kern/MakefileMon Nov 16 05:38:40 2015
(r290914)
@@ -19,6 +19,7 @@ WARNS?=   5
 
 TESTS_SUBDIRS+=acct
 TESTS_SUBDIRS+=execve
+TESTS_SUBDIRS+=pipe
 
 .include 
 

Modified: head/tests/sys/kern/pipe/Makefile
==
--- head/tools/regression/pipe/Makefile Mon Nov 16 05:28:14 2015
(r290913)
+++ head/tests/sys/kern/pipe/Makefile   Mon Nov 16 05:38:40 2015
(r290914)
@@ -1,16 +1,16 @@
-#
 # $FreeBSD$
-#
-# "make" then "make regress".
-#
-PROG=  bigpipetest
-MAN=
 
-regress:
-   @if ./bigpipetest; then \
-   echo "PASS"; \
-   else \
-   echo "FAIL"; \
-   fi
+TESTSDIR=  ${TESTSBASE}/sys/kern/pipe
 
-.include 
+PLAIN_TESTS_C+= big_pipe_test
+PLAIN_TESTS_C+= pipe_fstat_bug_test
+PLAIN_TESTS_C+= pipe_ino_test
+PLAIN_TESTS_C+= pipe_overcommit1_test
+PLAIN_TESTS_C+= pipe_overcommit2_test
+PLAIN_TESTS_C+= pipe_reverse2_test
+PLAIN_TESTS_C+= pipe_reverse_test
+PLAIN_TESTS_C+= pipe_wraparound_test
+
+WARNS?=6
+
+.include 

Copied and modified: head/tests/sys/kern/pipe/big_pipe_test.c (from r290911, 
head/tools/regression/pipe/bigpipetest.c)
==
--- head/tools/regression/pipe/bigpipetest.cMon Nov 16 04:53:13 2015
(r290911, copy source)
+++ head/tests/sys/kern/pipe/big_pipe_test.cMon Nov 16 05:38:40 2015
(r290914)
@@ -1,10 +1,11 @@
-#include 
+#include 
+#include 
+#include 
 #include 
-#include 
+#include 
 #include 
-#include 
 #include 
-#include 
+#include 
 
 #define BIG_PIPE_SIZE  64*1024 /* From sys/pipe.h */
 
@@ -15,68 +16,73 @@
  * $FreeBSD$
  */
 
-void write_frame(int fd, char *buf, unsigned long buflen)
+static void
+write_frame(int fd, char *buf, unsigned long buflen)
 {
-fd_set wfd;
-int i;
+   fd_set wfd;
+   int i;
 
-while (buflen) {
-   FD_ZERO();
-   FD_SET(fd, );
-   i = select(fd+1, NULL, , NULL, NULL);
-   if (i < 0) {
-   perror("select");
-   exit(1);
+   while (buflen) {
+   FD_ZERO();
+

svn commit: r290917 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon Nov 16 06:02:11 2015
New Revision: 290917
URL: https://svnweb.freebsd.org/changeset/base/290917

Log:
  Do not use vmspace_resident_count() for the OOM process selection.
  Residency count track the number of pte entries installed into the
  current pmap, which does not reflect the consumption of the physical
  memory by the address map.  Due to several mechanisms like pv entries
  reclamation, copy on write etc. the resident pte entries count may be
  much less than the amount of physical memory kept by the process.
  
  Provide the OOM-specific vm_pageout_oom_pagecount() function which
  estimates the amount of reclamaible memory which could be stolen if
  the process is killed.
  
  Reported and tested by:   pho
  Reviewed by:  alc
  Comments text by: alc
  Sponsored by: The FreeBSD Foundation
  MFC after:3 weeks

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cMon Nov 16 06:02:09 2015(r290916)
+++ head/sys/vm/vm_pageout.cMon Nov 16 06:02:11 2015(r290917)
@@ -1510,6 +1510,65 @@ vm_pageout_mightbe_oom(struct vm_domain 
atomic_subtract_int(_pageout_oom_vote, 1);
 }
 
+/*
+ * The OOM killer is the page daemon's action of last resort when
+ * memory allocation requests have been stalled for a prolonged period
+ * of time because it cannot reclaim memory.  This function computes
+ * the approximate number of physical pages that could be reclaimed if
+ * the specified address space is destroyed.
+ *
+ * Private, anonymous memory owned by the address space is the
+ * principal resource that we expect to recover after an OOM kill.
+ * Since the physical pages mapped by the address space's COW entries
+ * are typically shared pages, they are unlikely to be released and so
+ * they are not counted.
+ *
+ * To get to the point where the page daemon runs the OOM killer, its
+ * efforts to write-back vnode-backed pages may have stalled.  This
+ * could be caused by a memory allocation deadlock in the write path
+ * that might be resolved by an OOM kill.  Therefore, physical pages
+ * belonging to vnode-backed objects are counted, because they might
+ * be freed without being written out first if the address space holds
+ * the last reference to an unlinked vnode.
+ *
+ * Similarly, physical pages belonging to OBJT_PHYS objects are
+ * counted because the address space might hold the last reference to
+ * the object.
+ */
+static long
+vm_pageout_oom_pagecount(struct vmspace *vmspace)
+{
+   vm_map_t map;
+   vm_map_entry_t entry;
+   vm_object_t obj;
+   long res;
+
+   map = >vm_map;
+   KASSERT(!map->system_map, ("system map"));
+   sx_assert(>lock, SA_LOCKED);
+   res = 0;
+   for (entry = map->header.next; entry != >header;
+   entry = entry->next) {
+   if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0)
+   continue;
+   obj = entry->object.vm_object;
+   if (obj == NULL)
+   continue;
+   if ((entry->eflags & MAP_ENTRY_NEEDS_COPY) != 0 &&
+   obj->ref_count != 1)
+   continue;
+   switch (obj->type) {
+   case OBJT_DEFAULT:
+   case OBJT_SWAP:
+   case OBJT_PHYS:
+   case OBJT_VNODE:
+   res += obj->resident_page_count;
+   break;
+   }
+   }
+   return (res);
+}
+
 void
 vm_pageout_oom(int shortage)
 {
@@ -1583,12 +1642,13 @@ vm_pageout_oom(int shortage)
}
PROC_UNLOCK(p);
size = vmspace_swap_count(vm);
-   vm_map_unlock_read(>vm_map);
if (shortage == VM_OOM_MEM)
-   size += vmspace_resident_count(vm);
+   size += vm_pageout_oom_pagecount(vm);
+   vm_map_unlock_read(>vm_map);
vmspace_free(vm);
+
/*
-* if the this process is bigger than the biggest one
+* If this process is bigger than the biggest one,
 * remember it.
 */
if (size > bigsize) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290920 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Mon Nov 16 06:26:26 2015
New Revision: 290920
URL: https://svnweb.freebsd.org/changeset/base/290920

Log:
  Rework the test which raises OOM condition.  Right now, the code
  checks for the swap space consumption plus checks that the amount of
  the free pages exceeds some limit, in case pagedeamon did not coped
  with the page shortage in one of the late passes.  This is wrong
  because it does not account for the presence of the reclamaible pages
  in the queues which are not selectable for reclaim immediately.  E.g.,
  on the swap-less systems, large active queue easily triggered OOM.
  
  Instead, only raise OOM when pagedaemon is unable to produce a free
  page in several back-to-back passes.  Track the failed passes per
  pagedaemon thread.
  
  The number of passes to trigger OOM was selected empirically and
  tested both on small (32M-64M i386 VM) and large (32G amd64)
  configurations.  If the specifics of the load require tuning, sysctl
  vm.pageout_oom_seq sets the number of back-to-back passes which must
  fail before OOM is raised.  Each pass takes 1/2 of seconds.  Less the
  value, more sensible the pagedaemon is to the page shortage.
  
  In future, some heuristic to calculate the value of the tunable might
  be designed based on the system configuration and load.  But before it
  can be done, the i/o system must be fixed to reliably time-out
  pagedaemon writes, even if waiting for the memory to proceed.  Then,
  code can account for the in-flight page-outs and postpone OOM until
  all of them finished, which should reduce the need in tuning.  Right
  now, ignoring the in-flight writes and the counter allows to break
  deadlocks due to write path doing sleepable memory allocations.
  
  Reported by:  Dmitry Sivachenko, bde, many others
  Tested by:pho, bde, tuexen (arm)
  Reviewed by:  alc
  Discussed with:   bde, imp
  Sponsored by: The FreeBSD Foundation
  MFC after:3 weeks

Modified:
  head/sys/vm/vm_page.h
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_page.h
==
--- head/sys/vm/vm_page.h   Mon Nov 16 06:17:12 2015(r290919)
+++ head/sys/vm/vm_page.h   Mon Nov 16 06:26:26 2015(r290920)
@@ -227,6 +227,7 @@ struct vm_domain {
long vmd_segs;  /* bitmask of the segments */
boolean_t vmd_oom;
int vmd_pass;   /* local pagedaemon pass */
+   int vmd_oom_seq;
int vmd_last_active_scan;
struct vm_page vmd_marker; /* marker for pagedaemon private use */
struct vm_page vmd_inacthead; /* marker for LRU-defeating insertions */

Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cMon Nov 16 06:17:12 2015(r290919)
+++ head/sys/vm/vm_pageout.cMon Nov 16 06:26:26 2015(r290920)
@@ -122,7 +122,8 @@ static void vm_pageout_init(void);
 static int vm_pageout_clean(vm_page_t m);
 static int vm_pageout_cluster(vm_page_t m);
 static void vm_pageout_scan(struct vm_domain *vmd, int pass);
-static void vm_pageout_mightbe_oom(struct vm_domain *vmd, int pass);
+static void vm_pageout_mightbe_oom(struct vm_domain *vmd, int page_shortage,
+int starting_page_shortage);
 
 SYSINIT(pagedaemon_init, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, vm_pageout_init,
 NULL);
@@ -158,6 +159,7 @@ SYSINIT(vmdaemon, SI_SUB_KTHREAD_VM, SI_
 int vm_pages_needed;   /* Event on which pageout daemon sleeps */
 int vm_pageout_deficit;/* Estimated number of pages deficit */
 int vm_pageout_wakeup_thresh;
+static int vm_pageout_oom_seq = 12;
 
 #if !defined(NO_SWAPPING)
 static int vm_pageout_req_swapout; /* XXX */
@@ -223,6 +225,10 @@ static int pageout_lock_miss;
 SYSCTL_INT(_vm, OID_AUTO, pageout_lock_miss,
CTLFLAG_RD, _lock_miss, 0, "vget() lock misses during pageout");
 
+SYSCTL_INT(_vm, OID_AUTO, pageout_oom_seq,
+   CTLFLAG_RW, _pageout_oom_seq, 0,
+   "back-to-back calls to oom detector to start OOM");
+
 #define VM_PAGEOUT_PAGE_COUNT 16
 int vm_pageout_page_count = VM_PAGEOUT_PAGE_COUNT;
 
@@ -1041,7 +1047,8 @@ vm_pageout_scan(struct vm_domain *vmd, i
vm_object_t object;
long min_scan;
int act_delta, addl_page_shortage, deficit, error, maxlaunder, maxscan;
-   int page_shortage, scan_tick, scanned, vnodes_skipped;
+   int page_shortage, scan_tick, scanned, starting_page_shortage;
+   int vnodes_skipped;
boolean_t pageout_ok, queues_locked;
 
/*
@@ -1080,6 +1087,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
page_shortage = vm_paging_target() + deficit;
} else
page_shortage = deficit = 0;
+   starting_page_shortage = page_shortage;
 
/*
 * maxlaunder limits the number of dirty pages we flush per scan.
@@ -1343,6 +1351,12 @@ relock_queues:
(void)speedup_syncer();
 
   

svn commit: r290922 - head/tools/regression/acct

[Garrett Cooper]

Author: ngie
Date: Mon Nov 16 06:56:45 2015
New Revision: 290922
URL: https://svnweb.freebsd.org/changeset/base/290922

Log:
  Remove directory made obsolete by r290905
  
  MFC after: 1 week
  X-MFC with: r290905
  X-MFC note: stable/10 only
  Sponsored by: EMC / Isilon Storage Division

Deleted:
  head/tools/regression/acct/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290924 - in head/sys: netipsec opencrypto

[Andrey V. Elsukov]

Author: ae
Date: Mon Nov 16 07:10:42 2015
New Revision: 290924
URL: https://svnweb.freebsd.org/changeset/base/290924

Log:
  Use explicitly specified ivsize instead of blocksize when we mean IV size.
  Set zero ivsize for enc_xform_null and remove special handling from
  xform_esp.c.
  
  Reviewed by:  gnn
  Differential Revision:https://reviews.freebsd.org/D1503

Modified:
  head/sys/netipsec/key.c
  head/sys/netipsec/xform_esp.c
  head/sys/opencrypto/xform.c

Modified: head/sys/netipsec/key.c
==
--- head/sys/netipsec/key.c Mon Nov 16 07:03:00 2015(r290923)
+++ head/sys/netipsec/key.c Mon Nov 16 07:10:42 2015(r290924)
@@ -6706,7 +6706,7 @@ key_register(struct socket *so, struct m
continue;
alg = (struct sadb_alg *)(mtod(n, caddr_t) + off);
alg->sadb_alg_id = i;
-   alg->sadb_alg_ivlen = ealgo->blocksize;
+   alg->sadb_alg_ivlen = ealgo->ivsize;
alg->sadb_alg_minbits = _BITS(ealgo->minkey);
alg->sadb_alg_maxbits = _BITS(ealgo->maxkey);
off += PFKEY_ALIGN8(sizeof(struct sadb_alg));

Modified: head/sys/netipsec/xform_esp.c
==
--- head/sys/netipsec/xform_esp.c   Mon Nov 16 07:03:00 2015
(r290923)
+++ head/sys/netipsec/xform_esp.c   Mon Nov 16 07:10:42 2015
(r290924)
@@ -200,16 +200,10 @@ esp_init(struct secasvar *sav, struct xf
return EINVAL;
}
 
-   /*
-* NB: The null xform needs a non-zero blocksize to keep the
-*  crypto code happy but if we use it to set ivlen then
-*  the ESP header will be processed incorrectly.  The
-*  compromise is to force it to zero here.
-*/
if (SAV_ISCTRORGCM(sav))
sav->ivlen = 8; /* RFC4106 3.1 and RFC3686 3.1 */
else
-   sav->ivlen = (txform == _xform_null ? 0 : txform->ivsize);
+   sav->ivlen = txform->ivsize;
 
/*
 * Setup AH-related state.

Modified: head/sys/opencrypto/xform.c
==
--- head/sys/opencrypto/xform.c Mon Nov 16 07:03:00 2015(r290923)
+++ head/sys/opencrypto/xform.c Mon Nov 16 07:10:42 2015(r290924)
@@ -154,7 +154,7 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform d
 struct enc_xform enc_xform_null = {
CRYPTO_NULL_CBC, "NULL",
/* NB: blocksize of 4 is to generate a properly aligned ESP header */
-   NULL_BLOCK_LEN, NULL_BLOCK_LEN, NULL_MIN_KEY, NULL_MAX_KEY, 
+   NULL_BLOCK_LEN, 0, NULL_MIN_KEY, NULL_MAX_KEY, 
null_encrypt,
null_decrypt,
null_setkey,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r290869 - head/contrib/netbsd-tests/lib/libc/regex

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 18:49:31 2015
New Revision: 290869
URL: https://svnweb.freebsd.org/changeset/base/290869

Log:
  Redo r290847: use #ifdef __NetBSD__ on all the non-public APIs to
  mute -Wunused-but-set-variable warnings with gcc dealing with the
  function calls
  
  X-MFC with: r290847
  MFC after: 1 week
  Reported by: gcc
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/regex/debug.c

Modified: head/contrib/netbsd-tests/lib/libc/regex/debug.c
==
--- head/contrib/netbsd-tests/lib/libc/regex/debug.cSun Nov 15 18:45:04 
2015(r290868)
+++ head/contrib/netbsd-tests/lib/libc/regex/debug.cSun Nov 15 18:49:31 
2015(r290869)
@@ -45,16 +45,18 @@
 
 #include "test_regex.h"
 
+#ifdef __NetBSD__
 static void s_print(struct re_guts *, FILE *);
 static char *regchar(int);
+#endif
 
+#ifdef __NetBSD__
 /*
  * regprint - print a regexp for debugging
  */
 void
 regprint(regex_t *r, FILE *d)
 {
-#ifdef __NetBSD__
struct re_guts *g = r->re_g;
int c;
int last;
@@ -116,7 +118,6 @@ regprint(regex_t *r, FILE *d)
}
fprintf(d, "\n");
}
-#endif
 }
 
 /*
@@ -126,15 +127,11 @@ static void
 s_print(struct re_guts *g, FILE *d)
 {
sop *s;
-#ifdef __NetBSD__
cset *cs;
-#endif
int done = 0;
sop opnd;
int col = 0;
-#ifdef __NetBSD__
ssize_t last;
-#endif
sopno offset = 2;
 #  define  GAP()   {   if (offset % 5 == 0) { \
if (col > 40) { \
@@ -181,7 +178,6 @@ s_print(struct re_guts *g, FILE *d)
break;
case OANYOF:
fprintf(d, "[(%ld)", (long)opnd);
-#ifdef __NetBSD__
cs = >sets[opnd];
last = -1;
for (size_t i = 0; i < g->csetsize+1; i++)  /* +1 
flushes */
@@ -198,7 +194,6 @@ s_print(struct re_guts *g, FILE *d)
last = -1;
}
}
-#endif
fprintf(d, "]");
break;
case OBACK_:
@@ -254,11 +249,7 @@ s_print(struct re_guts *g, FILE *d)
fprintf(d, ">");
break;
default:
-#ifdef __FreeBSD__
-   fprintf(d, "!%ld(%ld)!", OP(*s), opnd);
-#else
fprintf(d, "!%d(%d)!", OP(*s), opnd);
-#endif
break;
}
if (!done)
@@ -280,3 +271,10 @@ regchar(int ch)
sprintf(buf, "\\%o", ch);
return(buf);
 }
+#else
+void
+regprint(regex_t *r, FILE *d)
+{
+
+}
+#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"