Re: svn commit: r248119 - in head/sys/arm: arm include
On Sun, 10 Mar 2013 11:12:58 +0100 Roman Divacky wrote: > Should clang define __FreeBSD_ARCH_armv6__ ? Any other define thats > missing and should be defined? It was discussed when I added FreeBSD/ARM support to clang. I originally had it, however it was decided to remove it as __ARM_ARCH encodes the required information without adding a FreeBSD specific macro. __FreeBSD_ARCH_armv6__ is only defined in our copy of gcc so shouldn't be relied upon. Andrew ___ 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: r248060 - in head/sys/dev/drm2: . ttm
On Mon, Mar 11, 2013 at 09:39:59AM +0100, Jean-S??bastien P??dron wrote:
> Hi Eitan!
>
> On 08.03.2013 19:14, Eitan Adler wrote:
> > On 8 March 2013 13:11, Jean-Sebastien Pedron wrote:
> >> @@ -125,8 +125,6 @@ static ssize_t ttm_mem_zone_store(struct
> >>
> >> static void ttm_mem_global_kobj_release(struct ttm_mem_global *glob)
> >> {
> >> -
> >> - free(glob, M_TTM_ZONE);
> >> }
> >
> > Can this function now be removed, because it appears to be empty?
>
> I guess we could get rid of the reference counting too, because we
> already have a refcount in the struct drm_global_reference containing
> struct ttm_mem_global or struct ttm_bo_global. This needs further
> investigation though.
>
> Konstantin, what do you think about this?
I do not like neither removing the release method, nor reference counting.
I made only absolutely neccessary changes to the TTM to get it into
FreeBSD. What is proposed is a start of rewrite.
pgpnvV0ree5ip.pgp
Description: PGP signature
Re: svn commit: r248060 - in head/sys/dev/drm2: . ttm
Hi Eitan!
On 08.03.2013 19:14, Eitan Adler wrote:
> On 8 March 2013 13:11, Jean-Sebastien Pedron wrote:
>> @@ -125,8 +125,6 @@ static ssize_t ttm_mem_zone_store(struct
>>
>> static void ttm_mem_global_kobj_release(struct ttm_mem_global *glob)
>> {
>> -
>> - free(glob, M_TTM_ZONE);
>> }
>
> Can this function now be removed, because it appears to be empty?
I guess we could get rid of the reference counting too, because we
already have a refcount in the struct drm_global_reference containing
struct ttm_mem_global or struct ttm_bo_global. This needs further
investigation though.
Konstantin, what do you think about this?
--
Jean-Sébastien Pédron
signature.asc
Description: OpenPGP digital signature
svn commit: r248151 - in head: . share/examples/cvsup
Author: bapt Date: Mon Mar 11 10:48:26 2013 New Revision: 248151 URL: http://svnweb.freebsd.org/changeset/base/248151 Log: Ports are no more exported via cvsup, remove cvsup examples and documentation refering to ports MFC after:2 days Deleted: head/share/examples/cvsup/ports-supfile head/share/examples/cvsup/refuse head/share/examples/cvsup/refuse.README Modified: head/ObsoleteFiles.inc head/share/examples/cvsup/README head/share/examples/cvsup/cvs-supfile head/share/examples/cvsup/stable-supfile Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Mar 11 08:21:43 2013(r248150) +++ head/ObsoleteFiles.inc Mon Mar 11 10:48:26 2013(r248151) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20130311: Ports are no more available via cvsup +OLD_FILES+=usr/share/examples/cvsup/ports-supfile +OLD_FILES+=usr/share/examples/cvsup/refuse +OLD_FILES+=usr/share/examples/cvsup/refuse.README # 20130309: NWFS and NCP supports removed OLD_FILES+=usr/bin/ncplist OLD_FILES+=usr/bin/ncplogin Modified: head/share/examples/cvsup/README == --- head/share/examples/cvsup/READMEMon Mar 11 08:21:43 2013 (r248150) +++ head/share/examples/cvsup/READMEMon Mar 11 10:48:26 2013 (r248151) @@ -19,8 +19,6 @@ To maintain the sources for the FreeBSD- standard-supfile Main source tree -ports-supfile Ports collection - To maintain the sources for the FreeBSD-stable release, use: stable-supfile Main source tree @@ -28,7 +26,7 @@ To maintain the sources for the FreeBSD- To maintain a copy of the CVS repository containing all versions of FreeBSD, use: -cvs-supfileMain source tree and ports collection +cvs-supfileMain source tree collection IMPORTANT: Before you use any of the supfiles in this directory, you will need to edit in an appropriate "host" setting. See: Modified: head/share/examples/cvsup/cvs-supfile == --- head/share/examples/cvsup/cvs-supfile Mon Mar 11 08:21:43 2013 (r248150) +++ head/share/examples/cvsup/cvs-supfile Mon Mar 11 10:48:26 2013 (r248151) @@ -43,9 +43,8 @@ # prefix=/home/ncvs # This specifies where to place the requested files. A # setting of "/home/ncvs" will place all of the files -# requested in /home/ncvs (e.g., "/home/ncvs/src/bin", -# "/home/ncvs/ports/archivers"). The prefix directory -# must exist in order to run CVSup. +# requested in /home/ncvs (e.g., "/home/ncvs/src/bin"). +# The prefix directory must exist in order to run CVSup. # Defaults that apply to all the collections # @@ -68,13 +67,6 @@ # mega-collection. It includes all of the individual "src-*" collections. src-all -## Ports Collection. -# -# The easiest way to get the ports tree is to use the "ports-all" -# mega-collection. It includes all of the individual "ports-*" -# collections, -ports-all - ## Projects # # This collection retrieves the projects tree of the FreeBSD Modified: head/share/examples/cvsup/stable-supfile == --- head/share/examples/cvsup/stable-supfileMon Mar 11 08:21:43 2013 (r248150) +++ head/share/examples/cvsup/stable-supfileMon Mar 11 10:48:26 2013 (r248151) @@ -46,21 +46,6 @@ # in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib"). # The prefix directory must exist in order to run CVSup. # -### -# -# DANGER! WARNING! LOOK OUT! VORSICHT! -# -# If you add any of the ports collections to this file, be sure to -# specify them with a "tag" value set to ".", like this: -# -# ports-all tag=. -# -# If you leave out the "tag=." portion, CVSup will delete all of -# the files in your ports. That is because the ports -# collections do not use the same tags as the main part of the FreeBSD -# source tree. -# -### # Defaults that apply to all the collections # ___ 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: r248153 - head/sys/arm/include
Author: cognet
Date: Mon Mar 11 10:56:46 2013
New Revision: 248153
URL: http://svnweb.freebsd.org/changeset/base/248153
Log:
Don't use an empty struct.
Modified:
head/sys/arm/include/signal.h
Modified: head/sys/arm/include/signal.h
==
--- head/sys/arm/include/signal.h Mon Mar 11 10:49:02 2013
(r248152)
+++ head/sys/arm/include/signal.h Mon Mar 11 10:56:46 2013
(r248153)
@@ -42,6 +42,7 @@ typedef long sig_atomic_t;
#if __BSD_VISIBLE
struct sigcontext {
+ int _dummy;
};
#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: r248154 - head/sys/dev/acpica
Author: mav
Date: Mon Mar 11 12:02:03 2013
New Revision: 248154
URL: http://svnweb.freebsd.org/changeset/base/248154
Log:
Reduce HPET eventtimer priority on systems with 8 or more cores. Price of
the lock congestion may be too high there (2.5% on 4x4 core AMD Opteron).
Modified:
head/sys/dev/acpica/acpi_hpet.c
Modified: head/sys/dev/acpica/acpi_hpet.c
==
--- head/sys/dev/acpica/acpi_hpet.c Mon Mar 11 10:56:46 2013
(r248153)
+++ head/sys/dev/acpica/acpi_hpet.c Mon Mar 11 12:02:03 2013
(r248154)
@@ -675,7 +675,8 @@ hpet_attach(device_t dev)
if (t->pcpu_master >= 0) {
t->et.et_flags |= ET_FLAGS_PERCPU;
t->et.et_quality += 100;
- }
+ } if (mp_ncpus >= 8)
+ t->et.et_quality -= 100;
if ((t->caps & HPET_TCAP_PER_INT) == 0)
t->et.et_quality -= 10;
t->et.et_frequency = sc->freq;
___
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: r248155 - head/sys/net
Author: glebius
Date: Mon Mar 11 12:06:57 2013
New Revision: 248155
URL: http://svnweb.freebsd.org/changeset/base/248155
Log:
Reinitialize eh after pfil(9) processing.
PR: 176764
Submitted by: adri
Modified:
head/sys/net/if_bridge.c
Modified: head/sys/net/if_bridge.c
==
--- head/sys/net/if_bridge.cMon Mar 11 12:02:03 2013(r248154)
+++ head/sys/net/if_bridge.cMon Mar 11 12:06:57 2013(r248155)
@@ -2314,6 +2314,7 @@ bridge_input(struct ifnet *ifp, struct m
BRIDGE_UNLOCK(sc); \
return (NULL); \
} \
+ eh = mtod(m, struct ether_header *);\
} \
} \
if (bif->bif_flags & IFBIF_LEARNING) { \
___
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: r248158 - head/sys/netinet/libalias
Author: glebius
Date: Mon Mar 11 12:22:44 2013
New Revision: 248158
URL: http://svnweb.freebsd.org/changeset/base/248158
Log:
Remove LIBALIAS_LOCK_ASSERT(), including a couple with an uninitialzed
argument, in code that isn't compiled in kernel.
PR: kern/176667
Sponsored by: Nginx, Inc.
Modified:
head/sys/netinet/libalias/alias_db.c
Modified: head/sys/netinet/libalias/alias_db.c
==
--- head/sys/netinet/libalias/alias_db.cMon Mar 11 12:14:20 2013
(r248157)
+++ head/sys/netinet/libalias/alias_db.cMon Mar 11 12:22:44 2013
(r248158)
@@ -2729,7 +2729,6 @@ static void
InitPunchFW(struct libalias *la)
{
- LIBALIAS_LOCK_ASSERT(la);
la->fireWallField = malloc(la->fireWallNumNums);
if (la->fireWallField) {
memset(la->fireWallField, 0, la->fireWallNumNums);
@@ -2745,7 +2744,6 @@ static void
UninitPunchFW(struct libalias *la)
{
- LIBALIAS_LOCK_ASSERT(la);
ClearAllFWHoles(la);
if (la->fireWallFD >= 0)
close(la->fireWallFD);
@@ -2765,7 +2763,6 @@ PunchFWHole(struct alias_link *lnk)
struct ip_fw rule; /* On-the-fly built rule */
int fwhole; /* Where to punch hole */
- LIBALIAS_LOCK_ASSERT(la);
la = lnk->la;
/* Don't do anything unless we are asked to */
@@ -2839,7 +2836,6 @@ ClearFWHole(struct alias_link *lnk)
{
struct libalias *la;
- LIBALIAS_LOCK_ASSERT(la);
la = lnk->la;
if (lnk->link_type == LINK_TCP) {
int fwhole = lnk->data.tcp->fwhole; /* Where is the firewall
@@ -2864,7 +2860,6 @@ ClearAllFWHoles(struct libalias *la)
struct ip_fw rule; /* On-the-fly built rule */
int i;
- LIBALIAS_LOCK_ASSERT(la);
if (la->fireWallFD < 0)
return;
@@ -2878,7 +2873,7 @@ ClearAllFWHoles(struct libalias *la)
memset(la->fireWallField, 0, la->fireWallNumNums);
}
-#endif
+#endif /* !NO_FW_PUNCH */
void
LibAliasSetFWBase(struct libalias *la, unsigned int base, unsigned int num)
___
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: r248159 - head/lib/libnetgraph
Author: glebius
Date: Mon Mar 11 13:05:11 2013
New Revision: 248159
URL: http://svnweb.freebsd.org/changeset/base/248159
Log:
Fix for quite a special case when userland emulates a netgraph node, and
userland can reply to a message with NGM_HASREPLY bit set. In this case
we should not wait for a response to a responce.
PR: 176771
Submitted by: Keith Reynolds
Modified:
head/lib/libnetgraph/msg.c
Modified: head/lib/libnetgraph/msg.c
==
--- head/lib/libnetgraph/msg.c Mon Mar 11 12:22:44 2013(r248158)
+++ head/lib/libnetgraph/msg.c Mon Mar 11 13:05:11 2013(r248159)
@@ -234,7 +234,7 @@ NgDeliverMsg(int cs, const char *path,
}
/* Wait for reply if there should be one. */
- if (msg->header.cmd & NGM_HASREPLY) {
+ if (msg->header.cmd & NGM_HASREPLY && !(msg->header.flags & NGF_RESP)) {
struct pollfd rfds;
int n;
___
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: r248160 - head/usr.bin/ee/nls/ru_RU.KOI8-R
Author: glebius Date: Mon Mar 11 13:08:32 2013 New Revision: 248160 URL: http://svnweb.freebsd.org/changeset/base/248160 Log: Fix spelling. PR: 176777 Submitted by: Andrey Simonenko Modified: head/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg Modified: head/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg == Binary file (source and/or target). No diff available. ___ 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: r248167 - head/usr.bin/top
Author: jhb
Date: Mon Mar 11 16:33:05 2013
New Revision: 248167
URL: http://svnweb.freebsd.org/changeset/base/248167
Log:
Fix the 'C' field for a running thread to match the behavior described
in the manpage by having it display the current CPU (ki_oncpu) rather
than the previously used CPU (ki_lastcpu). ki_lastcpu is still used for
all other thread states.
Reported by: Chris Ross
MFC after:1 week
Modified:
head/usr.bin/top/machine.c
Modified: head/usr.bin/top/machine.c
==
--- head/usr.bin/top/machine.c Mon Mar 11 15:48:17 2013(r248166)
+++ head/usr.bin/top/machine.c Mon Mar 11 16:33:05 2013(r248167)
@@ -797,7 +797,7 @@ format_next_process(caddr_t handle, char
double pct;
struct handle *hp;
char status[16];
- int state;
+ int cpu, state;
struct rusage ru, *rup;
long p_tot, s_tot;
char *proc_fmt, thr_buf[6], jid_buf[6];
@@ -997,6 +997,13 @@ format_next_process(caddr_t handle, char
}
/* format this entry */
+ if (smpmode) {
+ if (state == SRUN && pp->ki_oncpu != 0xff)
+ cpu = pp->ki_oncpu;
+ else
+ cpu = pp->ki_lastcpu;
+ } else
+ cpu = 0;
proc_fmt = smpmode ? smp_Proc_format : up_Proc_format;
if (ps.thread != 0)
thr_buf[0] = '\0';
@@ -1014,7 +1021,7 @@ format_next_process(caddr_t handle, char
format_k2(PROCSIZE(pp)),
format_k2(pagetok(pp->ki_rssize)),
status,
- smpmode ? pp->ki_lastcpu : 0,
+ cpu,
format_time(cputime),
ps.wcpu ? 100.0 * weighted_cpu(pct, pp) : 100.0 * pct,
screen_width > cmdlengthdelta ? screen_width - cmdlengthdelta : 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: r248168 - head/share/examples
Author: bapt Date: Mon Mar 11 17:21:21 2013 New Revision: 248168 URL: http://svnweb.freebsd.org/changeset/base/248168 Log: Disconnect files removed in r248151 Modified: head/share/examples/Makefile Modified: head/share/examples/Makefile == --- head/share/examples/MakefileMon Mar 11 16:33:05 2013 (r248167) +++ head/share/examples/MakefileMon Mar 11 17:21:21 2013 (r248168) @@ -52,9 +52,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ - cvsup/ports-supfile \ - cvsup/refuse \ - cvsup/refuse.README \ cvsup/stable-supfile \ cvsup/standard-supfile \ diskless/ME \ ___ 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: r248170 - head/sys/dev/acpica
Author: mav
Date: Mon Mar 11 17:29:09 2013
New Revision: 248170
URL: http://svnweb.freebsd.org/changeset/base/248170
Log:
Add "else" missed at r248154.
Modified:
head/sys/dev/acpica/acpi_hpet.c
Modified: head/sys/dev/acpica/acpi_hpet.c
==
--- head/sys/dev/acpica/acpi_hpet.c Mon Mar 11 17:21:52 2013
(r248169)
+++ head/sys/dev/acpica/acpi_hpet.c Mon Mar 11 17:29:09 2013
(r248170)
@@ -675,7 +675,7 @@ hpet_attach(device_t dev)
if (t->pcpu_master >= 0) {
t->et.et_flags |= ET_FLAGS_PERCPU;
t->et.et_quality += 100;
- } if (mp_ncpus >= 8)
+ } else if (mp_ncpus >= 8)
t->et.et_quality -= 100;
if ((t->caps & HPET_TCAP_PER_INT) == 0)
t->et.et_quality -= 10;
___
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: r248171 - head/usr.sbin/bhyve
Author: neel Date: Mon Mar 11 17:36:37 2013 New Revision: 248171 URL: http://svnweb.freebsd.org/changeset/base/248171 Log: Convert the offset into the bar that contains the MSI-X table to an offset into the MSI-X table before using it to calculate the table index. In the common case where the MSI-X table is located at the begining of the BAR these two offsets are identical and thus the code was working by accident. This change will fix the case where the MSI-X table is located in the middle or at the end of the BAR that contains it. Obtained from:NetApp Modified: head/usr.sbin/bhyve/pci_passthru.c Modified: head/usr.sbin/bhyve/pci_passthru.c == --- head/usr.sbin/bhyve/pci_passthru.c Mon Mar 11 17:29:09 2013 (r248170) +++ head/usr.sbin/bhyve/pci_passthru.c Mon Mar 11 17:36:37 2013 (r248171) @@ -279,6 +279,7 @@ msix_table_read(struct passthru_softc *s int index; pi = sc->psc_pi; + offset -= pi->pi_msix.table_offset; index = offset / MSIX_TABLE_ENTRY_SIZE; if (index >= pi->pi_msix.table_count) @@ -323,6 +324,8 @@ msix_table_write(struct vmctx *ctx, int int error, index; pi = sc->psc_pi; + offset -= pi->pi_msix.table_offset; + index = offset / MSIX_TABLE_ENTRY_SIZE; if (index >= pi->pi_msix.table_count) 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: r248172 - head/sys/kern
Author: tuexen
Date: Mon Mar 11 17:43:55 2013
New Revision: 248172
URL: http://svnweb.freebsd.org/changeset/base/248172
Log:
Return an error if sctp_peeloff() fails because a socket can't be allocated.
MFC after: 3 days
Modified:
head/sys/kern/uipc_socket.c
head/sys/kern/uipc_syscalls.c
Modified: head/sys/kern/uipc_socket.c
==
--- head/sys/kern/uipc_socket.c Mon Mar 11 17:36:37 2013(r248171)
+++ head/sys/kern/uipc_socket.c Mon Mar 11 17:43:55 2013(r248172)
@@ -136,6 +136,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
@@ -565,8 +566,12 @@ sonewconn(struct socket *head, int conns
/*
* The accept socket may be tearing down but we just
* won a race on the ACCEPT_LOCK.
+* However, if sctp_peeloff() is called on a 1-to-many
+* style socket, the SO_ACCEPTCONN doesn't need to be set.
*/
- if (!(head->so_options & SO_ACCEPTCONN)) {
+ if (!(head->so_options & SO_ACCEPTCONN) &&
+ ((head->so_proto->pr_protocol != IPPROTO_SCTP) ||
+(head->so_type != SOCK_SEQPACKET))) {
SOCK_LOCK(so);
so->so_head = NULL;
sofree(so); /* NB: returns ACCEPT_UNLOCK'ed. */
Modified: head/sys/kern/uipc_syscalls.c
==
--- head/sys/kern/uipc_syscalls.c Mon Mar 11 17:36:37 2013
(r248171)
+++ head/sys/kern/uipc_syscalls.c Mon Mar 11 17:43:55 2013
(r248172)
@@ -2386,8 +2386,10 @@ sys_sctp_peeloff(td, uap)
CURVNET_SET(head->so_vnet);
so = sonewconn(head, SS_ISCONNECTED);
- if (so == NULL)
+ if (so == NULL) {
+ error = ENOMEM;
goto noconnection;
+ }
/*
* Before changing the flags on the socket, we have to bump the
* reference count. Otherwise, if the protocol calls sofree(),
___
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: r248172 - head/sys/kern
On Mar 11, 2013, at 1:43 PM, Michael Tuexen wrote:
> Author: tuexen
> Date: Mon Mar 11 17:43:55 2013
> New Revision: 248172
> URL: http://svnweb.freebsd.org/changeset/base/248172
>
> Log:
> Return an error if sctp_peeloff() fails because a socket can't be allocated.
Hmm. Just wanted to commit the change to uipc_syscalls.c and do the
other fix separately. So the missing commit message is:
sctp_peeloff() uses sonewconn() also in cases where listen() wasn't called.
So honor this use case.
>
> MFC after: 3 days
>
> Modified:
> head/sys/kern/uipc_socket.c
> head/sys/kern/uipc_syscalls.c
>
> Modified: head/sys/kern/uipc_socket.c
> ==
> --- head/sys/kern/uipc_socket.c Mon Mar 11 17:36:37 2013
> (r248171)
> +++ head/sys/kern/uipc_socket.c Mon Mar 11 17:43:55 2013
> (r248172)
> @@ -136,6 +136,7 @@ __FBSDID("$FreeBSD$");
> #include
> #include
> #include
> +#include
>
> #include
>
> @@ -565,8 +566,12 @@ sonewconn(struct socket *head, int conns
> /*
>* The accept socket may be tearing down but we just
>* won a race on the ACCEPT_LOCK.
> + * However, if sctp_peeloff() is called on a 1-to-many
> + * style socket, the SO_ACCEPTCONN doesn't need to be set.
>*/
> - if (!(head->so_options & SO_ACCEPTCONN)) {
> + if (!(head->so_options & SO_ACCEPTCONN) &&
> + ((head->so_proto->pr_protocol != IPPROTO_SCTP) ||
> + (head->so_type != SOCK_SEQPACKET))) {
> SOCK_LOCK(so);
> so->so_head = NULL;
> sofree(so); /* NB: returns ACCEPT_UNLOCK'ed. */
>
> Modified: head/sys/kern/uipc_syscalls.c
> ==
> --- head/sys/kern/uipc_syscalls.c Mon Mar 11 17:36:37 2013
> (r248171)
> +++ head/sys/kern/uipc_syscalls.c Mon Mar 11 17:43:55 2013
> (r248172)
> @@ -2386,8 +2386,10 @@ sys_sctp_peeloff(td, uap)
>
> CURVNET_SET(head->so_vnet);
> so = sonewconn(head, SS_ISCONNECTED);
> - if (so == NULL)
> + if (so == NULL) {
> + error = ENOMEM;
> goto noconnection;
> + }
> /*
>* Before changing the flags on the socket, we have to bump the
>* reference count. Otherwise, if the protocol calls sofree(),
>
___
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: r248151 - in head: . share/examples/cvsup
Baptiste Daroussin wrote .. > Author: bapt > Date: Mon Mar 11 10:48:26 2013 > New Revision: 248151 > URL: http://svnweb.freebsd.org/changeset/base/248151 > > Log: > Ports are no more exported via cvsup, remove cvsup examples and > documentation > refering to ports > > MFC after: 2 days > > Deleted: > head/share/examples/cvsup/ports-supfile > head/share/examples/cvsup/refuse > head/share/examples/cvsup/refuse.README > Modified: > head/ObsoleteFiles.inc > head/share/examples/cvsup/README > head/share/examples/cvsup/cvs-supfile > head/share/examples/cvsup/stable-supfile > > Modified: head/ObsoleteFiles.inc > == > --- head/ObsoleteFiles.incMon Mar 11 08:21:43 2013(r248150) > +++ head/ObsoleteFiles.incMon Mar 11 10:48:26 2013(r248151) > @@ -38,6 +38,10 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20130311: Ports are no more available via cvsup > +OLD_FILES+=usr/share/examples/cvsup/ports-supfile > +OLD_FILES+=usr/share/examples/cvsup/refuse > +OLD_FILES+=usr/share/examples/cvsup/refuse.README > # 20130309: NWFS and NCP supports removed > OLD_FILES+=usr/bin/ncplist > OLD_FILES+=usr/bin/ncplogin > > Modified: head/share/examples/cvsup/README > == > --- head/share/examples/cvsup/README Mon Mar 11 08:21:43 2013 > (r248150) > +++ head/share/examples/cvsup/README Mon Mar 11 10:48:26 2013 > (r248151) > @@ -19,8 +19,6 @@ To maintain the sources for the FreeBSD- > > standard-supfile Main source tree > > -ports-supfilePorts collection > - > To maintain the sources for the FreeBSD-stable release, use: > > stable-supfile Main source tree > @@ -28,7 +26,7 @@ To maintain the sources for the FreeBSD- > To maintain a copy of the CVS repository containing all versions of > FreeBSD, use: > > -cvs-supfile Main source tree and ports collection > +cvs-supfile Main source tree collection > > IMPORTANT: Before you use any of the supfiles in this directory, > you will need to edit in an appropriate "host" setting. See: > > Modified: head/share/examples/cvsup/cvs-supfile > == > --- head/share/examples/cvsup/cvs-supfile Mon Mar 11 08:21:43 2013 > (r248150) > +++ head/share/examples/cvsup/cvs-supfile Mon Mar 11 10:48:26 2013 > (r248151) > @@ -43,9 +43,8 @@ > # prefix=/home/ncvs > #This specifies where to place the requested files. A > #setting of "/home/ncvs" will place all of the files > -#requested in /home/ncvs (e.g., "/home/ncvs/src/bin", > -#"/home/ncvs/ports/archivers"). The prefix directory > -#must exist in order to run CVSup. > +#requested in /home/ncvs (e.g., "/home/ncvs/src/bin"). > +#The prefix directory must exist in order to run CVSup. > > # Defaults that apply to all the collections > # > @@ -68,13 +67,6 @@ > # mega-collection. It includes all of the individual "src-*" collections. > src-all > > -## Ports Collection. > -# > -# The easiest way to get the ports tree is to use the "ports-all" > -# mega-collection. It includes all of the individual "ports-*" > -# collections, > -ports-all > - > ## Projects > # > # This collection retrieves the projects tree of the FreeBSD > > Modified: head/share/examples/cvsup/stable-supfile > == > --- head/share/examples/cvsup/stable-supfile Mon Mar 11 08:21:43 2013 > (r248150) > +++ head/share/examples/cvsup/stable-supfile Mon Mar 11 10:48:26 2013 > (r248151) > @@ -46,21 +46,6 @@ > #in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib"). > #The prefix directory must exist in order to run CVSup. > # > -### > -# > -# DANGER! WARNING! LOOK OUT! VORSICHT! > -# > -# If you add any of the ports collections to this file, be sure to > -# specify them with a "tag" value set to ".", like this: > -# > -# ports-all tag=. > -# > -# If you leave out the "tag=." portion, CVSup will delete all of > -# the files in your ports. That is because the ports > -# collections do not use the
Re: svn commit: r248151 - in head: . share/examples/cvsup
On Mon, 11 Mar 2013, Waitman Gobble wrote: > Baptiste Daroussin wrote .. > > Author: bapt > > Date: Mon Mar 11 10:48:26 2013 > > New Revision: 248151 > > URL: http://svnweb.freebsd.org/changeset/base/248151 [snip] > I'm getting > > > make installworld > .. > install -o root -g wheel -m 444 /usr/src/share/examples/cvsup/ports-supfile > /usr/share/examples/cvsup/ports-supfile > install: /usr/src/share/examples/cvsup/ports-supfile: No such file or > directory > *** [copies] Error code 71 > Maybe I pulled the src at the wrong time ? or something to check out.. I seems so, rev 248168 possibly should be committed in ahead of 248151 -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ___ 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: r248151 - in head: . share/examples/cvsup
Dmitry Morozovsky wrote ..
> On Mon, 11 Mar 2013, Waitman Gobble wrote:
>
> > Baptiste Daroussin wrote ..
> > > Author: bapt
> > > Date: Mon Mar 11 10:48:26 2013
> > > New Revision: 248151
> > > URL: http://svnweb.freebsd.org/changeset/base/248151
>
> [snip]
>
> > I'm getting
> >
> > > make installworld
> > ..
> > install -o root -g wheel -m 444 /usr/src/share/examples/cvsup/ports-supfile
> /usr/share/examples/cvsup/ports-supfile
> > install: /usr/src/share/examples/cvsup/ports-supfile: No such file or
> > directory
> > *** [copies] Error code 71
>
> > Maybe I pulled the src at the wrong time ? or something to check out..
>
> I seems so, rev 248168 possibly should be committed in ahead of 248151
>
> --
> Sincerely,
> D.Marck [DM5020, MCK-RIPE, DM3-RIPN]
> [ FreeBSD committer: ma...@freebsd.org ]
>
> *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru ***
>
> ___
Thank you,
got over the 'hump'
[57] > touch /usr/src/share/examples/cvsup/ports-supfile
[58] > touch /usr/src/share/examples/cvsup/refuse
[59] > touch /usr/src/share/examples/cvsup/refuse.README
[60] > make installworld {{OK}}
I'll try grabbing src again.
--
Waitman Gobble
San Jose California USA
___
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: r248151 - in head: . share/examples/cvsup
On Mon, Mar 11, 2013 at 12:40:42PM -0700, Waitman Gobble wrote: > Dmitry Morozovsky wrote .. > > On Mon, 11 Mar 2013, Waitman Gobble wrote: > > > > > Baptiste Daroussin wrote .. > > > > Author: bapt > > > > Date: Mon Mar 11 10:48:26 2013 > > > > New Revision: 248151 > > > > URL: http://svnweb.freebsd.org/changeset/base/248151 > > > > [snip] > > > > > I'm getting > > > > > > > make installworld > > > .. > > > install -o root -g wheel -m 444 > > > /usr/src/share/examples/cvsup/ports-supfile > > /usr/share/examples/cvsup/ports-supfile > > > install: /usr/src/share/examples/cvsup/ports-supfile: No such file or > > > directory > > > *** [copies] Error code 71 > > > > > Maybe I pulled the src at the wrong time ? or something to check out.. > > > > I seems so, rev 248168 possibly should be committed in ahead of 248151 > > Yes sorry about that I have missed the Makefile in my svn ci line. regards Bapt pgpTptDN3WVa9.pgp Description: PGP signature
Re: svn commit: r248151 - in head: . share/examples/cvsup
Baptiste Daroussin wrote .. > On Mon, Mar 11, 2013 at 12:40:42PM -0700, Waitman Gobble wrote: > > Dmitry Morozovsky wrote .. > > > On Mon, 11 Mar 2013, Waitman Gobble wrote: > > > > > > > Baptiste Daroussin wrote .. > > > > > Author: bapt > > > > > Date: Mon Mar 11 10:48:26 2013 > > > > > New Revision: 248151 > > > > > URL: http://svnweb.freebsd.org/changeset/base/248151 > > > > > > [snip] > > > > > > > I'm getting > > > > > > > > > make installworld > > > > .. > > > > install -o root -g wheel -m 444 > > > > /usr/src/share/examples/cvsup/ports-supfile > > > /usr/share/examples/cvsup/ports-supfile > > > > install: /usr/src/share/examples/cvsup/ports-supfile: No such file or > > > > directory > > > > *** [copies] Error code 71 > > > > > > > Maybe I pulled the src at the wrong time ? or something to check out.. > > > > > > I seems so, rev 248168 possibly should be committed in ahead of 248151 > > > > > Yes sorry about that I have missed the Makefile in my svn ci line. > > regards > Bapt Thanks Baptiste, It's been awhile since I built -CURRENT. So I'm already breaking stuff. I think pkgng is still the way to go??? /usr/ports/ports-mgmt/pkg/ fetch.c:167:38 if (((&http_mirrors)->stqh_first == ((void *)0))) ^~ fetch.c:167:38: note: remove extraneous parentheses around the comparison to silence this warning 1 error generated. *** [fetch.o] Error code 1 1 error *** [all] Error code 2 1 error *** [do-build] Error code 1 Stop in /usr/ports/ports-mgmt/pkg. *** [/usr/ports/ports-mgmt/pkg/work/.build_done.pkg._usr_local] Error code 1 Stop in /usr/ports/ports-mgmt/pkg. is this worthy of a pr? Thank you, -- Waitman Gobble San Jose California USA ___ 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: r248151 - in head: . share/examples/cvsup
Waitman Gobble wrote .. > /usr/ports/ports-mgmt/pkg/ > fetch.c:167:38 > if (((&http_mirrors)->stqh_first == ((void *)0))) > ^~ > fetch.c:167:38: note: remove extraneous parentheses around the comparison to > silence > this warning OOPS. it's apparently ccache related. Sorry about that!! -- Waitman Gobble San Jose California USA ___ 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: r248175 - in head/sys/dev/usb: . serial
Author: gavin Date: Mon Mar 11 22:17:39 2013 New Revision: 248175 URL: http://svnweb.freebsd.org/changeset/base/248175 Log: Add support for Optoelectronics USB barcode readers to uftdi(4). Add entries for other Optoelectronics devices to usbdevs. MFC after:1 week Modified: head/sys/dev/usb/serial/uftdi.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/uftdi.c == --- head/sys/dev/usb/serial/uftdi.c Mon Mar 11 20:01:38 2013 (r248174) +++ head/sys/dev/usb/serial/uftdi.c Mon Mar 11 22:17:39 2013 (r248175) @@ -753,6 +753,8 @@ static const STRUCT_USB_HOST_ID uftdi_de UFTDI_DEV(MOBILITY, USB_SERIAL, UFTDI_TYPE_AUTO), UFTDI_DEV(OLIMEX, ARM_USB_OCD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), UFTDI_DEV(OLIMEX, ARM_USB_OCD_H, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG), + UFTDI_DEV(OPTO, CRD7734, UFTDI_TYPE_AUTO), + UFTDI_DEV(OPTO, CRD7734_1, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AD4USB, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AP485, UFTDI_TYPE_AUTO), UFTDI_DEV(PAPOUCH, AP485_2, UFTDI_TYPE_AUTO), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsMon Mar 11 20:01:38 2013(r248174) +++ head/sys/dev/usb/usbdevsMon Mar 11 22:17:39 2013(r248175) @@ -323,6 +323,7 @@ vendor GUNZE0x0637 Gunze Electronics U vendor AVISION 0x0638 Avision vendor TEAC0x0644 TEAC vendor ACTON 0x0647 Acton Research Corp. +vendor OPTO0x065a Optoelectronics Co., Ltd vendor SGI 0x065e Silicon Graphics vendor SANWASUPPLY 0x0663 Sanwa Supply vendor MEGATEC 0x0665 Megatec @@ -3150,6 +3151,13 @@ product OPTION ICON321 0xd031 Globetrot product OPTION ICON505 0xd055 Globetrotter iCON 505 product OPTION ICON452 0x7901 Globetrotter iCON 452 +/* Optoelectronics Co., Ltd */ +product OPTO BARCODE 0x0001 Barcode Reader +product OPTO OPTICONCODE 0x0009 Opticon Code Reader +product OPTO BARCODE_1 0xa002 Barcode Reader +product OPTO CRD7734 0xc000 USB Cradle CRD-7734-RU +product OPTO CRD7734_1 0xc001 USB Cradle CRD-7734-RU + /* OvisLink product */ product OVISLINK RT30720x3072 RT3072 ___ 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: r248176 - head/sys/kern
Author: pjd
Date: Mon Mar 11 22:59:07 2013
New Revision: 248176
URL: http://svnweb.freebsd.org/changeset/base/248176
Log:
Fix memory leak when one process send descriptor over UNIX domain socket,
but the other process exited before receiving it.
Modified:
head/sys/kern/uipc_usrreq.c
Modified: head/sys/kern/uipc_usrreq.c
==
--- head/sys/kern/uipc_usrreq.c Mon Mar 11 22:17:39 2013(r248175)
+++ head/sys/kern/uipc_usrreq.c Mon Mar 11 22:59:07 2013(r248176)
@@ -282,7 +282,7 @@ static void unp_dispose(struct mbuf *);
static voidunp_shutdown(struct unpcb *);
static voidunp_drop(struct unpcb *, int);
static voidunp_gc(__unused void *, int);
-static voidunp_scan(struct mbuf *, void (*)(struct file *));
+static voidunp_scan(struct mbuf *, void (*)(struct filedescent **, int));
static voidunp_discard(struct file *);
static voidunp_freerights(struct filedescent **, int);
static voidunp_init(void);
@@ -2135,17 +2135,22 @@ static int unp_marked;
static int unp_unreachable;
static void
-unp_accessable(struct file *fp)
+unp_accessable(struct filedescent **fdep, int fdcount)
{
struct unpcb *unp;
+ struct file *fp;
+ int i;
- if ((unp = fptounp(fp)) == NULL)
- return;
- if (unp->unp_gcflag & UNPGC_REF)
- return;
- unp->unp_gcflag &= ~UNPGC_DEAD;
- unp->unp_gcflag |= UNPGC_REF;
- unp_marked++;
+ for (i = 0; i < fdcount; i++) {
+ fp = fdep[i]->fde_file;
+ if ((unp = fptounp(fp)) == NULL)
+ continue;
+ if (unp->unp_gcflag & UNPGC_REF)
+ continue;
+ unp->unp_gcflag &= ~UNPGC_DEAD;
+ unp->unp_gcflag |= UNPGC_REF;
+ unp_marked++;
+ }
}
static void
@@ -2292,19 +2297,16 @@ unp_dispose(struct mbuf *m)
{
if (m)
- unp_scan(m, unp_discard);
+ unp_scan(m, unp_freerights);
}
static void
-unp_scan(struct mbuf *m0, void (*op)(struct file *))
+unp_scan(struct mbuf *m0, void (*op)(struct filedescent **, int))
{
struct mbuf *m;
- struct filedescent **fdep;
struct cmsghdr *cm;
void *data;
- int i;
socklen_t clen, datalen;
- int qfds;
while (m0 != NULL) {
for (m = m0; m; m = m->m_next) {
@@ -2324,10 +2326,8 @@ unp_scan(struct mbuf *m0, void (*op)(str
if (cm->cmsg_level == SOL_SOCKET &&
cm->cmsg_type == SCM_RIGHTS) {
- qfds = datalen / sizeof(*fdep);
- fdep = data;
- for (i = 0; i < qfds; i++)
- (*op)(fdep[i]->fde_file);
+ (*op)(data, datalen /
+ sizeof(struct filedescent *));
}
if (CMSG_SPACE(datalen) < clen) {
___
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: r248151 - in head: . share/examples/cvsup
On Mon, Mar 11, 2013 at 02:59:45PM -0700, Waitman Gobble wrote: > Waitman Gobble wrote .. > > /usr/ports/ports-mgmt/pkg/ > > fetch.c:167:38 > > if (((&http_mirrors)->stqh_first == ((void *)0))) > > ^~ > > fetch.c:167:38: note: remove extraneous parentheses around the comparison > > to silence > > this warning > > > OOPS. it's apparently ccache related. Sorry about that!! > CCACHE_CPP2 is the way to still use ccache with clang and sys/queue.h. regards, Bapt pgpMrwU_leThM.pgp Description: PGP signature
svn commit: r248180 - head/sys/netinet6
Author: ae
Date: Tue Mar 12 02:20:20 2013
New Revision: 248180
URL: http://svnweb.freebsd.org/changeset/base/248180
Log:
Take the inpcb rlock before calculating checksum, it was accidentally
moved in r191672.
Obtained from:Yandex LLC
MFC after:1 week
Modified:
head/sys/netinet6/raw_ip6.c
Modified: head/sys/netinet6/raw_ip6.c
==
--- head/sys/netinet6/raw_ip6.c Tue Mar 12 02:12:47 2013(r248179)
+++ head/sys/netinet6/raw_ip6.c Tue Mar 12 02:20:20 2013(r248180)
@@ -197,6 +197,7 @@ rip6_input(struct mbuf **mp, int *offp,
&ip6->ip6_dst) != 0)
continue;
}
+ INP_RLOCK(in6p);
if (in6p->in6p_cksum != -1) {
V_rip6stat.rip6s_isum++;
if (in6_cksum(m, proto, *offp,
@@ -206,7 +207,6 @@ rip6_input(struct mbuf **mp, int *offp,
continue;
}
}
- INP_RLOCK(in6p);
/*
* If this raw socket has multicast state, and we
* have received a multicast, check if this socket
___
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: r248181 - head/sys/modules/ath
Author: adrian
Date: Tue Mar 12 02:54:49 2013
New Revision: 248181
URL: http://svnweb.freebsd.org/changeset/base/248181
Log:
Shift this over to a new location in contrib/, in preparation to push
this public.
Modified:
head/sys/modules/ath/Makefile
Modified: head/sys/modules/ath/Makefile
==
--- head/sys/modules/ath/Makefile Tue Mar 12 02:20:20 2013
(r248180)
+++ head/sys/modules/ath/Makefile Tue Mar 12 02:54:49 2013
(r248181)
@@ -124,7 +124,7 @@ SRCS+= ah_eeprom_9287.c
SRCS+= ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c
# + AR9300 HAL
-# .PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar9003
+# .PATH: ${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/ar9300
#SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
#SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
#SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
@@ -149,6 +149,7 @@ SRCS+= amrr.c
SRCS+= dfs_null.c
CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
+# CFLAGS+= -I. -I${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/
.if !defined(KERNBUILDDIR)
opt_ah.h:
___
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: r248182 - head/sys/dev/ath/ath_hal/ar9002
Author: adrian
Date: Tue Mar 12 03:03:24 2013
New Revision: 248182
URL: http://svnweb.freebsd.org/changeset/base/248182
Log:
Use the correct antenna configuration variable here. "diversity" just
controls whether it's on or off.
Found by: clang
Modified:
head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
==
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c Tue Mar 12 02:54:49
2013(r248181)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c Tue Mar 12 03:03:24
2013(r248182)
@@ -50,7 +50,7 @@ ar9285BTCoexAntennaDiversity(struct ath_
if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) ||
(AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) {
if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) &&
-(AH5212(ah)->ah_diversity == HAL_ANT_VARIABLE)) {
+(AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) {
/* Enable antenna diversity */
ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_ENABLE;
ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_ENABLE;
@@ -63,7 +63,7 @@ ar9285BTCoexAntennaDiversity(struct ath_
OS_REG_WRITE(ah, AR_PHY_SWITCH_COM,
HAL_BT_COEX_ANT_DIV_SWITCH_COM);
OS_REG_RMW(ah, AR_PHY_SWITCH_CHAIN_0, 0, 0xf000);
- } else if (AH5212(ah)->ah_diversity == HAL_ANT_FIXED_B) {
+ } else if (AH5212(ah)->ah_antControl == HAL_ANT_FIXED_B) {
/* Disable antenna diversity. Use antenna B(LNA2) only. */
ant_div_control1 = HAL_BT_COEX_ANTDIV_CONTROL1_FIXED_B;
ant_div_control2 = HAL_BT_COEX_ANTDIV_CONTROL2_FIXED_B;
___
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: r248184 - head/share/misc
Author: eadler Date: Tue Mar 12 04:37:04 2013 New Revision: 248184 URL: http://svnweb.freebsd.org/changeset/base/248184 Log: Remove two members of portmgr that have recently stepped down. Thank you for your time on portmgr. Remove one member from bugmeister that has stepped down recently. Thank you for your time on bugmeister. While here clean up the graph a bit (remove dead cvs repos) Modified: head/share/misc/organization.dot Modified: head/share/misc/organization.dot == --- head/share/misc/organization.dotTue Mar 12 03:48:05 2013 (r248183) +++ head/share/misc/organization.dotTue Mar 12 04:37:04 2013 (r248184) @@ -30,7 +30,7 @@ coresecretary [label="Core Team Secretar doccommitters [label="Doc/www Committers\ndoc-committ...@freebsd.org"] doceng [label="Documentation Engineering Team\ndoc...@freebsd.org\ngjb, blackend,\ngabor, hrs"] 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"] +portmgr [label="Port Management Team\nport...@freebsd.org\ntabthorpe, marcus, bapt, \nerwin, 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"] secteam [label="Security Team\nsect...@freebsd.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] @@ -43,13 +43,12 @@ srccommitters [label="Src Committers\nsr accounts [label="Accounts Team\naccou...@freebsd.org\nmarkm, simon, kensmith,\ndhw"] backups [label="Backup Administrators\nback...@freebsd.org\nsimon, kensmith,\ndhw"] -bugmeister [label="Bugmeister Team\nbugmeis...@freebsd.org\neadler, gavin, gonzo, linimon"] +bugmeister [label="Bugmeister Team\nbugmeis...@freebsd.org\neadler, gavin, gonzo"] clusteradm [label="Cluster Administrators\ncluster...@freebsd.org\nbrd, simon, ps,\nkensmith, peter"] cvsupmaster [label="CVSup Mirror Site Coordinators\ncvsup-mas...@freebsd.org\nkuriyama, jdp,\nkensmith"] dnsadm [label="DNS Administrators\ndns...@freebsd.org\nbillf, dg, ps,\nkensmith, peter"] mirroradmin [label="FTP/WWW Mirror Site Coordinators\nmirror-ad...@freebsd.org\nkuriyama, kensmith"] ncvs [label="CVS src Repository Managers\nn...@freebsd.org\njoe, kuriyama, markm,\nsimon, peter"] -pcvs [label="CVS ports Repository Managers\np...@freebsd.org\nmarcus, joe, kuriyama,\nmarkm, simon"] perforceadmin [label="Perforce Repository Administrators\nperforce-ad...@freebsd.org\nscottl, kensmith, gordon,\nrwatson, peter, dhw"] postmaster [label="Postmaster Team\npostmas...@freebsd.org\njmb, brd, sahil, dhw"] refadm [label="Reference Systems Administrators\nref...@freebsd.org\njake, billf, markm, simon,\nobrien, ps, kensmith,\npeter, dhw"] @@ -70,8 +69,6 @@ _admin -> backups _admin -> bugmeister _admin -> clusteradm _admin -> ncvs -_admin -> pcvs -_admin -> dcvs _admin -> cvsupmaster _admin -> dnsadm _admin -> mirroradmin ___ 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: r248186 - head/sys/kern
Author: mav
Date: Tue Mar 12 06:58:49 2013
New Revision: 248186
URL: http://svnweb.freebsd.org/changeset/base/248186
Log:
Make kern_nanosleep() and pause_sbt() to use per-CPU sleep queues.
This removes significant sleep queue lock congestion on multithreaded
microbenchmarks, making them scale to multiple CPUs almost linearly.
Modified:
head/sys/kern/kern_synch.c
head/sys/kern/kern_time.c
head/sys/kern/subr_sleepqueue.c
Modified: head/sys/kern/kern_synch.c
==
--- head/sys/kern/kern_synch.c Tue Mar 12 06:14:31 2013(r248185)
+++ head/sys/kern/kern_synch.c Tue Mar 12 06:58:49 2013(r248186)
@@ -85,7 +85,7 @@ SYSINIT(synch_setup, SI_SUB_KICK_SCHEDUL
NULL);
inthogticks;
-static int pause_wchan;
+static uint8_t pause_wchan[MAXCPU];
static struct callout loadav_callout;
@@ -198,7 +198,8 @@ _sleep(void *ident, struct lock_object *
if (TD_ON_SLEEPQ(td))
sleepq_remove(td, td->td_wchan);
- if (ident == &pause_wchan)
+ if ((uint8_t *)ident >= &pause_wchan[0] &&
+ (uint8_t *)ident <= &pause_wchan[MAXCPU - 1])
sleepq_flags = SLEEPQ_PAUSE;
else
sleepq_flags = SLEEPQ_SLEEP;
@@ -372,7 +373,7 @@ pause_sbt(const char *wmesg, sbintime_t
DELAY((sbt & 0x) / SBT_1US);
return (0);
}
- return (_sleep(&pause_wchan, NULL, 0, wmesg, sbt, pr, flags));
+ return (_sleep(&pause_wchan[curcpu], NULL, 0, wmesg, sbt, pr, flags));
}
/*
Modified: head/sys/kern/kern_time.c
==
--- head/sys/kern/kern_time.c Tue Mar 12 06:14:31 2013(r248185)
+++ head/sys/kern/kern_time.c Tue Mar 12 06:58:49 2013(r248186)
@@ -477,7 +477,7 @@ kern_clock_getres(struct thread *td, clo
return (0);
}
-static int nanowait;
+static uint8_t nanowait[MAXCPU];
int
kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt)
@@ -503,8 +503,8 @@ kern_nanosleep(struct thread *td, struct
if (TIMESEL(&sbt, tmp))
sbt += tc_tick_sbt;
sbt += tmp;
- error = tsleep_sbt(&nanowait, PWAIT | PCATCH, "nanslp", sbt, prec,
- C_ABSOLUTE);
+ error = tsleep_sbt(&nanowait[curcpu], PWAIT | PCATCH, "nanslp",
+ sbt, prec, C_ABSOLUTE);
if (error != EWOULDBLOCK) {
if (error == ERESTART)
error = EINTR;
Modified: head/sys/kern/subr_sleepqueue.c
==
--- head/sys/kern/subr_sleepqueue.c Tue Mar 12 06:14:31 2013
(r248185)
+++ head/sys/kern/subr_sleepqueue.c Tue Mar 12 06:58:49 2013
(r248186)
@@ -88,16 +88,14 @@ __FBSDID("$FreeBSD$");
#endif
/*
- * Constants for the hash table of sleep queue chains. These constants are
- * the same ones that 4BSD (and possibly earlier versions of BSD) used.
- * Basically, we ignore the lower 8 bits of the address since most wait
- * channel pointers are aligned and only look at the next 7 bits for the
- * hash. SC_TABLESIZE must be a power of two for SC_MASK to work properly.
+ * Constants for the hash table of sleep queue chains.
+ * SC_TABLESIZE must be a power of two for SC_MASK to work properly.
*/
-#defineSC_TABLESIZE128 /* Must be power of 2.
*/
+#defineSC_TABLESIZE256 /* Must be power of 2.
*/
#defineSC_MASK (SC_TABLESIZE - 1)
#defineSC_SHIFT8
-#defineSC_HASH(wc) (((uintptr_t)(wc) >> SC_SHIFT) & SC_MASK)
+#defineSC_HASH(wc) uintptr_t)(wc) >> SC_SHIFT) ^
(uintptr_t)(wc)) & \
+ SC_MASK)
#defineSC_LOOKUP(wc) &sleepq_chains[SC_HASH(wc)]
#define NR_SLEEPQS 2
/*
___
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"
