svn commit: r228758 - head/sys/dev/usb
Author: hselasky
Date: Wed Dec 21 08:46:08 2011
New Revision: 228758
URL: http://svn.freebsd.org/changeset/base/228758
Log:
Fix for race against user-space applications trying to change the
configuration on USB HUBs.
PR: kern/163091
MFC after:1 week
Modified:
head/sys/dev/usb/usb_hub.c
Modified: head/sys/dev/usb/usb_hub.c
==
--- head/sys/dev/usb/usb_hub.c Wed Dec 21 02:45:51 2011(r228757)
+++ head/sys/dev/usb/usb_hub.c Wed Dec 21 08:46:08 2011(r228758)
@@ -707,6 +707,13 @@ uhub_explore(struct usb_device *udev)
DPRINTF(Device is suspended!\n);
return (0);
}
+
+ /*
+* Make sure we don't race against user-space applications
+* like LibUSB:
+*/
+ usbd_enum_lock(udev);
+
for (x = 0; x != hub-nports; x++) {
up = hub-ports + x;
portno = x + 1;
@@ -784,6 +791,8 @@ uhub_explore(struct usb_device *udev)
up-restartcnt = 0;
}
+ usbd_enum_unlock(udev);
+
/* initial status checked */
sc-sc_flags |= UHUB_FLAG_DID_EXPLORE;
___
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: r228760 - head/sys/dev/usb
Author: avg
Date: Wed Dec 21 10:52:17 2011
New Revision: 228760
URL: http://svn.freebsd.org/changeset/base/228760
Log:
adapt usb transfer code for SCHEDULER_STOPPED
When SCHEDULER_STOPPED() is true the mtx_owned() call may return
an unexpected and thus meaningless result.
So, in the code paths that can be reached when SCHEDULER_STOPPED() is true
we need to protect the mtx_owned() calls with the SCHEDULER_STOPPED()
checks and ensure that an appropriate branch is taken in each case.
Reviewed by: hselasky
MFC after:3 months
X-MFC after: r228424
Modified:
head/sys/dev/usb/usb_transfer.c
Modified: head/sys/dev/usb/usb_transfer.c
==
--- head/sys/dev/usb/usb_transfer.c Wed Dec 21 09:08:41 2011
(r228759)
+++ head/sys/dev/usb/usb_transfer.c Wed Dec 21 10:52:17 2011
(r228760)
@@ -2150,7 +2150,7 @@ usbd_callback_wrapper(struct usb_xfer_qu
struct usb_xfer_root *info = xfer-xroot;
USB_BUS_LOCK_ASSERT(info-bus, MA_OWNED);
- if (!mtx_owned(info-xfer_mtx)) {
+ if (!mtx_owned(info-xfer_mtx) !SCHEDULER_STOPPED()) {
/*
* Cases that end up here:
*
@@ -3119,14 +3119,14 @@ usbd_transfer_poll(struct usb_xfer **ppx
/* make sure that the BUS mutex is not locked */
drop_bus = 0;
- while (mtx_owned(xroot-udev-bus-bus_mtx)) {
+ while (mtx_owned(xroot-udev-bus-bus_mtx)
!SCHEDULER_STOPPED()) {
mtx_unlock(xroot-udev-bus-bus_mtx);
drop_bus++;
}
/* make sure that the transfer mutex is not locked */
drop_xfer = 0;
- while (mtx_owned(xroot-xfer_mtx)) {
+ while (mtx_owned(xroot-xfer_mtx) !SCHEDULER_STOPPED()) {
mtx_unlock(xroot-xfer_mtx);
drop_xfer++;
}
___
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: r228762 - head/contrib/libarchive
Author: mm Date: Wed Dec 21 11:11:51 2011 New Revision: 228762 URL: http://svn.freebsd.org/changeset/base/228762 Log: Add FREEBSD-Xlist and FREEBSD-upgrade to contrib/libarchive MFC after:2 weeks Added: head/contrib/libarchive/FREEBSD-Xlist (contents, props changed) head/contrib/libarchive/FREEBSD-upgrade (contents, props changed) Added: head/contrib/libarchive/FREEBSD-Xlist == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/libarchive/FREEBSD-Xlist Wed Dec 21 11:11:51 2011 (r228762) @@ -0,0 +1,25 @@ +$FreeBSD$ +CMakeLists.txt +CTestConfig.cmake +INSTALL +Makefile.am +build +configure.ac +contrib +cpio/CMakeLists.txt +cpio/cpio_windows.c +cpio/cpio_windows.h +cpio/test/CMakeLists.txt +doc +examples +libarchive/CMakeLists.txt +libarchive/archive_windows.c +libarchive/archive_windows.h +libarchive/filter_fork_windows.c +libarchive/test/.cvsignore +libarchive/test/CMakeLists.txt +tar/CMakeLists.txt +tar/bsdtar_windows.c +tar/bsdtar_windows.h +tar/test/CMakeLists.txt +tar/test/test_windows.c Added: head/contrib/libarchive/FREEBSD-upgrade == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/libarchive/FREEBSD-upgrade Wed Dec 21 11:11:51 2011 (r228762) @@ -0,0 +1,24 @@ +$FreeBSD$ + +libarchive + +The source code is pulled with svn: + + svn checkout http://libarchive.googlecode.com/svn/release/2.8 + +For the contrib directory files and directories were pruned by: + +sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' + +You may check if there are any new files that we don't need. + +The instructions for importing new release and merging to HEAD can be found +at FreeBSD wiki: + + http://wiki.freebsd.org/SubversionPrimer/VendorImports + +To make local changes to xz, simply patch and commit to the trunk +branch (aka HEAD). Never make local changes on the vendor branch. + +m...@freebsd.org +21-December-2011 ___ 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: r228764 - in head/contrib/libarchive: . build contrib cpio cpio/test doc examples libarchive libarchive/test tar tar/test
Author: mm Date: Wed Dec 21 11:18:49 2011 New Revision: 228764 URL: http://svn.freebsd.org/changeset/base/228764 Log: Strip unnecessary files and directories from contrib/libarchive according to FREEBSD-Xlist MFC after:2 weeks Deleted: head/contrib/libarchive/CMakeLists.txt head/contrib/libarchive/CTestConfig.cmake head/contrib/libarchive/INSTALL head/contrib/libarchive/Makefile.am head/contrib/libarchive/build/ head/contrib/libarchive/configure.ac head/contrib/libarchive/contrib/ head/contrib/libarchive/cpio/CMakeLists.txt head/contrib/libarchive/cpio/cpio_windows.c head/contrib/libarchive/cpio/cpio_windows.h head/contrib/libarchive/cpio/test/CMakeLists.txt head/contrib/libarchive/doc/ head/contrib/libarchive/examples/ head/contrib/libarchive/libarchive/CMakeLists.txt head/contrib/libarchive/libarchive/archive_windows.c head/contrib/libarchive/libarchive/archive_windows.h head/contrib/libarchive/libarchive/filter_fork_windows.c head/contrib/libarchive/libarchive/test/.cvsignore head/contrib/libarchive/libarchive/test/CMakeLists.txt head/contrib/libarchive/tar/CMakeLists.txt head/contrib/libarchive/tar/bsdtar_windows.c head/contrib/libarchive/tar/bsdtar_windows.h head/contrib/libarchive/tar/test/CMakeLists.txt head/contrib/libarchive/tar/test/test_windows.c ___ 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: r228765 - head/sys/dev/usb/input
Author: avg
Date: Wed Dec 21 11:49:33 2011
New Revision: 228765
URL: http://svn.freebsd.org/changeset/base/228765
Log:
ukbd: adjust for SCHEDULER_STOPPED() and overhaul locking code
This change is designed to let USB keyboard work in the panic context
with stop_scheduler_on_panic=1. Most of change consists of removing
mtx_owned() checks where they can be easily avoided. Some additional
lock cleanup is performed along the way.
A list of the smaller changes:
- newbus methods should be executed with Giant already held, just assert
this
- kbd methods called in the non-polling context should be executed with
Giant already held, just assert this
- Giant is recursive, so we should just take it where we must have it,
without redundant checks if we already have it
- thanks to recent syscons changes we don't need to go through the hoops
to detect if kernel is going to poll us; polling mode is now clearly
separated from non-polling mode
- at present the polling mode can be entered by only one thread
- document special cases in greater detail
Please note that the ukbd code and underlying USB code still lve
dangerously in the kdb context by trying to obtain various locks
including the Giant. If any of those locks are already held by the
stopped threads, then the things would blow up.
Another limitation of the ukbd driver is that it is detached before a
system enters the halt state.
With this commit we can enable kern.stop_scheduler_on_panic by default,
that should not introduce any regressions.
Reviewed by: hselasky
MFC after:3 months
X-MFC after: r228424, r228760
Modified:
head/sys/dev/usb/input/ukbd.c
Modified: head/sys/dev/usb/input/ukbd.c
==
--- head/sys/dev/usb/input/ukbd.c Wed Dec 21 11:18:49 2011
(r228764)
+++ head/sys/dev/usb/input/ukbd.c Wed Dec 21 11:49:33 2011
(r228765)
@@ -198,7 +198,6 @@ struct ukbd_softc {
int sc_mode;/* input mode (K_XLATE,K_RAW,K_CODE) */
int sc_state; /* shift/lock key state */
int sc_accents; /* accent key index ( 0) */
- int sc_poll_tick_last;
int sc_led_size;
int sc_kbd_size;
@@ -227,7 +226,6 @@ struct ukbd_softc {
uint8_t sc_id_events;
uint8_t sc_kbd_id;
- uint8_t sc_poll_detected;
uint8_t sc_buffer[UKBD_BUFFER_SIZE];
};
@@ -247,6 +245,33 @@ struct ukbd_softc {
SCAN_PREFIX_CTL | SCAN_PREFIX_SHIFT)
#defineSCAN_CHAR(c)((c) 0x7f)
+#defineUKBD_LOCK() mtx_lock(Giant)
+#defineUKBD_UNLOCK() mtx_unlock(Giant)
+
+#ifdef INVARIANTS
+
+/*
+ * Assert that the lock is held in all contexts
+ * where the code can be executed.
+ */
+#defineUKBD_LOCK_ASSERT() mtx_assert(Giant, MA_OWNED)
+
+/*
+ * Assert that the lock is held in the contexts
+ * where it really has to be so.
+ */
+#defineUKBD_CTX_LOCK_ASSERT() \
+ do {\
+ if (!kdb_active panicstr == NULL)\
+ mtx_assert(Giant, MA_OWNED); \
+ } while (0)
+#else
+
+#define UKBD_LOCK_ASSERT() (void)0
+#define UKBD_CTX_LOCK_ASSERT() (void)0
+
+#endif
+
struct ukbd_mods {
uint32_t mask, key;
};
@@ -339,8 +364,6 @@ static int ukbd_ioctl(keyboard_t *, u_lo
static int ukbd_enable(keyboard_t *);
static int ukbd_disable(keyboard_t *);
static voidukbd_interrupt(struct ukbd_softc *);
-static int ukbd_is_polling(struct ukbd_softc *);
-static int ukbd_polls_other_thread(struct ukbd_softc *);
static voidukbd_event_keyinput(struct ukbd_softc *);
static device_probe_t ukbd_probe;
@@ -370,7 +393,8 @@ ukbd_start_timer(struct ukbd_softc *sc)
static void
ukbd_put_key(struct ukbd_softc *sc, uint32_t key)
{
- mtx_assert(Giant, MA_OWNED);
+
+ UKBD_CTX_LOCK_ASSERT();
DPRINTF(0x%02x (%d) %s\n, key, key,
(key KEY_RELEASE) ? released : pressed);
@@ -388,52 +412,32 @@ ukbd_put_key(struct ukbd_softc *sc, uint
}
static void
-ukbd_yield(void)
-{
- struct thread *td = curthread;
- uint32_t old_prio;
-
- DROP_GIANT();
-
- thread_lock(td);
-
- /* get current priority */
- old_prio = td-td_base_pri;
-
- /* set new priority */
- sched_prio(td, td-td_user_pri);
-
- /* cause a task switch */
- mi_switch(SW_INVOL | SWT_RELINQUISH, NULL);
-
- /* restore priority */
- sched_prio(td, old_prio);
-
- thread_unlock(td);
-
- PICKUP_GIANT();
-}
-
-static void
ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait)
{
- DPRINTFN(2, polling\n);
- /* update stats about last polling event */
- sc-sc_poll_tick_last = ticks;
- sc-sc_poll_detected = 1;
+
svn commit: r228766 - head/usr.bin/mkesdb
Author: gabor
Date: Wed Dec 21 12:07:14 2011
New Revision: 228766
URL: http://svn.freebsd.org/changeset/base/228766
Log:
- Remove a GCC-specific compiler flag that was added before to eliminate
some warnings but at the moment does not seem to be necessary.
Submitted by: arundel (via private mail)
Tested by:arundel
MFC after:1 week
Modified:
head/usr.bin/mkesdb/Makefile.inc
Modified: head/usr.bin/mkesdb/Makefile.inc
==
--- head/usr.bin/mkesdb/Makefile.incWed Dec 21 11:49:33 2011
(r228765)
+++ head/usr.bin/mkesdb/Makefile.incWed Dec 21 12:07:14 2011
(r228766)
@@ -2,5 +2,4 @@
SRCS+= lex.l yacc.y
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkesdb \
--I${.CURDIR}/../../lib/libc/iconv \
---param max-inline-insns-single=64
+-I${.CURDIR}/../../lib/libc/iconv
___
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: r228767 - head/sys/dev/syscons
Author: avg
Date: Wed Dec 21 12:21:22 2011
New Revision: 228767
URL: http://svn.freebsd.org/changeset/base/228767
Log:
sc_cngrab: switch to console vty when possible
In the future we may want to perform the switch even if the console is
currently in the graphics mode by trying to reset the video adapter first
(e.g. by executing vesa/vga bios post). That would probably require
some sort of a one-way flag as returning the control of the console back
to the interrupted application most likely would result in a mess.
Reviewed by: emaste
MFC after:2 months
Modified:
head/sys/dev/syscons/syscons.c
Modified: head/sys/dev/syscons/syscons.c
==
--- head/sys/dev/syscons/syscons.c Wed Dec 21 12:07:14 2011
(r228766)
+++ head/sys/dev/syscons/syscons.c Wed Dec 21 12:21:22 2011
(r228767)
@@ -1615,7 +1615,14 @@ sc_cngrab(struct consdev *cp)
{
scr_stat *scp;
+if (!cold
+ sc_console-sc-cur_scp-index != sc_console-index
+ sc_console-sc-cur_scp-smode.mode == VT_AUTO
+ sc_console-smode.mode == VT_AUTO)
+ sc_switch_scr(sc_console-sc, sc_console-index);
+
scp = sc_console-sc-cur_scp;
+
if (scp-sc-kbd == NULL)
return;
___
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: r228768 - in head/sys: net netinet netinet6 sys
Author: glebius
Date: Wed Dec 21 12:39:08 2011
New Revision: 228768
URL: http://svn.freebsd.org/changeset/base/228768
Log:
Provide ABI compatibility shim to enable configuring of addresses
with ifconfig(8) prior to r228571.
Requested by: brooks
Modified:
head/sys/net/if.h
head/sys/netinet/in.c
head/sys/netinet6/in6.c
head/sys/netinet6/in6_var.h
head/sys/sys/sockio.h
Modified: head/sys/net/if.h
==
--- head/sys/net/if.h Wed Dec 21 12:21:22 2011(r228767)
+++ head/sys/net/if.h Wed Dec 21 12:39:08 2011(r228768)
@@ -362,6 +362,14 @@ struct ifaliasreq {
int ifra_vhid;
};
+/* Compat with pre-10.x */
+struct oifaliasreq {
+ charifra_name[IFNAMSIZ];
+ struct sockaddr ifra_addr;
+ struct sockaddr ifra_broadaddr;
+ struct sockaddr ifra_mask;
+};
+
struct ifmediareq {
charifm_name[IFNAMSIZ]; /* if name, e.g. en0 */
int ifm_current;/* current media options */
Modified: head/sys/netinet/in.c
==
--- head/sys/netinet/in.c Wed Dec 21 12:21:22 2011(r228767)
+++ head/sys/netinet/in.c Wed Dec 21 12:39:08 2011(r228768)
@@ -223,6 +223,14 @@ in_control(struct socket *so, u_long cmd
struct sockaddr_in oldaddr;
int error, hostIsNew, iaIsNew, maskIsNew;
int iaIsFirst;
+ u_long ocmd = cmd;
+
+ /*
+* Pre-10.x compat: OSIOCAIFADDR passes a shorter
+* struct in_aliasreq, without ifra_vhid.
+*/
+ if (cmd == OSIOCAIFADDR)
+ cmd = SIOCAIFADDR;
ia = NULL;
iaIsFirst = 0;
@@ -253,10 +261,18 @@ in_control(struct socket *so, u_long cmd
sizeof(struct sockaddr_in) ||
ifra-ifra_broadaddr.sin_family != AF_INET))
return (EINVAL);
+#if 0
+ /*
+* ifconfig(8) in pre-10.x doesn't set sin_family for the
+* mask. The code is disabled for the 10.x timeline, to
+* make SIOCAIFADDR compatible with 9.x ifconfig(8).
+* The code should be enabled in 11.x
+*/
if (ifra-ifra_mask.sin_len != 0
(ifra-ifra_mask.sin_len != sizeof(struct sockaddr_in) ||
ifra-ifra_mask.sin_family != AF_INET))
return (EINVAL);
+#endif
break;
case SIOCSIFADDR:
case SIOCSIFBRDADDR:
@@ -564,7 +580,7 @@ in_control(struct socket *so, u_long cmd
}
if (hostIsNew || maskIsNew)
error = in_ifinit(ifp, ia, ifra-ifra_addr, 0,
- maskIsNew, ifra-ifra_vhid);
+ maskIsNew, (ocmd == cmd ? ifra-ifra_vhid : 0));
if (error != 0 iaIsNew)
break;
Modified: head/sys/netinet6/in6.c
==
--- head/sys/netinet6/in6.c Wed Dec 21 12:21:22 2011(r228767)
+++ head/sys/netinet6/in6.c Wed Dec 21 12:39:08 2011(r228768)
@@ -275,6 +275,13 @@ in6_control(struct socket *so, u_long cm
struct sockaddr_in6 *sa6;
int carp_attached = 0;
int error;
+ u_long ocmd = cmd;
+
+ /*
+* Compat to make pre-10.x ifconfig(8) operable.
+*/
+ if (cmd == OSIOCAIFADDR_IN6)
+ cmd = SIOCAIFADDR_IN6;
switch (cmd) {
case SIOCGETSGCNT_IN6:
@@ -654,7 +661,7 @@ in6_control(struct socket *so, u_long cm
break;
}
- if (ifra-ifra_vhid 0) {
+ if (cmd == ocmd ifra-ifra_vhid 0) {
if (carp_attach_p != NULL)
error = (*carp_attach_p)(ia-ia_ifa,
ifra-ifra_vhid);
Modified: head/sys/netinet6/in6_var.h
==
--- head/sys/netinet6/in6_var.h Wed Dec 21 12:21:22 2011(r228767)
+++ head/sys/netinet6/in6_var.h Wed Dec 21 12:39:08 2011(r228768)
@@ -290,6 +290,16 @@ struct in6_aliasreq {
int ifra_vhid;
};
+/* pre-10.x compat */
+struct oin6_aliasreq {
+ charifra_name[IFNAMSIZ];
+ struct sockaddr_in6 ifra_addr;
+ struct sockaddr_in6 ifra_dstaddr;
+ struct sockaddr_in6 ifra_prefixmask;
+ int ifra_flags;
+ struct in6_addrlifetime ifra_lifetime;
+};
+
/* prefix type macro */
#define IN6_PREFIX_ND 1
#define IN6_PREFIX_RR 2
@@ -410,7 +420,8 @@ struct in6_rrenumreq {
#define SIOCGIFNETMASK_IN6 _IOWR('i', 37, struct in6_ifreq)
#define SIOCDIFADDR_IN6 _IOW('i', 25, struct in6_ifreq)
-#define SIOCAIFADDR_IN6 _IOW('i', 26,
Re: svn commit: r228143 - in head: . share/mk tools/build/options
On 12/20/11 9:06 PM, Doug Barton wrote: On 12/20/2011 06:08, John Baldwin wrote: The defaults for src.conf should be for the common case Agreed. The problem we seem to be missing here is that developers are not even statistically significant in measuring the common case. Users using freebsd-update don't care (they aren't building the world). Having the profiled libraries installed does not negatively impact users. However, it requires extra effort for application developers (not necessarily just kernel developers) who want to profile the applications they are working on. I think application developers is a larger portion of our userbase than you are allowing for. However, that notwithstanding, profiled libraries are not actually costing users anything (except for ones who build world by hand), but removing them from default installs does remove functionality. -- 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
svn commit: r228769 - in head/contrib/libarchive: . cpio libarchive tar
Author: mm Date: Wed Dec 21 12:59:09 2011 New Revision: 228769 URL: http://svn.freebsd.org/changeset/base/228769 Log: Remove config_freebsd.h and add to FREEBSD-Xlist This file is common for libarchive, cpio and tar and is going to be located outside of contrib (lib/libarchive) Deleted: head/contrib/libarchive/cpio/config_freebsd.h head/contrib/libarchive/libarchive/config_freebsd.h head/contrib/libarchive/tar/config_freebsd.h Modified: head/contrib/libarchive/FREEBSD-Xlist Modified: head/contrib/libarchive/FREEBSD-Xlist == --- head/contrib/libarchive/FREEBSD-Xlist Wed Dec 21 12:39:08 2011 (r228768) +++ head/contrib/libarchive/FREEBSD-Xlist Wed Dec 21 12:59:09 2011 (r228769) @@ -9,17 +9,20 @@ contrib cpio/CMakeLists.txt cpio/cpio_windows.c cpio/cpio_windows.h +cpio/config_freebsd.h cpio/test/CMakeLists.txt doc examples libarchive/CMakeLists.txt libarchive/archive_windows.c libarchive/archive_windows.h +libarchive/config_freebsd.h libarchive/filter_fork_windows.c libarchive/test/.cvsignore libarchive/test/CMakeLists.txt tar/CMakeLists.txt tar/bsdtar_windows.c tar/bsdtar_windows.h +tar/config_freebsd.h tar/test/CMakeLists.txt tar/test/test_windows.c ___ 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: r228771 - head/contrib/libarchive/libarchive
Author: mm Date: Wed Dec 21 15:02:37 2011 New Revision: 228771 URL: http://svn.freebsd.org/changeset/base/228771 Log: Partial merge of r224691 from lib/libarchive: Add compatibility for ISO images created with unfixed makefs that violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD. This allows tar to read FreeBSD distribution ISO images created with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1). MFC after:2 weeks Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Modified: head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c == --- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Wed Dec 21 14:58:44 2011(r228770) +++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c Wed Dec 21 15:02:37 2011(r228771) @@ -895,8 +895,10 @@ isPVD(struct iso9660 *iso9660, const uns return (0); /* Reserved field must be 0. */ + /* FreeBSD: makefs erroneously created images with 0x20 */ for (i = 0; i PVD_reserved4_size; ++i) - if (h[PVD_reserved4_offset + i] != 0) + if (h[PVD_reserved4_offset + i] != 0 + h[PVD_reserved4_offset + i] != 32) return (0); /* Reserved field must be 0. */ ___ 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: r228773 - in head/contrib/libarchive/libarchive: . test
Author: mm Date: Wed Dec 21 15:18:52 2011 New Revision: 228773 URL: http://svn.freebsd.org/changeset/base/228773 Log: Merge FreeBSD changes from lib/libarchive to contrib/libarchive: r204111 (uqs): Fix common misspelling of hierarchy r208027 (uqs): mdoc: move CAVEATS, BUGS and SECURITY CONSIDERATIONS sections to the bottom of the manpages and order them consistently. GNU groff doesn't care about the ordering, and doesn't even mention CAVEATS and SECURITY CONSIDERATIONS as common sections and where to put them. r208291 (uqs): mdoc: consistently spell our email addresses f...@freebsd.org r209031 (uqs): mdoc nitpicking: the title argument shall be uppercase r214822 (kientzle): Clarify the naming: Methods that free an object should be called free. Retain the old finish names to preserve source compatibility for now. r214905 (kientzle): If the Zip reader doesn't see a PK signature block because there's inter-entry garbage, just scan forward to find the next one. This allows us to handle a lot of Zip archives that have been modified in-place. Thanks to: Gleb Kurtsou for sending me a sample archive r216258 (kientzle): Don't write data into an empty file. In particular, this check avoids a warning when extracting directory entries from certain GNU tar archives that store directory contents. r225525 (kientzle): Fix cpio on ARM. MFC after:2 weeks Added: head/contrib/libarchive/libarchive/test/test_compat_zip_2.zip.uu - copied unchanged from r214905, head/lib/libarchive/test/test_compat_zip_2.zip.uu Modified: head/contrib/libarchive/libarchive/archive.h head/contrib/libarchive/libarchive/archive_entry.3 head/contrib/libarchive/libarchive/archive_private.h head/contrib/libarchive/libarchive/archive_read.3 head/contrib/libarchive/libarchive/archive_read.c head/contrib/libarchive/libarchive/archive_read_disk.3 head/contrib/libarchive/libarchive/archive_read_disk.c head/contrib/libarchive/libarchive/archive_read_extract.c head/contrib/libarchive/libarchive/archive_read_support_format_cpio.c head/contrib/libarchive/libarchive/archive_read_support_format_zip.c head/contrib/libarchive/libarchive/archive_util.3 head/contrib/libarchive/libarchive/archive_virtual.c head/contrib/libarchive/libarchive/archive_write.3 head/contrib/libarchive/libarchive/archive_write.c head/contrib/libarchive/libarchive/archive_write_disk.3 head/contrib/libarchive/libarchive/archive_write_disk.c head/contrib/libarchive/libarchive/archive_write_set_format_cpio.c head/contrib/libarchive/libarchive/cpio.5 head/contrib/libarchive/libarchive/libarchive-formats.5 head/contrib/libarchive/libarchive/libarchive.3 head/contrib/libarchive/libarchive/tar.5 head/contrib/libarchive/libarchive/test/test_acl_freebsd.c head/contrib/libarchive/libarchive/test/test_compat_zip.c Directory Properties: head/contrib/libarchive/libarchive/ (props changed) Modified: head/contrib/libarchive/libarchive/archive.h == --- head/contrib/libarchive/libarchive/archive.hWed Dec 21 15:06:01 2011(r228772) +++ head/contrib/libarchive/libarchive/archive.hWed Dec 21 15:18:52 2011(r228773) @@ -493,11 +493,10 @@ __LA_DECL voidarchive_read_extract_set /* Close the file and release most resources. */ __LA_DECL int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ -/* Note that archive_read_finish will call archive_read_close for you. */ -#if ARCHIVE_VERSION_NUMBER 200 -/* Erroneously declared to return void in libarchive 1.x */ -__LA_DECL void archive_read_finish(struct archive *); -#else +/* Note that archive_read_free will call archive_read_close for you. */ +__LA_DECL int archive_read_free(struct archive *); +#if ARCHIVE_VERSION_NUMBER 400 +/* Synonym for archive_read_free() for backwards compatibility. */ __LA_DECL int archive_read_finish(struct archive *); #endif @@ -514,7 +513,7 @@ __LA_DECL intarchive_read_finish(stru * - archive_write_header to write the header * - archive_write_data to write the entry data * 5) archive_write_close to close the output - * 6) archive_write_finish to cleanup the writer and release resources + * 6) archive_write_free to cleanup the writer and release resources */ __LA_DECL struct archive *archive_write_new(void); __LA_DECL int archive_write_set_bytes_per_block(struct archive *, @@ -595,13 +594,12 @@ __LA_DECL __LA_SSIZE_T archive_write_da #endif __LA_DECL int archive_write_finish_entry(struct archive *); __LA_DECL int archive_write_close(struct archive *); -#if ARCHIVE_VERSION_NUMBER 200 -/* Return value was incorrect in libarchive 1.x. */ -__LA_DECL void
svn commit: r228775 - head/contrib/libarchive/libarchive_fe
Author: mm
Date: Wed Dec 21 15:22:05 2011
New Revision: 228775
URL: http://svn.freebsd.org/changeset/base/228775
Log:
Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/libarchive_fe:
r213469:
Recognize both ! and ^ as markers for negated character classes.
MFC after:2 weeks
Modified:
head/contrib/libarchive/libarchive_fe/pathmatch.c
Directory Properties:
head/contrib/libarchive/libarchive_fe/ (props changed)
Modified: head/contrib/libarchive/libarchive_fe/pathmatch.c
==
--- head/contrib/libarchive/libarchive_fe/pathmatch.c Wed Dec 21 15:20:17
2011(r228774)
+++ head/contrib/libarchive/libarchive_fe/pathmatch.c Wed Dec 21 15:22:05
2011(r228775)
@@ -35,7 +35,7 @@ __FBSDID($FreeBSD$);
/*
* Check whether a character 'c' is matched by a list specification [...]:
- ** Leading '!' negates the class.
+ ** Leading '!' or '^' negates the class.
** char-char is a range of characters
** \char removes any special meaning for char
*
@@ -60,7 +60,7 @@ pm_list(const char *start, const char *e
(void)flags; /* UNUSED */
/* If this is a negated class, return success for nomatch. */
- if (*p == '!' p end) {
+ if ((*p == '!' || *p == '^') p end) {
match = 0;
nomatch = 1;
++p;
___
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: r228776 - in head/contrib/libarchive/tar: . test
Author: mm Date: Wed Dec 21 15:30:49 2011 New Revision: 228776 URL: http://svn.freebsd.org/changeset/base/228776 Log: Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/tar: r204111 (uqs): Fix common misspelling of hierarchy r207786 (kientzle): Various manpage updates, including many long-option synonyms that were previously undocumented. r208028 (uqs): mdoc: move remaining sections into consistent order This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections. r209152 (kientzle): If the compressed data is larger than the uncompressed, report the compression ratio as 0% instead of displaying nonsense triggered by numeric overflow. This is common when dealing with uncompressed files when the I/O blocking causes there to be small transient differences in the accounting. r210720 (joel): Fix typos. r223541 (kientzle): If there is a read error reading Y/N confirmation from the keyboard, exit immediately with an error. If there is an error opening or reading a file to put into the archive, set the return value for a deferred error exit. r223573 (kientzle): The --newer-than test should descend into old directories to look for new files. r226636 (kientzle): Typo from previous commit. Urgh. r224153 (mm, partial): Update bsdtar.1 manpage MFC after:2 weeks Modified: head/contrib/libarchive/tar/bsdtar.1 head/contrib/libarchive/tar/read.c head/contrib/libarchive/tar/test/test_option_s.c head/contrib/libarchive/tar/tree.c head/contrib/libarchive/tar/util.c head/contrib/libarchive/tar/write.c Directory Properties: head/contrib/libarchive/tar/ (props changed) Modified: head/contrib/libarchive/tar/bsdtar.1 == --- head/contrib/libarchive/tar/bsdtar.1Wed Dec 21 15:22:05 2011 (r228775) +++ head/contrib/libarchive/tar/bsdtar.1Wed Dec 21 15:30:49 2011 (r228776) @@ -50,8 +50,8 @@ .Sh DESCRIPTION .Nm creates and manipulates streaming archive files. -This implementation can extract from tar, pax, cpio, zip, jar, ar, -and ISO 9660 cdrom images and can create tar, pax, cpio, ar, +This implementation can extract from tar, pax, cpio, zip, jar, ar, xar, +rpm and ISO 9660 cdrom images and can create tar, pax, cpio, ar, zip, and shar archives. .Pp The first synopsis form shows a @@ -67,6 +67,8 @@ is a mode indicator from the following l .Bl -tag -compact -width indent .It Fl c Create a new archive containing the specified items. +The long option form is +.Fl Fl create . .It Fl r Like .Fl c , @@ -75,8 +77,12 @@ Note that this only works on uncompresse The .Fl f option is required. +The long option form is +.Fl Fl append . .It Fl t List archive contents to stdout. +The long option form is +.Fl Fl list . .It Fl u Like .Fl r , @@ -86,11 +92,15 @@ Note that this only works on uncompresse The .Fl f option is required. +The long form is +.Fl Fl update . .It Fl x Extract to disk from the archive. If a file with the same name appears more than once in the archive, each copy will be extracted, with later copies overwriting (replacing) earlier copies. +The long option form is +.Fl Fl extract . .El .Pp In @@ -127,14 +137,18 @@ In contrast, .Dl Nm Fl c Fl f Pa - Pa newfile Pa original.tar creates a new archive with only two entries. Similarly, -.Dl Nm Fl czf Pa - Fl -format Cm pax Cm @ Ns Pa - +.Dl Nm Fl czf Pa - Fl Fl format Cm pax Cm @ Ns Pa - reads an archive from standard input (whose format will be determined automatically) and converts it into a gzip-compressed pax-format archive on stdout. In this way, .Nm can be used to convert archives from one format to another. -.It Fl b Ar blocksize +.It Fl B , Fl Fl read-full-blocks +Ignored for compatibility with other +.Xr tar 1 +implementations. +.It Fl b Ar blocksize , Fl Fl block-size Ar blocksize Specify the block size, in 512-byte records, for tape drive I/O. As a rule, this argument is only needed when reading from or writing to tape drives, and usually not even then as the default block size of @@ -144,21 +158,22 @@ In c and r mode, this changes the direct the following files. In x mode, change directories after opening the archive but before extracting entries from the archive. -.It Fl -check-links -(c and r modes only) -Issue a warning message unless all links to each file are archived. -.It Fl -chroot +.It Fl Fl chroot (x mode only) .Fn chroot to the current directory after processing any .Fl C options and before extracting any files. -.It Fl -exclude Ar pattern +.It Fl Fl disable-copyfile +Mac OS X specific. +Disable the use of +.Xr copyfile 3 . +.It Fl Fl exclude Ar pattern Do not process files or directories that match the specified pattern. Note that exclusions take precedence over patterns or filenames specified on the command line. -.It Fl -format Ar format +.It Fl Fl format Ar
svn commit: r228777 - head/contrib/libarchive/cpio
Author: mm
Date: Wed Dec 21 15:33:13 2011
New Revision: 228777
URL: http://svn.freebsd.org/changeset/base/228777
Log:
Merge FreeBSD changes from usr.bin/cpio to contrib/libarchive/cpio:
r204111 (uqs):
Fix common misspelling of hierarchy
r211054 (kientzle);
Fix -R when used with -p. Previously, the
uname and gname weren't overwritten, so the
disk restore would use those to lookup the
original uid/gid again. Clearing the uname
and gname prevents this.
r212263 (gjb):
Fix typo in bsdcpio manual:
s/libarchive_formats/libarchive-formats
MFC after:2 weeks
Modified:
head/contrib/libarchive/cpio/bsdcpio.1
head/contrib/libarchive/cpio/cmdline.c
head/contrib/libarchive/cpio/cpio.c
head/contrib/libarchive/cpio/cpio.h
Directory Properties:
head/contrib/libarchive/cpio/ (props changed)
Modified: head/contrib/libarchive/cpio/bsdcpio.1
==
--- head/contrib/libarchive/cpio/bsdcpio.1 Wed Dec 21 15:30:49 2011
(r228776)
+++ head/contrib/libarchive/cpio/bsdcpio.1 Wed Dec 21 15:33:13 2011
(r228777)
@@ -24,7 +24,7 @@
.\
.\ $FreeBSD$
.\
-.Dd December 21, 2007
+.Dd September 5, 2010
.Dt BSDCPIO 1
.Os
.Sh NAME
@@ -140,7 +140,7 @@ The POSIX.1 tar format.
The default format is
.Ar odc .
See
-.Xr libarchive_formats 5
+.Xr libarchive-formats 5
for more complete information about the
formats currently supported by the underlying
.Xr libarchive 3
@@ -295,7 +295,7 @@ for more information.
.Sh EXAMPLES
The
.Nm
-command is traditionally used to copy file heirarchies in conjunction
+command is traditionally used to copy file hierarchies in conjunction
with the
.Xr find 1
command.
Modified: head/contrib/libarchive/cpio/cmdline.c
==
--- head/contrib/libarchive/cpio/cmdline.c Wed Dec 21 15:30:49 2011
(r228776)
+++ head/contrib/libarchive/cpio/cmdline.c Wed Dec 21 15:33:13 2011
(r228777)
@@ -285,6 +285,8 @@ cpio_getopt(struct cpio *cpio)
* A period can be used instead of the colon.
*
* Sets uid/gid return as appropriate, -1 indicates uid/gid not specified.
+ * TODO: If the spec uses uname/gname, then return those to the caller
+ * as well. If the spec provides uid/gid, just return names as NULL.
*
* Returns NULL if no error, otherwise returns error string for display.
*
Modified: head/contrib/libarchive/cpio/cpio.c
==
--- head/contrib/libarchive/cpio/cpio.c Wed Dec 21 15:30:49 2011
(r228776)
+++ head/contrib/libarchive/cpio/cpio.c Wed Dec 21 15:33:13 2011
(r228777)
@@ -273,15 +273,21 @@ main(int argc, char *argv[])
cpio-quiet = 1;
break;
case 'R': /* GNU cpio, also --owner */
+ /* TODO: owner_parse should return uname/gname
+* also; use that to set [ug]name_override. */
errmsg = owner_parse(cpio-optarg, uid, gid);
if (errmsg) {
lafe_warnc(-1, %s, errmsg);
usage();
}
- if (uid != -1)
+ if (uid != -1) {
cpio-uid_override = uid;
- if (gid != -1)
+ cpio-uname_override = NULL;
+ }
+ if (gid != -1) {
cpio-gid_override = gid;
+ cpio-gname_override = NULL;
+ }
break;
case 'r': /* POSIX 1997 */
cpio-option_rename = 1;
@@ -575,10 +581,14 @@ file_to_archive(struct cpio *cpio, const
return (r);
}
- if (cpio-uid_override = 0)
+ if (cpio-uid_override = 0) {
archive_entry_set_uid(entry, cpio-uid_override);
- if (cpio-gid_override = 0)
+ archive_entry_set_uname(entry, cpio-uname_override);
+ }
+ if (cpio-gid_override = 0) {
archive_entry_set_gid(entry, cpio-gid_override);
+ archive_entry_set_gname(entry, cpio-gname_override);
+ }
/*
* Generate a destination path for this entry.
Modified: head/contrib/libarchive/cpio/cpio.h
==
--- head/contrib/libarchive/cpio/cpio.h Wed Dec 21 15:30:49 2011
(r228776)
+++ head/contrib/libarchive/cpio/cpio.h Wed Dec 21 15:33:13 2011
(r228777)
@@ -68,7 +68,9 @@ struct cpio {
size_tpass_destpath_alloc;
char *pass_destpath;
int uid_override;
+ char *uname_override;
int
svn commit: r228779 - head/sys/conf
Author: dim
Date: Wed Dec 21 15:59:18 2011
New Revision: 228779
URL: http://svn.freebsd.org/changeset/base/228779
Log:
Start selectively disabling a few kernel build warnings for clang, since
there are some places in the kernel where fixing them is too disruptive,
or where there is a false positive.
In this case, disable -Wconstant-conversion for two aic7xxx-related
files, as they get the following warning on i386 (and possibly on other
32-bit arches):
sys/dev/aic7xxx/ahc_pci.c:112:10: warning: implicit conversion from 'long
long' to 'bus_addr_t' (aka 'unsigned int') changes value from 549755813887 to
4294967295 [-Wconstant-conversion]
? 0x7FLL
~~^~
This is a false positive, since the code only passes the 0x7FLL
argument, if sizeof(bus_addr_t) is larger than 4 (e.g. on 64 bit arches,
or when PAE is enabled on i386). The code could be refactored to do
compile-time checks, but that is more disruptive.
MFC after:1 week
Modified:
head/sys/conf/files
head/sys/conf/kern.mk
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Dec 21 15:40:26 2011(r228778)
+++ head/sys/conf/files Wed Dec 21 15:59:18 2011(r228779)
@@ -508,8 +508,10 @@ dev/aic/aic.c optional aic
dev/aic/aic_pccard.c optional aic pccard
dev/aic7xxx/ahc_eisa.c optional ahc eisa
dev/aic7xxx/ahc_isa.c optional ahc isa
-dev/aic7xxx/ahc_pci.c optional ahc pci
-dev/aic7xxx/ahd_pci.c optional ahd pci
+dev/aic7xxx/ahc_pci.c optional ahc pci \
+ compile-with ${NORMAL_C} ${NO_WCONSTANT_CONVERSION}
+dev/aic7xxx/ahd_pci.c optional ahd pci \
+ compile-with ${NORMAL_C} ${NO_WCONSTANT_CONVERSION}
dev/aic7xxx/aic7770.c optional ahc
dev/aic7xxx/aic79xx.c optional ahd pci
dev/aic7xxx/aic79xx_osm.c optional ahd pci
Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk Wed Dec 21 15:40:26 2011(r228778)
+++ head/sys/conf/kern.mk Wed Dec 21 15:59:18 2011(r228779)
@@ -11,6 +11,13 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wn
# The following flags are next up for working on:
# -Wextra
+# Disable a few warnings for clang, since there are several places in the
+# kernel where fixing them is more trouble than it is worth, or where there is
+# a false positive.
+.if ${CC:T:Mclang} == clang
+NO_WCONSTANT_CONVERSION= -Wno-constant-conversion
+.endif
+
#
# On i386, do not align the stack to 16-byte boundaries. Otherwise GCC 2.95
# and above adds code to the entry and exit point of every function to align
the
___
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: r228780 - in head/contrib/libstdc++: . config/os/aix include/bits include/ext include/tr1 libsupc++ src
Author: pfg Date: Wed Dec 21 16:36:07 2011 New Revision: 228780 URL: http://svn.freebsd.org/changeset/base/228780 Log: Update libstdc++ with small updates from the latest rev. (135556) from the gcc 4.2 branch. The libraries in the gcc-4_2-branch remained under the LGPLv2. The changes can be reproduced with the following command: svn diff svn://gcc.gnu.org/svn/gcc/branches/gcc-4_2-branch/libstdc++-v3 -r 127959:135556 Reviewed by: mm Approved by: jhb (mentor) MFC after:2 weeks Modified: head/contrib/libstdc++/ChangeLog head/contrib/libstdc++/config/os/aix/os_defines.h head/contrib/libstdc++/include/bits/allocator.h head/contrib/libstdc++/include/bits/basic_string.h head/contrib/libstdc++/include/bits/fstream.tcc head/contrib/libstdc++/include/bits/locale_facets.tcc head/contrib/libstdc++/include/ext/atomicity.h head/contrib/libstdc++/include/ext/codecvt_specializations.h head/contrib/libstdc++/include/ext/concurrence.h head/contrib/libstdc++/include/ext/vstring.h head/contrib/libstdc++/include/tr1/boost_shared_ptr.h head/contrib/libstdc++/include/tr1/random head/contrib/libstdc++/libsupc++/eh_personality.cc head/contrib/libstdc++/libsupc++/typeinfo head/contrib/libstdc++/src/valarray-inst.cc Modified: head/contrib/libstdc++/ChangeLog == --- head/contrib/libstdc++/ChangeLogWed Dec 21 15:59:18 2011 (r228779) +++ head/contrib/libstdc++/ChangeLogWed Dec 21 16:36:07 2011 (r228780) @@ -1,3 +1,133 @@ +2008-05-19 Release Manager + + * GCC 4.2.4 released. + +2008-03-13 David Edelsohn edels...@gnu.org + + Backport from mainline: + 2008-01-26 David Edelsohn edels...@gnu.org + +PR target/34794 +* config/os/aix/os_defines.h: Define __COMPATMATH__. + +2008-02-14 Kaveh R. Ghazi gh...@caip.rutgers.edu + + * testsuite/27_io/fpos/14320-1.cc: Check for long long and + remove XFAIL. + +2008-02-01 Release Manager + + * GCC 4.2.3 released. + +2008-01-06 Ted Phelps phe...@gnusto.com + + PR c++/34152 + * libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Check + _GLIBCXX_HAVE_GETIPINFO instead of HAVE_GETIPINFO. + +2008-01-05 Paolo Carlini pcarl...@suse.de + + PR libstdc++/34680 + + Revert: + 2007-12-17 Jonathan Wakely jwakely@gmail.com + * include/bits/locale_facets.tcc (has_facet, use_facet): Simplify + RTTI checks. + + 2007-12-14 Benjamin Kosnik b...@redhat.com + +PR libstdc++/30127 +PR libstdc++/34449 +* include/bits/locale_facets.tcc (use_facet): Check facet hierarchy. +(has_facet): Same. +* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. +* testsuite/22_locale/global_templates/ +standard_facet_hierarchies.cc: New. + +2007-12-17 Jonathan Wakely jwakely@gmail.com + + * include/bits/locale_facets.tcc (has_facet, use_facet): Simplify + RTTI checks. + +2007-12-17 Benjamin Kosnik b...@redhat.com + + * testsuite/22_locale/global_templates/ + standard_facet_hierarchies.cc: Fix for generic locale model. + +2007-12-14 Benjamin Kosnik b...@redhat.com + +PR libstdc++/30127 +PR libstdc++/34449 +* include/bits/locale_facets.tcc (use_facet): Check facet hierarchy. +(has_facet): Same. +* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: New. +* testsuite/22_locale/global_templates/ +standard_facet_hierarchies.cc: New. + +2007-11-26 Paolo Carlini pcarl...@suse.de + + * include/bits/locale_facets.tcc (num_put::_M_insert_int): When + ios_base::showpos and the type is signed and the value is zero, + prepend +. + * testsuite/22_locale/num_put/put/char/12.cc: New. + * testsuite/22_locale/num_put/put/wchar_t/12.cc: Likewise. + +2007-10-20 Paolo Carlini pcarl...@suse.de + + * include/tr1/random + (uniform_int::_M_call(_UniformRandomNumberGenerator, result_type, + result_type, true_type)): Fix small thinko. + +2007-10-19 Paolo Carlini pcarl...@suse.de + + PR libstdc++/33815 + * include/tr1/random + (uniform_int::_M_call(_UniformRandomNumberGenerator, result_type, + result_type, true_type)): Avoid the modulo (which uses the low-order + bits). + +2007-10-18 Paolo Carlini pcarl...@suse.de + + PR libstdc++/33807 + * include/bits/allocator.h (operator==(const allocator_Tp, + const allocator_Tp), operator!=(const allocator_Tp, + const allocator_Tp)): Add. + * testsuite/20_util/memory/allocator/33807.cc: New. + +2007-10-14 Jonathan Wakely jwakely@gmail.com + + * docs/html/Makefile: Follow up to libstdc++/14991, remove target. + +2007-10-14 Jonathan Wakely jwakely@gmail.com + + * src/valarray-inst.cc, include/ext/atomicity.h, +
svn commit: r228782 - head/sys/boot/i386/libi386
Author: ed
Date: Wed Dec 21 16:47:01 2011
New Revision: 228782
URL: http://svn.freebsd.org/changeset/base/228782
Log:
Make the RTC checking for QEMU even more aggressive.
At work, where we use use KVM+QEMU, we notice that pxeboot is pratically
impossible because of network timeouts. This is due to the fact that the
RTC code makes aggressive jumps.
Two RTC reads does not seem to be sufficient. Change the code to check
for 8 identical RTC values.
Sponsored by: Kumina bv
Modified:
head/sys/boot/i386/libi386/time.c
Modified: head/sys/boot/i386/libi386/time.c
==
--- head/sys/boot/i386/libi386/time.c Wed Dec 21 16:38:37 2011
(r228781)
+++ head/sys/boot/i386/libi386/time.c Wed Dec 21 16:47:01 2011
(r228782)
@@ -62,7 +62,7 @@ bios_seconds(void)
* Some BIOSes (notably qemu) don't correctly read the RTC
* registers in an atomic way, sometimes returning bogus values.
* Therefore we debounce the reading by accepting it only when
- * we got two identical values in succession.
+ * we got 8 identical values in succession.
*
* If we pass midnight, don't wrap back to 0.
*/
@@ -71,14 +71,16 @@ time(time_t *t)
{
static time_t lasttime;
time_t now, check;
-int try;
+int same, try;
-try = 0;
+same = try = 0;
check = bios_seconds();
do {
now = check;
check = bios_seconds();
-} while (now != check ++try 1000);
+ if (check != now)
+ same = 0;
+} while (++same 8 ++try 1000);
if (now lasttime)
now += 24 * 3600;
___
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: r228387 - head/sys/dev/e1000
Could you please back sysctls from r223676 for igb? On 10.12.2011 11:08, Jack F Vogel wrote: Author: jfv Date: Sat Dec 10 07:08:52 2011 New Revision: 228387 URL: http://svn.freebsd.org/changeset/base/228387 -- Andrey Zonov ___ 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: r228783 - head/sys/conf
Author: dim
Date: Wed Dec 21 17:01:13 2011
New Revision: 228783
URL: http://svn.freebsd.org/changeset/base/228783
Log:
When building with clang, disable -Wshift-count-negative and
-Wshift-count-overflow for sys/dev/ath/ath_hal/ah_regdomain.c, as it
gets multiple instances of the following warnings:
In file included from sys/dev/ath/ath_hal/ah_regdomain.c:99:
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:69:15: warning: shift count
is negative [-Wshift-count-negative]
.chan11a = BM4(F1_4950_4980,
^
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:41:4: note: expanded from:
W1(_fa) | W1(_fb) | W1(_fc) | W1(_fd) }
^
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:34:45: note: expanded from:
(((_a) 63 (_a) 128 ? (((uint64_t) 1)((_a)-64)) : (uint64_t)
0))
^ ~
and:
In file included from sys/dev/ath/ath_hal/ah_regdomain.c:99:
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:629:15: error: shift count
= width of type [-Werror,-Wshift-count-overflow]
.chan11a = BM4(W2_5260_5320,
^
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:40:34: note: expanded from:
{ W0(_fa) | W0(_fb) | W0(_fc) | W0(_fd),\
^
sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h:32:44: note: expanded from:
(((_a) = 0 (_a) 64 ? (((uint64_t) 1)(_a)) : (uint64_t) 0))
^
Both warnings are false positives, caused by LLVM PR 10030. For global
initializations, clang fails to detect that the branch of the ternary
operator causing the warning is dead.
MFC after:1 week
Modified:
head/sys/conf/files
head/sys/conf/kern.mk
Modified: head/sys/conf/files
==
--- head/sys/conf/files Wed Dec 21 16:47:01 2011(r228782)
+++ head/sys/conf/files Wed Dec 21 17:01:13 2011(r228783)
@@ -613,7 +613,7 @@ dev/ath/ath_hal/ah_eeprom_9287.c \
optional ath_hal | ath_ar9287 \
compile-with ${NORMAL_C} -I$S/dev/ath
dev/ath/ath_hal/ah_regdomain.c optional ath \
- compile-with ${NORMAL_C} -I$S/dev/ath
+ compile-with ${NORMAL_C} ${NO_WSHIFT_COUNT_NEGATIVE}
${NO_WSHIFT_COUNT_OVERFLOW} -I$S/dev/ath
# ar5210
dev/ath/ath_hal/ar5210/ar5210_attach.c optional ath_hal | ath_ar5210 \
compile-with ${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal
Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk Wed Dec 21 16:47:01 2011(r228782)
+++ head/sys/conf/kern.mk Wed Dec 21 17:01:13 2011(r228783)
@@ -17,6 +17,8 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wn
.if ${CC:T:Mclang} == clang
NO_WCONSTANT_CONVERSION= -Wno-constant-conversion
NO_WARRAY_BOUNDS= -Wno-array-bounds
+NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-count-negative
+NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-count-overflow
.endif
#
___
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: r228784 - head/share/man/man9
Author: jh
Date: Wed Dec 21 17:03:30 2011
New Revision: 228784
URL: http://svn.freebsd.org/changeset/base/228784
Log:
Follow style(9) more closely in the example.
Modified:
head/share/man/man9/sbuf.9
Modified: head/share/man/man9/sbuf.9
==
--- head/share/man/man9/sbuf.9 Wed Dec 21 17:01:13 2011(r228783)
+++ head/share/man/man9/sbuf.9 Wed Dec 21 17:03:30 2011(r228784)
@@ -25,7 +25,7 @@
.\
.\ $FreeBSD$
.\
-.Dd December 9, 2011
+.Dd December 21, 2011
.Dt SBUF 9
.Os
.Sh NAME
@@ -495,8 +495,8 @@ TAILQ_FOREACH(foo, foolist, list) {
sbuf_printf(sb, Address: %s\en, foo-address);
sbuf_printf(sb, Zip: %s\en, foo-zipcode);
}
-if (sbuf_finish(sb)) /* Check for any and all errors */
- err(1,Could not generate message);
+if (sbuf_finish(sb) != 0) /* Check for any and all errors */
+ err(1, Could not generate message);
transmit_msg(sbuf_data(sb), sbuf_len(sb));
sbuf_delete(sb);
.Ed
___
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: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
Author: dim
Date: Wed Dec 21 17:16:43 2011
New Revision: 228785
URL: http://svn.freebsd.org/changeset/base/228785
Log:
Fix shift overflow problem in sys/dev/ath/ath_hal/ar5210/ar5210_power.c
and sys/dev/ath/ath_hal/ar5211/ar5211_power.c:
sys/dev/ath/ath_hal/ar5210/ar5210_power.c:36:3: warning: signed shift result
(0x2) requires 35 bits to represent, but 'int' only has 32 bits
[-Wshift-overflow]
OS_REG_RMW_FIELD(ah, AR_SCR, AR_SCR_SLE, AR_SCR_SLE_ALLOW);
^~
sys/dev/ath/ath_hal/ah_internal.h:472:42: note: expanded from:
(OS_REG_READ(_a, _r) ~ (_f)) | (((_v) _f##_S) (_f)))
^
sys/dev/ath/ah_osdep.h:127:49: note: expanded from:
(bus_space_handle_t)(_ah)-ah_sh, (_reg), (_val))
^~~~
The AR_SCR_SLE_{WAKE,SLP,NORM} values are pre-shifted in ar5210reg.h and
ar5211reg.h, while they should be unshifted, like in ar5212reg.h. Then,
when the OS_REG_RMW_FIELD() macro shifts them again, the values will
overflow, becoming effectively zero.
MFC after: 1 week
Modified:
head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
==
--- head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Wed Dec 21 17:03:30 2011
(r228784)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Wed Dec 21 17:16:43 2011
(r228785)
@@ -245,9 +245,9 @@
#defineAR_SCR_SLDUR0x /* sleep duration */
#defineAR_SCR_SLE 0x0003 /* sleep enable */
#defineAR_SCR_SLE_S16
-#defineAR_SCR_SLE_WAKE 0x /* force wake */
-#defineAR_SCR_SLE_SLP 0x0001 /* force sleep */
-#defineAR_SCR_SLE_ALLOW0x0002 /* allow to control
sleep */
+#defineAR_SCR_SLE_WAKE 0 /* force wake */
+#defineAR_SCR_SLE_SLP 1 /* force sleep */
+#defineAR_SCR_SLE_ALLOW2 /* allow to control
sleep */
#defineAR_SCR_BITS \20\20SLE_SLP\21SLE_ALLOW
#defineAR_INTPEND_IP 0x0001 /* interrupt pending */
Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
==
--- head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Wed Dec 21 17:03:30 2011
(r228784)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Wed Dec 21 17:16:43 2011
(r228785)
@@ -618,9 +618,9 @@
#defineAR_SCR_SLDUR_S 0
#defineAR_SCR_SLE 0x0003 /* sleep enable mask */
#defineAR_SCR_SLE_S16 /* sleep enable bits shift */
-#defineAR_SCR_SLE_WAKE 0x /* force wake */
-#defineAR_SCR_SLE_SLP 0x0001 /* force sleep */
-#defineAR_SCR_SLE_NORM 0x0002 /* sleep logic normal operation
*/
+#defineAR_SCR_SLE_WAKE 0 /* force wake */
+#defineAR_SCR_SLE_SLP 1 /* force sleep */
+#defineAR_SCR_SLE_NORM 2 /* sleep logic normal operation
*/
#defineAR_SCR_SLE_UNITS0x0008 /* SCR units/TU */
#defineAR_SCR_BITS \20\20SLE_SLP\21SLE
___
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: r228786 - in head/sys/dev/ath/ath_hal: ar5212 ar5416
Author: dim
Date: Wed Dec 21 17:36:45 2011
New Revision: 228786
URL: http://svn.freebsd.org/changeset/base/228786
Log:
Fix enum conversion problems in sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
and sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:
sys/dev/ath/ath_hal/ar5212/ar5212_misc.c:577:24: warning: implicit conversion
from enumeration type 'HAL_STATUS' to different enumeration type 'HAL_BOOL'
[-Wconversion]
return HAL_EINVAL;
~~ ^~
and:
sys/dev/ath/ath_hal/ar5416/ar5416_misc.c:164:9: warning: implicit conversion
from enumeration type 'HAL_STATUS' to different enumeration type 'HAL_BOOL'
[-Wconversion]
return HAL_OK;
~~ ^~
In both cases, enums HAL_BOOL and HAL_STATUS are mixed up.
MFC after: 1 week
Modified:
head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Dec 21 17:16:43
2011(r228785)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Wed Dec 21 17:36:45
2011(r228786)
@@ -574,7 +574,7 @@ ar5212SetDecompMask(struct ath_hal *ah,
struct ath_hal_5212 *ahp = AH5212(ah);
if (keyidx = HAL_DECOMP_MASK_SIZE)
-return HAL_EINVAL;
+return AH_FALSE;
OS_REG_WRITE(ah, AR_DCM_A, keyidx);
OS_REG_WRITE(ah, AR_DCM_D, en ? AR_DCM_D_EN : 0);
ahp-ah_decompMask[keyidx] = en;
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
==
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Wed Dec 21 17:16:43
2011(r228785)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c Wed Dec 21 17:36:45
2011(r228786)
@@ -161,7 +161,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
HAL_BOOL
ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
{
- return HAL_OK;
+ return AH_TRUE;
}
/* Setup coverage class */
___
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: r228787 - head/sys/dev/hwpmc
Author: eadler (ports committer) Date: Wed Dec 21 17:51:49 2011 New Revision: 228787 URL: http://svn.freebsd.org/changeset/base/228787 Log: - Remove extra space Submitted by: Davide Italiano davide.itali...@gmail.com Approved by: brucec Modified: head/sys/dev/hwpmc/hwpmc_core.c Modified: head/sys/dev/hwpmc/hwpmc_core.c == --- head/sys/dev/hwpmc/hwpmc_core.c Wed Dec 21 17:36:45 2011 (r228786) +++ head/sys/dev/hwpmc/hwpmc_core.c Wed Dec 21 17:51:49 2011 (r228787) @@ -1721,7 +1721,7 @@ iap_allocate_pmc(int cpu, int ri, struct if (core_cputype == PMC_CPU_INTEL_COREI7 ev == PMC_EV_IAP_EVENT_BBH_01H) return (EINVAL); - if ( a-pm_md.pm_iap.pm_iap_rsp ~IA_OFFCORE_RSP_MASK) + if (a-pm_md.pm_iap.pm_iap_rsp ~IA_OFFCORE_RSP_MASK) return (EINVAL); pm-pm_md.pm_iap.pm_iap_rsp = a-pm_md.pm_iap.pm_iap_rsp IA_OFFCORE_RSP_MASK; ___ 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: r228143 - in head: . share/mk tools/build/options
On Wed, Dec 21, 2011 at 10:50:42AM -0800, Doug Barton wrote: On 12/20/2011 9:59 PM, Steve Kargl wrote: On Tue, Dec 20, 2011 at 09:30:10PM -0800, Garrett Cooper wrote: On Tue, Dec 20, 2011 at 8:55 PM, Steve Kargl s...@troutmask.apl.washington.edu wrote: On Tue, Dec 20, 2011 at 06:45:07PM -0800, Doug Barton wrote: On 12/20/2011 18:29, Ben Kaduk wrote: 2011/12/20 Doug Barton do...@freebsd.org: On 12/20/2011 06:08, John Baldwin wrote: The defaults for src.conf should be for the common case Agreed. The problem we seem to be missing here is that developers are not even statistically significant in measuring the common case. The common case of what, though? ?People using src.conf, or people rebuilding world, or just people using FreeBSD? The latter of course. The overwhelming majority of FreeBSD users will never use profiled libs, and in fact don't even know what they are. It's just useless space being taken up on every install. The defaults should be sensible for our users. OK, Doug, we get it! You don't like profiled libraries. You don't use them, and by extension the 'common user' does not use them. It's not about me. :) (And by extension, it's not about you either.) i Thi point that I was trying to drive home (that I think Doug is as well) is: - How many FreeBSD users are developers/performance/test engineers who care about this stuff being compiled into the base system? Don't know. I haven't seen a statistically meaningful poll of the FreeBSD user base on which to draw an answer. I suspect that neither you nor Doug have seen such a poll. Oh please. It doesn't take a poll to know that the overwhelming majority of FreeBSD installs are servers or end-user systems. Well, let's take it to a logical conclusion. What other knobs should default to off? WITHOUT_TOOLCHAIN may be appropriate for the segment of the user base who simply want a server. Clearly, end-users, who do not need profiled libraries, do not do software development so this knob seems appropriate. Well, if these end-users aren't doing software development, we might as well set WITHOUT_MAKE. My experience with 'common users' and reading through freebsd-questions suggests that manpages are useless, so please set WITHOUT_MAN. And since we aren't building manpages, we might as well set WITHOUT_GROFF. There, the system is neutered for the convenience of our end-users. Neither the time to build profiled libraries nor the diskspace used is significant. Great, so why is it such a problem for you to build them? It is not a problem because the libraries are built by default. :-) Of course, there is the converse. Why is it a problem for you to turn off building profiled libaries? -- 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: r228788 - head/sys/dev/e1000
Author: jhb Date: Wed Dec 21 20:10:11 2011 New Revision: 228788 URL: http://svn.freebsd.org/changeset/base/228788 Log: Restore the sysctl changes from 223676 and 227309 lost in the previous import: - Add read-only sysctls for all of the tunables supported by the igb and em drivers. - Make the per-instance 'enable_aim' sysctl truly per-instance by having it change a per-instance variable (which is used to control AIM) rather than having all of the per-instance sysctls operate on a single global variable. While here, restore the previously existing hw.igb.rx_processing_limit tunable as it is very useful to be able to set a default tunable that applies to all adapters in the system. Modified: head/sys/dev/e1000/if_igb.c head/sys/dev/e1000/if_igb.h Modified: head/sys/dev/e1000/if_igb.c == --- head/sys/dev/e1000/if_igb.c Wed Dec 21 17:51:49 2011(r228787) +++ head/sys/dev/e1000/if_igb.c Wed Dec 21 20:10:11 2011(r228788) @@ -299,11 +299,17 @@ MODULE_DEPEND(igb, ether, 1, 1, 1); * Tunable default values. */ +static SYSCTL_NODE(_hw, OID_AUTO, igb, CTLFLAG_RD, 0, IGB driver parameters); + /* Descriptor defaults */ static int igb_rxd = IGB_DEFAULT_RXD; static int igb_txd = IGB_DEFAULT_TXD; TUNABLE_INT(hw.igb.rxd, igb_rxd); TUNABLE_INT(hw.igb.txd, igb_txd); +SYSCTL_INT(_hw_igb, OID_AUTO, rxd, CTLFLAG_RDTUN, igb_rxd, 0, +Number of receive descriptors per queue); +SYSCTL_INT(_hw_igb, OID_AUTO, txd, CTLFLAG_RDTUN, igb_txd, 0, +Number of transmit descriptors per queue); /* ** AIM: Adaptive Interrupt Moderation @@ -313,6 +319,8 @@ TUNABLE_INT(hw.igb.txd, igb_txd); */ static int igb_enable_aim = TRUE; TUNABLE_INT(hw.igb.enable_aim, igb_enable_aim); +SYSCTL_INT(_hw_igb, OID_AUTO, enable_aim, CTLFLAG_RW, igb_enable_aim, 0, +Enable adaptive interrupt moderation); /* * MSIX should be the default for best performance, @@ -320,12 +328,16 @@ TUNABLE_INT(hw.igb.enable_aim, igb_en */ static int igb_enable_msix = 1; TUNABLE_INT(hw.igb.enable_msix, igb_enable_msix); +SYSCTL_INT(_hw_igb, OID_AUTO, enable_msix, CTLFLAG_RDTUN, igb_enable_msix, 0, +Enable MSI-X interrupts); /* ** Tuneable Interrupt rate */ static int igb_max_interrupt_rate = 8000; TUNABLE_INT(hw.igb.max_interrupt_rate, igb_max_interrupt_rate); +SYSCTL_INT(_hw_igb, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, +igb_max_interrupt_rate, 0, Maximum interrupts per second); /* ** Header split causes the packet header to @@ -337,6 +349,8 @@ TUNABLE_INT(hw.igb.max_interrupt_rate, */ static int igb_header_split = FALSE; TUNABLE_INT(hw.igb.hdr_split, igb_header_split); +SYSCTL_INT(_hw_igb, OID_AUTO, header_split, CTLFLAG_RDTUN, igb_header_split, 0, +Enable receive mbuf header split); /* ** This will autoconfigure based on @@ -344,6 +358,15 @@ TUNABLE_INT(hw.igb.hdr_split, igb_hea */ static int igb_num_queues = 0; TUNABLE_INT(hw.igb.num_queues, igb_num_queues); +SYSCTL_INT(_hw_igb, OID_AUTO, num_queues, CTLFLAG_RDTUN, igb_num_queues, 0, +Number of queues to configure, 0 indicates autoconfigure); + +/* How many packets rxeof tries to clean at a time */ +static int igb_rx_process_limit = 100; +TUNABLE_INT(hw.igb.rx_process_limit, igb_rx_process_limit); +SYSCTL_INT(_hw_igb, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN, +igb_rx_process_limit, 0, +Maximum number of received packets to process at a time, -1 means unlimited); /* * Device identification routine @@ -430,10 +453,9 @@ igb_attach(device_t dev) OID_AUTO, nvm, CTLTYPE_INT|CTLFLAG_RW, adapter, 0, igb_sysctl_nvm_info, I, NVM Information); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, enable_aim, CTLTYPE_INT|CTLFLAG_RW, - igb_enable_aim, 1, Interrupt Moderation); + igb_set_sysctl_value(adapter, enable_aim, + Interrupt Moderation, adapter-enable_aim, + igb_enable_aim); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), @@ -464,7 +486,7 @@ igb_attach(device_t dev) /* Sysctl for limiting the amount of work done in the taskqueue */ igb_set_sysctl_value(adapter, rx_processing_limit, max number of rx packets to process, - adapter-rx_process_limit, 100); + adapter-rx_process_limit, igb_rx_process_limit); /* * Validate number of transmit and receive descriptors. It @@ -1463,7 +1485,7 @@ igb_msix_que(void *arg) more_rx = igb_rxeof(que, adapter-rx_process_limit, NULL); - if (igb_enable_aim == FALSE) + if (adapter-enable_aim == FALSE) goto no_calc; /* ** Do
svn commit: r228789 - in head/sys/modules/aic7xxx: ahc/ahc_pci ahd
Author: dim
Date: Wed Dec 21 20:23:03 2011
New Revision: 228789
URL: http://svn.freebsd.org/changeset/base/228789
Log:
Amend r228779 by also disabling -Wconstant-conversion warnings for the
aic7xxx module.
MFC after:1 week
Modified:
head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
head/sys/modules/aic7xxx/ahd/Makefile
Modified: head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
==
--- head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Wed Dec 21 20:10:11
2011(r228788)
+++ head/sys/modules/aic7xxx/ahc/ahc_pci/Makefile Wed Dec 21 20:23:03
2011(r228789)
@@ -12,5 +12,6 @@ SRCS+=device_if.h bus_if.h pci_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
+CWARNFLAGS+= ${NO_WCONSTANT_CONVERSION}
.include bsd.kmod.mk
Modified: head/sys/modules/aic7xxx/ahd/Makefile
==
--- head/sys/modules/aic7xxx/ahd/Makefile Wed Dec 21 20:10:11 2011
(r228788)
+++ head/sys/modules/aic7xxx/ahd/Makefile Wed Dec 21 20:23:03 2011
(r228789)
@@ -32,6 +32,7 @@ SRCS= ${GENSRCS}
SRCS+= aic79xx.c aic79xx_osm.c aic79xx_pci.c ahd_pci.c
SRCS+= opt_scsi.h opt_aic79xx.h opt_cam.h opt_ddb.h
SRCS+= device_if.h bus_if.h pci_if.h
+CWARNFLAGS+= ${NO_WCONSTANT_CONVERSION}
CLEANFILES= ${GENSRCS}
___
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: r228790 - in head/usr.sbin: fwcontrol newsyslog ypserv
Author: eadler (ports committer)
Date: Wed Dec 21 20:27:41 2011
New Revision: 228790
URL: http://svn.freebsd.org/changeset/base/228790
Log:
- Remove extraneous null ptr deref checks
- Fix memory leak
Submitted by: Slono Slono slonoman2...@yandex.ru
Approved by: jhb
MFC after:1 week
Modified:
head/usr.sbin/fwcontrol/fwcontrol.c
head/usr.sbin/newsyslog/newsyslog.c
head/usr.sbin/ypserv/yp_main.c
Modified: head/usr.sbin/fwcontrol/fwcontrol.c
==
--- head/usr.sbin/fwcontrol/fwcontrol.c Wed Dec 21 20:23:03 2011
(r228789)
+++ head/usr.sbin/fwcontrol/fwcontrol.c Wed Dec 21 20:27:41 2011
(r228790)
@@ -152,8 +152,7 @@ str2node(int fd, const char *nodestr)
fweui2eui64(data-dev[i].eui, tmpeui);
if (memcmp(eui, tmpeui, sizeof(struct eui64)) == 0) {
node = data-dev[i].dst;
- if (data != NULL)
- free(data);
+ free(data);
goto gotnode;
}
}
Modified: head/usr.sbin/newsyslog/newsyslog.c
==
--- head/usr.sbin/newsyslog/newsyslog.c Wed Dec 21 20:23:03 2011
(r228789)
+++ head/usr.sbin/newsyslog/newsyslog.c Wed Dec 21 20:27:41 2011
(r228790)
@@ -1946,9 +1946,10 @@ do_zipwork(struct zipwork_entry *zwork)
char zresult[MAXPATHLEN];
int c;
+ assert(zwork != NULL);
pgm_path = NULL;
strlcpy(zresult, zwork-zw_fname, sizeof(zresult));
- if (zwork != NULL zwork-zw_conf != NULL
+ if (zwork-zw_conf != NULL
zwork-zw_conf-compress COMPRESS_NONE)
for (c = 1; c COMPRESS_TYPES; c++) {
if (zwork-zw_conf-compress == c) {
Modified: head/usr.sbin/ypserv/yp_main.c
==
--- head/usr.sbin/ypserv/yp_main.c Wed Dec 21 20:23:03 2011
(r228789)
+++ head/usr.sbin/ypserv/yp_main.c Wed Dec 21 20:27:41 2011
(r228790)
@@ -256,6 +256,7 @@ create_service(const int sock, const str
const struct __rpc_sockinfo *si)
{
int error;
+ char *sname;
SVCXPRT *transp;
struct addrinfo hints, *res, *res0;
@@ -263,6 +264,7 @@ create_service(const int sock, const str
struct bindaddrlistent *blep;
struct netbuf svcaddr;
+ sname = NULL;
SLIST_INIT(sle_head);
memset(hints, 0, sizeof(hints));
memset(svcaddr, 0, sizeof(svcaddr));
@@ -342,7 +344,6 @@ create_service(const int sock, const str
if (strncmp(0, servname, 1) == 0) {
struct sockaddr *sap;
socklen_t slen;
- char *sname;
sname = malloc(NI_MAXSERV);
if (sname == NULL) {
@@ -362,6 +363,7 @@ create_service(const int sock, const str
strerror(errno));
freeaddrinfo(res0);
close(s);
+ free(sname);
return -1;
}
error = getnameinfo(sap, slen,
@@ -373,6 +375,7 @@ create_service(const int sock, const str
strerror(errno));
freeaddrinfo(res0);
close(s);
+ free(sname);
return -1;
}
servname = sname;
@@ -441,7 +444,7 @@ create_service(const int sock, const str
}
/* XXX: ignore error intentionally */
rpcb_set(YPPROG, YPVERS, nconf, svcaddr);
-
+ free (sname);
freeaddrinfo(res0);
return 0;
}
___
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: r228790 - in head/usr.sbin: fwcontrol newsyslog ypserv
On Wed, Dec 21, 2011 at 3:39 PM, Doug Barton do...@freebsd.org wrote: A better way to write this commit log would be, Remove null pointer checks that are extraneous because ... 2/3 why, 1/3 what. Noted. - Fix memory leak Should this perhaps have been a separate commit? Probably. I'll be more careful next time. -- Eitan Adler Ports committer X11, Bugbusting 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: r228790 - in head/usr.sbin: fwcontrol newsyslog ypserv
On 12/21/2011 12:40 PM, Eitan Adler wrote: On Wed, Dec 21, 2011 at 3:39 PM, Doug Barton do...@freebsd.org wrote: A better way to write this commit log would be, Remove null pointer checks that are extraneous because ... 2/3 why, 1/3 what. Noted. Thanks. However, I was perhaps too subtle in asking you to actually explain why they were not needed. :) - Fix memory leak Should this perhaps have been a separate commit? Probably. I'll be more careful next time. Awesome! Doug -- [^L] Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ 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: r228791 - head/usr.sbin/ypserv
Author: eadler (ports committer) Date: Wed Dec 21 20:47:24 2011 New Revision: 228791 URL: http://svn.freebsd.org/changeset/base/228791 Log: - Fix style(9) bug I introduced in the last commit Approved by: jhb Modified: head/usr.sbin/ypserv/yp_main.c Modified: head/usr.sbin/ypserv/yp_main.c == --- head/usr.sbin/ypserv/yp_main.c Wed Dec 21 20:27:41 2011 (r228790) +++ head/usr.sbin/ypserv/yp_main.c Wed Dec 21 20:47:24 2011 (r228791) @@ -444,7 +444,7 @@ create_service(const int sock, const str } /* XXX: ignore error intentionally */ rpcb_set(YPPROG, YPVERS, nconf, svcaddr); - free (sname); + free(sname); freeaddrinfo(res0); return 0; } ___ 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: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
Erm, why did you do this without first getting clearance from someone
who has the hardware to test it?
Just because it looks obviously wrong to you, doesn't at all mean that
it's wrong. It's quite possible that the driver _requires_ those
bits to be written to the hardware as 0.
I'd appreciate it if would please revert this and other ath/hal
changes until I've had time to research them and test them out.
Thanks,
Adrian
On 21 December 2011 09:16, Dimitry Andric d...@freebsd.org wrote:
Author: dim
Date: Wed Dec 21 17:16:43 2011
New Revision: 228785
URL: http://svn.freebsd.org/changeset/base/228785
Log:
Fix shift overflow problem in sys/dev/ath/ath_hal/ar5210/ar5210_power.c
and sys/dev/ath/ath_hal/ar5211/ar5211_power.c:
sys/dev/ath/ath_hal/ar5210/ar5210_power.c:36:3: warning: signed shift result
(0x2) requires 35 bits to represent, but 'int' only has 32 bits
[-Wshift-overflow]
OS_REG_RMW_FIELD(ah, AR_SCR, AR_SCR_SLE, AR_SCR_SLE_ALLOW);
^~
sys/dev/ath/ath_hal/ah_internal.h:472:42: note: expanded from:
(OS_REG_READ(_a, _r) ~ (_f)) | (((_v) _f##_S) (_f)))
^
sys/dev/ath/ah_osdep.h:127:49: note: expanded from:
(bus_space_handle_t)(_ah)-ah_sh, (_reg), (_val))
^~~~
The AR_SCR_SLE_{WAKE,SLP,NORM} values are pre-shifted in ar5210reg.h and
ar5211reg.h, while they should be unshifted, like in ar5212reg.h. Then,
when the OS_REG_RMW_FIELD() macro shifts them again, the values will
overflow, becoming effectively zero.
MFC after: 1 week
Modified:
head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
==
--- head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Wed Dec 21 17:03:30 2011
(r228784)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210reg.h Wed Dec 21 17:16:43 2011
(r228785)
@@ -245,9 +245,9 @@
#define AR_SCR_SLDUR 0x /* sleep duration */
#define AR_SCR_SLE 0x0003 /* sleep enable */
#define AR_SCR_SLE_S 16
-#define AR_SCR_SLE_WAKE 0x /* force wake */
-#define AR_SCR_SLE_SLP 0x0001 /* force sleep */
-#define AR_SCR_SLE_ALLOW 0x0002 /* allow to control
sleep */
+#define AR_SCR_SLE_WAKE 0 /* force wake */
+#define AR_SCR_SLE_SLP 1 /* force sleep */
+#define AR_SCR_SLE_ALLOW 2 /* allow to control
sleep */
#define AR_SCR_BITS \20\20SLE_SLP\21SLE_ALLOW
#define AR_INTPEND_IP 0x0001 /* interrupt pending
*/
Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
==
--- head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Wed Dec 21 17:03:30 2011
(r228784)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Wed Dec 21 17:16:43 2011
(r228785)
@@ -618,9 +618,9 @@
#define AR_SCR_SLDUR_S 0
#define AR_SCR_SLE 0x0003 /* sleep enable mask */
#define AR_SCR_SLE_S 16 /* sleep enable bits shift */
-#define AR_SCR_SLE_WAKE 0x /* force wake */
-#define AR_SCR_SLE_SLP 0x0001 /* force sleep */
-#define AR_SCR_SLE_NORM 0x0002 /* sleep logic normal
operation */
+#define AR_SCR_SLE_WAKE 0 /* force wake */
+#define AR_SCR_SLE_SLP 1 /* force sleep */
+#define AR_SCR_SLE_NORM 2 /* sleep logic normal
operation */
#define AR_SCR_SLE_UNITS 0x0008 /* SCR units/TU */
#define AR_SCR_BITS \20\20SLE_SLP\21SLE
___
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: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
On Wednesday, December 21, 2011 4:52:04 pm Adrian Chadd wrote: Erm, why did you do this without first getting clearance from someone who has the hardware to test it? Just because it looks obviously wrong to you, doesn't at all mean that it's wrong. It's quite possible that the driver _requires_ those bits to be written to the hardware as 0. I'd appreciate it if would please revert this and other ath/hal changes until I've had time to research them and test them out. I agree it should be reviewed, but if you are seriously depending on the fact that the shifted values are beyond the edge of the word boundary and so the result wraps to zero, then I'd question the sanity of your code. -- 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: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
On 21 December 2011 14:00, John Baldwin j...@freebsd.org wrote: I agree it should be reviewed, but if you are seriously depending on the fact that the shifted values are beyond the edge of the word boundary and so the result wraps to zero, then I'd question the sanity of your code. I agree, but this is all there be dragons :) adrian ___ 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: r228793 - head/sys/modules/ath
Author: dim
Date: Wed Dec 21 22:13:50 2011
New Revision: 228793
URL: http://svn.freebsd.org/changeset/base/228793
Log:
Amend r228783 by also disabling -Wshift-count-negative
-Wshift-count-overflow warnings for the ath module.
MFC after:1 week
Modified:
head/sys/modules/ath/Makefile
Modified: head/sys/modules/ath/Makefile
==
--- head/sys/modules/ath/Makefile Wed Dec 21 21:39:30 2011
(r228792)
+++ head/sys/modules/ath/Makefile Wed Dec 21 22:13:50 2011
(r228793)
@@ -139,6 +139,7 @@ SRCS+= amrr.c
SRCS+= dfs_null.c
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
+CWARNFLAGS+= ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW}
opt_ah.h:
echo '#define AH_SUPPORT_AR5416 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
Re: svn commit: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
On Wed Dec 21 11, John Baldwin wrote: On Wednesday, December 21, 2011 4:52:04 pm Adrian Chadd wrote: Erm, why did you do this without first getting clearance from someone who has the hardware to test it? Just because it looks obviously wrong to you, doesn't at all mean that it's wrong. It's quite possible that the driver _requires_ those bits to be written to the hardware as 0. I'd appreciate it if would please revert this and other ath/hal changes until I've had time to research them and test them out. I agree it should be reviewed, but if you are seriously depending on the fact that the shifted values are beyond the edge of the word boundary and so the result wraps to zero, then I'd question the sanity of your code. i disagree. the commits should stay. after all this is HEAD. this way all developers running HEAD and with the appropriate ath hardware will test the changes. if dim@ really broke something, people will notice. the changes should *not* be MFC'ed. but if no one complains until 10.0-RELEASE, it's very unlikely he broke something. plus...does it make a different, if you test HEAD with the changes present or test HEAD with the changes integrated via patches? one way or the other you can test the changes and *if* something broke, the commits can be reverted. cheers. alex -- 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
svn commit: r228795 - head/usr.sbin/pw
Author: eadler (ports committer) Date: Thu Dec 22 03:36:54 2011 New Revision: 228795 URL: http://svn.freebsd.org/changeset/base/228795 Log: - document the -l option to usermod PR: docs/161588 Submitted by: Luchesar V. ILIEV luchesar.il...@gmail.com Approved by: gjb MFC after:1 week Modified: head/usr.sbin/pw/pw.8 Modified: head/usr.sbin/pw/pw.8 == --- head/usr.sbin/pw/pw.8 Wed Dec 21 22:49:16 2011(r228794) +++ head/usr.sbin/pw/pw.8 Thu Dec 22 03:36:54 2011(r228795) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd March 30, 2007 +.Dd December 21, 2011 .Dt PW 8 .Os .Sh NAME @@ -714,6 +714,17 @@ are also removed if the user's uid is un system. .Pp The +.Ar usermod +command adds one additional option: +.Bl -tag -width -G grouplist +.It Fl l Ar name +This option allows changing of an existing account name to +.Ql \name . +The new name must not already exist, and any attempt to duplicate an +existing account name will be rejected. +.El +.Pp +The .Ar usershow command allows viewing of an account in one of two formats. By default, the format is identical to the format used in ___ 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: r228750 - head/usr.bin/cpio/test
On Dec 20, 2011, at 2:27 PM, Martin Matuska wrote: On 20.12.2011 21:56, John Baldwin wrote: On Tuesday, December 20, 2011 3:37:17 pm Martin Matuska wrote: Author: mm Date: Tue Dec 20 20:37:17 2011 New Revision: 228750 URL: http://svn.freebsd.org/changeset/base/228750 Log: Sync bsdcpio with vendor branch release/2.8: Revision 3770: Merge r3768 from trunk: Fix typo in dev/ino verification for cpio formats. Obtained from: http://code.google.com/p/libarchive MFC after: 2 weeks If libarchive is now maintained externally rather than in the tree, is it time for bsdtar, bsdcpio, and libarchive to move to contrib and for vendor imports to be managed as they are for other contrib bits? I agree, this is the right thing to do. I am going to start making appropriate bits under vendor/. Thanks for tackling this, Martin. It's long overdue. Tim ___ 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: r228785 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
On 21 December 2011 15:27, Alexander Best arun...@freebsd.org wrote: I agree it should be reviewed, but if you are seriously depending on the fact that the shifted values are beyond the edge of the word boundary and so the result wraps to zero, then I'd question the sanity of your code. i disagree. the commits should stay. after all this is HEAD. this way all developers running HEAD and with the appropriate ath hardware will test the changes. if dim@ really broke something, people will notice. the changes should *not* be MFC'ed. but if no one complains until 10.0-RELEASE, it's very unlikely he broke something. plus...does it make a different, if you test HEAD with the changes present or test HEAD with the changes integrated via patches? one way or the other you can test the changes and *if* something broke, the commits can be reverted. Hi, This makes a mockery of the concept of maintainers :-) The idea of committing stuff into directories that others actively maintain and claim responsibility of is a bit ridiculous. So here - I'm asking that the commits be reverted until I've sat down and tested it on the AR5210/AR5211 cards I've acquired. Thanks, Adrian ___ 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
