Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
Marcel Moolenaar writes: > Author: marcel > Date: Mon Oct 22 01:18:41 2012 > New Revision: 241823 > URL: http://svn.freebsd.org/changeset/base/241823 > > Log: > Add ATF to the build. This is may be a bit rought around the egdes, > but committing it helps to get everyone on the same page and makes > sure we make progress. [...] atf-run fails to link when using -stdlib=libc++. It works if I remove `throw' from check_stream(). Any clue? test-program.o: In function `(anonymous namespace)::check_stream(std::__1::basic_ostream >&)': /usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: undefined reference to `std::__1::basic_ios >::clear(unsigned int)' clang++: error: linker command failed with exit code 1 (use -v to see invocation) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241864 - head/share/man/man4
Author: kevlo
Date: Mon Oct 22 07:04:34 2012
New Revision: 241864
URL: http://svn.freebsd.org/changeset/base/241864
Log:
Remove MLINK for if_idt.
Spotted by: Alie Tan
Modified:
head/share/man/man4/Makefile
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileMon Oct 22 04:18:17 2012
(r241863)
+++ head/share/man/man4/MakefileMon Oct 22 07:04:34 2012
(r241864)
@@ -615,7 +615,6 @@ MLINKS+=hme.4 if_hme.4
MLINKS+=hpet.4 acpi_hpet.4
MLINKS+=${_hptrr.4} ${_rr232x.4}
MLINKS+=${_attimer.4} ${_i8254.4}
-MLINKS+=idt.4 if_idt.4
MLINKS+=igb.4 if_igb.4
MLINKS+=ip.4 rawip.4
MLINKS+=ipfirewall.4 ipaccounting.4 \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241830 - in head/usr.sbin/pkg_install: add create delete info lib updating version
hi,
pkg_install are under portmgr maintainership, and we never received this patch
to review and validate.
The patch looks ok but should have been validated by portmgr and is missing the
needed bump of the version number.
Last I totally disagree on a 3 days MFC time, but would rather go for at least
one month or even more, so that we can really get feedback from people actually
using this before MFCing
regards,
Bapt
On Mon, Oct 22, 2012 at 02:12:20AM +, Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 22 02:12:20 2012
> New Revision: 241830
> URL: http://svn.freebsd.org/changeset/base/241830
>
> Log:
> Warn users when using pkg tools if it looks like they
> be be pkgng users.
>
> Reviewed by:bapt (earlier version)
> Reviewed by:kwm
> Approved by:cperciva
> MFC after: 3 days
>
> Added:
> head/usr.sbin/pkg_install/lib/pkgng.c (contents, props changed)
> Modified:
> head/usr.sbin/pkg_install/add/main.c
> head/usr.sbin/pkg_install/create/main.c
> head/usr.sbin/pkg_install/delete/main.c
> head/usr.sbin/pkg_install/info/main.c
> head/usr.sbin/pkg_install/lib/Makefile
> head/usr.sbin/pkg_install/lib/lib.h
> head/usr.sbin/pkg_install/updating/main.c
> head/usr.sbin/pkg_install/version/main.c
>
> Modified: head/usr.sbin/pkg_install/add/main.c
> ==
> --- head/usr.sbin/pkg_install/add/main.c Mon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/add/main.c Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -135,6 +135,7 @@ main(int argc, char **argv)
> static char temppackageroot[MAXPATHLEN];
> static char pkgaddpath[MAXPATHLEN];
>
> +warnpkgng();
> if (*argv[0] != '/' && strchr(argv[0], '/') != NULL)
> PkgAddCmd = realpath(argv[0], pkgaddpath);
> else
>
> Modified: head/usr.sbin/pkg_install/create/main.c
> ==
> --- head/usr.sbin/pkg_install/create/main.c Mon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/create/main.c Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -72,6 +72,7 @@ main(int argc, char **argv)
> int ch;
> char **pkgs, **start, *tmp;
>
> +warnpkgng();
> pkgs = start = argv;
> while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
> switch(ch) {
>
> Modified: head/usr.sbin/pkg_install/delete/main.c
> ==
> --- head/usr.sbin/pkg_install/delete/main.c Mon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/delete/main.c Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -67,6 +67,7 @@ main(int argc, char **argv)
> const char *tmp;
> struct stat stat_s;
>
> +warnpkgng();
> pkgs = start = argv;
> while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
> switch(ch) {
>
> Modified: head/usr.sbin/pkg_install/info/main.c
> ==
> --- head/usr.sbin/pkg_install/info/main.c Mon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/info/main.c Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -68,6 +68,7 @@ main(int argc, char **argv)
> char **pkgs, **start;
> char *pkgs_split;
>
> +warnpkgng();
> whead = malloc(sizeof(struct which_head));
> if (whead == NULL)
> err(2, NULL);
>
> Modified: head/usr.sbin/pkg_install/lib/Makefile
> ==
> --- head/usr.sbin/pkg_install/lib/MakefileMon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/lib/MakefileMon Oct 22 02:12:20 2012
> (r241830)
> @@ -3,7 +3,7 @@
> LIB= install
> INTERNALLIB=
> SRCS=file.c msg.c plist.c str.c exec.c global.c pen.c match.c \
> - deps.c version.c pkgwrap.c url.c
> + deps.c version.c pkgwrap.c url.c pkgng.c
>
> WARNS?= 3
> WFORMAT?=1
>
> Modified: head/usr.sbin/pkg_install/lib/lib.h
> ==
> --- head/usr.sbin/pkg_install/lib/lib.h Mon Oct 22 02:12:15 2012
> (r241829)
> +++ head/usr.sbin/pkg_install/lib/lib.h Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -157,6 +157,7 @@ const char*make_playpen(char *, off_t);
> char *where_playpen(void);
> int leave_playpen(void);
> off_tmin_free(const char *);
> +void warnpkgng(void);
>
> /* String */
> char *get_dash_string(char **);
>
> Added: head/usr.sbin/pkg_install/lib/pkgng.c
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/usr.sbin/pkg_install/lib/pkgng.c
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 12:00 AM, Jan Beich wrote:
> Marcel Moolenaar writes:
>
>> Author: marcel
>> Date: Mon Oct 22 01:18:41 2012
>> New Revision: 241823
>> URL: http://svn.freebsd.org/changeset/base/241823
>>
>> Log:
>> Add ATF to the build. This is may be a bit rought around the egdes,
>> but committing it helps to get everyone on the same page and makes
>> sure we make progress.
> [...]
>
> atf-run fails to link when using -stdlib=libc++. It works if I remove
> `throw' from check_stream(). Any clue?
>
> test-program.o: In function `(anonymous
> namespace)::check_stream(std::__1::basic_ostream std::__1::char_traits >&)':
> /usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76:
> undefined reference to `std::__1::basic_ios std::__1::char_traits >::clear(unsigned int)'
> clang++: error: linker command failed with exit code 1 (use -v to see
> invocation)
Is it a bug in libc++ where it's doing the wrong thing inlining some
values for basic_ios (my guess is based on the snippet example at:
http://www.cplusplus.com/reference/iostream/ios/clear/ ):
$ p4 diff -du ios
--- //depot/user/gcooper/atf-head/src/contrib/libc++/include/ios
2012-05-20 04:37:04.0
+++ /scratch/p4/user/gcooper/atf-head/src/contrib/libc++/include/ios
2012-05-20 04:37:04.0
@@ -575,10 +575,10 @@
_LIBCPP_ALWAYS_INLINE
_LIBCPP_EXPLICIT
operator bool() const {return !fail();}
-_LIBCPP_ALWAYS_INLINE bool operator!() const{return fail();}
-_LIBCPP_ALWAYS_INLINE iostate rdstate() const {return
ios_base::rdstate();}
-_LIBCPP_ALWAYS_INLINE void clear(iostate __state = goodbit)
{ios_base::clear(__state);}
-_LIBCPP_ALWAYS_INLINE void setstate(iostate __state)
{ios_base::setstate(__state);}
+_LIBCPP_INLINE_VISIBILITY bool operator!() const{return fail();}
+_LIBCPP_INLINE_VISIBILITY iostate rdstate() const {return
ios_base::rdstate();}
+void clear(iostate __state = goodbit) {ios_base::clear(__state);}
+_LIBCPP_INLINE_VISIBILITY void setstate(iostate __state)
{ios_base::setstate(__state);}
_LIBCPP_ALWAYS_INLINE bool good() const {return ios_base::good();}
_LIBCPP_ALWAYS_INLINE bool eof() const {return ios_base::eof();}
_LIBCPP_ALWAYS_INLINE bool fail() const {return ios_base::fail();}
I'm building clang and libc++ in my VM to confirm.
Thanks!
-Garrett
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241866 - head/share/syscons/keymaps
Author: gavin Date: Mon Oct 22 09:38:07 2012 New Revision: 241866 URL: http://svn.freebsd.org/changeset/base/241866 Log: Add German, French, Portuguese and Spanish names for the Spanish Dvorak keymap. MFC after:1 week Modified: head/share/syscons/keymaps/INDEX.keymaps Modified: head/share/syscons/keymaps/INDEX.keymaps == --- head/share/syscons/keymaps/INDEX.keymapsMon Oct 22 09:07:12 2012 (r241865) +++ head/share/syscons/keymaps/INDEX.keymapsMon Oct 22 09:38:07 2012 (r241866) @@ -381,6 +381,10 @@ ru.koi8-r.win.kbd:es:Ruso koi8-r (winkey ru.koi8-r.win.kbd:uk:��Ӧ� koi8-r (winkeys) spanish.dvorak.kbd:en:Spanish Dvorak +spanish.dvorak.kbd:de:Spanisch Dvorak +spanish.dvorak.kbd:fr:Espagnol Dvorak +spanish.dvorak.kbd:pt:Espanhol Dvorak +spanish.dvorak.kbd:es:Espa�ol Dvorak spanish.iso.kbd:en:Spanish ISO-8859-1 spanish.iso.kbd:de:Spanisch ISO-8859-1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241869 - head/contrib/tzdata
Author: edwin Date: Mon Oct 22 10:20:11 2012 New Revision: 241869 URL: http://svn.freebsd.org/changeset/base/241869 Log: MFV of r241867 Merge of tzdata2012g into head: - Fix end of DST in Gaza and Hebron - Western Samoa: DST start at 30 Septembet 2012 and finished at 7 April 2013. Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Oct 22 10:18:41 2012(r241868) +++ head/contrib/tzdata/asiaMon Oct 22 10:20:11 2012(r241869) @@ -2293,6 +2293,8 @@ Rule Palestine2010only- Aug 11 0:000 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:001:00EEST2011 Aug 1 2:00- EET 2012 Mar 30 - 2:001:00EEST2012 Sep 28 + 2:001:00EEST2012 Sep 21 1:00 2:00- EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00- EET 2011 Aug 30 2:001:00EEST2011 Sep 30 3:00 2:00- EET 2012 Mar 30 - 2:001:00EEST2012 Sep 28 3:00 + 2:001:00EEST2012 Sep 21 1:00 2:00- EET # Paracel Is Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Mon Oct 22 10:18:41 2012 (r241868) +++ head/contrib/tzdata/australasia Mon Oct 22 10:20:11 2012 (r241869) @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S +Rule WS 2012max - Sep lastSun 3:001 D +Rule WS 2012max - Apr Sun>=1 4:000 - +# Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT1950# Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia12:33:04 - LMT 1879 J -11:00 1:00WSDT2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00WSDT2011 Dec 30 -13:00 1:00WSDT2012 Apr 1 4:00 -13:00 - WST +13:00 1:00WSDT2012 Apr Sun>=1 4:00 +13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241830 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Mon, Oct 22, 2012 at 02:12:20AM +, Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 22 02:12:20 2012
> New Revision: 241830
> URL: http://svn.freebsd.org/changeset/base/241830
> Added: head/usr.sbin/pkg_install/lib/pkgng.c
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/usr.sbin/pkg_install/lib/pkgng.c Mon Oct 22 02:12:20 2012
> (r241830)
> @@ -0,0 +1,38 @@
> +/*
> + * FreeBSD install - a package for the installation and maintenance
> + * of non-core utilities.
> + *
> + * 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.
> + *
> + * Eitan Adler
> + *
> + * detect pkgng's existence and warn
> + *
> + */
> +
> +#include
> +__FBSDID("$FreeBSD$");
> +
> +#include "lib.h"
> +#include
> +
> +void warnpkgng(void) {
Style bug, the brace should be on a line by itself.
> + char pkgngpath[MAXPATHLEN];
> + char *pkgngdir;
> +
> + pkgngdir = getenv("PKG_DBDIR");
> + if (pkgngdir == NULL)
> + pkgngdir = "/var/db/pkg";
> + strcpy(pkgngpath, pkgngdir);
> + strcat(pkgngpath, "/local.sqlite");
> +
> + if (access(pkgngpath, F_OK) == 0)
> + warnx("Don't use the pkg_ tools if you are using pkgng");
> +}
There is a buffer overflow if $PKG_DBDIR is too long. Although the
environment should be safe in pkg_*, I still don't like it.
The easiest fix is to use asprintf(3), which also avoids hard-coding
MAXPATHLEN or PATH_MAX.
--
Jilles Tjoelker
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241874 - head/sys/dev/mpt
Author: marius
Date: Mon Oct 22 10:42:59 2012
New Revision: 241874
URL: http://svn.freebsd.org/changeset/base/241874
Log:
After r241858, remove the remainder of FreeBSD ~4 support from mpt(4).
MFC after:1 week
Modified:
head/sys/dev/mpt/mpt.c
head/sys/dev/mpt/mpt.h
head/sys/dev/mpt/mpt_cam.c
head/sys/dev/mpt/mpt_debug.c
head/sys/dev/mpt/mpt_raid.c
Modified: head/sys/dev/mpt/mpt.c
==
--- head/sys/dev/mpt/mpt.c Mon Oct 22 10:31:28 2012(r241873)
+++ head/sys/dev/mpt/mpt.c Mon Oct 22 10:42:59 2012(r241874)
@@ -286,10 +286,8 @@ mpt_modevent(module_t mod, int type, voi
}
case MOD_SHUTDOWN:
break;
-#if __FreeBSD_version >= 50
case MOD_QUIESCE:
break;
-#endif
case MOD_UNLOAD:
error = pers->unload(pers);
mpt_personalities[pers->id] = NULL;
@@ -1471,15 +1469,9 @@ mpt_recv_handshake_reply(struct mpt_soft
*/
if ((reply_len >> 1) != hdr->MsgLength &&
(hdr->Function != MPI_FUNCTION_IOC_FACTS)){
-#if __FreeBSD_version >= 50
mpt_prt(mpt, "reply length does not match message length: "
"got %x; expected %zx for function %x\n",
hdr->MsgLength << 2, reply_len << 1, hdr->Function);
-#else
- mpt_prt(mpt, "reply length does not match message length: "
- "got %x; expected %x for function %x\n",
- hdr->MsgLength << 2, reply_len << 1, hdr->Function);
-#endif
}
/* Get rest of the reply; but don't overflow the provided buffer */
@@ -2155,7 +2147,6 @@ mpt_disable_ints(struct mpt_softc *mpt)
static void
mpt_sysctl_attach(struct mpt_softc *mpt)
{
-#if __FreeBSD_version >= 50
struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(mpt->dev);
struct sysctl_oid *tree = device_get_sysctl_tree(mpt->dev);
@@ -2170,7 +2161,6 @@ mpt_sysctl_attach(struct mpt_softc *mpt)
"failure_id", CTLFLAG_RW, &mpt->failure_id, -1,
"Next Target to Fail");
#endif
-#endif
}
int
Modified: head/sys/dev/mpt/mpt.h
==
--- head/sys/dev/mpt/mpt.h Mon Oct 22 10:31:28 2012(r241873)
+++ head/sys/dev/mpt/mpt.h Mon Oct 22 10:42:59 2012(r241874)
@@ -100,52 +100,34 @@
#define _MPT_H_
/* OS Includes
/
-#include
#include
#include
+#include
+#include
#include
#include
-#if __FreeBSD_version < 50
#include
-#include
-#include
-#include
-#else
#include
-#include
-#include
#include
+#include
#include
-#include
-#endif
#include
-#include
-#include
+#include
+#include
+#include
+#include
#include
#include
-#if __FreeBSD_version < 50
-#include
-#include
-#endif
-
#ifdef __sparc64__
#include
#include
#endif
-#include
-
-#if __FreeBSD_version < 50
-#include
-#include
-#else
#include
#include
-#endif
-#include
#include "opt_ddb.h"
/ Register Definitions
/
@@ -241,7 +223,6 @@ int mpt_modevent(module_t, int, void *);
#if __FreeBSD_version < 60
#definebus_get_dma_tag(x) NULL
#endif
-#if __FreeBSD_version >= 501102
#define mpt_dma_tag_create(mpt, parent_tag, alignment, boundary, \
lowaddr, highaddr, filter, filterarg,\
maxsize, nsegments, maxsegsz, flags, \
@@ -251,17 +232,6 @@ int mpt_modevent(module_t, int, void *);
maxsize, nsegments, maxsegsz, flags, \
busdma_lock_mutex, &(mpt)->mpt_lock, \
dma_tagp)
-#else
-#define mpt_dma_tag_create(mpt, parent_tag, alignment, boundary, \
- lowaddr, highaddr, filter, filterarg,\
- maxsize, nsegments, maxsegsz, flags, \
- dma_tagp)\
- bus_dma_tag_create(parent_tag, alignment, boundary, \
- lowaddr, highaddr, filter, filterarg,\
- maxsize, nsegments, maxsegsz, flags, \
- dma_tagp)
-#endif
-
struct mpt_map_info {
struct mpt_softc *mpt;
int error;
@@ -291,14 +261,9 @@ void mpt_map_rquest(void *, bus_dma_segm
kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
#definempt_kthread_exit(status)\
kproc_exit(status)
-#elif __FreeBSD_version > 55
-#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
\
- kthread_create(func, farg, proc_ptr, flags, stackpgs,
svn commit: r241875 - head/sys/dev/mpt
Author: marius
Date: Mon Oct 22 10:53:59 2012
New Revision: 241875
URL: http://svn.freebsd.org/changeset/base/241875
Log:
Remove support for using Giant for locking within mpt(4). Finer grained
locking has been working fine for ~5.5 years by now.
MFC after:1 week
Modified:
head/sys/dev/mpt/mpt.h
head/sys/dev/mpt/mpt_cam.c
head/sys/dev/mpt/mpt_raid.c
Modified: head/sys/dev/mpt/mpt.h
==
--- head/sys/dev/mpt/mpt.h Mon Oct 22 10:42:59 2012(r241874)
+++ head/sys/dev/mpt/mpt.h Mon Oct 22 10:53:59 2012(r241875)
@@ -788,7 +788,6 @@ mpt_assign_serno(struct mpt_softc *mpt,
}
/* Locking Primitives
*/
-#if 1
#defineMPT_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY |
INTR_MPSAFE
#defineMPT_LOCK_SETUP(mpt)
\
mtx_init(&mpt->mpt_lock, "mpt", NULL, MTX_DEF); \
@@ -803,8 +802,6 @@ mpt_assign_serno(struct mpt_softc *mpt,
#defineMPT_UNLOCK(mpt) mtx_unlock(&(mpt)->mpt_lock)
#defineMPT_OWNED(mpt) mtx_owned(&(mpt)->mpt_lock)
#defineMPT_LOCK_ASSERT(mpt)mtx_assert(&(mpt)->mpt_lock, MA_OWNED)
-#defineMPTLOCK_2_CAMLOCK(mpt)
-#defineCAMLOCK_2_MPTLOCK(mpt)
#define mpt_sleep(mpt, ident, priority, wmesg, timo) \
msleep(ident, &(mpt)->mpt_lock, priority, wmesg, timo)
#define mpt_req_timeout(req, ticks, func, arg) \
@@ -816,38 +813,6 @@ mpt_assign_serno(struct mpt_softc *mpt,
#define mpt_callout_drain(mpt, c) \
callout_drain(c)
-#else
-
-#defineMPT_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY
-#defineMPT_LOCK_SETUP(mpt) do { } while (0)
-#defineMPT_LOCK_DESTROY(mpt) do { } while (0)
-#defineMPT_LOCK_ASSERT(mpt)mtx_assert(&Giant, MA_OWNED)
-#defineMPT_LOCK(mpt) mtx_lock(&Giant)
-#defineMPT_UNLOCK(mpt) mtx_unlock(&Giant)
-#defineMPTLOCK_2_CAMLOCK(mpt)
-#defineCAMLOCK_2_MPTLOCK(mpt)
-
-#define mpt_req_timeout(req, ticks, func, arg) \
- callout_reset(&(req)->callout, (ticks), (func), (arg))
-#define mpt_req_untimeout(req, func, arg) \
- callout_stop(&(req)->callout)
-#define mpt_callout_init(mpt, c) \
- callout_init(c, 0)
-#define mpt_callout_drain(mpt, c) \
- callout_drain(c)
-
-static __inline int
-mpt_sleep(struct mpt_softc *, void *, int, const char *, int);
-
-static __inline int
-mpt_sleep(struct mpt_softc *mpt, void *i, int p, const char *w, int t)
-{
- int r;
- r = tsleep(i, p, w, t);
- return (r);
-}
-#endif
-
/*** Register Access
**/
static __inline void mpt_write(struct mpt_softc *, size_t, uint32_t);
static __inline uint32_t mpt_read(struct mpt_softc *, int);
Modified: head/sys/dev/mpt/mpt_cam.c
==
--- head/sys/dev/mpt/mpt_cam.c Mon Oct 22 10:42:59 2012(r241874)
+++ head/sys/dev/mpt/mpt_cam.c Mon Oct 22 10:53:59 2012(r241875)
@@ -1347,9 +1347,7 @@ bad:
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
- CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
- MPTLOCK_2_CAMLOCK(mpt);
return;
}
@@ -1583,9 +1581,7 @@ bad:
if (seg < nseg && nxt_off >= MPT_REQUEST_AREA) {
request_t *nrq;
- CAMLOCK_2_MPTLOCK(mpt);
nrq = mpt_get_request(mpt, FALSE);
- MPTLOCK_2_CAMLOCK(mpt);
if (nrq == NULL) {
error = ENOMEM;
@@ -1633,9 +1629,7 @@ out:
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
- CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
- MPTLOCK_2_CAMLOCK(mpt);
return;
}
@@ -1667,9 +1661,7 @@ out:
tgt->state = TGT_STATE_MOVING_DATA;
#endif
}
- CAMLOCK_2_MPTLOCK(mpt);
mpt_send_cmd(mpt, req);
- MPTLOCK_2_CAMLOCK(mpt);
}
static void
@@ -1758,9 +1750,7 @@ bad:
ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
xpt_done(ccb);
- CAMLOCK_2_MPTLOCK(mpt);
mpt_free_request(mpt, req);
- MPTLOCK_2_CAMLOCK(mpt);
return;
}
@@ -1978,9 +1968,7 @@ bad:
if (seg < nseg && nxt_off >= MPT_REQUEST_AREA) {
request_t *nrq;
-
svn commit: r241876 - head/sys/boot/common
Author: ae
Date: Mon Oct 22 11:01:43 2012
New Revision: 241876
URL: http://svn.freebsd.org/changeset/base/241876
Log:
When loader tries to open GPT partition, but partition table is not GPT,
then try automatically detect an appropriate partition type.
PR: kern/172550
Tested by:Ralf Wenk
Modified:
head/sys/boot/common/disk.c
Modified: head/sys/boot/common/disk.c
==
--- head/sys/boot/common/disk.c Mon Oct 22 10:53:59 2012(r241875)
+++ head/sys/boot/common/disk.c Mon Oct 22 11:01:43 2012(r241876)
@@ -310,6 +310,13 @@ opened:
if (ptable_gettype(od->table) == PTABLE_GPT) {
partition = 255;
goto out; /* Nothing more to do */
+ } else if (partition == 255) {
+ /*
+* When we try to open GPT partition, but partition
+* table isn't GPT, reset d_partition value to -1
+* and try to autodetect appropriate value.
+*/
+ partition = -1;
}
/*
* If d_partition < 0 and we are looking at a BSD slice,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On 2012-10-22 09:00, Jan Beich wrote:
...
atf-run fails to link when using -stdlib=libc++. It works if I remove
`throw' from check_stream(). Any clue?
test-program.o: In function `(anonymous
namespace)::check_stream(std::__1::basic_ostream
>&)':
/usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: undefined
reference to `std::__1::basic_ios
>::clear(unsigned int)'
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
Strange, for me it compiles (with a bunch of warnings, which I have
fixed locally), and links just fine. However, I always use -std=c++11,
which -std= flag are you using, if any?
That said, I am planning on importing a new drop of libc++ soon, but I
would rather see this fixed sooner than later. So I will cherry-pick
a few fixes tonight.
Meanwhile, here are the local diffs I have for making atf build.
-Dimitry
PS: As far as I can see, atf doesn't build at all with clang and
libstdc++, because there are many warnings caused by -Wsystem-headers...
Is there any incentive to fix these?
Index: contrib/atf/atf-report/atf-report.cpp
===
--- contrib/atf/atf-report/atf-report.cpp (revision 241864)
+++ contrib/atf/atf-report/atf-report.cpp (working copy)
@@ -381,7 +381,6 @@ class ticker_writer : public writer {
class xml_writer : public writer {
ostream_ptr m_os;
-size_t m_curtp, m_ntps;
std::string m_tcname, m_tpname;
static
Index: contrib/atf/atf-run/io.hpp
===
--- contrib/atf/atf-run/io.hpp (revision 241864)
+++ contrib/atf/atf-run/io.hpp (working copy)
@@ -378,11 +378,6 @@ class pistream :
public std::istream, utils::noncopyable
{
//!
-//! \brief The file handle managed by this stream.
-//!
-int m_fd;
-
-//!
//! \brief The systembuf object used to manage this stream's data.
//!
systembuf m_systembuf;
Index: contrib/libc++/include/fstream
===
--- contrib/libc++/include/fstream (revision 241864)
+++ contrib/libc++/include/fstream (working copy)
@@ -594,7 +594,6 @@ basic_filebuf<_CharT, _Traits>::underflow()
size_t __nmemb = _VSTD::min(static_cast(this->egptr() - this->eback() - __unget_sz),
static_cast(__extbufend_ - __extbufnext_));
codecvt_base::result __r;
-state_type __svs = __st_;
size_t __nr = fread((void*)__extbufnext_, 1, __nmemb, __file_);
if (__nr != 0)
{
Index: contrib/libc++/include/locale
===
--- contrib/libc++/include/locale (revision 241864)
+++ contrib/libc++/include/locale (working copy)
@@ -2830,9 +2830,9 @@ class _LIBCPP_VISIBLE moneypunct
virtual string_type do_negative_sign() const {return string_type(1, '-');}
virtual int do_frac_digits() const {return 0;}
virtual pattern do_pos_format()const
-{pattern __p = {symbol, sign, none, value}; return __p;}
+{pattern __p = {{symbol, sign, none, value}}; return __p;}
virtual pattern do_neg_format()const
-{pattern __p = {symbol, sign, none, value}; return __p;}
+{pattern __p = {{symbol, sign, none, value}}; return __p;}
};
template
@@ -3146,7 +3146,6 @@ money_get<_CharT, _InputIterator>::__do_get(iter_t
bool __sb = __flags & ios_base::showbase;
if (__sb || __more_needed)
{
-ios_base::iostate __et = ios_base::goodbit;
typename string_type::const_iterator __sym_space_end = __sym.begin();
if (__p > 0 && (__pat.field[__p - 1] == money_base::none ||
__pat.field[__p - 1] == money_base::space)) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241755 - head/lib/msun/src
On Sun, 21 Oct 2012, Warner Losh wrote: Feel free to fix them however. I added the comments because the algorithms weren't quite the same... If you have a better way, feel free to back my stuff out on the way to it. But the algorithms are identical to a fault. Inside the functions, all lines except 1 in each correspond exactly, and the exception is a style bug. Only about 30 lines in each are not lexically identical. The non-lexical differences are for things like different magic numbers. The old fdlibm comments aren't too careful about keeping magic numbers out of the algorithm description so that the algorithm description is as general as possible. The precise magic numbers are often critical to the details of the implementation of the algorithm but not really to the algorithm itself. Bruce ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On 2012-10-22 09:24, Garrett Cooper wrote:
On Mon, Oct 22, 2012 at 12:00 AM, Jan Beich wrote:
...
atf-run fails to link when using -stdlib=libc++. It works if I remove
`throw' from check_stream(). Any clue?
test-program.o: In function `(anonymous
namespace)::check_stream(std::__1::basic_ostream
>&)':
/usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: undefined
reference to `std::__1::basic_ios
>::clear(unsigned int)'
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
Is it a bug in libc++ where it's doing the wrong thing inlining some
values for basic_ios (my guess is based on the snippet example at:
http://www.cplusplus.com/reference/iostream/ios/clear/ ):
$ p4 diff -du ios
--- //depot/user/gcooper/atf-head/src/contrib/libc++/include/ios
2012-05-20 04:37:04.0
+++ /scratch/p4/user/gcooper/atf-head/src/contrib/libc++/include/ios
2012-05-20 04:37:04.0
@@ -575,10 +575,10 @@
_LIBCPP_ALWAYS_INLINE
_LIBCPP_EXPLICIT
operator bool() const {return !fail();}
-_LIBCPP_ALWAYS_INLINE bool operator!() const{return fail();}
-_LIBCPP_ALWAYS_INLINE iostate rdstate() const {return
ios_base::rdstate();}
-_LIBCPP_ALWAYS_INLINE void clear(iostate __state = goodbit)
{ios_base::clear(__state);}
-_LIBCPP_ALWAYS_INLINE void setstate(iostate __state)
{ios_base::setstate(__state);}
+_LIBCPP_INLINE_VISIBILITY bool operator!() const{return fail();}
+_LIBCPP_INLINE_VISIBILITY iostate rdstate() const {return
ios_base::rdstate();}
+void clear(iostate __state = goodbit) {ios_base::clear(__state);}
+_LIBCPP_INLINE_VISIBILITY void setstate(iostate __state)
{ios_base::setstate(__state);}
_LIBCPP_ALWAYS_INLINE bool good() const {return ios_base::good();}
_LIBCPP_ALWAYS_INLINE bool eof() const {return ios_base::eof();}
_LIBCPP_ALWAYS_INLINE bool fail() const {return ios_base::fail();}
I'm building clang and libc++ in my VM to confirm.
I don't think so, as these member functions are supposed to be always
inlined. E.g. basic_ios::clear() should always be expanded inline to
ios_base::clear(), which is a normal (out of line) function.
However, the visibility stuff is always terribly confusing, so you might
have a found a real issue. Note that in libc++ trunk, the attributes of
these member functions have not changed.
In any case, I cannot reproduce the link error on my system.
-Dimitry
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241880 - in head/sys: amd64/amd64 i386/i386 pc98/pc98
Author: eadler
Date: Mon Oct 22 11:57:26 2012
New Revision: 241880
URL: http://svn.freebsd.org/changeset/base/241880
Log:
The 'testing memory' patch gets printed too many times
Approved by: cperciva (implicit)
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/i386/i386/machdep.c
head/sys/pc98/pc98/machdep.c
Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c Mon Oct 22 11:10:15 2012
(r241879)
+++ head/sys/amd64/amd64/machdep.c Mon Oct 22 11:57:26 2012
(r241880)
@@ -1532,8 +1532,6 @@ getmemsize(caddr_t kmdp, u_int64_t first
if (memtest == 0)
goto skip_memtest;
- printf("testing memory...\n");
-
/*
* map page into kernel: valid, read/write,non-cacheable
*/
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cMon Oct 22 11:10:15 2012
(r241879)
+++ head/sys/i386/i386/machdep.cMon Oct 22 11:57:26 2012
(r241880)
@@ -2459,8 +2459,6 @@ physmap_done:
if (memtest == 0)
goto skip_memtest;
- printf("testing memory...\n");
-
/*
* map page into kernel: valid, read/write,non-cacheable
*/
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cMon Oct 22 11:10:15 2012
(r241879)
+++ head/sys/pc98/pc98/machdep.cMon Oct 22 11:57:26 2012
(r241880)
@@ -2042,8 +2042,6 @@ getmemsize(int first)
if (memtest == 0)
goto skip_memtest;
- printf("testing memory...\n");
-
/*
* map page into kernel: valid, read/write,non-cacheable
*/
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241830 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On 22 October 2012 03:18, Baptiste Daroussin wrote: > > hi, > > pkg_install are under portmgr maintainership, and we never received this patch > to review and validate. We discussed an earlier version of the patch and this version is that one + your comments. > The patch looks ok but should have been validated by portmgr and is missing > the > needed bump of the version number. Okay. > Last I totally disagree on a 3 days MFC time, but would rather go for at least > one month or even more, so that we can really get feedback from people > actually > using this before MFCing Why? Is this likely to break things? -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241881 - head/usr.bin/ssh-copy-id
Author: eadler Date: Mon Oct 22 12:05:14 2012 New Revision: 241881 URL: http://svn.freebsd.org/changeset/base/241881 Log: Somehow this got replicated too many times Approved by: cperciva (implicit) Modified: head/usr.bin/ssh-copy-id/Makefile Modified: head/usr.bin/ssh-copy-id/Makefile == --- head/usr.bin/ssh-copy-id/Makefile Mon Oct 22 11:57:26 2012 (r241880) +++ head/usr.bin/ssh-copy-id/Makefile Mon Oct 22 12:05:14 2012 (r241881) @@ -4,21 +4,3 @@ SCRIPTS= ssh-copy-id.sh MAN= ssh-copy-id.1 .include -# $FreeBSD$ - -SCRIPTS= ssh-copy-id.sh -MAN= ssh-copy-id.1 - -.include -# $FreeBSD$ - -SCRIPTS= ssh-copy-id.sh -MAN= ssh-copy-id.1 - -.include -# $FreeBSD$ - -SCRIPTS= ssh-copy-id.sh -MAN= ssh-copy-id.1 - -.include ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241862 - in head/usr.bin: . ssh-copy-id
On 22 October 2012 00:23, Xin Li wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > On 10/21/12 8:57 PM, Eitan Adler wrote: >> Author: eadler Date: Mon Oct 22 03:57:00 2012 New Revision: 241862 >> URL: http://svn.freebsd.org/changeset/base/241862 >> >> Log: Add a clean-room reimplementation of a script originally >> found in openssh's contrib directory. >> >> This version has more features and is better written. I intend to >> submit this upstream as well. >> >> Reviewed by: bapt Reviewed by: des Approved by:cperciva MFC >> after: 1 week >> >> Added: head/usr.bin/ssh-copy-id/ head/usr.bin/ssh-copy-id/Makefile >> (contents, props changed) head/usr.bin/ssh-copy-id/ssh-copy-id.1 >> (contents, props changed) head/usr.bin/ssh-copy-id/ssh-copy-id.sh >> (contents, props changed) Modified: head/usr.bin/Makefile > [...] >> Added: head/usr.bin/ssh-copy-id/Makefile >> == >> >> >> > - --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/usr.bin/ssh-copy-id/Makefile Mon Oct 22 03:57:00 2012 >> (r241862) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +SCRIPTS= ssh-copy-id.sh >> +MAN=ssh-copy-id.1 + +.include +# $FreeBSD$ + >> +SCRIPTS= ssh-copy-id.sh +MAN=ssh-copy-id.1 + +.include >> +# $FreeBSD$ + +SCRIPTS= ssh-copy-id.sh +MAN= >> ssh-copy-id.1 + +.include +# $FreeBSD$ + +SCRIPTS= >> ssh-copy-id.sh +MAN= ssh-copy-id.1 + +.include > > I think this should be just 1 versus 4 copies? Fixed. Thanks. I'm not sure how that happened. -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241882 - head/share/man/man4
Author: melifaro
Date: Mon Oct 22 12:22:56 2012
New Revision: 241882
URL: http://svn.freebsd.org/changeset/base/241882
Log:
Provide example for newly-added NG_NETFLOW_V9INFO_TYPE
Submitted by: Dmitry Luhtionov
MFC with: r241446
Modified:
head/share/man/man4/ng_netflow.4
Modified: head/share/man/man4/ng_netflow.4
==
--- head/share/man/man4/ng_netflow.4Mon Oct 22 12:05:14 2012
(r241881)
+++ head/share/man/man4/ng_netflow.4Mon Oct 22 12:22:56 2012
(r241882)
@@ -286,6 +286,8 @@ commands are:
.Qq Li "settemplate { time = %u packets = %u }"
.It Dv NGM_NETFLOW_SETMTU
.Qq Li "setmtu { mtu = %u }"
+.It Dv NGM_NETFLOW_V9INFO
+.Qq Li v9info
.El
.Sh SHUTDOWN
This node shuts down upon receipt of a
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241856 - in head/sys: arm/xscale/pxa dev/acpica dev/agp dev/amdsbwd dev/amdtemp dev/asmc dev/coretemp dev/e1000 dev/glxiic dev/ixgbe dev/kbdmux dev/sound/pci i386/acpica i386/bios x86
On Sunday, October 21, 2012 11:41:14 pm Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 22 03:41:14 2012
> New Revision: 241856
> URL: http://svn.freebsd.org/changeset/base/241856
>
> Log:
> Now that device disabling is generic, remove extraneous code from the
> device drivers that used to provide this feature.
This isn't functionally identical. In some cases a hint to disable
unit 0 would in fact disable all units. For example, disabling est0 and
acpi_perf0 disabled all instances of estX and acpi_perfX, not just the
first one. You should test this on a multi-CPU machine before and after
to see the different effects.
The one in the x86 code that handles early mapping of ACPI tables before
new-bus is around is also very important (acpi_find_table()). You just
broke booting on SMP systems where ACPI is disabled but that contain an
MADT for example (pretty much all modern x86 SMP systems).
elcr is also not a new-bus device, so removing that hint broke that
psuedo-driver as well.
It is only safe to remove these calls in new-bus attach (not probe!)
routines that are using 'device_get_unit()' and not hardcoding the
unit to 0 (unless you know for certain that there can only ever be one
instance of this device such as acpi0 or asmc0).
> Modified:
> head/sys/arm/xscale/pxa/pxa_smi.c
> head/sys/dev/acpica/acpi.c
> head/sys/dev/acpica/acpi_perf.c
> head/sys/dev/acpica/acpi_throttle.c
> head/sys/dev/agp/agp_ali.c
> head/sys/dev/agp/agp_amd.c
> head/sys/dev/agp/agp_amd64.c
> head/sys/dev/agp/agp_apple.c
> head/sys/dev/agp/agp_i810.c
> head/sys/dev/agp/agp_intel.c
> head/sys/dev/agp/agp_nvidia.c
> head/sys/dev/agp/agp_sis.c
> head/sys/dev/agp/agp_via.c
> head/sys/dev/amdsbwd/amdsbwd.c
> head/sys/dev/amdtemp/amdtemp.c
> head/sys/dev/asmc/asmc.c
> head/sys/dev/coretemp/coretemp.c
> head/sys/dev/e1000/if_em.c
> head/sys/dev/e1000/if_igb.c
> head/sys/dev/e1000/if_lem.c
> head/sys/dev/glxiic/glxiic.c
> head/sys/dev/ixgbe/ixgbe.c
> head/sys/dev/ixgbe/ixv.c
> head/sys/dev/kbdmux/kbdmux.c
> head/sys/dev/sound/pci/emu10kx.c
> head/sys/i386/acpica/acpi_machdep.c
> head/sys/i386/bios/apm.c
> head/sys/x86/cpufreq/est.c
> head/sys/x86/cpufreq/p4tcc.c
> head/sys/x86/isa/elcr.c
>
> Modified: head/sys/dev/acpica/acpi_perf.c
> ==
> --- head/sys/dev/acpica/acpi_perf.c Mon Oct 22 03:37:00 2012
> (r241855)
> +++ head/sys/dev/acpica/acpi_perf.c Mon Oct 22 03:41:14 2012
> (r241856)
> @@ -175,9 +175,6 @@ acpi_perf_probe(device_t dev)
> ACPI_BUFFER buf;
> int error, rid, type;
>
> - if (resource_disabled("acpi_perf", 0))
> - return (ENXIO);
> -
> /*
>* Check the performance state registers. If they are of type
>* "functional fixed hardware", we attach quietly since we will
>
> Modified: head/sys/dev/acpica/acpi_throttle.c
> ==
> --- head/sys/dev/acpica/acpi_throttle.c Mon Oct 22 03:37:00 2012
> (r241855)
> +++ head/sys/dev/acpica/acpi_throttle.c Mon Oct 22 03:41:14 2012
> (r241856)
> @@ -167,9 +167,6 @@ static int
> acpi_throttle_probe(device_t dev)
> {
>
> - if (resource_disabled("acpi_throttle", 0))
> - return (ENXIO);
> -
> /*
>* On i386 platforms at least, ACPI throttling is accomplished by
>* the chipset modulating the STPCLK# pin based on the duty cycle.
>
> Modified: head/sys/dev/amdsbwd/amdsbwd.c
> ==
> --- head/sys/dev/amdsbwd/amdsbwd.cMon Oct 22 03:37:00 2012
> (r241855)
> +++ head/sys/dev/amdsbwd/amdsbwd.cMon Oct 22 03:41:14 2012
> (r241856)
> @@ -267,8 +267,6 @@ amdsbwd_identify(driver_t *driver, devic
> device_tchild;
> device_tsmb_dev;
>
> - if (resource_disabled("amdsbwd", 0))
> - return;
> if (device_find_child(parent, "amdsbwd", -1) != NULL)
> return;
>
>
> Modified: head/sys/dev/amdtemp/amdtemp.c
> ==
> --- head/sys/dev/amdtemp/amdtemp.cMon Oct 22 03:37:00 2012
> (r241855)
> +++ head/sys/dev/amdtemp/amdtemp.cMon Oct 22 03:41:14 2012
> (r241856)
> @@ -185,9 +185,6 @@ amdtemp_probe(device_t dev)
> {
> uint32_t family, model;
>
> - if (resource_disabled("amdtemp", 0))
> - return (ENXIO);
> -
> family = CPUID_TO_FAMILY(cpu_id);
> model = CPUID_TO_MODEL(cpu_id);
>
>
> Modified: head/sys/dev/coretemp/coretemp.c
> ==
> --- head/sys/dev/coretemp/coretemp.c Mon Oct 22 03:37:00 2012
> (r241855)
> +++ head/sys/dev/coretemp/coretemp.c Mon Oct 22 03:41:14 2012
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 4:09 AM, Dimitry Andric wrote: > On 2012-10-22 09:00, Jan Beich wrote: > ... >> >> atf-run fails to link when using -stdlib=libc++. It works if I remove >> `throw' from check_stream(). Any clue? >> >> test-program.o: In function `(anonymous >> namespace)::check_stream(std::__1::basic_ostream> std::__1::char_traits >&)': >> >> /usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: >> undefined reference to `std::__1::basic_ios> std::__1::char_traits >::clear(unsigned int)' >> clang++: error: linker command failed with exit code 1 (use -v to see >> invocation) > > > Strange, for me it compiles (with a bunch of warnings, which I have > fixed locally), and links just fine. However, I always use -std=c++11, > which -std= flag are you using, if any? > > That said, I am planning on importing a new drop of libc++ soon, but I > would rather see this fixed sooner than later. So I will cherry-pick > a few fixes tonight. > > Meanwhile, here are the local diffs I have for making atf build. > > -Dimitry > > PS: As far as I can see, atf doesn't build at all with clang and > libstdc++, because there are many warnings caused by -Wsystem-headers... > Is there any incentive to fix these? I submitted the atf compile-time warnings patch on your behalf: http://code.google.com/p/kyua/issues/detail?id=42&thanks=42&ts=1350910277 . Thanks! -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241884 - head/sys/netinet6
Author: melifaro
Date: Mon Oct 22 12:54:52 2012
New Revision: 241884
URL: http://svn.freebsd.org/changeset/base/241884
Log:
Eliminate code checking if found IPv6 rte is dynamic. IPv6 redirects
are using (different) ND-based approach described in RFC 4861. This change
is similar to r241406 which conditionally skips the same check in IPv4.
This change is part of bigger patch eliminating rte locking.
Sponsored by: Yandex LLC.
OK'd by: hrs
MFC after:2 weeks
Modified:
head/sys/netinet6/in6_rmx.c
Modified: head/sys/netinet6/in6_rmx.c
==
--- head/sys/netinet6/in6_rmx.c Mon Oct 22 12:39:57 2012(r241883)
+++ head/sys/netinet6/in6_rmx.c Mon Oct 22 12:54:52 2012(r241884)
@@ -98,8 +98,6 @@ extern intin6_inithead(void **head, int
extern int in6_detachhead(void **head, int off);
#endif
-#define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */
-
/*
* Do what we need to do when inserting a route.
*/
@@ -170,42 +168,8 @@ in6_addroute(void *v_arg, void *n_arg, s
return (ret);
}
-/*
- * This code is the inverse of in6_clsroute: on first reference, if we
- * were managing the route, stop doing so and set the expiration timer
- * back off again.
- */
-static struct radix_node *
-in6_matroute(void *v_arg, struct radix_node_head *head)
-{
- struct radix_node *rn = rn_match(v_arg, head);
- struct rtentry *rt = (struct rtentry *)rn;
-
- if (rt) {
- RT_LOCK(rt);
- if (rt->rt_flags & RTPRF_OURS) {
- rt->rt_flags &= ~RTPRF_OURS;
- rt->rt_rmx.rmx_expire = 0;
- }
- RT_UNLOCK(rt);
- }
- return rn;
-}
-
SYSCTL_DECL(_net_inet6_ip6);
-static VNET_DEFINE(int, rtq_reallyold6) = 60*60;
- /* one hour is ``really old'' */
-#defineV_rtq_reallyold6VNET(rtq_reallyold6)
-SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire, CTLFLAG_RW,
-&VNET_NAME(rtq_reallyold6) , 0, "");
-
-static VNET_DEFINE(int, rtq_minreallyold6) = 10;
- /* never automatically crank down to less */
-#defineV_rtq_minreallyold6 VNET(rtq_minreallyold6)
-SYSCTL_VNET_INT(_net_inet6_ip6, IPV6CTL_RTMINEXPIRE, rtminexpire, CTLFLAG_RW,
-&VNET_NAME(rtq_minreallyold6) , 0, "");
-
static VNET_DEFINE(int, rtq_toomany6) = 128;
/* 128 cached routes is ``too many'' */
#defineV_rtq_toomany6 VNET(rtq_toomany6)
@@ -223,122 +187,6 @@ struct rtqk_arg {
};
/*
- * Get rid of old routes. When draining, this deletes everything, even when
- * the timeout is not expired yet. When updating, this makes sure that
- * nothing has a timeout longer than the current value of rtq_reallyold6.
- */
-static int
-in6_rtqkill(struct radix_node *rn, void *rock)
-{
- struct rtqk_arg *ap = rock;
- struct rtentry *rt = (struct rtentry *)rn;
- int err;
-
- RADIX_NODE_HEAD_WLOCK_ASSERT(ap->rnh);
-
- if (rt->rt_flags & RTPRF_OURS) {
- ap->found++;
-
- if (ap->draining || rt->rt_rmx.rmx_expire <= time_uptime) {
- if (rt->rt_refcnt > 0)
- panic("rtqkill route really not free");
-
- err = in6_rtrequest(RTM_DELETE,
- (struct sockaddr *)rt_key(rt),
- rt->rt_gateway, rt_mask(rt),
- rt->rt_flags|RTF_RNH_LOCKED, 0,
- rt->rt_fibnum);
- if (err) {
- log(LOG_WARNING, "in6_rtqkill: error %d", err);
- } else {
- ap->killed++;
- }
- } else {
- if (ap->updating
- && (rt->rt_rmx.rmx_expire - time_uptime
- > V_rtq_reallyold6)) {
- rt->rt_rmx.rmx_expire = time_uptime
- + V_rtq_reallyold6;
- }
- ap->nextstop = lmin(ap->nextstop,
- rt->rt_rmx.rmx_expire);
- }
- }
-
- return 0;
-}
-
-#define RTQ_TIMEOUT60*10 /* run no less than once every ten minutes */
-static VNET_DEFINE(int, rtq_timeout6) = RTQ_TIMEOUT;
-static VNET_DEFINE(struct callout, rtq_timer6);
-
-#defineV_rtq_timeout6 VNET(rtq_timeout6)
-#defineV_rtq_timer6VNET(rtq_timer6)
-
-static void
-in6_rtqtimo_one(struct radix_node_head *rnh)
-{
- struct rtqk_arg arg;
- static time_t last_adjusted_timeout = 0;
-
- arg.found = arg.killed = 0;
- arg.rnh = rnh;
- arg.nextstop = time_uptime + V_rtq_timeout6;
- arg.draining = a
Re: svn commit: r241755 - head/lib/msun/src
On Oct 21, 2012, at 10:06 PM, Steve Kargl wrote: > On Sun, Oct 21, 2012 at 09:08:49PM -0600, Warner Losh wrote: >> Feel free to fix them however. I added the comments because >> the algorithms weren't quite the same... If you have a better >> way, feel free to back my stuff out on the way to it. >> >> Warner >> > > Please back your commits out. > > Two of the three people who actually appear to be > working on libm have now requested the back-out. OK. While it would be just as easy for you guys to commit the new stuff over mine, I'll revert them. Warner ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241856 - in head/sys: arm/xscale/pxa dev/acpica dev/agp dev/amdsbwd dev/amdtemp dev/asmc dev/coretemp dev/e1000 dev/glxiic dev/ixgbe dev/kbdmux dev/sound/pci i386/acpica i386/bios x86
On 22 October 2012 08:42, John Baldwin wrote: > On Sunday, October 21, 2012 11:41:14 pm Eitan Adler wrote: >> Author: eadler >> Date: Mon Oct 22 03:41:14 2012 >> New Revision: 241856 >> URL: http://svn.freebsd.org/changeset/base/241856 >> >> Log: >> Now that device disabling is generic, remove extraneous code from the >> device drivers that used to provide this feature. > > This isn't functionally identical. In some cases a hint to disable > unit 0 would in fact disable all units. For example, disabling est0 and > acpi_perf0 disabled all instances of estX and acpi_perfX, not just the > first one. You should test this on a multi-CPU machine before and after > to see the different effects. > > The one in the x86 code that handles early mapping of ACPI tables before > new-bus is around is also very important (acpi_find_table()). You just > broke booting on SMP systems where ACPI is disabled but that contain an > MADT for example (pretty much all modern x86 SMP systems). > > elcr is also not a new-bus device, so removing that hint broke that > psuedo-driver as well. > > It is only safe to remove these calls in new-bus attach (not probe!) > routines that are using 'device_get_unit()' and not hardcoding the > unit to 0 (unless you know for certain that there can only ever be one > instance of this device such as acpi0 or asmc0). Thanks for the information. I will revert and come up with a better patch. -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241885 - in head/sys: arm/xscale/pxa dev/acpica dev/agp dev/amdsbwd dev/amdtemp dev/asmc dev/coretemp dev/e1000 dev/glxiic dev/ixgbe dev/kbdmux dev/sound/pci i386/acpica i386/bios x86/...
Author: eadler
Date: Mon Oct 22 13:06:09 2012
New Revision: 241885
URL: http://svn.freebsd.org/changeset/base/241885
Log:
This isn't functionally identical. In some cases a hint to disable
unit 0 would in fact disable all units.
This reverts r241856
Approved by: cperciva (implicit)
Modified:
head/sys/arm/xscale/pxa/pxa_smi.c
head/sys/dev/acpica/acpi.c
head/sys/dev/acpica/acpi_perf.c
head/sys/dev/acpica/acpi_throttle.c
head/sys/dev/agp/agp_ali.c
head/sys/dev/agp/agp_amd.c
head/sys/dev/agp/agp_amd64.c
head/sys/dev/agp/agp_apple.c
head/sys/dev/agp/agp_i810.c
head/sys/dev/agp/agp_intel.c
head/sys/dev/agp/agp_nvidia.c
head/sys/dev/agp/agp_sis.c
head/sys/dev/agp/agp_via.c
head/sys/dev/amdsbwd/amdsbwd.c
head/sys/dev/amdtemp/amdtemp.c
head/sys/dev/asmc/asmc.c
head/sys/dev/coretemp/coretemp.c
head/sys/dev/e1000/if_em.c
head/sys/dev/e1000/if_igb.c
head/sys/dev/e1000/if_lem.c
head/sys/dev/glxiic/glxiic.c
head/sys/dev/ixgbe/ixgbe.c
head/sys/dev/ixgbe/ixv.c
head/sys/dev/kbdmux/kbdmux.c
head/sys/dev/sound/pci/emu10kx.c
head/sys/i386/acpica/acpi_machdep.c
head/sys/i386/bios/apm.c
head/sys/x86/cpufreq/est.c
head/sys/x86/cpufreq/p4tcc.c
head/sys/x86/isa/elcr.c
Modified: head/sys/arm/xscale/pxa/pxa_smi.c
==
--- head/sys/arm/xscale/pxa/pxa_smi.c Mon Oct 22 12:54:52 2012
(r241884)
+++ head/sys/arm/xscale/pxa/pxa_smi.c Mon Oct 22 13:06:09 2012
(r241885)
@@ -82,6 +82,9 @@ static int
pxa_smi_probe(device_t dev)
{
+ if (resource_disabled("smi", device_get_unit(dev)))
+ return (ENXIO);
+
device_set_desc(dev, "Static Memory Interface");
return (0);
}
Modified: head/sys/dev/acpica/acpi.c
==
--- head/sys/dev/acpica/acpi.c Mon Oct 22 12:54:52 2012(r241884)
+++ head/sys/dev/acpica/acpi.c Mon Oct 22 13:06:09 2012(r241885)
@@ -377,6 +377,10 @@ acpi_identify(void)
if (!cold)
return (ENXIO);
+/* Check that we haven't been disabled with a hint. */
+if (resource_disabled("acpi", 0))
+ return (ENXIO);
+
/* Check for other PM systems. */
if (power_pm_get_type() != POWER_PM_TYPE_NONE &&
power_pm_get_type() != POWER_PM_TYPE_ACPI) {
Modified: head/sys/dev/acpica/acpi_perf.c
==
--- head/sys/dev/acpica/acpi_perf.c Mon Oct 22 12:54:52 2012
(r241884)
+++ head/sys/dev/acpica/acpi_perf.c Mon Oct 22 13:06:09 2012
(r241885)
@@ -175,6 +175,9 @@ acpi_perf_probe(device_t dev)
ACPI_BUFFER buf;
int error, rid, type;
+ if (resource_disabled("acpi_perf", 0))
+ return (ENXIO);
+
/*
* Check the performance state registers. If they are of type
* "functional fixed hardware", we attach quietly since we will
Modified: head/sys/dev/acpica/acpi_throttle.c
==
--- head/sys/dev/acpica/acpi_throttle.c Mon Oct 22 12:54:52 2012
(r241884)
+++ head/sys/dev/acpica/acpi_throttle.c Mon Oct 22 13:06:09 2012
(r241885)
@@ -167,6 +167,9 @@ static int
acpi_throttle_probe(device_t dev)
{
+ if (resource_disabled("acpi_throttle", 0))
+ return (ENXIO);
+
/*
* On i386 platforms at least, ACPI throttling is accomplished by
* the chipset modulating the STPCLK# pin based on the duty cycle.
Modified: head/sys/dev/agp/agp_ali.c
==
--- head/sys/dev/agp/agp_ali.c Mon Oct 22 12:54:52 2012(r241884)
+++ head/sys/dev/agp/agp_ali.c Mon Oct 22 13:06:09 2012(r241885)
@@ -81,6 +81,8 @@ agp_ali_probe(device_t dev)
{
const char *desc;
+ if (resource_disabled("agp", device_get_unit(dev)))
+ return (ENXIO);
desc = agp_ali_match(dev);
if (desc) {
device_set_desc(dev, desc);
Modified: head/sys/dev/agp/agp_amd.c
==
--- head/sys/dev/agp/agp_amd.c Mon Oct 22 12:54:52 2012(r241884)
+++ head/sys/dev/agp/agp_amd.c Mon Oct 22 13:06:09 2012(r241885)
@@ -203,6 +203,8 @@ agp_amd_probe(device_t dev)
{
const char *desc;
+ if (resource_disabled("agp", device_get_unit(dev)))
+ return (ENXIO);
desc = agp_amd_match(dev);
if (desc) {
device_set_desc(dev, desc);
Modified: head/sys/dev/agp/agp_amd64.c
==
--- head/sys/dev/agp/agp_amd64.cMon Oct 22 12:54:52 2012
(r241884)
+++ head/sys/dev/agp/agp_amd64.cMon Oct 22 13:06:09 2012
(r241885)
@@ -152,6 +152,8 @@ agp
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 4:29 AM, Dimitry Andric wrote: ... > I don't think so, as these member functions are supposed to be always > inlined. E.g. basic_ios::clear() should always be expanded inline to > ios_base::clear(), which is a normal (out of line) function. > > However, the visibility stuff is always terribly confusing, so you might > have a found a real issue. Note that in libc++ trunk, the attributes of > these member functions have not changed. > > In any case, I cannot reproduce the link error on my system. Dmitry: Optimization level might be the salient point. Jan: What are your full CFLAGS/CXXFLAGS? Thanks! -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241886 - head/lib/msun/src
Author: imp
Date: Mon Oct 22 13:20:31 2012
New Revision: 241886
URL: http://svn.freebsd.org/changeset/base/241886
Log:
Revert r241755
Modified:
head/lib/msun/src/e_logf.c
Modified: head/lib/msun/src/e_logf.c
==
--- head/lib/msun/src/e_logf.c Mon Oct 22 13:06:09 2012(r241885)
+++ head/lib/msun/src/e_logf.c Mon Oct 22 13:20:31 2012(r241886)
@@ -19,57 +19,6 @@ __FBSDID("$FreeBSD$");
#include "math.h"
#include "math_private.h"
-/* __ieee754_log(x)
- * Return the logrithm of x
- *
- * Method :
- * 1. Argument Reduction: find k and f such that
- * x = 2^k * (1+f),
- * where sqrt(2)/2 < 1+f < sqrt(2) .
- *
- * 2. Approximation of log(1+f).
- * Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
- * = 2s + 2/3 s**3 + 2/5 s**5 + .,
- * = 2s + s*R
- * We use a special Reme algorithm on [0,0.1716] to generate
- * a polynomial of degree 8 to approximate R The maximum error
- * of this polynomial approximation is bounded by 2**-34.24. In
- * other words,
- * 2 4 6 8
- * R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s
- * (the values of Lg1 to Lg7 are listed in the program)
- * and
- * | 2 8 | -34.24
- * | Lg1*s +...+Lg4*s- R(z) | <= 2
- * | |
- * Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
- * In order to guarantee error in log below 1ulp, we compute log
- * by
- * log(1+f) = f - s*(f - R)(if f is not too large)
- * log(1+f) = f - (hfsq - s*(hfsq+R)). (better accuracy)
- *
- * 3. Finally, log(x) = k*ln2 + log(1+f).
- * = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
- * Here ln2 is split into two floating point number:
- * ln2_hi + ln2_lo,
- * where n*ln2_hi is always exact for |n| < 2000.
- *
- * Special cases:
- * log(x) is NaN with signal if x < 0 (including -INF) ;
- * log(+INF) is +INF; log(0) is -INF with signal;
- * log(NaN) is that NaN with no signal.
- *
- * Accuracy:
- * according to an error analysis, the error is always less than
- * 1 ulp (unit in the last place).
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
-
static const float
ln2_hi = 6.9313812256e-01, /* 0x3f317180 */
ln2_lo = 9.0580006145e-06, /* 0x3717f7d1 */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241887 - head/lib/msun/src
Author: imp
Date: Mon Oct 22 13:21:11 2012
New Revision: 241887
URL: http://svn.freebsd.org/changeset/base/241887
Log:
Revert r241756
Modified:
head/lib/msun/src/e_expf.c
Modified: head/lib/msun/src/e_expf.c
==
--- head/lib/msun/src/e_expf.c Mon Oct 22 13:20:31 2012(r241886)
+++ head/lib/msun/src/e_expf.c Mon Oct 22 13:21:11 2012(r241887)
@@ -21,68 +21,6 @@ __FBSDID("$FreeBSD$");
#include "math.h"
#include "math_private.h"
-/* __ieee754_expf
- * Returns the exponential of x.
- *
- * Method
- * 1. Argument reduction:
- * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658.
- * Given x, find r and integer k such that
- *
- * x = k*ln2 + r, |r| <= 0.5*ln2.
- *
- * Here r will be represented as r = hi-lo for better
- * accuracy.
- *
- * 2. Approximation of exp(r) by a special rational function on
- * the interval [0,0.34658]:
- * Write
- * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ...
- * We use a special Remes algorithm on [0,0.34658] to generate
- * a polynomial of degree 2 to approximate R. The maximum error
- * of this polynomial approximation is bounded by 2**-27. In
- * other words,
- * R(z) ~ 2.0 + P1*z + P2*z*z
- * (where z=r*r, and the values of P1 and P2 are listed below)
- * and
- * | 2 | -27
- * | 2.0+P1*z+P2*z - R(z) | <= 2
- * | |
- * The computation of expf(r) thus becomes
- * 2*r
- * expf(r) = 1 + ---
- *R - r
- * r*R1(r)
- * = 1 + r + --- (for better accuracy)
- *2 - R1(r)
- * where
- * 2 4
- * R1(r) = r - (P1*r + P2*r)
- *
- * 3. Scale back to obtain expf(x):
- * From step 1, we have
- * expf(x) = 2^k * expf(r)
- *
- * Special cases:
- * expf(INF) is INF, exp(NaN) is NaN;
- * expf(-INF) is 0, and
- * for finite argument, only exp(0)=1 is exact.
- *
- * Accuracy:
- * according to an error analysis, the error is always less than
- * 0.5013 ulp (unit in the last place).
- *
- * Misc. info.
- * For IEEE float
- * if x > 8.8721679688e+01 then exp(x) overflow
- * if x < -1.0397208405e+02 then exp(x) underflow
- *
- * Constants:
- * The hexadecimal values are the intended ones for the following
- * constants. The decimal values may be used, provided that the
- * compiler will convert from decimal to binary accurately enough
- * to produce the hexadecimal values shown.
- */
static const float
one= 1.0,
halF[2]= {0.5,-0.5,},
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241755 - head/lib/msun/src
On Oct 21, 2012, at 10:06 PM, Steve Kargl wrote: > On Sun, Oct 21, 2012 at 09:08:49PM -0600, Warner Losh wrote: >> Feel free to fix them however. I added the comments because >> the algorithms weren't quite the same... If you have a better >> way, feel free to back my stuff out on the way to it. >> >> Warner >> > > Please back your commits out. > > Two of the three people who actually appear to be > working on libm have now requested the back-out. Done. Have fun with whatever you have in mind to replace it. Warner ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241757 - head/usr.sbin/pciconf
On Sunday, October 21, 2012 11:11:09 pm Warner Losh wrote: > > On Oct 20, 2012, at 6:30 AM, John Baldwin wrote: > > > On Friday, October 19, 2012 06:48:22 PM Warner Losh wrote: > >> Author: imp > >> Date: Fri Oct 19 22:48:22 2012 > >> New Revision: 241757 > >> URL: http://svn.freebsd.org/changeset/base/241757 > >> > >> Log: > >> Indent ecaps the same way we indent caps. > > > > This was on purpose so the '=' signs line up > > It makes it hard to parse otherwise... Perhaps the equal lining up should be documented? Or at least be fixed to match everything else. When ecaps were added the broke indentation... > > I'm happy to fix the alignment issue. Alternatively you would have to reindent everything else to allow for the larger 'ecap [XXX]' width. You could do that if you wanted to instead. -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241856 - in head/sys: arm/xscale/pxa dev/acpica dev/agp dev/amdsbwd dev/amdtemp dev/asmc dev/coretemp dev/e1000 dev/glxiic dev/ixgbe dev/kbdmux dev/sound/pci i386/acpica i386/bios x86
On Monday, October 22, 2012 9:03:50 am Eitan Adler wrote: > On 22 October 2012 08:42, John Baldwin wrote: > > On Sunday, October 21, 2012 11:41:14 pm Eitan Adler wrote: > >> Author: eadler > >> Date: Mon Oct 22 03:41:14 2012 > >> New Revision: 241856 > >> URL: http://svn.freebsd.org/changeset/base/241856 > >> > >> Log: > >> Now that device disabling is generic, remove extraneous code from the > >> device drivers that used to provide this feature. > > > > This isn't functionally identical. In some cases a hint to disable > > unit 0 would in fact disable all units. For example, disabling est0 and > > acpi_perf0 disabled all instances of estX and acpi_perfX, not just the > > first one. You should test this on a multi-CPU machine before and after > > to see the different effects. > > > > The one in the x86 code that handles early mapping of ACPI tables before > > new-bus is around is also very important (acpi_find_table()). You just > > broke booting on SMP systems where ACPI is disabled but that contain an > > MADT for example (pretty much all modern x86 SMP systems). > > > > elcr is also not a new-bus device, so removing that hint broke that > > psuedo-driver as well. > > > > It is only safe to remove these calls in new-bus attach (not probe!) > > routines that are using 'device_get_unit()' and not hardcoding the > > unit to 0 (unless you know for certain that there can only ever be one > > instance of this device such as acpi0 or asmc0). > > Thanks for the information. I will revert and come up with a better patch. I don't think you need to revert all of them. Just go back over your patch and revert the ones that aren't definitely safe. I think the ones I included in my first e-mail are the ones you need to revert, but I haven't double checked that list. -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241755 - head/lib/msun/src
On Oct 22, 2012, at 5:14 AM, Bruce Evans wrote: > On Sun, 21 Oct 2012, Warner Losh wrote: > >> Feel free to fix them however. I added the comments because the algorithms >> weren't quite the same... If you have a better way, feel free to back my >> stuff out on the way to it. > > But the algorithms are identical to a fault. Inside the functions, all > lines except 1 in each correspond exactly, and the exception is a style > bug. Only about 30 lines in each are not lexically identical. The > non-lexical differences are for things like different magic numbers. Except that's not true. For expf, only the first two terms of the 5 are computed in Remes expansion. That's why I bothered to document the difference. For logf, there are at least two additional terms in the intermediate form. The differences here are: /* logf */ t1= w*(Lg2+w*Lg4); t2= z*(Lg1+w*Lg3); /* log */ t1= w*(Lg2+w*(Lg4+w*Lg6)); t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); which to even the most casual observer are clearly different. > The old fdlibm comments aren't too careful about keeping magic numbers > out of the algorithm description so that the algorithm description is > as general as possible. The precise magic numbers are often critical > to the details of the implementation of the algorithm but not really > to the algorithm itself. The current code isn't careful at all about magic numbers. Which ones are magic hex constants for IEEE stuff, and which ones are hex numbers for the exact representation of important constants? Anyway, it is clear you guys don't want them in there so I've reverted them. I'm totally baffled by this request because these algorithms are similar not identical, but since you guys are the active maintainers, I'll accede to your wishes after expressing my utter bafflement at the justifications. Warner ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241755 - head/lib/msun/src
On Mon, Oct 22, 2012 at 06:59:04AM -0600, Warner Losh wrote: > > On Oct 21, 2012, at 10:06 PM, Steve Kargl wrote: > > > On Sun, Oct 21, 2012 at 09:08:49PM -0600, Warner Losh wrote: > >> Feel free to fix them however. I added the comments because > >> the algorithms weren't quite the same... If you have a better > >> way, feel free to back my stuff out on the way to it. > >> > >> Warner > >> > > > > Please back your commits out. > > > > Two of the three people who actually appear to be > > working on libm have now requested the back-out. > > OK. While it would be just as easy for you guys to commit the new stuff over > mine, I'll revert them. > > Warner > Thanks. BTW, besides bde's technical points, your change made our sources different from OpenBSD, NetBSD, and new project openlibm. Diffing against the other trees would become cluttered. -- Steve ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241888 - in head: share/man/man9 sys/net
Author: melifaro
Date: Mon Oct 22 14:10:17 2012
New Revision: 241888
URL: http://svn.freebsd.org/changeset/base/241888
Log:
Make PFIL use per-VNET lock instead of per-AF lock. Since most used packet
filters (ipfw and PF) use the same ruleset with the same lock for both
AF_INET and AF_INET6 there is no need in more fine-grade locking.
However, it is possible to request personal lock by specifying
PFIL_FLAG_PRIVATE_LOCK flag in pfil_head structure (see pfil.9 for
more details).
Export PFIL lock via rw_lock(9)/rm_lock(9)-like API permitting pfil consumers
to use this lock instead of own lock. This help reducing locks on main
traffic path.
pfil_assert() is currently not implemented due to absense of rm_assert().
Waiting for some kind of r234648 to be merged in HEAD.
This change is part of bigger patch reducing routing locking.
Sponsored by: Yandex LLC
Reviewed by: glebius, ae
OK'd by: silence on net@
MFC after:3 weeks
Modified:
head/share/man/man9/pfil.9
head/sys/net/pfil.c
head/sys/net/pfil.h
Modified: head/share/man/man9/pfil.9
==
--- head/share/man/man9/pfil.9 Mon Oct 22 13:21:11 2012(r241887)
+++ head/share/man/man9/pfil.9 Mon Oct 22 14:10:17 2012(r241888)
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 6, 2012
+.Dd October 22, 2012
.Dt PFIL 9
.Os
.Sh NAME
@@ -39,7 +39,11 @@
.Nm pfil_hook_get ,
.Nm pfil_add_hook ,
.Nm pfil_remove_hook ,
-.Nm pfil_run_hooks
+.Nm pfil_run_hooks ,
+.Nm pfil_rlock ,
+.Nm pfil_runlock ,
+.Nm pfil_wlock ,
+.Nm pfil_wunlock
.Nd packet filter interface
.Sh SYNOPSIS
.In sys/param.h
@@ -62,6 +66,14 @@
.Fn (*func) "void *arg" "struct mbuf **mp" "struct ifnet *" "int dir" "struct
inpcb *"
.Ft int
.Fn pfil_run_hooks "struct pfil_head *head" "struct mbuf **mp" "struct ifnet
*" "int dir" "struct inpcb *"
+.Ft void
+.Fn pfil_rlock "struct pfil_head *" "struct rm_priotracker *"
+.Ft void
+.Fn pfil_runlock "struct pfil_head *" "struct rm_priotracker *"
+.Ft void
+.Fn pfil_wlock "struct pfil_head *"
+.Ft void
+.Fn pfil_wunlock "struct pfil_head *"
.Sh DESCRIPTION
The
.Nm
@@ -86,6 +98,16 @@ The data link type is a
.Xr bpf 4
DLT constant indicating what kind of header is present on the packet
at the filtering point.
+Each filtering point uses common per-VNET rmlock by default.
+This can be changed by specifying
+.Vt PFIL_FLAG_PRIVATE_LOCK
+as
+.Vt "flags"
+field in the
+.Vt pfil_head
+structure.
+Note that specifying private lock can break filters sharing the same
+ruleset and/or state between different data link types.
Filtering points may be unregistered with the
.Fn pfil_head_unregister
function.
@@ -122,6 +144,31 @@ The filter returns an error (errno) if t
if the processing is to continue.
If the packet processing is to stop, it is the responsibility of the
filter to free the packet.
+.Pp
+Every filter hook is called with
+.Nm
+read lock held.
+All heads uses the same lock within the same VNET instance.
+Packet filter can use this lock instead of own locking model to
+improve performance.
+Since
+.Nm
+uses
+.Xr rmlock 9
+.Fn pfil_rlock
+and
+.Fn pfil_runlock
+require
+.Va struct rm_priotracker
+to be passed as argument.
+Filter can acquire and release writer lock via
+.Fn pfil_wlock
+and
+.Fn pfil_wunlock
+functions.
+See
+.Xr rmlock 9
+for more details.
.Sh FILTERING POINTS
Currently, filtering points are implemented for the following link types:
.Pp
@@ -157,6 +204,7 @@ might sleep!
.Sh SEE ALSO
.Xr bpf 4 ,
.Xr if_bridge 4
+.Xr rmlock 4
.Sh HISTORY
The
.Nm
@@ -192,6 +240,9 @@ as well as be less IP-centric.
.Pp
Fine-grained locking was added in
.Fx 5.2 .
+.Nm
+lock export was added in
+.Fx 10.0 .
.Sh BUGS
The
.Fn pfil_hook_get
Modified: head/sys/net/pfil.c
==
--- head/sys/net/pfil.c Mon Oct 22 13:21:11 2012(r241887)
+++ head/sys/net/pfil.c Mon Oct 22 14:10:17 2012(r241888)
@@ -61,6 +61,8 @@ static int pfil_list_remove(pfil_list_t
LIST_HEAD(pfilheadhead, pfil_head);
VNET_DEFINE(struct pfilheadhead, pfil_head_list);
#defineV_pfil_head_listVNET(pfil_head_list)
+VNET_DEFINE(struct rmlock, pfil_lock);
+#defineV_pfil_lock VNET(pfil_lock)
/*
* pfil_run_hooks() runs the specified packet filter hooks.
@@ -91,6 +93,60 @@ pfil_run_hooks(struct pfil_head *ph, str
}
/*
+ * pfil_try_rlock() acquires rm reader lock for specified head
+ * if this is immediately possible,
+ */
+int
+pfil_try_rlock(struct pfil_head *ph, struct rm_priotracker *tracker)
+{
+ return PFIL_TRY_RLOCK(ph, tracker);
+}
+
+/*
+ * pfil_rlock() acquires rm reader lock for specified head.
+ */
+void
+pfil_rlock(struct pfil_head *ph, struct rm_priotracker *tracker)
+{
+ PFIL_RLOCK(ph, tracker);
+}
+
+/*
+ * pfil_runlock() releases reader lock for specified head.
+ */
+void
+pfil_runlock(stru
Re: svn commit: r241830 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Mon, Oct 22, 2012 at 08:01:19AM -0400, Eitan Adler wrote: > On 22 October 2012 03:18, Baptiste Daroussin wrote: > > > > hi, > > > > pkg_install are under portmgr maintainership, and we never received this > > patch > > to review and validate. > > We discussed an earlier version of the patch and this version is that > one + your comments. yes but giving me a chance to review the final version would have allowed me to ask you to for example: I still want to be able to do some operations without havind this warning, like preparing a chroot or other option, thus not printing the warning in some special cases I could also have been able to discuss about it with other portmgr based on the final patch (which is one of the reason it is maintained by portmgr) given we were 5 portmgrs in the same place for the last 5 days that wpuld have fit perfectly. and I could have given you the approval which you need to commit on pkg_install bapt pgphVXFPIJR6y.pgp Description: PGP signature
Re: svn commit: r241755 - head/lib/msun/src
On Oct 22, 2012, at 7:40 AM, Steve Kargl wrote: > On Mon, Oct 22, 2012 at 06:59:04AM -0600, Warner Losh wrote: >> >> On Oct 21, 2012, at 10:06 PM, Steve Kargl wrote: >> >>> On Sun, Oct 21, 2012 at 09:08:49PM -0600, Warner Losh wrote: Feel free to fix them however. I added the comments because the algorithms weren't quite the same... If you have a better way, feel free to back my stuff out on the way to it. Warner >>> >>> Please back your commits out. >>> >>> Two of the three people who actually appear to be >>> working on libm have now requested the back-out. >> >> OK. While it would be just as easy for you guys to commit the new stuff >> over mine, I'll revert them. >> >> Warner >> > > Thanks. > > BTW, besides bde's technical points, your change made > our sources different from OpenBSD, NetBSD, and new > project openlibm. Diffing against the other trees > would become cluttered. BDE's technical points vary in quality and are difficult to argue with since they are so nit-picky. :( I'd be happy to work through them, but some of the issues I just fundamentally disagree with. Since I backed out the comments, I've decided not to spend the time arguing, but do think that documenting the differences between the precisions would be good. I started down this path because I thought expf was broken because it didn't match exp exactly... However, since he's implementing a new one, wouldn't that also have diffability issues too? Warner ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241830 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On 22 October 2012 10:18, Baptiste Daroussin wrote: > On Mon, Oct 22, 2012 at 08:01:19AM -0400, Eitan Adler wrote: >> On 22 October 2012 03:18, Baptiste Daroussin wrote: >> > >> > hi, >> > >> > pkg_install are under portmgr maintainership, and we never received this >> > patch >> > to review and validate. >> >> We discussed an earlier version of the patch and this version is that >> one + your comments. > > yes but giving me a chance to review the final version would have allowed me > to > ask you to for example: Okay. I'll prepare some changes and send them to you for approval. I apologize for not asking for additional review for this patch. I'm not sure when I will send the patch to you, but I won't MFC this change until then. -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241828 - in head: . sys/modules/3dfx sys/modules/cmx sys/modules/filemon tools/tools/sysdoc
On Sunday, October 21, 2012 10:12:11 pm Eitan Adler wrote: > Author: eadler > Date: Mon Oct 22 02:12:11 2012 > New Revision: 241828 > URL: http://svn.freebsd.org/changeset/base/241828 > > Log: > Finish migration of MAINTAINER entries > > Approved by:cperciva > MFC after: 3 days > > Modified: > head/MAINTAINERS > head/sys/modules/3dfx/Makefile > head/sys/modules/cmx/Makefile > head/sys/modules/filemon/Makefile > head/tools/tools/sysdoc/Makefile > > Modified: head/MAINTAINERS > == > --- head/MAINTAINERS Mon Oct 22 02:12:06 2012(r241827) > +++ head/MAINTAINERS Mon Oct 22 02:12:11 2012(r241828) > @@ -120,16 +120,7 @@ lib/libc/stdtime edwin Heads-up apprec > is maintained by a third party source. > sbin/routed bms Pre-commit review; notify vendor at rhyolite.com > isci(4) jimharris Pre-commit review requested. > - > -Following are the entries from the Makefiles, and a few other sources. > -Please remove stale entries from both their origin, and this file. > - > -Please also consider removing the lines from the files listed below and > -stating your preferences here instead. > - > -List below generated with: > -$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ ]*=' > - > -sys/modules/3dfx/Makefile:MAINTAINER=cok...@freebsd.org > -sys/modules/urio/Makefile:MAINTAINER=Iwasa Kazmi > -tools/tools/sysdoc/Makefile:MAINTAINER= trho...@freebsd.org > +3dfx cokane Pre-commit review preferred. > +cmx dan...@roe.ch Pre-commit review preferred. > +fileman obrien Pre-commit review preferred. > +sysdoc trhodes Pre-commit review preferred. s/fileman/filemon/? -- John Baldwin ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241836 - head/share/man/man4
On 21 October 2012 22:59, Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 22 02:59:49 2012
> New Revision: 241836
> URL: http://svn.freebsd.org/changeset/base/241836
>
> Log:
> Remove {harp,hfa,idt} man pages as they were removed in r179308.
A few people emailed me about this already, so I'll reply publicly: it
seems my ObsoleteFiles.inc change got dropped from the patch I sent
for approval. I shall commit this change "shortly."
--
Eitan Adler
Source & Ports committer
X11, Bugmeister, Ports Security teams
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241891 - head
Author: eadler
Date: Mon Oct 22 14:48:14 2012
New Revision: 241891
URL: http://svn.freebsd.org/changeset/base/241891
Log:
Fix typo ('a' and 'o' are not the same letter apparently)
Approved by: cperciva (implicit)
Modified:
head/MAINTAINERS
Modified: head/MAINTAINERS
==
--- head/MAINTAINERSMon Oct 22 14:23:59 2012(r241890)
+++ head/MAINTAINERSMon Oct 22 14:48:14 2012(r241891)
@@ -122,5 +122,5 @@ sbin/routed bms Pre-commit review; notif
isci(4)jimharris Pre-commit review requested.
3dfx cokane Pre-commit review preferred.
cmxdan...@roe.ch Pre-commit review preferred.
-filemanobrien Pre-commit review preferred.
+filemonobrien Pre-commit review preferred.
sysdoc trhodes Pre-commit review preferred.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241828 - in head: . sys/modules/3dfx sys/modules/cmx sys/modules/filemon tools/tools/sysdoc
On 22 October 2012 09:36, John Baldwin wrote: > s/fileman/filemon/? fixed. -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241892 - head/sys/mips/conf
Author: andre Date: Mon Oct 22 15:04:23 2012 New Revision: 241892 URL: http://svn.freebsd.org/changeset/base/241892 Log: Remove ZERO_COPY_SOCKETS from kernel configuration as the current COW based approach is not safe and should not be used in production. Modified: head/sys/mips/conf/RT305X Modified: head/sys/mips/conf/RT305X == --- head/sys/mips/conf/RT305X Mon Oct 22 14:48:14 2012(r241891) +++ head/sys/mips/conf/RT305X Mon Oct 22 15:04:23 2012(r241892) @@ -86,7 +86,6 @@ options SCSI_NO_OP_STRINGS optionsRWLOCK_NOINLINE optionsSX_NOINLINE optionsNO_SWAPPING -optionsZERO_COPY_SOCKETS options MROUTING# Multicast routing optionsIPFIREWALL_DEFAULT_TO_ACCEPT ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 01:18:41AM +, Marcel Moolenaar wrote: M> Tinderbox breakages that are the result of this commit are entirely M> the committer's fault -- in other words: buildworld testing on amd64 M> only. Taking into account the fact that last couple of weeks head was usually not buildable rather than buildable, I strongly disappreciate this. It looks to me as we are again treating head/ as a pile of stuff, not as an operating system one can install and use. Now that we have a big choice of VCSes: svn user branches, git and perforce, why isn't it possible to settle things in private branch and only then commit them to the head/? -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241888 - in head: share/man/man9 sys/net
On Mon, Oct 22, 2012 at 02:10:17PM +, Alexander V. Chernikov wrote: A> Author: melifaro A> Date: Mon Oct 22 14:10:17 2012 A> New Revision: 241888 A> URL: http://svn.freebsd.org/changeset/base/241888 A> A> Log: A> Make PFIL use per-VNET lock instead of per-AF lock. Since most used packet A> filters (ipfw and PF) use the same ruleset with the same lock for both A> AF_INET and AF_INET6 there is no need in more fine-grade locking. A> However, it is possible to request personal lock by specifying A> PFIL_FLAG_PRIVATE_LOCK flag in pfil_head structure (see pfil.9 for A> more details). A> A> Export PFIL lock via rw_lock(9)/rm_lock(9)-like API permitting pfil consumers A> to use this lock instead of own lock. This help reducing locks on main A> traffic path. A> A> pfil_assert() is currently not implemented due to absense of rm_assert(). A> Waiting for some kind of r234648 to be merged in HEAD. A> A> This change is part of bigger patch reducing routing locking. A> A> Sponsored by: Yandex LLC A> Reviewed by: glebius, ae I didn't review that, we have only discussed that. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241888 - in head: share/man/man9 sys/net
On 22.10.2012 19:17, Gleb Smirnoff wrote: On Mon, Oct 22, 2012 at 02:10:17PM +, Alexander V. Chernikov wrote: A> Author: melifaro A> Date: Mon Oct 22 14:10:17 2012 A> New Revision: 241888 A> URL: http://svn.freebsd.org/changeset/base/241888 A> A> Log: A> Make PFIL use per-VNET lock instead of per-AF lock. Since most used packet A> filters (ipfw and PF) use the same ruleset with the same lock for both A> AF_INET and AF_INET6 there is no need in more fine-grade locking. A> However, it is possible to request personal lock by specifying A> PFIL_FLAG_PRIVATE_LOCK flag in pfil_head structure (see pfil.9 for A> more details). A> A> Export PFIL lock via rw_lock(9)/rm_lock(9)-like API permitting pfil consumers A> to use this lock instead of own lock. This help reducing locks on main A> traffic path. A> A> pfil_assert() is currently not implemented due to absense of rm_assert(). A> Waiting for some kind of r234648 to be merged in HEAD. A> A> This change is part of bigger patch reducing routing locking. A> A> Sponsored by: Yandex LLC A> Reviewed by:glebius, ae I didn't review that, we have only discussed that. Ah, ok. So commit message should be read as s/Reviewed by:/Discussed with:/ -- WBR, Alexander ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
Dimitry Andric writes: > On 2012-10-22 09:00, Jan Beich wrote: > ... > >> atf-run fails to link when using -stdlib=libc++. It works if I remove >> `throw' from check_stream(). Any clue? >> >> test-program.o: In function `(anonymous >> namespace)::check_stream(std::__1::basic_ostream> std::__1::char_traits >&)': >> /usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: >> undefined reference to `std::__1::basic_ios> std::__1::char_traits >::clear(unsigned int)' >> clang++: error: linker command failed with exit code 1 (use -v to >> see invocation) > > Strange, for me it compiles (with a bunch of warnings, which I have > fixed locally), and links just fine. However, I always use -std=c++11, > which -std= flag are you using, if any? Adding -std=c++11 doesn't help. Neither yours or Garrett's patches. Instead, removing local -finline-functions (implied by -O3) does. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241755 - head/lib/msun/src
On Mon, 22 Oct 2012, Warner Losh wrote: On Oct 22, 2012, at 5:14 AM, Bruce Evans wrote: On Sun, 21 Oct 2012, Warner Losh wrote: Feel free to fix them however. I added the comments because the algorithms weren't quite the same... If you have a better way, feel free to back my stuff out on the way to it. But the algorithms are identical to a fault. Inside the functions, all lines except 1 in each correspond exactly, and the exception is a style bug. Only about 30 lines in each are not lexically identical. The non-lexical differences are for things like different magic numbers. Except that's not true. For expf, only the first two terms of the 5 are computed in Remes expansion. That's why I bothered to document the difference. For logf, there are at least two additional terms in the intermediate form. No, they both use a Remez-type polynomial approximation. The only differences are that the approximation for logf needs _fewer_ terms, and in fact has 3 fewer (except in the Cygnus version it had the same number of terms with the lower ones useless at best), and that the grouping of the terms is different for efficiency. I say "Remez-type" because it is unclear if anyone actually uses pure Remez. I use my own idea of what it is, without having looked at documentation of the original algorithm. I probably have different tweaks than normal. fdlibm's approximations often seem to be too inaccurate to have been generated by full Remez. The ones here in the Cygnus version were generated by starting with the double precision coeffs and blindly rounding them to float precision. This is a bad non-Remez method (but pure Remez doesn't understand limited precision AFAIK). In practice it gave 6 extra bits using Lg1-Lg7, where my coeffs generated for float precision give 10 extra bits using only Lg1-Lg4. The extra coeffs tend to be actively harmful (and IIRC they were here), because when Remez generates the lower coeffs it tunes them for the lower coeffs actually working, all in infinite precision, and after rounding to finite precision the delicate tuning for this just doesn't work. The comments actually say "special Remes". Who knows what that is? :-) Even running same algorithm, there is a lot of noise in the lower bits for all except the first few coeffs, so it is hard to duplicate coeffs produced by other special versions. The differences here are: /* logf */ t1= w*(Lg2+w*Lg4); t2= z*(Lg1+w*Lg3); /* log */ t1= w*(Lg2+w*(Lg4+w*Lg6)); t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7))); which to even the most casual observer are clearly different. Too casual :-). Both use a moderately efficient grouping of terms for efficiency. Both are more optimal than the simple Horner's method grouping which would look similar even to a too-casual observer: R = s*s*(Lg1+s*(Lg2+s*(...+Lg[4or7])...)) Neither is highly optimized, but the logf one is is better, mainly because a power of 2 number of terms is easiest to get right and a small number of terms is especially easy to get right. In fact, the logf one is just the log one with higher terms omitted. Simply omitting higher terms is usually too simple, but here it happens to improve the grouping. The grouping is a general polynomial evaluation technique and isn't part of Remez. The details of it aren't documented at all. In fact, the pseudo-code doesn't even mention z completely: it says R(z) ~= Lg1*s**2 + ... +Lg7*s**14 (using superscripts for the powers) where the code says t2 = z*(Lg1+w*(Lg3+...)... R = t2+t1. Many other details involve unmentioned parts of general polynymonal evaluation technique (mainly, add terms from high to low for accuracy, but violate this rule as much as possible for efficiency, and avoid underflow by filtering out small args early and by not calculating high powers directly). The old fdlibm comments aren't too careful about keeping magic numbers out of the algorithm description so that the algorithm description is as general as possible. The precise magic numbers are often critical to the details of the implementation of the algorithm but not really to the algorithm itself. The current code isn't careful at all about magic numbers. Which ones are magic hex constants for IEEE stuff, and which ones are hex numbers for the exact representation of important constants? None for the hex FP constants. Hex FP constants are for the programmer's convenience, but I are just style bugs where I use put them in e_expf.c. Decimal FP constants work with any C compiler. They are only pseudocode in comments in fdlibm, and no one every used their values from there AFAIK, since C compilers were common when fdlibm was released. The style bug is to mix C99 hex FP constants in old fdlibm (Cygnus) code. Though only in comments, it looks strange since the active code still laboriously spells out (float) casts to get float constants. Even C90 has float constants via the F suffix. But I recently deci
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 7:58 AM, Jan Beich wrote: > Dimitry Andric writes: > >> On 2012-10-22 09:00, Jan Beich wrote: >> ... >> >>> atf-run fails to link when using -stdlib=libc++. It works if I remove >>> `throw' from check_stream(). Any clue? >>> >>> test-program.o: In function `(anonymous >>> namespace)::check_stream(std::__1::basic_ostream>> std::__1::char_traits >&)': >>> /usr/src/usr.bin/atf/atf-run/../../../contrib/atf/atf-run/test-program.cpp:76: >>> undefined reference to `std::__1::basic_ios>> std::__1::char_traits >::clear(unsigned int)' >>> clang++: error: linker command failed with exit code 1 (use -v to >>> see invocation) >> >> Strange, for me it compiles (with a bunch of warnings, which I have >> fixed locally), and links just fine. However, I always use -std=c++11, >> which -std= flag are you using, if any? > > Adding -std=c++11 doesn't help. Neither yours or Garrett's patches. > Instead, removing local -finline-functions (implied by -O3) does. Ok. I was on the right track, even though my solution wasn't correct... Now that we know how to repro it, we can come up with a legitimate fix, but just to be sure we have all the details could you please send us your full environment (CC/CXX/CFLAGS/CXXFLAGS)? Thanks! -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 8:07 AM, Gleb Smirnoff wrote: > On Mon, Oct 22, 2012 at 01:18:41AM +, Marcel Moolenaar wrote: > M> Tinderbox breakages that are the result of this commit are entirely > M> the committer's fault -- in other words: buildworld testing on amd64 > M> only. > > Taking into account the fact that last couple of weeks head was usually > not buildable rather than buildable, I strongly disappreciate this. > > It looks to me as we are again treating head/ as a pile of stuff, > not as an operating system one can install and use. > > Now that we have a big choice of VCSes: svn user branches, git and > perforce, why isn't it possible to settle things in private branch > and only then commit them to the head/? I had been checking in changes to p4 over the last 4 months and then I ditched it for a local svn checkout when preparing the final patch that I sent to Marcel; I had run the patch in svn in two different sets of VMs in a make tinderbox manner several times. All but a handful of non-build critical items made it into this commit, and the only breakage that was present was accidental and affected ATF runtime. Maintaining all these moving pieces has proved challenging (esp. because I lack the scripts to track all of the changes that I had at IronPort with p4), and even then tracking new files in p4 is entertaining compared to svn, git, etc. This unnecessary complexity plus the fact that one needs p4 in order to collaborate with the changes I'm working on is the primary reason why I'm ditching it for git. The only breakage that's occurring now we've found is people using clang/libc++ (and libc++ looks like it has bugs that would have been caught with C++ applications written in a C++ standards-compliant manner) and various optimization levels which would not have raised red flags with make tinderbox in the first place. If there was a widespread (gcc and/or standard compiler/linker flags) issue with the build a) we would have seen it be now in the tinderbox emails and b) I would have CCed the current set of mailing lists so the issue would have been resolved quickly. The fact that it wasn't caught illustrates the fact that although we're trying to pilot clang as the default compiler by next month, there's a huge gap in required testing for commits. Looking forward, the major items for ATF have been committed. The rest of the patches which will be committed will be considerably smaller, targeted to specific components, and [for the most part, minus test integration in the tinderbox builds which will only be done after extensively testing is performed] will not affect the standard build process. Thank you for the concern though and I understand where you're coming from. -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241625 - head/usr.sbin/cron/cron
Guys, The latest version of the patch against current HEAD is available here: http://sobomax.sippysoft.com/cron.diff Any comments/suggestions are appreciated. This version should default to previous behaviour of waking up every 60 seconds unless there is @every_second entry in the cron. Konstantin, can you please put it for testing to your boxes? Please make sure to do `make clean' after applying it, as libcron is not listed as a dependency for cron, so it's possible that some changes may not be picked up. Thanks! -Maxim On 10/17/2012 1:18 PM, Konstantin Belousov wrote: On Wed, Oct 17, 2012 at 01:07:20PM -0700, Maxim Sobolev wrote: On 10/17/2012 10:48 AM, Konstantin Belousov wrote: The cron daemon in HEAD is not functional, i.e. no jobs are executed at all. Reverting r241625 r241618 r241576 gives me the expected behaviour. P.S. I do not remember a single commit from you which did not failed on tinderbox, or was not found buggy later. Should be fixed already in the latest HEAD. Please check and let me know if you still have some issues (send crontab entry which is not getting executed). The particular issue has been fixed in the r241618. Well, as I noted above, I had r241618 applied, since I needed to revert it. For me, neither the standard entries from /etc/crontab, nor the following user crontab: * * * * * /usr/bin/limits -a >/tmp/1.txt are not executing. In particular, the /tmp/1.txt file was not created, and the cron.log was empty. As I said, a reversal of all three commits makes the cron(8) operate correctly. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241625 - head/usr.sbin/cron/cron
On 22 October 2012 12:10, Maxim Sobolev wrote: > Please make > sure to do `make clean' after applying it, as libcron is not listed as a > dependency for cron, so it's possible that some changes may not be picked > up. Why? Can this be fixed if this is not intended? -- Eitan Adler Source & Ports committer X11, Bugmeister, Ports Security teams ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241625 - head/usr.sbin/cron/cron
On 10/22/2012 9:35 AM, Eitan Adler wrote: Why? Can this be fixed if this is not intended? Well, I see libcron in the DPADD for the cron(8), so I think as far as normal buildworld is concerned things are good. It's just that if you build the cron only manually, it's not recompiled automatically. Maybe one need to do make depend or something. -Maxim [sobomax@pioneer ~/projects/FreeBSD/head/usr.sbin/cron]$ make ===> lib (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/lib ===> cron (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/cron ===> crontab (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/crontab [sobomax@pioneer ~/projects/FreeBSD/head/usr.sbin/cron]$ touch lib/entry.c [sobomax@pioneer ~/projects/FreeBSD/head/usr.sbin/cron]$ make ===> lib (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/lib cc -O2 -pipe -I/usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/lib/../cron -DLOGIN_CAP -DPAM -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-uninitialized -Wno-pointer-sign -c entry.c building static cron library ranlib libcron.a ===> cron (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/cron ===> crontab (all) Warning: Object directory not changed from original /usr/home/sobomax/projects/FreeBSD/head/usr.sbin/cron/crontab [sobomax@pioneer ~/projects/FreeBSD/head/usr.sbin/cron]$ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241893 - head/share/misc
Author: eadler Date: Mon Oct 22 17:13:15 2012 New Revision: 241893 URL: http://svn.freebsd.org/changeset/base/241893 Log: Update re members to reality MFC after:3 days Modified: head/share/misc/organization.dot Modified: head/share/misc/organization.dot == --- head/share/misc/organization.dotMon Oct 22 15:04:23 2012 (r241892) +++ head/share/misc/organization.dotMon Oct 22 17:13:15 2012 (r241893) @@ -32,7 +32,7 @@ doceng [label="Documentation Engineering portscommitters [label="Ports Committers\nports-committ...@freebsd.org"] portmgr [label="Port Management Team\nport...@freebsd.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, miwi"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secret...@freebsd.org\ntabthorpe"] -re [label="Primary Release Engineering Team\n...@freebsd.org\nkib, blackend, jpaetzel, hrs, kensmith,\nrwatson, bz"] +re [label="Primary Release Engineering Team\n...@freebsd.org\nkib, blackend, jpaetzel, hrs, kensmith"] secteam [label="Security Team\nsect...@freebsd.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] portssecteam [label="Ports Security Team\nports-sect...@freebsd.org\nmiwi, rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"] secteamsecretary [label="Security Team Secretary\nsecteam-secret...@freebsd.org\nremko"] ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241845 - head/games/fortune/datfiles
On Oct 21, 2012, at 9:00 PM, Eitan Adler wrote: > Author: eadler > Date: Mon Oct 22 03:00:43 2012 > New Revision: 241845 > URL: http://svn.freebsd.org/changeset/base/241845 > > Log: > Sysinstall has been removed from base. > > Approved by: cperciva > > Modified: > head/games/fortune/datfiles/freebsd-tips > > Modified: head/games/fortune/datfiles/freebsd-tips > == > --- head/games/fortune/datfiles/freebsd-tips Mon Oct 22 03:00:37 2012 > (r241844) > +++ head/games/fortune/datfiles/freebsd-tips Mon Oct 22 03:00:43 2012 > (r241845) > @@ -40,7 +40,7 @@ Having trouble using fetch through a fir > variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. > % > If other operating systems have damaged your Master Boot Record, you can > -reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See > +reinstall it either with boot0cfg(8). See Need to also drop 'either' from the above sentence: "reinstall it with boot0cfg(8)." ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241895 - head/contrib/llvm/lib/Target/X86/MCTargetDesc
Author: dim
Date: Mon Oct 22 17:47:37 2012
New Revision: 241895
URL: http://svn.freebsd.org/changeset/base/241895
Log:
Pull in r165878 from upstream llvm trunk:
X86: Disable long nops for all cpus prior to pentiumpro/i686.
This is the safest approach for now. If you think long nops matter a
lot for performance, compile with -march=i686 or higher. :)
MFC after:3 days
Modified:
head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
Modified: head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
==
--- head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Mon Oct
22 17:23:32 2012(r241894)
+++ head/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp Mon Oct
22 17:47:37 2012(r241895)
@@ -307,7 +307,9 @@ bool X86AsmBackend::writeNopData(uint64_
};
// This CPU doesnt support long nops. If needed add more.
- if (CPU == "geode") {
+ // FIXME: Can we get this from the subtarget somehow?
+ if (CPU == "generic" || CPU == "i386" || CPU == "i486" || CPU == "i586" ||
+ CPU == "pentium" || CPU == "pentium-mmx" || CPU == "geode") {
for (uint64_t i = 0; i < Count; ++i)
OW->Write8(0x90);
return true;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241896 - in head: . cddl/contrib/opensolaris/lib/libzpool/common/sys share/man/man9 sys/cam/ctl sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys sys/cddl/contrib/openso...
Author: kib Date: Mon Oct 22 17:50:54 2012 New Revision: 241896 URL: http://svn.freebsd.org/changeset/base/241896 Log: Remove the support for using non-mpsafe filesystem modules. In particular, do not lock Giant conditionally when calling into the filesystem module, remove the VFS_LOCK_GIANT() and related macros. Stop handling buffers belonging to non-mpsafe filesystems. The VFS_VERSION is bumped to indicate the interface change which does not result in the interface signatures changes. Conducted and reviewed by:attilio Tested by:pho Deleted: head/share/man/man9/VFS_LOCK_GIANT.9 Modified: head/ObsoleteFiles.inc head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h head/share/man/man9/Makefile head/share/man/man9/namei.9 head/sys/cam/ctl/ctl_backend_block.c head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c head/sys/cddl/compat/opensolaris/sys/vnode.h head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c head/sys/compat/linprocfs/linprocfs.c head/sys/compat/linux/linux_file.c head/sys/compat/linux/linux_misc.c head/sys/compat/ndis/subr_ndis.c head/sys/compat/svr4/svr4_misc.c head/sys/conf/NOTES head/sys/conf/options head/sys/dev/hwpmc/hwpmc_mod.c head/sys/dev/md/md.c head/sys/dev/nand/nandsim_swap.c head/sys/dev/xen/blkback/blkback.c head/sys/fs/nfs/nfs_commonport.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/procfs/procfs_map.c head/sys/fs/unionfs/union_subr.c head/sys/geom/geom_vfs.c head/sys/geom/journal/g_journal.c head/sys/i386/ibcs2/ibcs2_misc.c head/sys/kern/imgact_elf.c head/sys/kern/kern_acct.c head/sys/kern/kern_alq.c head/sys/kern/kern_ctf.c head/sys/kern/kern_descrip.c head/sys/kern/kern_exec.c head/sys/kern/kern_exit.c head/sys/kern/kern_gzio.c head/sys/kern/kern_jail.c head/sys/kern/kern_ktrace.c head/sys/kern/kern_linker.c head/sys/kern/kern_proc.c head/sys/kern/kern_sig.c head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c head/sys/kern/sys_process.c head/sys/kern/uipc_syscalls.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_aio.c head/sys/kern/vfs_bio.c head/sys/kern/vfs_cache.c head/sys/kern/vfs_default.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_init.c head/sys/kern/vfs_lookup.c head/sys/kern/vfs_mount.c head/sys/kern/vfs_mountroot.c head/sys/kern/vfs_subr.c head/sys/kern/vfs_syscalls.c head/sys/kern/vfs_vnops.c head/sys/nfsserver/nfs.h head/sys/nfsserver/nfs_serv.c head/sys/nfsserver/nfs_srvsubs.c head/sys/nlm/nlm_prot_impl.c head/sys/security/audit/audit_arg.c head/sys/security/audit/audit_syscalls.c head/sys/security/audit/audit_worker.c head/sys/security/mac/mac_process.c head/sys/security/mac/mac_syscalls.c head/sys/sys/buf.h head/sys/sys/bufobj.h head/sys/sys/mount.h head/sys/sys/namei.h head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ufs/ufs_quota.c head/sys/vm/vm_fault.c head/sys/vm/vm_mmap.c head/sys/vm/vm_object.c head/sys/vm/vm_pageout.c head/sys/vm/vnode_pager.c Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 22 17:47:37 2012(r241895) +++ head/ObsoleteFiles.inc Mon Oct 22 17:50:54 2012(r241896) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20121022: VFS_LOCK_GIANT elimination +OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz # 20121004: remove incomplete unwind.h OLD_FILES+=usr/include/clang/3.2/unwind.h # 20120908: pf cleanup Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h == --- head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Mon Oct 22 17:47:37 2012(r241895) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Mon Oct 22 17:50:54 2012(r241896) @@ -430,14 +430,6 @@ extern int fop_getattr(vnode_t *vp, vatt #definevn_lock(vp, type) #defineVOP_UNLOCK(vp, type) -#ifdef VFS_LOCK_GIANT -#undef VFS_LOCK_GIANT -#endif -#defineVFS_LOCK_GIANT(mp) 0 -#ifdef VFS_UNLOCK_GIANT -#undef VFS_UNLOCK_GIANT -#endif -#defineVFS_UNLOCK_GIANT(vfslocked) extern int vn_open(char *path, int x1, int oflags, int mode, vnode_t **vpp, int x2, int x3); Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileMon Oct 22 17:47:37 2012 (r241895) +++ head/share/man/man9/MakefileMon Oct 22 17:50:54 2012 (r241896) @@ -280,7 +280,6 @@ MAN=accept_filter.9
svn commit: r241897 - in head: . sys/sys
Author: kib Date: Mon Oct 22 17:54:32 2012 New Revision: 241897 URL: http://svn.freebsd.org/changeset/base/241897 Log: Bump __FreeBSD_version and make a note in UPDATING about removal of the support for non-MPSAFE filesystems. Modified: head/UPDATING head/sys/sys/param.h Modified: head/UPDATING == --- head/UPDATING Mon Oct 22 17:50:54 2012(r241896) +++ head/UPDATING Mon Oct 22 17:54:32 2012(r241897) @@ -24,6 +24,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20121022: + Support for non-MPSAFE filesystems was removed from VFS. The + VFS_VERSION was bumped, all filesystem modules shall be + recompiled. + 20121018: All the non-MPSAFE filesystems have been disconnected from the build. The full list includes: codafs, hpfs, ntfs, nwfs, Modified: head/sys/sys/param.h == --- head/sys/sys/param.hMon Oct 22 17:50:54 2012(r241896) +++ head/sys/sys/param.hMon Oct 22 17:54:32 2012(r241897) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 120 /* Master, propagated to newvers */ +#define __FreeBSD_version 121 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241899 - in head/usr.sbin/bsdconfig: . include security security/include share
Author: dteske
Date: Mon Oct 22 18:01:38 2012
New Revision: 241899
URL: http://svn.freebsd.org/changeset/base/241899
Log:
Resurrect usage.hlp and securelevel.hlp from sysinstall(8) and integrate them
into bsdconfig(8).
Approved by: adrian (co-mentor) (implicit)
Added:
head/usr.sbin/bsdconfig/include/usage.hlp (contents, props changed)
head/usr.sbin/bsdconfig/security/include/securelevel.hlp (contents, props
changed)
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/include/Makefile
head/usr.sbin/bsdconfig/include/messages.subr
head/usr.sbin/bsdconfig/security/include/Makefile
head/usr.sbin/bsdconfig/security/kern_securelevel
head/usr.sbin/bsdconfig/share/common.subr
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Mon Oct 22 17:56:15 2012
(r241898)
+++ head/usr.sbin/bsdconfig/bsdconfig Mon Oct 22 18:01:38 2012
(r241899)
@@ -37,7 +37,8 @@ f_include $BSDCFG_SHARE/strings.subr
BSDCFG_LIBE="/usr/libexec/bsdconfig"
f_include_lang $BSDCFG_LIBE/include/messages.subr
-f_include_help $BSDCFG_LIBE/include/bsdconfig.hlp
+f_include_help BSDCONFIG $BSDCFG_LIBE/include/bsdconfig.hlp
+f_include_help USAGE $BSDCFG_LIBE/include/usage.hlp
FUNCTIONS
@@ -141,12 +142,13 @@ dialog_menu_main()
local menu_list size
menu_list="
- 'X' '$msg_exit' '$msg_exit_bsdconfig'
+ 'X' '$msg_exit' '$msg_exit_bsdconfig'
+ '1' '$msg_usage' '$msg_quick_start_how_to_use_this_menu_system'
" # END-QUOTE
local sanitize_awk="{ gsub(/'/, \"'''\"); print }"
- local menuitem menu_title menu_help menu_selection index=1
+ local menuitem menu_title menu_help menu_selection index=2
for menuitem in $( ls -d [0-9][0-9][0-9].* ); do
[ $index -lt ${#DIALOG_MENU_TAGS} ] || break
tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
@@ -187,7 +189,7 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_exit_bsdconfig\" \
--help-button \
- ${USE_XDIALOG:+--help \"\$( f_include_help )\"} \
+ ${USE_XDIALOG:+--help \"\$( f_include_help BSDCONFIG )\"} \
--menu \"\$prompt\" $size $menu_list\
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@@ -300,7 +302,7 @@ while :; do
if [ $retval -eq 2 ]; then
# The Help button was pressed
- f_show_msg "%s" "$( f_include_help )"
+ f_show_msg "%s" "$( f_include_help BSDCONFIG )"
continue
elif [ $retval -ne 0 ]; then
f_die
@@ -311,6 +313,11 @@ while :; do
break
;;
+ 1) # Usage
+ f_show_msg "%s" "$( f_include_help USAGE )"
+ continue
+ ;;
+
*) # Dynamically loaded menuitem
cmd=$( eval echo \"\$menu_program$mtag\" )
f_dprintf "cmd=[$cmd]"
Modified: head/usr.sbin/bsdconfig/include/Makefile
==
--- head/usr.sbin/bsdconfig/include/MakefileMon Oct 22 17:56:15 2012
(r241898)
+++ head/usr.sbin/bsdconfig/include/MakefileMon Oct 22 18:01:38 2012
(r241899)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${LIBEXECDIR}/bsdconfig/include
-FILES= bsdconfig.hlp messages.subr
+FILES= bsdconfig.hlp messages.subr usage.hlp
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
Modified: head/usr.sbin/bsdconfig/include/messages.subr
==
--- head/usr.sbin/bsdconfig/include/messages.subr Mon Oct 22 17:56:15
2012(r241898)
+++ head/usr.sbin/bsdconfig/include/messages.subr Mon Oct 22 18:01:38
2012(r241899)
@@ -51,11 +51,13 @@ msg_permission_denied="%s: %s: Permissio
msg_please_enter_password="Please enter your password for sudo(8):"
msg_please_enter_username_password="Please enter a username and password for
sudo(8):"
msg_previous_syntax_errors="%s: Not overwriting \`%s' due to previous syntax
errors"
+msg_quick_start_how_to_use_this_menu_system="Quick start - How to use this
menu system"
msg_secure_mode_requires_x11="Secure-mode requires X11 (use \`-X')!"
msg_secure_mode_requires_root="Secure-mode requires root-access!"
msg_sorry_try_again="Sorry, try again."
msg_try_sudo_only_this_once="Try sudo(8) only this once"
msg_unknown_user="Unknown user: %s"
+msg_usage="Usage"
msg_user_disallowed="User disallowed: %s"
msg_yes="Yes"
msg_you_are_not_root_but="You are not root but %s can use sudo(8).\nWhat would
you like to do?"
Added: head/usr.sbin/bsdconfig/include/usage.hlp
===
svn commit: r241902 - in head/usr.sbin/bsdinstall: . scripts
Author: dteske
Date: Mon Oct 22 18:14:27 2012
New Revision: 241902
URL: http://svn.freebsd.org/changeset/base/241902
Log:
Optimize syntax to use builtins and reduce unnecessary forking where possible.
Reviewed by: nwhitehorn
Approved by: adrian (co-mentor)
Modified:
head/usr.sbin/bsdinstall/bsdinstall
head/usr.sbin/bsdinstall/scripts/auto
Modified: head/usr.sbin/bsdinstall/bsdinstall
==
--- head/usr.sbin/bsdinstall/bsdinstall Mon Oct 22 18:05:01 2012
(r241901)
+++ head/usr.sbin/bsdinstall/bsdinstall Mon Oct 22 18:14:27 2012
(r241902)
@@ -32,12 +32,8 @@
: ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
: ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
-VERB=$1; shift
+VERB=${1:-auto}; shift
-if [ -z "$VERB" ]; then
- VERB=auto
-fi
-
-test -d "$BSDINSTALL_TMPETC" || mkdir "$BSDINSTALL_TMPETC"
+[ -d "$BSDINSTALL_TMPETC" ] || mkdir -p "$BSDINSTALL_TMPETC"
echo "Running installation step: $VERB $@" >> "$BSDINSTALL_LOG"
-exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>>"$BSDINSTALL_LOG"
+exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$BSDINSTALL_LOG"
Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto Mon Oct 22 18:05:01 2012
(r241901)
+++ head/usr.sbin/bsdinstall/scripts/auto Mon Oct 22 18:14:27 2012
(r241902)
@@ -53,15 +53,15 @@ bsdinstall hostname || error
export DISTRIBUTIONS="base.txz kernel.txz"
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
- DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e
^kernel -e ^base`
+ DISTMENU=`awk '!/^(kernel|base)/{print $4,$5,$6}'
$BSDINSTALL_DISTDIR/MANIFEST`
exec 3>&1
- EXTRA_DISTS=$(echo $DISTMENU | xargs dialog \
- --backtitle "FreeBSD Installer" \
- --title "Distribution Select" --nocancel --separate-output \
- --checklist "Choose optional system components to install:" \
- 0 0 0 \
- 2>&1 1>&3)
+ EXTRA_DISTS=$( eval dialog \
+ --backtitle \"FreeBSD Installer\" \
+ --title \"Distribution Select\" --nocancel --separate-output \
+ --checklist \"Choose optional system components to install:\" \
+ 0 0 0 $DISTMENU \
+ 2>&1 1>&3 )
for dist in $EXTRA_DISTS; do
export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
done
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241903 - in head/contrib/libc++: . include src src/support
Author: dim Date: Mon Oct 22 18:25:04 2012 New Revision: 241903 URL: http://svn.freebsd.org/changeset/base/241903 Log: Import libc++ trunk r165949. Among other improvements and bug fixes, this has many visibility problems fixed, which should help with compiling certain ports that exercise C++11 mode (i.e. Firefox). Also, belatedly add the LICENSE.TXT and accompanying CREDITS.TXT files, which are referred to in all the source files. MFC after:1 month Added: head/contrib/libc++/CREDITS.TXT - copied unchanged from r241901, vendor/libc++/dist/CREDITS.TXT head/contrib/libc++/LICENSE.TXT - copied unchanged from r241901, vendor/libc++/dist/LICENSE.TXT Deleted: head/contrib/libc++/src/support/ Modified: head/contrib/libc++/include/__bit_reference head/contrib/libc++/include/__config head/contrib/libc++/include/__hash_table head/contrib/libc++/include/__locale head/contrib/libc++/include/__mutex_base head/contrib/libc++/include/__tree head/contrib/libc++/include/__tuple head/contrib/libc++/include/__undef_min_max head/contrib/libc++/include/algorithm head/contrib/libc++/include/array head/contrib/libc++/include/atomic head/contrib/libc++/include/bitset head/contrib/libc++/include/chrono head/contrib/libc++/include/cmath head/contrib/libc++/include/complex head/contrib/libc++/include/condition_variable head/contrib/libc++/include/cstddef head/contrib/libc++/include/cstdio head/contrib/libc++/include/cstdlib head/contrib/libc++/include/deque head/contrib/libc++/include/exception head/contrib/libc++/include/forward_list head/contrib/libc++/include/fstream head/contrib/libc++/include/functional head/contrib/libc++/include/future head/contrib/libc++/include/ios head/contrib/libc++/include/iosfwd head/contrib/libc++/include/istream head/contrib/libc++/include/iterator head/contrib/libc++/include/list head/contrib/libc++/include/locale head/contrib/libc++/include/map head/contrib/libc++/include/memory head/contrib/libc++/include/mutex head/contrib/libc++/include/new head/contrib/libc++/include/ostream head/contrib/libc++/include/queue head/contrib/libc++/include/random head/contrib/libc++/include/regex head/contrib/libc++/include/stack head/contrib/libc++/include/streambuf head/contrib/libc++/include/string head/contrib/libc++/include/system_error head/contrib/libc++/include/thread head/contrib/libc++/include/tuple head/contrib/libc++/include/type_traits head/contrib/libc++/include/unordered_map head/contrib/libc++/include/utility head/contrib/libc++/include/valarray head/contrib/libc++/include/vector head/contrib/libc++/src/condition_variable.cpp head/contrib/libc++/src/debug.cpp head/contrib/libc++/src/exception.cpp head/contrib/libc++/src/future.cpp head/contrib/libc++/src/ios.cpp head/contrib/libc++/src/iostream.cpp head/contrib/libc++/src/locale.cpp head/contrib/libc++/src/memory.cpp head/contrib/libc++/src/mutex.cpp head/contrib/libc++/src/new.cpp head/contrib/libc++/src/random.cpp head/contrib/libc++/src/stdexcept.cpp head/contrib/libc++/src/thread.cpp head/contrib/libc++/src/typeinfo.cpp Directory Properties: head/contrib/libc++/ (props changed) Copied: head/contrib/libc++/CREDITS.TXT (from r241901, vendor/libc++/dist/CREDITS.TXT) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/libc++/CREDITS.TXT Mon Oct 22 18:25:04 2012 (r241903, copy of r241901, vendor/libc++/dist/CREDITS.TXT) @@ -0,0 +1,76 @@ +This file is a partial list of people who have contributed to the LLVM/libc++ +project. If you have contributed a patch or made some other contribution to +LLVM/libc++, please submit a patch to this file to add yourself, and it will be +done! + +The list is sorted by surname and formatted to allow easy grepping and +beautification by scripts. The fields are: name (N), email (E), web-address +(W), PGP key ID and fingerprint (P), description (D), and snail-mail address +(S). + +N: Howard Hinnant +E: hhinn...@apple.com +D: Architect and primary author of libc++ + +N: Marshall Clow +E: mclow.li...@gmail.com +E: marsh...@idio.com +D: Minor patches and bug fixes. + +N: Bjorn Reese +E: bre...@users.sourceforge.net +D: Initial regex prototype + +N: David Chisnall +E: theraven at theravensnest dot org +D: FreeBSD and Solaris ports, libcxxrt support, some atomics work. + +N: Ruben Van Boxem +E: vanboxem dot ruben at gmail dot com +D: Initial Windows patches. + +N: Arvid Picciani +E: aep at exys dot org +D: Minor patches and musl port. + +N: Craig Silverstein +E: csilv...@google.com +D: Implemented Cityhash as the string hash function on 64-bit machines + +N: Google Inc. +D: Copyright owner and contributor of the CityHash algorithm + +N: Jeffrey Yasskin +E: jyass...@gmail.com +E: jyass...@google.com +D: Linux fixes. + +N: Jonathan S
Re: svn commit: r241897 - in head: . sys/sys
On 10/22/12, Konstantin Belousov wrote: > Author: kib > Date: Mon Oct 22 17:54:32 2012 > New Revision: 241897 > URL: http://svn.freebsd.org/changeset/base/241897 > > Log: > Bump __FreeBSD_version and make a note in UPDATING about removal of > the support for non-MPSAFE filesystems. Also, the __FreeBSD_version bump can be used for FUSE import and NON-mpsafe filesystems removal as well. Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241903 - in head/contrib/libc++: . include src src/support
On 2012-10-22 20:25, Dimitry Andric wrote:> Author: dim
Date: Mon Oct 22 18:25:04 2012
New Revision: 241903
URL: http://svn.freebsd.org/changeset/base/241903
Log:
Import libc++ trunk r165949. Among other improvements and bug fixes,
this has many visibility problems fixed, which should help with
compiling certain ports that exercise C++11 mode (i.e. Firefox).
Also, belatedly add the LICENSE.TXT and accompanying CREDITS.TXT files,
which are referred to in all the source files.
Note that with llvm and clang, we install these license files into
/usr/share/doc/{llvm,clang}, together with the (admittedly sparse) other
documentation.
For libc++, there isn't any offline documentation to install right now,
so making a /usr/share/doc/libc++ directory for just the .TXT files
might be a little overkill? Maybe we should install them into the
include directory?
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241906 - head/contrib/netcat
Author: delphij
Date: Mon Oct 22 18:56:31 2012
New Revision: 241906
URL: http://svn.freebsd.org/changeset/base/241906
Log:
MFV: netcat from OpenBSD 5.2.
MFC after:1 month
Modified:
head/contrib/netcat/FREEBSD-vendor
head/contrib/netcat/nc.1
head/contrib/netcat/netcat.c
head/contrib/netcat/socks.c
Directory Properties:
head/contrib/netcat/ (props changed)
Modified: head/contrib/netcat/FREEBSD-vendor
==
--- head/contrib/netcat/FREEBSD-vendor Mon Oct 22 18:49:03 2012
(r241905)
+++ head/contrib/netcat/FREEBSD-vendor Mon Oct 22 18:56:31 2012
(r241906)
@@ -1,5 +1,5 @@
# $FreeBSD$
Project: netcat (aka src/usr.bin/nc in OpenBSD)
ProjectURL:http://www.openbsd.org/
-Version: 5.1
+Version: 5.2
License: BSD
Modified: head/contrib/netcat/nc.1
==
--- head/contrib/netcat/nc.1Mon Oct 22 18:49:03 2012(r241905)
+++ head/contrib/netcat/nc.1Mon Oct 22 18:56:31 2012(r241906)
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.60 2012/02/07 12:11:43 lum Exp $
+.\" $OpenBSD: nc.1,v 1.61 2012/07/07 15:33:02 haesbaert Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 4, 2011
+.Dd February 7, 2012
.Dt NC 1
.Os
.Sh NAME
@@ -137,6 +137,10 @@ is completed.
It is an error to use this option without the
.Fl l
option.
+When used together with the
+.Fl u
+option, the server socket is not connected and it can receive UDP datagrams
from
+multiple hosts.
.It Fl l
Used to specify that
.Nm
Modified: head/contrib/netcat/netcat.c
==
--- head/contrib/netcat/netcat.cMon Oct 22 18:49:03 2012
(r241905)
+++ head/contrib/netcat/netcat.cMon Oct 22 18:56:31 2012
(r241906)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.105 2012/02/09 06:25:35 lum Exp $ */
+/* $OpenBSD: netcat.c,v 1.109 2012/07/07 15:33:02 haesbaert Exp $ */
/*
* Copyright (c) 2001 Eric Jackson
*
@@ -75,7 +75,6 @@
/* Command Line Options */
intdflag; /* detached, no stdin */
unsigned int iflag;/* Interval Flag */
-intjflag; /* use jumbo frames if we can */
intkflag; /* More than one connect */
intlflag; /* Bind to local port */
intnflag; /* Don't do name look up */
@@ -116,6 +115,7 @@ int unix_connect(char *);
intunix_listen(char *);
void set_common_sockopts(int);
intmap_tos(char *, int *);
+void report_connect(const struct sockaddr *, socklen_t);
void usage(int);
#ifdef IPSEC
@@ -153,7 +153,7 @@ main(int argc, char *argv[])
sv = NULL;
while ((ch = getopt_long(argc, argv,
- "46DdEe:hI:i:jklnoO:P:p:rSs:tT:UuV:vw:X:x:z",
+ "46DdEe:hI:i:klnoO:P:p:rSs:tT:UuV:vw:X:x:z",
longopts, NULL)) != -1) {
switch (ch) {
case '4':
@@ -201,11 +201,6 @@ main(int argc, char *argv[])
if (errstr)
errx(1, "interval %s: %s", errstr, optarg);
break;
-#ifdef SO_JUMBO
- case 'j':
- jflag = 1;
- break;
-#endif
case 'k':
kflag = 1;
break;
@@ -395,17 +390,23 @@ main(int argc, char *argv[])
if (s < 0)
err(1, NULL);
/*
-* For UDP, we will use recvfrom() initially
-* to wait for a caller, then use the regular
-* functions to talk to the caller.
+* For UDP and -k, don't connect the socket, let it
+* receive datagrams from multiple socket pairs.
+*/
+ if (uflag && kflag)
+ readwrite(s);
+ /*
+* For UDP and not -k, we will use recvfrom() initially
+* to wait for a caller, then use the regular functions
+* to talk to the caller.
*/
- if (uflag) {
+ else if (uflag && !kflag) {
int rv, plen;
char buf[16384];
struct sockaddr_storage z;
len = sizeof(z);
- plen = jflag ? 16384 : 2048;
+ plen = 2048;
rv = recvfrom(s, buf, pl
svn commit: r241907 - head/contrib/libc++/include
Author: dim
Date: Mon Oct 22 19:06:00 2012
New Revision: 241907
URL: http://svn.freebsd.org/changeset/base/241907
Log:
Fix two -Wsystem-header warnings in libc++ that were exposed by the new
ATF import. These have also been sent upstream.
MFC after:1 month
Modified:
head/contrib/libc++/include/locale
Modified: head/contrib/libc++/include/locale
==
--- head/contrib/libc++/include/locale Mon Oct 22 18:56:31 2012
(r241906)
+++ head/contrib/libc++/include/locale Mon Oct 22 19:06:00 2012
(r241907)
@@ -2876,9 +2876,9 @@ protected:
virtual string_type do_negative_sign() const {return string_type(1, '-');}
virtual int do_frac_digits() const {return 0;}
virtual pattern do_pos_format()const
-{pattern __p = {symbol, sign, none, value}; return __p;}
+{pattern __p = {{symbol, sign, none, value}}; return __p;}
virtual pattern do_neg_format()const
-{pattern __p = {symbol, sign, none, value}; return __p;}
+{pattern __p = {{symbol, sign, none, value}}; return __p;}
};
template
@@ -3192,7 +3192,6 @@ money_get<_CharT, _InputIterator>::__do_
bool __sb = __flags & ios_base::showbase;
if (__sb || __more_needed)
{
-ios_base::iostate __et = ios_base::goodbit;
typename string_type::const_iterator __sym_space_end =
__sym.begin();
if (__p > 0 && (__pat.field[__p - 1] == money_base::none ||
__pat.field[__p - 1] == money_base::space)) {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241908 - head/sys/netpfil/ipfw
Author: melifaro
Date: Mon Oct 22 19:22:31 2012
New Revision: 241908
URL: http://svn.freebsd.org/changeset/base/241908
Log:
Remove unnecessary chain read lock in ipfw nat 'global' code.
Document case when ipfw chain lock must be held while calling ipfw_nat().
MFC after:2 weeks
Modified:
head/sys/netpfil/ipfw/ip_fw_nat.c
Modified: head/sys/netpfil/ipfw/ip_fw_nat.c
==
--- head/sys/netpfil/ipfw/ip_fw_nat.c Mon Oct 22 19:06:00 2012
(r241907)
+++ head/sys/netpfil/ipfw/ip_fw_nat.c Mon Oct 22 19:22:31 2012
(r241908)
@@ -202,6 +202,13 @@ add_redir_spool_cfg(char *buf, struct cf
}
}
+/*
+ * ipfw_nat - perform mbuf header translation.
+ *
+ * Note V_layer3_chain has to be locked while calling ipfw_nat() in
+ * 'global' operation mode (t == NULL).
+ *
+ */
static int
ipfw_nat(struct ip_fw_args *args, struct cfg_nat *t, struct mbuf *m)
{
@@ -269,7 +276,6 @@ ipfw_nat(struct ip_fw_args *args, struct
found = 0;
chain = &V_layer3_chain;
- IPFW_RLOCK(chain);
/* Check every nat entry... */
LIST_FOREACH(t, &chain->nat, _next) {
if ((t->mode & PKT_ALIAS_SKIP_GLOBAL) != 0)
@@ -282,7 +288,6 @@ ipfw_nat(struct ip_fw_args *args, struct
break;
}
}
- IPFW_RUNLOCK(chain);
if (found != 1) {
/* No instance found, return ignore */
args->m = mcl;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241909 - head/lib/libc++
Author: dim
Date: Mon Oct 22 19:44:17 2012
New Revision: 241909
URL: http://svn.freebsd.org/changeset/base/241909
Log:
Allow building libc++ with any custom -std=xxx flag. Note that using
-std=gnu++98 will give a lot of warnings with clang, so please use
-std=c++0x or higher, or use NO_WERROR.
MFC after:1 week
Modified:
head/lib/libc++/Makefile
Modified: head/lib/libc++/Makefile
==
--- head/lib/libc++/MakefileMon Oct 22 19:22:31 2012(r241908)
+++ head/lib/libc++/MakefileMon Oct 22 19:44:17 2012(r241909)
@@ -53,7 +53,9 @@ cxxrt_${_S}:
WARNS= 0
CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT
+.if !defined(CXXFLAGS) || ${CXXFLAGS:M-std=*}" == ""
CXXFLAGS+= -std=c++0x
+.endif
DPADD= ${LIBCXXRT}
LDADD= -lcxxrt
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241823 - in head: . etc etc/atf etc/mtree lib lib/atf lib/atf/libatf-c lib/atf/libatf-c++ libexec libexec/atf libexec/atf/atf-check share share/atf share/doc share/doc/atf share/examp
On Mon, Oct 22, 2012 at 09:42:42AM -0700, Garrett Cooper wrote: G> On Mon, Oct 22, 2012 at 8:07 AM, Gleb Smirnoff wrote: G> > On Mon, Oct 22, 2012 at 01:18:41AM +, Marcel Moolenaar wrote: G> > M> Tinderbox breakages that are the result of this commit are entirely G> > M> the committer's fault -- in other words: buildworld testing on amd64 G> > M> only. G> > G> > Taking into account the fact that last couple of weeks head was usually G> > not buildable rather than buildable, I strongly disappreciate this. G> > G> > It looks to me as we are again treating head/ as a pile of stuff, G> > not as an operating system one can install and use. G> > G> > Now that we have a big choice of VCSes: svn user branches, git and G> > perforce, why isn't it possible to settle things in private branch G> > and only then commit them to the head/? G> G> I had been checking in changes to p4 over the last 4 months and then I G> ditched it for a local svn checkout when preparing the final patch G> that I sent to Marcel; I had run the patch in svn in two different G> sets of VMs in a make tinderbox manner several times. All but a G> handful of non-build critical items made it into this commit, and the G> only breakage that was present was accidental and affected ATF G> runtime. G> G> Maintaining all these moving pieces has proved challenging (esp. G> because I lack the scripts to track all of the changes that I had at G> IronPort with p4), and even then tracking new files in p4 is G> entertaining compared to svn, git, etc. This unnecessary complexity G> plus the fact that one needs p4 in order to collaborate with the G> changes I'm working on is the primary reason why I'm ditching it for G> git. G> G> The only breakage that's occurring now we've found is people using G> clang/libc++ (and libc++ looks like it has bugs that would have been G> caught with C++ applications written in a C++ standards-compliant G> manner) and various optimization levels which would not have raised G> red flags with make tinderbox in the first place. G> G> If there was a widespread (gcc and/or standard compiler/linker flags) G> issue with the build a) we would have seen it be now in the tinderbox G> emails and b) I would have CCed the current set of mailing lists so G> the issue would have been resolved quickly. The fact that it wasn't G> caught illustrates the fact that although we're trying to pilot clang G> as the default compiler by next month, there's a huge gap in required G> testing for commits. G> G> Looking forward, the major items for ATF have been committed. The rest G> of the patches which will be committed will be considerably smaller, G> targeted to specific components, and [for the most part, minus test G> integration in the tinderbox builds which will only be done after G> extensively testing is performed] will not affect the standard build G> process. G> G> Thank you for the concern though and I understand where you're coming from. Okay, now I see that you had did a lot of testing and my blame was ungrounded. Sorry. But the commit message from Marcel was so provocating such blame :) And probably I was also driven by the fact that I closed a number of build breakages last week, which weren't mine. Sorry again. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241897 - in head: . sys/sys
On Mon, Oct 22, 2012 at 07:28:42PM +0100, Attilio Rao wrote: A> On 10/22/12, Konstantin Belousov wrote: A> > Author: kib A> > Date: Mon Oct 22 17:54:32 2012 A> > New Revision: 241897 A> > URL: http://svn.freebsd.org/changeset/base/241897 A> > A> > Log: A> > Bump __FreeBSD_version and make a note in UPDATING about removal of A> > the support for non-MPSAFE filesystems. A> A> Also, the __FreeBSD_version bump can be used for FUSE import and A> NON-mpsafe filesystems removal as well. Can you please mention this in the doc repo, where we document __FreeBSD_version values? -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241913 - in head: . sys/net sys/netgraph sys/netinet sys/netinet6 sys/netipsec sys/netpfil/ipfw sys/netpfil/pf sys/sys
Author: glebius
Date: Mon Oct 22 21:09:03 2012
New Revision: 241913
URL: http://svn.freebsd.org/changeset/base/241913
Log:
Switch the entire IPv4 stack to keep the IP packet header
in network byte order. Any host byte order processing is
done in local variables and host byte order values are
never[1] written to a packet.
After this change a packet processed by the stack isn't
modified at all[2] except for TTL.
After this change a network stack hacker doesn't need to
scratch his head trying to figure out what is the byte order
at the given place in the stack.
[1] One exception still remains. The raw sockets convert host
byte order before pass a packet to an application. Probably
this would remain for ages for compatibility.
[2] The ip_input() still subtructs header len from ip->ip_len,
but this is planned to be fixed soon.
Reviewed by: luigi, Maxim Dounin
Tested by:ray, Olivier Cochard-Labbe
Modified:
head/UPDATING
head/sys/net/if_gre.c
head/sys/net/if_stf.c
head/sys/netgraph/ng_ipfw.c
head/sys/netinet/igmp.c
head/sys/netinet/in.h
head/sys/netinet/in_gif.c
head/sys/netinet/ip_carp.c
head/sys/netinet/ip_divert.c
head/sys/netinet/ip_gre.c
head/sys/netinet/ip_icmp.c
head/sys/netinet/ip_input.c
head/sys/netinet/ip_ipsec.c
head/sys/netinet/ip_mroute.c
head/sys/netinet/ip_options.c
head/sys/netinet/ip_output.c
head/sys/netinet/raw_ip.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_usrreq.c
head/sys/netinet/sctputil.c
head/sys/netinet/siftr.c
head/sys/netinet/tcp_debug.c
head/sys/netinet/tcp_input.c
head/sys/netinet/tcp_output.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_syncache.c
head/sys/netinet/tcp_timewait.c
head/sys/netinet/udp_usrreq.c
head/sys/netinet6/ip6_ipsec.c
head/sys/netipsec/ipsec.c
head/sys/netpfil/ipfw/ip_dn_io.c
head/sys/netpfil/ipfw/ip_fw2.c
head/sys/netpfil/ipfw/ip_fw_dynamic.c
head/sys/netpfil/ipfw/ip_fw_pfil.c
head/sys/netpfil/pf/if_pfsync.c
head/sys/netpfil/pf/pf.c
head/sys/sys/param.h
Modified: head/UPDATING
==
--- head/UPDATING Mon Oct 22 20:17:58 2012(r241912)
+++ head/UPDATING Mon Oct 22 21:09:03 2012(r241913)
@@ -24,6 +24,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20121023:
+ The IPv4 network stack has been converted to network byte
+ order. The following modules need to be recompiled together
+ with kernel: carp(4), divert(4), gif(4), siftr(4), gre(4),
+ pf(4), ipfw(4), ng_ipfw(4), stf(4).
+
20121022:
Support for non-MPSAFE filesystems was removed from VFS. The
VFS_VERSION was bumped, all filesystem modules shall be
Modified: head/sys/net/if_gre.c
==
--- head/sys/net/if_gre.c Mon Oct 22 20:17:58 2012(r241912)
+++ head/sys/net/if_gre.c Mon Oct 22 21:09:03 2012(r241913)
@@ -356,7 +356,7 @@ gre_output(struct ifnet *ifp, struct mbu
* RFC2004 specifies that fragmented diagrams shouldn't
* be encapsulated.
*/
- if (ip->ip_off & (IP_MF | IP_OFFMASK)) {
+ if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) {
_IF_DROP(&ifp->if_snd);
m_freem(m);
error = EINVAL;/* is there better errno? */
@@ -410,7 +410,7 @@ gre_output(struct ifnet *ifp, struct mbu
}
ip = mtod(m, struct ip *);
memcpy((caddr_t)(ip + 1), &mob_h, (unsigned)msiz);
- ip->ip_len = ntohs(ip->ip_len) + msiz;
+ ip->ip_len = htons(ntohs(ip->ip_len) + msiz);
} else { /* AF_INET */
_IF_DROP(&ifp->if_snd);
m_freem(m);
@@ -493,7 +493,7 @@ gre_output(struct ifnet *ifp, struct mbu
((struct ip*)gh)->ip_ttl = GRE_TTL;
((struct ip*)gh)->ip_tos = gre_ip_tos;
((struct ip*)gh)->ip_id = gre_ip_id;
- gh->gi_len = m->m_pkthdr.len;
+ gh->gi_len = htons(m->m_pkthdr.len);
}
ifp->if_opackets++;
Modified: head/sys/net/if_stf.c
==
--- head/sys/net/if_stf.c Mon Oct 22 20:17:58 2012(r241912)
+++ head/sys/net/if_stf.c Mon Oct 22 21:09:03 2012(r241913)
@@ -524,7 +524,7 @@ stf_output(ifp, m, dst, ro)
bcopy(&in4,
svn commit: r241914 - head/sys/kern
Author: ed Date: Mon Oct 22 21:14:26 2012 New Revision: 241914 URL: http://svn.freebsd.org/changeset/base/241914 Log: Remove unused `vfslocked' variable. I have no idea what this `vfslocked' thing means. I wonder how it ended up here. Modified: head/sys/kern/vfs_syscalls.c Modified: head/sys/kern/vfs_syscalls.c == --- head/sys/kern/vfs_syscalls.cMon Oct 22 21:09:03 2012 (r241913) +++ head/sys/kern/vfs_syscalls.cMon Oct 22 21:14:26 2012 (r241914) @@ -4507,10 +4507,9 @@ kern_posix_fallocate(struct thread *td, struct mount *mp; struct vnode *vp; off_t olen, ooffset; - int error, vfslocked; + int error; fp = NULL; - vfslocked = 0; error = fget(td, fd, CAP_WRITE, &fp); if (error != 0) goto out; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241916 - in head/sys: netinet netinet6
Author: delphij Date: Mon Oct 22 21:49:56 2012 New Revision: 241916 URL: http://svn.freebsd.org/changeset/base/241916 Log: Remove __P. Submitted by: kevlo Reviewed by: md5(1) MFC after:2 months Modified: head/sys/netinet/sctp_uio.h head/sys/netinet/sctp_var.h head/sys/netinet6/icmp6.c head/sys/netinet6/in6.c head/sys/netinet6/in6.h head/sys/netinet6/in6_gif.h head/sys/netinet6/in6_ifattach.h head/sys/netinet6/in6_pcb.h head/sys/netinet6/in6_src.c head/sys/netinet6/in6_var.h head/sys/netinet6/ip6_output.c head/sys/netinet6/ip6_var.h head/sys/netinet6/ip6protosw.h head/sys/netinet6/nd6.c head/sys/netinet6/nd6.h head/sys/netinet6/nd6_rtr.c head/sys/netinet6/pim6_var.h head/sys/netinet6/scope6_var.h head/sys/netinet6/sctp6_var.h head/sys/netinet6/tcp6_var.h Modified: head/sys/netinet/sctp_uio.h == --- head/sys/netinet/sctp_uio.h Mon Oct 22 21:26:36 2012(r241915) +++ head/sys/netinet/sctp_uio.h Mon Oct 22 21:49:56 2012(r241916) @@ -1267,44 +1267,44 @@ sctp_sorecvmsg(struct socket *so, #if !(defined(_KERNEL)) && !(defined(__Userspace__)) __BEGIN_DECLS -int sctp_peeloff __P((int, sctp_assoc_t)); -int sctp_bindx __P((int, struct sockaddr *, int, int)); -int sctp_connectx __P((int, const struct sockaddr *, int, sctp_assoc_t *)); -int sctp_getaddrlen __P((sa_family_t)); -int sctp_getpaddrs __P((int, sctp_assoc_t, struct sockaddr **)); -void sctp_freepaddrs __P((struct sockaddr *)); -int sctp_getladdrs __P((int, sctp_assoc_t, struct sockaddr **)); -void sctp_freeladdrs __P((struct sockaddr *)); -int sctp_opt_info __P((int, sctp_assoc_t, int, void *, socklen_t *)); +int sctp_peeloff(int, sctp_assoc_t); +int sctp_bindx(int, struct sockaddr *, int, int); +int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *); +int sctp_getaddrlen(sa_family_t); +int sctp_getpaddrs(int, sctp_assoc_t, struct sockaddr **); +void sctp_freepaddrs(struct sockaddr *); +int sctp_getladdrs(int, sctp_assoc_t, struct sockaddr **); +void sctp_freeladdrs(struct sockaddr *); +int sctp_opt_info(int, sctp_assoc_t, int, void *, socklen_t *); /* deprecated */ ssize_t sctp_sendmsg -__P((int, const void *, size_t, const struct sockaddr *, -socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t)); +(int, const void *, size_t, const struct sockaddr *, +socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t); /* deprecated */ - ssize_t sctp_send __P((int, const void *, size_t, - const struct sctp_sndrcvinfo *, int)); + ssize_t sctp_send(int, const void *, size_t, + const struct sctp_sndrcvinfo *, int); /* deprecated */ - ssize_t sctp_sendx __P((int, const void *, size_t, struct sockaddr *, - int, struct sctp_sndrcvinfo *, int)); + ssize_t sctp_sendx(int, const void *, size_t, struct sockaddr *, + int, struct sctp_sndrcvinfo *, int); /* deprecated */ - ssize_t sctp_sendmsgx __P((int sd, const void *, size_t, struct sockaddr *, - int, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t)); + ssize_t sctp_sendmsgx(int sd, const void *, size_t, struct sockaddr *, + int, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t); - sctp_assoc_t sctp_getassocid __P((int, struct sockaddr *)); + sctp_assoc_t sctp_getassocid(int, struct sockaddr *); /* deprecated */ - ssize_t sctp_recvmsg __P((int, void *, size_t, struct sockaddr *, socklen_t *, - struct sctp_sndrcvinfo *, int *)); + ssize_t sctp_recvmsg(int, void *, size_t, struct sockaddr *, socklen_t *, + struct sctp_sndrcvinfo *, int *); - ssize_t sctp_sendv __P((int, const struct iovec *, int, struct sockaddr *, - int, void *, socklen_t, unsigned int, int)); + ssize_t sctp_sendv(int, const struct iovec *, int, struct sockaddr *, + int, void *, socklen_t, unsigned int, int); - ssize_t sctp_recvv __P((int, const struct iovec *, int, struct sockaddr *, - socklen_t *, void *, socklen_t *, unsigned int *, int *)); + ssize_t sctp_recvv(int, const struct iovec *, int, struct sockaddr *, + socklen_t *, void *, socklen_t *, unsigned int *, int *); __END_DECLS Modified: head/sys/netinet/sctp_var.h == --- head/sys/netinet/sctp_var.h Mon Oct 22 21:26:36 2012(r241915) +++ head/sys/netinet/sctp_var.h Mon Oct 22 21:49:56 2012(r241916) @@ -322,29 +322,29 @@ struct sctphdr; void sctp_close(struct socket *so); int sctp_disconnect(struct socket *so); -void sctp_ctlinput __P((int, struct sockaddr *, void *)); -int sctp_ctloutput __P((struct socket *, struct sockopt *)); +void sctp_ctlinput(int, struct sockaddr *, void *); +int sctp_ctloutput(struct socket *, struct sockopt *);
svn commit: r241917 - in head/sys/dev: e1000 ixgbe sound/pci
Author: eadler
Date: Mon Oct 22 22:29:48 2012
New Revision: 241917
URL: http://svn.freebsd.org/changeset/base/241917
Log:
Now that device disabling is generic, remove extraneous code from the
device drivers that used to provide this feature.
This is a subset of 241856 (which was reverted)
Reviewed by: des
Approved by: cperciva (implicit)
MFC after:1 week
Modified:
head/sys/dev/e1000/if_lem.c
head/sys/dev/ixgbe/ixgbe.c
head/sys/dev/ixgbe/ixv.c
head/sys/dev/sound/pci/emu10kx.c
Modified: head/sys/dev/e1000/if_lem.c
==
--- head/sys/dev/e1000/if_lem.c Mon Oct 22 21:49:56 2012(r241916)
+++ head/sys/dev/e1000/if_lem.c Mon Oct 22 22:29:48 2012(r241917)
@@ -390,11 +390,6 @@ lem_attach(device_t dev)
INIT_DEBUGOUT("lem_attach: begin");
- if (resource_disabled("lem", device_get_unit(dev))) {
- device_printf(dev, "Disabled by device hint\n");
- return (ENXIO);
- }
-
adapter = device_get_softc(dev);
adapter->dev = adapter->osdep.dev = dev;
EM_CORE_LOCK_INIT(adapter, device_get_nameunit(dev));
Modified: head/sys/dev/ixgbe/ixgbe.c
==
--- head/sys/dev/ixgbe/ixgbe.c Mon Oct 22 21:49:56 2012(r241916)
+++ head/sys/dev/ixgbe/ixgbe.c Mon Oct 22 22:29:48 2012(r241917)
@@ -401,11 +401,6 @@ ixgbe_attach(device_t dev)
INIT_DEBUGOUT("ixgbe_attach: begin");
- if (resource_disabled("ixgbe", device_get_unit(dev))) {
- device_printf(dev, "Disabled by device hint\n");
- return (ENXIO);
- }
-
/* Allocate, clear, and link in our adapter structure */
adapter = device_get_softc(dev);
adapter->dev = adapter->osdep.dev = dev;
Modified: head/sys/dev/ixgbe/ixv.c
==
--- head/sys/dev/ixgbe/ixv.cMon Oct 22 21:49:56 2012(r241916)
+++ head/sys/dev/ixgbe/ixv.cMon Oct 22 22:29:48 2012(r241917)
@@ -299,11 +299,6 @@ ixv_attach(device_t dev)
INIT_DEBUGOUT("ixv_attach: begin");
- if (resource_disabled("ixgbe", device_get_unit(dev))) {
- device_printf(dev, "Disabled by device hint\n");
- return (ENXIO);
- }
-
/* Allocate, clear, and link in our adapter structure */
adapter = device_get_softc(dev);
adapter->dev = adapter->osdep.dev = dev;
Modified: head/sys/dev/sound/pci/emu10kx.c
==
--- head/sys/dev/sound/pci/emu10kx.cMon Oct 22 21:49:56 2012
(r241916)
+++ head/sys/dev/sound/pci/emu10kx.cMon Oct 22 22:29:48 2012
(r241917)
@@ -3050,11 +3050,6 @@ emu_pci_attach(device_t dev)
sc = device_get_softc(dev);
unit = device_get_unit(dev);
- if (resource_disabled("emu10kx", unit)) {
- device_printf(dev, "disabled by kernel hints\n");
- return (ENXIO); /* XXX to avoid unit reuse */
- }
-
/* Get configuration */
sc->ctx = device_get_sysctl_ctx(dev);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241918 - head/sys/dev/etherswitch/arswitch
Author: adrian
Date: Mon Oct 22 22:32:52 2012
New Revision: 241918
URL: http://svn.freebsd.org/changeset/base/241918
Log:
Don't try to cache the page setting - always set the page before
doing a switch register read/write.
PR: kern/172968
Modified:
head/sys/dev/etherswitch/arswitch/arswitch_reg.c
Modified: head/sys/dev/etherswitch/arswitch/arswitch_reg.c
==
--- head/sys/dev/etherswitch/arswitch/arswitch_reg.cMon Oct 22 22:29:48
2012(r241917)
+++ head/sys/dev/etherswitch/arswitch/arswitch_reg.cMon Oct 22 22:32:52
2012(r241918)
@@ -72,10 +72,17 @@ arswitch_split_setpage(device_t dev, uin
*phy = (((addr) >> 6) & 0x07) | 0x10;
*reg = ((addr) >> 1) & 0x1f;
- if (sc->page != page) {
- MDIO_WRITEREG(device_get_parent(dev), 0x18, 0, page);
- sc->page = page;
- }
+ /*
+* The earlier code would only switch the page
+* over if the page were different. Experiments have
+* shown that this is unstable.
+*
+* Hence, the page is always set here.
+*
+* See PR kern/172968
+*/
+ MDIO_WRITEREG(device_get_parent(dev), 0x18, 0, page);
+ sc->page = page;
}
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241919 - head/sys/netipsec
Author: glebius
Date: Mon Oct 22 22:42:28 2012
New Revision: 241919
URL: http://svn.freebsd.org/changeset/base/241919
Log:
Couple of changes missed from r241913, which converted
IPv4 stack to network byte order.
Modified:
head/sys/netipsec/ipsec_output.c
head/sys/netipsec/xform_ah.c
Modified: head/sys/netipsec/ipsec_output.c
==
--- head/sys/netipsec/ipsec_output.cMon Oct 22 22:32:52 2012
(r241918)
+++ head/sys/netipsec/ipsec_output.cMon Oct 22 22:42:28 2012
(r241919)
@@ -197,18 +197,14 @@ ipsec_process_done(struct mbuf *m, struc
*/
switch (saidx->dst.sa.sa_family) {
#ifdef INET
- struct ip *ip;
case AF_INET:
- ip = mtod(m, struct ip *);
- ip->ip_len = ntohs(ip->ip_len);
- ip->ip_off = ntohs(ip->ip_off);
-
#ifdef IPSEC_NAT_T
/*
* If NAT-T is enabled, now that all IPsec processing is done
* insert UDP encapsulation header after IP header.
*/
if (sav->natt_type) {
+ struct ip *ip = mtod(m, struct ip *);
#ifdef _IP_VHL
const int hlen = IP_VHL_HL(ip->ip_vhl);
#else
@@ -246,7 +242,7 @@ ipsec_process_done(struct mbuf *m, struc
udp->uh_dport = KEY_PORTFROMSADDR(&sav->sah->saidx.dst);
udp->uh_sum = 0;
udp->uh_ulen = htons(m->m_pkthdr.len - hlen);
- ip->ip_len = m->m_pkthdr.len;
+ ip->ip_len = htons(m->m_pkthdr.len);
ip->ip_p = IPPROTO_UDP;
if (sav->natt_type == UDP_ENCAP_ESPINUDP_NON_IKE)
Modified: head/sys/netipsec/xform_ah.c
==
--- head/sys/netipsec/xform_ah.cMon Oct 22 22:32:52 2012
(r241918)
+++ head/sys/netipsec/xform_ah.cMon Oct 22 22:42:28 2012
(r241919)
@@ -305,23 +305,13 @@ ah_massage_headers(struct mbuf **m0, int
ip->ip_ttl = 0;
ip->ip_sum = 0;
- /*
-* On input, fix ip_len which has been byte-swapped
-* at ip_input().
-*/
- if (!out) {
- ip->ip_len = htons(ip->ip_len + skip);
+ if (!out)
+ ip->ip_len = htons(ntohs(ip->ip_len) + skip);
- if (alg == CRYPTO_MD5_KPDK || alg == CRYPTO_SHA1_KPDK)
- ip->ip_off = htons(ip->ip_off & IP_DF);
- else
- ip->ip_off = 0;
- } else {
- if (alg == CRYPTO_MD5_KPDK || alg == CRYPTO_SHA1_KPDK)
- ip->ip_off = htons(ntohs(ip->ip_off) & IP_DF);
- else
- ip->ip_off = 0;
- }
+ if (alg == CRYPTO_MD5_KPDK || alg == CRYPTO_SHA1_KPDK)
+ ip->ip_off &= htons(IP_DF);
+ else
+ ip->ip_off = htons(0);
ptr = mtod(m, unsigned char *) + sizeof(struct ip);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r241920 - head/sys/powerpc/conf
Author: rpaulo Date: Tue Oct 23 02:20:11 2012 New Revision: 241920 URL: http://svn.freebsd.org/changeset/base/241920 Log: Remove compat options. Submitted by: netchild Modified: head/sys/powerpc/conf/WII Modified: head/sys/powerpc/conf/WII == --- head/sys/powerpc/conf/WII Mon Oct 22 22:42:28 2012(r241919) +++ head/sys/powerpc/conf/WII Tue Oct 23 02:20:11 2012(r241920) @@ -32,10 +32,6 @@ options PROCFS #Process filesystem (r optionsPSEUDOFS#Pseudo-filesystem framework optionsGEOM_PART_GPT #GUID Partition Tables. optionsGEOM_LABEL #Provides labelization -optionsCOMPAT_FREEBSD4 #Keep this for a while -optionsCOMPAT_FREEBSD5 #Compatible with FreeBSD5 -optionsCOMPAT_FREEBSD6 #Compatible with FreeBSD6 -optionsCOMPAT_FREEBSD7 #Compatible with FreeBSD7 optionsSCSI_DELAY=5000 #Delay (in ms) before probing SCSI optionsKTRACE #ktrace(1) syscall trace support optionsSTACK #stack(9) support ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241913 - in head: . sys/net sys/netgraph sys/netinet sys/netinet6 sys/netipsec sys/netpfil/ipfw sys/netpfil/pf sys/sys
On Mon, Oct 22, 2012 at 09:09:04PM +, Gleb Smirnoff wrote: > Author: glebius > Date: Mon Oct 22 21:09:03 2012 > New Revision: 241913 > URL: http://svn.freebsd.org/changeset/base/241913 > > Log: > Switch the entire IPv4 stack to keep the IP packet header > in network byte order. Any host byte order processing is well done! cheers luigi ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r241916 - in head/sys: netinet netinet6
On Mon, 22 Oct 2012, Xin LI wrote: Log: Remove __P. This was a chance to remove style bugs in the prototypes. At least it didn't create so many new ones, unlike the original __P axing. It still enlarged about a hundred by changing from Gnu style continuation to Gnu style continuation indentation with an off-by-5 error. Modified: head/sys/netinet/sctp_uio.h == --- head/sys/netinet/sctp_uio.h Mon Oct 22 21:26:36 2012(r241915) +++ head/sys/netinet/sctp_uio.h Mon Oct 22 21:49:56 2012(r241916) @@ -1267,44 +1267,44 @@ sctp_sorecvmsg(struct socket *so, #if !(defined(_KERNEL)) && !(defined(__Userspace__)) __BEGIN_DECLS -int sctp_peeloff __P((int, sctp_assoc_t)); -int sctp_bindx __P((int, struct sockaddr *, int, int)); -int sctp_connectx __P((int, const struct sockaddr *, int, sctp_assoc_t *)); -int sctp_getaddrlen __P((sa_family_t)); -int sctp_getpaddrs __P((int, sctp_assoc_t, struct sockaddr **)); -void sctp_freepaddrs __P((struct sockaddr *)); -int sctp_getladdrs __P((int, sctp_assoc_t, struct sockaddr **)); -void sctp_freeladdrs __P((struct sockaddr *)); -int sctp_opt_info __P((int, sctp_assoc_t, int, void *, socklen_t *)); +int sctp_peeloff(int, sctp_assoc_t); +int sctp_bindx(int, struct sockaddr *, int, int); +int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *); +int sctp_getaddrlen(sa_family_t); +int sctp_getpaddrs(int, sctp_assoc_t, struct sockaddr **); +void sctp_freepaddrs(struct sockaddr *); +int sctp_getladdrs(int, sctp_assoc_t, struct sockaddr **); +void sctp_freeladdrs(struct sockaddr *); +int sctp_opt_info(int, sctp_assoc_t, int, void *, socklen_t *); sctp is fairly consistent in having style bugs on every line. It never indented fucntion names in prototypes. /* deprecated */ ssize_t sctp_sendmsg -__P((int, const void *, size_t, const struct sockaddr *, -socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t)); +(int, const void *, size_t, const struct sockaddr *, +socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t); Putting the __P(( unindented on a new line was weird. It is weirder now with the __P( part. /* deprecated */ - ssize_t sctp_send __P((int, const void *, size_t, - const struct sctp_sndrcvinfo *, int)); + ssize_t sctp_send(int, const void *, size_t, + const struct sctp_sndrcvinfo *, int); Continuation lines were weirdly indented in at least this part of sctp. This one uses 14 spaces, underneath a line with 1 tab. 1 tab followed by 4 spaces would be normal. Since the 14 spaces didn't line up with anything, removing __P( leaves the continuation line not lined up with anything slightly differently. ... /* deprecated */ - ssize_t sctp_recvmsg __P((int, void *, size_t, struct sockaddr *, socklen_t *, - struct sctp_sndrcvinfo *, int *)); + ssize_t sctp_recvmsg(int, void *, size_t, struct sockaddr *, socklen_t *, + struct sctp_sndrcvinfo *, int *); Here there are 17 spaces instead of 14. Modified: head/sys/netinet6/icmp6.c == --- head/sys/netinet6/icmp6.c Mon Oct 22 21:26:36 2012(r241915) +++ head/sys/netinet6/icmp6.c Mon Oct 22 21:49:56 2012(r241916) @@ -133,15 +133,15 @@ VNET_DECLARE(int, icmp6_nodeinfo); static void icmp6_errcount(struct icmp6errstat *, int, int); static int icmp6_rip6_input(struct mbuf **, int); static int icmp6_ratelimit(const struct in6_addr *, const int, const int); -static const char *icmp6_redirect_diag __P((struct in6_addr *, - struct in6_addr *, struct in6_addr *)); +static const char *icmp6_redirect_diag(struct in6_addr *, + struct in6_addr *, struct in6_addr *); Function names not indented. Continuation lines indented abnormally with 1 tab so that it doesn't line up with anything. static struct mbuf *ni6_input(struct mbuf *, int); static struct mbuf *ni6_nametodns(const char *, int, int); static int ni6_dnsmatch(const char *, int, const char *, int); -static int ni6_addrs __P((struct icmp6_nodeinfo *, struct mbuf *, - struct ifnet **, struct in6_addr *)); -static int ni6_store_addrs __P((struct icmp6_nodeinfo *, struct icmp6_nodeinfo *, - struct ifnet *, int)); Here the continuation lines were indented abnormally but using Gnu style (indent -lp) so that they lined up with the parantheses using a mixture of tabs and spaces. +static int ni6_addrs(struct icmp6_nodeinfo *, struct mbuf *, + struct ifnet **, struct in6_addr *); +static int ni6_store_addrs(struct icmp6_nodeinfo *, struct icmp6_nodeinfo *, + struct ifnet *, int); Now after removing __P( and closing up a space, the contination lines don't even follow Gnu style, but are off by 5 spaces. static int icmp6_notify_error(struct mbuf **, int, int
Re: svn commit: r241755 - head/lib/msun/src
On Mon, 22 Oct 2012, Warner Losh wrote: On Oct 22, 2012, at 7:40 AM, Steve Kargl wrote: ... BTW, besides bde's technical points, your change made our sources different from OpenBSD, NetBSD, and new project openlibm. Diffing against the other trees would become cluttered. BDE's technical points vary in quality and are difficult to argue with since they are so nit-picky. :( I'd be happy to work through them, but some of the issues I just fundamentally disagree with. Since I backed out the comments, I've decided not to spend the time arguing, but do think that documenting the differences between the precisions would be good. I started down this path because I thought expf was broken because it didn't match exp exactly... However, since he's implementing a new one, wouldn't that also have diffability issues too? Steve is implementing it :-). It would be completely different. It is already implemented, not quite perfectly, for expl(), and diffs between that version and the float and double versions are unreadable. Changing the float and double versions to be like it would make the diffs readable again. Imperfections in it include its documentation consisting mainly of a pointer to a much further-away place than a nearby source file -- to a paper by Tang which is still behind the ACM paywall AFAIK. It is slightly simpler and more general than the fdlibm version (no transformation through the apparently-magic R(z)), and well documented by the paper, so it is easier to understand iff you have seen the paper or know the general details. Starting from scratch, I wouldn't go this way. Translating the fdlibm exp() directly to expl() would have given a good enough version. Similarly for all functions in fdlibm. The double precision versions aren't perfect, but they are mostly good or very good. (It's interesting that they keep getting better with each generation of x86, because each generation has better support for the type of bit fiddling that the fdlibm functions like to do. Better means often taking 1/2 or 1/3 as many cycles relative to the 2002 generation of x86's, mainly by reducing pipeline stalls in instructions that fdlibm probably liked to use because they were fast on sparc in 1992, but were slow on x86 in 1992 and became relatively slower with pipelines on x86.) But Steve didn't understand the fdlibm version when he started, and didn't like the looks of it, so he wrote a completely different version. We now have a version that is so much better than the fdlibm version that it is silly to keep using the fdlibm version. It takes about the same time for expl() as for expf(), to create about 3 times as many accurate bits internally and deliver 64 of them (it would be useful to deliver more, but the API for this isn't established and expf() doesn't have any more to deliver). (This is for ld80; ld128 on at least sparc64 is so slow that it is unusable for almost all purposes and especially unusable for optimizing expf().) Normally, using the same algorithm, you have to work hard for long double precision to be less than 4 times slower than float precision. Note that i386 doesn't even use fdlibm for exp(). It uses the i387 for "efficiency". But with newer x86, even fdlibm's slow version is faster than the i387. We never used the i387 for expf() on i386 because optimizing expf() wasn't considered important until after x86's became new enough for their hardware expf to be slower than fdlibm software expf, though we almost imported this from NetBSD. The i387 is unusable for expl() on i386 since it is barely accurate enough for exp(). Lots of other i387 "optimized" versions on i386 should be removed. There are just a couple of them that are more efficient or more accurate (usually not both) than the fdlibm versions on modern x86. amd64 never used most of the ones that should be removed, though they would have been relatively more accurate for amd64. But it takes courage to axe working versions :-). Bruce ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
