From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 00:57:15 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 92A8A1F7;
Sun, 16 Dec 2012 00:57:15 +0000 (UTC)
(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 794FB8FC14;
Sun, 16 Dec 2012 00:57:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBG0vFm1069675;
Sun, 16 Dec 2012 00:57:15 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBG0vEqp069672;
Sun, 16 Dec 2012 00:57:14 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201212160057.qBG0vEqp069672@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 16 Dec 2012 00:57:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244282 - in projects/bhyve/sys: amd64/amd64
amd64/include x86/x86
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 00:57:15 -0000
Author: neel
Date: Sun Dec 16 00:57:14 2012
New Revision: 244282
URL: http://svnweb.freebsd.org/changeset/base/244282
Log:
Prefer x2apic mode when running inside a virtual machine.
Provide a tunable 'machdep.x2apic_desired' to let the administrator override
the default behavior.
Provide a read-only sysctl 'machdep.x2apic' to let the administrator know
whether the kernel is using x2apic or legacy mmio to access local apic.
Tested with Parallels Desktop 8 and bhyve hypervisors.
Also tested running on bare metal Intel Xeon E5-2658.
Obtained from: NetApp
Discussed with: jhb, attilio, avg, grehan
Modified:
projects/bhyve/sys/amd64/amd64/mp_machdep.c
projects/bhyve/sys/amd64/include/apicvar.h
projects/bhyve/sys/x86/x86/local_apic.c
Modified: projects/bhyve/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/bhyve/sys/amd64/amd64/mp_machdep.c Sun Dec 16 00:20:16 2012 (r244281)
+++ projects/bhyve/sys/amd64/amd64/mp_machdep.c Sun Dec 16 00:57:14 2012 (r244282)
@@ -708,6 +708,8 @@ init_secondary(void)
wrmsr(MSR_STAR, msr);
wrmsr(MSR_SF_MASK, PSL_NT|PSL_T|PSL_I|PSL_C|PSL_D);
+ lapic_init_ap();
+
/* Disable local APIC just to be sure. */
lapic_disable();
Modified: projects/bhyve/sys/amd64/include/apicvar.h
==============================================================================
--- projects/bhyve/sys/amd64/include/apicvar.h Sun Dec 16 00:20:16 2012 (r244281)
+++ projects/bhyve/sys/amd64/include/apicvar.h Sun Dec 16 00:57:14 2012 (r244282)
@@ -209,6 +209,7 @@ int lapic_enable_pmc(void);
void lapic_eoi(void);
int lapic_id(void);
void lapic_init(vm_paddr_t addr);
+void lapic_init_ap(void);
int lapic_intr_pending(u_int vector);
void lapic_ipi_raw(register_t icrlo, u_int dest);
void lapic_ipi_vectored(u_int vector, int dest);
Modified: projects/bhyve/sys/x86/x86/local_apic.c
==============================================================================
--- projects/bhyve/sys/x86/x86/local_apic.c Sun Dec 16 00:20:16 2012 (r244281)
+++ projects/bhyve/sys/x86/x86/local_apic.c Sun Dec 16 00:57:14 2012 (r244282)
@@ -50,12 +50,14 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/sched.h>
#include <sys/smp.h>
+#include <sys/sysctl.h>
#include <sys/timeet.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <x86/apicreg.h>
+#include <machine/atomic.h>
#include <machine/cpu.h>
#include <machine/cputypes.h>
#include <machine/frame.h>
@@ -158,7 +160,15 @@ volatile lapic_t *lapic;
vm_paddr_t lapic_paddr;
static u_long lapic_timer_divisor;
static struct eventtimer lapic_et;
+
static int x2apic;
+SYSCTL_INT(_machdep, OID_AUTO, x2apic, CTLFLAG_RD, &x2apic, 0, "x2apic mode");
+
+static int x2apic_desired = -1; /* enable only if running in a VM */
+TUNABLE_INT("machdep.x2apic_desired", &x2apic_desired);
+SYSCTL_INT(_machdep, OID_AUTO, x2apic_desired, CTLFLAG_RDTUN,
+ &x2apic_desired, 0,
+ "0 (disable), 1 (enable), -1 (leave it up to the kernel)");
static void lapic_enable(void);
static void lapic_resume(struct pic *pic);
@@ -247,6 +257,17 @@ lvt_mode(struct lapic *la, u_int pin, ui
return (value);
}
+static void
+x2apic_init(void)
+{
+ uint64_t apic_base;
+
+ apic_base = rdmsr(MSR_APICBASE);
+
+ if ((apic_base & APICBASE_X2APIC) == 0)
+ wrmsr(MSR_APICBASE, apic_base | APICBASE_X2APIC);
+}
+
/*
* Map the local APIC and setup necessary interrupt vectors.
*/
@@ -256,9 +277,21 @@ lapic_init(vm_paddr_t addr)
u_int regs[4];
int i, arat;
- if ((cpu_feature2 & CPUID2_X2APIC) != 0 &&
- (rdmsr(MSR_APICBASE) & APICBASE_X2APIC) != 0) {
- x2apic = 1;
+ if ((cpu_feature2 & CPUID2_X2APIC) != 0) {
+ if (rdmsr(MSR_APICBASE) & APICBASE_X2APIC)
+ x2apic = 1;
+ else if (x2apic_desired != 0) {
+ /*
+ * The default behavior is to enable x2apic only if
+ * the kernel is executing inside a virtual machine.
+ */
+ if (vm_guest != VM_GUEST_NO || x2apic_desired == 1)
+ x2apic = 1;
+ }
+ }
+
+ if (x2apic) {
+ x2apic_init();
if (bootverbose)
printf("Local APIC access using x2APIC MSRs\n");
} else {
@@ -317,6 +350,14 @@ lapic_init(vm_paddr_t addr)
}
}
+void
+lapic_init_ap(void)
+{
+
+ if (x2apic)
+ x2apic_init();
+}
+
/*
* Create a local APIC instance.
*/
@@ -934,9 +975,26 @@ static void
lapic_set_icr(uint64_t value)
{
- if (x2apic)
+ /*
+ * Access to x2apic MSR registers is not a serializing condition.
+ *
+ * A number of IPI handlers (e.g. rendezvous, tlb shootdown)
+ * depend on shared state in memory between the cpu that
+ * originated the IPI and the cpus that are the target.
+ *
+ * Insert a memory barrier to ensure that changes to memory
+ * are globally visible to the other cpus.
+ */
+ if (x2apic) {
+ /*
+ * XXX
+ * Intel's architecture spec seems to suggest that an
+ * "sfence" should be sufficient here but empirically
+ * an "mfence" is required to do the job.
+ */
+ mb();
wrmsr(MSR_APIC_ICR, value);
- else {
+ } else {
lapic->icr_hi = value >> 32;
lapic->icr_lo = value;
}
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 01:20:09 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5353D832;
Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
(envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 36E638FC0A;
Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBG1K9LH073849;
Sun, 16 Dec 2012 01:20:09 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBG1K9W4073848;
Sun, 16 Dec 2012 01:20:09 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201212160120.qBG1K9W4073848@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 16 Dec 2012 01:20:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244283 - projects/bhyve/sys/amd64/vmm/io
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 01:20:09 -0000
Author: neel
Date: Sun Dec 16 01:20:08 2012
New Revision: 244283
URL: http://svnweb.freebsd.org/changeset/base/244283
Log:
Modify the default behavior of bhyve such that it no longer forces the use of
x2apic mode on the guest.
The guest can decide whether or not it wants to use legacy mmio or x2apic
access to the APIC by writing to the MSR_APICBASE register.
Obtained from: NetApp
Modified:
projects/bhyve/sys/amd64/vmm/io/vlapic.c
Modified: projects/bhyve/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/io/vlapic.c Sun Dec 16 00:57:14 2012 (r244282)
+++ projects/bhyve/sys/amd64/vmm/io/vlapic.c Sun Dec 16 01:20:08 2012 (r244283)
@@ -896,8 +896,6 @@ vlapic_set_x2apic_state(struct vm *vm, i
vlapic = vm_lapic(vm, vcpuid);
- if (state == X2APIC_ENABLED)
- vlapic->msr_apicbase |= APICBASE_X2APIC;
- else
+ if (state == X2APIC_DISABLED)
vlapic->msr_apicbase &= ~APICBASE_X2APIC;
}
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 07:09:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5E87E9DF;
Sun, 16 Dec 2012 07:09:53 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 428228FC14;
Sun, 16 Dec 2012 07:09:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBG79rNb027221;
Sun, 16 Dec 2012 07:09:53 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBG79qoV027219;
Sun, 16 Dec 2012 07:09:52 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212160709.qBG79qoV027219@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 07:09:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244284 - in projects/calloutng/sys: kern sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 07:09:53 -0000
Author: mav
Date: Sun Dec 16 07:09:52 2012
New Revision: 244284
URL: http://svnweb.freebsd.org/changeset/base/244284
Log:
- Remove c_staiter field from the struct callout and use c_links.tqe
instead. It is possible because callout can't be both on the callwheel and
the cc_expireq at the same time.
- Remove use of the cc_exec_next field. Since cc_expireq has no extra
elements we can always fetch first elements out of it and don't need to
keep pointer to the next one.
Modified:
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/sys/_callout.h
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Sun Dec 16 01:20:08 2012 (r244283)
+++ projects/calloutng/sys/kern/kern_timeout.c Sun Dec 16 07:09:52 2012 (r244284)
@@ -384,7 +384,7 @@ void
callout_process(struct bintime *now)
{
struct bintime first, last, max, tmp_max;
- struct callout *tmp;
+ struct callout *tmp, *tmpn;
struct callout_cpu *cc;
struct callout_tailq *sc;
uint64_t lookahead;
@@ -450,12 +450,13 @@ callout_process(struct bintime *now)
NULL, 1);
tmp = cc->cc_exec_next_dir;
} else {
- TAILQ_INSERT_TAIL(&cc->cc_expireq,
- tmp, c_staiter);
+ tmpn = TAILQ_NEXT(tmp, c_links.tqe);
TAILQ_REMOVE(sc, tmp, c_links.tqe);
+ TAILQ_INSERT_TAIL(&cc->cc_expireq,
+ tmp, c_links.tqe);
tmp->c_flags |= CALLOUT_PROCESSED;
need_softclock = 1;
- tmp = TAILQ_NEXT(tmp, c_links.tqe);
+ tmp = tmpn;
}
continue;
}
@@ -789,15 +790,11 @@ softclock(void *arg)
gcalls = 0;
cc = (struct callout_cpu *)arg;
CC_LOCK(cc);
- c = TAILQ_FIRST(&cc->cc_expireq);
- while (c != NULL) {
- ++depth;
- cc->cc_exec_next = TAILQ_NEXT(c, c_staiter);
- TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter);
+ while ((c = TAILQ_FIRST(&cc->cc_expireq)) != NULL) {
+ TAILQ_REMOVE(&cc->cc_expireq, c, c_links.tqe);
softclock_call_cc(c, cc, &mpcalls, &lockcalls, &gcalls, 0);
- c = cc->cc_exec_next;
+ ++depth;
}
- cc->cc_exec_next = NULL;
#ifdef CALLOUT_PROFILING
avg_depth += (depth * 1000 - avg_depth) >> 8;
avg_mpcalls += (mpcalls * 1000 - avg_mpcalls) >> 8;
@@ -962,11 +959,8 @@ _callout_reset_on(struct callout *c, str
bucket = get_bucket(&c->c_time);
TAILQ_REMOVE(&cc->cc_callwheel[bucket], c,
c_links.tqe);
- } else {
- if (cc->cc_exec_next == c)
- cc->cc_exec_next = TAILQ_NEXT(c, c_staiter);
- TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter);
- }
+ } else
+ TAILQ_REMOVE(&cc->cc_expireq, c, c_links.tqe);
cancelled = 1;
c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING);
}
@@ -1187,11 +1181,8 @@ again:
bucket = get_bucket(&c->c_time);
TAILQ_REMOVE(&cc->cc_callwheel[bucket], c,
c_links.tqe);
- } else {
- if (cc->cc_exec_next == c)
- cc->cc_exec_next = TAILQ_NEXT(c, c_links.tqe);
- TAILQ_REMOVE(&cc->cc_expireq, c, c_staiter);
- }
+ } else
+ TAILQ_REMOVE(&cc->cc_expireq, c, c_links.tqe);
callout_cc_del(c, cc);
CC_UNLOCK(cc);
Modified: projects/calloutng/sys/sys/_callout.h
==============================================================================
--- projects/calloutng/sys/sys/_callout.h Sun Dec 16 01:20:08 2012 (r244283)
+++ projects/calloutng/sys/sys/_callout.h Sun Dec 16 07:09:52 2012 (r244284)
@@ -51,7 +51,6 @@ struct callout {
SLIST_ENTRY(callout) sle;
TAILQ_ENTRY(callout) tqe;
} c_links;
- TAILQ_ENTRY(callout) c_staiter;
struct bintime c_time; /* ticks to the event */
struct bintime c_precision; /* delta allowed wrt opt */
void *c_arg; /* function argument */
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 09:39:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id CA03A689;
Sun, 16 Dec 2012 09:39:23 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A19528FC0A;
Sun, 16 Dec 2012 09:39:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBG9dNPe048334;
Sun, 16 Dec 2012 09:39:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBG9dLO0048321;
Sun, 16 Dec 2012 09:39:21 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212160939.qBG9dLO0048321@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 09:39:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244285 - in projects/calloutng/sys: kern netinet sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 09:39:23 -0000
Author: mav
Date: Sun Dec 16 09:39:20 2012
New Revision: 244285
URL: http://svnweb.freebsd.org/changeset/base/244285
Log:
Cleanup tabs and whitespaces in modified code. Should be no functional
changes.
Modified:
projects/calloutng/sys/kern/kern_clocksource.c
projects/calloutng/sys/kern/kern_condvar.c
projects/calloutng/sys/kern/kern_synch.c
projects/calloutng/sys/kern/kern_tc.c
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/kern/subr_sleepqueue.c
projects/calloutng/sys/kern/sys_generic.c
projects/calloutng/sys/netinet/tcp_timer.c
projects/calloutng/sys/sys/callout.h
projects/calloutng/sys/sys/condvar.h
projects/calloutng/sys/sys/sleepqueue.h
projects/calloutng/sys/sys/systm.h
projects/calloutng/sys/sys/time.h
Modified: projects/calloutng/sys/kern/kern_clocksource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_clocksource.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/kern_clocksource.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -873,12 +873,12 @@ cpu_new_callout(int cpu, struct bintime
state = DPCPU_ID_PTR(cpu, timerstate);
ET_HW_LOCK(state);
- /*
- * If there is callout time already set earlier -- do nothing.
- * This check may appear redundant because we check already in
- * callout_process() but this double check guarantees we're safe
- * with respect to race conditions between interrupts execution
- * and scheduling.
+ /*
+ * If there is callout time already set earlier -- do nothing.
+ * This check may appear redundant because we check already in
+ * callout_process() but this double check guarantees we're safe
+ * with respect to race conditions between interrupts execution
+ * and scheduling.
*/
state->nextcallopt = bt_opt;
if (state->nextcall.sec != -1 &&
Modified: projects/calloutng/sys/kern/kern_condvar.c
==============================================================================
--- projects/calloutng/sys/kern/kern_condvar.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/kern_condvar.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -274,7 +274,7 @@ _cv_wait_sig(struct cv *cvp, struct lock
* cv_signal or cv_broadcast, EWOULDBLOCK if the timeout expires.
*/
int
-_cv_timedwait(struct cv *cvp, struct lock_object *lock, struct bintime *bt,
+_cv_timedwait(struct cv *cvp, struct lock_object *lock, struct bintime *bt,
struct bintime *precision, int timo, int flags)
{
WITNESS_SAVE_DECL(lock_witness);
@@ -311,10 +311,10 @@ _cv_timedwait(struct cv *cvp, struct loc
DROP_GIANT();
sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0);
- if (bt == NULL)
+ if (bt == NULL)
sleepq_set_timeout_flags(cvp, timo, flags);
else
- sleepq_set_timeout_bt(cvp, bt, precision);
+ sleepq_set_timeout_bt(cvp, bt, precision);
if (lock != &Giant.lock_object) {
if (class->lc_flags & LC_SLEEPABLE)
sleepq_release(cvp);
@@ -340,12 +340,12 @@ _cv_timedwait(struct cv *cvp, struct loc
/*
* Wait on a condition variable allowing interruption by signals.
- * Returns 0 if the thread was resumed by cv_signal or cv_broadcast,
- * or cv_broadcast, EWOULDBLOCK if the timeout expires, and EINTR
+ * Returns 0 if the thread was resumed by cv_signal or cv_broadcast,
+ * or cv_broadcast, EWOULDBLOCK if the timeout expires, and EINTR
* or ERESTART if a signal was caught.
*/
int
-_cv_timedwait_sig(struct cv *cvp, struct lock_object *lock,
+_cv_timedwait_sig(struct cv *cvp, struct lock_object *lock,
struct bintime *bt, struct bintime *precision, int timo, int flags)
{
WITNESS_SAVE_DECL(lock_witness);
@@ -383,7 +383,7 @@ _cv_timedwait_sig(struct cv *cvp, struct
sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR |
SLEEPQ_INTERRUPTIBLE, 0);
- if (bt == NULL)
+ if (bt == NULL)
sleepq_set_timeout_flags(cvp, timo, flags);
else
sleepq_set_timeout_bt(cvp, bt, precision);
Modified: projects/calloutng/sys/kern/kern_synch.c
==============================================================================
--- projects/calloutng/sys/kern/kern_synch.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/kern_synch.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -146,7 +146,7 @@ sleepinit(void)
*/
int
_sleep(void *ident, struct lock_object *lock, int priority,
- const char *wmesg, int timo, struct bintime *bt,
+ const char *wmesg, int timo, struct bintime *bt,
struct bintime *precision, int flags)
{
struct thread *td;
@@ -233,7 +233,7 @@ _sleep(void *ident, struct lock_object *
* return from cursig().
*/
sleepq_add(ident, lock, wmesg, sleepq_flags, 0);
- if (bt)
+ if (bt)
sleepq_set_timeout_bt(ident, bt, precision);
else if (timo)
sleepq_set_timeout_flags(ident, timo, flags);
Modified: projects/calloutng/sys/kern/kern_tc.c
==============================================================================
--- projects/calloutng/sys/kern/kern_tc.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/kern_tc.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -1718,7 +1718,7 @@ tc_ticktock(int cnt)
tc_windup();
}
-static void __inline
+static void __inline
tc_adjprecision(void)
{
struct timespec ts;
@@ -1739,7 +1739,7 @@ tc_adjprecision(void)
timespec2bintime(&ts, &bt_timethreshold);
}
-static int
+static int
sysctl_kern_timecounter_adjprecision(SYSCTL_HANDLER_ARGS)
{
int error, val;
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/kern_timeout.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -207,7 +207,7 @@ static MALLOC_DEFINE(M_CALLOUT, "callout
static void
cc_cme_cleanup(struct callout_cpu *cc, int direct)
{
-
+
cc->cc_exec_entity[direct].cc_curr = NULL;
cc->cc_exec_entity[direct].cc_next = NULL;
cc->cc_exec_entity[direct].cc_cancel = 0;
@@ -228,7 +228,6 @@ cc_cme_migrating(struct callout_cpu *cc,
{
#ifdef SMP
-
return (cc->cc_exec_entity[direct].ce_migration_cpu != CPUBLOCK);
#else
return (0);
@@ -371,7 +370,7 @@ callout_hash(struct bintime *bt)
return (int) ((bt->sec << CC_HASH_SHIFT) +
(bt->frac >> (64 - CC_HASH_SHIFT)));
-}
+}
static inline int
get_bucket(struct bintime *bt)
@@ -914,7 +913,7 @@ _callout_reset_on(struct callout *c, str
else
bintime_mul(&pr, to_ticks);
}
- } else {
+ } else {
to_bt = *bt;
if (precision != NULL)
pr = *precision;
Modified: projects/calloutng/sys/kern/subr_sleepqueue.c
==============================================================================
--- projects/calloutng/sys/kern/subr_sleepqueue.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/subr_sleepqueue.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -362,7 +362,7 @@ sleepq_add(void *wchan, struct lock_obje
* Sets a timeout that will remove the current thread from the specified
* sleep queue after timo ticks if the thread has not already been awakened.
*/
-void
+void
_sleepq_set_timeout(void *wchan, struct bintime *bt, struct bintime *precision,
int timo, int flags)
{
@@ -376,7 +376,7 @@ _sleepq_set_timeout(void *wchan, struct
MPASS(TD_ON_SLEEPQ(td));
MPASS(td->td_sleepqueue == NULL);
MPASS(wchan != NULL);
- if (bt == NULL)
+ if (bt == NULL)
callout_reset_flags_on(&td->td_slpcallout, timo,
sleepq_timeout, td, PCPU_GET(cpuid), flags | C_DIRECT_EXEC);
else
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/kern/sys_generic.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -999,7 +999,7 @@ kern_select(struct thread *td, int nd, f
if (tvp != NULL) {
atv = *tvp;
- if (atv.tv_sec < 0 || atv.tv_usec < 0 ||
+ if (atv.tv_sec < 0 || atv.tv_usec < 0 ||
atv.tv_usec >= 1000000) {
error = EINVAL;
goto done;
@@ -1281,7 +1281,7 @@ sys_poll(td, uap)
if (uap->timeout != INFTIM) {
atv.tv_sec = uap->timeout / 1000;
atv.tv_usec = (uap->timeout % 1000) * 1000;
- if (atv.tv_sec < 0 || atv.tv_usec < 0 ||
+ if (atv.tv_sec < 0 || atv.tv_usec < 0 ||
atv.tv_usec >= 1000000) {
error = EINVAL;
goto done;
@@ -1307,7 +1307,7 @@ sys_poll(td, uap)
if (bintime_cmp(&rbt, &abt, >=))
break;
error = seltdwait(td, &abt, &precision, 0);
- } else {
+ } else {
error = seltdwait(td, NULL, NULL, 0);
}
if (error)
@@ -1671,7 +1671,7 @@ seltdwait(struct thread *td, struct bint
mtx_unlock(&stp->st_mtx);
return (0);
}
- if (bt == NULL && timo > 0)
+ if (bt == NULL && timo > 0)
error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo);
else if (bt != NULL)
error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx,
Modified: projects/calloutng/sys/netinet/tcp_timer.c
==============================================================================
--- projects/calloutng/sys/netinet/tcp_timer.c Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/netinet/tcp_timer.c Sun Dec 16 09:39:20 2012 (r244285)
@@ -713,37 +713,38 @@ tcp_timer_active(struct tcpcb *tp, int t
#define ticks_to_msecs(t) (1000*(t) / hz)
static int
-delta_bintime_in_msecs(struct bintime bt, struct bintime now)
+delta_bintime_in_msecs(struct bintime bt, struct bintime now)
{
+
bintime_sub(&bt, &now);
return (((uint64_t)1000 * (uint64_t)(bt.frac >> 32)) >> 32) +
(bt.sec * 1000);
}
void
-tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer,
+tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer,
struct xtcp_timer *xtimer)
{
struct bintime bt, now;
-
+
bzero(xtimer, sizeof(*xtimer));
if (timer == NULL)
return;
bintime_clear(&bt);
- getbinuptime(&now);
- if (callout_active(&timer->tt_delack))
+ getbinuptime(&now);
+ if (callout_active(&timer->tt_delack))
xtimer->tt_delack = delta_bintime_in_msecs(
timer->tt_delack.c_time, now);
- if (callout_active(&timer->tt_rexmt))
+ if (callout_active(&timer->tt_rexmt))
xtimer->tt_rexmt = delta_bintime_in_msecs(
timer->tt_rexmt.c_time, now);
- if (callout_active(&timer->tt_persist))
+ if (callout_active(&timer->tt_persist))
xtimer->tt_persist = delta_bintime_in_msecs(
timer->tt_persist.c_time, now);
- if (callout_active(&timer->tt_keep))
+ if (callout_active(&timer->tt_keep))
xtimer->tt_keep = delta_bintime_in_msecs(
timer->tt_keep.c_time, now);
- if (callout_active(&timer->tt_2msl))
+ if (callout_active(&timer->tt_2msl))
xtimer->tt_2msl = delta_bintime_in_msecs(
timer->tt_2msl.c_time, now);
xtimer->t_rcvtime = ticks_to_msecs(ticks - tp->t_rcvtime);
Modified: projects/calloutng/sys/sys/callout.h
==============================================================================
--- projects/calloutng/sys/sys/callout.h Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/sys/callout.h Sun Dec 16 09:39:20 2012 (r244285)
@@ -80,11 +80,11 @@ int _callout_reset_on(struct callout *,
#define callout_reset_on(c, to_ticks, fn, arg, cpu) \
_callout_reset_on((c), NULL, NULL, (to_ticks), (fn), (arg), \
(cpu), C_PRELSET(tc_timeexp))
-#define callout_reset_flags_on(c, to_ticks, fn, arg, cpu, flags) \
+#define callout_reset_flags_on(c, to_ticks, fn, arg, cpu, flags) \
_callout_reset_on((c), NULL, NULL, (to_ticks), (fn), (arg), (cpu), \
(flags))
-#define callout_reset_bt_on(c, bt, pr, fn, arg, cpu, flags) \
- _callout_reset_on((c), (bt), (pr), 0, (fn), (arg), (cpu), (flags))
+#define callout_reset_bt_on(c, bt, pr, fn, arg, cpu, flags) \
+ _callout_reset_on((c), (bt), (pr), 0, (fn), (arg), (cpu), (flags))
#define callout_reset(c, on_tick, fn, arg) \
callout_reset_on((c), (on_tick), (fn), (arg), (c)->c_cpu)
#define callout_reset_flags(c, on_tick, fn, arg, flags) \
Modified: projects/calloutng/sys/sys/condvar.h
==============================================================================
--- projects/calloutng/sys/sys/condvar.h Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/sys/condvar.h Sun Dec 16 09:39:20 2012 (r244285)
@@ -56,10 +56,10 @@ void _cv_wait(struct cv *cvp, struct loc
void _cv_wait_unlock(struct cv *cvp, struct lock_object *lock);
int _cv_wait_sig(struct cv *cvp, struct lock_object *lock);
int _cv_timedwait(struct cv *cvp, struct lock_object *lock,
- struct bintime *bt, struct bintime *precision, int timo,
+ struct bintime *bt, struct bintime *precision, int timo,
int flags);
int _cv_timedwait_sig(struct cv *cvp, struct lock_object *lock,
- struct bintime *bt, struct bintime *precision, int timo,
+ struct bintime *bt, struct bintime *precision, int timo,
int flags);
void cv_signal(struct cv *cvp);
Modified: projects/calloutng/sys/sys/sleepqueue.h
==============================================================================
--- projects/calloutng/sys/sys/sleepqueue.h Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/sys/sleepqueue.h Sun Dec 16 09:39:20 2012 (r244285)
@@ -108,7 +108,7 @@ struct sleepqueue *sleepq_lookup(void *w
void sleepq_release(void *wchan);
void sleepq_remove(struct thread *td, void *wchan);
int sleepq_signal(void *wchan, int flags, int pri, int queue);
-void _sleepq_set_timeout(void *wchan, struct bintime *bt,
+void _sleepq_set_timeout(void *wchan, struct bintime *bt,
struct bintime *precision, int timo, int flags);
#define sleepq_set_timeout(wchan, timo) \
_sleepq_set_timeout((wchan), NULL, NULL, (timo), 0)
Modified: projects/calloutng/sys/sys/systm.h
==============================================================================
--- projects/calloutng/sys/sys/systm.h Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/sys/systm.h Sun Dec 16 09:39:20 2012 (r244285)
@@ -345,7 +345,7 @@ static __inline void splx(intrmask_t ip
* less often.
*/
int _sleep(void *chan, struct lock_object *lock, int pri, const char *wmesg,
- int timo, struct bintime *bt, struct bintime *precision,
+ int timo, struct bintime *bt, struct bintime *precision,
int flags) __nonnull(1);
#define msleep(chan, mtx, pri, wmesg, timo) \
_sleep((chan), &(mtx)->lock_object, (pri), (wmesg), (timo), \
Modified: projects/calloutng/sys/sys/time.h
==============================================================================
--- projects/calloutng/sys/sys/time.h Sun Dec 16 07:09:52 2012 (r244284)
+++ projects/calloutng/sys/sys/time.h Sun Dec 16 09:39:20 2012 (r244285)
@@ -304,7 +304,7 @@ extern struct timeval boottime;
extern int tc_timeexp;
extern int tc_timepercentage;
extern int tc_timethreshold;
-extern struct bintime bt_timethreshold;
+extern struct bintime bt_timethreshold;
/*
* Functions for looking at our clock: [get]{bin,nano,micro}[up]time()
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 10:12:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D398EEBF;
Sun, 16 Dec 2012 10:12:41 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A8BD98FC0A;
Sun, 16 Dec 2012 10:12:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGACfck054340;
Sun, 16 Dec 2012 10:12:41 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGACfHO054334;
Sun, 16 Dec 2012 10:12:41 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212161012.qBGACfHO054334@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 10:12:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244286 - projects/calloutng/share/man/man9
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 10:12:42 -0000
Author: mav
Date: Sun Dec 16 10:12:40 2012
New Revision: 244286
URL: http://svnweb.freebsd.org/changeset/base/244286
Log:
Document more new functions.
Modified:
projects/calloutng/share/man/man9/Makefile
projects/calloutng/share/man/man9/sleep.9
projects/calloutng/share/man/man9/timeout.9
Modified: projects/calloutng/share/man/man9/Makefile
==============================================================================
--- projects/calloutng/share/man/man9/Makefile Sun Dec 16 09:39:20 2012 (r244285)
+++ projects/calloutng/share/man/man9/Makefile Sun Dec 16 10:12:40 2012 (r244286)
@@ -1196,9 +1196,16 @@ MLINKS+=signal.9 cursig.9 \
signal.9 SIG_STOPSIGMASK.9 \
signal.9 trapsignal.9
MLINKS+=sleep.9 msleep.9 \
+ sleep.9 msleep_bt.9 \
+ sleep.9 msleep_flags.9 \
sleep.9 msleep_spin.9 \
+ sleep.9 msleep_spin_flags.9 \
sleep.9 pause.9 \
+ sleep.9 pause_bt.9 \
+ sleep.9 pause_flags.9 \
sleep.9 tsleep.9 \
+ sleep.9 tsleep_bt.9 \
+ sleep.9 tsleep_flags.9 \
sleep.9 wakeup.9 \
sleep.9 wakeup_one.9
MLINKS+=sleepqueue.9 init_sleepqueues.9 \
@@ -1213,6 +1220,8 @@ MLINKS+=sleepqueue.9 init_sleepqueues.9
sleepqueue.9 sleepq_release.9 \
sleepqueue.9 sleepq_remove.9 \
sleepqueue.9 sleepq_set_timeout.9 \
+ sleepqueue.9 sleepq_set_timeout_bt.9 \
+ sleepqueue.9 sleepq_set_timeout_flags.9 \
sleepqueue.9 sleepq_signal.9 \
sleepqueue.9 sleepq_timedwait.9 \
sleepqueue.9 sleepq_timedwait_sig.9 \
@@ -1335,6 +1344,11 @@ MLINKS+=timeout.9 callout.9 \
timeout.9 callout_init_rw.9 \
timeout.9 callout_pending.9 \
timeout.9 callout_reset.9 \
+ timeout.9 callout_reset_bt.9 \
+ timeout.9 callout_reset_flags.9 \
+ timeout.9 callout_reset_on.9 \
+ timeout.9 callout_reset_bt_on.9 \
+ timeout.9 callout_reset_flags_on.9 \
timeout.9 callout_schedule.9 \
timeout.9 callout_stop.9 \
timeout.9 untimeout.9
Modified: projects/calloutng/share/man/man9/sleep.9
==============================================================================
--- projects/calloutng/share/man/man9/sleep.9 Sun Dec 16 09:39:20 2012 (r244285)
+++ projects/calloutng/share/man/man9/sleep.9 Sun Dec 16 10:12:40 2012 (r244286)
@@ -25,15 +25,20 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 14, 2012
+.Dd December 16, 2012
.Dt SLEEP 9
.Os
.Sh NAME
.Nm msleep ,
+.Nm msleep_flags ,
.Nm msleep_bt ,
.Nm msleep_spin ,
+.Nm msleep_spin_flags ,
.Nm pause ,
+.Nm pause_flags ,
+.Nm pause_bt ,
.Nm tsleep ,
+.Nm tsleep_flags ,
.Nm tsleep_bt ,
.Nm wakeup
.Nd wait for events
@@ -44,15 +49,28 @@
.Ft int
.Fn msleep "void *chan" "struct mtx *mtx" "int priority" "const char *wmesg" "int timo"
.Ft int
+.Fn msleep_flags "void *chan" "struct mtx *mtx" "int priority" \
+"const char *wmesg" "int timo" "int flags"
+.Ft int
.Fn msleep_bt "void *chan" "struct mtx *mtx" "int priority" \
"const char *wmesg" "struct bintime *bt" "struct bintime *pr"
.Ft int
.Fn msleep_spin "void *chan" "struct mtx *mtx" "const char *wmesg" "int timo"
+.Ft int
+.Fn msleep_spin_flags "void *chan" "struct mtx *mtx" "const char *wmesg" \
+"int timo" "int flags"
.Ft void
.Fn pause "const char *wmesg" "int timo"
+.Ft void
+.Fn pause_flags "const char *wmesg" "int timo" "int flags"
+.Ft void
+.Fn pause_bt "const char *wmesg" "struct bintime *bt" "struct bintime *pr"
.Ft int
.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo"
.Ft int
+.Fn tsleep_flags "void *chan" "int priority" "const char *wmesg" "int timo" \
+"int flags"
+.Ft int
.Fn tsleep_bt "void *chan" "int priority" "const char *wmesg" \
"struct bintime *bt" "struct bintime *pr"
.Ft void
@@ -156,12 +174,19 @@ If the timeout expires,
then the sleep function will return
.Er EWOULDBLOCK .
.Pp
-.Fn msleep_bt
+The parameter
+.Fa flags
+allows to pass additional
+.Fn callout_reset_flags
+flags to specify relative event precision.
+.Pp
+.Fn msleep_bt ,
+.Fn pause_bt
and
.Fn tsleep_bt
functions take
.Fa bt
-argument instead of
+parameter instead of
.Fa timo .
It allows to specify wakeup time with higher resolution as absolute time
since boot in form of
Modified: projects/calloutng/share/man/man9/timeout.9
==============================================================================
--- projects/calloutng/share/man/man9/timeout.9 Sun Dec 16 09:39:20 2012 (r244285)
+++ projects/calloutng/share/man/man9/timeout.9 Sun Dec 16 10:12:40 2012 (r244286)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 14, 2012
+.Dd December 16, 2012
.Dt TIMEOUT 9
.Os
.Sh NAME
@@ -42,6 +42,7 @@
.Nm callout_stop ,
.Nm callout_drain ,
.Nm callout_reset ,
+.Nm callout_reset_flags ,
.Nm callout_reset_on ,
.Nm callout_reset_flags_on ,
.Nm callout_reset_bt_on ,
@@ -81,6 +82,9 @@ struct callout_handle handle = CALLOUT_H
.Ft int
.Fn callout_reset "struct callout *c" "int ticks" "timeout_t *func" "void *arg"
.Ft int
+.Fn callout_reset_flags "struct callout *c" "int ticks" "timeout_t *func" \
+"void *arg" "int flags"
+.Ft int
.Fn callout_reset_on "struct callout *c" "int ticks" "timeout_t *func" \
"void *arg" "int cpu"
.Ft int
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 11:16:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 7D3C2C4A;
Sun, 16 Dec 2012 11:16:14 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6158C8FC13;
Sun, 16 Dec 2012 11:16:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGBGEPM063984;
Sun, 16 Dec 2012 11:16:14 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGBGEwn063983;
Sun, 16 Dec 2012 11:16:14 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212161116.qBGBGEwn063983@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 11:16:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244287 - projects/calloutng/sys/x86/isa
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 11:16:14 -0000
Author: mav
Date: Sun Dec 16 11:16:13 2012
New Revision: 244287
URL: http://svnweb.freebsd.org/changeset/base/244287
Log:
Mostly out of fun, teach i8254 eventtimer driver to program only LSB for
very short time intervals (<214us). This allows to get less then 22us
usleep(1) time from this anscient timer. It is even better then HPET time
now, just with much higher CPU usage.
Modified:
projects/calloutng/sys/x86/isa/clock.c
Modified: projects/calloutng/sys/x86/isa/clock.c
==============================================================================
--- projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 10:12:40 2012 (r244286)
+++ projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 11:16:13 2012 (r244287)
@@ -125,6 +125,7 @@ struct attimer_softc {
static struct attimer_softc *attimer_sc = NULL;
static int timer0_period = -2;
+static int timer0_last = 0xffff;
/* Values for timerX_state: */
#define RELEASED 0
@@ -433,11 +434,17 @@ set_i8254_freq(int mode, uint32_t period
outb(TIMER_CNTR0, new_count >> 8);
break;
case MODE_ONESHOT:
+ if (new_count < 256 && timer0_last < 256) {
+ outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_LSB);
+ outb(TIMER_CNTR0, new_count & 0xff);
+ break;
+ }
outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT);
outb(TIMER_CNTR0, new_count & 0xff);
outb(TIMER_CNTR0, new_count >> 8);
break;
}
+ timer0_last = new_count;
out:
mtx_unlock_spin(&clock_lock);
}
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 14:09:19 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B24FB2EF;
Sun, 16 Dec 2012 14:09:19 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7F3048FC20;
Sun, 16 Dec 2012 14:09:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGE9JXi089408;
Sun, 16 Dec 2012 14:09:19 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGE9Jn9089407;
Sun, 16 Dec 2012 14:09:19 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212161409.qBGE9Jn9089407@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 14:09:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244290 - projects/calloutng/sys/x86/isa
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 14:09:19 -0000
Author: mav
Date: Sun Dec 16 14:09:18 2012
New Revision: 244290
URL: http://svnweb.freebsd.org/changeset/base/244290
Log:
Continue fun of r244287: do not write i8254 mode register if the same value
was already written earlier. This reduces usleep(1) latency with i8254
eventtimer from 22 to 19.5us.
Hinted by: bde
Modified:
projects/calloutng/sys/x86/isa/clock.c
Modified: projects/calloutng/sys/x86/isa/clock.c
==============================================================================
--- projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 14:01:56 2012 (r244289)
+++ projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 14:09:18 2012 (r244290)
@@ -125,6 +125,7 @@ struct attimer_softc {
static struct attimer_softc *attimer_sc = NULL;
static int timer0_period = -2;
+static int timer0_mode = 0xffff;
static int timer0_last = 0xffff;
/* Values for timerX_state: */
@@ -405,7 +406,7 @@ DELAY(int n)
static void
set_i8254_freq(int mode, uint32_t period)
{
- int new_count;
+ int new_count, new_mode;
mtx_lock_spin(&clock_lock);
if (mode == MODE_STOP) {
@@ -424,26 +425,33 @@ set_i8254_freq(int mode, uint32_t period
timer0_period = (mode == MODE_PERIODIC) ? new_count : -1;
switch (mode) {
case MODE_STOP:
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT);
+ new_mode = TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT;
+ outb(TIMER_MODE, new_mode);
outb(TIMER_CNTR0, 0);
outb(TIMER_CNTR0, 0);
break;
case MODE_PERIODIC:
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT);
+ new_mode = TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT;
+ outb(TIMER_MODE, new_mode);
outb(TIMER_CNTR0, new_count & 0xff);
outb(TIMER_CNTR0, new_count >> 8);
break;
case MODE_ONESHOT:
if (new_count < 256 && timer0_last < 256) {
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_LSB);
+ new_mode = TIMER_SEL0 | TIMER_INTTC | TIMER_LSB;
+ if (new_mode != timer0_mode)
+ outb(TIMER_MODE, new_mode);
outb(TIMER_CNTR0, new_count & 0xff);
break;
}
- outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT);
+ new_mode = TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT;
+ if (new_mode != timer0_mode)
+ outb(TIMER_MODE, new_mode);
outb(TIMER_CNTR0, new_count & 0xff);
outb(TIMER_CNTR0, new_count >> 8);
break;
}
+ timer0_mode = new_mode;
timer0_last = new_count;
out:
mtx_unlock_spin(&clock_lock);
@@ -454,6 +462,8 @@ i8254_restore(void)
{
timer0_period = -2;
+ timer0_mode = 0xffff;
+ timer0_last = 0xffff;
if (attimer_sc != NULL)
set_i8254_freq(attimer_sc->mode, attimer_sc->period);
else
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 16:57:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3709418D;
Sun, 16 Dec 2012 16:57:53 +0000 (UTC)
(envelope-from adrian.chadd@gmail.com)
Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52])
by mx1.freebsd.org (Postfix) with ESMTP id 695998FC0A;
Sun, 16 Dec 2012 16:57:51 +0000 (UTC)
Received: by mail-wg0-f52.google.com with SMTP id 12so2179206wgh.31
for <multiple recipients>; Sun, 16 Dec 2012 08:57:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=EMoi6sAKTVjGiUwmfdZir7Y0zkIvSuAPjlG0q8l45yg=;
b=Atr2FleW9Hus6C8GN90C5+txVQoU948tYX9R8Xeq29Hfrl2Yiakiw20VZHImSA2atS
4ymlnEspZQHT/c0wuczXsRALsdBLDxKh0N3UWQgVnc04FfzNZgG3KzIEYihmUDJTKR/U
HSEWRbdaqPciYhCDSQou0J6ToOMX+RCgx2s2Z363sRjRf3uo4ygx+JreqiaSkPpCFYFN
o8fG9pkVpX4WFYlfL0mFto4nZcFdVVudb4iXBcGtPXOVwYwHt1NrskMso7ZtzE/z04En
xfdecOhLvifYqHBf4+3Kv4vpT5c45P3f1z2uZNwhT6xJhYdt2crhDKAPdwmTQ7cU+ljT
ZRyQ==
MIME-Version: 1.0
Received: by 10.194.93.40 with SMTP id cr8mr12872526wjb.16.1355677071296; Sun,
16 Dec 2012 08:57:51 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.217.57.9 with HTTP; Sun, 16 Dec 2012 08:57:51 -0800 (PST)
In-Reply-To: <201212161116.qBGBGEwn063983@svn.freebsd.org>
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
Date: Sun, 16 Dec 2012 08:57:51 -0800
X-Google-Sender-Auth: ys1dizEOPe2Bm8NWqvtFRsoGIEU
Message-ID: <CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
From: Adrian Chadd <adrian@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 16:57:53 -0000
Have you guys even remotely verified that all the weird i8254 clones
support this operation?
Considering our track record with breaking some of the legacy hardware
(and preventing stable operation on things like Alix boards), I'd
really like to see this particular option hide behind a runtime or
build config twiddle.
Thanks,
Adrian
On 16 December 2012 03:16, Alexander Motin <mav@freebsd.org> wrote:
> Author: mav
> Date: Sun Dec 16 11:16:13 2012
> New Revision: 244287
> URL: http://svnweb.freebsd.org/changeset/base/244287
>
> Log:
> Mostly out of fun, teach i8254 eventtimer driver to program only LSB for
> very short time intervals (<214us). This allows to get less then 22us
> usleep(1) time from this anscient timer. It is even better then HPET time
> now, just with much higher CPU usage.
>
> Modified:
> projects/calloutng/sys/x86/isa/clock.c
>
> Modified: projects/calloutng/sys/x86/isa/clock.c
> ==============================================================================
> --- projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 10:12:40 2012 (r244286)
> +++ projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 11:16:13 2012 (r244287)
> @@ -125,6 +125,7 @@ struct attimer_softc {
> static struct attimer_softc *attimer_sc = NULL;
>
> static int timer0_period = -2;
> +static int timer0_last = 0xffff;
>
> /* Values for timerX_state: */
> #define RELEASED 0
> @@ -433,11 +434,17 @@ set_i8254_freq(int mode, uint32_t period
> outb(TIMER_CNTR0, new_count >> 8);
> break;
> case MODE_ONESHOT:
> + if (new_count < 256 && timer0_last < 256) {
> + outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_LSB);
> + outb(TIMER_CNTR0, new_count & 0xff);
> + break;
> + }
> outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT);
> outb(TIMER_CNTR0, new_count & 0xff);
> outb(TIMER_CNTR0, new_count >> 8);
> break;
> }
> + timer0_last = new_count;
> out:
> mtx_unlock_spin(&clock_lock);
> }
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 17:11:03 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B81EDCFD;
Sun, 16 Dec 2012 17:11:03 +0000 (UTC)
(envelope-from mavbsd@gmail.com)
Received: from mail-we0-f182.google.com (mail-we0-f182.google.com
[74.125.82.182])
by mx1.freebsd.org (Postfix) with ESMTP id D35EC8FC0C;
Sun, 16 Dec 2012 17:11:02 +0000 (UTC)
Received: by mail-we0-f182.google.com with SMTP id u54so2367336wey.13
for <multiple recipients>; Sun, 16 Dec 2012 09:10:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
:references:in-reply-to:content-type:content-transfer-encoding;
bh=VfCQsS8QRZJgV4PGHKKBEmWJFnk4r3jEzJZo3/zeU9k=;
b=A8nzTcNPtEvjcy9j1lY9Fx1q0QSEinXRZh/35BQwrcxnGJqAJ7r13UXZvf1+7XFZM8
4LqX3nkq+LnK71bxd0YabKolvILLW7bve1zKtibWpau/4ahjIlBNWtO9UE3Prtza9M+d
RtalEXFxV6r0IO8NWylcglDOgTv4vIcaCY0GX8d99sJalnVI/CZo32edPfX2APrEyG1u
Pzf9CicpJjQLXKpp0PwdbdZa3U+QS32fa48+TQZ+4Px7PTu6HfWySClvP5B04B/tX7ap
wGBX4qa/wqsAWPidAn8nw7BSSGCBDgIVZ9hPK8T5EuWR4nl2zSJOvFxcPoXqfbtysU/i
iCGg==
Received: by 10.194.88.98 with SMTP id bf2mr12797547wjb.49.1355677855709;
Sun, 16 Dec 2012 09:10:55 -0800 (PST)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
by mx.google.com with ESMTPS id h19sm7391209wiv.7.2012.12.16.09.10.53
(version=TLSv1/SSLv3 cipher=OTHER);
Sun, 16 Dec 2012 09:10:54 -0800 (PST)
Sender: Alexander Motin <mavbsd@gmail.com>
Message-ID: <50CE009B.7010804@FreeBSD.org>
Date: Sun, 16 Dec 2012 19:10:51 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:13.0) Gecko/20120628 Thunderbird/13.0.1
MIME-Version: 1.0
To: Adrian Chadd <adrian@freebsd.org>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
<CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
In-Reply-To: <CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 17:11:03 -0000
On 16.12.2012 18:57, Adrian Chadd wrote:
> Have you guys even remotely verified that all the weird i8254 clones
> support this operation?
>
> Considering our track record with breaking some of the legacy hardware
> (and preventing stable operation on things like Alix boards), I'd
> really like to see this particular option hide behind a runtime or
> build config twiddle.
This change affects only one-shot operation mode of i8254 eventtimer,
which we can't enable by default because it can't coexist with i8254
timecounter, which we can't disable by default because we can't be sure
that there is any other timecounter. That is why I've written about
fun. And no, I have no all possible weird i8254 clones to test, so any
help and ideas are welcome. :)
> On 16 December 2012 03:16, Alexander Motin <mav@freebsd.org> wrote:
>> Author: mav
>> Date: Sun Dec 16 11:16:13 2012
>> New Revision: 244287
>> URL: http://svnweb.freebsd.org/changeset/base/244287
>>
>> Log:
>> Mostly out of fun, teach i8254 eventtimer driver to program only LSB for
>> very short time intervals (<214us). This allows to get less then 22us
>> usleep(1) time from this anscient timer. It is even better then HPET time
>> now, just with much higher CPU usage.
>>
>> Modified:
>> projects/calloutng/sys/x86/isa/clock.c
>>
>> Modified: projects/calloutng/sys/x86/isa/clock.c
>> ==============================================================================
>> --- projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 10:12:40 2012 (r244286)
>> +++ projects/calloutng/sys/x86/isa/clock.c Sun Dec 16 11:16:13 2012 (r244287)
>> @@ -125,6 +125,7 @@ struct attimer_softc {
>> static struct attimer_softc *attimer_sc = NULL;
>>
>> static int timer0_period = -2;
>> +static int timer0_last = 0xffff;
>>
>> /* Values for timerX_state: */
>> #define RELEASED 0
>> @@ -433,11 +434,17 @@ set_i8254_freq(int mode, uint32_t period
>> outb(TIMER_CNTR0, new_count >> 8);
>> break;
>> case MODE_ONESHOT:
>> + if (new_count < 256 && timer0_last < 256) {
>> + outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_LSB);
>> + outb(TIMER_CNTR0, new_count & 0xff);
>> + break;
>> + }
>> outb(TIMER_MODE, TIMER_SEL0 | TIMER_INTTC | TIMER_16BIT);
>> outb(TIMER_CNTR0, new_count & 0xff);
>> outb(TIMER_CNTR0, new_count >> 8);
>> break;
>> }
>> + timer0_last = new_count;
>> out:
>> mtx_unlock_spin(&clock_lock);
>> }
--
Alexander Motin
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 17:18:54 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 9A053EA1;
Sun, 16 Dec 2012 17:18:54 +0000 (UTC)
(envelope-from adrian.chadd@gmail.com)
Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com
[209.85.212.174])
by mx1.freebsd.org (Postfix) with ESMTP id CFDDF8FC0A;
Sun, 16 Dec 2012 17:18:53 +0000 (UTC)
Received: by mail-wi0-f174.google.com with SMTP id hm9so1467506wib.13
for <multiple recipients>; Sun, 16 Dec 2012 09:18:52 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=0LjH8PexIh6W5vQZXvE+AtYONzpXqJOU9zdr91b17fc=;
b=WTH6/dzxCH5fi7yD/4vulULBCjnEboJUjIPCcw0/W8uBx/1TUnkNxPgNuAv5TOqx5l
zPFuyhR3AGFUt7itZnHnLG+MhaYcQzThzdZ5afpyA9bva+a3y4d2F2EAqn9UbxZ3XjbF
LyF/kEXWlwfi0oleX41paq243EhmzMsMA22JkdBVx3+TCwGpLUg/knoqyESpOhkUnynC
9lFnsegavrAe1m534UOOtzkgjfK9pkcqIGILGNz4jzeUij9wrXH87fTUoDhCRrVB1zXB
xkLD6fJOjD9Fl22Z7rBammVtIzpJyT+vmfGe1hADMavXDRsTK5hhwZGKvLC+a9cnGDhb
R2Yw==
MIME-Version: 1.0
Received: by 10.194.179.34 with SMTP id dd2mr12960139wjc.1.1355678330965; Sun,
16 Dec 2012 09:18:50 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.217.57.9 with HTTP; Sun, 16 Dec 2012 09:18:50 -0800 (PST)
In-Reply-To: <50CE009B.7010804@FreeBSD.org>
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
<CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
<50CE009B.7010804@FreeBSD.org>
Date: Sun, 16 Dec 2012 09:18:50 -0800
X-Google-Sender-Auth: kg6k0cjK6XZNeq7snQzydF8ZAEE
Message-ID: <CAJ-Vmok7rdooCifWmNw2LJ95BSuOwwz6wPeq86x8AcAp7FzuJw@mail.gmail.com>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
From: Adrian Chadd <adrian@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 17:18:54 -0000
On 16 December 2012 09:10, Alexander Motin <mav@freebsd.org> wrote:
> This change affects only one-shot operation mode of i8254 eventtimer, which
> we can't enable by default because it can't coexist with i8254 timecounter,
> which we can't disable by default because we can't be sure that there is any
> other timecounter. That is why I've written about fun. And no, I have no
> all possible weird i8254 clones to test, so any help and ideas are welcome.
> :)
That's why I think you guys have to be very careful here. There's
still plenty of embedded x86 hardware out there which uses
not-quite-matching i8254 silicon implementations.
I realise it's not enabled by default, but by putting this code in
there, you risk having it eventually bubble up and become potentially
available/active on some quirky embedded platforms (or heck,
non-embedded platforms where for some reason the i8254 eventtimer is
active, but the timecounter isn't.)
The point I'm trying to make here is that you guys shouldn't just
change things because you don't think that it'll not be used. You may
not think it's being used but the whole i386 space (embedded or
otherwise) is full of legacy (and non-legacy) hilarity. You should be
really careful that you don't break previous things which you just
don't have a chance in hell of being able to test thoroughly.
We have 15 years of "mostly working" on a really really quirky
platform. You won't get that kind of testing again.
I'm (kind of) sorry for being overly serious and ranty here - but this
is exactly the kind of thing that breaks hardware support in
unpredictable ways, making us all look bad.
Adrian
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 17:44:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 9449C536;
Sun, 16 Dec 2012 17:44:43 +0000 (UTC)
(envelope-from mavbsd@gmail.com)
Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com
[209.85.212.180])
by mx1.freebsd.org (Postfix) with ESMTP id BEB858FC0C;
Sun, 16 Dec 2012 17:44:42 +0000 (UTC)
Received: by mail-wi0-f180.google.com with SMTP id hj13so1477897wib.13
for <multiple recipients>; Sun, 16 Dec 2012 09:44:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
:references:in-reply-to:content-type:content-transfer-encoding;
bh=LeLksY2Grhm1N3TQDNNvXzutgpOFbWXOtX17dTexChU=;
b=0JynrWrJ2ihusz4iV7+sUq9NRo+mb5tLgcGT48JDdY5wgOin6ksOMYangfSN+tMTbM
BOqRS6KWdlTa1ojRqR4ayhg4UmiKWMEsB4BbniK+BuoxdOkr4Yzq062mssHBY1AQhHAb
4MUdXOReyJ5r73VYHRZ+wsgug8ASNJhQHOs0q4/YjohgCa418he5XR1usrlDHXyjautO
vyF0pSGF1pqACwuwn+IFjywVOOPzKIVLvg/gHW48LV1zm7w1UdUkz+wsiSmVqmlZfuGW
a2enGiWb2jEdEtdIU+TVAIxYFsin0QTOnYqEm705ZV+i513ygZ7YPf6rG7QhiHvvBy8g
t9Rw==
Received: by 10.194.79.34 with SMTP id g2mr13006356wjx.17.1355679876237;
Sun, 16 Dec 2012 09:44:36 -0800 (PST)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
by mx.google.com with ESMTPS id fv2sm7524078wib.4.2012.12.16.09.44.34
(version=TLSv1/SSLv3 cipher=OTHER);
Sun, 16 Dec 2012 09:44:35 -0800 (PST)
Sender: Alexander Motin <mavbsd@gmail.com>
Message-ID: <50CE087A.2020200@FreeBSD.org>
Date: Sun, 16 Dec 2012 19:44:26 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:13.0) Gecko/20120628 Thunderbird/13.0.1
MIME-Version: 1.0
To: Adrian Chadd <adrian@freebsd.org>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
<CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
<50CE009B.7010804@FreeBSD.org>
<CAJ-Vmok7rdooCifWmNw2LJ95BSuOwwz6wPeq86x8AcAp7FzuJw@mail.gmail.com>
In-Reply-To: <CAJ-Vmok7rdooCifWmNw2LJ95BSuOwwz6wPeq86x8AcAp7FzuJw@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 17:44:43 -0000
On 16.12.2012 19:18, Adrian Chadd wrote:
> On 16 December 2012 09:10, Alexander Motin <mav@freebsd.org> wrote:
>
>> This change affects only one-shot operation mode of i8254 eventtimer, which
>> we can't enable by default because it can't coexist with i8254 timecounter,
>> which we can't disable by default because we can't be sure that there is any
>> other timecounter. That is why I've written about fun. And no, I have no
>> all possible weird i8254 clones to test, so any help and ideas are welcome.
>> :)
>
> That's why I think you guys have to be very careful here. There's
> still plenty of embedded x86 hardware out there which uses
> not-quite-matching i8254 silicon implementations.
> I realise it's not enabled by default, but by putting this code in
> there, you risk having it eventually bubble up and become potentially
> available/active on some quirky embedded platforms (or heck,
> non-embedded platforms where for some reason the i8254 eventtimer is
> active, but the timecounter isn't.)
>
> The point I'm trying to make here is that you guys shouldn't just
> change things because you don't think that it'll not be used. You may
> not think it's being used but the whole i386 space (embedded or
> otherwise) is full of legacy (and non-legacy) hilarity. You should be
> really careful that you don't break previous things which you just
> don't have a chance in hell of being able to test thoroughly.
>
> We have 15 years of "mostly working" on a really really quirky
> platform. You won't get that kind of testing again.
>
> I'm (kind of) sorry for being overly serious and ranty here - but this
> is exactly the kind of thing that breaks hardware support in
> unpredictable ways, making us all look bad.
I understand your concerns, but we can't get somewhere without walking
steps. As I've told, that feature is disabled by default, and even if it
ever be possible, I will definitely think twice considering risks before
enabling it. The only other thing I can tell into my defense is that I
am running all this code on my personal laptop, several systems from
different generations and classes on my lab table and some other nearby
machines. That is not speaking about help from volunteers. If you know
anything specific why or where that may cause problems, or which
specific tests should I run, I will gladly accept your experience.
--
Alexander Motin
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 19:51:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id AAF8E235;
Sun, 16 Dec 2012 19:51:35 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 90DF88FC13;
Sun, 16 Dec 2012 19:51:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGJpZgL040600;
Sun, 16 Dec 2012 19:51:35 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGJpZDM040598;
Sun, 16 Dec 2012 19:51:35 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212161951.qBGJpZDM040598@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 19:51:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244306 - projects/calloutng/sys/dev/syscons
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 19:51:35 -0000
Author: mav
Date: Sun Dec 16 19:51:34 2012
New Revision: 244306
URL: http://svnweb.freebsd.org/changeset/base/244306
Log:
Reduce syscons "refresh" rate to 1-2Hz when console is in graphics mode
and there is nothing to do except some polling for keyboard. Text mode
refresh would also be nice to have adaptive, but this change at least
should help laptop users who running X.
Modified:
projects/calloutng/sys/dev/syscons/syscons.c
Modified: projects/calloutng/sys/dev/syscons/syscons.c
==============================================================================
--- projects/calloutng/sys/dev/syscons/syscons.c Sun Dec 16 17:01:23 2012 (r244305)
+++ projects/calloutng/sys/dev/syscons/syscons.c Sun Dec 16 19:51:34 2012 (r244306)
@@ -1814,13 +1814,11 @@ static void
scrn_timer(void *arg)
{
#ifndef PC98
- static int kbd_interval = 0;
+ static time_t kbd_time_stamp = 0;
#endif
- struct timeval tv;
sc_softc_t *sc;
scr_stat *scp;
- int again;
- int s;
+ int again, rate;
again = (arg != NULL);
if (arg != NULL)
@@ -1831,18 +1829,14 @@ scrn_timer(void *arg)
return;
/* don't do anything when we are performing some I/O operations */
- if (suspend_in_progress || sc->font_loading_in_progress) {
- if (again)
- callout_reset_flags(&sc->ctimeout, hz / 15, scrn_timer, sc,
- C_PRELSET(0));
- return;
- }
- s = spltty();
+ if (suspend_in_progress || sc->font_loading_in_progress)
+ goto done;
#ifndef PC98
if ((sc->kbd == NULL) && (sc->config & SC_AUTODETECT_KBD)) {
/* try to allocate a keyboard automatically */
- if (++kbd_interval >= 25) {
+ if (kbd_time_stamp != time_uptime) {
+ kbd_time_stamp = time_uptime;
sc->keyboard = sc_allocate_keyboard(sc, -1);
if (sc->keyboard >= 0) {
sc->kbd = kbd_get_keyboard(sc->keyboard);
@@ -1851,7 +1845,6 @@ scrn_timer(void *arg)
update_kbd_state(sc->cur_scp, sc->cur_scp->status,
LOCK_MASK);
}
- kbd_interval = 0;
}
}
#endif /* PC98 */
@@ -1860,16 +1853,15 @@ scrn_timer(void *arg)
scp = sc->cur_scp;
/* should we stop the screen saver? */
- getmicrouptime(&tv);
if (debugger > 0 || panicstr || shutdown_in_progress)
sc_touch_scrn_saver();
if (run_scrn_saver) {
- if (tv.tv_sec > sc->scrn_time_stamp + scrn_blank_time)
+ if (time_uptime > sc->scrn_time_stamp + scrn_blank_time)
sc->flags |= SC_SCRN_IDLE;
else
sc->flags &= ~SC_SCRN_IDLE;
} else {
- sc->scrn_time_stamp = tv.tv_sec;
+ sc->scrn_time_stamp = time_uptime;
sc->flags &= ~SC_SCRN_IDLE;
if (scrn_blank_time > 0)
run_scrn_saver = TRUE;
@@ -1882,13 +1874,8 @@ scrn_timer(void *arg)
/* should we just return ? */
if (sc->blink_in_progress || sc->switch_in_progress
- || sc->write_in_progress) {
- if (again)
- callout_reset_flags(&sc->ctimeout, hz / 15, scrn_timer, sc,
- C_PRELSET(0));
- splx(s);
- return;
- }
+ || sc->write_in_progress)
+ goto done;
/* Update the screen */
scp = sc->cur_scp; /* cur_scp may have changed... */
@@ -1902,10 +1889,19 @@ scrn_timer(void *arg)
(*current_saver)(sc, TRUE);
#endif
- if (again)
- callout_reset_flags(&sc->ctimeout, hz / 30, scrn_timer, sc,
+done:
+ if (again) {
+ /*
+ * Use reduced "refresh" rate if we are in graphics and that is not a
+ * graphical screen saver. In such case we just have nothing to do.
+ */
+ if (ISGRAPHSC(scp) && !(sc->flags & SC_SCRN_BLANKED))
+ rate = 2;
+ else
+ rate = 30;
+ callout_reset_flags(&sc->ctimeout, hz / rate, scrn_timer, sc,
C_PRELSET(1));
- splx(s);
+ }
}
static int
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 20:58:39 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id C78C812B;
Sun, 16 Dec 2012 20:58:39 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id AD03F8FC13;
Sun, 16 Dec 2012 20:58:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGKwdJI049355;
Sun, 16 Dec 2012 20:58:39 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGKwdOE049354;
Sun, 16 Dec 2012 20:58:39 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162058.qBGKwdOE049354@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 20:58:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244309 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 20:58:39 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 20:58:39 2012
New Revision: 244309
URL: http://svnweb.freebsd.org/changeset/base/244309
Log:
Give one failure mode a better error message.
Modified:
projects/portbuild/scripts/allgohans
Modified: projects/portbuild/scripts/allgohans
==============================================================================
--- projects/portbuild/scripts/allgohans Sun Dec 16 20:54:07 2012 (r244308)
+++ projects/portbuild/scripts/allgohans Sun Dec 16 20:58:39 2012 (r244309)
@@ -23,7 +23,7 @@ doarch() {
if [ -f "${pbd}/${arch}/portbuild.conf" ]; then
. ${pbd}/${arch}/portbuild.conf
else
- echo "Invalid arch $arch"
+ echo "can't find ${pbd}/${arch}/portbuild.conf"
exit 1
fi
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:02:30 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 20594442;
Sun, 16 Dec 2012 21:02:30 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DFE668FC12;
Sun, 16 Dec 2012 21:02:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGL2TkN050516;
Sun, 16 Dec 2012 21:02:29 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGL2T1d050515;
Sun, 16 Dec 2012 21:02:29 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162102.qBGL2T1d050515@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:02:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244310 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:02:30 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:02:29 2012
New Revision: 244310
URL: http://svnweb.freebsd.org/changeset/base/244310
Log:
Remove group-friendly umask. Remove hardcoding of gcc. Make the .updated
file only after update success.
Modified:
projects/portbuild/scripts/dopackages
Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages Sun Dec 16 20:58:39 2012 (r244309)
+++ projects/portbuild/scripts/dopackages Sun Dec 16 21:02:29 2012 (r244310)
@@ -9,9 +9,6 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts
-# make writable by group
-umask 002
-
journalname="journal"
usage () {
@@ -480,11 +477,11 @@ if [ "$skipstart" = 0 ]; then
echo "updating ${PORTSDIR} from ${VCS}"
echo "================================================"
cd ${PORTSDIR}
- updated=$(date '+%Y/%m/%d %H:%M')
- echo ${updated} > ${builddir}/ports/.updated
# XXX MCL 20121120 not yet tested.
${VCS_UPDATE_COMMAND} ${builddir}/ports || mailexit 1
# XXX Check for conflicts
+ updated=$(date '+%Y/%m/%d %H:%M')
+ echo ${updated} > ${builddir}/ports/.updated
else
# echo "XXX at build portsupdate portsupdate ${arch} ${branch} ${buildid} $@ "
build portsupdate ${arch} ${branch} ${buildid} $@
@@ -700,7 +697,7 @@ if [ "$nobuild" = 0 ]; then
fi
# Compile ptimeout.
- /usr/bin/gcc -o ${builddir}/ptimeout -Wall ${pbc}/sources/ptimeout.c
+ /usr/bin/cc -o ${builddir}/ptimeout -Wall ${pbc}/sources/ptimeout.c
dobuild ${pbc} ${arch} ${branch} ${builddir}
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:04:08 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 25B4E56F;
Sun, 16 Dec 2012 21:04:08 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 08CDE8FC14;
Sun, 16 Dec 2012 21:04:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGL47tZ050849;
Sun, 16 Dec 2012 21:04:07 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGL471Y050848;
Sun, 16 Dec 2012 21:04:07 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162104.qBGL471Y050848@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:04:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244311 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:04:08 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:04:07 2012
New Revision: 244311
URL: http://svnweb.freebsd.org/changeset/base/244311
Log:
Remove hard-coding of gcc.
Modified:
projects/portbuild/scripts/pdispatch
Modified: projects/portbuild/scripts/pdispatch
==============================================================================
--- projects/portbuild/scripts/pdispatch Sun Dec 16 21:02:29 2012 (r244310)
+++ projects/portbuild/scripts/pdispatch Sun Dec 16 21:04:07 2012 (r244311)
@@ -145,7 +145,7 @@ rm -f ${builddir}/logs/${pkgname}.log ${
rm -f ${builddir}/errors/${pkgname}.log ${builddir}/errors/${pkgname}.log.bz2
if [ ! -f ${builddir}/ptimeout ]; then
- /usr/bin/gcc -o ${builddir}/ptimeout -Wall ${pbc}/sources/ptimeout.c
+ /usr/bin/cc -o ${builddir}/ptimeout -Wall ${pbc}/sources/ptimeout.c
fi
${builddir}/ptimeout $timeout ${ssh_cmd} -a -n ${client_user}@${host} ${sudo_cmd} ${command} ${arch} ${branch} ${buildid} ${chroot} ${flags} \"$ED\" \"$PD\" \"$FD\" \"$BD\" \"$RD\" \"$PKGD\" ${args} 2>&1
error=$?
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:05:55 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 407E1790;
Sun, 16 Dec 2012 21:05:55 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2387B8FC0A;
Sun, 16 Dec 2012 21:05:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGL5tuX051176;
Sun, 16 Dec 2012 21:05:55 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGL5tId051175;
Sun, 16 Dec 2012 21:05:55 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162105.qBGL5tId051175@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:05:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244312 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:05:55 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:05:54 2012
New Revision: 244312
URL: http://svnweb.freebsd.org/changeset/base/244312
Log:
Remove potentially unneccessary chown.
Modified:
projects/portbuild/scripts/portbuild
Modified: projects/portbuild/scripts/portbuild
==============================================================================
--- projects/portbuild/scripts/portbuild Sun Dec 16 21:04:07 2012 (r244311)
+++ projects/portbuild/scripts/portbuild Sun Dec 16 21:05:54 2012 (r244312)
@@ -328,7 +328,9 @@ if [ ! -f /tmp/${buildid}/sources/pnohan
if [ $? -ne 0 ]; then
error=255
else
- chown ports-${arch} ${chroot}/pnohang
+ # XXX MCL 20121214 as a test, just delete this and add a chmod
+ # chown ports-${arch} ${chroot}/pnohang
+ chmod 555 ${chroot}/pnohang
cp -p ${chroot}/pnohang /tmp/${buildid}/sources/
fi
else
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:06:32 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 154738B2;
Sun, 16 Dec 2012 21:06:32 +0000 (UTC)
(envelope-from adrian.chadd@gmail.com)
Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52])
by mx1.freebsd.org (Postfix) with ESMTP id 321068FC12;
Sun, 16 Dec 2012 21:06:30 +0000 (UTC)
Received: by mail-wg0-f52.google.com with SMTP id 12so2245062wgh.31
for <multiple recipients>; Sun, 16 Dec 2012 13:06:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=tbR0AfXpkOKpqvV4ojPRFTPBE8/e/oCAQT5Vu99dsSI=;
b=APjctWMDd6C/VbCRsW0JayNC2WYNyxiSTXgleIl7bBY9M5sDWGSgGuJbzrZRte2jdI
PD2hLgDZYT9y8RUdIJdJYLX43u4Cr4Vzm+9FsL1MzMZ+EP2821QB3SJ+qaK5PIkDVKgY
rpHlZ5EFPNome+uGTgk99zla9zwsErxaBIWzNY7q+t8UT3wXod3KMKwr9AG8lxMEwNW5
12fkcsFpDc4UUPvNEHjUHKY1BZJNv69nDTH3Yyp+QMdAFHbRkgrOYq74OwcADoEt5eiB
Cl/ioUikx6ei/4a+KzoifP0jT2zI1retEOvubVQ13D/iS05QW8+qVrk6exM7YUh9KJ+j
y80g==
MIME-Version: 1.0
Received: by 10.180.88.138 with SMTP id bg10mr12256496wib.13.1355691984148;
Sun, 16 Dec 2012 13:06:24 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.217.57.9 with HTTP; Sun, 16 Dec 2012 13:06:24 -0800 (PST)
In-Reply-To: <50CE087A.2020200@FreeBSD.org>
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
<CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
<50CE009B.7010804@FreeBSD.org>
<CAJ-Vmok7rdooCifWmNw2LJ95BSuOwwz6wPeq86x8AcAp7FzuJw@mail.gmail.com>
<50CE087A.2020200@FreeBSD.org>
Date: Sun, 16 Dec 2012 13:06:24 -0800
X-Google-Sender-Auth: Vk6Fv8zXYvzkI4y6alB9QP6_iM4
Message-ID: <CAJ-VmomZC1aatO3zREWc0VGPXhmUcCB9GqVF0hqS=+VP2xL3Ag@mail.gmail.com>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
From: Adrian Chadd <adrian@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:06:32 -0000
What we need to do is get you and David a bunch of that older embedded
i386 class hardware to test against.
I can organise some of that to appear in a month or so - soekris
hardware and alix hardware to start with.
I'd also suggest testing on vmware/virtualbox/qemu/parallels installs
where you explicitly enable the legacy timer hardware and see what the
behaviour is.
Adrian
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:10:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 78D7FA1A;
Sun, 16 Dec 2012 21:10:23 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 45ED28FC17;
Sun, 16 Dec 2012 21:10:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGLAN8r052171;
Sun, 16 Dec 2012 21:10:23 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGLAM5e052168;
Sun, 16 Dec 2012 21:10:22 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162110.qBGLAM5e052168@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:10:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244313 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:10:23 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:10:22 2012
New Revision: 244313
URL: http://svnweb.freebsd.org/changeset/base/244313
Log:
Get rid of group writeability. Don't write .updated until it really has.
Modified:
projects/portbuild/scripts/updatesnap
projects/portbuild/scripts/updatesnap.ports
Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap Sun Dec 16 21:05:54 2012 (r244312)
+++ projects/portbuild/scripts/updatesnap Sun Dec 16 21:10:22 2012 (r244313)
@@ -32,9 +32,6 @@ finish() {
begin=$(date +%s)
echo "Started at $(date)"
-# We need to preserve group writability
-umask 002
-
uid=${PORTBUILD_USER}
if [ ! -z "${PORTBUILD_GROUP}" ]; then
gid=${PORTBUILD_GROUP}
@@ -93,7 +90,6 @@ for branch in $SRC_BRANCHES; do
fi
${VCS_OVERWRITE_COMMAND} ${mountpoint}/src || finish 1
fi
- echo ${fulldate} > src/.updated
# hack for zfs breakiness
find . -group wheel | xargs chgrp ${gid}
snapdate=$(stamp ${fulldate})
@@ -101,6 +97,7 @@ for branch in $SRC_BRANCHES; do
echo "zfs snapshot ${zbase_prefix}${branch}/src@${snapdate}"
fi
zfs snapshot ${zbase_prefix}${branch}/src@${snapdate} || finish 1
+ echo ${fulldate} > src/.updated
done
finish 0
Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports Sun Dec 16 21:05:54 2012 (r244312)
+++ projects/portbuild/scripts/updatesnap.ports Sun Dec 16 21:10:22 2012 (r244313)
@@ -32,9 +32,6 @@ finish() {
begin=$(date +%s)
echo "Started at $(date)"
-# We need to preserve group writability
-umask 002
-
uid=${PORTBUILD_USER}
if [ ! -z "${PORTBUILD_GROUP}" ]; then
gid=${PORTBUILD_GROUP}
@@ -85,7 +82,6 @@ else
fi
${VCS_OVERWRITE_COMMAND} ${head}/ports || finish 1
fi
-echo ${fulldate} > ports/.updated
# hack for zfs breakiness
find . -group wheel | xargs chgrp ${gid}
snapdate=$(stamp ${fulldate})
@@ -93,5 +89,6 @@ if [ $VERBOSE ]; then
echo "zfs snapshot ${zhead}/ports@${snapdate}"
fi
zfs snapshot ${zhead}/ports@${snapdate} || finish 1
+echo ${fulldate} > ports/.updated
finish 0
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:13:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2953EB49;
Sun, 16 Dec 2012 21:13:41 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E7C238FC0A;
Sun, 16 Dec 2012 21:13:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGLDevE052684;
Sun, 16 Dec 2012 21:13:40 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGLDeHp052681;
Sun, 16 Dec 2012 21:13:40 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162113.qBGLDeHp052681@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 21:13:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244314 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:13:41 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 21:13:40 2012
New Revision: 244314
URL: http://svnweb.freebsd.org/changeset/base/244314
Log:
Further work to parameterize uid and gid.
Modified:
projects/portbuild/scripts/build
projects/portbuild/scripts/buildproxy
Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build Sun Dec 16 21:10:22 2012 (r244313)
+++ projects/portbuild/scripts/build Sun Dec 16 21:13:40 2012 (r244314)
@@ -166,7 +166,7 @@ do_create() {
fi
# create the links for the webserver under ../errorlogs/. Note
- # non ports-<arch> ownership of this directory!
+ # possibly different ownership of this directory!
errorlogs=${pbd}/errorlogs
portbuild_uid=${PORTBUILD_USER}
if [ ! -d ${errorlogs} ]; then
@@ -583,7 +583,11 @@ pbab=${pbd}/${arch}/${branch}
validate_env ${arch} ${branch} || exit 1
-uid=ports-${arch}
+if [ ! -z "${PORTBUILD_USER}" ]; then
+ uid=${PORTBUILD_USER}
+else
+ uid=ports-${arch}
+fi
if [ ! -z "${PORTBUILD_GROUP}" ]; then
gid=${PORTBUILD_GROUP}
else
Modified: projects/portbuild/scripts/buildproxy
==============================================================================
--- projects/portbuild/scripts/buildproxy Sun Dec 16 21:10:22 2012 (r244313)
+++ projects/portbuild/scripts/buildproxy Sun Dec 16 21:13:40 2012 (r244314)
@@ -25,7 +25,7 @@ def validate(uid, arch):
if uid == 0:
return True
- if getuidbyname("ports-%s" % arch) == uid:
+ if getuidbyname(portbuild_uid) == uid:
return True
return False
@@ -58,17 +58,24 @@ def process(cmd, sockfile):
config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME )
BUILDPROXY_SOCKET_FILE = config.get( 'BUILDPROXY_SOCKET_FILE' )
+PORTBUILD_USER = config.get( 'PORTBUILD_USER' )
PORTBUILD_GROUP = config.get( 'PORTBUILD_GROUP' )
+portbuild_uid = PORTBUILD_USER
+if not portbuild_uid:
+ portbuild_uid = "ports-" + arch
+
if os.path.exists(BUILDPROXY_SOCKET_FILE):
os.unlink(BUILDPROXY_SOCKET_FILE)
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
s.bind(BUILDPROXY_SOCKET_FILE)
-if not PORTBUILD_GROUP:
- os.chmod(BUILDPROXY_SOCKET_FILE, 0600)
-else:
- os.chmod(BUILDPROXY_SOCKET_FILE, 0660)
- os.chown(BUILDPROXY_SOCKET_FILE, -1, getgidbyname(PORTBUILD_GROUP))
+os.chmod(BUILDPROXY_SOCKET_FILE, 0600)
+if PORTBUILD_USER:
+ if PORTBUILD_GROUP:
+ os.chown(BUILDPROXY_SOCKET_FILE, getuidbyname(PORTBUILD_USER), getgidbyname(PORTBUILD_GROUP))
+ os.chmod(BUILDPROXY_SOCKET_FILE, 0660)
+ else:
+ os.chown(BUILDPROXY_SOCKET_FILE, getuidbyname(PORTBUILD_USER), -1)
s.listen(10)
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 21:57:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3E0BF243;
Sun, 16 Dec 2012 21:57:35 +0000 (UTC)
(envelope-from mavbsd@gmail.com)
Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com
[209.85.212.180])
by mx1.freebsd.org (Postfix) with ESMTP id 68B698FC12;
Sun, 16 Dec 2012 21:57:34 +0000 (UTC)
Received: by mail-wi0-f180.google.com with SMTP id hj13so1552486wib.13
for <multiple recipients>; Sun, 16 Dec 2012 13:57:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
:references:in-reply-to:content-type:content-transfer-encoding;
bh=mH0wdA2iTOx34f+Hf76RsnckjHUZ6wt3aYaCuTE1+XM=;
b=tDZQCLIaOjWTqtpLslh2klXI3Nv0E0LCcnniCB0pbutIzPekg7TjPqlA7joffxtRUY
nL4Vu2MYn8/3qKNG74gk6XlGAfWpWwnQpOBPUE7gqGEXnHwYTNoARbRiol1u34UeR/Kg
OK0rgyY+QnOyBKxmxqDmohPk1zlTEWZdrkak+AF+RlqwT6XMC/lRIdn+uJt+CoD0gFWO
tfVAGZMNy7QwuXXPtBJxIa/JytuEMss5vufgrjT4256SrajqSty32rcNNJePB/+yFz9H
csEgE9Gmn8tZkBEPAZ7HG8b4lTtShFlO5SJPfDckbL0KOJD/HddupFIi+4odWT1KK/n2
GqlA==
Received: by 10.194.83.36 with SMTP id n4mr3033817wjy.59.1355695053233;
Sun, 16 Dec 2012 13:57:33 -0800 (PST)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
by mx.google.com with ESMTPS id i2sm8495689wiw.3.2012.12.16.13.57.31
(version=TLSv1/SSLv3 cipher=OTHER);
Sun, 16 Dec 2012 13:57:32 -0800 (PST)
Sender: Alexander Motin <mavbsd@gmail.com>
Message-ID: <50CE43C9.4030809@FreeBSD.org>
Date: Sun, 16 Dec 2012 23:57:29 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:13.0) Gecko/20120628 Thunderbird/13.0.1
MIME-Version: 1.0
To: Adrian Chadd <adrian@freebsd.org>
Subject: Re: svn commit: r244287 - projects/calloutng/sys/x86/isa
References: <201212161116.qBGBGEwn063983@svn.freebsd.org>
<CAJ-VmonYuh4dTwY9PjBmE4uOq8nNAL_kDKXpi6knwvc99PqJcw@mail.gmail.com>
<50CE009B.7010804@FreeBSD.org>
<CAJ-Vmok7rdooCifWmNw2LJ95BSuOwwz6wPeq86x8AcAp7FzuJw@mail.gmail.com>
<50CE087A.2020200@FreeBSD.org>
<CAJ-VmomZC1aatO3zREWc0VGPXhmUcCB9GqVF0hqS=+VP2xL3Ag@mail.gmail.com>
In-Reply-To: <CAJ-VmomZC1aatO3zREWc0VGPXhmUcCB9GqVF0hqS=+VP2xL3Ag@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 21:57:35 -0000
On 16.12.2012 23:06, Adrian Chadd wrote:
> What we need to do is get you and David a bunch of that older embedded
> i386 class hardware to test against.
>
> I can organise some of that to appear in a month or so - soekris
> hardware and alix hardware to start with.
>
> I'd also suggest testing on vmware/virtualbox/qemu/parallels installs
> where you explicitly enable the legacy timer hardware and see what the
> behaviour is.
Testing and new hardware is always great, but one-shot timers are
already working in FreeBSD for quite a while since FreeBSD 9.0. The only
change to the low-level timer driver in this branch was mentioned here
and it is irrelevant for now. Most of work done in this branch is
machine-independent, and it is not very important on which hardware to
test it. But I am still trying to test on as many kinds as I can just to
be safe. Testing under VM is a good idea, as it may have very specific
timing characteristics.
Still IMO much more interesting would be to try some more different
workloads. If you can propose some workloads that actively use callouts,
it would be interesting to try them. I've tried mentioned disk and TCP
I/O and got no problems. In both cases profiler shows new callouts
consuming no more then couple percents of CPU time, that is not bad.
Synthetic tests are also doing well.
Me and Davide are now quite satisfied with the present state of the
code. Unless something significant will be found/reported, I think we
could commit it somewhere closer to the end of the week.
--
Alexander Motin
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 22:06:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 994E95AD;
Sun, 16 Dec 2012 22:06:34 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 798308FC14;
Sun, 16 Dec 2012 22:06:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGM6YI6060007;
Sun, 16 Dec 2012 22:06:34 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGM6Swm059966;
Sun, 16 Dec 2012 22:06:28 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212162206.qBGM6Swm059966@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 22:06:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244315 - in projects/calloutng:
contrib/binutils/gas/config contrib/gcc contrib/gcc/config/arm
contrib/openbsm contrib/openbsm/bin/auditdistd contrib/openbsm/config
contrib/openbsm/etc...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 22:06:34 -0000
Author: mav
Date: Sun Dec 16 22:06:28 2012
New Revision: 244315
URL: http://svnweb.freebsd.org/changeset/base/244315
Log:
MFC @ r244314
Added:
projects/calloutng/sys/security/audit/bsm_domain.c
- copied unchanged from r244314, head/sys/security/audit/bsm_domain.c
projects/calloutng/sys/security/audit/bsm_errno.c
- copied unchanged from r244314, head/sys/security/audit/bsm_errno.c
projects/calloutng/sys/security/audit/bsm_fcntl.c
- copied unchanged from r244314, head/sys/security/audit/bsm_fcntl.c
projects/calloutng/sys/security/audit/bsm_socket_type.c
- copied unchanged from r244314, head/sys/security/audit/bsm_socket_type.c
projects/calloutng/sys/security/audit/bsm_token.c
- copied unchanged from r244314, head/sys/security/audit/bsm_token.c
Deleted:
projects/calloutng/sys/security/audit/audit_bsm_domain.c
projects/calloutng/sys/security/audit/audit_bsm_errno.c
projects/calloutng/sys/security/audit/audit_bsm_fcntl.c
projects/calloutng/sys/security/audit/audit_bsm_socket_type.c
projects/calloutng/sys/security/audit/audit_bsm_token.c
Modified:
projects/calloutng/contrib/binutils/gas/config/tc-arm.c
projects/calloutng/contrib/gcc/config/arm/arm.h
projects/calloutng/contrib/gcc/longlong.h
projects/calloutng/contrib/openbsm/INSTALL
projects/calloutng/contrib/openbsm/NEWS
projects/calloutng/contrib/openbsm/VERSION
projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
projects/calloutng/contrib/openbsm/config/config.h
projects/calloutng/contrib/openbsm/configure
projects/calloutng/contrib/openbsm/configure.ac
projects/calloutng/contrib/openbsm/etc/audit_event
projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h
projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h
projects/calloutng/gnu/usr.bin/binutils/as/Makefile
projects/calloutng/lib/libdevstat/devstat.3
projects/calloutng/lib/libdevstat/devstat.c
projects/calloutng/lib/libdevstat/devstat.h
projects/calloutng/sbin/growfs/growfs.c
projects/calloutng/sys/arm/conf/VERSATILEPB
projects/calloutng/sys/boot/arm/uboot/Makefile
projects/calloutng/sys/boot/sparc64/boot1/boot1.c
projects/calloutng/sys/conf/files
projects/calloutng/sys/dev/wbwd/wbwd.c
projects/calloutng/sys/kern/kern_sig.c
projects/calloutng/sys/netinet6/in6.c
projects/calloutng/sys/netinet6/in6_var.h
projects/calloutng/sys/netinet6/ip6_input.c
projects/calloutng/sys/netpfil/pf/pf_ioctl.c
projects/calloutng/sys/sparc64/conf/GENERIC
projects/calloutng/tools/tools/sysbuild/sysbuild.sh
projects/calloutng/usr.sbin/iostat/iostat.8
projects/calloutng/usr.sbin/iostat/iostat.c
Directory Properties:
projects/calloutng/ (props changed)
projects/calloutng/contrib/binutils/ (props changed)
projects/calloutng/contrib/gcc/ (props changed)
projects/calloutng/contrib/openbsm/ (props changed)
projects/calloutng/gnu/usr.bin/binutils/ (props changed)
projects/calloutng/sbin/ (props changed)
projects/calloutng/sys/ (props changed)
projects/calloutng/sys/boot/ (props changed)
projects/calloutng/sys/conf/ (props changed)
Modified: projects/calloutng/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/calloutng/contrib/binutils/gas/config/tc-arm.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/binutils/gas/config/tc-arm.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -20107,6 +20107,7 @@ static const struct arm_option_cpu_value
{"softvfp", FPU_ARCH_VFP},
{"softvfp+vfp", FPU_ARCH_VFP_V2},
{"vfp", FPU_ARCH_VFP_V2},
+ {"vfpv2", FPU_ARCH_VFP_V2},
{"vfp9", FPU_ARCH_VFP_V2},
{"vfp3", FPU_ARCH_VFP_V3},
{"vfpv3", FPU_ARCH_VFP_V3},
Modified: projects/calloutng/contrib/gcc/config/arm/arm.h
==============================================================================
--- projects/calloutng/contrib/gcc/config/arm/arm.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/gcc/config/arm/arm.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -1866,8 +1866,10 @@ typedef struct
# define DTOR_LIST_BEGIN asm (ARM_EABI_DTORS_SECTION_OP)
# define DTOR_LIST_END /* empty */
# else /* !defined (__ARM_EABI__) */
+# ifndef __clang__
# define CTORS_SECTION_ASM_OP ARM_CTORS_SECTION_OP
# define DTORS_SECTION_ASM_OP ARM_DTORS_SECTION_OP
+# endif
# endif /* !defined (__ARM_EABI__) */
#endif /* !defined (IN_LIBCC2) */
Modified: projects/calloutng/contrib/gcc/longlong.h
==============================================================================
--- projects/calloutng/contrib/gcc/longlong.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/gcc/longlong.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -205,7 +205,7 @@ UDItype __umulsidi3 (USItype, USItype);
"rI" ((USItype) (bl)) __CLOBBER_CC)
#define umul_ppmm(xh, xl, a, b) \
{register USItype __t0, __t1, __t2; \
- __asm__ ("%@ Inlined umul_ppmm\n" \
+ __asm__ ("/* Inlined umul_ppmm */\n" \
" mov %2, %5, lsr #16\n" \
" mov %0, %6, lsr #16\n" \
" bic %3, %5, %2, lsl #16\n" \
Modified: projects/calloutng/contrib/openbsm/INSTALL
==============================================================================
--- projects/calloutng/contrib/openbsm/INSTALL Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/INSTALL Sun Dec 16 22:06:28 2012 (r244315)
@@ -9,8 +9,8 @@ suppport is found. Typical builds will
make
If doing development work on OpenBSM with gcc, the following invocation of
-configure may be preferred in order to generate full compiler warnings and
-force the compile to fail if a warning is found:
+configure is preferred in order to generate full compiler warnings and force
+the compile to fail if a warning is found:
CFLAGS="-Wall -Werror" ./configure
Modified: projects/calloutng/contrib/openbsm/NEWS
==============================================================================
--- projects/calloutng/contrib/openbsm/NEWS Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/NEWS Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,5 +1,11 @@
OpenBSM Version History
+OpenBSM 1.2 alpha 3
+
+- Various minor tweaks to the auditdistd build to make it fit the FreeBSD
+ build environment better.
+- AUE_WAIT6 merged from FreeBSD 9.
+
OpenBSM 1.2 alpha 2
- auditdistd, a distributed audit trail management daemon, has now been
@@ -489,4 +495,4 @@ OpenBSM 1.0 alpha 1
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#53 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $
Modified: projects/calloutng/contrib/openbsm/VERSION
==============================================================================
--- projects/calloutng/contrib/openbsm/VERSION Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/VERSION Sun Dec 16 22:06:28 2012 (r244315)
@@ -1 +1 @@
-OPENBSM_1_2alpha2
+OPENBSM_1_2_alpha3
Modified: projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Sun Dec 16 22:06:28 2012 (r244315)
@@ -355,7 +355,7 @@ receiver {
.Xr auditdistd 8 .
.Sh AUTHORS
The
-.Nm
-was written by
+.Nm auditdistd
+was developed by
.An Pawel Jakub Dawidek Aq pawel@dawidek.net
under sponsorship of the FreeBSD Foundation.
Modified: projects/calloutng/contrib/openbsm/config/config.h
==============================================================================
--- projects/calloutng/contrib/openbsm/config/config.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/config/config.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -235,7 +235,7 @@
#define PACKAGE_NAME "OpenBSM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.2alpha2"
+#define PACKAGE_STRING "OpenBSM 1.2-alpha3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openbsm"
@@ -244,7 +244,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2alpha2"
+#define PACKAGE_VERSION "1.2-alpha3"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
@@ -280,7 +280,7 @@
#define USE_SYS_ENDIAN_H /**/
/* Version number of package */
-#define VERSION "1.2alpha2"
+#define VERSION "1.2-alpha3"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
Modified: projects/calloutng/contrib/openbsm/configure
==============================================================================
--- projects/calloutng/contrib/openbsm/configure Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/configure Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
#
# Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenBSM'
PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2alpha2'
-PACKAGE_STRING='OpenBSM 1.2alpha2'
+PACKAGE_VERSION='1.2-alpha3'
+PACKAGE_STRING='OpenBSM 1.2-alpha3'
PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";;
+ short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenBSM configure 1.2alpha2
+OpenBSM configure 1.2-alpha3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenBSM $as_me 1.2alpha2, which was
+It was created by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -11552,7 +11552,7 @@ fi
# Define the identity of the package.
PACKAGE=OpenBSM
- VERSION=1.2alpha2
+ VERSION=1.2-alpha3
cat >>confdefs.h <<_ACEOF
@@ -13559,12 +13559,14 @@ int
main ()
{
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
;
return 0;
@@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenBSM $as_me 1.2alpha2, which was
+This file was extended by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14238,7 +14240,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenBSM config.status 1.2alpha2
+OpenBSM config.status 1.2-alpha3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: projects/calloutng/contrib/openbsm/configure.ac
==============================================================================
--- projects/calloutng/contrib/openbsm/configure.ac Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/configure.ac Sun Dec 16 22:06:28 2012 (r244315)
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 $])
+AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
@@ -217,12 +217,14 @@ AC_TRY_LINK([
#endif
#include <stdlib.h>
], [
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
], [], [
AC_DEFINE(USE_COMPAT_ENDIAN_ENC_H,, Define if compat/endian_enc.h is required)
AC_MSG_RESULT([using compat/endian_enc.h])
Modified: projects/calloutng/contrib/openbsm/etc/audit_event
==============================================================================
--- projects/calloutng/contrib/openbsm/etc/audit_event Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/etc/audit_event Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,5 +1,5 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
# $FreeBSD$
#
# The mapping between event identifiers and values is also hard-coded in
@@ -562,6 +562,7 @@
43198:AUE_PDKILL:pdkill(2):pc
43199:AUE_PDGETPID:pdgetpid(2):pc
43200:AUE_PDWAIT:pdwait(2):pc
+43201:AUE_WAIT6:wait6(2):pc
#
# Solaris userspace events.
#
Modified: projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h
==============================================================================
--- projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/sys/bsm/audit_kevents.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -601,6 +601,7 @@
#define AUE_PDKILL 43198 /* FreeBSD. */
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
+#define AUE_WAIT6 43201 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
Modified: projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h
==============================================================================
--- projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/contrib/openbsm/sys/bsm/audit_record.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -233,6 +233,7 @@ token_t *au_to_ipc_perm(struct ipc_perm
token_t *au_to_iport(uint16_t iport);
token_t *au_to_opaque(const char *data, uint16_t bytes);
token_t *au_to_path(const char *path);
+token_t *au_to_privset(char *privtypestr, char *privstr);
token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
@@ -278,6 +279,7 @@ token_t *au_to_exec_env(char **envp);
token_t *au_to_text(const char *text);
token_t *au_to_kevent(struct kevent *kev);
token_t *au_to_trailer(int rec_size);
+token_t *au_to_upriv(char sorf, char *priv);
token_t *au_to_zonename(const char *zonename);
/*
Modified: projects/calloutng/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/calloutng/gnu/usr.bin/binutils/as/Makefile Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/gnu/usr.bin/binutils/as/Makefile Sun Dec 16 22:06:28 2012 (r244315)
@@ -8,7 +8,7 @@
.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET} == "arm" || ${TARGET_ARCH} == "powerpc64"
NO_WERROR.clang=
.endif
Modified: projects/calloutng/lib/libdevstat/devstat.3
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.3 Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.3 Sun Dec 16 22:06:28 2012 (r244315)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 18, 2003
+.Dd December 15, 2012
.Dt DEVSTAT 3
.Os
.Sh NAME
@@ -526,6 +526,35 @@ the acquisition of
.Fa previous
and
.Fa current .
+.It Dv DSM_TOTAL_DURATION
+type:
+.Vt "long double *"
+.Pp
+The total duration of transactions, in seconds, between the acquisition of
+.Fa previous
+and
+.Fa current .
+.It Dv DSM_TOTAL_DURATION_OTHER
+.It Dv DSM_TOTAL_DURATION_READ
+.It Dv DSM_TOTAL_DURATION_WRITE
+.It Dv DSM_TOTAL_DURATION_FREE
+type:
+.Vt "long double *"
+.Pp
+The total duration of transactions of the specified type between
+the acquisition of
+.Fa previous
+and
+.Fa current .
+.It Dv DSM_TOTAL_BUSY_TIME
+type:
+.Vt "long double *"
+.Pp
+Total time the device had one or more transactions outstanding
+between the acquisition of
+.Fa previous
+and
+.Fa current .
.It Dv DSM_TOTAL_BLOCKS
type:
.Vt "uint64_t *"
Modified: projects/calloutng/lib/libdevstat/devstat.c
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -133,6 +133,12 @@ struct devstat_args {
{ DSM_MS_PER_TRANSACTION_FREE, DEVSTAT_ARG_LD },
{ DSM_BUSY_PCT, DEVSTAT_ARG_LD },
{ DSM_QUEUE_LENGTH, DEVSTAT_ARG_UINT64 },
+ { DSM_TOTAL_DURATION, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_READ, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_WRITE, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_FREE, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_DURATION_OTHER, DEVSTAT_ARG_LD },
+ { DSM_TOTAL_BUSY_TIME, DEVSTAT_ARG_LD },
};
static const char *namelist[] = {
@@ -1217,11 +1223,13 @@ devstat_compute_statistics(struct devsta
u_int64_t totaltransfers, totaltransfersread, totaltransferswrite;
u_int64_t totaltransfersother, totalblocks, totalblocksread;
u_int64_t totalblockswrite, totaltransfersfree, totalblocksfree;
+ long double totalduration, totaldurationread, totaldurationwrite;
+ long double totaldurationfree, totaldurationother;
va_list ap;
devstat_metric metric;
u_int64_t *destu64;
long double *destld;
- int retval, i;
+ int retval;
retval = 0;
@@ -1263,6 +1271,13 @@ devstat_compute_statistics(struct devsta
totalblocksfree /= 512;
}
+ totaldurationread = DELTA_T(duration[DEVSTAT_READ]);
+ totaldurationwrite = DELTA_T(duration[DEVSTAT_WRITE]);
+ totaldurationfree = DELTA_T(duration[DEVSTAT_FREE]);
+ totaldurationother = DELTA_T(duration[DEVSTAT_NO_DATA]);
+ totalduration = totaldurationread + totaldurationwrite +
+ totaldurationfree + totaldurationother;
+
va_start(ap, etime);
while ((metric = (devstat_metric)va_arg(ap, devstat_metric)) != 0) {
@@ -1484,9 +1499,7 @@ devstat_compute_statistics(struct devsta
*/
case DSM_MS_PER_TRANSACTION:
if (totaltransfers > 0) {
- *destld = 0;
- for (i = 0; i < DEVSTAT_N_TRANS_FLAGS; i++)
- *destld += DELTA_T(duration[i]);
+ *destld = totalduration;
*destld /= totaltransfers;
*destld *= 1000;
} else
@@ -1499,7 +1512,7 @@ devstat_compute_statistics(struct devsta
*/
case DSM_MS_PER_TRANSACTION_READ:
if (totaltransfersread > 0) {
- *destld = DELTA_T(duration[DEVSTAT_READ]);
+ *destld = totaldurationread;
*destld /= totaltransfersread;
*destld *= 1000;
} else
@@ -1507,7 +1520,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_WRITE:
if (totaltransferswrite > 0) {
- *destld = DELTA_T(duration[DEVSTAT_WRITE]);
+ *destld = totaldurationwrite;
*destld /= totaltransferswrite;
*destld *= 1000;
} else
@@ -1515,7 +1528,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_FREE:
if (totaltransfersfree > 0) {
- *destld = DELTA_T(duration[DEVSTAT_FREE]);
+ *destld = totaldurationfree;
*destld /= totaltransfersfree;
*destld *= 1000;
} else
@@ -1523,7 +1536,7 @@ devstat_compute_statistics(struct devsta
break;
case DSM_MS_PER_TRANSACTION_OTHER:
if (totaltransfersother > 0) {
- *destld = DELTA_T(duration[DEVSTAT_NO_DATA]);
+ *destld = totaldurationother;
*destld /= totaltransfersother;
*destld *= 1000;
} else
@@ -1541,6 +1554,24 @@ devstat_compute_statistics(struct devsta
case DSM_QUEUE_LENGTH:
*destu64 = current->start_count - current->end_count;
break;
+ case DSM_TOTAL_DURATION:
+ *destld = totalduration;
+ break;
+ case DSM_TOTAL_DURATION_READ:
+ *destld = totaldurationread;
+ break;
+ case DSM_TOTAL_DURATION_WRITE:
+ *destld = totaldurationwrite;
+ break;
+ case DSM_TOTAL_DURATION_FREE:
+ *destld = totaldurationfree;
+ break;
+ case DSM_TOTAL_DURATION_OTHER:
+ *destld = totaldurationother;
+ break;
+ case DSM_TOTAL_BUSY_TIME:
+ *destld = DELTA_T(busy_time);
+ break;
/*
* XXX: comment out the default block to see if any case's are missing.
*/
Modified: projects/calloutng/lib/libdevstat/devstat.h
==============================================================================
--- projects/calloutng/lib/libdevstat/devstat.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/lib/libdevstat/devstat.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -97,6 +97,12 @@ typedef enum {
DSM_MS_PER_TRANSACTION_FREE,
DSM_BUSY_PCT,
DSM_QUEUE_LENGTH,
+ DSM_TOTAL_DURATION,
+ DSM_TOTAL_DURATION_READ,
+ DSM_TOTAL_DURATION_WRITE,
+ DSM_TOTAL_DURATION_FREE,
+ DSM_TOTAL_DURATION_OTHER,
+ DSM_TOTAL_BUSY_TIME,
DSM_MAX
} devstat_metric;
Modified: projects/calloutng/sbin/growfs/growfs.c
==============================================================================
--- projects/calloutng/sbin/growfs/growfs.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sbin/growfs/growfs.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -1611,17 +1611,20 @@ main(int argc, char **argv)
}
sblock.fs_ncg = howmany(sblock.fs_size, sblock.fs_fpg);
+ /*
+ * Allocate last cylinder group only if there is enough room
+ * for at least one data block.
+ */
if (sblock.fs_size % sblock.fs_fpg != 0 &&
- sblock.fs_size % sblock.fs_fpg < cgdmin(&sblock, sblock.fs_ncg)) {
- /*
- * The space in the new last cylinder group is too small,
- * so revert back.
- */
+ sblock.fs_size <= cgdmin(&sblock, sblock.fs_ncg - 1)) {
+ humanize_number(oldsizebuf, sizeof(oldsizebuf),
+ (sblock.fs_size % sblock.fs_fpg) * sblock.fs_fsize,
+ "B", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
+ warnx("no room to allocate last cylinder group; "
+ "leaving %s unused", oldsizebuf);
sblock.fs_ncg--;
if (sblock.fs_magic == FS_UFS1_MAGIC)
sblock.fs_old_ncyl = sblock.fs_ncg * sblock.fs_old_cpg;
- printf("Warning: %jd sector(s) cannot be allocated.\n",
- (intmax_t)fsbtodb(&sblock, sblock.fs_size % sblock.fs_fpg));
sblock.fs_size = sblock.fs_ncg * sblock.fs_fpg;
}
Modified: projects/calloutng/sys/arm/conf/VERSATILEPB
==============================================================================
--- projects/calloutng/sys/arm/conf/VERSATILEPB Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/arm/conf/VERSATILEPB Sun Dec 16 22:06:28 2012 (r244315)
@@ -1,4 +1,4 @@
-# RPI-B -- Custom configuration for the Raspberry Pi
+# VERSATILEPB - Configuration for QEMU version of Versatile Platform Board
#
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
Modified: projects/calloutng/sys/boot/arm/uboot/Makefile
==============================================================================
--- projects/calloutng/sys/boot/arm/uboot/Makefile Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/boot/arm/uboot/Makefile Sun Dec 16 22:06:28 2012 (r244315)
@@ -109,6 +109,9 @@ CFLAGS+= -I${.OBJDIR}/../../uboot/lib
# where to get libstand from
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
+# clang doesn't understand %D as a specifier to printf
+NO_WERROR.clang=
+
DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
Modified: projects/calloutng/sys/boot/sparc64/boot1/boot1.c
==============================================================================
--- projects/calloutng/sys/boot/sparc64/boot1/boot1.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/boot/sparc64/boot1/boot1.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -340,11 +340,11 @@ main(int ac, char **av)
}
#ifdef ZFSBOOT
- printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n",
+ printf(" \n>> FreeBSD/sparc64 ZFS boot block\n Boot path: %s\n",
bootpath);
#else
- printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n"
- " Boot loader: %s\n", "", bootpath, path);
+ printf(" \n>> FreeBSD/sparc64 boot block\n Boot path: %s\n"
+ " Boot loader: %s\n", bootpath, path);
#endif
if (domount(bootpath) == -1)
Modified: projects/calloutng/sys/conf/files
==============================================================================
--- projects/calloutng/sys/conf/files Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/conf/files Sun Dec 16 22:06:28 2012 (r244315)
@@ -3531,16 +3531,16 @@ rpc/rpcsec_gss/svc_rpcsec_gss.c optional
security/audit/audit.c optional audit
security/audit/audit_arg.c optional audit
security/audit/audit_bsm.c optional audit
-security/audit/audit_bsm_domain.c optional audit
-security/audit/audit_bsm_errno.c optional audit
-security/audit/audit_bsm_fcntl.c optional audit
security/audit/audit_bsm_klib.c optional audit
-security/audit/audit_bsm_socket_type.c optional audit
-security/audit/audit_bsm_token.c optional audit
security/audit/audit_pipe.c optional audit
security/audit/audit_syscalls.c standard
security/audit/audit_trigger.c optional audit
security/audit/audit_worker.c optional audit
+security/audit/bsm_domain.c optional audit
+security/audit/bsm_errno.c optional audit
+security/audit/bsm_fcntl.c optional audit
+security/audit/bsm_socket_type.c optional audit
+security/audit/bsm_token.c optional audit
security/mac/mac_atalk.c optional mac netatalk
security/mac/mac_audit.c optional mac audit
security/mac/mac_cred.c optional mac
Modified: projects/calloutng/sys/dev/wbwd/wbwd.c
==============================================================================
--- projects/calloutng/sys/dev/wbwd/wbwd.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/dev/wbwd/wbwd.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -208,9 +208,8 @@ sysctl_wb_debug(SYSCTL_HANDLER_ARGS)
sbuf_printf(&sb, "LDN8 (GPIO2, Watchdog): ");
sbuf_printf(&sb, "CRF5 0x%02x ", sc->reg_1);
sbuf_printf(&sb, "CRF6 0x%02x ", sc->reg_timeout);
- sbuf_printf(&sb, "CRF7 0x%02x ", sc->reg_2);
+ sbuf_printf(&sb, "CRF7 0x%02x", sc->reg_2);
- sbuf_trim(&sb);
error = sbuf_finish(&sb);
sbuf_delete(&sb);
return (error);
Modified: projects/calloutng/sys/kern/kern_sig.c
==============================================================================
--- projects/calloutng/sys/kern/kern_sig.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/kern/kern_sig.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -3210,22 +3210,8 @@ coredump(struct thread *td)
MPASS((p->p_flag & P_HADTHREADS) == 0 || p->p_singlethread == td);
_STOPEVENT(p, S_CORE, 0);
- name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid, td,
- compress);
- if (name == NULL) {
+ if (!do_coredump || (!sugid_coredump && (p->p_flag & P_SUGID) != 0)) {
PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, NULL, EINVAL);
-#endif
- return (EINVAL);
- }
- if (((sugid_coredump == 0) && p->p_flag & P_SUGID) ||
- do_coredump == 0) {
- PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, name, EFAULT);
-#endif
- free(name, M_TEMP);
return (EFAULT);
}
@@ -3240,14 +3226,14 @@ coredump(struct thread *td)
limit = (off_t)lim_cur(p, RLIMIT_CORE);
if (limit == 0 || racct_get_available(p, RACCT_CORE) == 0) {
PROC_UNLOCK(p);
-#ifdef AUDIT
- audit_proc_coredump(td, name, EFBIG);
-#endif
- free(name, M_TEMP);
return (EFBIG);
}
PROC_UNLOCK(p);
+ name = expand_name(p->p_comm, cred->cr_uid, p->p_pid, td, compress);
+ if (name == NULL)
+ return (EINVAL);
+
restart:
NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, name, td);
flags = O_CREAT | FWRITE | O_NOFOLLOW;
Modified: projects/calloutng/sys/netinet6/in6.c
==============================================================================
--- projects/calloutng/sys/netinet6/in6.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/in6.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -1149,6 +1149,8 @@ in6_update_ifa(struct ifnet *ifp, struct
ifa_ref(&ia->ia_ifa); /* in6_ifaddrhead */
IN6_IFADDR_WLOCK();
TAILQ_INSERT_TAIL(&V_in6_ifaddrhead, ia, ia_link);
+ LIST_INSERT_HEAD(IN6ADDR_HASH(&ifra->ifra_addr.sin6_addr),
+ ia, ia6_hash);
IN6_IFADDR_WUNLOCK();
}
@@ -1534,6 +1536,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
*/
IN6_IFADDR_WLOCK();
TAILQ_REMOVE(&V_in6_ifaddrhead, ia, ia_link);
+ LIST_REMOVE(ia, ia6_hash);
IN6_IFADDR_WUNLOCK();
/*
@@ -2083,7 +2086,7 @@ in6_localip(struct in6_addr *in6)
struct in6_ifaddr *ia;
IN6_IFADDR_RLOCK();
- TAILQ_FOREACH(ia, &V_in6_ifaddrhead, ia_link) {
+ LIST_FOREACH(ia, IN6ADDR_HASH(in6), ia6_hash) {
if (IN6_ARE_ADDR_EQUAL(in6, &ia->ia_addr.sin6_addr)) {
IN6_IFADDR_RUNLOCK();
return (1);
@@ -2093,22 +2096,20 @@ in6_localip(struct in6_addr *in6)
return (0);
}
-
int
in6_is_addr_deprecated(struct sockaddr_in6 *sa6)
{
struct in6_ifaddr *ia;
IN6_IFADDR_RLOCK();
- TAILQ_FOREACH(ia, &V_in6_ifaddrhead, ia_link) {
- if (IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr,
- &sa6->sin6_addr) &&
- (ia->ia6_flags & IN6_IFF_DEPRECATED) != 0) {
- IN6_IFADDR_RUNLOCK();
- return (1); /* true */
+ LIST_FOREACH(ia, IN6ADDR_HASH(&sa6->sin6_addr), ia6_hash) {
+ if (IN6_ARE_ADDR_EQUAL(IA6_IN6(ia), &sa6->sin6_addr)) {
+ if (ia->ia6_flags & IN6_IFF_DEPRECATED) {
+ IN6_IFADDR_RUNLOCK();
+ return (1); /* true */
+ }
+ break;
}
-
- /* XXX: do we still have to go thru the rest of the list? */
}
IN6_IFADDR_RUNLOCK();
Modified: projects/calloutng/sys/netinet6/in6_var.h
==============================================================================
--- projects/calloutng/sys/netinet6/in6_var.h Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/in6_var.h Sun Dec 16 22:06:28 2012 (r244315)
@@ -67,6 +67,7 @@
#include <sys/tree.h>
#ifdef _KERNEL
+#include <sys/fnv_hash.h>
#include <sys/libkern.h>
#endif
@@ -131,10 +132,13 @@ struct in6_ifaddr {
/* multicast addresses joined from the kernel */
LIST_HEAD(, in6_multi_mship) ia6_memberships;
+ /* entry in bucket of inet6 addresses */
+ LIST_ENTRY(in6_ifaddr) ia6_hash;
};
/* List of in6_ifaddr's. */
TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr);
+LIST_HEAD(in6_ifaddrlisthead, in6_ifaddr);
/* control structure to manage address selection policy */
struct in6_addrpolicy {
@@ -499,7 +503,27 @@ struct in6_rrenumreq {
#ifdef _KERNEL
VNET_DECLARE(struct in6_ifaddrhead, in6_ifaddrhead);
+VNET_DECLARE(struct in6_ifaddrlisthead *, in6_ifaddrhashtbl);
+VNET_DECLARE(u_long, in6_ifaddrhmask);
#define V_in6_ifaddrhead VNET(in6_ifaddrhead)
+#define V_in6_ifaddrhashtbl VNET(in6_ifaddrhashtbl)
+#define V_in6_ifaddrhmask VNET(in6_ifaddrhmask)
+
+#define IN6ADDR_NHASH_LOG2 8
+#define IN6ADDR_NHASH (1 << IN6ADDR_NHASH_LOG2)
+#define IN6ADDR_HASHVAL(x) (in6_addrhash(x))
+#define IN6ADDR_HASH(x) \
+ (&V_in6_ifaddrhashtbl[IN6ADDR_HASHVAL(x) & V_in6_ifaddrhmask])
+
+static __inline uint32_t
+in6_addrhash(struct in6_addr *in6)
+{
+ uint32_t x;
+
+ x = in6->s6_addr32[0] ^ in6->s6_addr32[1] ^ in6->s6_addr32[2] ^
+ in6->s6_addr32[3];
+ return (fnv_32_buf(&x, sizeof(x), FNV1_32_INIT));
+}
extern struct rwlock in6_ifaddr_lock;
#define IN6_IFADDR_LOCK_ASSERT( ) rw_assert(&in6_ifaddr_lock, RA_LOCKED)
Modified: projects/calloutng/sys/netinet6/ip6_input.c
==============================================================================
--- projects/calloutng/sys/netinet6/ip6_input.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netinet6/ip6_input.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -126,6 +126,8 @@ extern struct domain inet6domain;
u_char ip6_protox[IPPROTO_MAX];
VNET_DEFINE(struct in6_ifaddrhead, in6_ifaddrhead);
+VNET_DEFINE(struct in6_ifaddrlisthead *, in6_ifaddrhashtbl);
+VNET_DEFINE(u_long, in6_ifaddrhmask);
static struct netisr_handler ip6_nh = {
.nh_name = "ip6",
@@ -170,6 +172,8 @@ ip6_init(void)
TUNABLE_INT_FETCH("net.inet6.ip6.no_radr", &V_ip6_no_radr);
TAILQ_INIT(&V_in6_ifaddrhead);
+ V_in6_ifaddrhashtbl = hashinit(IN6ADDR_NHASH, M_IFADDR,
+ &V_in6_ifaddrhmask);
/* Initialize packet filter hooks. */
V_inet6_pfil_hook.ph_type = PFIL_TYPE_AF;
@@ -297,6 +301,7 @@ void
ip6_destroy()
{
+ hashdestroy(V_in6_ifaddrhashtbl, M_IFADDR, V_in6_ifaddrhmask);
nd6_destroy();
callout_drain(&V_in6_tmpaddrtimer_ch);
}
Modified: projects/calloutng/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- projects/calloutng/sys/netpfil/pf/pf_ioctl.c Sun Dec 16 21:13:40 2012 (r244314)
+++ projects/calloutng/sys/netpfil/pf/pf_ioctl.c Sun Dec 16 22:06:28 2012 (r244315)
@@ -963,8 +963,6 @@ pfioctl(struct cdev *dev, u_long cmd, ca
{
int error = 0;
- CURVNET_SET(TD_TO_VNET(td));
-
/* XXX keep in sync with switch() below */
if (securelevel_gt(td->td_ucred, 2))
switch (cmd) {
@@ -1068,6 +1066,8 @@ pfioctl(struct cdev *dev, u_long cmd, ca
return (EACCES);
}
+ CURVNET_SET(TD_TO_VNET(td));
+
switch (cmd) {
case DIOCSTART:
PF_RULES_WLOCK();
Copied: projects/calloutng/sys/security/audit/bsm_domain.c (from r244314, head/sys/security/audit/bsm_domain.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/calloutng/sys/security/audit/bsm_domain.c Sun Dec 16 22:06:28 2012 (r244315, copy of r244314, head/sys/security/audit/bsm_domain.c)
@@ -0,0 +1,495 @@
+/*-
+ * Copyright (c) 2008 Apple Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#3
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <security/audit/audit.h>
+
+#include <bsm/audit_domain.h>
+#include <bsm/audit_record.h>
+
+struct bsm_domain {
+ u_short bd_bsm_domain;
+ int bd_local_domain;
+};
+
+#define PF_NO_LOCAL_MAPPING -600
+
+static const struct bsm_domain bsm_domains[] = {
+ { BSM_PF_UNSPEC, PF_UNSPEC },
+ { BSM_PF_LOCAL, PF_LOCAL },
+ { BSM_PF_INET, PF_INET },
+ { BSM_PF_IMPLINK,
+#ifdef PF_IMPLINK
+ PF_IMPLINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_PUP,
+#ifdef PF_PUP
+ PF_PUP
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_CHAOS,
+#ifdef PF_CHAOS
+ PF_CHAOS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_NS,
+#ifdef PF_NS
+ PF_NS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_NBS,
+#ifdef PF_NBS
+ PF_NBS
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_ECMA,
+#ifdef PF_ECMA
+ PF_ECMA
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_DATAKIT,
+#ifdef PF_DATAKIT
+ PF_DATAKIT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_CCITT,
+#ifdef PF_CCITT
+ PF_CCITT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_SNA, PF_SNA },
+ { BSM_PF_DECnet, PF_DECnet },
+ { BSM_PF_DLI,
+#ifdef PF_DLI
+ PF_DLI
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_LAT,
+#ifdef PF_LAT
+ PF_LAT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_HYLINK,
+#ifdef PF_HYLINK
+ PF_HYLINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_APPLETALK, PF_APPLETALK },
+ { BSM_PF_NIT,
+#ifdef PF_NIT
+ PF_NIT
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_802,
+#ifdef PF_802
+ PF_802
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_OSI,
+#ifdef PF_OSI
+ PF_OSI
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_X25,
+#ifdef PF_X25
+ PF_X25
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_OSINET,
+#ifdef PF_OSINET
+ PF_OSINET
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_GOSIP,
+#ifdef PF_GOSIP
+ PF_GOSIP
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_IPX, PF_IPX },
+ { BSM_PF_ROUTE, PF_ROUTE },
+ { BSM_PF_LINK,
+#ifdef PF_LINK
+ PF_LINK
+#else
+ PF_NO_LOCAL_MAPPING
+#endif
+ },
+ { BSM_PF_INET6, PF_INET6 },
+ { BSM_PF_KEY, PF_KEY },
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 23:23:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 34006759;
Sun, 16 Dec 2012 23:23:35 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 18BA28FC13;
Sun, 16 Dec 2012 23:23:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGNNYJh071744;
Sun, 16 Dec 2012 23:23:34 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGNNYUW071743;
Sun, 16 Dec 2012 23:23:34 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212162323.qBGNNYUW071743@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 16 Dec 2012 23:23:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244322 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 23:23:35 -0000
Author: linimon (doc,ports committer)
Date: Sun Dec 16 23:23:34 2012
New Revision: 244322
URL: http://svnweb.freebsd.org/changeset/base/244322
Log:
Try to push the mount points down one directory. WIP.
Modified:
projects/portbuild/pxedust/pxedust
Modified: projects/portbuild/pxedust/pxedust
==============================================================================
--- projects/portbuild/pxedust/pxedust Sun Dec 16 23:09:27 2012 (r244321)
+++ projects/portbuild/pxedust/pxedust Sun Dec 16 23:23:34 2012 (r244322)
@@ -115,8 +115,13 @@ make ${COMMON_ENV} distribution || exit
echo "make distribution: finished."
echo
-mkdir -p ${DESTDIR}/usr2 || exit 1
-mkdir -p ${DESTDIR}/usr3 || exit 1
+# XXX MCL must be some way to decrease the hard-coding here
+mkdir -p ${DESTDIR}/usr2/portbuild || exit 1
+mkdir -p ${DESTDIR}/usr2/squid || exit 1
+# best choice for 1 spindle
+mkdir -p ${DESTDIR}/usr2/pkgbuild || exit 1
+# best choice for 2 spindles
+mkdir -p ${DESTDIR}/usr3/pkgbuild || exit 1
cp /dev/null ${LOGFILE}
From owner-svn-src-projects@FreeBSD.ORG Sun Dec 16 23:53:47 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5387A81B;
Sun, 16 Dec 2012 23:53:47 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 37B2B8FC12;
Sun, 16 Dec 2012 23:53:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGNrl9U075819;
Sun, 16 Dec 2012 23:53:47 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGNrldL075818;
Sun, 16 Dec 2012 23:53:47 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212162353.qBGNrldL075818@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 16 Dec 2012 23:53:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244326 - projects/calloutng/sys/dev/syscons
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Dec 2012 23:53:47 -0000
Author: mav
Date: Sun Dec 16 23:53:46 2012
New Revision: 244326
URL: http://svnweb.freebsd.org/changeset/base/244326
Log:
Fix the build with gcc.
Modified:
projects/calloutng/sys/dev/syscons/syscons.c
Modified: projects/calloutng/sys/dev/syscons/syscons.c
==============================================================================
--- projects/calloutng/sys/dev/syscons/syscons.c Sun Dec 16 23:46:59 2012 (r244325)
+++ projects/calloutng/sys/dev/syscons/syscons.c Sun Dec 16 23:53:46 2012 (r244326)
@@ -1828,6 +1828,9 @@ scrn_timer(void *arg)
else
return;
+ /* find the vty to update */
+ scp = sc->cur_scp;
+
/* don't do anything when we are performing some I/O operations */
if (suspend_in_progress || sc->font_loading_in_progress)
goto done;
@@ -1849,9 +1852,6 @@ scrn_timer(void *arg)
}
#endif /* PC98 */
- /* find the vty to update */
- scp = sc->cur_scp;
-
/* should we stop the screen saver? */
if (debugger > 0 || panicstr || shutdown_in_progress)
sc_touch_scrn_saver();
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:04:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D16DDDF7;
Mon, 17 Dec 2012 00:04:43 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id B51E18FC14;
Mon, 17 Dec 2012 00:04:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH04hBT078224;
Mon, 17 Dec 2012 00:04:43 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH04hs4078223;
Mon, 17 Dec 2012 00:04:43 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201212170004.qBH04hs4078223@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:04:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244327 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:04:43 -0000
Author: bryanv
Date: Mon Dec 17 00:04:43 2012
New Revision: 244327
URL: http://svnweb.freebsd.org/changeset/base/244327
Log:
Fix whitespace bug
Approved by: grehan (implicit)
Modified:
projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Sun Dec 16 23:53:46 2012 (r244326)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Mon Dec 17 00:04:43 2012 (r244327)
@@ -893,7 +893,7 @@ vic_ioctl(struct ifnet *ifp, u_long cmd,
if ((ifp->if_flags ^ sc->vic_if_flags) &
(IFF_PROMISC | IFF_ALLMULTI)) {
vic_set_rxfilter(sc);
- }
+ }
} else
vic_init_locked(sc);
} else {
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:06:21 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 487B9FD2;
Mon, 17 Dec 2012 00:06:21 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2CAB38FC0A;
Mon, 17 Dec 2012 00:06:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH06KUw078514;
Mon, 17 Dec 2012 00:06:20 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH06K0Y078513;
Mon, 17 Dec 2012 00:06:20 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201212170006.qBH06K0Y078513@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:06:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244328 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:06:21 -0000
Author: bryanv
Date: Mon Dec 17 00:06:20 2012
New Revision: 244328
URL: http://svnweb.freebsd.org/changeset/base/244328
Log:
Fix mbuf leak in a very rare error case
Approved by: grehan (implicit)
Modified:
projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Mon Dec 17 00:04:43 2012 (r244327)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Mon Dec 17 00:06:20 2012 (r244328)
@@ -1003,18 +1003,17 @@ vic_encap_load_mbuf(struct vic_softc *sc
return (error);
m = m_collapse(m, M_DONTWAIT, maxsegs);
- if (m != NULL)
+ if (m != NULL) {
+ *m0 = m;
error = bus_dmamap_load_mbuf_sg(tag, dmap, m, segs, nsegs, 0);
- else
+ } else
error = ENOBUFS;
if (error) {
m_freem(*m0);
- m = NULL;
+ *m0 = NULL;
}
- *m0 = m;
-
return (error);
}
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:17:19 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id AE0EA24E;
Mon, 17 Dec 2012 00:17:19 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 9275C8FC0C;
Mon, 17 Dec 2012 00:17:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH0HJZm080260;
Mon, 17 Dec 2012 00:17:19 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH0HJ9c080259;
Mon, 17 Dec 2012 00:17:19 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170017.qBH0HJ9c080259@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:17:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244329 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:17:19 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:17:18 2012
New Revision: 244329
URL: http://svnweb.freebsd.org/changeset/base/244329
Log:
Turn off .ssh directory creation. It is not in the right place.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Mon Dec 17 00:06:20 2012 (r244328)
+++ projects/portbuild/tools/addarch Mon Dec 17 00:17:18 2012 (r244329)
@@ -78,14 +78,14 @@ if ! test_fs "${archfs}"; then
chmod -R g+w ${archdir} || exit 1
fi
-# create .ssh/ directory if it does not already exist. (duplicates 'build')
-sshdir=${archdir}/.ssh
-if [ ! -d ${sshdir} ]; then
- echo "The ${sshdir} directory does not exist. I'll create it for you, but you will need to populate it."
- mkdir -p ${sshdir} || exit 1
- chown -R ${uid}:${gid} ${sshdir} || exit 1
- chmod 700 ${sshdir} || exit 1
-fi
+## create .ssh/ directory if it does not already exist. (duplicates 'build')
+#sshdir=${archdir}/.ssh
+#if [ ! -d ${sshdir} ]; then
+# echo "The ${sshdir} directory does not exist. I'll create it for you, but you will need to populate it."
+# mkdir -p ${sshdir} || exit 1
+# chown -R ${uid}:${gid} ${sshdir} || exit 1
+# chmod 700 ${sshdir} || exit 1
+#fi
lockfiles=${archdir}/lockfiles
if [ ! -d ${lockfiles} ]; then
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:22:48 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id DA709563;
Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A5B5F8FC13;
Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH0Mmqu080987;
Mon, 17 Dec 2012 00:22:48 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH0Mmtk080986;
Mon, 17 Dec 2012 00:22:48 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170022.qBH0Mmtk080986@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:22:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244330 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:22:48 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:22:48 2012
New Revision: 244330
URL: http://svnweb.freebsd.org/changeset/base/244330
Log:
Fix default location of various subdirs (clients/ and so forth). Turn
off the creation of the .ssh directory; it is in the wrong place.
Modified:
projects/portbuild/scripts/build
Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build Mon Dec 17 00:17:18 2012 (r244329)
+++ projects/portbuild/scripts/build Mon Dec 17 00:22:48 2012 (r244330)
@@ -70,13 +70,13 @@ do_create() {
chmod -R g+w ${archdir}
fi
- # create .ssh/ directory if it does not already exist
- sshdir=${pbd}/${arch}/.ssh
- if [ ! -d ${sshdir} ]; then
- mkdir -p ${sshdir} || exit 1
- chown -R ${uid}:${gid} ${sshdir}
- chmod 700 ${sshdir}
- fi
+# # create .ssh/ directory if it does not already exist
+# sshdir=${pbd}/${arch}/.ssh
+# if [ ! -d ${sshdir} ]; then
+# mkdir -p ${sshdir} || exit 1
+# chown -R ${uid}:${gid} ${sshdir}
+# chmod 700 ${sshdir}
+# fi
# create overall archive directory if it does not already exist
archivedir=${pbd}/${arch}/archive
@@ -134,7 +134,7 @@ do_create() {
ln -sf ${builddir} ${pbab}/builds/latest
# create clients/ directory if it does not already exist
- clientsdir=${pbab}/clients
+ clientsdir=${pbd}/${arch}/clients
if [ ! -d ${clientsdir} ]; then
mkdir -p ${clientsdir} || exit 1
chown -R ${uid}:${gid} ${clientsdir}
@@ -142,7 +142,7 @@ do_create() {
fi
# create loads/ directory if it does not already exist
- loadsdir=${pbab}/loads
+ loadsdir=${pbd}/${arch}/loads
if [ ! -d ${loadsdir} ]; then
mkdir -p ${loadsdir} || exit 1
chown -R ${uid}:${gid} ${loadsdir}
@@ -150,7 +150,7 @@ do_create() {
fi
# create lockfiles/ directory if it does not already exist
- lockfiles=${pbab}/lockfiles
+ lockfiles=${pbd}/${arch}/lockfiles
if [ ! -d ${lockfiles} ]; then
mkdir -p ${lockfiles} || exit 1
chown -R ${uid}:${gid} ${lockfiles}
@@ -158,7 +158,7 @@ do_create() {
fi
# create empty mlist file if it does not already exist
- mlist=${pbab}/mlist
+ mlist=${pbd}/${arch}/mlist
if [ ! -d ${mlist} ]; then
touch ${mlist} || exit 1
chown -R ${uid}:${gid} ${mlist}
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:42:24 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id A46E7BA4;
Mon, 17 Dec 2012 00:42:24 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 89D1F8FC13;
Mon, 17 Dec 2012 00:42:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH0gOVT083467;
Mon, 17 Dec 2012 00:42:24 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH0gO8Y083466;
Mon, 17 Dec 2012 00:42:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170042.qBH0gO8Y083466@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:42:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244333 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:42:24 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:42:23 2012
New Revision: 244333
URL: http://svnweb.freebsd.org/changeset/base/244333
Log:
Tighten up error condition.
Modified:
projects/portbuild/scripts/pollmachine
Modified: projects/portbuild/scripts/pollmachine
==============================================================================
--- projects/portbuild/scripts/pollmachine Mon Dec 17 00:34:07 2012 (r244332)
+++ projects/portbuild/scripts/pollmachine Mon Dec 17 00:42:23 2012 (r244333)
@@ -321,8 +321,8 @@ while True:
f.close()
except:
pass
- except OSError, error:
- print "pollmachine: could not find %s, skipping" % mlistfile
+ except:
+ print "pollmachine: could not read %s, skipping" % mlistfile
gone = machines[arch].difference(now)
new = now.difference(machines[arch])
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 00:55:18 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0DC0BEBA;
Mon, 17 Dec 2012 00:55:18 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E82CD8FC15;
Mon, 17 Dec 2012 00:55:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH0tH4K085099;
Mon, 17 Dec 2012 00:55:17 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH0tH4i085097;
Mon, 17 Dec 2012 00:55:17 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170055.qBH0tH4i085097@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 00:55:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244334 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 00:55:18 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 00:55:17 2012
New Revision: 244334
URL: http://svnweb.freebsd.org/changeset/base/244334
Log:
Cleanup.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Mon Dec 17 00:42:23 2012 (r244333)
+++ projects/portbuild/tools/addarch Mon Dec 17 00:55:17 2012 (r244334)
@@ -136,7 +136,7 @@ if [ ! -x ${pbc}/qmanager/${QMANAGER} ];
echo "you need to install ${QMANAGER} under ${pbc}/qmanager/ and re-run this script."
exit 1
else
- running=`ps ax | grep -v grep | grep $qm`
+ running=`ps ax | grep -v grep | grep ${QMANAGER}`
if [ -z "${running}" ]; then
echo "${QMANAGER} is not running. run /usr/local/etc/rc.d/qmanager.sh and re-run this script."
exit 1
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 01:01:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0F7C11DA;
Mon, 17 Dec 2012 01:01:40 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E81E38FC14;
Mon, 17 Dec 2012 01:01:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH11d3n086016;
Mon, 17 Dec 2012 01:01:39 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH11d7a086015;
Mon, 17 Dec 2012 01:01:39 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170101.qBH11d7a086015@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 01:01:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244335 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 01:01:40 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 01:01:39 2012
New Revision: 244335
URL: http://svnweb.freebsd.org/changeset/base/244335
Log:
Tried to switch too much away from ports-<arch>. There must be one
place in the database that sorts through which machines belong to
which arch, and this is it.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Mon Dec 17 00:55:17 2012 (r244334)
+++ projects/portbuild/tools/addarch Mon Dec 17 01:01:39 2012 (r244335)
@@ -142,7 +142,7 @@ else
exit 1
else
echo "adding ${arch} to qmanager ..."
- python ${pbc}/qmanager/qclient add_acl name=${uid} uidlist=${uid} gidlist=${gid} sense=1
+ python ${pbc}/qmanager/qclient add_acl name=ports-${arch} uidlist=${uid} gidlist=${gid} sense=1
echo "... done."
fi
fi
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 01:10:06 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B0034422;
Mon, 17 Dec 2012 01:10:06 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 964618FC1B;
Mon, 17 Dec 2012 01:10:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH1A6UT087447;
Mon, 17 Dec 2012 01:10:06 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH1A67d087446;
Mon, 17 Dec 2012 01:10:06 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212170110.qBH1A67d087446@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 01:10:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244336 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 01:10:06 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 01:10:06 2012
New Revision: 244336
URL: http://svnweb.freebsd.org/changeset/base/244336
Log:
Move usr3 away for now.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Mon Dec 17 01:01:39 2012 (r244335)
+++ projects/portbuild/tools/addarch Mon Dec 17 01:10:06 2012 (r244336)
@@ -122,7 +122,7 @@ http_proxy="http://localhost:3128/"
mailto=root@`hostname`
md_size=11g
pkg_sufx=".tbz"
-scratchdir=/usr3/pkgbuild
+scratchdir=/usr2/pkgbuild
squid_dir=/usr2/squid
use_jail=1
use_md_swap=1
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 10:23:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0611A67F;
Mon, 17 Dec 2012 10:23:23 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DF4A68FC15;
Mon, 17 Dec 2012 10:23:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHANMku067685;
Mon, 17 Dec 2012 10:23:22 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHANMhq067683;
Mon, 17 Dec 2012 10:23:22 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212171023.qBHANMhq067683@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Dec 2012 10:23:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244349 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 10:23:23 -0000
Author: mav
Date: Mon Dec 17 10:23:22 2012
New Revision: 244349
URL: http://svnweb.freebsd.org/changeset/base/244349
Log:
Update cc_lastscan to now before processing events, not after. This closes
chance of scheduling into the past if new callout scheduled while we are
dropping the lock to execute direct callout.
Modified:
projects/calloutng/sys/kern/kern_timeout.c
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Mon Dec 17 10:12:12 2012 (r244348)
+++ projects/calloutng/sys/kern/kern_timeout.c Mon Dec 17 10:23:22 2012 (r244349)
@@ -399,6 +399,7 @@ callout_process(struct bintime *now)
/* Compute the buckets of the last scan and present times. */
firstb = callout_hash(&cc->cc_lastscan);
+ cc->cc_lastscan = *now;
nowb = callout_hash(now);
/* Compute the last bucket and minimum time of the bucket after it. */
@@ -498,7 +499,6 @@ next:
if (callout_new_inserted != NULL)
(*callout_new_inserted)(curcpu, last, first);
cc->cc_firstevent = last;
- cc->cc_lastscan = *now;
#ifdef CALLOUT_PROFILING
avg_depth_dir += (depth_dir * 1000 - avg_depth_dir) >> 8;
avg_mpcalls_dir += (mpcalls_dir * 1000 - avg_mpcalls_dir) >> 8;
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 11:12:10 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E1B5448D;
Mon, 17 Dec 2012 11:12:10 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id AD0DF8FC1A;
Mon, 17 Dec 2012 11:12:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHBCAIg075419;
Mon, 17 Dec 2012 11:12:10 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHBCACx075417;
Mon, 17 Dec 2012 11:12:10 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212171112.qBHBCACx075417@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Dec 2012 11:12:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244355 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 11:12:10 -0000
Author: mav
Date: Mon Dec 17 11:12:09 2012
New Revision: 244355
URL: http://svnweb.freebsd.org/changeset/base/244355
Log:
Make loadavg calculation callout direct. There are several reasons for it:
- it is very simple and doesn't worth context switch to SWI;
- since SWI is no longer used here, we can remove twelve years old hack,
excluding this SWI from from the loadavg statistics;
- it fixes problem when eventtimer (HPET) shares interrupt with some other
device, and that interrupt thread counted as permanent loadavg of 1; now
loadavg accounted before that interrupt thread is scheduled.
Modified:
projects/calloutng/sys/kern/kern_intr.c
projects/calloutng/sys/kern/kern_synch.c
Modified: projects/calloutng/sys/kern/kern_intr.c
==============================================================================
--- projects/calloutng/sys/kern/kern_intr.c Mon Dec 17 11:00:03 2012 (r244354)
+++ projects/calloutng/sys/kern/kern_intr.c Mon Dec 17 11:12:09 2012 (r244355)
@@ -1103,7 +1103,6 @@ int
swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler,
void *arg, int pri, enum intr_type flags, void **cookiep)
{
- struct thread *td;
struct intr_event *ie;
int error;
@@ -1125,15 +1124,7 @@ swi_add(struct intr_event **eventp, cons
}
error = intr_event_add_handler(ie, name, NULL, handler, arg,
PI_SWI(pri), flags, cookiep);
- if (error)
- return (error);
- if (pri == SWI_CLOCK) {
- td = ie->ie_thread->it_thread;
- thread_lock(td);
- td->td_flags |= TDF_NOLOAD;
- thread_unlock(td);
- }
- return (0);
+ return (error);
}
/*
Modified: projects/calloutng/sys/kern/kern_synch.c
==============================================================================
--- projects/calloutng/sys/kern/kern_synch.c Mon Dec 17 11:00:03 2012 (r244354)
+++ projects/calloutng/sys/kern/kern_synch.c Mon Dec 17 11:12:09 2012 (r244355)
@@ -573,8 +573,9 @@ loadav(void *arg)
* random variation to avoid synchronisation with processes that
* run at regular intervals.
*/
- callout_reset(&loadav_callout, hz * 4 + (int)(random() % (hz * 2 + 1)),
- loadav, NULL);
+ callout_reset_flags(&loadav_callout,
+ hz * 4 + (int)(random() % (hz * 2 + 1)),
+ loadav, NULL, C_DIRECT_EXEC);
}
/* ARGSUSED */
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 19:00:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5C557291;
Mon, 17 Dec 2012 19:00:53 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 277248FC1A;
Mon, 17 Dec 2012 19:00:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHJ0rRU045836;
Mon, 17 Dec 2012 19:00:53 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHJ0r4a045835;
Mon, 17 Dec 2012 19:00:53 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212171900.qBHJ0r4a045835@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 19:00:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244361 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 19:00:53 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 19:00:52 2012
New Revision: 244361
URL: http://svnweb.freebsd.org/changeset/base/244361
Log:
First pass at a script that allows the delegation of most useful ZFS
permissions to the 'portbuild' user.
Added:
projects/portbuild/tools/zfsadmin (contents, props changed)
Added: projects/portbuild/tools/zfsadmin
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/portbuild/tools/zfsadmin Mon Dec 17 19:00:52 2012 (r244361)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# server-side script to setup delegated zfs administration. Should be run as root.
+
+# configurable variables
+pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/var/portbuild}
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts
+
+if [ `id -u` != 0 ]; then
+ echo "$0 must be run as root."
+ exit 1
+fi
+if [ ! -e ${pbc}/conf/server.conf ] ; then
+ echo "You must first create ${pbc}/conf/server.conf."
+ exit 1
+fi
+. ${pbc}/conf/server.conf
+
+if [ -z "${ZFS_VOLUME}" ]; then
+ echo "You must define ZFS_VOLUME in ${pbc}/conf/server.conf."
+ exit 1
+fi
+if [ -z "${ZFS_PERMISSIONSET}" ]; then
+ echo "You must define ZFS_PERMISSIONSET in ${pbc}/conf/server.conf."
+ exit 1
+fi
+if [ -z "${PORTBUILD_USER}" ]; then
+ echo "You must define PORTBUILD_USER in ${pbc}/conf/server.conf."
+ exit 1
+fi
+
+# create the "zfsadmin" permission set.
+zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}
+
+# delegate the "zfsadmin" permission set to the PORTBUILD_USER.
+zfs allow -u ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME}
+
+echo "result of operation:"
+zfs allow ${ZFS_VOLUME}
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 19:34:28 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 61CC75F7;
Mon, 17 Dec 2012 19:34:28 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 4782E8FC0A;
Mon, 17 Dec 2012 19:34:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHJYSbU052918;
Mon, 17 Dec 2012 19:34:28 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHJYS5K052915;
Mon, 17 Dec 2012 19:34:28 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212171934.qBHJYS5K052915@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 17 Dec 2012 19:34:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244363 - projects/portbuild/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 19:34:28 -0000
Author: linimon (doc,ports committer)
Date: Mon Dec 17 19:34:27 2012
New Revision: 244363
URL: http://svnweb.freebsd.org/changeset/base/244363
Log:
The SUPFILE definitions are obsolete with SVN.
Modified:
projects/portbuild/conf/server.conf
Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf Mon Dec 17 19:17:10 2012 (r244362)
+++ projects/portbuild/conf/server.conf Mon Dec 17 19:34:27 2012 (r244363)
@@ -38,12 +38,6 @@ SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/p
SRC_DIRECTORY_PREFIX=src-
SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTORY}/${SRC_DIRECTORY_PREFIX}
-SUPFILE_DIRECTORY=/home/portmgr/sup
-PORTS_MASTER_SUPFILE=${SUPFILE_DIRECTORY}/ports-master-supfile
-SRC_MASTER_SUPFILE=${SUPFILE_DIRECTORY}/src-master-supfile
-PORTS_SUPFILE=${SUPFILE_DIRECTORY}/ports-supfile
-SRC_SUPFILE=${SUPFILE_DIRECTORY}/src-supfile
-
WORLDDIR=${ZFS_MOUNTPOINT}/chroot/
# XXX TODO (note: Python script, so avoid {})
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 20:36:58 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id BE6E5D72;
Mon, 17 Dec 2012 20:36:58 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A36328FC0A;
Mon, 17 Dec 2012 20:36:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHKawWr064983;
Mon, 17 Dec 2012 20:36:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHKavP2064975;
Mon, 17 Dec 2012 20:36:57 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212172036.qBHKavP2064975@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Dec 2012 20:36:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244364 - in projects/calloutng/sys: kern sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 20:36:58 -0000
Author: mav
Date: Mon Dec 17 20:36:56 2012
New Revision: 244364
URL: http://svnweb.freebsd.org/changeset/base/244364
Log:
Experiments with dummynet exposed number of problems in code supporting
legacy tick-based callouts. "callou_reset(... , 1, ...)", used by dummynet,
effectively means "call me on the next hardclock tick after now". But our
new world order had no concept of the "next tick", and concept of "now" was
also complicated by using imprecise getbinuptime(). Different attempts to
handle that gave either low resolution, or lack of event aggregation. In
all cases resolution was limited by 1ms of getbinuptime(), that made at
least useless setting hz above 1000.
To fix that, new callout code was made to get the time of the hardclock()
call directly from the kern_eventtimer.c, where it is already present with
full precision. That fixed all above problems at the same time: all legacy
callouts are now sychronized and so will aggregate with hardclock events,
and because of having precise time values hz above 1000 are again usable.
In addition to that, create and use new global variable tc_tick_bt,
representing duration of the timecounter tick, that is bigger then
duration of hz tick (tick_bt), when hz is set above 1000;
Reviewed by: davide
Modified:
projects/calloutng/sys/kern/kern_clocksource.c
projects/calloutng/sys/kern/kern_tc.c
projects/calloutng/sys/kern/kern_time.c
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/kern/subr_param.c
projects/calloutng/sys/kern/sys_generic.c
projects/calloutng/sys/sys/time.h
Modified: projects/calloutng/sys/kern/kern_clocksource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_clocksource.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/kern_clocksource.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -96,7 +96,6 @@ static struct mtx et_hw_mtx;
static struct eventtimer *timer = NULL;
static struct bintime timerperiod; /* Timer period for periodic mode. */
-static struct bintime hardperiod; /* hardclock() events period. */
static struct bintime statperiod; /* statclock() events period. */
static struct bintime profperiod; /* profclock() events period. */
static struct bintime nexttick; /* Next global timer tick time. */
@@ -146,6 +145,7 @@ struct pcpu_state {
};
static DPCPU_DEFINE(struct pcpu_state, timerstate);
+DPCPU_DEFINE(struct bintime, hardclocktime);
/*
* Timer broadcast IPI handler.
@@ -174,7 +174,7 @@ hardclockintr(void)
static int
handleevents(struct bintime *now, int fake)
{
- struct bintime t;
+ struct bintime t, *hct;
struct trapframe *frame;
struct pcpu_state *state;
uintfptr_t pc;
@@ -199,10 +199,13 @@ handleevents(struct bintime *now, int fa
runs = 0;
while (bintime_cmp(now, &state->nexthard, >=)) {
- bintime_addx(&state->nexthard, hardperiod.frac);
+ bintime_addx(&state->nexthard, tick_bt.frac);
runs++;
}
if (runs) {
+ hct = DPCPU_PTR(hardclocktime);
+ *hct = state->nexthard;
+ bintime_sub(hct, &tick_bt);
if ((timer->et_flags & ET_FLAGS_PERCPU) == 0 &&
bintime_cmp(&state->nexthard, &nexthard, >))
nexthard = state->nexthard;
@@ -282,7 +285,7 @@ getnextcpuevent(struct bintime *event, i
if (curcpu == CPU_FIRST() && tc_min_ticktock_freq > hardfreq)
hardfreq = tc_min_ticktock_freq;
if (hz > hardfreq) {
- tmp = hardperiod;
+ tmp = tick_bt;
bintime_mul(&tmp, hz / hardfreq - 1);
bintime_add(event, &tmp);
}
@@ -698,7 +701,7 @@ cpu_initclocks_bsp(void)
profhz = round_freq(timer, stathz * 64);
}
tick = 1000000 / hz;
- FREQ2BT(hz, &hardperiod);
+ FREQ2BT(hz, &tick_bt);
FREQ2BT(stathz, &statperiod);
FREQ2BT(profhz, &profperiod);
ET_LOCK();
Modified: projects/calloutng/sys/kern/kern_tc.c
==============================================================================
--- projects/calloutng/sys/kern/kern_tc.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/kern_tc.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -121,7 +121,7 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO,
×tepwarnings, 0, "Log time steps");
struct bintime bt_timethreshold;
-struct bintime tick_bt;
+struct bintime tc_tick_bt;
int tc_timeexp;
int tc_timepercentage = TC_DEFAULTPERC;
TUNABLE_INT("kern.timecounter.alloweddeviation", &tc_timepercentage);
@@ -1772,8 +1772,9 @@ inittimecounter(void *dummy)
else
tc_tick = 1;
tc_adjprecision();
+ FREQ2BT(hz, &tick_bt);
tick_rate = hz / tc_tick;
- FREQ2BT(tick_rate, &tick_bt);
+ FREQ2BT(tick_rate, &tc_tick_bt);
p = (tc_tick * 1000000) / hz;
printf("Timecounters tick every %d.%03u msec\n", p / 1000, p % 1000);
Modified: projects/calloutng/sys/kern/kern_time.c
==============================================================================
--- projects/calloutng/sys/kern/kern_time.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/kern_time.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -494,7 +494,7 @@ kern_nanosleep(struct thread *td, struct
bt_prec = tmp;
bintime_divpow2(&bt_prec, tc_timeexp);
if (TIMESEL(&bt, &tmp))
- bintime_add(&bt, &tick_bt);
+ bintime_add(&bt, &tc_tick_bt);
bintime_add(&bt, &tmp);
error = tsleep_bt(&nanowait, PWAIT | PCATCH, "nanslp", &bt, &bt_prec);
TIMESEL(&btt, &tmp);
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/kern_timeout.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$");
#include "opt_callout_profiling.h"
#include "opt_kdtrace.h"
+#if defined(__arm__)
+#include "opt_timer.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -872,6 +875,10 @@ callout_handle_init(struct callout_handl
handle->callout = NULL;
}
+#ifndef NO_EVENTTIMERS
+DPCPU_DECLARE(struct bintime, hardclocktime);
+#endif
+
/*
* New interface; clients allocate their own callout structures.
*
@@ -893,26 +900,34 @@ _callout_reset_on(struct callout *c, str
struct bintime *precision, int to_ticks, void (*ftn)(void *),
void *arg, int cpu, int flags)
{
- struct bintime now, to_bt, pr;
+ struct bintime to_bt, pr;
struct callout_cpu *cc;
int bucket, cancelled, direct;
cancelled = 0;
if (bt == NULL) {
- pr = to_bt = tick_bt;
- getbinuptime(&now);
+#ifdef NO_EVENTTIMERS
+ getbinuptime(&to_bt);
+ /* Add safety belt for the case of hz > 1000. */
+ bintime_addx(&to_bt, tc_tick_bt.frac - tick_bt.frac);
+#else
+ /*
+ * Obtain the time of the last hardclock() call on this CPU
+ * directly from the kern_clocksource.c. This value is
+ * per-CPU, but it is equal for all active ones.
+ */
+ spinlock_enter();
+ to_bt = DPCPU_GET(hardclocktime);
+ spinlock_exit();
+#endif
+ pr = tick_bt;
if (to_ticks > 1)
- bintime_mul(&to_bt, to_ticks);
- bintime_add(&to_bt, &now);
- if (C_PRELGET(flags) < 0) {
- pr = tick_bt;
- } else {
- to_ticks >>= C_PRELGET(flags);
- if (to_ticks == 0)
- pr = tick_bt;
- else
- bintime_mul(&pr, to_ticks);
- }
+ bintime_mul(&pr, to_ticks);
+ bintime_add(&to_bt, &pr);
+ if (C_PRELGET(flags) < 0)
+ bintime_clear(&pr);
+ else
+ bintime_divpow2(&pr, C_PRELGET(flags));
} else {
to_bt = *bt;
if (precision != NULL)
Modified: projects/calloutng/sys/kern/subr_param.c
==============================================================================
--- projects/calloutng/sys/kern/subr_param.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/subr_param.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -81,8 +81,9 @@ __FBSDID("$FreeBSD$");
static int sysctl_kern_vm_guest(SYSCTL_HANDLER_ARGS);
-int hz;
-int tick;
+int hz; /* system clock's frequency */
+int tick; /* usec per tick (1000000 / hz) */
+struct bintime tick_bt; /* bintime per tick (1s / hz) */
int maxusers; /* base tunable */
int maxproc; /* maximum # of processes */
int maxprocperuid; /* max # of procs per user */
@@ -219,6 +220,7 @@ init_param1(void)
if (hz == -1)
hz = vm_guest > VM_GUEST_NO ? HZ_VM : HZ;
tick = 1000000 / hz;
+ FREQ2BT(hz, &tick_bt);
#ifdef VM_SWZONE_SIZE_MAX
maxswzone = VM_SWZONE_SIZE_MAX;
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 20:36:56 2012 (r244364)
@@ -1008,7 +1008,7 @@ kern_select(struct thread *td, int nd, f
precision = abt;
bintime_divpow2(&precision, tc_timeexp);
if (TIMESEL(&rbt, &abt))
- bintime_add(&abt, &tick_bt);
+ bintime_add(&abt, &tc_tick_bt);
bintime_add(&abt, &rbt);
} else {
abt.sec = 0;
@@ -1290,7 +1290,7 @@ sys_poll(td, uap)
precision = abt;
bintime_divpow2(&precision, tc_timeexp);
if (TIMESEL(&rbt, &abt))
- bintime_add(&abt, &tick_bt);
+ bintime_add(&abt, &tc_tick_bt);
bintime_add(&abt, &rbt);
} else {
abt.sec = 0;
Modified: projects/calloutng/sys/sys/time.h
==============================================================================
--- projects/calloutng/sys/sys/time.h Mon Dec 17 19:34:27 2012 (r244363)
+++ projects/calloutng/sys/sys/time.h Mon Dec 17 20:36:56 2012 (r244364)
@@ -300,6 +300,7 @@ extern time_t time_second;
extern time_t time_uptime;
extern struct bintime boottimebin;
extern struct bintime tick_bt;
+extern struct bintime tc_tick_bt;
extern struct timeval boottime;
extern int tc_timeexp;
extern int tc_timepercentage;
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 21:17:01 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id A31091AE;
Mon, 17 Dec 2012 21:17:01 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
[IPv6:2001:470:1f10:75::2])
by mx1.freebsd.org (Postfix) with ESMTP id 747A28FC13;
Mon, 17 Dec 2012 21:17:01 +0000 (UTC)
Received: from pakbsde14.localnet (unknown [38.105.238.108])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id D14D1B915;
Mon, 17 Dec 2012 16:17:00 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Subject: Re: svn commit: r244249 - projects/calloutng/sys/dev/syscons
Date: Mon, 17 Dec 2012 15:09:54 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; )
References: <201212151044.qBFAiG70038633@svn.freebsd.org>
In-Reply-To: <201212151044.qBFAiG70038633@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201212171509.55216.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Mon, 17 Dec 2012 16:17:00 -0500 (EST)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 21:17:01 -0000
On Saturday, December 15, 2012 5:44:16 am Alexander Motin wrote:
> Author: mav
> Date: Sat Dec 15 10:44:16 2012
> New Revision: 244249
> URL: http://svnweb.freebsd.org/changeset/base/244249
>
> Log:
> Switch syscons from timeout() to callout_reset_flags() and specify that
> precision is not important there -- anything from 20 to 30Hz will be fine.
>
> Modified:
> projects/calloutng/sys/dev/syscons/syscons.c
> projects/calloutng/sys/dev/syscons/syscons.h
>
> Modified: projects/calloutng/sys/dev/syscons/syscons.c
>
==============================================================================
> --- projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:30:06 2012
(r244248)
> +++ projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:44:16 2012
(r244249)
> @@ -504,6 +504,8 @@ sc_attach_unit(int unit, int flags)
>
> sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
> sc->config = flags;
> + callout_init(&sc->ctimeout, FALSE);
> + callout_init(&sc->cblink, FALSE);
Did you change the calling conventions for callout_init() in this branch? In
HEAD the second argument is a flags variable (albeit with only a single flag
defined: CALLOUT_MPSAFE). Thus, the common usage is to use 'callout_init(..,
0);' for callouts that need Giant and 'callout_init(..., CALLOUT_MPSAFE);' for
those that do not need Giant.
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 21:23:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E22D65A7;
Mon, 17 Dec 2012 21:23:02 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id C7BB88FC12;
Mon, 17 Dec 2012 21:23:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHLN2NX077448;
Mon, 17 Dec 2012 21:23:02 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHLN2nW077447;
Mon, 17 Dec 2012 21:23:02 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212172123.qBHLN2nW077447@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Dec 2012 21:23:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244367 - projects/calloutng/sys/dev/syscons
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 21:23:03 -0000
Author: mav
Date: Mon Dec 17 21:23:02 2012
New Revision: 244367
URL: http://svnweb.freebsd.org/changeset/base/244367
Log:
Change callout_init() mpsafe argument value from FALSE to 0, following
usual practice.
Reported by: jhb
Modified:
projects/calloutng/sys/dev/syscons/syscons.c
Modified: projects/calloutng/sys/dev/syscons/syscons.c
==============================================================================
--- projects/calloutng/sys/dev/syscons/syscons.c Mon Dec 17 21:09:44 2012 (r244366)
+++ projects/calloutng/sys/dev/syscons/syscons.c Mon Dec 17 21:23:02 2012 (r244367)
@@ -504,8 +504,8 @@ sc_attach_unit(int unit, int flags)
sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
sc->config = flags;
- callout_init(&sc->ctimeout, FALSE);
- callout_init(&sc->cblink, FALSE);
+ callout_init(&sc->ctimeout, 0);
+ callout_init(&sc->cblink, 0);
scp = sc_get_stat(sc->dev[0]);
if (sc_console == NULL) /* sc_console_unit < 0 */
sc_console = scp;
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 21:23:15 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3D5706B9;
Mon, 17 Dec 2012 21:23:15 +0000 (UTC)
(envelope-from mavbsd@gmail.com)
Received: from mail-we0-f182.google.com (mail-we0-f182.google.com
[74.125.82.182])
by mx1.freebsd.org (Postfix) with ESMTP id 69A478FC15;
Mon, 17 Dec 2012 21:23:13 +0000 (UTC)
Received: by mail-we0-f182.google.com with SMTP id u54so3032069wey.13
for <multiple recipients>; Mon, 17 Dec 2012 13:23:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
:references:in-reply-to:content-type:content-transfer-encoding;
bh=G8ZuIe53sZA4D4rtiMJ2PnMFDe8WqiSFVLps34ULkEc=;
b=zMcszHf1o0Dv9OxWxK12rTGBHcP4Pvs9hELcXfd+8GmL4OPrsOTi3AgsMyMBhEhbKG
GAYDbGnAEf2DkrUOLbcFWWMv9yK5H/sD3TvLGz779BjLQwLgxehnNY4ZJb6p3hkVWBPE
/CLdDHT6t0xm78WLETfRtBZFUjPEqdhB+QoUInmx+eikKlbLJ4e3CMPMd0sndqYuPtli
kqzOSwii00UqwDkaiODQZ46DKB1466+DjriwIOW1P/XYRrQVhBIn48XVr9jiC/gRd52I
jdYqc+IuwfHm76eyJF6Wo5zyHHA5dxxQpkzidC9z6U8wDOlw9/XJFxinL3hmE9AHq6yO
E2rQ==
Received: by 10.194.76.165 with SMTP id l5mr19799034wjw.14.1355779393272;
Mon, 17 Dec 2012 13:23:13 -0800 (PST)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
by mx.google.com with ESMTPS id
eo10sm14462794wib.9.2012.12.17.13.23.10
(version=TLSv1/SSLv3 cipher=OTHER);
Mon, 17 Dec 2012 13:23:12 -0800 (PST)
Sender: Alexander Motin <mavbsd@gmail.com>
Message-ID: <50CF8D3D.6030906@FreeBSD.org>
Date: Mon, 17 Dec 2012 23:23:09 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:13.0) Gecko/20120628 Thunderbird/13.0.1
MIME-Version: 1.0
To: John Baldwin <jhb@freebsd.org>
Subject: Re: svn commit: r244249 - projects/calloutng/sys/dev/syscons
References: <201212151044.qBFAiG70038633@svn.freebsd.org>
<201212171509.55216.jhb@freebsd.org>
In-Reply-To: <201212171509.55216.jhb@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 21:23:15 -0000
On 17.12.2012 22:09, John Baldwin wrote:
> On Saturday, December 15, 2012 5:44:16 am Alexander Motin wrote:
>> Author: mav
>> Date: Sat Dec 15 10:44:16 2012
>> New Revision: 244249
>> URL: http://svnweb.freebsd.org/changeset/base/244249
>>
>> Log:
>> Switch syscons from timeout() to callout_reset_flags() and specify that
>> precision is not important there -- anything from 20 to 30Hz will be fine.
>>
>> Modified:
>> projects/calloutng/sys/dev/syscons/syscons.c
>> projects/calloutng/sys/dev/syscons/syscons.h
>>
>> Modified: projects/calloutng/sys/dev/syscons/syscons.c
>>
> ==============================================================================
>> --- projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:30:06 2012
> (r244248)
>> +++ projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:44:16 2012
> (r244249)
>> @@ -504,6 +504,8 @@ sc_attach_unit(int unit, int flags)
>>
>> sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
>> sc->config = flags;
>> + callout_init(&sc->ctimeout, FALSE);
>> + callout_init(&sc->cblink, FALSE);
>
> Did you change the calling conventions for callout_init() in this branch? In
> HEAD the second argument is a flags variable (albeit with only a single flag
> defined: CALLOUT_MPSAFE). Thus, the common usage is to use 'callout_init(..,
> 0);' for callouts that need Giant and 'callout_init(..., CALLOUT_MPSAFE);' for
> those that do not need Giant.
No, I haven't. But man page still talks about "FALSE" value for mpsafe
argument and that confused me. Fixed. Thanks.
--
Alexander Motin
From owner-svn-src-projects@FreeBSD.ORG Mon Dec 17 22:06:11 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 602A7AF5;
Mon, 17 Dec 2012 22:06:11 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2BF048FC1A;
Mon, 17 Dec 2012 22:06:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHM6Bus084787;
Mon, 17 Dec 2012 22:06:11 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHM6BDl084786;
Mon, 17 Dec 2012 22:06:11 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212172206.qBHM6BDl084786@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Dec 2012 22:06:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244368 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 22:06:11 -0000
Author: mav
Date: Mon Dec 17 22:06:10 2012
New Revision: 244368
URL: http://svnweb.freebsd.org/changeset/base/244368
Log:
Remove unused timo argument from the seltdwait() function. Both of its
consumers migrated to bintime and won't get back.
Modified:
projects/calloutng/sys/kern/sys_generic.c
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 21:23:02 2012 (r244367)
+++ projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 22:06:10 2012 (r244368)
@@ -102,8 +102,7 @@ static int dofilewrite(struct thread *,
off_t, int);
static void doselwakeup(struct selinfo *, int);
static void seltdinit(struct thread *);
-static int seltdwait(struct thread *, struct bintime *, struct bintime *,
- int);
+static int seltdwait(struct thread *, struct bintime *, struct bintime *);
static void seltdclear(struct thread *);
/*
@@ -1024,10 +1023,10 @@ kern_select(struct thread *td, int nd, f
TIMESEL(&rbt, &abt);
if (bintime_cmp(&rbt, &abt, >=))
break;
- error = seltdwait(td, &abt, &precision, 0);
+ error = seltdwait(td, &abt, &precision);
}
else {
- error = seltdwait(td, NULL, NULL, 0);
+ error = seltdwait(td, NULL, NULL);
}
if (error)
break;
@@ -1306,9 +1305,9 @@ sys_poll(td, uap)
TIMESEL(&rbt, &abt);
if (bintime_cmp(&rbt, &abt, >=))
break;
- error = seltdwait(td, &abt, &precision, 0);
+ error = seltdwait(td, &abt, &precision);
} else {
- error = seltdwait(td, NULL, NULL, 0);
+ error = seltdwait(td, NULL, NULL);
}
if (error)
break;
@@ -1651,8 +1650,7 @@ out:
}
static int
-seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision,
- int timo)
+seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision)
{
struct seltd *stp;
int error;
@@ -1671,9 +1669,7 @@ seltdwait(struct thread *td, struct bint
mtx_unlock(&stp->st_mtx);
return (0);
}
- if (bt == NULL && timo > 0)
- error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo);
- else if (bt != NULL)
+ if (bt != NULL)
error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx,
bt, precision);
else
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 01:13:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E7B1D6F0;
Tue, 18 Dec 2012 01:13:25 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 140658FC19;
Tue, 18 Dec 2012 01:13:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI1DOaK018882;
Tue, 18 Dec 2012 01:13:24 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI1DOIT018881;
Tue, 18 Dec 2012 01:13:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212180113.qBI1DOIT018881@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Tue, 18 Dec 2012 01:13:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244371 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 01:13:26 -0000
Author: linimon (doc,ports committer)
Date: Tue Dec 18 01:13:24 2012
New Revision: 244371
URL: http://svnweb.freebsd.org/changeset/base/244371
Log:
Make more robust. Remove cruft.
Modified:
projects/portbuild/tools/zfsadmin
Modified: projects/portbuild/tools/zfsadmin
==============================================================================
--- projects/portbuild/tools/zfsadmin Tue Dec 18 00:25:48 2012 (r244370)
+++ projects/portbuild/tools/zfsadmin Tue Dec 18 01:13:24 2012 (r244371)
@@ -6,8 +6,6 @@
pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
pbd=${PORTBUILD_DATA:-/var/portbuild}
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts
-
if [ `id -u` != 0 ]; then
echo "$0 must be run as root."
exit 1
@@ -31,11 +29,15 @@ if [ -z "${PORTBUILD_USER}" ]; then
exit 1
fi
+# reset the "zfsadmin" permission set if it already exists.
+zfs unallow -s @zfsadmin ${ZFS_VOLUME} 2> /dev/null
+zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null
+
# create the "zfsadmin" permission set.
-zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}
+zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME} || exit 1
-# delegate the "zfsadmin" permission set to the PORTBUILD_USER.
-zfs allow -u ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME}
+# delegate the "zfsadmin" permission set to the PORTBUILD_USER.
+zfs allow -u ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME} || exit 1
echo "result of operation:"
zfs allow ${ZFS_VOLUME}
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 01:23:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 78BCADEA;
Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 442F28FC0A;
Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI1NcEM020950;
Tue, 18 Dec 2012 01:23:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI1NciM020949;
Tue, 18 Dec 2012 01:23:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212180123.qBI1NciM020949@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Tue, 18 Dec 2012 01:23:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244372 - projects/portbuild/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 01:23:38 -0000
Author: linimon (doc,ports committer)
Date: Tue Dec 18 01:23:37 2012
New Revision: 244372
URL: http://svnweb.freebsd.org/changeset/base/244372
Log:
Add ZFS_PERMISSIONSET for zfsadmin.
Modified:
projects/portbuild/conf/server.conf
Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf Tue Dec 18 01:13:24 2012 (r244371)
+++ projects/portbuild/conf/server.conf Tue Dec 18 01:23:37 2012 (r244372)
@@ -28,9 +28,18 @@ SRC_BRANCH_10_SUBDIR=head/
# directory management definitions
#
+# zfs volume name
ZFS_VOLUME=a
+# zfs mount point
ZFS_MOUNTPOINT=/a
+# zfs permission set. this delegates all permissions except "allow" and
+# "receive". (see zfsadmin)
+ZFS_PERMISSIONSET=clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot
+# portbuild subtree. holds portbuild codebase plus all architectures.
+PORTBUILD_DIRECTORY=portbuild
+
+# snapshots subtree. holds ports and src snapshots.
SNAP_DIRECTORY=snap
# defines for /a/snap/ports-head/ports
SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/ports-head
@@ -38,6 +47,7 @@ SNAP_PORTS_DIRECTORY=${SNAP_DIRECTORY}/p
SRC_DIRECTORY_PREFIX=src-
SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTORY}/${SRC_DIRECTORY_PREFIX}
+# temporary workspace
WORLDDIR=${ZFS_MOUNTPOINT}/chroot/
# XXX TODO (note: Python script, so avoid {})
@@ -77,7 +87,8 @@ PDISPATCH_TIMEOUT=360000
# qmanager definitions (note: Python script, so avoid {})
#
-QMANAGER_PATH=/var/portbuild/qmanager
+#QMANAGER_PATH=${ZFS_MOUNTPOINT}/${PORTBUILD_DIRECTORY}/qmanager
+QMANAGER_PATH=/a/portbuild/qmanager
QMANAGER_DATABASE_FILE=qdb.sl3
QMANAGER_SOCKET_FILE=/tmp/.qmgr
@@ -92,6 +103,7 @@ QMANAGER_RUNAWAY_THRESHOLD=100
#
# upload definitions (see 'cpdistfiles')
+# XXX MCL TO GO AWAY
#
UPLOAD_DIRECTORY="w/ports/distfiles/"
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 07:00:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 13E9476B;
Tue, 18 Dec 2012 07:00:02 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id EB8B88FC0C;
Tue, 18 Dec 2012 07:00:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI701f4078421;
Tue, 18 Dec 2012 07:00:01 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI701YZ078420;
Tue, 18 Dec 2012 07:00:01 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201212180700.qBI701YZ078420@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 18 Dec 2012 07:00:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244380 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 07:00:02 -0000
Author: bryanv
Date: Tue Dec 18 07:00:01 2012
New Revision: 244380
URL: http://svnweb.freebsd.org/changeset/base/244380
Log:
Use the modern malloc(9) flags
Requested by: glebius
Approved by: grehan (implicit)
Modified:
projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Tue Dec 18 06:55:13 2012 (r244379)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c Tue Dec 18 07:00:01 2012 (r244380)
@@ -1002,7 +1002,7 @@ vic_encap_load_mbuf(struct vic_softc *sc
} else if (error != EFBIG)
return (error);
- m = m_collapse(m, M_DONTWAIT, maxsegs);
+ m = m_collapse(m, M_NOWAIT, maxsegs);
if (m != NULL) {
*m0 = m;
error = bus_dmamap_load_mbuf_sg(tag, dmap, m, segs, nsegs, 0);
@@ -1355,7 +1355,7 @@ vic_newbuf(struct vic_softc *sc, struct
frag = &sc->vic_rxq[0] != rxq;
#endif
- m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rxq->pktlen);
+ m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->pktlen);
if (m == NULL)
return (ENOBUFS);
m->m_len = m->m_pkthdr.len = rxq->pktlen;
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 07:15:03 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id BA07AC04;
Tue, 18 Dec 2012 07:15:03 +0000 (UTC)
(envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 9EF678FC14;
Tue, 18 Dec 2012 07:15:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI7F3mb081807;
Tue, 18 Dec 2012 07:15:03 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI7F3Tk081805;
Tue, 18 Dec 2012 07:15:03 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201212180715.qBI7F3Tk081805@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 18 Dec 2012 07:15:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244381 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 07:15:03 -0000
Author: bryanv
Date: Tue Dec 18 07:15:03 2012
New Revision: 244381
URL: http://svnweb.freebsd.org/changeset/base/244381
Log:
Correct the swapped enable/disable interrupt comments
Approved by: grehan (implicit)
Modified:
projects/vmxnet/sys/dev/vmware/vmxnet/if_vicreg.h
Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vicreg.h
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vicreg.h Tue Dec 18 07:00:01 2012 (r244380)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vicreg.h Tue Dec 18 07:15:03 2012 (r244381)
@@ -50,8 +50,8 @@
#define VIC_CMD_IFF_PROMISC 0x0001 /* Promiscuous enabled */
#define VIC_CMD_IFF_BROADCAST 0x0002 /* Broadcast enabled */
#define VIC_CMD_IFF_MULTICAST 0x0004 /* Multicast enabled */
-#define VIC_CMD_INTR_DISABLE 0x0020 /* Enable interrupts */
-#define VIC_CMD_INTR_ENABLE 0x0040 /* Disable interrupts */
+#define VIC_CMD_INTR_DISABLE 0x0020 /* Disable interrupts */
+#define VIC_CMD_INTR_ENABLE 0x0040 /* Enable interrupts */
#define VIC_CMD_Tx_DONE 0x0100 /* Tx done register */
#define VIC_CMD_NUM_Rx_BUF 0x0200 /* Number of Rx buffers */
#define VIC_CMD_NUM_Tx_BUF 0x0400 /* Number of Tx buffers */
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 12:23:51 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 50E095F3;
Tue, 18 Dec 2012 12:23:51 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 36CFC8FC13;
Tue, 18 Dec 2012 12:23:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBICNphu038657;
Tue, 18 Dec 2012 12:23:51 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBICNpXT038655;
Tue, 18 Dec 2012 12:23:51 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212181223.qBICNpXT038655@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 18 Dec 2012 12:23:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244395 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 12:23:51 -0000
Author: mav
Date: Tue Dec 18 12:23:50 2012
New Revision: 244395
URL: http://svnweb.freebsd.org/changeset/base/244395
Log:
Remove condition, useless after callout_tickstofirst() removal..
Modified:
projects/calloutng/sys/kern/kern_clocksource.c
Modified: projects/calloutng/sys/kern/kern_clocksource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 10:44:47 2012 (r244394)
+++ projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 12:23:50 2012 (r244395)
@@ -281,7 +281,7 @@ getnextcpuevent(struct bintime *event, i
*event = state->nexthard;
if (idle || (!activetick && !profiling &&
(timer->et_flags & ET_FLAGS_PERCPU) == 0)) {
- hardfreq = idle ? 2 : (stathz / 2);
+ hardfreq = 2;
if (curcpu == CPU_FIRST() && tc_min_ticktock_freq > hardfreq)
hardfreq = tc_min_ticktock_freq;
if (hz > hardfreq) {
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 12:28:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 00EFF898;
Tue, 18 Dec 2012 12:28:01 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id C10628FC18;
Tue, 18 Dec 2012 12:28:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBICS1ib039329;
Tue, 18 Dec 2012 12:28:01 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBICS1r1039324;
Tue, 18 Dec 2012 12:28:01 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212181228.qBICS1r1039324@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 18 Dec 2012 12:28:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244396 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 12:28:02 -0000
Author: mav
Date: Tue Dec 18 12:28:00 2012
New Revision: 244396
URL: http://svnweb.freebsd.org/changeset/base/244396
Log:
Remove some more extra tabs. No functional change.
Modified:
projects/calloutng/sys/kern/kern_clocksource.c
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/kern/sys_generic.c
Modified: projects/calloutng/sys/kern/kern_clocksource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 12:23:50 2012 (r244395)
+++ projects/calloutng/sys/kern/kern_clocksource.c Tue Dec 18 12:28:00 2012 (r244396)
@@ -275,7 +275,7 @@ getnextcpuevent(struct bintime *event, i
struct pcpu_state *state;
struct bintime tmp;
int hardfreq;
-
+
state = DPCPU_PTR(timerstate);
/* Handle hardclock() events, skipping some is CPU is idle. */
*event = state->nexthard;
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Tue Dec 18 12:23:50 2012 (r244395)
+++ projects/calloutng/sys/kern/kern_timeout.c Tue Dec 18 12:28:00 2012 (r244396)
@@ -126,7 +126,7 @@ struct cc_exec {
int cc_cancel;
int cc_waiting;
};
-
+
/*
* There is one struct callou_cpu per cpu, holding all relevant
* state for the callout processing thread on the individual CPU.
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Tue Dec 18 12:23:50 2012 (r244395)
+++ projects/calloutng/sys/kern/sys_generic.c Tue Dec 18 12:28:00 2012 (r244396)
@@ -1672,7 +1672,7 @@ seltdwait(struct thread *td, struct bint
if (bt != NULL)
error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx,
bt, precision);
- else
+ else
error = cv_wait_sig(&stp->st_wait, &stp->st_mtx);
mtx_unlock(&stp->st_mtx);
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 17:13:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E3BBB487;
Tue, 18 Dec 2012 17:13:25 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id C39578FC12;
Tue, 18 Dec 2012 17:13:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBIHDP2O090436;
Tue, 18 Dec 2012 17:13:25 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBIHDHgF090369;
Tue, 18 Dec 2012 17:13:17 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212181713.qBIHDHgF090369@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 18 Dec 2012 17:13:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244402 - in projects/mtree: . bin/df bin/ps bin/sh
cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzfs/common
contrib/binutils/gas/config contrib/gcc contrib/gcc/confi...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 17:13:26 -0000
Author: brooks
Date: Tue Dec 18 17:13:16 2012
New Revision: 244402
URL: http://svnweb.freebsd.org/changeset/base/244402
Log:
MFH at r244401 to pick up the import of vis/unvis(3).
Added:
projects/mtree/contrib/libc-vis/
- copied from r244401, head/contrib/libc-vis/
projects/mtree/sys/arm/arm/pl190.c
- copied unchanged from r244401, head/sys/arm/arm/pl190.c
projects/mtree/sys/arm/conf/VERSATILEPB
- copied unchanged from r244401, head/sys/arm/conf/VERSATILEPB
projects/mtree/sys/arm/versatile/
- copied from r244401, head/sys/arm/versatile/
projects/mtree/sys/boot/fdt/dts/versatilepb.dts
- copied unchanged from r244401, head/sys/boot/fdt/dts/versatilepb.dts
projects/mtree/sys/security/audit/bsm_domain.c
- copied unchanged from r244401, head/sys/security/audit/bsm_domain.c
projects/mtree/sys/security/audit/bsm_errno.c
- copied unchanged from r244401, head/sys/security/audit/bsm_errno.c
projects/mtree/sys/security/audit/bsm_fcntl.c
- copied unchanged from r244401, head/sys/security/audit/bsm_fcntl.c
projects/mtree/sys/security/audit/bsm_socket_type.c
- copied unchanged from r244401, head/sys/security/audit/bsm_socket_type.c
projects/mtree/sys/security/audit/bsm_token.c
- copied unchanged from r244401, head/sys/security/audit/bsm_token.c
projects/mtree/tools/regression/bin/sh/errors/write-error1.0
- copied unchanged from r244401, head/tools/regression/bin/sh/errors/write-error1.0
Deleted:
projects/mtree/lib/libc/gen/unvis.3
projects/mtree/lib/libc/gen/unvis.c
projects/mtree/lib/libc/gen/vis.3
projects/mtree/lib/libc/gen/vis.c
projects/mtree/sys/security/audit/audit_bsm_domain.c
projects/mtree/sys/security/audit/audit_bsm_errno.c
projects/mtree/sys/security/audit/audit_bsm_fcntl.c
projects/mtree/sys/security/audit/audit_bsm_socket_type.c
projects/mtree/sys/security/audit/audit_bsm_token.c
Modified:
projects/mtree/UPDATING
projects/mtree/bin/df/df.c
projects/mtree/bin/ps/ps.c
projects/mtree/bin/sh/eval.c
projects/mtree/bin/sh/output.c
projects/mtree/bin/sh/output.h
projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
projects/mtree/contrib/binutils/gas/config/tc-arm.c
projects/mtree/contrib/gcc/config/arm/arm.h
projects/mtree/contrib/gcc/longlong.h
projects/mtree/contrib/openbsm/INSTALL
projects/mtree/contrib/openbsm/NEWS
projects/mtree/contrib/openbsm/VERSION
projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
projects/mtree/contrib/openbsm/config/config.h
projects/mtree/contrib/openbsm/configure
projects/mtree/contrib/openbsm/configure.ac
projects/mtree/contrib/openbsm/etc/audit_event
projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h
projects/mtree/contrib/openbsm/sys/bsm/audit_record.h
projects/mtree/contrib/top/top.h
projects/mtree/etc/defaults/rc.conf
projects/mtree/etc/devd/usb.conf
projects/mtree/etc/login.conf
projects/mtree/etc/pf.os
projects/mtree/etc/rc.d/auditdistd
projects/mtree/etc/rc.d/savecore
projects/mtree/etc/rc.d/sysctl
projects/mtree/gnu/lib/libgcc/Makefile
projects/mtree/gnu/usr.bin/binutils/as/Makefile
projects/mtree/include/Makefile
projects/mtree/lib/clang/Makefile
projects/mtree/lib/libc/gen/Makefile.inc
projects/mtree/lib/libc/gen/sysctlbyname.c
projects/mtree/lib/libc/iconv/citrus_mmap.c
projects/mtree/lib/libc/locale/collate.c
projects/mtree/lib/libc/locale/setrunelocale.c
projects/mtree/lib/libc/nls/msgcat.c
projects/mtree/lib/libcompiler_rt/Makefile
projects/mtree/lib/libdevstat/devstat.3
projects/mtree/lib/libdevstat/devstat.c
projects/mtree/lib/libdevstat/devstat.h
projects/mtree/sbin/growfs/growfs.c
projects/mtree/sbin/route/route.c
projects/mtree/sbin/savecore/savecore.8
projects/mtree/sbin/savecore/savecore.c
projects/mtree/sbin/setkey/setkey.8
projects/mtree/sbin/sysctl/sysctl.8
projects/mtree/sbin/sysctl/sysctl.c
projects/mtree/share/examples/etc/make.conf
projects/mtree/share/i18n/csmapper/Makefile.part
projects/mtree/share/misc/committers-src.dot
projects/mtree/share/mk/bsd.lib.mk
projects/mtree/share/mk/bsd.prog.mk
projects/mtree/share/mk/sys.mk
projects/mtree/share/syscons/keymaps/spanish.dvorak.kbd
projects/mtree/sys/amd64/amd64/fpu.c
projects/mtree/sys/amd64/include/bus.h
projects/mtree/sys/amd64/include/fpu.h
projects/mtree/sys/boot/arm/uboot/Makefile
projects/mtree/sys/boot/forth/beastie.4th.8
projects/mtree/sys/boot/forth/check-password.4th
projects/mtree/sys/boot/forth/check-password.4th.8
projects/mtree/sys/boot/forth/loader.4th.8
projects/mtree/sys/boot/forth/loader.conf.5
projects/mtree/sys/boot/forth/menu.4th.8
projects/mtree/sys/boot/i386/efi/ldscript.amd64
projects/mtree/sys/boot/sparc64/boot1/boot1.c
projects/mtree/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
projects/mtree/sys/cddl/compat/opensolaris/sys/kstat.h
projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
projects/mtree/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/mtree/sys/conf/files
projects/mtree/sys/conf/files.arm
projects/mtree/sys/dev/agp/agp_i810.c
projects/mtree/sys/dev/ahci/ahci.c
projects/mtree/sys/dev/ale/if_ale.c
projects/mtree/sys/dev/arcmsr/arcmsr.c
projects/mtree/sys/dev/ata/ata-pci.h
projects/mtree/sys/dev/ata/chipsets/ata-ati.c
projects/mtree/sys/dev/ath/if_ath_tx.c
projects/mtree/sys/dev/ath/if_athvar.h
projects/mtree/sys/dev/smc/if_smc.c
projects/mtree/sys/dev/sound/pci/hda/hdaa_patches.c
projects/mtree/sys/dev/sound/pci/hda/hdac.h
projects/mtree/sys/dev/sym/sym_hipd.c
projects/mtree/sys/dev/uart/uart_bus_fdt.c
projects/mtree/sys/dev/virtio/block/virtio_blk.c
projects/mtree/sys/dev/virtio/network/if_vtnet.c
projects/mtree/sys/dev/virtio/scsi/virtio_scsi.c
projects/mtree/sys/dev/wbwd/wbwd.c
projects/mtree/sys/dev/wtap/if_wtap.c
projects/mtree/sys/i386/include/bus.h
projects/mtree/sys/kern/kern_fork.c
projects/mtree/sys/kern/kern_mib.c
projects/mtree/sys/kern/kern_priv.c
projects/mtree/sys/kern/kern_shutdown.c
projects/mtree/sys/kern/kern_sig.c
projects/mtree/sys/kern/subr_witness.c
projects/mtree/sys/kern/vfs_export.c
projects/mtree/sys/kern/vfs_subr.c
projects/mtree/sys/kgssapi/gss_accept_sec_context.c
projects/mtree/sys/kgssapi/gss_acquire_cred.c
projects/mtree/sys/kgssapi/gss_canonicalize_name.c
projects/mtree/sys/kgssapi/gss_delete_sec_context.c
projects/mtree/sys/kgssapi/gss_display_status.c
projects/mtree/sys/kgssapi/gss_export_name.c
projects/mtree/sys/kgssapi/gss_impl.c
projects/mtree/sys/kgssapi/gss_import_name.c
projects/mtree/sys/kgssapi/gss_init_sec_context.c
projects/mtree/sys/kgssapi/gss_pname_to_uid.c
projects/mtree/sys/kgssapi/gss_release_cred.c
projects/mtree/sys/kgssapi/gss_release_name.c
projects/mtree/sys/kgssapi/gss_set_cred_option.c
projects/mtree/sys/kgssapi/gssapi_impl.h
projects/mtree/sys/net/if_bridge.c
projects/mtree/sys/net/if_llatbl.c
projects/mtree/sys/netinet/if_ether.c
projects/mtree/sys/netinet/tcp_input.c
projects/mtree/sys/netinet6/in6.c
projects/mtree/sys/netinet6/in6_var.h
projects/mtree/sys/netinet6/ip6_input.c
projects/mtree/sys/netinet6/ip6_var.h
projects/mtree/sys/netinet6/nd6.c
projects/mtree/sys/netpfil/pf/if_pfsync.c
projects/mtree/sys/netpfil/pf/pf.c
projects/mtree/sys/netpfil/pf/pf_if.c
projects/mtree/sys/netpfil/pf/pf_ioctl.c
projects/mtree/sys/netpfil/pf/pf_norm.c
projects/mtree/sys/sparc64/conf/GENERIC
projects/mtree/sys/sys/fnv_hash.h
projects/mtree/sys/sys/kdb.h
projects/mtree/sys/sys/mount.h
projects/mtree/sys/sys/sysctl.h
projects/mtree/sys/sys/systm.h
projects/mtree/sys/ufs/ufs/ufs_quota.c
projects/mtree/sys/vm/vm.h
projects/mtree/sys/vm/vm_map.c
projects/mtree/sys/vm/vm_mmap.c
projects/mtree/sys/vm/vm_unix.c
projects/mtree/sys/x86/include/bus.h
projects/mtree/tools/tools/sysbuild/sysbuild.sh
projects/mtree/usr.bin/calendar/parsedata.c
projects/mtree/usr.bin/sort/sort.c
projects/mtree/usr.bin/sort/sort.h
projects/mtree/usr.sbin/gssd/gssd.c
projects/mtree/usr.sbin/iostat/iostat.8
projects/mtree/usr.sbin/iostat/iostat.c
projects/mtree/usr.sbin/ndp/ndp.8
projects/mtree/usr.sbin/portsnap/portsnap/portsnap.sh
projects/mtree/usr.sbin/service/service.8
projects/mtree/usr.sbin/service/service.sh
Directory Properties:
projects/mtree/ (props changed)
projects/mtree/cddl/contrib/opensolaris/ (props changed)
projects/mtree/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/mtree/contrib/binutils/ (props changed)
projects/mtree/contrib/gcc/ (props changed)
projects/mtree/contrib/openbsm/ (props changed)
projects/mtree/contrib/top/ (props changed)
projects/mtree/gnu/lib/ (props changed)
projects/mtree/gnu/usr.bin/binutils/ (props changed)
projects/mtree/lib/libc/ (props changed)
projects/mtree/sbin/ (props changed)
projects/mtree/sys/ (props changed)
projects/mtree/sys/boot/ (props changed)
projects/mtree/sys/boot/i386/efi/ (props changed)
projects/mtree/sys/cddl/contrib/opensolaris/ (props changed)
projects/mtree/sys/conf/ (props changed)
projects/mtree/sys/powerpc/wii/locore.S (props changed)
projects/mtree/usr.bin/calendar/ (props changed)
Modified: projects/mtree/UPDATING
==============================================================================
--- projects/mtree/UPDATING Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/UPDATING Tue Dec 18 17:13:16 2012 (r244402)
@@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20121217:
+ By default, only the 10 most recent kernel dumps will be saved. To
+ restore the previous behaviour (no limit on the number of kernel dumps
+ stored in the dump directory) add the following line to /etc/rc.conf:
+
+ savecore_flags=""
+
20121201:
With the addition of auditdistd(8), a new auditdistd user is now
depended on during installworld. "mergemaster -p" can be used to add
Modified: projects/mtree/bin/df/df.c
==============================================================================
--- projects/mtree/bin/df/df.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/bin/df/df.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -397,7 +397,7 @@ prthumanvalinode(int64_t bytes)
static intmax_t
fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
{
- return (num * (intmax_t) fsbs / bs);
+ return (num * (intmax_t) fsbs / (int64_t) bs);
}
/*
Modified: projects/mtree/bin/ps/ps.c
==============================================================================
--- projects/mtree/bin/ps/ps.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/bin/ps/ps.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -109,6 +109,7 @@ static int needcomm; /* -o "command" */
static int needenv; /* -e */
static int needuser; /* -o "user" */
static int optfatal; /* Fatal error parsing some list-option. */
+static int pid_max; /* kern.max_pid */
static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
@@ -148,6 +149,7 @@ static int pscomp(const void *, const v
static void saveuser(KINFO *);
static void scanvars(void);
static void sizevars(void);
+static void pidmax_init(void);
static void usage(void);
static char dfmt[] = "pid,tt,state,time,command";
@@ -200,6 +202,8 @@ main(int argc, char *argv[])
if (argc > 1)
argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
+ pidmax_init();
+
all = descendancy = _fmt = nselectors = optfatal = 0;
prtheader = showthreads = wflag = xkeep_implied = 0;
xkeep = -1; /* Neither -x nor -X. */
@@ -722,7 +726,6 @@ addelem_gid(struct listinfo *inf, const
return (1);
}
-#define BSD_PID_MAX 99999 /* Copy of PID_MAX from sys/proc.h. */
static int
addelem_pid(struct listinfo *inf, const char *elem)
{
@@ -740,7 +743,7 @@ addelem_pid(struct listinfo *inf, const
if (*endp != '\0' || tempid < 0 || elem == endp) {
warnx("Invalid %s: %s", inf->lname, elem);
errno = ERANGE;
- } else if (errno != 0 || tempid > BSD_PID_MAX) {
+ } else if (errno != 0 || tempid > pid_max) {
warnx("%s too large: %s", inf->lname, elem);
errno = ERANGE;
}
@@ -753,7 +756,6 @@ addelem_pid(struct listinfo *inf, const
inf->l.pids[(inf->count)++] = tempid;
return (1);
}
-#undef BSD_PID_MAX
/*-
* The user can specify a device via one of three formats:
@@ -1352,6 +1354,18 @@ kludge_oldps_options(const char *optlist
}
static void
+pidmax_init(void)
+{
+ size_t intsize;
+
+ intsize = sizeof(pid_max);
+ if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
+ warn("unable to read kern.pid_max");
+ pid_max = 99999;
+ }
+}
+
+static void
usage(void)
{
#define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
Modified: projects/mtree/bin/sh/eval.c
==============================================================================
--- projects/mtree/bin/sh/eval.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/bin/sh/eval.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -1070,6 +1070,7 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
+ outclearerror(out1);
/*
* If there is no command word, redirection errors should
* not be fatal but assignment errors should.
@@ -1085,6 +1086,11 @@ evalcommand(union node *cmd, int flags,
builtin_flags = flags;
exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
flushall();
+ if (outiserror(out1)) {
+ warning("write error on stdout");
+ if (exitstatus == 0 || exitstatus == 1)
+ exitstatus = 2;
+ }
cmddone:
if (argc > 0)
bltinunsetlocale();
Modified: projects/mtree/bin/sh/output.c
==============================================================================
--- projects/mtree/bin/sh/output.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/bin/sh/output.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -239,6 +239,20 @@ freestdout(void)
}
+int
+outiserror(struct output *file)
+{
+ return (file->flags & OUTPUT_ERR);
+}
+
+
+void
+outclearerror(struct output *file)
+{
+ file->flags &= ~OUTPUT_ERR;
+}
+
+
void
outfmt(struct output *file, const char *fmt, ...)
{
Modified: projects/mtree/bin/sh/output.h
==============================================================================
--- projects/mtree/bin/sh/output.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/bin/sh/output.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -66,6 +66,8 @@ void emptyoutbuf(struct output *);
void flushall(void);
void flushout(struct output *);
void freestdout(void);
+int outiserror(struct output *);
+void outclearerror(struct output *);
void outfmt(struct output *, const char *, ...) __printflike(2, 3);
void out1fmt(const char *, ...) __printflike(1, 2);
void out2fmt_flush(const char *, ...) __printflike(1, 2);
Modified: projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/cddl/contrib/opensolaris/cmd/zdb/zdb.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -61,14 +61,16 @@
#undef verify
#include <libzfs.h>
-#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
- zio_compress_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
- zio_checksum_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
- dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
- dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
-#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
+#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
+ zio_compress_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
+ zio_checksum_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
+ dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
+ dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
+#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : \
+ (((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ? \
+ DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
#ifndef lint
extern int zfs_recover;
@@ -3194,7 +3196,13 @@ main(int argc, char **argv)
argv[i], strerror(errno));
}
}
- (os != NULL) ? dump_dir(os) : dump_zpool(spa);
+ if (os != NULL) {
+ dump_dir(os);
+ } else if (zopt_objects > 0 && !dump_opt['m']) {
+ dump_dir(spa->spa_meta_objset);
+ } else {
+ dump_zpool(spa);
+ }
} else {
flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR;
flagbits['c'] = ZDB_FLAG_CHECKSUM;
Modified: projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -727,7 +727,7 @@ send_iterate_fs(zfs_handle_t *zhp, void
sd->parent_fromsnap_guid = 0;
VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0));
VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0));
- (void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd);
+ (void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd);
VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps));
VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops));
nvlist_free(sd->parent_snaps);
@@ -1945,11 +1945,12 @@ recv_incremental_replication(libzfs_hand
recvflags_t *flags, nvlist_t *stream_nv, avl_tree_t *stream_avl,
nvlist_t *renamed)
{
- nvlist_t *local_nv;
+ nvlist_t *local_nv, *deleted = NULL;
avl_tree_t *local_avl;
nvpair_t *fselem, *nextfselem;
char *fromsnap;
char newname[ZFS_MAXNAMELEN];
+ char guidname[32];
int error;
boolean_t needagain, progress, recursive;
char *s1, *s2;
@@ -1965,6 +1966,8 @@ recv_incremental_replication(libzfs_hand
again:
needagain = progress = B_FALSE;
+ VERIFY(0 == nvlist_alloc(&deleted, NV_UNIQUE_NAME, 0));
+
if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL,
recursive, &local_nv, &local_avl)) != 0)
return (error);
@@ -2079,6 +2082,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", thisguid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2134,6 +2139,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2156,6 +2163,24 @@ again:
s2 = strrchr(stream_fsname, '/');
/*
+ * Check if we're going to rename based on parent guid change
+ * and the current parent guid was also deleted. If it was then
+ * rename will fail and is likely unneeded, so avoid this and
+ * force an early retry to determine the new
+ * parent_fromsnap_guid.
+ */
+ if (stream_parent_fromsnap_guid != 0 &&
+ parent_fromsnap_guid != 0 &&
+ stream_parent_fromsnap_guid != parent_fromsnap_guid) {
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ if (nvlist_exists(deleted, guidname)) {
+ progress = B_TRUE;
+ needagain = B_TRUE;
+ goto doagain;
+ }
+ }
+
+ /*
* Check for rename. If the exact receive path is specified, it
* does not count as a rename, but we still need to check the
* datasets beneath it.
@@ -2209,8 +2234,10 @@ again:
}
}
+doagain:
fsavl_destroy(local_avl);
nvlist_free(local_nv);
+ nvlist_free(deleted);
if (needagain && progress) {
/* do another pass to fix up temporary names */
Modified: projects/mtree/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- projects/mtree/contrib/binutils/gas/config/tc-arm.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/binutils/gas/config/tc-arm.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -20107,6 +20107,7 @@ static const struct arm_option_cpu_value
{"softvfp", FPU_ARCH_VFP},
{"softvfp+vfp", FPU_ARCH_VFP_V2},
{"vfp", FPU_ARCH_VFP_V2},
+ {"vfpv2", FPU_ARCH_VFP_V2},
{"vfp9", FPU_ARCH_VFP_V2},
{"vfp3", FPU_ARCH_VFP_V3},
{"vfpv3", FPU_ARCH_VFP_V3},
Modified: projects/mtree/contrib/gcc/config/arm/arm.h
==============================================================================
--- projects/mtree/contrib/gcc/config/arm/arm.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/gcc/config/arm/arm.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -1866,8 +1866,10 @@ typedef struct
# define DTOR_LIST_BEGIN asm (ARM_EABI_DTORS_SECTION_OP)
# define DTOR_LIST_END /* empty */
# else /* !defined (__ARM_EABI__) */
+# ifndef __clang__
# define CTORS_SECTION_ASM_OP ARM_CTORS_SECTION_OP
# define DTORS_SECTION_ASM_OP ARM_DTORS_SECTION_OP
+# endif
# endif /* !defined (__ARM_EABI__) */
#endif /* !defined (IN_LIBCC2) */
Modified: projects/mtree/contrib/gcc/longlong.h
==============================================================================
--- projects/mtree/contrib/gcc/longlong.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/gcc/longlong.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -205,7 +205,7 @@ UDItype __umulsidi3 (USItype, USItype);
"rI" ((USItype) (bl)) __CLOBBER_CC)
#define umul_ppmm(xh, xl, a, b) \
{register USItype __t0, __t1, __t2; \
- __asm__ ("%@ Inlined umul_ppmm\n" \
+ __asm__ ("/* Inlined umul_ppmm */\n" \
" mov %2, %5, lsr #16\n" \
" mov %0, %6, lsr #16\n" \
" bic %3, %5, %2, lsl #16\n" \
Modified: projects/mtree/contrib/openbsm/INSTALL
==============================================================================
--- projects/mtree/contrib/openbsm/INSTALL Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/INSTALL Tue Dec 18 17:13:16 2012 (r244402)
@@ -9,8 +9,8 @@ suppport is found. Typical builds will
make
If doing development work on OpenBSM with gcc, the following invocation of
-configure may be preferred in order to generate full compiler warnings and
-force the compile to fail if a warning is found:
+configure is preferred in order to generate full compiler warnings and force
+the compile to fail if a warning is found:
CFLAGS="-Wall -Werror" ./configure
Modified: projects/mtree/contrib/openbsm/NEWS
==============================================================================
--- projects/mtree/contrib/openbsm/NEWS Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/NEWS Tue Dec 18 17:13:16 2012 (r244402)
@@ -1,5 +1,11 @@
OpenBSM Version History
+OpenBSM 1.2 alpha 3
+
+- Various minor tweaks to the auditdistd build to make it fit the FreeBSD
+ build environment better.
+- AUE_WAIT6 merged from FreeBSD 9.
+
OpenBSM 1.2 alpha 2
- auditdistd, a distributed audit trail management daemon, has now been
@@ -489,4 +495,4 @@ OpenBSM 1.0 alpha 1
to support reloading of kernel event table.
- Allow comments in /etc/security configuration files.
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#53 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $
Modified: projects/mtree/contrib/openbsm/VERSION
==============================================================================
--- projects/mtree/contrib/openbsm/VERSION Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/VERSION Tue Dec 18 17:13:16 2012 (r244402)
@@ -1 +1 @@
-OPENBSM_1_2alpha2
+OPENBSM_1_2_alpha3
Modified: projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
==============================================================================
--- projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/bin/auditdistd/auditdistd.conf.5 Tue Dec 18 17:13:16 2012 (r244402)
@@ -355,7 +355,7 @@ receiver {
.Xr auditdistd 8 .
.Sh AUTHORS
The
-.Nm
-was written by
+.Nm auditdistd
+was developed by
.An Pawel Jakub Dawidek Aq pawel@dawidek.net
under sponsorship of the FreeBSD Foundation.
Modified: projects/mtree/contrib/openbsm/config/config.h
==============================================================================
--- projects/mtree/contrib/openbsm/config/config.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/config/config.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -235,7 +235,7 @@
#define PACKAGE_NAME "OpenBSM"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenBSM 1.2alpha2"
+#define PACKAGE_STRING "OpenBSM 1.2-alpha3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openbsm"
@@ -244,7 +244,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2alpha2"
+#define PACKAGE_VERSION "1.2-alpha3"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
@@ -280,7 +280,7 @@
#define USE_SYS_ENDIAN_H /**/
/* Version number of package */
-#define VERSION "1.2alpha2"
+#define VERSION "1.2-alpha3"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
Modified: projects/mtree/contrib/openbsm/configure
==============================================================================
--- projects/mtree/contrib/openbsm/configure Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/configure Tue Dec 18 17:13:16 2012 (r244402)
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 .
+# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
#
# Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenBSM'
PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2alpha2'
-PACKAGE_STRING='OpenBSM 1.2alpha2'
+PACKAGE_VERSION='1.2-alpha3'
+PACKAGE_STRING='OpenBSM 1.2-alpha3'
PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";;
+ short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenBSM configure 1.2alpha2
+OpenBSM configure 1.2-alpha3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenBSM $as_me 1.2alpha2, which was
+It was created by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -11552,7 +11552,7 @@ fi
# Define the identity of the package.
PACKAGE=OpenBSM
- VERSION=1.2alpha2
+ VERSION=1.2-alpha3
cat >>confdefs.h <<_ACEOF
@@ -13559,12 +13559,14 @@ int
main ()
{
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
;
return 0;
@@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenBSM $as_me 1.2alpha2, which was
+This file was extended by OpenBSM $as_me 1.2-alpha3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14238,7 +14240,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenBSM config.status 1.2alpha2
+OpenBSM config.status 1.2-alpha3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: projects/mtree/contrib/openbsm/configure.ac
==============================================================================
--- projects/mtree/contrib/openbsm/configure.ac Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/configure.ac Tue Dec 18 17:13:16 2012 (r244402)
@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
-AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 $])
+AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm])
+AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c])
AC_CONFIG_AUX_DIR(config)
@@ -217,12 +217,14 @@ AC_TRY_LINK([
#endif
#include <stdlib.h>
], [
- bswap16(0);
- bswap32(0);
- bswap64(0);
+ int i;
+
+ i = bswap16(0);
+ i = bswap32(0);
+ i = bswap64(0);
be32enc(NULL, 0);
- htole64(0);
- le64toh(0);
+ i = htole64(0);
+ i = le64toh(0);
], [], [
AC_DEFINE(USE_COMPAT_ENDIAN_ENC_H,, Define if compat/endian_enc.h is required)
AC_MSG_RESULT([using compat/endian_enc.h])
Modified: projects/mtree/contrib/openbsm/etc/audit_event
==============================================================================
--- projects/mtree/contrib/openbsm/etc/audit_event Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/etc/audit_event Tue Dec 18 17:13:16 2012 (r244402)
@@ -1,5 +1,5 @@
#
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $
# $FreeBSD$
#
# The mapping between event identifiers and values is also hard-coded in
@@ -562,6 +562,7 @@
43198:AUE_PDKILL:pdkill(2):pc
43199:AUE_PDGETPID:pdgetpid(2):pc
43200:AUE_PDWAIT:pdwait(2):pc
+43201:AUE_WAIT6:wait6(2):pc
#
# Solaris userspace events.
#
Modified: projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h
==============================================================================
--- projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/sys/bsm/audit_kevents.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -601,6 +601,7 @@
#define AUE_PDKILL 43198 /* FreeBSD. */
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
+#define AUE_WAIT6 43201 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
Modified: projects/mtree/contrib/openbsm/sys/bsm/audit_record.h
==============================================================================
--- projects/mtree/contrib/openbsm/sys/bsm/audit_record.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/openbsm/sys/bsm/audit_record.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -233,6 +233,7 @@ token_t *au_to_ipc_perm(struct ipc_perm
token_t *au_to_iport(uint16_t iport);
token_t *au_to_opaque(const char *data, uint16_t bytes);
token_t *au_to_path(const char *path);
+token_t *au_to_privset(char *privtypestr, char *privstr);
token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
@@ -278,6 +279,7 @@ token_t *au_to_exec_env(char **envp);
token_t *au_to_text(const char *text);
token_t *au_to_kevent(struct kevent *kev);
token_t *au_to_trailer(int rec_size);
+token_t *au_to_upriv(char sorf, char *priv);
token_t *au_to_zonename(const char *zonename);
/*
Modified: projects/mtree/contrib/top/top.h
==============================================================================
--- projects/mtree/contrib/top/top.h Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/contrib/top/top.h Tue Dec 18 17:13:16 2012 (r244402)
@@ -14,7 +14,7 @@
extern int Header_lines; /* 7 */
/* Maximum number of columns allowed for display */
-#define MAX_COLS 128
+#define MAX_COLS 512
/* Log base 2 of 1024 is 10 (2^10 == 1024) */
#define LOG1024 10
Modified: projects/mtree/etc/defaults/rc.conf
==============================================================================
--- projects/mtree/etc/defaults/rc.conf Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/defaults/rc.conf Tue Dec 18 17:13:16 2012 (r244402)
@@ -605,7 +605,9 @@ chkprintcap_enable="NO" # Run chkprintca
chkprintcap_flags="-d" # Create missing directories by default.
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
dumpdir="/var/crash" # Directory where crash dumps are to be stored
-savecore_flags="" # Used if dumpdev is enabled above, and present.
+savecore_flags="-m 10" # Used if dumpdev is enabled above, and present.
+ # By default, only the 10 most recent kernel dumps
+ # are saved.
crashinfo_enable="YES" # Automatically generate crash dump summary.
crashinfo_program="/usr/sbin/crashinfo" # Script to generate crash dump summary.
quota_enable="NO" # turn on quotas on startup (or NO).
Modified: projects/mtree/etc/devd/usb.conf
==============================================================================
--- projects/mtree/etc/devd/usb.conf Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/devd/usb.conf Tue Dec 18 17:13:16 2012 (r244402)
@@ -423,6 +423,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x0499";
+ match "product" "(0x1000|0x1001|0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012|0x1013|0x1014|0x1015|0x1016|0x1017|0x1018|0x1019|0x101a|0x101b|0x101c|0x101d|0x101e|0x101f|0x1020|0x1021|0x1022|0x1023|0x1024|0x1025|0x1026|0x1027|0x1028|0x1029|0x102a|0x102b|0x102e|0x1030|0x1031|0x1032|0x1033|0x1034|0x1035|0x1036|0x1037|0x1038|0x1039|0x103a|0x103b|0x103c|0x103d|0x103e|0x103f|0x1040|0x1041|0x1042|0x1043|0x1044|0x1045|0x104e|0x104f|0x1050|0x1051|0x1052|0x1053|0x1054|0x1055|0x1056|0x1057|0x1058|0x1059|0x105a|0x105b|0x105c|0x105d|0x1503|0x2000|0x2001|0x2002|0x2003|0x5000|0x5001|0x5002|0x5003|0x5004|0x5005|0x5006|0x5007|0x5008|0x5009|0x500a|0x500b|0x500c|0x500d|0x500e|0x500f|0x7000|0x7010)";
+ action "kldload -n snd_uaudio";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x049f";
match "product" "(0x0003|0x0032)";
action "kldload -n uipaq";
@@ -2647,6 +2655,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x0f3d";
+ match "product" "0x68aa";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x0f4e";
match "product" "0x0200";
action "kldload -n uipaq";
@@ -4199,6 +4215,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x22de";
+ match "product" "0x6801";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x2478";
match "product" "0x2008";
action "kldload -n uplcom";
@@ -4611,5 +4635,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2279 USB entries processed
+# 2386 USB entries processed
Modified: projects/mtree/etc/login.conf
==============================================================================
--- projects/mtree/etc/login.conf Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/login.conf Tue Dec 18 17:13:16 2012 (r244402)
@@ -32,7 +32,7 @@ default:\
:cputime=unlimited:\
:datasize=unlimited:\
:stacksize=unlimited:\
- :memorylocked=unlimited:\
+ :memorylocked=64K:\
:memoryuse=unlimited:\
:filesize=unlimited:\
:coredumpsize=unlimited:\
@@ -59,6 +59,7 @@ xuser:\
staff:\
:tc=default:
daemon:\
+ :memorylocked=64M:\
:tc=default:
news:\
:tc=default:
@@ -72,6 +73,7 @@ dialer:\
# in preference to 'default'.
root:\
:ignorenologin:\
+ :memorylocked=unlimited:\
:tc=default:
#
Modified: projects/mtree/etc/pf.os
==============================================================================
--- projects/mtree/etc/pf.os Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/pf.os Tue Dec 18 17:13:16 2012 (r244402)
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $OpenBSD: pf.os,v 1.25 2010/10/18 15:55:27 deraadt Exp $
+# $OpenBSD: pf.os,v 1.26 2012/08/03 12:25:16 jsg Exp $
# passive OS fingerprinting
# -------------------------
#
@@ -226,7 +226,13 @@ S2:64:1:60:M*,S,T,N,W0: Linux:2.4::Linu
S3:64:1:60:M*,S,T,N,W0: Linux:2.4:.18-21:Linux 2.4.18 and newer
S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 <= 2.6.7
S4:64:1:60:M*,S,T,N,W0: Linux:2.6:.1-7:Linux 2.4/2.6 <= 2.6.7
-S4:64:1:60:M*,S,T,N,W7: Linux:2.6:8:Linux 2.6.8 and newer (?)
+
+S4:64:1:60:M*,S,T,N,W5: Linux:2.6::Linux 2.6 (newer, 1)
+S4:64:1:60:M*,S,T,N,W6: Linux:2.6::Linux 2.6 (newer, 2)
+S4:64:1:60:M*,S,T,N,W7: Linux:2.6::Linux 2.6 (newer, 3)
+T4:64:1:60:M*,S,T,N,W7: Linux:2.6::Linux 2.6 (newer, 4)
+
+S10:64:1:60:M*,S,T,N,W4: Linux:3.0::Linux 3.0
S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 (sometimes 2.4)
S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6
@@ -429,6 +435,8 @@ S44:128:1:48:M*,N,N,S: Windows:XP:SP1:
32767:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows SP1, 2000 SP4
32767:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows SP1, 2000 SP4
+8192:128:1:52:M*,N,W2,N,N,S: Windows:Vista::Windows Vista/7
+
# Odds, ends, mods:
S52:128:1:48:M1260,N,N,S: Windows:2000:cisco:Windows XP/2000 via Cisco
Modified: projects/mtree/etc/rc.d/auditdistd
==============================================================================
--- projects/mtree/etc/rc.d/auditdistd Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/rc.d/auditdistd Tue Dec 18 17:13:16 2012 (r244402)
@@ -14,7 +14,7 @@ name="auditdistd"
rcvar="${name}_enable"
pidfile="/var/run/${name}.pid"
command="/usr/sbin/${name}"
-required_files="/etc/${name}.conf"
+required_files="/etc/security/${name}.conf"
extra_commands="reload"
load_rc_config $name
Modified: projects/mtree/etc/rc.d/savecore
==============================================================================
--- projects/mtree/etc/rc.d/savecore Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/rc.d/savecore Tue Dec 18 17:13:16 2012 (r244402)
@@ -62,7 +62,7 @@ savecore_start()
;;
esac
- if savecore -C "${dumpdir}" "${dev}" >/dev/null; then
+ if savecore -C "${dev}" >/dev/null; then
savecore ${savecore_flags} ${dumpdir} ${dumpdev}
if checkyesno crashinfo_enable; then
${crashinfo_program} -d ${dumpdir}
Modified: projects/mtree/etc/rc.d/sysctl
==============================================================================
--- projects/mtree/etc/rc.d/sysctl Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/etc/rc.d/sysctl Tue Dec 18 17:13:16 2012 (r244402)
@@ -8,51 +8,27 @@
. /etc/rc.subr
name="sysctl"
+command="/sbin/sysctl"
stop_cmd=":"
start_cmd="sysctl_start"
reload_cmd="sysctl_start"
lastload_cmd="sysctl_start last"
extra_commands="reload lastload"
-#
-# Read in a file containing sysctl settings and set things accordingly.
-#
-parse_file()
-{
- if [ -f $1 ]; then
- while read var comments
- do
- case ${var} in
- \#*|'')
- ;;
- *)
- mib=${var%=*}
- val=${var#*=}
-
- if current_value=`${SYSCTL} -n ${mib} 2>/dev/null`; then
- case ${current_value} in
- ${val})
- ;;
- *)
- if ! sysctl "${var}" >/dev/null 2>&1; then
- warn "unable to set ${var}"
- fi
- ;;
- esac
- elif [ "$2" = "last" ]; then
- warn "sysctl ${mib} does not exist."
- fi
- ;;
- esac
- done < $1
- fi
-}
-
sysctl_start()
{
-
- parse_file /etc/sysctl.conf $1
- parse_file /etc/sysctl.conf.local $1
+ case $1 in
+ last)
+ command_args="-i -f"
+ ;;
+ *)
+ command_args="-f"
+ ;;
+ esac
+
+ for _f in /etc/sysctl.conf /etc/sysctl.conf.local; do
+ [ -r ${_f} ] && ${command} ${command_args} ${_f} > /dev/null
+ done
}
load_rc_config $name
Modified: projects/mtree/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/mtree/gnu/lib/libgcc/Makefile Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/gnu/lib/libgcc/Makefile Tue Dec 18 17:13:16 2012 (r244402)
@@ -38,13 +38,16 @@ OBJS= # added to below in various ways
#
# Library members defined in libgcc2.c.
LIB2FUNCS= _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
- _cmpdi2 _ucmpdi2 _clear_cache \
+ _cmpdi2 _ucmpdi2 \
_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2 \
_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3 \
_divxc3 _divtc3
+.if ${COMPILER_TYPE} != "clang" || ${TARGET_CPUARCH} != "arm"
+LIB2FUNCS+= _clear_cache
+.endif
# The floating-point conversion routines that involve a single-word integer.
.for mode in sf df xf
@@ -106,6 +109,10 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udi
.if ${TARGET_CPUARCH} == "arm"
# from config/arm/t-strongarm-elf
CFLAGS+= -Dinhibit_libc -fno-inline
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+= -fheinous-gnu-extensions
+.endif
+
LIB1ASMSRC = lib1funcs.asm
LIB1ASMFUNCS = _dvmd_tls _bb_init_func
LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
Modified: projects/mtree/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- projects/mtree/gnu/usr.bin/binutils/as/Makefile Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/gnu/usr.bin/binutils/as/Makefile Tue Dec 18 17:13:16 2012 (r244402)
@@ -8,7 +8,7 @@
.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_ARCH:Marm*} || ${TARGET_ARCH} == "powerpc64"
NO_WERROR.clang=
.endif
Modified: projects/mtree/include/Makefile
==============================================================================
--- projects/mtree/include/Makefile Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/include/Makefile Tue Dec 18 17:13:16 2012 (r244402)
@@ -23,9 +23,12 @@ INCS= a.out.h ar.h assert.h bitstring.h
stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \
strings.h sysexits.h tar.h termios.h tgmath.h \
time.h timeconv.h timers.h ttyent.h \
- ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h vis.h \
+ ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \
wchar.h wctype.h wordexp.h xlocale.h
+.PATH: ${.CURDIR}/../contrib/libc-vis
+INCS+= vis.h
+
MHDRS= float.h floatingpoint.h stdarg.h
PHDRS= sched.h _semaphore.h
Modified: projects/mtree/lib/clang/Makefile
==============================================================================
--- projects/mtree/lib/clang/Makefile Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/clang/Makefile Tue Dec 18 17:13:16 2012 (r244402)
@@ -71,15 +71,12 @@ SUBDIR= libclanganalysis \
libllvmx86utils
.if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmarchive \
- libllvmdebuginfo \
+SUBDIR+=libllvmdebuginfo \
libllvmexecutionengine \
libllvminterpreter \
libllvmjit \
- libllvmlinker \
libllvmmcdisassembler \
libllvmmcjit \
- libllvmobject \
libllvmruntimedyld
.endif
.endif
Modified: projects/mtree/lib/libc/gen/Makefile.inc
==============================================================================
--- projects/mtree/lib/libc/gen/Makefile.inc Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/gen/Makefile.inc Tue Dec 18 17:13:16 2012 (r244402)
@@ -32,14 +32,16 @@ SRCS+= __getosreldate.c __xuname.c \
sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \
sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \
- ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c unvis-compat.c \
- usleep.c utime.c utxdb.c valloc.c vis.c \
- wait.c wait3.c waitpid.c \
+ ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis-compat.c \
+ usleep.c utime.c utxdb.c valloc.c wait.c wait3.c waitpid.c \
waitid.c wordexp.c
.PATH: ${.CURDIR}/../../contrib/libc-pwcache
SRCS+= pwcache.c pwcache.h
+.PATH: ${.CURDIR}/../../contrib/libc-vis
+SRCS+= unvis.c vis.c
+
MISRCS+=modf.c
CANCELPOINTS_SRCS=sem.c sem_new.c
Modified: projects/mtree/lib/libc/gen/sysctlbyname.c
==============================================================================
--- projects/mtree/lib/libc/gen/sysctlbyname.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/gen/sysctlbyname.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -19,13 +19,10 @@ sysctlbyname(const char *name, void *old
const void *newp, size_t newlen)
{
int real_oid[CTL_MAXNAME+2];
- int error;
size_t oidlen;
oidlen = sizeof(real_oid) / sizeof(int);
- error = sysctlnametomib(name, real_oid, &oidlen);
- if (error < 0)
- return (error);
- error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen);
- return (error);
+ if (sysctlnametomib(name, real_oid, &oidlen) < 0)
+ return (-1);
+ return (sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen));
}
Modified: projects/mtree/lib/libc/iconv/citrus_mmap.c
==============================================================================
--- projects/mtree/lib/libc/iconv/citrus_mmap.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/iconv/citrus_mmap.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -57,12 +57,8 @@ _citrus_map_file(struct _citrus_region *
_region_init(r, NULL, 0);
- if ((fd = open(path, O_RDONLY)) == -1)
+ if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
return (errno);
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
- ret = errno;
- goto error;
- }
if (fstat(fd, &st) == -1) {
ret = errno;
Modified: projects/mtree/lib/libc/locale/collate.c
==============================================================================
--- projects/mtree/lib/libc/locale/collate.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/locale/collate.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -135,7 +135,7 @@ __collate_load_tables_l(const char *enco
(void)strcat(buf, "/");
(void)strcat(buf, encoding);
(void)strcat(buf, "/LC_COLLATE");
- if ((fp = fopen(buf, "r")) == NULL)
+ if ((fp = fopen(buf, "re")) == NULL)
return (_LDP_ERROR);
if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) {
Modified: projects/mtree/lib/libc/locale/setrunelocale.c
==============================================================================
--- projects/mtree/lib/libc/locale/setrunelocale.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/locale/setrunelocale.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -129,7 +129,7 @@ __setrunelocale(struct xlocale_ctype *l,
(void) strcat(name, encoding);
(void) strcat(name, "/LC_CTYPE");
- if ((fp = fopen(name, "r")) == NULL)
+ if ((fp = fopen(name, "re")) == NULL)
return (errno == 0 ? ENOENT : errno);
if ((rl = _Read_RuneMagi(fp)) == NULL) {
Modified: projects/mtree/lib/libc/nls/msgcat.c
==============================================================================
--- projects/mtree/lib/libc/nls/msgcat.c Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libc/nls/msgcat.c Tue Dec 18 17:13:16 2012 (r244402)
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
if (np != NULL) { \
np->name = strdup(n); \
np->path = NULL; \
+ np->catd = NLERR; \
np->lang = (l == NULL) ? NULL : \
strdup(l); \
np->caterrno = e; \
Modified: projects/mtree/lib/libcompiler_rt/Makefile
==============================================================================
--- projects/mtree/lib/libcompiler_rt/Makefile Tue Dec 18 16:37:24 2012 (r244401)
+++ projects/mtree/lib/libcompiler_rt/Makefile Tue Dec 18 17:13:16 2012 (r244402)
@@ -28,7 +28,6 @@ SRCF= absvdi2 \
ashlti3 \
ashrdi3 \
ashrti3 \
- clear_cache \
clzdi2 \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Tue Dec 18 20:45:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E3996594;
Tue, 18 Dec 2012 20:45:20 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
[IPv6:2001:470:1f10:75::2])
by mx1.freebsd.org (Postfix) with ESMTP id B4F298FC1D;
Tue, 18 Dec 2012 20:45:20 +0000 (UTC)
Received: from pakbsde14.localnet (unknown [38.105.238.108])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1DD90B94B;
Tue, 18 Dec 2012 15:45:20 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Subject: Re: svn commit: r244249 - projects/calloutng/sys/dev/syscons
Date: Tue, 18 Dec 2012 15:42:30 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p22; KDE/4.5.5; amd64; ; )
References: <201212151044.qBFAiG70038633@svn.freebsd.org>
<201212171509.55216.jhb@freebsd.org> <50CF8D3D.6030906@FreeBSD.org>
In-Reply-To: <50CF8D3D.6030906@FreeBSD.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201212181542.30789.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Tue, 18 Dec 2012 15:45:20 -0500 (EST)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 20:45:21 -0000
On Monday, December 17, 2012 4:23:09 pm Alexander Motin wrote:
> On 17.12.2012 22:09, John Baldwin wrote:
> > On Saturday, December 15, 2012 5:44:16 am Alexander Motin wrote:
> >> Author: mav
> >> Date: Sat Dec 15 10:44:16 2012
> >> New Revision: 244249
> >> URL: http://svnweb.freebsd.org/changeset/base/244249
> >>
> >> Log:
> >> Switch syscons from timeout() to callout_reset_flags() and specify that
> >> precision is not important there -- anything from 20 to 30Hz will be fine.
> >>
> >> Modified:
> >> projects/calloutng/sys/dev/syscons/syscons.c
> >> projects/calloutng/sys/dev/syscons/syscons.h
> >>
> >> Modified: projects/calloutng/sys/dev/syscons/syscons.c
> >>
> > ==============================================================================
> >> --- projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:30:06 2012
> > (r244248)
> >> +++ projects/calloutng/sys/dev/syscons/syscons.c Sat Dec 15 10:44:16 2012
> > (r244249)
> >> @@ -504,6 +504,8 @@ sc_attach_unit(int unit, int flags)
> >>
> >> sc = sc_get_softc(unit, flags & SC_KERNEL_CONSOLE);
> >> sc->config = flags;
> >> + callout_init(&sc->ctimeout, FALSE);
> >> + callout_init(&sc->cblink, FALSE);
> >
> > Did you change the calling conventions for callout_init() in this branch? In
> > HEAD the second argument is a flags variable (albeit with only a single flag
> > defined: CALLOUT_MPSAFE). Thus, the common usage is to use 'callout_init(..,
> > 0);' for callouts that need Giant and 'callout_init(..., CALLOUT_MPSAFE);' for
> > those that do not need Giant.
>
> No, I haven't. But man page still talks about "FALSE" value for mpsafe
> argument and that confused me. Fixed. Thanks.
Ah, ok. I think you have some other changes that used "TRUE" instead of
CALLOUT_MPSAFE as well.
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 12:09:03 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 69FB9B19;
Wed, 19 Dec 2012 12:09:03 +0000 (UTC)
(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 4FC6A8FC12;
Wed, 19 Dec 2012 12:09:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJC93EH089070;
Wed, 19 Dec 2012 12:09:03 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJC93T4089069;
Wed, 19 Dec 2012 12:09:03 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201212191209.qBJC93T4089069@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 19 Dec 2012 12:09:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244425 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 12:09:03 -0000
Author: cherry
Date: Wed Dec 19 12:09:02 2012
New Revision: 244425
URL: http://svnweb.freebsd.org/changeset/base/244425
Log:
- Add a dummy userland pagetable pointer to keep xen happy. This allows us to hypervisor_iret() into xen to resume from exceptions. (Xen checks for a valid userland pagetable irrespective of the domain "mode" (ie; user/kernel)) being returned to.
- Enhance xen_vm_vtop() to lookup early (boottime) kernel mappings.
- A few more sanity checks ie; KASSERTS()
Modified:
projects/amd64_xen_pv/sys/amd64/xen/pmap.c
Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Wed Dec 19 12:00:09 2012 (r244424)
+++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Wed Dec 19 12:09:02 2012 (r244425)
@@ -429,7 +429,7 @@ pmap_xen_bootpages(vm_paddr_t *firstaddr
uintptr_t va;
vm_paddr_t ma;
- /* Share info */
+ /* i) Share info */
ma = xen_start_info->shared_info;
/* This is a bit of a hack right now - we waste a physical
@@ -452,6 +452,27 @@ pmap_xen_bootpages(vm_paddr_t *firstaddr
PT_SET_MA(va, ma | PG_RW | PG_V | PG_U);
HYPERVISOR_shared_info = (void *) va;
+
+
+ /* ii) Userland page table base */
+ va = vallocpages(firstaddr, 1);
+ bzero((void *)va, PAGE_SIZE);
+
+ /*
+ * x86_64 has 2 privilege rings and Xen keeps separate pml4
+ * pointers for each, which are sanity checked on every
+ * exit via hypervisor_iret. We therefore set up a zeroed out
+ * user page table pml4 to satisfy/fool xen.
+ */
+
+ /* Mark the page r/o before pinning */
+ pmap_xen_setpages_ro(va, 1);
+
+ /* Pin the table */
+ xen_pgdir_pin(phystomach(VTOP(va)));
+
+ /* Register user page table with Xen */
+ xen_pt_user_switch(VTOP(va));
}
/* Boot time ptov - xen guarantees bootpages to be offset */
@@ -906,7 +927,12 @@ pmap_extract_and_hold(pmap_t pmap, vm_of
vm_paddr_t
pmap_kextract(vm_offset_t va)
{
- return xpmap_mtop(pmap_kextract_ma(va));
+ vm_paddr_t ma;
+ ma = pmap_kextract_ma(va);
+
+ KASSERT(ma != 0, ("%s: Unmapped va: 0x%lx \n", __func__, va));
+
+ return xpmap_mtop(ma);
}
vm_paddr_t
@@ -1301,8 +1327,12 @@ xen_vm_vtop(uintptr_t va)
{
int result;
- /* The kernel expects to have full access to its address space */
- const vm_prot_t accesstype = VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE;
+ /*
+ * The kernel expects to have at least read access to its
+ * address space. On Xen we don't have full access, since
+ * page-table pages, for eg: are read-only.
+ */
+ const vm_prot_t accesstype = VM_PROT_READ;
vm_page_t m;
vm_object_t object; /* Backing object for this va */
@@ -1315,12 +1345,20 @@ xen_vm_vtop(uintptr_t va)
va <= VM_MAX_KERNEL_ADDRESS),
("Invalid kernel virtual address"));
+ if (va >= KERNBASE && va <= virtual_avail) { /*
+ * Boot time page
+ */
+ return VTOP(va);
+ }
+
/* Get the specific object and pindex where the va may be mapped */
result = vm_map_lookup(&kernel_map, va, accesstype, &entry,
&object, &pindex, &tmp_prot, &wired);
- KASSERT(result == KERN_SUCCESS, ("Couldn't find va in the kernel map. \n"));
- KASSERT(accesstype == tmp_prot, ("Kernel access permissions disparity\n"));
+ KASSERT(result == KERN_SUCCESS, ("Couldn't find va = 0x%lx in the kernel map. \n", va));
+
+ KASSERT(accesstype | tmp_prot, ("Kernel access permissions disparity for va = 0x%lx: %s\n", va, ((tmp_prot & VM_PROT_READ) ? "VM_PROT_READ" : (
+ (tmp_prot & VM_PROT_WRITE) ? "| VM_PROT_WRITE" : ((tmp_prot & VM_PROT_EXECUTE) ? "| VM_PROT_EXECUTE" : "")))));
VM_OBJECT_LOCK(object);
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 12:11:01 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 43AECDCA;
Wed, 19 Dec 2012 12:11:01 +0000 (UTC) (envelope-from cherry@zyx.in)
Received: from quietly-confident.xenoserver.net
(quietly-confident.xenoserver.net [85.88.27.202])
by mx1.freebsd.org (Postfix) with ESMTP id BACDB8FC12;
Wed, 19 Dec 2012 12:11:00 +0000 (UTC)
Received: from foobar (unknown [117.199.5.171])
by quietly-confident.xenoserver.net (Postfix) with ESMTPSA id F3C052989;
Wed, 19 Dec 2012 12:10:53 +0000 (UTC)
From: Cherry G. Mathew <cherry@zyx.in>
To: src-committers@freebsd.org
Subject: Re: svn commit: r244425 - projects/amd64_xen_pv/sys/amd64/xen
References: <201212191209.qBJC93T4089069@svn.freebsd.org>
Date: Wed, 19 Dec 2012 17:40:01 +0530
In-Reply-To: <201212191209.qBJC93T4089069@svn.freebsd.org> (Cherry G. Mathew's
message of "Wed, 19 Dec 2012 12:09:03 +0000 (UTC)")
Message-ID: <878v8uckfa.fsf@zyx.in>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: svn-src-projects@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 12:11:01 -0000
Apologies for deviating from the checkin log template.
Approved by: gibbs(implicit)
>>>>> "Cherry" == Cherry G Mathew <cherry@FreeBSD.org> writes:
Cherry> Author: cherry Date: Wed Dec 19 12:09:02 2012 New Revision:
Cherry> 244425 URL: http://svnweb.freebsd.org/changeset/base/244425
Cherry> Log: - Add a dummy userland pagetable pointer to keep xen
Cherry> happy. This allows us to hypervisor_iret() into xen to
Cherry> resume from exceptions. (Xen checks for a valid userland
Cherry> pagetable irrespective of the domain "mode" (ie;
Cherry> user/kernel)) being returned to. - Enhance xen_vm_vtop() to
Cherry> lookup early (boottime) kernel mappings. - A few more
Cherry> sanity checks ie; KASSERTS()
Cherry> Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c
Cherry> Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c
Cherry> ==============================================================================
Cherry> --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Wed Dec 19
Cherry> 12:00:09 2012 (r244424) +++
Cherry> projects/amd64_xen_pv/sys/amd64/xen/pmap.c Wed Dec 19
Cherry> 12:09:02 2012 (r244425) @@ -429,7 +429,7 @@
Cherry> pmap_xen_bootpages(vm_paddr_t *firstaddr uintptr_t va;
Cherry> vm_paddr_t ma;
Cherry> - /* Share info */ + /* i) Share info */ ma =
Cherry> xen_start_info->shared_info;
Cherry> /* This is a bit of a hack right now - we waste a
Cherry> physical @@ -452,6 +452,27 @@ pmap_xen_bootpages(vm_paddr_t
Cherry> *firstaddr PT_SET_MA(va, ma | PG_RW | PG_V | PG_U);
Cherry> HYPERVISOR_shared_info = (void *) va; + + + /* ii)
Cherry> Userland page table base */ + va = vallocpages(firstaddr,
Cherry> 1); + bzero((void *)va, PAGE_SIZE); + + /* + * x86_64 has 2
Cherry> privilege rings and Xen keeps separate pml4 + * pointers for
Cherry> each, which are sanity checked on every + * exit via
Cherry> hypervisor_iret. We therefore set up a zeroed out + * user
Cherry> page table pml4 to satisfy/fool xen. + */ + + /* Mark the
Cherry> page r/o before pinning */ + pmap_xen_setpages_ro(va, 1); +
Cherry> + /* Pin the table */ + xen_pgdir_pin(phystomach(VTOP(va)));
Cherry> + + /* Register user page table with Xen */ +
Cherry> xen_pt_user_switch(VTOP(va));
Cherry> }
Cherry> /* Boot time ptov - xen guarantees bootpages to be offset
Cherry> */ @@ -906,7 +927,12 @@ pmap_extract_and_hold(pmap_t pmap,
Cherry> vm_of vm_paddr_t pmap_kextract(vm_offset_t va) { - return
Cherry> xpmap_mtop(pmap_kextract_ma(va)); + vm_paddr_t ma; + ma =
Cherry> pmap_kextract_ma(va); + + KASSERT(ma != 0, ("%s: Unmapped
Cherry> va: 0x%lx \n", __func__, va)); + + return xpmap_mtop(ma);
Cherry> }
Cherry> vm_paddr_t @@ -1301,8 +1327,12 @@ xen_vm_vtop(uintptr_t va)
Cherry> { int result;
Cherry> - /* The kernel expects to have full access to its address
Cherry> space */ - const vm_prot_t accesstype = VM_PROT_READ |
Cherry> VM_PROT_WRITE | VM_PROT_EXECUTE; + /* + * The kernel expects
Cherry> to have at least read access to its + * address space. On
Cherry> Xen we don't have full access, since + * page-table pages,
Cherry> for eg: are read-only. + */ + const vm_prot_t accesstype =
Cherry> VM_PROT_READ;
Cherry> vm_page_t m; vm_object_t object; /* Backing object for
Cherry> this va */ @@ -1315,12 +1345,20 @@ xen_vm_vtop(uintptr_t va)
Cherry> va <= VM_MAX_KERNEL_ADDRESS), ("Invalid kernel virtual
Cherry> address"));
Cherry> + if (va >= KERNBASE && va <= virtual_avail) { /* + * Boot
Cherry> time page + */ + return VTOP(va); + } + /* Get the specific
Cherry> object and pindex where the va may be mapped */ result =
Cherry> vm_map_lookup(&kernel_map, va, accesstype, &entry, &object,
Cherry> &pindex, &tmp_prot, &wired);
Cherry> - KASSERT(result == KERN_SUCCESS, ("Couldn't find va in the
Cherry> kernel map. \n")); - KASSERT(accesstype == tmp_prot,
Cherry> ("Kernel access permissions disparity\n")); + KASSERT(result
Cherry> == KERN_SUCCESS, ("Couldn't find va = 0x%lx in the kernel
Cherry> map. \n", va)); + + KASSERT(accesstype | tmp_prot, ("Kernel
Cherry> access permissions disparity for va = 0x%lx: %s\n", va,
Cherry> ((tmp_prot & VM_PROT_READ) ? "VM_PROT_READ" : ( + (tmp_prot
Cherry> & VM_PROT_WRITE) ? "| VM_PROT_WRITE" : ((tmp_prot &
Cherry> VM_PROT_EXECUTE) ? "| VM_PROT_EXECUTE" : "")))));
Cherry> VM_OBJECT_LOCK(object);
--
Cherry
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 12:12:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 73E39EF0;
Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 588F98FC0A;
Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJCCPxj089878;
Wed, 19 Dec 2012 12:12:25 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJCCP9v089877;
Wed, 19 Dec 2012 12:12:25 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201212191212.qBJCCP9v089877@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244427 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 12:12:25 -0000
Author: cherry
Date: Wed Dec 19 12:12:24 2012
New Revision: 244427
URL: http://svnweb.freebsd.org/changeset/base/244427
Log:
- Fix stack layout on return from exception via hypervisor_iret. This
xen hypercall requires a return code at the bottom of the stack.
Approved by: gibbs (implicit)
Modified:
projects/amd64_xen_pv/sys/amd64/xen/exception.S
Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/exception.S Wed Dec 19 12:10:14 2012 (r244426)
+++ projects/amd64_xen_pv/sys/amd64/xen/exception.S Wed Dec 19 12:12:24 2012 (r244427)
@@ -131,10 +131,10 @@
subq $TF_ERR, %rsp
#define TRAP_FRAME_EXIT_NOERR \
- addq $TF_RIP, %rsp
+ addq $TF_RIP + 8, %rsp
#define TRAP_FRAME_EXIT_ERR \
- addq $TF_ERR, %rsp
+ addq $TF_ERR + 8, %rsp
#define TRAP_PROLOGUE(a) \
movl $(a), TF_TRAPNO(%rsp) ; \
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 16:37:05 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id CB50A2F1;
Wed, 19 Dec 2012 16:37:05 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id B20FD8FC0A;
Wed, 19 Dec 2012 16:37:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJGb5gl037884;
Wed, 19 Dec 2012 16:37:05 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJGb5TO037883;
Wed, 19 Dec 2012 16:37:05 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212191637.qBJGb5TO037883@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 16:37:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244438 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 16:37:05 -0000
Author: brooks
Date: Wed Dec 19 16:37:05 2012
New Revision: 244438
URL: http://svnweb.freebsd.org/changeset/base/244438
Log:
Loop back a bug fix to -n output from NetBSD.
Modified:
projects/mtree/contrib/mtree/create.c
Modified: projects/mtree/contrib/mtree/create.c
==============================================================================
--- projects/mtree/contrib/mtree/create.c Wed Dec 19 16:23:20 2012 (r244437)
+++ projects/mtree/contrib/mtree/create.c Wed Dec 19 16:37:05 2012 (r244438)
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.66 2012/12/12 15:50:35 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $");
#endif
#endif /* not lint */
@@ -136,8 +136,9 @@ cwalk(void)
}
switch(p->fts_info) {
case FTS_D:
+ printf("\n");
if (!nflag)
- printf("\n# %s\n", p->fts_path);
+ printf("# %s\n", p->fts_path);
statd(t, p, &uid, &gid, &mode, &flags);
statf(indent, p);
break;
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 18:15:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8530F4FB;
Wed, 19 Dec 2012 18:15:34 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6A3778FC0A;
Wed, 19 Dec 2012 18:15:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJIFYbU055609;
Wed, 19 Dec 2012 18:15:34 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJIFY5o055608;
Wed, 19 Dec 2012 18:15:34 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212191815.qBJIFY5o055608@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 18:15:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244442 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 18:15:34 -0000
Author: brooks
Date: Wed Dec 19 18:15:33 2012
New Revision: 244442
URL: http://svnweb.freebsd.org/changeset/base/244442
Log:
Chase a $NetBSD$ update in the previous commit.
Modified:
projects/mtree/contrib/mtree/create.c
Modified: projects/mtree/contrib/mtree/create.c
==============================================================================
--- projects/mtree/contrib/mtree/create.c Wed Dec 19 17:28:17 2012 (r244441)
+++ projects/mtree/contrib/mtree/create.c Wed Dec 19 18:15:33 2012 (r244442)
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.66 2012/12/12 15:50:35 christos Exp $ */
+/* $NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 18:51:36 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 1946CFBD;
Wed, 19 Dec 2012 18:51:36 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id D87D78FC13;
Wed, 19 Dec 2012 18:51:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJIpZEs061457;
Wed, 19 Dec 2012 18:51:35 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJIpZG9061453;
Wed, 19 Dec 2012 18:51:35 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212191851.qBJIpZG9061453@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 18:51:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244443 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 18:51:36 -0000
Author: brooks
Date: Wed Dec 19 18:51:35 2012
New Revision: 244443
URL: http://svnweb.freebsd.org/changeset/base/244443
Log:
Add a compatibility option to imply -j when -c and -i are given.
Add a COMPATIBILITY section to document differences from FreeBSD's
historic mtree. Not all are currently documented pending further
discussion with NetBSD developers.
Modified:
projects/mtree/contrib/mtree/mtree.8
projects/mtree/contrib/mtree/mtree.c
Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 18:15:33 2012 (r244442)
+++ projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 18:51:35 2012 (r244443)
@@ -166,6 +166,16 @@ and
If no inclusion list is provided, the default is to display all files.
.It Fl i
If specified, set the schg and/or sappnd flags.
+For compatiblity with
+.Fx
+if the
+.Fl c
+and
+.Fl i
+option are both passed,
+then the
+.Fl j
+option is implied and a warning is emitted.
.It Fl j
Indent the output 4 spaces each time a directory level is descended when
creating a specification with the
@@ -690,6 +700,37 @@ option can be used in combination with
or
.Fl u
to create directory hierarchies for, for example, distributions.
+.Sh COMPATIBILITY
+This version of the
+.Nm utility differs from the version in
+.Fx 9
+and earlier in several ways:
+.Bl -bullet -compact
+.It
+When the
+.Fl c
+option is specified a final ``..'' is not emitted to match the top
+directory.
+Files made to match by appending ``..\\n\\n''.
+.It
+The
+.Fl U
+and
+.Fl u
+options do not set the modification time or the schg and/or sappnd
+file flags unless the
+.Fl t
+and
+.Fl i
+options are also passed.
+.It
+The
+.Fl j
+option is equivalent to the
+.Fx
+.Fl i
+option and should be used in its place.
+.El
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr chgrp 1 ,
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Wed Dec 19 18:15:33 2012 (r244442)
+++ projects/mtree/contrib/mtree/mtree.c Wed Dec 19 18:51:35 2012 (r244443)
@@ -236,6 +236,12 @@ main(int argc, char **argv)
if ((cflag && Cflag) || (cflag && Dflag) || (Cflag && Dflag))
mtree_err("-c, -C and -D flags are mutually exclusive");
+ if (cflag && iflag) {
+ warnx("-c and -i specified, setting -j and unsetting -i");
+ iflag = 0;
+ jflag = 1;
+ }
+
if (iflag && mflag)
mtree_err("-i and -m flags are mutually exclusive");
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 23:27:24 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 9C76DBE5;
Wed, 19 Dec 2012 23:27:24 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 679A68FC0C;
Wed, 19 Dec 2012 23:27:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJNROtu011629;
Wed, 19 Dec 2012 23:27:24 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJNRO0s011626;
Wed, 19 Dec 2012 23:27:24 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212192327.qBJNRO0s011626@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 23:27:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244448 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 23:27:24 -0000
Author: brooks
Date: Wed Dec 19 23:27:23 2012
New Revision: 244448
URL: http://svnweb.freebsd.org/changeset/base/244448
Log:
Remove the -T flag. We won't be going that route.
Modified:
projects/mtree/contrib/mtree/mtree.8
projects/mtree/contrib/mtree/mtree.c
Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 21:00:22 2012 (r244447)
+++ projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 23:27:23 2012 (r244448)
@@ -64,7 +64,7 @@
.Nd map a directory hierarchy
.Sh SYNOPSIS
.Nm
-.Op Fl CcDdejLlMnPqrSTtUuWx
+.Op Fl CcDdejLlMnPqrStUuWx
.Op Fl i | Fl m
.Op Fl E Ar tags
.Op Fl f Ar spec
@@ -307,18 +307,9 @@ of the files for which the keyword
.Sy cksum
was specified.
The checksum is seeded with the specified value.
-.It Fl T
-.Em Do not
-modify the modified time of existing files, the device type of devices, and
-symbolic link targets, to match the specification.
-This is the default on systems other than
-.Fx .
.It Fl t
Modify the modified time of existing files, the device type of devices, and
symbolic link targets, to match the specification.
-This is the default on
-.Fx
-systems.
.It Fl U
Same as
.Fl u
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Wed Dec 19 21:00:22 2012 (r244447)
+++ projects/mtree/contrib/mtree/mtree.c Wed Dec 19 23:27:23 2012 (r244448)
@@ -79,12 +79,8 @@ main(int argc, char **argv)
spec1 = stdin;
spec2 = NULL;
-#ifdef __FreeBSD__
- tflag = 1;
-#endif
-
while ((ch = getopt(argc, argv,
- "cCdDeE:f:I:ijk:K:lLmMnN:p:PqrR:s:StTuUWxX:"))
+ "cCdDeE:f:I:ijk:K:lLmMnN:p:PqrR:s:StuUWxX:"))
!= -1) {
switch((char)ch) {
case 'c':
@@ -191,9 +187,6 @@ main(int argc, char **argv)
case 't':
tflag = 1;
break;
- case 'T':
- tflag = 0;
- break;
case 'u':
uflag = 1;
break;
@@ -270,7 +263,7 @@ usage(void)
{
fprintf(stderr,
- "usage: %s [-CcDdejLlMnPqrSTtUuWx] [-i|-m] [-E tags]\n"
+ "usage: %s [-CcDdejLlMnPqrStUuWx] [-i|-m] [-E tags]\n"
"\t\t[-f spec] [-f spec]\n"
"\t\t[-I tags] [-K keywords] [-k keywords] [-N dbdir] [-p path]\n"
"\t\t[-R keywords] [-s seed] [-X exclude-file]\n",
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 23:29:48 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 28827DE8;
Wed, 19 Dec 2012 23:29:48 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 0CCCC8FC0A;
Wed, 19 Dec 2012 23:29:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJNTl2A012072;
Wed, 19 Dec 2012 23:29:47 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJNTliI012071;
Wed, 19 Dec 2012 23:29:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212192329.qBJNTliI012071@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 23:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244449 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 23:29:48 -0000
Author: brooks
Date: Wed Dec 19 23:29:47 2012
New Revision: 244449
URL: http://svnweb.freebsd.org/changeset/base/244449
Log:
Remove a couple compile time FreeBSD output compatibility bits to be
replaced with runtime ones.
Modified:
projects/mtree/contrib/mtree/create.c
Modified: projects/mtree/contrib/mtree/create.c
==============================================================================
--- projects/mtree/contrib/mtree/create.c Wed Dec 19 23:27:23 2012 (r244448)
+++ projects/mtree/contrib/mtree/create.c Wed Dec 19 23:29:47 2012 (r244449)
@@ -147,13 +147,8 @@ cwalk(void)
if (!nflag)
printf("%*s# %s\n", indent, "",
p->fts_path);
-#ifdef __FreeBSD__
- }
- if (1) {
-#endif
printf("%*s..\n\n", indent, "");
}
-
break;
case FTS_DNR:
case FTS_ERR:
@@ -217,11 +212,7 @@ statf(int indent, FTSENT *p)
(long long)p->fts_statp->st_rdev);
if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
-#ifndef __FreeBSD__
if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
-#else
- if (keys & F_SIZE)
-#endif
output(indent, &offset, "size=%lld",
(long long)p->fts_statp->st_size);
if (keys & F_TIME)
From owner-svn-src-projects@FreeBSD.ORG Wed Dec 19 23:34:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 4A3FAFC;
Wed, 19 Dec 2012 23:34:20 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2F6DB8FC12;
Wed, 19 Dec 2012 23:34:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJNYK2V012881;
Wed, 19 Dec 2012 23:34:20 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJNYKRP012880;
Wed, 19 Dec 2012 23:34:20 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212192334.qBJNYKRP012880@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 19 Dec 2012 23:34:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244450 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 23:34:20 -0000
Author: brooks
Date: Wed Dec 19 23:34:19 2012
New Revision: 244450
URL: http://svnweb.freebsd.org/changeset/base/244450
Log:
Remove the first attempt at a COMPATIBILITY section.
Modified:
projects/mtree/contrib/mtree/mtree.8
Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 23:29:47 2012 (r244449)
+++ projects/mtree/contrib/mtree/mtree.8 Wed Dec 19 23:34:19 2012 (r244450)
@@ -691,37 +691,6 @@ option can be used in combination with
or
.Fl u
to create directory hierarchies for, for example, distributions.
-.Sh COMPATIBILITY
-This version of the
-.Nm utility differs from the version in
-.Fx 9
-and earlier in several ways:
-.Bl -bullet -compact
-.It
-When the
-.Fl c
-option is specified a final ``..'' is not emitted to match the top
-directory.
-Files made to match by appending ``..\\n\\n''.
-.It
-The
-.Fl U
-and
-.Fl u
-options do not set the modification time or the schg and/or sappnd
-file flags unless the
-.Fl t
-and
-.Fl i
-options are also passed.
-.It
-The
-.Fl j
-option is equivalent to the
-.Fx
-.Fl i
-option and should be used in its place.
-.El
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr chgrp 1 ,
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 12:34:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 985AB735;
Thu, 20 Dec 2012 12:34:23 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7CE208FC0A;
Thu, 20 Dec 2012 12:34:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKCYNfv045659;
Thu, 20 Dec 2012 12:34:23 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKCYMll045653;
Thu, 20 Dec 2012 12:34:22 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212201234.qBKCYMll045653@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 20 Dec 2012 12:34:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244485 - projects
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 12:34:23 -0000
Author: ae
Date: Thu Dec 20 12:34:22 2012
New Revision: 244485
URL: http://svnweb.freebsd.org/changeset/base/244485
Log:
Sync with head/.
Added:
- copied unchanged from r244484, head/COPYRIGHT
- copied unchanged from r244484, head/LOCKS
- copied unchanged from r244484, head/MAINTAINERS
- copied unchanged from r244484, head/Makefile
- copied unchanged from r244484, head/Makefile.inc1
- copied unchanged from r244484, head/ObsoleteFiles.inc
- copied unchanged from r244484, head/README
- copied unchanged from r244484, head/UPDATING
- copied from r244484, head/bin/
- copied from r244484, head/cddl/
- copied from r244484, head/contrib/
- copied from r244484, head/crypto/
- copied from r244484, head/etc/
- copied from r244484, head/games/
- copied from r244484, head/gnu/
- copied from r244484, head/include/
- copied from r244484, head/kerberos5/
- copied from r244484, head/lib/
- copied from r244484, head/libexec/
- copied from r244484, head/release/
- copied from r244484, head/rescue/
- copied from r244484, head/sbin/
- copied from r244484, head/secure/
- copied from r244484, head/share/
- copied from r244484, head/sys/
- copied from r244484, head/tools/
- copied from r244484, head/usr.bin/
- copied from r244484, head/usr.sbin/
Directory Properties:
projects/COPYRIGHT (props changed)
projects/LOCKS (props changed)
projects/MAINTAINERS (props changed)
projects/Makefile (props changed)
projects/Makefile.inc1 (props changed)
projects/ObsoleteFiles.inc (props changed)
projects/README (props changed)
projects/UPDATING (props changed)
projects/bin/ (props changed)
projects/cddl/ (props changed)
projects/contrib/ (props changed)
projects/crypto/ (props changed)
projects/etc/ (props changed)
projects/games/ (props changed)
projects/gnu/ (props changed)
projects/include/ (props changed)
projects/kerberos5/ (props changed)
projects/lib/ (props changed)
projects/libexec/ (props changed)
projects/release/ (props changed)
projects/rescue/ (props changed)
projects/sbin/ (props changed)
projects/secure/ (props changed)
projects/share/ (props changed)
projects/sys/ (props changed)
projects/tools/ (props changed)
projects/usr.bin/ (props changed)
projects/usr.sbin/ (props changed)
Modified:
Directory Properties:
projects/ (props changed)
projects/cddl/contrib/opensolaris/ (props changed)
projects/cddl/contrib/opensolaris/cmd/zfs/ (props changed)
projects/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/contrib/atf/ (props changed)
projects/contrib/bind9/ (props changed)
projects/contrib/binutils/ (props changed)
projects/contrib/bmake/ (props changed)
projects/contrib/byacc/ (props changed)
projects/contrib/bzip2/ (props changed)
projects/contrib/com_err/ (props changed)
projects/contrib/compiler-rt/ (props changed)
projects/contrib/dialog/ (props changed)
projects/contrib/dtc/ (props changed)
projects/contrib/ee/ (props changed)
projects/contrib/expat/ (props changed)
projects/contrib/file/ (props changed)
projects/contrib/gcc/ (props changed)
projects/contrib/gdb/ (props changed)
projects/contrib/gdtoa/ (props changed)
projects/contrib/groff/ (props changed)
projects/contrib/less/ (props changed)
projects/contrib/libarchive/ (props changed)
projects/contrib/libarchive/cpio/ (props changed)
projects/contrib/libarchive/libarchive/ (props changed)
projects/contrib/libarchive/libarchive_fe/ (props changed)
projects/contrib/libarchive/tar/ (props changed)
projects/contrib/libc++/ (props changed)
projects/contrib/libcxxrt/ (props changed)
projects/contrib/libpcap/ (props changed)
projects/contrib/libstdc++/ (props changed)
projects/contrib/llvm/ (props changed)
projects/contrib/llvm/tools/clang/ (props changed)
projects/contrib/ncurses/ (props changed)
projects/contrib/netcat/ (props changed)
projects/contrib/ntp/ (props changed)
projects/contrib/ofed/libibcm/ (props changed)
projects/contrib/ofed/libibcm/config/ (props changed)
projects/contrib/ofed/libibcm/include/ (props changed)
projects/contrib/ofed/libibcm/include/infiniband/ (props changed)
projects/contrib/ofed/libibcm/src/ (props changed)
projects/contrib/ofed/libibverbs/ (props changed)
projects/contrib/ofed/libibverbs/config/ (props changed)
projects/contrib/ofed/libibverbs/debian/ (props changed)
projects/contrib/ofed/libibverbs/examples/ (props changed)
projects/contrib/ofed/libibverbs/fixes/ (props changed)
projects/contrib/ofed/libibverbs/include/ (props changed)
projects/contrib/ofed/libibverbs/include/infiniband/ (props changed)
projects/contrib/ofed/libibverbs/man/ (props changed)
projects/contrib/ofed/libibverbs/src/ (props changed)
projects/contrib/ofed/libmlx4/ (props changed)
projects/contrib/ofed/libmlx4/config/ (props changed)
projects/contrib/ofed/libmlx4/debian/ (props changed)
projects/contrib/ofed/libmlx4/fixes/ (props changed)
projects/contrib/ofed/libmlx4/src/ (props changed)
projects/contrib/ofed/libmthca/ (props changed)
projects/contrib/ofed/libmthca/config/ (props changed)
projects/contrib/ofed/libmthca/debian/ (props changed)
projects/contrib/ofed/libmthca/src/ (props changed)
projects/contrib/ofed/librdmacm/ (props changed)
projects/contrib/ofed/librdmacm/config/ (props changed)
projects/contrib/ofed/librdmacm/examples/ (props changed)
projects/contrib/ofed/librdmacm/include/ (props changed)
projects/contrib/ofed/librdmacm/include/rdma/ (props changed)
projects/contrib/ofed/librdmacm/man/ (props changed)
projects/contrib/ofed/librdmacm/src/ (props changed)
projects/contrib/ofed/libsdp/ (props changed)
projects/contrib/ofed/libsdp/config/ (props changed)
projects/contrib/ofed/libsdp/src/ (props changed)
projects/contrib/ofed/libsdp/src/linux/ (props changed)
projects/contrib/ofed/management/ (props changed)
projects/contrib/ofed/management/doc/ (props changed)
projects/contrib/ofed/management/infiniband-diags/ (props changed)
projects/contrib/ofed/management/infiniband-diags/include/ (props changed)
projects/contrib/ofed/management/infiniband-diags/man/ (props changed)
projects/contrib/ofed/management/infiniband-diags/scripts/ (props changed)
projects/contrib/ofed/management/infiniband-diags/src/ (props changed)
projects/contrib/ofed/management/libibcommon/ (props changed)
projects/contrib/ofed/management/libibcommon/include/ (props changed)
projects/contrib/ofed/management/libibcommon/include/infiniband/ (props changed)
projects/contrib/ofed/management/libibcommon/src/ (props changed)
projects/contrib/ofed/management/libibmad/ (props changed)
projects/contrib/ofed/management/libibmad/include/ (props changed)
projects/contrib/ofed/management/libibmad/include/infiniband/ (props changed)
projects/contrib/ofed/management/libibmad/src/ (props changed)
projects/contrib/ofed/management/libibumad/ (props changed)
projects/contrib/ofed/management/libibumad/include/ (props changed)
projects/contrib/ofed/management/libibumad/include/infiniband/ (props changed)
projects/contrib/ofed/management/libibumad/man/ (props changed)
projects/contrib/ofed/management/libibumad/src/ (props changed)
projects/contrib/ofed/management/opensm/ (props changed)
projects/contrib/ofed/management/opensm/complib/ (props changed)
projects/contrib/ofed/management/opensm/config/ (props changed)
projects/contrib/ofed/management/opensm/doc/ (props changed)
projects/contrib/ofed/management/opensm/include/ (props changed)
projects/contrib/ofed/management/opensm/include/complib/ (props changed)
projects/contrib/ofed/management/opensm/include/iba/ (props changed)
projects/contrib/ofed/management/opensm/include/opensm/ (props changed)
projects/contrib/ofed/management/opensm/include/vendor/ (props changed)
projects/contrib/ofed/management/opensm/libvendor/ (props changed)
projects/contrib/ofed/management/opensm/man/ (props changed)
projects/contrib/ofed/management/opensm/opensm/ (props changed)
projects/contrib/ofed/management/opensm/osmeventplugin/ (props changed)
projects/contrib/ofed/management/opensm/osmeventplugin/src/ (props changed)
projects/contrib/ofed/management/opensm/osmtest/ (props changed)
projects/contrib/ofed/management/opensm/osmtest/include/ (props changed)
projects/contrib/ofed/management/opensm/scripts/ (props changed)
projects/contrib/one-true-awk/ (props changed)
projects/contrib/openbsm/ (props changed)
projects/contrib/openpam/ (props changed)
projects/contrib/openresolv/ (props changed)
projects/contrib/pf/ (props changed)
projects/contrib/sendmail/ (props changed)
projects/contrib/tcpdump/ (props changed)
projects/contrib/tcsh/ (props changed)
projects/contrib/tnftp/ (props changed)
projects/contrib/top/ (props changed)
projects/contrib/tzcode/stdtime/ (props changed)
projects/contrib/tzcode/zic/ (props changed)
projects/contrib/tzdata/ (props changed)
projects/contrib/wpa/ (props changed)
projects/contrib/xz/ (props changed)
projects/crypto/heimdal/ (props changed)
projects/crypto/openssh/ (props changed)
projects/crypto/openssl/ (props changed)
projects/gnu/lib/ (props changed)
projects/gnu/usr.bin/binutils/ (props changed)
projects/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/gnu/usr.bin/gdb/ (props changed)
projects/lib/libarchive/ (props changed)
projects/lib/libarchive/test/ (props changed)
projects/lib/libc/ (props changed)
projects/lib/libc/stdtime/ (props changed)
projects/lib/libutil/ (props changed)
projects/lib/libz/ (props changed)
projects/lib/libz/contrib/ (props changed)
projects/lib/libz/contrib/asm686/ (props changed)
projects/lib/libz/contrib/gcc_gvmat64/ (props changed)
projects/lib/libz/doc/ (props changed)
projects/sbin/dumpon/ (props changed)
projects/sbin/ipfw/ (props changed)
projects/share/man/man4/ (props changed)
projects/share/zoneinfo/ (props changed)
projects/sys/amd64/compile/ (props changed)
projects/sys/amd64/conf/ (props changed)
projects/sys/amd64/include/xen/ (props changed)
projects/sys/arm/compile/ (props changed)
projects/sys/arm/conf/ (props changed)
projects/sys/boot/ (props changed)
projects/sys/boot/i386/efi/ (props changed)
projects/sys/boot/ia64/efi/ (props changed)
projects/sys/boot/ia64/ski/ (props changed)
projects/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/sys/boot/powerpc/ofw/ (props changed)
projects/sys/cddl/contrib/opensolaris/ (props changed)
projects/sys/conf/ (props changed)
projects/sys/contrib/dev/acpica/ (props changed)
projects/sys/contrib/dev/acpica/common/ (props changed)
projects/sys/contrib/dev/acpica/compiler/ (props changed)
projects/sys/contrib/dev/acpica/components/debugger/ (props changed)
projects/sys/contrib/dev/acpica/components/disassembler/ (props changed)
projects/sys/contrib/dev/acpica/components/dispatcher/ (props changed)
projects/sys/contrib/dev/acpica/components/events/ (props changed)
projects/sys/contrib/dev/acpica/components/executer/ (props changed)
projects/sys/contrib/dev/acpica/components/hardware/ (props changed)
projects/sys/contrib/dev/acpica/components/namespace/ (props changed)
projects/sys/contrib/dev/acpica/components/parser/ (props changed)
projects/sys/contrib/dev/acpica/components/resources/ (props changed)
projects/sys/contrib/dev/acpica/components/tables/ (props changed)
projects/sys/contrib/dev/acpica/components/utilities/ (props changed)
projects/sys/contrib/dev/acpica/include/ (props changed)
projects/sys/contrib/dev/acpica/os_specific/ (props changed)
projects/sys/contrib/libfdt/ (props changed)
projects/sys/contrib/octeon-sdk/ (props changed)
projects/sys/contrib/x86emu/ (props changed)
projects/sys/dev/usb/controller/ (props changed)
projects/sys/geom/ (props changed)
projects/sys/i386/compile/ (props changed)
projects/sys/i386/conf/ (props changed)
projects/sys/ia64/compile/ (props changed)
projects/sys/ia64/conf/ (props changed)
projects/sys/mips/compile/ (props changed)
projects/sys/mips/conf/ (props changed)
projects/sys/ofed/drivers/ (props changed)
projects/sys/ofed/drivers/infiniband/ (props changed)
projects/sys/ofed/drivers/infiniband/core/ (props changed)
projects/sys/ofed/drivers/infiniband/debug/ (props changed)
projects/sys/ofed/drivers/infiniband/hw/ (props changed)
projects/sys/ofed/drivers/infiniband/hw/mlx4/ (props changed)
projects/sys/ofed/drivers/infiniband/hw/mthca/ (props changed)
projects/sys/ofed/drivers/infiniband/ulp/ (props changed)
projects/sys/ofed/drivers/infiniband/ulp/ipoib/ (props changed)
projects/sys/ofed/drivers/infiniband/ulp/sdp/ (props changed)
projects/sys/ofed/drivers/infiniband/util/ (props changed)
projects/sys/ofed/drivers/net/ (props changed)
projects/sys/ofed/drivers/net/mlx4/ (props changed)
projects/sys/ofed/include/ (props changed)
projects/sys/ofed/include/asm/ (props changed)
projects/sys/ofed/include/linux/ (props changed)
projects/sys/ofed/include/linux/mlx4/ (props changed)
projects/sys/ofed/include/net/ (props changed)
projects/sys/ofed/include/rdma/ (props changed)
projects/sys/pc98/compile/ (props changed)
projects/sys/pc98/conf/ (props changed)
projects/sys/powerpc/compile/ (props changed)
projects/sys/powerpc/conf/ (props changed)
projects/sys/sparc64/compile/ (props changed)
projects/sys/sparc64/conf/ (props changed)
projects/sys/xen/interface/ (props changed)
projects/sys/xen/interface/arch-x86/ (props changed)
projects/sys/xen/interface/foreign/ (props changed)
projects/sys/xen/interface/hvm/ (props changed)
projects/sys/xen/interface/io/ (props changed)
projects/tools/regression/geom_uzip/ (props changed)
projects/tools/tools/nanobsd/gateworks/Files/ (props changed)
projects/tools/tools/nanobsd/gateworks/Files/root/ (props changed)
projects/tools/tools/nanobsd/gateworks/cfg/ (props changed)
projects/tools/tools/nanobsd/gateworks/cfg/ssh/ (props changed)
projects/usr.bin/calendar/ (props changed)
projects/usr.bin/cpio/ (props changed)
projects/usr.bin/cpio/test/ (props changed)
projects/usr.bin/csup/ (props changed)
projects/usr.bin/procstat/ (props changed)
projects/usr.bin/tar/ (props changed)
projects/usr.sbin/jail/ (props changed)
projects/usr.sbin/ndiscvt/ (props changed)
projects/usr.sbin/rtadvctl/ (props changed)
projects/usr.sbin/rtadvd/ (props changed)
projects/usr.sbin/rtsold/ (props changed)
projects/usr.sbin/zic/ (props changed)
Copied: projects/COPYRIGHT (from r244484, head/COPYRIGHT)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/COPYRIGHT Thu Dec 20 12:34:22 2012 (r244485, copy of r244484, head/COPYRIGHT)
@@ -0,0 +1,126 @@
+# $FreeBSD$
+# @(#)COPYRIGHT 8.2 (Berkeley) 3/21/94
+
+The compilation of software known as FreeBSD is distributed under the
+following terms:
+
+Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The 4.4BSD and 4.4BSD-Lite software is distributed under the following
+terms:
+
+All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
+Releases is copyrighted by The Regents of the University of California.
+
+Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+This product includes software developed by the University of
+California, Berkeley and its contributors.
+4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+The Institute of Electrical and Electronics Engineers and the American
+National Standards Committee X3, on Information Processing Systems have
+given us permission to reprint portions of their documentation.
+
+In the following statement, the phrase ``this text'' refers to portions
+of the system documentation.
+
+Portions of this text are reprinted and reproduced in electronic form in
+the second BSD Networking Software Release, from IEEE Std 1003.1-1988, IEEE
+Standard Portable Operating System Interface for Computer Environments
+(POSIX), copyright C 1988 by the Institute of Electrical and Electronics
+Engineers, Inc. In the event of any discrepancy between these versions
+and the original IEEE Standard, the original IEEE Standard is the referee
+document.
+
+In the following statement, the phrase ``This material'' refers to portions
+of the system documentation.
+
+This material is reproduced with permission from American National
+Standards Committee X3, on Information Processing Systems. Computer and
+Business Equipment Manufacturers Association (CBEMA), 311 First St., NW,
+Suite 500, Washington, DC 20001-2178. The developmental work of
+Programming Language C was completed by the X3J11 Technical Committee.
+
+The views and conclusions contained in the software and documentation are
+those of the authors and should not be interpreted as representing official
+policies, either expressed or implied, of the Regents of the University
+of California.
+
+
+NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD")
+source has been updated. The copyright addendum may be found at
+ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is
+included below.
+
+July 22, 1999
+
+To All Licensees, Distributors of Any Version of BSD:
+
+As you know, certain of the Berkeley Software Distribution ("BSD") source
+code files require that further distributions of products containing all or
+portions of the software, acknowledge within their advertising materials
+that such products contain software developed by UC Berkeley and its
+contributors.
+
+Specifically, the provision reads:
+
+" * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors."
+
+Effective immediately, licensees and distributors are no longer required to
+include the acknowledgement within advertising materials. Accordingly, the
+foregoing paragraph of those BSD Unix files containing it is hereby deleted
+in its entirety.
+
+William Hoskins
+Director, Office of Technology Licensing
+University of California, Berkeley
Copied: projects/LOCKS (from r244484, head/LOCKS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/LOCKS Thu Dec 20 12:34:22 2012 (r244485, copy of r244484, head/LOCKS)
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+This file documents formal review/approval requirements that have been
+approved by core.
+
+subsystem login expires notes
+--------------------------------------
+
+Special cases:
+releng/4.* Requires Security Officer approval.
+releng/5.* Requires Security Officer approval.
+releng/6.* Requires Security Officer approval.
+releng/7.* Requires Security Officer approval.
Copied: projects/MAINTAINERS (from r244484, head/MAINTAINERS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/MAINTAINERS Thu Dec 20 12:34:22 2012 (r244485, copy of r244484, head/MAINTAINERS)
@@ -0,0 +1,126 @@
+$FreeBSD$
+
+Please note that the content of this file is strictly advisory.
+No locks listed here are valid. The only strict review requirements
+are granted by core. These are documented in head/LOCKS and enforced
+by svnadmin/conf/approvers.
+
+The source tree is a community effort. However, some folks go to the
+trouble of looking after particular areas of the tree. In return for
+their active caretaking of the code it is polite to coordinate changes
+with them. This is a list of people who have expressed an interest in
+part of the code or listed their active caretaking role so that other
+committers can easily find somebody who is familiar with it. The notes
+should specify if there is a 3rd party source tree involved or other
+things that should be kept in mind.
+
+However, this is not a 'big stick', it is an offer to help and a source
+of guidance. It does not override the communal nature of the tree.
+It is not a registry of 'turf' or private property.
+
+subsystem login notes
+-----------------------------
+kqueue jmg Pre-commit review requested.
+libc/posix1e rwatson Pre-commit review requested.
+POSIX.1e ACLs rwatson Pre-commit review requested.
+UFS EAs rwatson Pre-commit review requested.
+MAC Framework rwatson Pre-commit review requested.
+MAC Modules rwatson Pre-commit review requested.
+contrib/openbsm rwatson Pre-commit review requested.
+sys/security/audit rwatson Pre-commit review requested.
+ahc(4) gibbs Pre-commit review requested.
+ahd(4) gibbs Pre-commit review requested.
+NEWCARD imp Pre-commit review requested.
+pci bus imp,jhb Pre-commit review requested.
+cdboot jhb Pre-commit review requested.
+pxeboot jhb Pre-commit review requested.
+witness jhb Pre-commit review requested.
+CAM gibbs,
+ ken Pre-commit review requested. send to scsi@freebsd.org
+devstat(9) ken Pre-commit review requested.
+camcontrol(8) ken Pre-commit review requested.
+libcam ken Pre-commit review requested.
+libdevstat ken Pre-commit review requested.
+iostat(8) ken Pre-commit review requested.
+cd(4) ken Pre-commit review requested.
+pass(4) ken Pre-commit review requested.
+ch(4) ken Pre-commit review requested.
+em(4) jfv Pre-commit review requested.
+bxe(4) davidch Pre-commit review requested.
+tdfx(4) cokane Just keep me informed of changes, try not to break it.
+sendmail gshapiro Pre-commit review requested.
+etc/mail gshapiro Pre-commit review requested.
+ Keep in sync with -STABLE.
+etc/sendmail gshapiro Pre-commit review requested.
+ Keep in sync with -STABLE.
+libfetch des Advance notification requested.
+fetch des Advance notification requested.
+libpam des Pre-commit review requested.
+openssh des Pre-commit review requested.
+pseudofs des Pre-commit review requested.
+procfs des Pre-commit review requested.
+linprocfs des Pre-commit review requested.
+lpr gad Pre-commit review requested, particularly for
+ lpd/recvjob.c and lpd/printjob.c.
+newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it.
+cvs peter Heads-up appreciated, try not to break it.
+nvi peter Try not to break it.
+libz peter Try not to break it.
+groff ru Recommends pre-commit review.
+share/mk ru This is a vital component of the build system, so I
+ offer a pre-commit review for anything non-trivial.
+ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org
+drm rnoland Just keep me informed of changes, try not to break it.
+unifdef(1) fanf Pre-commit review requested.
+ntp roberto Pre-commit review requested.
+inetd dwmalone Recommends pre-commit review.
+contrib/smbfs bp Open for in-tree committs. In case of functional
+ changes pre-commit review requested.
+contrib/pf mlaier Pre-commit review requested.
+binutils obrien Insists on BU blocked from unapproved commits
+file obrien Insists to keep file blocked from other's unapproved
+ commits
+contrib/bzip2 obrien Pre-commit review required.
+lukemftpd obrien Pre-commit review required.
+geom_concat pjd Pre-commit review preferred.
+geom_eli pjd Pre-commit review preferred.
+geom_gate pjd Pre-commit review preferred.
+geom_label pjd Pre-commit review preferred.
+geom_mirror pjd Pre-commit review preferred.
+geom_nop pjd Pre-commit review preferred.
+geom_raid3 pjd Pre-commit review preferred.
+geom_shsec pjd Pre-commit review preferred.
+geom_stripe pjd Pre-commit review preferred.
+geom_zero pjd Pre-commit review preferred.
+sbin/geom pjd Pre-commit review preferred.
+zfs pjd Pre-commit review preferred.
+nfs alfred Will be happy to review code, but not mandatory.
+rpc.lockd alfred Will be happy to review code, but not mandatory.
+truss alfred Will be happy to review code, but not mandatory.
+rpc alfred Pre-commit review requested.
+pkg_install portmgr Pre-commit review or approval from portmgr@ requested.
+linux emul emulation Please discuss changes here.
+bs{diff,patch} cperciva Pre-commit review requested.
+portsnap cperciva Pre-commit review requested.
+freebsd-update cperciva Pre-commit review requested.
+openssl benl Pre-commit review requested.
+sys/netgraph/bluetooth emax Pre-commit review preferred.
+lib/libbluetooth emax Pre-commit review preferred.
+lib/libsdp emax Pre-commit review preferred.
+usr.bin/bluetooth emax Pre-commit review preferred.
+usr.sbin/bluetooth emax Pre-commit review preferred.
+gnu/usr.bin/send-pr bugmaster Pre-commit review requested.
+*env(3) secteam Due to the problematic security history of this
+ code, please have patches reviewed by secteam.
+share/zoneinfo edwin Heads-up appreciated, since our data is coming
+ from a third party source.
+usr.sbin/zic edwin Heads-up appreciated, since this code is
+ maintained by a third party source.
+lib/libc/stdtime edwin Heads-up appreciated, since parts of this code
+ is maintained by a third party source.
+sbin/routed bms Pre-commit review; notify vendor at rhyolite.com
+isci(4) jimharris Pre-commit review requested.
+3dfx cokane Pre-commit review preferred.
+cmx daniel@roe.ch Pre-commit review preferred.
+filemon obrien Pre-commit review preferred.
+sysdoc trhodes Pre-commit review preferred.
Copied: projects/Makefile (from r244484, head/Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/Makefile Thu Dec 20 12:34:22 2012 (r244485, copy of r244484, head/Makefile)
@@ -0,0 +1,448 @@
+#
+# $FreeBSD$
+#
+# The user-driven targets are:
+#
+# universe - *Really* build *everything* (buildworld and
+# all kernels on all architectures).
+# tinderbox - Same as universe, but presents a list of failed build
+# targets and exits with an error if there were any.
+# buildworld - Rebuild *everything*, including glue to help do
+# upgrades.
+# installworld - Install everything built by "buildworld".
+# world - buildworld + installworld, no kernel.
+# buildkernel - Rebuild the kernel and the kernel-modules.
+# installkernel - Install the kernel and the kernel-modules.
+# installkernel.debug
+# reinstallkernel - Reinstall the kernel and the kernel-modules.
+# reinstallkernel.debug
+# kernel - buildkernel + installkernel.
+# kernel-toolchain - Builds the subset of world necessary to build a kernel
+# kernel-toolchains - Build kernel-toolchain for all universe targets.
+# doxygen - Build API documentation of the kernel, needs doxygen.
+# update - Convenient way to update your source tree(s).
+# check-old - List obsolete directories/files/libraries.
+# check-old-dirs - List obsolete directories.
+# check-old-files - List obsolete files.
+# check-old-libs - List obsolete libraries.
+# delete-old - Delete obsolete directories/files.
+# delete-old-dirs - Delete obsolete directories.
+# delete-old-files - Delete obsolete files.
+# delete-old-libs - Delete obsolete libraries.
+# targets - Print a list of supported TARGET/TARGET_ARCH pairs
+# for world and kernel targets.
+# toolchains - Build a toolchain for all world and kernel targets.
+#
+# This makefile is simple by design. The FreeBSD make automatically reads
+# the /usr/share/mk/sys.mk unless the -m argument is specified on the
+# command line. By keeping this makefile simple, it doesn't matter too
+# much how different the installed mk files are from those in the source
+# tree. This makefile executes a child make process, forcing it to use
+# the mk files from the source tree which are supposed to DTRT.
+#
+# Most of the user-driven targets (as listed above) are implemented in
+# Makefile.inc1. The exceptions are universe, tinderbox and targets.
+#
+# If you want to build your system from source be sure that /usr/obj has
+# at least 1GB of diskspace available. A complete 'universe' build requires
+# about 15GB of space.
+#
+# For individuals wanting to build from the sources currently on their
+# system, the simple instructions are:
+#
+# 1. `cd /usr/src' (or to the directory containing your source tree).
+# 2. Define `HISTORICAL_MAKE_WORLD' variable (see README).
+# 3. `make world'
+#
+# For individuals wanting to upgrade their sources (even if only a
+# delta of a few days):
+#
+# 1. `cd /usr/src' (or to the directory containing your source tree).
+# 2. `make buildworld'
+# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
+# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC).
+# [steps 3. & 4. can be combined by using the "kernel" target]
+# 5. `reboot' (in single user mode: boot -s from the loader prompt).
+# 6. `mergemaster -p'
+# 7. `make installworld'
+# 8. `make delete-old'
+# 9. `mergemaster' (you may wish to use -i, along with -U or -F).
+# 10. `reboot'
+# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)
+#
+# See src/UPDATING `COMMON ITEMS' for more complete information.
+#
+# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can
+# cross build world for other machine types using the buildworld target,
+# and once the world is built you can cross build a kernel using the
+# buildkernel target.
+#
+# Define the user-driven targets. These are listed here in alphabetical
+# order, but that's not important.
+#
+# Targets that begin with underscore are internal targets intended for
+# developer convenience only. They are intentionally not documented and
+# completely subject to change without notice.
+#
+# For more information, see the build(7) manual page.
+#
+TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
+ check-old check-old-dirs check-old-files check-old-libs \
+ checkdpadd clean cleandepend cleandir \
+ delete-old delete-old-dirs delete-old-files delete-old-libs \
+ depend distribute distributekernel distributekernel.debug \
+ distributeworld distrib-dirs distribution doxygen \
+ everything hier hierarchy install installcheck installkernel \
+ installkernel.debug packagekernel packageworld \
+ reinstallkernel reinstallkernel.debug \
+ installworld kernel-toolchain libraries lint maninstall \
+ obj objlink regress rerelease showconfig tags toolchain update \
+ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \
+ _build-tools _cross-tools _includes _libraries _depend \
+ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+
+TGTS+= ${SUBDIR_TARGETS}
+
+BITGTS= files includes
+BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
+TGTS+= ${BITGTS}
+
+.ORDER: buildworld installworld
+.ORDER: buildworld distributeworld
+.ORDER: buildworld buildkernel
+.ORDER: buildkernel installkernel
+.ORDER: buildkernel installkernel.debug
+.ORDER: buildkernel reinstallkernel
+.ORDER: buildkernel reinstallkernel.debug
+
+PATH= /sbin:/bin:/usr/sbin:/usr/bin
+MAKEOBJDIRPREFIX?= /usr/obj
+_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
+ ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
+ -f /dev/null -V MAKEOBJDIRPREFIX dummy
+.if !empty(_MAKEOBJDIRPREFIX)
+.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
+ (in make.conf(5)) or command-line variable.
+.endif
+MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
+BINMAKE= \
+ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
+ -m ${.CURDIR}/share/mk
+_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+
+# Guess machine architecture from machine type, and vice versa.
+.if !defined(TARGET_ARCH) && defined(TARGET)
+_TARGET_ARCH= ${TARGET:S/pc98/i386/}
+.elif !defined(TARGET) && defined(TARGET_ARCH) && \
+ ${TARGET_ARCH} != ${MACHINE_ARCH}
+_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/}
+.endif
+# Legacy names, for another transition period mips:mips(n32|64)?eb -> mips:mips\1
+.if defined(TARGET) && defined(TARGET_ARCH) && \
+ ${TARGET} == "mips" && ${TARGET_ARCH:Mmips*eb}
+_TARGET_ARCH= ${TARGET_ARCH:C/eb$//}
+.warning "TARGET_ARCH of ${TARGET_ARCH} is deprecated in favor of ${_TARGET_ARCH}"
+.endif
+.if defined(TARGET) && ${TARGET} == "mips" && defined(TARGET_BIG_ENDIAN)
+.warning "TARGET_BIG_ENDIAN is no longer necessary for MIPS. Big-endian is not the default."
+.endif
+# arm with TARGET_BIG_ENDIAN -> armeb
+.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated. use armeb"
+_TARGET_ARCH=armeb
+.endif
+.if defined(TARGET) && !defined(_TARGET)
+_TARGET=${TARGET}
+.endif
+.if defined(TARGET_ARCH) && !defined(_TARGET_ARCH)
+_TARGET_ARCH=${TARGET_ARCH}
+.endif
+# Otherwise, default to current machine type and architecture.
+_TARGET?= ${MACHINE}
+_TARGET_ARCH?= ${MACHINE_ARCH}
+
+#
+# Make sure we have an up-to-date make(1). Only world and buildworld
+# should do this as those are the initial targets used for upgrades.
+# The user can define ALWAYS_CHECK_MAKE to have this check performed
+# for all targets.
+#
+.if defined(ALWAYS_CHECK_MAKE)
+${TGTS}: upgrade_checks
+.else
+buildworld: upgrade_checks
+.endif
+
+#
+# This 'cleanworld' target is not included in TGTS, because it is not a
+# recursive target. All of the work for it is done right here. It is
+# expected that BW_CANONICALOBJDIR == the CANONICALOBJDIR as would be
+# created by bsd.obj.mk, except that we don't want to .include that file
+# in this makefile.
+#
+# In the following, the first 'rm' in a series will usually remove all
+# files and directories. If it does not, then there are probably some
+# files with file flags set, so this unsets them and tries the 'rm' a
+# second time. There are situations where this target will be cleaning
+# some directories via more than one method, but that duplication is
+# needed to correctly handle all the possible situations. Removing all
+# files without file flags set in the first 'rm' instance saves time,
+# because 'chflags' will need to operate on fewer files afterwards.
+#
+BW_CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
+cleanworld:
+.if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR}
+.if exists(${BW_CANONICALOBJDIR}/)
+ -rm -rf ${BW_CANONICALOBJDIR}/*
+ -chflags -R 0 ${BW_CANONICALOBJDIR}
+ rm -rf ${BW_CANONICALOBJDIR}/*
+.endif
+ # To be safe in this case, fall back to a 'make cleandir'
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir
+.else
+ -rm -rf ${.OBJDIR}/*
+ -chflags -R 0 ${.OBJDIR}
+ rm -rf ${.OBJDIR}/*
+.endif
+
+#
+# Handle the user-driven targets, using the source relative mk files.
+#
+
+${TGTS}:
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET}
+
+# Set a reasonable default
+.MAIN: all
+
+STARTTIME!= LC_ALL=C date
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo
+.if !empty(CHECK_TIME)
+.error check your date/time: ${STARTTIME}
+.endif
+
+.if defined(HISTORICAL_MAKE_WORLD) || defined(DESTDIR)
+#
+# world
+#
+# Attempt to rebuild and reinstall everything. This target is not to be
+# used for upgrading an existing FreeBSD system, because the kernel is
+# not included. One can argue that this target doesn't build everything
+# then.
+#
+world: upgrade_checks
+ @echo "--------------------------------------------------------------"
+ @echo ">>> make world started on ${STARTTIME}"
+ @echo "--------------------------------------------------------------"
+.if target(pre-world)
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Making 'pre-world' target"
+ @echo "--------------------------------------------------------------"
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} pre-world
+.endif
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} buildworld
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} -B installworld
+.if target(post-world)
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Making 'post-world' target"
+ @echo "--------------------------------------------------------------"
+ ${_+_}@cd ${.CURDIR}; ${_MAKE} post-world
+.endif
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> make world completed on `LC_ALL=C date`"
+ @echo " (started ${STARTTIME})"
+ @echo "--------------------------------------------------------------"
+.else
+world:
+ @echo "WARNING: make world will overwrite your existing FreeBSD"
+ @echo "installation without also building and installing a new"
+ @echo "kernel. This can be dangerous. Please read the handbook,"
+ @echo "'Rebuilding world', for how to upgrade your system."
+ @echo "Define DESTDIR to where you want to install FreeBSD,"
+ @echo "including /, to override this warning and proceed as usual."
+ @echo ""
+ @echo "Bailing out now..."
+ @false
+.endif
+
+#
+# kernel
+#
+# Short hand for `make buildkernel installkernel'
+#
+kernel: buildkernel installkernel
+
+#
+# Perform a few tests to determine if the installed tools are adequate
+# for building the world.
+#
+upgrade_checks:
+.if !defined(.PARSEDIR)
+ @if ! (cd ${.CURDIR}/tools/build/make_check && \
+ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
+ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
+ then \
+ (cd ${.CURDIR} && ${MAKE} make); \
+ fi
+.endif
+
+#
+# Upgrade make(1) to the current version using the installed
+# headers, libraries and tools. Also, allow the location of
+# the system bsdmake-like utility to be overridden.
+#
+MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
+ DESTDIR= \
+ INSTALL="sh ${.CURDIR}/tools/install.sh"
+MMAKE= ${MMAKEENV} ${MAKE} \
+ -D_UPGRADING \
+ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WERROR
+
+make: .PHONY
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Building an up-to-date make(1)"
+ @echo "--------------------------------------------------------------"
+ ${_+_}@cd ${.CURDIR}/usr.bin/make; \
+ ${MMAKE} obj && \
+ ${MMAKE} depend && \
+ ${MMAKE} all && \
+ ${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
+
+tinderbox:
+ @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+
+toolchains:
+ @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
+
+kernel-toolchains:
+ @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe
+
+#
+# universe
+#
+# Attempt to rebuild *everything* for all supported architectures,
+# with a reasonable chance of success, regardless of how old your
+# existing system is.
+#
+.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
+TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64
+TARGET_ARCHES_arm?= arm armeb armv6 armv6eb
+TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32
+TARGET_ARCHES_powerpc?= powerpc powerpc64
+TARGET_ARCHES_pc98?= i386
+.for target in ${TARGETS}
+TARGET_ARCHES_${target}?= ${target}
+.endfor
+
+.if defined(UNIVERSE_TARGET)
+MAKE_JUST_WORLDS= YES
+.else
+UNIVERSE_TARGET?= buildworld
+.endif
+KERNSRCDIR?= ${.CURDIR}/sys
+
+targets:
+ @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
+.for target in ${TARGETS}
+.for target_arch in ${TARGET_ARCHES_${target}}
+ @echo " ${target}/${target_arch}"
+.endfor
+.endfor
+
+.if defined(DOING_TINDERBOX)
+FAILFILE=${.CURDIR}/_.tinderbox.failed
+MAKEFAIL=tee -a ${FAILFILE}
+.else
+MAKEFAIL=cat
+.endif
+
+universe: universe_prologue
+universe_prologue:
+ @echo "--------------------------------------------------------------"
+ @echo ">>> make universe started on ${STARTTIME}"
+ @echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+ @rm -f ${FAILFILE}
+.endif
+.for target in ${TARGETS}
+universe: universe_${target}
+.ORDER: universe_prologue universe_${target} universe_epilogue
+universe_${target}: universe_${target}_prologue
+universe_${target}_prologue:
+ @echo ">> ${target} started on `LC_ALL=C date`"
+.if !defined(MAKE_JUST_KERNELS)
+.for target_arch in ${TARGET_ARCHES_${target}}
+universe_${target}: universe_${target}_${target_arch}
+universe_${target}_${target_arch}: universe_${target}_prologue
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
+ TARGET=${target} \
+ TARGET_ARCH=${target_arch} \
+ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
+ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
+ "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
+ ${MAKEFAIL}))
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
+.endfor
+.endif
+.if !defined(MAKE_JUST_WORLDS)
+.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
+ @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
+ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+ (echo "${target} 'make LINT' failed," \
+ "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
+.endif
+ @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
+ universe_kernels
+.endif
+ @echo ">> ${target} completed on `LC_ALL=C date`"
+.endfor
+universe_kernels: universe_kernconfs
+.if !defined(TARGET)
+TARGET!= uname -m
+.endif
+KERNCONFS!= cd ${KERNSRCDIR}/${TARGET}/conf && \
+ find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
+ ! -name DEFAULTS ! -name NOTES
+universe_kernconfs:
+.for kernel in ${KERNCONFS}
+TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
+ config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \
+ grep -v WARNING: | cut -f 2
+.if empty(TARGET_ARCH_${kernel})
+.error "Target architecture for ${TARGET}/conf/${kernel} unknown. config(8) likely too old."
+.endif
+universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
+universe_kernconf_${TARGET}_${kernel}:
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} buildkernel \
+ TARGET=${TARGET} \
+ TARGET_ARCH=${TARGET_ARCH_${kernel}} \
+ KERNCONF=${kernel} \
+ > _.${TARGET}.${kernel} 2>&1 || \
+ (echo "${TARGET} ${kernel} kernel failed," \
+ "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
+.endfor
+universe: universe_epilogue
+universe_epilogue:
+ @echo "--------------------------------------------------------------"
+ @echo ">>> make universe completed on `LC_ALL=C date`"
+ @echo " (started ${STARTTIME})"
+ @echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+ @if [ -e ${FAILFILE} ] ; then \
+ echo "Tinderbox failed:" ;\
+ cat ${FAILFILE} ;\
+ exit 1 ;\
+ fi
+.endif
+.endif
+
+buildLINT:
+ ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
Copied: projects/Makefile.inc1 (from r244484, head/Makefile.inc1)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/Makefile.inc1 Thu Dec 20 12:34:22 2012 (r244485, copy of r244484, head/Makefile.inc1)
@@ -0,0 +1,1727 @@
+#
+# $FreeBSD$
+#
+# Make command line options:
+# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+# -DNO_CLEAN do not clean at all
+# -DNO_SHARE do not go into share subdir
+# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
+# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
+# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
+# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
+# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
+# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
+# -DNO_DOCUPDATE do not update doc in ${MAKE} update
+# -DNO_WWWUPDATE do not update www in ${MAKE} update
+# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
+# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
+# LOCAL_MTREE="list of mtree files" to process to allow local directories
+# to be created before files are installed
+# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
+# list
+# TARGET="machine" to crossbuild world for a different machine type
+# TARGET_ARCH= may be required when a TARGET supports multiple endians
+# BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh)
+
+#
+# The intended user-driven targets are:
+# buildworld - rebuild *everything*, including glue to help do upgrades
+# installworld- install everything built by "buildworld"
+# doxygen - build API documentation of the kernel
+# update - convenient way to update your source tree (eg: cvsup/cvs)
+#
+# Standard targets (not defined here) are documented in the makefiles in
+# /usr/share/mk. These include:
+# obj depend all install clean cleandepend cleanobj
+
+# You are supposed to define both of these when calling Makefile.inc1
+# directly. However, some old scripts don't. Cope for the moment, but
+# issue a new warning for a transition period.
+.if defined(TARGET) && !defined(TARGET_ARCH)
+.warning "You must pass both TARGET and TARGET_ARCH to Makefile.inc1. Setting TARGET_ARCH=${TARGET}."
+TARGET_ARCH=${TARGET}
+.endif
+.if !defined(TARGET) || !defined(TARGET_ARCH)
+.error "Both TARGET and TARGET_ARCH must be defined."
+.endif
+
+.include <bsd.own.mk>
+.include <bsd.arch.inc.mk>
+.include <bsd.compiler.mk>
+
+# We must do share/info early so that installation of info `dir'
+# entries works correctly. Do it first since it is less likely to
+# grow dependencies on include and lib than vice versa.
+#
+# We must do lib/ and libexec/ before bin/, because if installworld
+# installs a new /bin/sh, the 'make' command will *immediately*
+# use that new version. And the new (dynamically-linked) /bin/sh
+# will expect to find appropriate libraries in /lib and /libexec.
+#
+SUBDIR= share/info lib libexec
+SUBDIR+=bin
+.if ${MK_GAMES} != "no"
+SUBDIR+=games
+.endif
+.if ${MK_CDDL} != "no"
+SUBDIR+=cddl
+.endif
+SUBDIR+=gnu include
+.if ${MK_KERBEROS} != "no"
+SUBDIR+=kerberos5
+.endif
+.if ${MK_RESCUE} != "no"
+SUBDIR+=rescue
+.endif
+SUBDIR+=sbin
+.if ${MK_CRYPT} != "no"
+SUBDIR+=secure
+.endif
+.if !defined(NO_SHARE)
+SUBDIR+=share
+.endif
+SUBDIR+=sys usr.bin usr.sbin
+.if ${MK_OFED} != "no"
+SUBDIR+=contrib/ofed
+.endif
+#
+# We must do etc/ last for install/distribute to work.
+#
+SUBDIR+=etc
+
+# These are last, since it is nice to at least get the base system
+# rebuilt before you do them.
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+SUBDIR+= ${_DIR}
+.endif
+.endfor
+
+.if defined(SUBDIR_OVERRIDE)
+SUBDIR= ${SUBDIR_OVERRIDE}
+.endif
+
+.if defined(NOCLEAN)
+NO_CLEAN= ${NOCLEAN}
+.endif
+.if defined(NO_CLEANDIR)
+CLEANDIR= clean cleandepend
+.else
+CLEANDIR= cleandir
+.endif
+
+LOCAL_TOOL_DIRS?=
+
+BUILDENV_SHELL?=/bin/sh
+
+CVS?= cvs
+CVSFLAGS?= -A -P -d -I!
+SVN?= svn
+SVNFLAGS?= -r HEAD
+SUP?= /usr/bin/csup
+SUPFLAGS?= -g -L 2
+.if defined(SUPHOST)
+SUPFLAGS+= -h ${SUPHOST}
+.endif
+
+MAKEOBJDIRPREFIX?= /usr/obj
+.if !defined(OSRELDATE)
+.if exists(/usr/include/osreldate.h)
+OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ /usr/include/osreldate.h
+.else
+OSRELDATE= 0
+.endif
+.endif
+
+.if !defined(VERSION)
+VERSION!= uname -srp
+VERSION+= ${OSRELDATE}
+.endif
+
+KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6eb/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+.if ${TARGET} == ${TARGET_ARCH}
+_t= ${TARGET}
+.else
+_t= ${TARGET_ARCH}/${TARGET}
+.endif
+.for _t in ${_t}
+.if empty(KNOWN_ARCHES:M${_t})
+.error Unknown target ${TARGET_ARCH}:${TARGET}.
+.endif
+.endfor
+
+.if ${TARGET} == ${MACHINE}
+TARGET_CPUTYPE?=${CPUTYPE}
+.else
+TARGET_CPUTYPE?=
+.endif
+
+.if !empty(TARGET_CPUTYPE)
+_TARGET_CPUTYPE=${TARGET_CPUTYPE}
+.else
+_TARGET_CPUTYPE=dummy
+.endif
+_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
+ -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
+.if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
+.error CPUTYPE global should be set with ?=.
+.endif
+.if make(buildworld)
+BUILD_ARCH!= uname -p
+.if ${MACHINE_ARCH} != ${BUILD_ARCH}
+.error To cross-build, set TARGET_ARCH.
+.endif
+.endif
+.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
+OBJTREE= ${MAKEOBJDIRPREFIX}
+.else
+OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
+.endif
+WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
+# /usr/games added for fortune which depend on strfile
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
+XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+STRICTTMPPATH= ${BPATH}:${XPATH}
+TMPPATH= ${STRICTTMPPATH}:${PATH}
+
+#
+# Avoid running mktemp(1) unless actually needed.
+# It may not be functional, e.g., due to new ABI
+# when in the middle of installing over this system.
+#
+.if make(distributeworld) || make(installworld)
+INSTALLTMP!= /usr/bin/mktemp -d -u -t install
+.endif
+
+#
+# Building a world goes through the following stages
+#
+# 1. legacy stage [BMAKE]
+# This stage is responsible for creating compatibility
+# shims that are needed by the bootstrap-tools,
+# build-tools and cross-tools stages.
+# 1. bootstrap-tools stage [BMAKE]
+# This stage is responsible for creating programs that
+# are needed for backward compatibility reasons. They
+# are not built as cross-tools.
+# 2. build-tools stage [TMAKE]
+# This stage is responsible for creating the object
+# tree and building any tools that are needed during
+# the build process.
+# 3. cross-tools stage [XMAKE]
+# This stage is responsible for creating any tools that
+# are needed for cross-builds. A cross-compiler is one
+# of them.
+# 4. world stage [WMAKE]
+# This stage actually builds the world.
+# 5. install stage (optional) [IMAKE]
+# This stage installs a previously built world.
+#
+
+BOOTSTRAPPING?= 0
+
+# Common environment for world related stages
+CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
+ MACHINE_ARCH=${TARGET_ARCH} \
+ MACHINE=${TARGET} \
+ CPUTYPE=${TARGET_CPUTYPE}
+.if ${MK_GROFF} != "no"
+CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
+ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
+ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
+.endif
+
+# bootstrap-tools stage
+BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
+ PATH=${BPATH}:${PATH} \
+ WORLDTMP=${WORLDTMP} \
+ VERSION="${VERSION}" \
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
+ COMPILER_TYPE=${COMPILER_TYPE}
+BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+ DESTDIR= \
+ BOOTSTRAPPING=${OSRELDATE} \
+ SSP_CFLAGS= \
+ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ -DNO_PIC -DNO_PROFILE -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
+# build-tools stage
+TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
+ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
+ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ DESTDIR= \
+ BOOTSTRAPPING=${OSRELDATE} \
+ SSP_CFLAGS= \
+ -DNO_LINT \
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
+# cross-tools stage
+XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
+ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ -DWITHOUT_GDB
+
+# world stage
+WMAKEENV= ${CROSSENV} \
+ _SHLIBDIRPREFIX=${WORLDTMP} \
+ _LDSCRIPTROOT= \
+ VERSION="${VERSION}" \
+ INSTALL="sh ${.CURDIR}/tools/install.sh" \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 12:42:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id A3975A11;
Thu, 20 Dec 2012 12:42:43 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 886AA8FC0A;
Thu, 20 Dec 2012 12:42:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKCghBs046799;
Thu, 20 Dec 2012 12:42:43 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKCgheA046798;
Thu, 20 Dec 2012 12:42:43 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201242.qBKCgheA046798@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 12:42:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244486 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 12:42:43 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 12:42:42 2012
New Revision: 244486
URL: http://svnweb.freebsd.org/changeset/base/244486
Log:
You don't want to expire portbuild itself. You'll expire things like
tools, pxedust, and most importantly, pxeroot.
Modified:
projects/portbuild/scripts/zexpire
Modified: projects/portbuild/scripts/zexpire
==============================================================================
--- projects/portbuild/scripts/zexpire Thu Dec 20 12:34:22 2012 (r244485)
+++ projects/portbuild/scripts/zexpire Thu Dec 20 12:42:42 2012 (r244486)
@@ -13,7 +13,6 @@ VERBOSE= True
# List of filesystems to expire
expirelist=(("a", 14),
- ("a/portbuild", 14),
("a/portbuild/amd64", 14),
("a/portbuild/arm", 14),
("a/portbuild/i386", 14),
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 12:46:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 06B4FDA7;
Thu, 20 Dec 2012 12:46:35 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DD8DA8FC14;
Thu, 20 Dec 2012 12:46:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKCkY2O047370;
Thu, 20 Dec 2012 12:46:34 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKCkYMn047369;
Thu, 20 Dec 2012 12:46:34 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212201246.qBKCkYMn047369@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 20 Dec 2012 12:46:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244487 - in projects: . bin cddl contrib crypto etc
games gnu include kerberos5 lib libexec release rescue sbin secure share sys
tools usr.bin usr.sbin
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 12:46:35 -0000
Author: ae
Date: Thu Dec 20 12:46:34 2012
New Revision: 244487
URL: http://svnweb.freebsd.org/changeset/base/244487
Log:
Backout r244485.
Deleted:
projects/COPYRIGHT
projects/LOCKS
projects/MAINTAINERS
projects/Makefile
projects/Makefile.inc1
projects/ObsoleteFiles.inc
projects/README
projects/UPDATING
projects/bin/
projects/cddl/
projects/contrib/
projects/crypto/
projects/etc/
projects/games/
projects/gnu/
projects/include/
projects/kerberos5/
projects/lib/
projects/libexec/
projects/release/
projects/rescue/
projects/sbin/
projects/secure/
projects/share/
projects/sys/
projects/tools/
projects/usr.bin/
projects/usr.sbin/
Modified:
Directory Properties:
projects/ (props changed)
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 13:27:52 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 98E7D87C;
Thu, 20 Dec 2012 13:27:52 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 732AE8FC13;
Thu, 20 Dec 2012 13:27:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKDRqZj053476;
Thu, 20 Dec 2012 13:27:52 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKDRjsR053441;
Thu, 20 Dec 2012 13:27:45 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212201327.qBKDRjsR053441@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 20 Dec 2012 13:27:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244488 - in projects/counters: . bin/df bin/ps bin/sh
cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzfs/common
contrib/bind9 contrib/bind9/bin contrib/bind9/bin/chec...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 13:27:52 -0000
Author: ae
Date: Thu Dec 20 13:27:43 2012
New Revision: 244488
URL: http://svnweb.freebsd.org/changeset/base/244488
Log:
Merge r243652 through r24487 from head.
Added:
projects/counters/contrib/bind9/lib/dns/opensslecdsa_link.c
- copied unchanged from r244487, head/contrib/bind9/lib/dns/opensslecdsa_link.c
projects/counters/contrib/libc-vis/
- copied from r244487, head/contrib/libc-vis/
projects/counters/contrib/llvm/include/llvm/ADT/MapVector.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/ADT/MapVector.h
projects/counters/contrib/llvm/include/llvm/AddressingMode.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/AddressingMode.h
projects/counters/contrib/llvm/include/llvm/Analysis/DependenceAnalysis.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Analysis/DependenceAnalysis.h
projects/counters/contrib/llvm/include/llvm/Analysis/ProfileDataLoader.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Analysis/ProfileDataLoader.h
projects/counters/contrib/llvm/include/llvm/Analysis/ProfileDataTypes.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Analysis/ProfileDataTypes.h
projects/counters/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachinePostDominators.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/CodeGen/MachinePostDominators.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ScheduleDAGILP.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/CodeGen/ScheduleDAGILP.h
projects/counters/contrib/llvm/include/llvm/CodeGen/TargetSchedule.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/CodeGen/TargetSchedule.h
projects/counters/contrib/llvm/include/llvm/DataLayout.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/DataLayout.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/ObjectBuffer.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/ExecutionEngine/ObjectBuffer.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/ObjectImage.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/ExecutionEngine/ObjectImage.h
projects/counters/contrib/llvm/include/llvm/Object/RelocVisitor.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Object/RelocVisitor.h
projects/counters/contrib/llvm/include/llvm/Target/TargetTransformImpl.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Target/TargetTransformImpl.h
projects/counters/contrib/llvm/include/llvm/TargetTransformInfo.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/TargetTransformInfo.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/BypassSlowDivision.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Transforms/Utils/BypassSlowDivision.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/IntegerDivision.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Transforms/Utils/IntegerDivision.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h
- copied unchanged from r244487, head/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h
projects/counters/contrib/llvm/lib/Analysis/CostModel.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Analysis/CostModel.cpp
projects/counters/contrib/llvm/lib/Analysis/DependenceAnalysis.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Analysis/DependenceAnalysis.cpp
projects/counters/contrib/llvm/lib/Analysis/ProfileDataLoader.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Analysis/ProfileDataLoader.cpp
projects/counters/contrib/llvm/lib/Analysis/ProfileDataLoaderPass.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Analysis/ProfileDataLoaderPass.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachinePostDominators.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/CodeGen/MachinePostDominators.cpp
projects/counters/contrib/llvm/lib/CodeGen/StackColoring.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/CodeGen/StackColoring.cpp
projects/counters/contrib/llvm/lib/CodeGen/TargetSchedule.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/CodeGen/TargetSchedule.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.h
- copied unchanged from r244487, head/contrib/llvm/lib/DebugInfo/DWARFDebugRangeList.h
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventsWrapper.h
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventsWrapper.h
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/ittnotify_config.h
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/ittnotify_config.h
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/ittnotify_types.h
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/ittnotify_types.h
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/jitprofiling.c
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/jitprofiling.c
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/jitprofiling.h
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/jitprofiling.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/ObjectImageCommon.h
- copied unchanged from r244487, head/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/ObjectImageCommon.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMScheduleSwift.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/ARM/ARMScheduleSwift.td
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.h
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Hexagon/HexagonMachineScheduler.h
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsDirectObjLower.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsDirectObjLower.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsDirectObjLower.h
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsDirectObjLower.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsDSPInstrFormats.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Mips/MipsDSPInstrFormats.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsDSPInstrInfo.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/Mips/MipsDSPInstrInfo.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleE500mc.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/PowerPC/PPCScheduleE500mc.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleE5500.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/PowerPC/PPCScheduleE5500.td
projects/counters/contrib/llvm/lib/Target/TargetTransformImpl.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Target/TargetTransformImpl.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86InstrTSX.td
- copied unchanged from r244487, head/contrib/llvm/lib/Target/X86/X86InstrTSX.td
projects/counters/contrib/llvm/lib/Transforms/IPO/BarrierNoopPass.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/IPO/BarrierNoopPass.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/BlackList.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Instrumentation/BlackList.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/BlackList.h
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Instrumentation/BlackList.h
projects/counters/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/BypassSlowDivision.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Utils/BypassSlowDivision.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/IntegerDivision.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Utils/IntegerDivision.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/MetaRenamer.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Utils/MetaRenamer.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
projects/counters/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
projects/counters/contrib/llvm/lib/VMCore/AttributesImpl.h
- copied unchanged from r244487, head/contrib/llvm/lib/VMCore/AttributesImpl.h
projects/counters/contrib/llvm/lib/VMCore/DataLayout.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/VMCore/DataLayout.cpp
projects/counters/contrib/llvm/lib/VMCore/TargetTransformInfo.cpp
- copied unchanged from r244487, head/contrib/llvm/lib/VMCore/TargetTransformInfo.cpp
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentCommands.td
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/AST/CommentCommands.td
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentHTMLTags.td
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/AST/CommentHTMLTags.td
projects/counters/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTTypeTraits.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTTypeTraits.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.def
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Sanitizers.def
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Basic/Sanitizers.def
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearchOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PPMutationListener.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Lex/PPMutationListener.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorOptions.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/Core/
- copied from r244487, head/contrib/llvm/tools/clang/include/clang/Rewrite/Core/
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/
- copied from r244487, head/contrib/llvm/tools/clang/include/clang/Rewrite/Frontend/
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/MultiplexExternalSemaSource.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Sema/MultiplexExternalSemaSource.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Analyses.def
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Analyses.def
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/CommonOptionsParser.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Tooling/CommonOptionsParser.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/CompilationDatabasePluginRegistry.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Tooling/CompilationDatabasePluginRegistry.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/FileMatchTrie.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Tooling/FileMatchTrie.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/JSONCompilationDatabase.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/include/clang/Tooling/JSONCompilationDatabase.h
projects/counters/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Analysis/BodyFarm.h
projects/counters/contrib/llvm/tools/clang/lib/Analysis/ObjCNoReturn.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Analysis/ObjCNoReturn.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Driver/SanitizerArgs.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_aes.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_aes.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Headers/__wmmintrin_pclmul.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/f16cintrin.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Headers/f16cintrin.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/rtmintrin.h
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Headers/rtmintrin.h
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/Core/
- copied from r244487, head/contrib/llvm/tools/clang/lib/Rewrite/Core/
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/Frontend/
- copied from r244487, head/contrib/llvm/tools/clang/lib/Rewrite/Frontend/
projects/counters/contrib/llvm/tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Sema/ScopeInfo.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Sema/SemaStmtAsm.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DirectIvarAssignment.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DirectIvarAssignment.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/SimpleStreamChecker.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/SimpleStreamChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ConstraintManager.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ConstraintManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Tooling/CommonOptionsParser.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/FileMatchTrie.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Tooling/FileMatchTrie.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/JSONCompilationDatabase.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/lib/Tooling/JSONCompilationDatabase.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/ClangCommentCommandInfoEmitter.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/utils/TableGen/ClangCommentCommandInfoEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/ClangCommentHTMLTagsEmitter.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/clang/utils/TableGen/ClangCommentHTMLTagsEmitter.cpp
projects/counters/contrib/llvm/tools/lli/RecordingMemoryManager.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/lli/RecordingMemoryManager.cpp
projects/counters/contrib/llvm/tools/lli/RecordingMemoryManager.h
- copied unchanged from r244487, head/contrib/llvm/tools/lli/RecordingMemoryManager.h
projects/counters/contrib/llvm/tools/lli/RemoteTarget.cpp
- copied unchanged from r244487, head/contrib/llvm/tools/lli/RemoteTarget.cpp
projects/counters/contrib/llvm/tools/lli/RemoteTarget.h
- copied unchanged from r244487, head/contrib/llvm/tools/lli/RemoteTarget.h
projects/counters/contrib/llvm/utils/TableGen/CodeGenMapTable.cpp
- copied unchanged from r244487, head/contrib/llvm/utils/TableGen/CodeGenMapTable.cpp
projects/counters/contrib/openbsm/bin/auditdistd/
- copied from r244487, head/contrib/openbsm/bin/auditdistd/
projects/counters/contrib/openbsm/compat/closefrom.h
- copied unchanged from r244487, head/contrib/openbsm/compat/closefrom.h
projects/counters/contrib/openbsm/compat/compat.h
- copied unchanged from r244487, head/contrib/openbsm/compat/compat.h
projects/counters/contrib/openbsm/compat/endian_enc.h
- copied unchanged from r244487, head/contrib/openbsm/compat/endian_enc.h
projects/counters/contrib/openbsm/compat/flopen.h
- copied unchanged from r244487, head/contrib/openbsm/compat/flopen.h
projects/counters/contrib/openbsm/compat/pidfile.h
- copied unchanged from r244487, head/contrib/openbsm/compat/pidfile.h
projects/counters/contrib/openbsm/compat/vis.h
- copied unchanged from r244487, head/contrib/openbsm/compat/vis.h
projects/counters/contrib/openbsm/config/ylwrap
- copied unchanged from r244487, head/contrib/openbsm/config/ylwrap
projects/counters/contrib/openbsm/m4/
- copied from r244487, head/contrib/openbsm/m4/
projects/counters/etc/rc.d/auditdistd
- copied unchanged from r244487, head/etc/rc.d/auditdistd
projects/counters/lib/clang/include/MipsGenAsmMatcher.inc
- copied unchanged from r244487, head/lib/clang/include/MipsGenAsmMatcher.inc
projects/counters/lib/clang/include/MipsGenMCPseudoLowering.inc
- copied unchanged from r244487, head/lib/clang/include/MipsGenMCPseudoLowering.inc
projects/counters/lib/clang/include/clang/AST/CommentCommandInfo.inc
- copied unchanged from r244487, head/lib/clang/include/clang/AST/CommentCommandInfo.inc
projects/counters/lib/clang/include/clang/AST/CommentHTMLTags.inc
- copied unchanged from r244487, head/lib/clang/include/clang/AST/CommentHTMLTags.inc
projects/counters/lib/clang/include/clang/AST/CommentHTMLTagsProperties.inc
- copied unchanged from r244487, head/lib/clang/include/clang/AST/CommentHTMLTagsProperties.inc
projects/counters/lib/clang/libclangrewritecore/
- copied from r244487, head/lib/clang/libclangrewritecore/
projects/counters/lib/clang/libclangrewritefrontend/
- copied from r244487, head/lib/clang/libclangrewritefrontend/
projects/counters/lib/libc/gen/unvis-compat.c
- copied unchanged from r244487, head/lib/libc/gen/unvis-compat.c
projects/counters/share/syscons/keymaps/us.dvorakp.kbd
- copied unchanged from r244487, head/share/syscons/keymaps/us.dvorakp.kbd
projects/counters/sys/arm/arm/cpufunc_asm_arm11x6.S
- copied unchanged from r244487, head/sys/arm/arm/cpufunc_asm_arm11x6.S
projects/counters/sys/arm/arm/pl190.c
- copied unchanged from r244487, head/sys/arm/arm/pl190.c
projects/counters/sys/arm/conf/VERSATILEPB
- copied unchanged from r244487, head/sys/arm/conf/VERSATILEPB
projects/counters/sys/arm/versatile/
- copied from r244487, head/sys/arm/versatile/
projects/counters/sys/boot/fdt/dts/versatilepb.dts
- copied unchanged from r244487, head/sys/boot/fdt/dts/versatilepb.dts
projects/counters/sys/kern/subr_busdma_bufalloc.c
- copied unchanged from r244487, head/sys/kern/subr_busdma_bufalloc.c
projects/counters/sys/rpc/krpc.h
- copied unchanged from r244487, head/sys/rpc/krpc.h
projects/counters/sys/security/audit/bsm_domain.c
- copied unchanged from r244487, head/sys/security/audit/bsm_domain.c
projects/counters/sys/security/audit/bsm_errno.c
- copied unchanged from r244487, head/sys/security/audit/bsm_errno.c
projects/counters/sys/security/audit/bsm_fcntl.c
- copied unchanged from r244487, head/sys/security/audit/bsm_fcntl.c
projects/counters/sys/security/audit/bsm_socket_type.c
- copied unchanged from r244487, head/sys/security/audit/bsm_socket_type.c
projects/counters/sys/security/audit/bsm_token.c
- copied unchanged from r244487, head/sys/security/audit/bsm_token.c
projects/counters/sys/sys/busdma_bufalloc.h
- copied unchanged from r244487, head/sys/sys/busdma_bufalloc.h
projects/counters/tools/regression/bin/sh/errors/write-error1.0
- copied unchanged from r244487, head/tools/regression/bin/sh/errors/write-error1.0
projects/counters/tools/regression/usr.bin/printf/regress.zero.out
- copied unchanged from r244487, head/tools/regression/usr.bin/printf/regress.zero.out
projects/counters/usr.sbin/auditdistd/
- copied from r244487, head/usr.sbin/auditdistd/
projects/counters/usr.sbin/pkg/dns_utils.c
- copied unchanged from r244487, head/usr.sbin/pkg/dns_utils.c
projects/counters/usr.sbin/pkg/dns_utils.h
- copied unchanged from r244487, head/usr.sbin/pkg/dns_utils.h
Deleted:
projects/counters/contrib/llvm/include/llvm/ADT/Trie.h
projects/counters/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/IntelJITEventsWrapper.h
projects/counters/contrib/llvm/include/llvm/TableGen/TableGenAction.h
projects/counters/contrib/llvm/include/llvm/Target/TargetData.h
projects/counters/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h
projects/counters/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/ObjectImage.h
projects/counters/contrib/llvm/lib/TableGen/TableGenAction.cpp
projects/counters/contrib/llvm/lib/Target/AMDGPU/
projects/counters/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMELFWriterInfo.h
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeELFWriterInfo.h
projects/counters/contrib/llvm/lib/Target/TargetData.cpp
projects/counters/contrib/llvm/lib/Target/TargetELFWriterInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86ELFWriterInfo.h
projects/counters/contrib/llvm/lib/Target/X86/X86MCInstLower.h
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/FunctionBlackList.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/FunctionBlackList.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/Analyses.def
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/PreprocessorOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/DeltaTree.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/FrontendActions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/HTMLRewrite.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/RewriteRope.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriters.h
projects/counters/contrib/llvm/tools/clang/include/clang/Rewrite/TokenRewriter.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/CommandLineClangTool.h
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/DeltaTree.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/FixItRewriter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/FrontendActions.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/HTMLPrint.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/HTMLRewrite.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/InclusionRewriter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/RewriteMacros.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/RewriteModernObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/RewriteObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/RewriteRope.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/RewriteTest.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/Rewriter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Rewrite/TokenRewriter.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AdjustedReturnValueChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/OSAtomicChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicConstraintManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/CommandLineClangTool.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/CustomCompilationDatabase.h
projects/counters/include/vis.h
projects/counters/lib/clang/libclangrewrite/
projects/counters/lib/libc/gen/unvis.3
projects/counters/lib/libc/gen/unvis.c
projects/counters/lib/libc/gen/vis.3
projects/counters/lib/libc/gen/vis.c
projects/counters/sys/security/audit/audit_bsm_domain.c
projects/counters/sys/security/audit/audit_bsm_errno.c
projects/counters/sys/security/audit/audit_bsm_fcntl.c
projects/counters/sys/security/audit/audit_bsm_socket_type.c
projects/counters/sys/security/audit/audit_bsm_token.c
Modified:
projects/counters/Makefile.inc1
projects/counters/ObsoleteFiles.inc
projects/counters/UPDATING
projects/counters/bin/df/df.c
projects/counters/bin/ps/ps.c
projects/counters/bin/sh/eval.c
projects/counters/bin/sh/output.c
projects/counters/bin/sh/output.h
projects/counters/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/counters/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
projects/counters/contrib/bind9/CHANGES
projects/counters/contrib/bind9/Makefile.in
projects/counters/contrib/bind9/README
projects/counters/contrib/bind9/acconfig.h
projects/counters/contrib/bind9/bin/Makefile.in
projects/counters/contrib/bind9/bin/check/Makefile.in
projects/counters/contrib/bind9/bin/check/check-tool.c
projects/counters/contrib/bind9/bin/confgen/Makefile.in
projects/counters/contrib/bind9/bin/confgen/unix/Makefile.in
projects/counters/contrib/bind9/bin/dig/Makefile.in
projects/counters/contrib/bind9/bin/dig/nslookup.c
projects/counters/contrib/bind9/bin/dnssec/Makefile.in
projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.8
projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.c
projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.html
projects/counters/contrib/bind9/bin/dnssec/dnssec-settime.c
projects/counters/contrib/bind9/bin/dnssec/dnssec-signzone.c
projects/counters/contrib/bind9/bin/named/Makefile.in
projects/counters/contrib/bind9/bin/named/builtin.c
projects/counters/contrib/bind9/bin/named/config.c
projects/counters/contrib/bind9/bin/named/controlconf.c
projects/counters/contrib/bind9/bin/named/convertxsl.pl
projects/counters/contrib/bind9/bin/named/query.c
projects/counters/contrib/bind9/bin/named/server.c
projects/counters/contrib/bind9/bin/named/statschannel.c
projects/counters/contrib/bind9/bin/named/unix/Makefile.in
projects/counters/contrib/bind9/bin/nsupdate/Makefile.in
projects/counters/contrib/bind9/bin/nsupdate/nsupdate.c
projects/counters/contrib/bind9/bin/rndc/Makefile.in
projects/counters/contrib/bind9/bin/tools/Makefile.in
projects/counters/contrib/bind9/config.h.in
projects/counters/contrib/bind9/configure.in
projects/counters/contrib/bind9/doc/Makefile.in
projects/counters/contrib/bind9/doc/arm/Bv9ARM-book.xml
projects/counters/contrib/bind9/doc/arm/Bv9ARM.ch04.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.ch06.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.ch07.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.ch08.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.ch09.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.html
projects/counters/contrib/bind9/doc/arm/Bv9ARM.pdf
projects/counters/contrib/bind9/doc/arm/Makefile.in
projects/counters/contrib/bind9/doc/arm/man.arpaname.html
projects/counters/contrib/bind9/doc/arm/man.ddns-confgen.html
projects/counters/contrib/bind9/doc/arm/man.dig.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-keygen.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-revoke.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-settime.html
projects/counters/contrib/bind9/doc/arm/man.dnssec-signzone.html
projects/counters/contrib/bind9/doc/arm/man.genrandom.html
projects/counters/contrib/bind9/doc/arm/man.host.html
projects/counters/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
projects/counters/contrib/bind9/doc/arm/man.named-checkconf.html
projects/counters/contrib/bind9/doc/arm/man.named-checkzone.html
projects/counters/contrib/bind9/doc/arm/man.named-journalprint.html
projects/counters/contrib/bind9/doc/arm/man.named.html
projects/counters/contrib/bind9/doc/arm/man.nsec3hash.html
projects/counters/contrib/bind9/doc/arm/man.nsupdate.html
projects/counters/contrib/bind9/doc/arm/man.rndc-confgen.html
projects/counters/contrib/bind9/doc/arm/man.rndc.conf.html
projects/counters/contrib/bind9/doc/arm/man.rndc.html
projects/counters/contrib/bind9/doc/misc/Makefile.in
projects/counters/contrib/bind9/doc/misc/format-options.pl
projects/counters/contrib/bind9/doc/misc/options
projects/counters/contrib/bind9/doc/misc/sort-options.pl
projects/counters/contrib/bind9/isc-config.sh.in
projects/counters/contrib/bind9/lib/Makefile.in
projects/counters/contrib/bind9/lib/bind9/Makefile.in
projects/counters/contrib/bind9/lib/bind9/api
projects/counters/contrib/bind9/lib/bind9/check.c
projects/counters/contrib/bind9/lib/bind9/include/Makefile.in
projects/counters/contrib/bind9/lib/bind9/include/bind9/Makefile.in
projects/counters/contrib/bind9/lib/dns/Makefile.in
projects/counters/contrib/bind9/lib/dns/adb.c
projects/counters/contrib/bind9/lib/dns/api
projects/counters/contrib/bind9/lib/dns/db.c
projects/counters/contrib/bind9/lib/dns/dnssec.c
projects/counters/contrib/bind9/lib/dns/ds.c
projects/counters/contrib/bind9/lib/dns/dst_api.c
projects/counters/contrib/bind9/lib/dns/dst_internal.h
projects/counters/contrib/bind9/lib/dns/dst_openssl.h
projects/counters/contrib/bind9/lib/dns/dst_parse.c
projects/counters/contrib/bind9/lib/dns/dst_parse.h
projects/counters/contrib/bind9/lib/dns/dst_result.c
projects/counters/contrib/bind9/lib/dns/include/Makefile.in
projects/counters/contrib/bind9/lib/dns/include/dns/db.h
projects/counters/contrib/bind9/lib/dns/include/dns/dnssec.h
projects/counters/contrib/bind9/lib/dns/include/dns/ds.h
projects/counters/contrib/bind9/lib/dns/include/dns/iptable.h
projects/counters/contrib/bind9/lib/dns/include/dns/keyvalues.h
projects/counters/contrib/bind9/lib/dns/include/dns/log.h
projects/counters/contrib/bind9/lib/dns/include/dns/rdataset.h
projects/counters/contrib/bind9/lib/dns/include/dns/rpz.h
projects/counters/contrib/bind9/lib/dns/include/dns/stats.h
projects/counters/contrib/bind9/lib/dns/include/dns/view.h
projects/counters/contrib/bind9/lib/dns/include/dns/zone.h
projects/counters/contrib/bind9/lib/dns/include/dst/Makefile.in
projects/counters/contrib/bind9/lib/dns/include/dst/dst.h
projects/counters/contrib/bind9/lib/dns/include/dst/result.h
projects/counters/contrib/bind9/lib/dns/log.c
projects/counters/contrib/bind9/lib/dns/master.c
projects/counters/contrib/bind9/lib/dns/masterdump.c
projects/counters/contrib/bind9/lib/dns/openssl_link.c
projects/counters/contrib/bind9/lib/dns/openssldh_link.c
projects/counters/contrib/bind9/lib/dns/openssldsa_link.c
projects/counters/contrib/bind9/lib/dns/opensslgost_link.c
projects/counters/contrib/bind9/lib/dns/opensslrsa_link.c
projects/counters/contrib/bind9/lib/dns/rbtdb.c
projects/counters/contrib/bind9/lib/dns/rcode.c
projects/counters/contrib/bind9/lib/dns/rdata.c
projects/counters/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
projects/counters/contrib/bind9/lib/dns/rdata/generic/ds_43.c
projects/counters/contrib/bind9/lib/dns/rdataset.c
projects/counters/contrib/bind9/lib/dns/resolver.c
projects/counters/contrib/bind9/lib/dns/rpz.c
projects/counters/contrib/bind9/lib/dns/spnego_asn1.pl
projects/counters/contrib/bind9/lib/dns/validator.c
projects/counters/contrib/bind9/lib/dns/view.c
projects/counters/contrib/bind9/lib/dns/zone.c
projects/counters/contrib/bind9/lib/export/Makefile.in
projects/counters/contrib/bind9/lib/export/dns/Makefile.in
projects/counters/contrib/bind9/lib/export/dns/include/Makefile.in
projects/counters/contrib/bind9/lib/export/dns/include/dns/Makefile.in
projects/counters/contrib/bind9/lib/export/dns/include/dst/Makefile.in
projects/counters/contrib/bind9/lib/export/irs/include/irs/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/nls/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/nothreads/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/pthreads/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/unix/Makefile.in
projects/counters/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in
projects/counters/contrib/bind9/lib/export/samples/Makefile-postinstall.in
projects/counters/contrib/bind9/lib/export/samples/Makefile.in
projects/counters/contrib/bind9/lib/irs/Makefile.in
projects/counters/contrib/bind9/lib/irs/include/Makefile.in
projects/counters/contrib/bind9/lib/irs/include/irs/Makefile.in
projects/counters/contrib/bind9/lib/isc/alpha/Makefile.in
projects/counters/contrib/bind9/lib/isc/alpha/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/api
projects/counters/contrib/bind9/lib/isc/ia64/Makefile.in
projects/counters/contrib/bind9/lib/isc/ia64/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
projects/counters/contrib/bind9/lib/isc/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/include/isc/file.h
projects/counters/contrib/bind9/lib/isc/include/isc/namespace.h
projects/counters/contrib/bind9/lib/isc/include/isc/task.h
projects/counters/contrib/bind9/lib/isc/mem.c
projects/counters/contrib/bind9/lib/isc/mips/Makefile.in
projects/counters/contrib/bind9/lib/isc/mips/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/nls/Makefile.in
projects/counters/contrib/bind9/lib/isc/noatomic/Makefile.in
projects/counters/contrib/bind9/lib/isc/noatomic/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/nothreads/Makefile.in
projects/counters/contrib/bind9/lib/isc/nothreads/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/powerpc/Makefile.in
projects/counters/contrib/bind9/lib/isc/powerpc/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/pthreads/Makefile.in
projects/counters/contrib/bind9/lib/isc/pthreads/condition.c
projects/counters/contrib/bind9/lib/isc/pthreads/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/sparc64/Makefile.in
projects/counters/contrib/bind9/lib/isc/sparc64/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/task.c
projects/counters/contrib/bind9/lib/isc/task_api.c
projects/counters/contrib/bind9/lib/isc/unix/Makefile.in
projects/counters/contrib/bind9/lib/isc/unix/file.c
projects/counters/contrib/bind9/lib/isc/unix/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_32/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_32/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_64/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_64/include/Makefile.in
projects/counters/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
projects/counters/contrib/bind9/lib/isccc/api
projects/counters/contrib/bind9/lib/isccc/cc.c
projects/counters/contrib/bind9/lib/isccc/include/Makefile.in
projects/counters/contrib/bind9/lib/isccc/include/isccc/Makefile.in
projects/counters/contrib/bind9/lib/isccfg/api
projects/counters/contrib/bind9/lib/isccfg/include/Makefile.in
projects/counters/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
projects/counters/contrib/bind9/lib/isccfg/namedconf.c
projects/counters/contrib/bind9/lib/lwres/Makefile.in
projects/counters/contrib/bind9/lib/lwres/api
projects/counters/contrib/bind9/lib/lwres/getaddrinfo.c
projects/counters/contrib/bind9/lib/lwres/include/Makefile.in
projects/counters/contrib/bind9/lib/lwres/include/lwres/Makefile.in
projects/counters/contrib/bind9/lib/lwres/man/Makefile.in
projects/counters/contrib/bind9/make/rules.in
projects/counters/contrib/bind9/version
projects/counters/contrib/binutils/Makefile.in
projects/counters/contrib/binutils/Makefile.tpl
projects/counters/contrib/binutils/gas/config/tc-arm.c
projects/counters/contrib/binutils/libiberty/Makefile.in
projects/counters/contrib/cvs/diff/Makefile.in
projects/counters/contrib/cvs/lib/Makefile.in
projects/counters/contrib/dtc/Makefile
projects/counters/contrib/gcc/Makefile.in
projects/counters/contrib/gcc/config/arm/arm.h
projects/counters/contrib/gcc/longlong.h
projects/counters/contrib/gcclibs/libcpp/Makefile.in
projects/counters/contrib/gcclibs/libdecnumber/Makefile.in
projects/counters/contrib/gcclibs/libiberty/Makefile.in
projects/counters/contrib/gdb/gdb/dwarf2read.c
projects/counters/contrib/gdb/gdb/gdbtypes.c
projects/counters/contrib/gdb/gdb/gdbtypes.h
projects/counters/contrib/gdb/gdb/hpread.c
projects/counters/contrib/gdb/gdb/parse.c
projects/counters/contrib/gdb/gdb/stabsread.c
projects/counters/contrib/gdtoa/makefile
projects/counters/contrib/gperf/lib/Makefile.in
projects/counters/contrib/less/NEWS
projects/counters/contrib/less/README
projects/counters/contrib/less/configure.ac
projects/counters/contrib/less/defines.h.in
projects/counters/contrib/less/less.man
projects/counters/contrib/less/less.nro
projects/counters/contrib/less/lessecho.man
projects/counters/contrib/less/lessecho.nro
projects/counters/contrib/less/lesskey.man
projects/counters/contrib/less/lesskey.nro
projects/counters/contrib/less/option.c
projects/counters/contrib/less/version.c
projects/counters/contrib/libc++/include/exception
projects/counters/contrib/libc++/include/iterator
projects/counters/contrib/libc++/include/locale
projects/counters/contrib/llvm/include/llvm-c/Core.h
projects/counters/contrib/llvm/include/llvm-c/Disassembler.h
projects/counters/contrib/llvm/include/llvm-c/Target.h
projects/counters/contrib/llvm/include/llvm-c/TargetMachine.h
projects/counters/contrib/llvm/include/llvm-c/Transforms/Vectorize.h
projects/counters/contrib/llvm/include/llvm/ADT/APFloat.h
projects/counters/contrib/llvm/include/llvm/ADT/APInt.h
projects/counters/contrib/llvm/include/llvm/ADT/ArrayRef.h
projects/counters/contrib/llvm/include/llvm/ADT/BitVector.h
projects/counters/contrib/llvm/include/llvm/ADT/DAGDeltaAlgorithm.h
projects/counters/contrib/llvm/include/llvm/ADT/DeltaAlgorithm.h
projects/counters/contrib/llvm/include/llvm/ADT/DenseMap.h
projects/counters/contrib/llvm/include/llvm/ADT/DenseMapInfo.h
projects/counters/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h
projects/counters/contrib/llvm/include/llvm/ADT/FoldingSet.h
projects/counters/contrib/llvm/include/llvm/ADT/Hashing.h
projects/counters/contrib/llvm/include/llvm/ADT/ImmutableList.h
projects/counters/contrib/llvm/include/llvm/ADT/ImmutableMap.h
projects/counters/contrib/llvm/include/llvm/ADT/ImmutableSet.h
projects/counters/contrib/llvm/include/llvm/ADT/Optional.h
projects/counters/contrib/llvm/include/llvm/ADT/OwningPtr.h
projects/counters/contrib/llvm/include/llvm/ADT/PackedVector.h
projects/counters/contrib/llvm/include/llvm/ADT/PointerIntPair.h
projects/counters/contrib/llvm/include/llvm/ADT/ScopedHashTable.h
projects/counters/contrib/llvm/include/llvm/ADT/SetVector.h
projects/counters/contrib/llvm/include/llvm/ADT/SmallBitVector.h
projects/counters/contrib/llvm/include/llvm/ADT/SmallPtrSet.h
projects/counters/contrib/llvm/include/llvm/ADT/SmallString.h
projects/counters/contrib/llvm/include/llvm/ADT/SmallVector.h
projects/counters/contrib/llvm/include/llvm/ADT/SparseBitVector.h
projects/counters/contrib/llvm/include/llvm/ADT/SparseSet.h
projects/counters/contrib/llvm/include/llvm/ADT/StringExtras.h
projects/counters/contrib/llvm/include/llvm/ADT/StringRef.h
projects/counters/contrib/llvm/include/llvm/ADT/StringSet.h
projects/counters/contrib/llvm/include/llvm/ADT/Triple.h
projects/counters/contrib/llvm/include/llvm/ADT/Twine.h
projects/counters/contrib/llvm/include/llvm/ADT/ValueMap.h
projects/counters/contrib/llvm/include/llvm/ADT/ilist.h
projects/counters/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h
projects/counters/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h
projects/counters/contrib/llvm/include/llvm/Analysis/BranchProbabilityInfo.h
projects/counters/contrib/llvm/include/llvm/Analysis/CallGraph.h
projects/counters/contrib/llvm/include/llvm/Analysis/CaptureTracking.h
projects/counters/contrib/llvm/include/llvm/Analysis/CodeMetrics.h
projects/counters/contrib/llvm/include/llvm/Analysis/ConstantFolding.h
projects/counters/contrib/llvm/include/llvm/Analysis/Dominators.h
projects/counters/contrib/llvm/include/llvm/Analysis/IVUsers.h
projects/counters/contrib/llvm/include/llvm/Analysis/InlineCost.h
projects/counters/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h
projects/counters/contrib/llvm/include/llvm/Analysis/IntervalPartition.h
projects/counters/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h
projects/counters/contrib/llvm/include/llvm/Analysis/Loads.h
projects/counters/contrib/llvm/include/llvm/Analysis/LoopInfo.h
projects/counters/contrib/llvm/include/llvm/Analysis/LoopInfoImpl.h
projects/counters/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h
projects/counters/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h
projects/counters/contrib/llvm/include/llvm/Analysis/PHITransAddr.h
projects/counters/contrib/llvm/include/llvm/Analysis/Passes.h
projects/counters/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h
projects/counters/contrib/llvm/include/llvm/Analysis/RegionInfo.h
projects/counters/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h
projects/counters/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
projects/counters/contrib/llvm/include/llvm/Analysis/SparsePropagation.h
projects/counters/contrib/llvm/include/llvm/Analysis/ValueTracking.h
projects/counters/contrib/llvm/include/llvm/Argument.h
projects/counters/contrib/llvm/include/llvm/Attributes.h
projects/counters/contrib/llvm/include/llvm/BasicBlock.h
projects/counters/contrib/llvm/include/llvm/Bitcode/Archive.h
projects/counters/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h
projects/counters/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h
projects/counters/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h
projects/counters/contrib/llvm/include/llvm/CallingConv.h
projects/counters/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h
projects/counters/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h
projects/counters/contrib/llvm/include/llvm/CodeGen/FastISel.h
projects/counters/contrib/llvm/include/llvm/CodeGen/GCMetadata.h
projects/counters/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h
projects/counters/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h
projects/counters/contrib/llvm/include/llvm/CodeGen/LiveInterval.h
projects/counters/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h
projects/counters/contrib/llvm/include/llvm/CodeGen/LiveVariables.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineFunction.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineInstr.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineInstrBundle.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineOperand.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h
projects/counters/contrib/llvm/include/llvm/CodeGen/MachineScheduler.h
projects/counters/contrib/llvm/include/llvm/CodeGen/PBQP/Graph.h
projects/counters/contrib/llvm/include/llvm/CodeGen/PBQP/HeuristicBase.h
projects/counters/contrib/llvm/include/llvm/CodeGen/Passes.h
projects/counters/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h
projects/counters/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h
projects/counters/contrib/llvm/include/llvm/CodeGen/RegisterClassInfo.h
projects/counters/contrib/llvm/include/llvm/CodeGen/RegisterPressure.h
projects/counters/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ScheduleDAGInstrs.h
projects/counters/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h
projects/counters/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h
projects/counters/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ValueTypes.h
projects/counters/contrib/llvm/include/llvm/CodeGen/ValueTypes.td
projects/counters/contrib/llvm/include/llvm/Constant.h
projects/counters/contrib/llvm/include/llvm/Constants.h
projects/counters/contrib/llvm/include/llvm/DIBuilder.h
projects/counters/contrib/llvm/include/llvm/DebugInfo.h
projects/counters/contrib/llvm/include/llvm/DebugInfo/DIContext.h
projects/counters/contrib/llvm/include/llvm/DefaultPasses.h
projects/counters/contrib/llvm/include/llvm/DerivedTypes.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h
projects/counters/contrib/llvm/include/llvm/ExecutionEngine/RuntimeDyld.h
projects/counters/contrib/llvm/include/llvm/Function.h
projects/counters/contrib/llvm/include/llvm/GlobalAlias.h
projects/counters/contrib/llvm/include/llvm/GlobalValue.h
projects/counters/contrib/llvm/include/llvm/GlobalVariable.h
projects/counters/contrib/llvm/include/llvm/IRBuilder.h
projects/counters/contrib/llvm/include/llvm/InitializePasses.h
projects/counters/contrib/llvm/include/llvm/InlineAsm.h
projects/counters/contrib/llvm/include/llvm/InstrTypes.h
projects/counters/contrib/llvm/include/llvm/Instruction.h
projects/counters/contrib/llvm/include/llvm/Instructions.h
projects/counters/contrib/llvm/include/llvm/IntrinsicInst.h
projects/counters/contrib/llvm/include/llvm/Intrinsics.h
projects/counters/contrib/llvm/include/llvm/Intrinsics.td
projects/counters/contrib/llvm/include/llvm/IntrinsicsARM.td
projects/counters/contrib/llvm/include/llvm/IntrinsicsMips.td
projects/counters/contrib/llvm/include/llvm/IntrinsicsX86.td
projects/counters/contrib/llvm/include/llvm/LLVMContext.h
projects/counters/contrib/llvm/include/llvm/LinkAllPasses.h
projects/counters/contrib/llvm/include/llvm/MC/MCAsmBackend.h
projects/counters/contrib/llvm/include/llvm/MC/MCAsmInfo.h
projects/counters/contrib/llvm/include/llvm/MC/MCAssembler.h
projects/counters/contrib/llvm/include/llvm/MC/MCCodeEmitter.h
projects/counters/contrib/llvm/include/llvm/MC/MCContext.h
projects/counters/contrib/llvm/include/llvm/MC/MCDwarf.h
projects/counters/contrib/llvm/include/llvm/MC/MCELFObjectWriter.h
projects/counters/contrib/llvm/include/llvm/MC/MCExpr.h
projects/counters/contrib/llvm/include/llvm/MC/MCInst.h
projects/counters/contrib/llvm/include/llvm/MC/MCInstPrinter.h
projects/counters/contrib/llvm/include/llvm/MC/MCInstrDesc.h
projects/counters/contrib/llvm/include/llvm/MC/MCLabel.h
projects/counters/contrib/llvm/include/llvm/MC/MCMachObjectWriter.h
projects/counters/contrib/llvm/include/llvm/MC/MCObjectFileInfo.h
projects/counters/contrib/llvm/include/llvm/MC/MCObjectStreamer.h
projects/counters/contrib/llvm/include/llvm/MC/MCObjectWriter.h
projects/counters/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h
projects/counters/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h
projects/counters/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h
projects/counters/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h
projects/counters/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h
projects/counters/contrib/llvm/include/llvm/MC/MCRegisterInfo.h
projects/counters/contrib/llvm/include/llvm/MC/MCSchedule.h
projects/counters/contrib/llvm/include/llvm/MC/MCSection.h
projects/counters/contrib/llvm/include/llvm/MC/MCSectionCOFF.h
projects/counters/contrib/llvm/include/llvm/MC/MCSectionELF.h
projects/counters/contrib/llvm/include/llvm/MC/MCSectionMachO.h
projects/counters/contrib/llvm/include/llvm/MC/MCStreamer.h
projects/counters/contrib/llvm/include/llvm/MC/MCSubtargetInfo.h
projects/counters/contrib/llvm/include/llvm/MC/MCSymbol.h
projects/counters/contrib/llvm/include/llvm/MC/MCTargetAsmLexer.h
projects/counters/contrib/llvm/include/llvm/MC/MCTargetAsmParser.h
projects/counters/contrib/llvm/include/llvm/MC/MCValue.h
projects/counters/contrib/llvm/include/llvm/MC/SubtargetFeature.h
projects/counters/contrib/llvm/include/llvm/MDBuilder.h
projects/counters/contrib/llvm/include/llvm/Metadata.h
projects/counters/contrib/llvm/include/llvm/Object/Archive.h
projects/counters/contrib/llvm/include/llvm/Object/Binary.h
projects/counters/contrib/llvm/include/llvm/Object/COFF.h
projects/counters/contrib/llvm/include/llvm/Object/ELF.h
projects/counters/contrib/llvm/include/llvm/Object/MachO.h
projects/counters/contrib/llvm/include/llvm/Object/MachOFormat.h
projects/counters/contrib/llvm/include/llvm/Object/ObjectFile.h
projects/counters/contrib/llvm/include/llvm/Operator.h
projects/counters/contrib/llvm/include/llvm/Pass.h
projects/counters/contrib/llvm/include/llvm/PassAnalysisSupport.h
projects/counters/contrib/llvm/include/llvm/PassSupport.h
projects/counters/contrib/llvm/include/llvm/Support/AlignOf.h
projects/counters/contrib/llvm/include/llvm/Support/Allocator.h
projects/counters/contrib/llvm/include/llvm/Support/CallSite.h
projects/counters/contrib/llvm/include/llvm/Support/Casting.h
projects/counters/contrib/llvm/include/llvm/Support/CommandLine.h
projects/counters/contrib/llvm/include/llvm/Support/Compiler.h
projects/counters/contrib/llvm/include/llvm/Support/DataExtractor.h
projects/counters/contrib/llvm/include/llvm/Support/ELF.h
projects/counters/contrib/llvm/include/llvm/Support/FileOutputBuffer.h
projects/counters/contrib/llvm/include/llvm/Support/FileSystem.h
projects/counters/contrib/llvm/include/llvm/Support/Format.h
projects/counters/contrib/llvm/include/llvm/Support/FormattedStream.h
projects/counters/contrib/llvm/include/llvm/Support/GCOV.h
projects/counters/contrib/llvm/include/llvm/Support/InstVisitor.h
projects/counters/contrib/llvm/include/llvm/Support/IntegersSubset.h
projects/counters/contrib/llvm/include/llvm/Support/IntegersSubsetMapping.h
projects/counters/contrib/llvm/include/llvm/Support/LEB128.h
projects/counters/contrib/llvm/include/llvm/Support/LockFileManager.h
projects/counters/contrib/llvm/include/llvm/Support/MathExtras.h
projects/counters/contrib/llvm/include/llvm/Support/Memory.h
projects/counters/contrib/llvm/include/llvm/Support/MemoryBuffer.h
projects/counters/contrib/llvm/include/llvm/Support/Mutex.h
projects/counters/contrib/llvm/include/llvm/Support/MutexGuard.h
projects/counters/contrib/llvm/include/llvm/Support/PathV1.h
projects/counters/contrib/llvm/include/llvm/Support/PathV2.h
projects/counters/contrib/llvm/include/llvm/Support/PrettyStackTrace.h
projects/counters/contrib/llvm/include/llvm/Support/Program.h
projects/counters/contrib/llvm/include/llvm/Support/RWMutex.h
projects/counters/contrib/llvm/include/llvm/Support/Regex.h
projects/counters/contrib/llvm/include/llvm/Support/Registry.h
projects/counters/contrib/llvm/include/llvm/Support/SourceMgr.h
projects/counters/contrib/llvm/include/llvm/Support/StreamableMemoryObject.h
projects/counters/contrib/llvm/include/llvm/Support/TargetFolder.h
projects/counters/contrib/llvm/include/llvm/Support/TargetRegistry.h
projects/counters/contrib/llvm/include/llvm/Support/Threading.h
projects/counters/contrib/llvm/include/llvm/Support/TimeValue.h
projects/counters/contrib/llvm/include/llvm/Support/Timer.h
projects/counters/contrib/llvm/include/llvm/Support/ValueHandle.h
projects/counters/contrib/llvm/include/llvm/Support/YAMLParser.h
projects/counters/contrib/llvm/include/llvm/Support/circular_raw_ostream.h
projects/counters/contrib/llvm/include/llvm/Support/raw_os_ostream.h
projects/counters/contrib/llvm/include/llvm/Support/raw_ostream.h
projects/counters/contrib/llvm/include/llvm/Support/system_error.h
projects/counters/contrib/llvm/include/llvm/Support/type_traits.h
projects/counters/contrib/llvm/include/llvm/SymbolTableListTraits.h
projects/counters/contrib/llvm/include/llvm/TableGen/Error.h
projects/counters/contrib/llvm/include/llvm/TableGen/Main.h
projects/counters/contrib/llvm/include/llvm/TableGen/Record.h
projects/counters/contrib/llvm/include/llvm/Target/Mangler.h
projects/counters/contrib/llvm/include/llvm/Target/Target.td
projects/counters/contrib/llvm/include/llvm/Target/TargetCallingConv.h
projects/counters/contrib/llvm/include/llvm/Target/TargetInstrInfo.h
projects/counters/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h
projects/counters/contrib/llvm/include/llvm/Target/TargetLibraryInfo.h
projects/counters/contrib/llvm/include/llvm/Target/TargetLowering.h
projects/counters/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h
projects/counters/contrib/llvm/include/llvm/Target/TargetMachine.h
projects/counters/contrib/llvm/include/llvm/Target/TargetOpcodes.h
projects/counters/contrib/llvm/include/llvm/Target/TargetOptions.h
projects/counters/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h
projects/counters/contrib/llvm/include/llvm/Target/TargetSchedule.td
projects/counters/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td
projects/counters/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h
projects/counters/contrib/llvm/include/llvm/Target/TargetSubtargetInfo.h
projects/counters/contrib/llvm/include/llvm/Transforms/IPO.h
projects/counters/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h
projects/counters/contrib/llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h
projects/counters/contrib/llvm/include/llvm/Transforms/Instrumentation.h
projects/counters/contrib/llvm/include/llvm/Transforms/Scalar.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/Local.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/SimplifyIndVar.h
projects/counters/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h
projects/counters/contrib/llvm/include/llvm/Transforms/Vectorize.h
projects/counters/contrib/llvm/include/llvm/Type.h
projects/counters/contrib/llvm/include/llvm/Use.h
projects/counters/contrib/llvm/include/llvm/User.h
projects/counters/contrib/llvm/include/llvm/Value.h
projects/counters/contrib/llvm/lib/Analysis/AliasAnalysis.cpp
projects/counters/contrib/llvm/lib/Analysis/AliasSetTracker.cpp
projects/counters/contrib/llvm/lib/Analysis/Analysis.cpp
projects/counters/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp
projects/counters/contrib/llvm/lib/Analysis/BranchProbabilityInfo.cpp
projects/counters/contrib/llvm/lib/Analysis/CaptureTracking.cpp
projects/counters/contrib/llvm/lib/Analysis/CodeMetrics.cpp
projects/counters/contrib/llvm/lib/Analysis/ConstantFolding.cpp
projects/counters/contrib/llvm/lib/Analysis/DominanceFrontier.cpp
projects/counters/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp
projects/counters/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp
projects/counters/contrib/llvm/lib/Analysis/IVUsers.cpp
projects/counters/contrib/llvm/lib/Analysis/InlineCost.cpp
projects/counters/contrib/llvm/lib/Analysis/InstructionSimplify.cpp
projects/counters/contrib/llvm/lib/Analysis/LazyValueInfo.cpp
projects/counters/contrib/llvm/lib/Analysis/Lint.cpp
projects/counters/contrib/llvm/lib/Analysis/Loads.cpp
projects/counters/contrib/llvm/lib/Analysis/LoopInfo.cpp
projects/counters/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp
projects/counters/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
projects/counters/contrib/llvm/lib/Analysis/NoAliasAnalysis.cpp
projects/counters/contrib/llvm/lib/Analysis/PHITransAddr.cpp
projects/counters/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp
projects/counters/contrib/llvm/lib/Analysis/ProfileInfo.cpp
projects/counters/contrib/llvm/lib/Analysis/RegionInfo.cpp
projects/counters/contrib/llvm/lib/Analysis/RegionPass.cpp
projects/counters/contrib/llvm/lib/Analysis/ScalarEvolution.cpp
projects/counters/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp
projects/counters/contrib/llvm/lib/Analysis/Trace.cpp
projects/counters/contrib/llvm/lib/Analysis/ValueTracking.cpp
projects/counters/contrib/llvm/lib/Archive/ArchiveInternals.h
projects/counters/contrib/llvm/lib/Archive/ArchiveReader.cpp
projects/counters/contrib/llvm/lib/AsmParser/LLLexer.cpp
projects/counters/contrib/llvm/lib/AsmParser/LLParser.cpp
projects/counters/contrib/llvm/lib/AsmParser/LLParser.h
projects/counters/contrib/llvm/lib/AsmParser/LLToken.h
projects/counters/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
projects/counters/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h
projects/counters/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
projects/counters/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h
projects/counters/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp
projects/counters/contrib/llvm/lib/CodeGen/AllocationOrder.cpp
projects/counters/contrib/llvm/lib/CodeGen/Analysis.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/ARMException.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfAccelTable.h
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp
projects/counters/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp
projects/counters/contrib/llvm/lib/CodeGen/BranchFolding.cpp
projects/counters/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp
projects/counters/contrib/llvm/lib/CodeGen/CallingConvLower.cpp
projects/counters/contrib/llvm/lib/CodeGen/CodeGen.cpp
projects/counters/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp
projects/counters/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp
projects/counters/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp
projects/counters/contrib/llvm/lib/CodeGen/EarlyIfConversion.cpp
projects/counters/contrib/llvm/lib/CodeGen/ExecutionDepsFix.cpp
projects/counters/contrib/llvm/lib/CodeGen/ExpandPostRAPseudos.cpp
projects/counters/contrib/llvm/lib/CodeGen/GCStrategy.cpp
projects/counters/contrib/llvm/lib/CodeGen/IfConversion.cpp
projects/counters/contrib/llvm/lib/CodeGen/InlineSpiller.cpp
projects/counters/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveDebugVariables.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveInterval.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveIntervalUnion.h
projects/counters/contrib/llvm/lib/CodeGen/LiveRangeCalc.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveRangeEdit.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveRegMatrix.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveRegMatrix.h
projects/counters/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp
projects/counters/contrib/llvm/lib/CodeGen/LiveVariables.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineBlockPlacement.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineCSE.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineCopyPropagation.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineFunction.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineInstr.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineInstrBundle.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineLICM.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineScheduler.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineSink.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineTraceMetrics.cpp
projects/counters/contrib/llvm/lib/CodeGen/MachineTraceMetrics.h
projects/counters/contrib/llvm/lib/CodeGen/MachineVerifier.cpp
projects/counters/contrib/llvm/lib/CodeGen/Passes.cpp
projects/counters/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp
projects/counters/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp
projects/counters/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp
projects/counters/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegAllocBasic.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegAllocFast.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegAllocGreedy.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegisterClassInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegisterCoalescer.h
projects/counters/contrib/llvm/lib/CodeGen/RegisterPressure.cpp
projects/counters/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp
projects/counters/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp
projects/counters/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp
projects/counters/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp
projects/counters/contrib/llvm/lib/CodeGen/ScoreboardHazardRecognizer.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeOrdering.h
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
projects/counters/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp
projects/counters/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp
projects/counters/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp
projects/counters/contrib/llvm/lib/CodeGen/SlotIndexes.cpp
projects/counters/contrib/llvm/lib/CodeGen/SplitKit.cpp
projects/counters/contrib/llvm/lib/CodeGen/StackProtector.cpp
projects/counters/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp
projects/counters/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp
projects/counters/contrib/llvm/lib/CodeGen/TailDuplication.cpp
projects/counters/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp
projects/counters/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
projects/counters/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
projects/counters/contrib/llvm/lib/CodeGen/VirtRegMap.cpp
projects/counters/contrib/llvm/lib/CodeGen/VirtRegMap.h
projects/counters/contrib/llvm/lib/DebugInfo/DIContext.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFCompileUnit.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFCompileUnit.h
projects/counters/contrib/llvm/lib/DebugInfo/DWARFContext.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFContext.h
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugAranges.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugInfoEntry.h
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugLine.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFDebugLine.h
projects/counters/contrib/llvm/lib/DebugInfo/DWARFFormValue.cpp
projects/counters/contrib/llvm/lib/DebugInfo/DWARFFormValue.h
projects/counters/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
projects/counters/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h
projects/counters/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/MCJIT/MCJIT.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/GDBRegistrar.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/JITRegistrar.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
projects/counters/contrib/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
projects/counters/contrib/llvm/lib/ExecutionEngine/TargetSelect.cpp
projects/counters/contrib/llvm/lib/MC/ELFObjectWriter.cpp
projects/counters/contrib/llvm/lib/MC/MCAsmBackend.cpp
projects/counters/contrib/llvm/lib/MC/MCAsmInfo.cpp
projects/counters/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp
projects/counters/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp
projects/counters/contrib/llvm/lib/MC/MCAsmStreamer.cpp
projects/counters/contrib/llvm/lib/MC/MCAssembler.cpp
projects/counters/contrib/llvm/lib/MC/MCContext.cpp
projects/counters/contrib/llvm/lib/MC/MCDisassembler/Disassembler.cpp
projects/counters/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp
projects/counters/contrib/llvm/lib/MC/MCDwarf.cpp
projects/counters/contrib/llvm/lib/MC/MCELFObjectTargetWriter.cpp
projects/counters/contrib/llvm/lib/MC/MCELFStreamer.cpp
projects/counters/contrib/llvm/lib/MC/MCExpr.cpp
projects/counters/contrib/llvm/lib/MC/MCInst.cpp
projects/counters/contrib/llvm/lib/MC/MCInstPrinter.cpp
projects/counters/contrib/llvm/lib/MC/MCLabel.cpp
projects/counters/contrib/llvm/lib/MC/MCMachOStreamer.cpp
projects/counters/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
projects/counters/contrib/llvm/lib/MC/MCObjectStreamer.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/AsmParser.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp
projects/counters/contrib/llvm/lib/MC/MCParser/MCTargetAsmParser.cpp
projects/counters/contrib/llvm/lib/MC/MCRegisterInfo.cpp
projects/counters/contrib/llvm/lib/MC/MCStreamer.cpp
projects/counters/contrib/llvm/lib/MC/MCSubtargetInfo.cpp
projects/counters/contrib/llvm/lib/MC/MCSymbol.cpp
projects/counters/contrib/llvm/lib/MC/MCValue.cpp
projects/counters/contrib/llvm/lib/MC/MachObjectWriter.cpp
projects/counters/contrib/llvm/lib/MC/SubtargetFeature.cpp
projects/counters/contrib/llvm/lib/MC/WinCOFFStreamer.cpp
projects/counters/contrib/llvm/lib/Object/COFFObjectFile.cpp
projects/counters/contrib/llvm/lib/Object/MachOObjectFile.cpp
projects/counters/contrib/llvm/lib/Support/APFloat.cpp
projects/counters/contrib/llvm/lib/Support/Atomic.cpp
projects/counters/contrib/llvm/lib/Support/CommandLine.cpp
projects/counters/contrib/llvm/lib/Support/DAGDeltaAlgorithm.cpp
projects/counters/contrib/llvm/lib/Support/DataExtractor.cpp
projects/counters/contrib/llvm/lib/Support/DataStream.cpp
projects/counters/contrib/llvm/lib/Support/DynamicLibrary.cpp
projects/counters/contrib/llvm/lib/Support/Errno.cpp
projects/counters/contrib/llvm/lib/Support/FoldingSet.cpp
projects/counters/contrib/llvm/lib/Support/Host.cpp
projects/counters/contrib/llvm/lib/Support/LockFileManager.cpp
projects/counters/contrib/llvm/lib/Support/Memory.cpp
projects/counters/contrib/llvm/lib/Support/MemoryBuffer.cpp
projects/counters/contrib/llvm/lib/Support/SmallVector.cpp
projects/counters/contrib/llvm/lib/Support/StreamableMemoryObject.cpp
projects/counters/contrib/llvm/lib/Support/StringMap.cpp
projects/counters/contrib/llvm/lib/Support/StringRef.cpp
projects/counters/contrib/llvm/lib/Support/Triple.cpp
projects/counters/contrib/llvm/lib/Support/Unix/Memory.inc
projects/counters/contrib/llvm/lib/Support/Unix/Path.inc
projects/counters/contrib/llvm/lib/Support/Unix/Signals.inc
projects/counters/contrib/llvm/lib/Support/Windows/Memory.inc
projects/counters/contrib/llvm/lib/Support/Windows/PathV2.inc
projects/counters/contrib/llvm/lib/Support/YAMLParser.cpp
projects/counters/contrib/llvm/lib/Support/raw_ostream.cpp
projects/counters/contrib/llvm/lib/Support/regexec.c
projects/counters/contrib/llvm/lib/Support/system_error.cpp
projects/counters/contrib/llvm/lib/TableGen/Error.cpp
projects/counters/contrib/llvm/lib/TableGen/Main.cpp
projects/counters/contrib/llvm/lib/TableGen/Record.cpp
projects/counters/contrib/llvm/lib/TableGen/TGParser.cpp
projects/counters/contrib/llvm/lib/TableGen/TGParser.h
projects/counters/contrib/llvm/lib/Target/ARM/ARM.h
projects/counters/contrib/llvm/lib/Target/ARM/ARM.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMCallingConv.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMHazardRecognizer.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMISelLowering.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMSchedule.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td
projects/counters/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMSubtarget.h
projects/counters/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h
projects/counters/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
projects/counters/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
projects/counters/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.h
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCExpr.h
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/ARM/MLxExpansionPass.cpp
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUSubtarget.h
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/CellSPU/SPUTargetMachine.h
projects/counters/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp
projects/counters/contrib/llvm/lib/Target/CppBackend/CPPTargetMachine.h
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonCallingConvLower.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonInstrFormats.td
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonInstrInfo.td
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonPeephole.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonRegisterInfo.h
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonRemoveSZExtArgs.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonSchedule.td
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonScheduleV4.td
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonSubtarget.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonTargetMachine.h
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonTargetObjectFile.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
projects/counters/contrib/llvm/lib/Target/Hexagon/HexagonVarargsCallingConvention.h
projects/counters/contrib/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/AsmParser/MBlazeAsmParser.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeTargetMachine.h
projects/counters/contrib/llvm/lib/Target/MBlaze/MBlazeTargetObjectFile.cpp
projects/counters/contrib/llvm/lib/Target/MBlaze/MCTargetDesc/MBlazeMCCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430FrameLowering.h
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/MSP430/MSP430TargetMachine.h
projects/counters/contrib/llvm/lib/Target/Mangler.cpp
projects/counters/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
projects/counters/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsBaseInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/Mips/Mips.td
projects/counters/contrib/llvm/lib/Target/Mips/Mips16FrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/Mips/Mips16FrameLowering.h
projects/counters/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/Mips16InstrInfo.td
projects/counters/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/Mips16RegisterInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsAnalyzeImmediate.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsCallingConv.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsFrameLowering.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsMCInstLower.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsMCInstLower.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsMachineFunction.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsMachineFunction.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.td
projects/counters/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsSEInstrInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsSERegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsSERegisterInfo.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsSubtarget.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/Mips/MipsTargetMachine.h
projects/counters/contrib/llvm/lib/Target/Mips/MipsTargetObjectFile.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTX.td
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXAllocaHoisting.h
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXISelLowering.h
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXSubtarget.h
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
projects/counters/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPC.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCCallingConv.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCInstrFormats.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCSchedule.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCSchedule440.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleA2.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleG3.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleG4Plus.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCScheduleG5.td
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/PowerPC/PPCTargetMachine.h
projects/counters/contrib/llvm/lib/Target/Sparc/SparcFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td
projects/counters/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/Sparc/SparcTargetMachine.h
projects/counters/contrib/llvm/lib/Target/Target.cpp
projects/counters/contrib/llvm/lib/Target/TargetLibraryInfo.cpp
projects/counters/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp
projects/counters/contrib/llvm/lib/Target/TargetMachineC.cpp
projects/counters/contrib/llvm/lib/Target/TargetRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp
projects/counters/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
projects/counters/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
projects/counters/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.h
projects/counters/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
projects/counters/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoder.h
projects/counters/contrib/llvm/lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h
projects/counters/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
projects/counters/contrib/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h
projects/counters/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp
projects/counters/contrib/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
projects/counters/contrib/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86.td
projects/counters/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86AsmPrinter.h
projects/counters/contrib/llvm/lib/Target/X86/X86COFFMachineModuleInfo.h
projects/counters/contrib/llvm/lib/Target/X86/X86CallingConv.td
projects/counters/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86FastISel.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86ISelLowering.h
projects/counters/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrControl.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrFMA.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrFormats.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86InstrInfo.h
projects/counters/contrib/llvm/lib/Target/X86/X86InstrInfo.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrMMX.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrSSE.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrShiftRotate.td
projects/counters/contrib/llvm/lib/Target/X86/X86InstrXOP.td
projects/counters/contrib/llvm/lib/Target/X86/X86JITInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86MCInstLower.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86RegisterInfo.h
projects/counters/contrib/llvm/lib/Target/X86/X86RegisterInfo.td
projects/counters/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86Subtarget.h
projects/counters/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/X86/X86TargetMachine.h
projects/counters/contrib/llvm/lib/Target/X86/X86VZeroUpper.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreAsmPrinter.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreFrameLowering.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td
projects/counters/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.cpp
projects/counters/contrib/llvm/lib/Target/XCore/XCoreTargetMachine.h
projects/counters/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/ExtractGV.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/FunctionAttrs.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/IPO.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/InlineAlways.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/InlineSimple.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/Inliner.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/Internalize.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
projects/counters/contrib/llvm/lib/Transforms/IPO/PruneEH.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstCombineWorklist.h
projects/counters/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/BoundsChecking.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/MaximumSpanningTree.h
projects/counters/contrib/llvm/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/ConstantProp.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/DCE.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/GlobalMerge.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LICM.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopInstSimplify.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/ObjCARC.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/Scalar.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
projects/counters/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/CodeExtractor.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/Local.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/SSAUpdater.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/SimplifyInstructions.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/Utils.cpp
projects/counters/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp
projects/counters/contrib/llvm/lib/Transforms/Vectorize/BBVectorize.cpp
projects/counters/contrib/llvm/lib/Transforms/Vectorize/Vectorize.cpp
projects/counters/contrib/llvm/lib/VMCore/AsmWriter.cpp
projects/counters/contrib/llvm/lib/VMCore/Attributes.cpp
projects/counters/contrib/llvm/lib/VMCore/AutoUpgrade.cpp
projects/counters/contrib/llvm/lib/VMCore/ConstantFold.cpp
projects/counters/contrib/llvm/lib/VMCore/Constants.cpp
projects/counters/contrib/llvm/lib/VMCore/ConstantsContext.h
projects/counters/contrib/llvm/lib/VMCore/Core.cpp
projects/counters/contrib/llvm/lib/VMCore/DIBuilder.cpp
projects/counters/contrib/llvm/lib/VMCore/DebugInfo.cpp
projects/counters/contrib/llvm/lib/VMCore/Dominators.cpp
projects/counters/contrib/llvm/lib/VMCore/Function.cpp
projects/counters/contrib/llvm/lib/VMCore/GCOV.cpp
projects/counters/contrib/llvm/lib/VMCore/IRBuilder.cpp
projects/counters/contrib/llvm/lib/VMCore/InlineAsm.cpp
projects/counters/contrib/llvm/lib/VMCore/Instructions.cpp
projects/counters/contrib/llvm/lib/VMCore/LLVMContext.cpp
projects/counters/contrib/llvm/lib/VMCore/LLVMContextImpl.cpp
projects/counters/contrib/llvm/lib/VMCore/LLVMContextImpl.h
projects/counters/contrib/llvm/lib/VMCore/PassManager.cpp
projects/counters/contrib/llvm/lib/VMCore/Type.cpp
projects/counters/contrib/llvm/lib/VMCore/User.cpp
projects/counters/contrib/llvm/lib/VMCore/Value.cpp
projects/counters/contrib/llvm/lib/VMCore/ValueTypes.cpp
projects/counters/contrib/llvm/lib/VMCore/Verifier.cpp
projects/counters/contrib/llvm/tools/bugpoint/ExtractFunction.cpp
projects/counters/contrib/llvm/tools/bugpoint/OptimizerDriver.cpp
projects/counters/contrib/llvm/tools/clang/include/clang-c/Index.h
projects/counters/contrib/llvm/tools/clang/include/clang/ARCMigrate/ARCMT.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ASTConsumer.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ASTMutationListener.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Attr.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/BuiltinTypes.def
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CXXInheritance.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CharUnits.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Comment.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentBriefParser.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentCommandTraits.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentLexer.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentParser.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/CommentSema.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Decl.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/DeclarationName.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Expr.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ExprObjC.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/NSAPI.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/NestedNameSpecifier.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/OperationKinds.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/PrettyPrinter.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/RawCommentList.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/RecordLayout.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/SelectorLocationsKind.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Stmt.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/StmtObjC.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/Type.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/UnresolvedSet.h
projects/counters/contrib/llvm/tools/clang/include/clang/AST/VTableBuilder.h
projects/counters/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchFinder.h
projects/counters/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchers.h
projects/counters/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersInternal.h
projects/counters/contrib/llvm/tools/clang/include/clang/ASTMatchers/ASTMatchersMacros.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/FormatString.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/ThreadSafety.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/AnalysisContext.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/CFG.h
projects/counters/contrib/llvm/tools/clang/include/clang/Analysis/ProgramPoint.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Attr.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsMips.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsNVPTX.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/ConvertUTF.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticASTKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommentKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSerializationKinds.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Module.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/ObjCRuntime.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/OnDiskHashTable.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/SourceManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/TargetOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.def
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/TokenKinds.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/TypeTraits.h
projects/counters/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td
projects/counters/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Action.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Arg.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/CC1AsOptions.td
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Driver.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Job.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/OptParser.td
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Option.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Options.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Options.td
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Tool.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
projects/counters/contrib/llvm/tools/clang/include/clang/Driver/Types.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/ASTUnit.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticRenderer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/LangStandard.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/LangStandards.def
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/LogDiagnosticPrinter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/MultiplexConsumer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/SerializedDiagnosticPrinter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnostic.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Frontend/VerifyDiagnosticConsumer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/ExternalPreprocessorSource.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/HeaderMap.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/HeaderSearch.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/Lexer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/LiteralSupport.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/MacroInfo.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/ModuleMap.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PTHLexer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PTHManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PreprocessingRecord.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/PreprocessorLexer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/Token.h
projects/counters/contrib/llvm/tools/clang/include/clang/Lex/TokenLexer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Parse/Parser.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/AttributeList.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/DeclSpec.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/DelayedDiagnostic.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Initialization.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/LocInfoType.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Overload.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Ownership.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/ParsedTemplate.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Scope.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/ScopeInfo.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Sema.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/SemaConsumer.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/Template.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/TemplateDeduction.h
projects/counters/contrib/llvm/tools/clang/include/clang/Sema/TypoCorrection.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ASTDeserializationListener.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ASTReader.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ASTWriter.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ContinuousRangeMap.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/Module.h
projects/counters/contrib/llvm/tools/clang/include/clang/Serialization/ModuleManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Checker.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/CheckerManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/CompilationDatabase.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/Refactoring.h
projects/counters/contrib/llvm/tools/clang/include/clang/Tooling/Tooling.h
projects/counters/contrib/llvm/tools/clang/lib/ARCMigrate/ARCMT.cpp
projects/counters/contrib/llvm/tools/clang/lib/ARCMigrate/FileRemapper.cpp
projects/counters/contrib/llvm/tools/clang/lib/ARCMigrate/Internals.h
projects/counters/contrib/llvm/tools/clang/lib/ARCMigrate/ObjCMT.cpp
projects/counters/contrib/llvm/tools/clang/lib/ARCMigrate/Transforms.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ASTConsumer.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ASTDiagnostic.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/Comment.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentBriefParser.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentCommandTraits.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentDumper.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentLexer.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentParser.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/CommentSema.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/Decl.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/Expr.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ItaniumMangle.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/NSAPI.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/ParentMap.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/RawCommentList.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/Stmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/StmtDumper.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/Type.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/TypeLoc.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/AST/VTableBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchFinder.cpp
projects/counters/contrib/llvm/tools/clang/lib/ASTMatchers/ASTMatchersInternal.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/AnalysisDeclContext.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/FormatString.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/ReachableCode.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/ScanfFormatString.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/ThreadSafety.cpp
projects/counters/contrib/llvm/tools/clang/lib/Analysis/UninitializedValues.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/ConvertUTF.c
projects/counters/contrib/llvm/tools/clang/lib/Basic/ConvertUTFWrapper.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/DiagnosticIDs.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/IdentifierTable.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/Module.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/SourceLocation.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/SourceManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
projects/counters/contrib/llvm/tools/clang/lib/Basic/Version.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayout.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTBAA.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/Arg.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/CC1AsOptions.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/DriverOptions.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/OptTable.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/Option.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
projects/counters/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/Tools.h
projects/counters/contrib/llvm/tools/clang/lib/Driver/Types.cpp
projects/counters/contrib/llvm/tools/clang/lib/Driver/WindowsToolChain.cpp
projects/counters/contrib/llvm/tools/clang/lib/Edit/RewriteObjCFoundationAPI.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/ChainedDiagnosticConsumer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/ChainedIncludesSource.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/CreateInvocationFromCommandLine.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/DependencyFile.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/DependencyGraph.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/DiagnosticRenderer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/LogDiagnosticPrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/SerializedDiagnosticPrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/TextDiagnostic.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/VerifyDiagnosticConsumer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp
projects/counters/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
projects/counters/contrib/llvm/tools/clang/lib/Headers/altivec.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/bmi2intrin.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/cpuid.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/immintrin.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/module.map
projects/counters/contrib/llvm/tools/clang/lib/Headers/unwind.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/wmmintrin.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/x86intrin.h
projects/counters/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h
projects/counters/contrib/llvm/tools/clang/lib/Lex/HeaderMap.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/HeaderSearch.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/MacroArgs.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/MacroInfo.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/ModuleMap.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PPDirectives.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PPExpressions.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PTHLexer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/PreprocessingRecord.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp
projects/counters/contrib/llvm/tools/clang/lib/Lex/TokenLexer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseAST.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/ParseTentative.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/Parser.cpp
projects/counters/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h
projects/counters/contrib/llvm/tools/clang/lib/Sema/AnalysisBasedWarnings.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/CodeCompleteConsumer.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/DeclSpec.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/DelayedDiagnostic.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/IdentifierResolver.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/JumpDiagnostics.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaAccess.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaAttr.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaCast.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaCodeComplete.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaDeclObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaExceptionSpec.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaExprMember.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaExprObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaOverload.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaPseudoObject.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaStmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaStmtAttr.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaTemplateDeduction.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaTemplateVariadic.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp
projects/counters/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTCommon.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTReader.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/GeneratePCH.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/Module.cpp
projects/counters/contrib/llvm/tools/clang/lib/Serialization/ModuleManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/AttrNonNullChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/CheckerDocumentation.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/Checkers.td
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DebugCheckers.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/DynamicTypePropagation.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ExprInspectionChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCContainersChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/TaintTesterChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/AnalysisManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BasicValueFactory.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CallEvent.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerContext.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CheckerManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/CoreEngine.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Environment.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExplodedGraph.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngine.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineC.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ExprEngineObjC.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/MemRegion.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/ProgramState.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SVals.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleConstraintManager.h
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/Store.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/SymbolManager.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/TextPathDiagnostics.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.h
projects/counters/contrib/llvm/tools/clang/lib/StaticAnalyzer/Frontend/CheckerRegistration.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/CompilationDatabase.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/Refactoring.cpp
projects/counters/contrib/llvm/tools/clang/lib/Tooling/Tooling.cpp
projects/counters/contrib/llvm/tools/clang/tools/driver/cc1_main.cpp
projects/counters/contrib/llvm/tools/clang/tools/driver/cc1as_main.cpp
projects/counters/contrib/llvm/tools/clang/tools/driver/driver.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/ClangAttrEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/ClangSACheckersEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/NeonEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/OptParserEmitter.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/TableGen.cpp
projects/counters/contrib/llvm/tools/clang/utils/TableGen/TableGenBackends.h
projects/counters/contrib/llvm/tools/llc/llc.cpp
projects/counters/contrib/llvm/tools/lli/lli.cpp
projects/counters/contrib/llvm/tools/llvm-ar/llvm-ar.cpp
projects/counters/contrib/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
projects/counters/contrib/llvm/tools/llvm-extract/llvm-extract.cpp
projects/counters/contrib/llvm/tools/llvm-mc/llvm-mc.cpp
projects/counters/contrib/llvm/tools/llvm-nm/llvm-nm.cpp
projects/counters/contrib/llvm/tools/llvm-objdump/llvm-objdump.cpp
projects/counters/contrib/llvm/tools/llvm-ranlib/llvm-ranlib.cpp
projects/counters/contrib/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
projects/counters/contrib/llvm/tools/llvm-stress/llvm-stress.cpp
projects/counters/contrib/llvm/tools/opt/opt.cpp
projects/counters/contrib/llvm/utils/TableGen/AsmMatcherEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/AsmWriterEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/AsmWriterInst.cpp
projects/counters/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeEmitterGen.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenDAGPatterns.h
projects/counters/contrib/llvm/utils/TableGen/CodeGenInstruction.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenInstruction.h
projects/counters/contrib/llvm/utils/TableGen/CodeGenRegisters.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenRegisters.h
projects/counters/contrib/llvm/utils/TableGen/CodeGenSchedule.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenSchedule.h
projects/counters/contrib/llvm/utils/TableGen/CodeGenTarget.cpp
projects/counters/contrib/llvm/utils/TableGen/CodeGenTarget.h
projects/counters/contrib/llvm/utils/TableGen/DAGISelMatcher.h
projects/counters/contrib/llvm/utils/TableGen/DAGISelMatcherEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/DAGISelMatcherGen.cpp
projects/counters/contrib/llvm/utils/TableGen/DFAPacketizerEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/DisassemblerEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/EDEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/FastISelEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/InstrInfoEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/IntrinsicEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/PseudoLoweringEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/RegisterInfoEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/SequenceToOffsetTable.h
projects/counters/contrib/llvm/utils/TableGen/SetTheory.cpp
projects/counters/contrib/llvm/utils/TableGen/SetTheory.h
projects/counters/contrib/llvm/utils/TableGen/SubtargetEmitter.cpp
projects/counters/contrib/llvm/utils/TableGen/TGValueTypes.cpp
projects/counters/contrib/llvm/utils/TableGen/TableGen.cpp
projects/counters/contrib/llvm/utils/TableGen/TableGenBackends.h
projects/counters/contrib/llvm/utils/TableGen/X86DisassemblerTables.cpp
projects/counters/contrib/llvm/utils/TableGen/X86ModRMFilters.h
projects/counters/contrib/llvm/utils/TableGen/X86RecognizableInstr.cpp
projects/counters/contrib/llvm/utils/TableGen/X86RecognizableInstr.h
projects/counters/contrib/ntp/arlib/Makefile.in
projects/counters/contrib/ntp/libntp/Makefile.in
projects/counters/contrib/ntp/libparse/Makefile.in
projects/counters/contrib/ntp/ntpd/Makefile.in
projects/counters/contrib/openbsm/CREDITS
projects/counters/contrib/openbsm/INSTALL
projects/counters/contrib/openbsm/LICENSE
projects/counters/contrib/openbsm/Makefile.am
projects/counters/contrib/openbsm/Makefile.in
projects/counters/contrib/openbsm/NEWS
projects/counters/contrib/openbsm/README
projects/counters/contrib/openbsm/TODO
projects/counters/contrib/openbsm/VERSION
projects/counters/contrib/openbsm/aclocal.m4
projects/counters/contrib/openbsm/autogen.sh
projects/counters/contrib/openbsm/bin/Makefile.am
projects/counters/contrib/openbsm/bin/Makefile.in
projects/counters/contrib/openbsm/bin/audit/Makefile.am
projects/counters/contrib/openbsm/bin/audit/Makefile.in
projects/counters/contrib/openbsm/bin/audit/audit.8
projects/counters/contrib/openbsm/bin/auditd/Makefile.am
projects/counters/contrib/openbsm/bin/auditd/Makefile.in
projects/counters/contrib/openbsm/bin/auditd/auditd.8
projects/counters/contrib/openbsm/bin/auditd/auditd.c
projects/counters/contrib/openbsm/bin/auditfilterd/Makefile.am
projects/counters/contrib/openbsm/bin/auditfilterd/Makefile.in
projects/counters/contrib/openbsm/bin/auditreduce/Makefile.am
projects/counters/contrib/openbsm/bin/auditreduce/Makefile.in
projects/counters/contrib/openbsm/bin/auditreduce/auditreduce.1
projects/counters/contrib/openbsm/bin/praudit/Makefile.am
projects/counters/contrib/openbsm/bin/praudit/Makefile.in
projects/counters/contrib/openbsm/bin/praudit/praudit.1
projects/counters/contrib/openbsm/bin/praudit/praudit.c
projects/counters/contrib/openbsm/bsm/Makefile.am
projects/counters/contrib/openbsm/bsm/Makefile.in
projects/counters/contrib/openbsm/bsm/auditd_lib.h
projects/counters/contrib/openbsm/bsm/libbsm.h
projects/counters/contrib/openbsm/compat/endian.h
projects/counters/contrib/openbsm/config/config.h
projects/counters/contrib/openbsm/config/config.h.in
projects/counters/contrib/openbsm/config/ltmain.sh
projects/counters/contrib/openbsm/configure
projects/counters/contrib/openbsm/configure.ac
projects/counters/contrib/openbsm/etc/audit_control
projects/counters/contrib/openbsm/etc/audit_event
projects/counters/contrib/openbsm/libauditd/Makefile.am
projects/counters/contrib/openbsm/libauditd/Makefile.in
projects/counters/contrib/openbsm/libauditd/auditd_lib.c
projects/counters/contrib/openbsm/libbsm/Makefile.am
projects/counters/contrib/openbsm/libbsm/Makefile.in
projects/counters/contrib/openbsm/libbsm/au_control.3
projects/counters/contrib/openbsm/libbsm/au_fcntl_cmd.3
projects/counters/contrib/openbsm/libbsm/au_io.3
projects/counters/contrib/openbsm/libbsm/audit_submit.3
projects/counters/contrib/openbsm/libbsm/bsm_audit.c
projects/counters/contrib/openbsm/libbsm/bsm_class.c
projects/counters/contrib/openbsm/libbsm/bsm_control.c
projects/counters/contrib/openbsm/libbsm/bsm_errno.c
projects/counters/contrib/openbsm/libbsm/bsm_io.c
projects/counters/contrib/openbsm/libbsm/bsm_token.c
projects/counters/contrib/openbsm/libbsm/bsm_user.c
projects/counters/contrib/openbsm/libbsm/bsm_wrappers.c
projects/counters/contrib/openbsm/man/Makefile.am
projects/counters/contrib/openbsm/man/Makefile.in
projects/counters/contrib/openbsm/man/audit.log.5
projects/counters/contrib/openbsm/man/audit_control.5
projects/counters/contrib/openbsm/man/auditon.2
projects/counters/contrib/openbsm/man/getaudit.2
projects/counters/contrib/openbsm/man/setaudit.2
projects/counters/contrib/openbsm/modules/Makefile.am
projects/counters/contrib/openbsm/modules/Makefile.in
projects/counters/contrib/openbsm/modules/auditfilter_noop/Makefile.am
projects/counters/contrib/openbsm/modules/auditfilter_noop/Makefile.in
projects/counters/contrib/openbsm/sys/Makefile.am
projects/counters/contrib/openbsm/sys/Makefile.in
projects/counters/contrib/openbsm/sys/bsm/Makefile.am
projects/counters/contrib/openbsm/sys/bsm/Makefile.in
projects/counters/contrib/openbsm/sys/bsm/audit_errno.h
projects/counters/contrib/openbsm/sys/bsm/audit_internal.h
projects/counters/contrib/openbsm/sys/bsm/audit_kevents.h
projects/counters/contrib/openbsm/sys/bsm/audit_record.h
projects/counters/contrib/openbsm/test/Makefile.am
projects/counters/contrib/openbsm/test/Makefile.in
projects/counters/contrib/openbsm/test/bsm/Makefile.am
projects/counters/contrib/openbsm/test/bsm/Makefile.in
projects/counters/contrib/openbsm/tools/Makefile.am
projects/counters/contrib/openbsm/tools/Makefile.in
projects/counters/contrib/opie/libmissing/Makefile.in
projects/counters/contrib/opie/libopie/Makefile.in
projects/counters/contrib/tcp_wrappers/Makefile
projects/counters/contrib/tcpdump/Makefile.in
projects/counters/contrib/top/top.h
projects/counters/crypto/heimdal/appl/ftp/common/Makefile.in
projects/counters/crypto/heimdal/appl/telnet/libtelnet/Makefile.in
projects/counters/crypto/openssl/Makefile.org
projects/counters/crypto/openssl/crypto/Makefile
projects/counters/crypto/openssl/crypto/rand/rand_unix.c
projects/counters/etc/defaults/rc.conf
projects/counters/etc/devd/usb.conf
projects/counters/etc/ftpusers
projects/counters/etc/login.conf
projects/counters/etc/mail/aliases
projects/counters/etc/master.passwd
projects/counters/etc/mtree/BSD.var.dist
projects/counters/etc/periodic/daily/Makefile
projects/counters/etc/pf.os
projects/counters/etc/rc.d/Makefile
projects/counters/etc/rc.d/savecore
projects/counters/etc/rc.d/sysctl
projects/counters/etc/regdomain.xml
projects/counters/etc/root/dot.cshrc
projects/counters/games/fortune/datfiles/fortunes
projects/counters/gnu/lib/libgcc/Makefile
projects/counters/gnu/usr.bin/binutils/as/Makefile
projects/counters/gnu/usr.bin/cc/cc_tools/Makefile
projects/counters/include/Makefile
projects/counters/lib/bind/config.h
projects/counters/lib/bind/dns/Makefile
projects/counters/lib/bind/isc/isc/platform.h
projects/counters/lib/clang/Makefile
projects/counters/lib/clang/clang.build.mk
projects/counters/lib/clang/include/Makefile
projects/counters/lib/clang/include/clang/Basic/Version.inc
projects/counters/lib/clang/include/llvm/Config/config.h
projects/counters/lib/clang/libclanganalysis/Makefile
projects/counters/lib/clang/libclangast/Makefile
projects/counters/lib/clang/libclangsema/Makefile
projects/counters/lib/clang/libclangstaticanalyzercheckers/Makefile
projects/counters/lib/clang/libclangstaticanalyzercore/Makefile
projects/counters/lib/clang/libllvmanalysis/Makefile
projects/counters/lib/clang/libllvmarmcodegen/Makefile
projects/counters/lib/clang/libllvmcodegen/Makefile
projects/counters/lib/clang/libllvmcore/Makefile
projects/counters/lib/clang/libllvmdebuginfo/Makefile
projects/counters/lib/clang/libllvminstrumentation/Makefile
projects/counters/lib/clang/libllvmipo/Makefile
projects/counters/lib/clang/libllvmmcjit/Makefile
projects/counters/lib/clang/libllvmmipsasmparser/Makefile
projects/counters/lib/clang/libllvmmipscodegen/Makefile
projects/counters/lib/clang/libllvmmipsdesc/Makefile
projects/counters/lib/clang/libllvmscalaropts/Makefile
projects/counters/lib/clang/libllvmtablegen/Makefile
projects/counters/lib/clang/libllvmtarget/Makefile
projects/counters/lib/clang/libllvmtransformutils/Makefile
projects/counters/lib/clang/libllvmvectorize/Makefile
projects/counters/lib/clang/libllvmx86codegen/Makefile
projects/counters/lib/libc/gen/Makefile.inc
projects/counters/lib/libc/gen/Symbol.map
projects/counters/lib/libc/gen/fmtmsg.c
projects/counters/lib/libc/gen/fstab.c
projects/counters/lib/libc/gen/getcap.c
projects/counters/lib/libc/gen/getgrent.c
projects/counters/lib/libc/gen/getnetgrent.c
projects/counters/lib/libc/gen/getttyent.c
projects/counters/lib/libc/gen/getusershell.c
projects/counters/lib/libc/gen/getutxent.c
projects/counters/lib/libc/gen/glob.c
projects/counters/lib/libc/gen/sysctlbyname.c
projects/counters/lib/libc/iconv/citrus_mmap.c
projects/counters/lib/libc/locale/collate.c
projects/counters/lib/libc/locale/setrunelocale.c
projects/counters/lib/libc/nls/msgcat.c
projects/counters/lib/libc/stdio/fdopen.c
projects/counters/lib/libc/stdio/flags.c
projects/counters/lib/libc/stdio/fopen.3
projects/counters/lib/libc/stdio/freopen.c
projects/counters/lib/libc/stdio/getline.3
projects/counters/lib/libc/sys/bind.2
projects/counters/lib/libc/sys/socket.2
projects/counters/lib/libcompiler_rt/Makefile
projects/counters/lib/libdevstat/devstat.3
projects/counters/lib/libdevstat/devstat.c
projects/counters/lib/libdevstat/devstat.h
projects/counters/lib/libipsec/policy_parse.y
projects/counters/lib/libradius/Makefile
projects/counters/lib/libradius/libradius.3
projects/counters/lib/libradius/radius.conf.5
projects/counters/lib/libradius/radlib.c
projects/counters/lib/libradius/radlib.h
projects/counters/lib/libradius/radlib_private.h
projects/counters/lib/libradius/radlib_vs.h
projects/counters/libexec/rtld-elf/Makefile
projects/counters/release/picobsd/floppy.tree/etc/ppp/ppp.conf
projects/counters/release/picobsd/mfs_tree/etc/remote
projects/counters/sbin/comcontrol/comcontrol.8
projects/counters/sbin/devd/devd.cc
projects/counters/sbin/devd/devd.hh
projects/counters/sbin/dump/dump.h
projects/counters/sbin/growfs/growfs.c
projects/counters/sbin/ifconfig/af_inet6.c
projects/counters/sbin/mount_nfs/mount_nfs.8
projects/counters/sbin/route/route.c
projects/counters/sbin/savecore/savecore.8
projects/counters/sbin/savecore/savecore.c
projects/counters/sbin/setkey/setkey.8
projects/counters/sbin/sysctl/sysctl.8
projects/counters/sbin/sysctl/sysctl.c
projects/counters/share/examples/etc/make.conf
projects/counters/share/examples/ppp/ppp.conf.sample
projects/counters/share/examples/ppp/ppp.conf.span-isp
projects/counters/share/i18n/csmapper/Makefile.part
projects/counters/share/man/man4/arcmsr.4
projects/counters/share/man/man4/audit.4
projects/counters/share/man/man4/gdb.4
projects/counters/share/man/man4/mouse.4
projects/counters/share/man/man4/ng_netflow.4
projects/counters/share/man/man5/make.conf.5
projects/counters/share/man/man5/rc.conf.5
projects/counters/share/man/man5/remote.5
projects/counters/share/man/man7/tuning.7
projects/counters/share/man/man9/Makefile
projects/counters/share/man/man9/domain.9
projects/counters/share/man/man9/taskqueue.9
projects/counters/share/man/man9/zone.9
projects/counters/share/misc/Makefile
projects/counters/share/misc/committers-src.dot
projects/counters/share/misc/iso639
projects/counters/share/misc/organization.dot
projects/counters/share/mk/bsd.cpu.mk
projects/counters/share/mk/bsd.lib.mk
projects/counters/share/mk/bsd.prog.mk
projects/counters/share/mk/sys.mk
projects/counters/share/skel/dot.cshrc
projects/counters/share/syscons/keymaps/INDEX.keymaps
projects/counters/share/syscons/keymaps/Makefile
projects/counters/share/syscons/keymaps/spanish.dvorak.kbd
projects/counters/sys/Makefile
projects/counters/sys/amd64/amd64/db_trace.c
projects/counters/sys/amd64/amd64/fpu.c
projects/counters/sys/amd64/amd64/pmap.c
projects/counters/sys/amd64/include/fpu.h
projects/counters/sys/amd64/pci/pci_cfgreg.c
projects/counters/sys/arm/arm/busdma_machdep-v6.c
projects/counters/sys/arm/arm/busdma_machdep.c
projects/counters/sys/arm/arm/cpufunc.c
projects/counters/sys/arm/arm/elf_trampoline.c
projects/counters/sys/arm/arm/identcpu.c
projects/counters/sys/arm/arm/locore.S
projects/counters/sys/arm/arm/machdep.c
projects/counters/sys/arm/arm/pmap-v6.c
projects/counters/sys/arm/arm/pmap.c
projects/counters/sys/arm/at91/if_ate.c
projects/counters/sys/arm/at91/if_macb.c
projects/counters/sys/arm/broadcom/bcm2835/bcm2835_fb.c
projects/counters/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/counters/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/counters/sys/arm/broadcom/bcm2835/files.bcm2835
projects/counters/sys/arm/conf/PANDABOARD
projects/counters/sys/arm/conf/RPI-B
projects/counters/sys/arm/econa/if_ece.c
projects/counters/sys/arm/include/armreg.h
projects/counters/sys/arm/include/cpuconf.h
projects/counters/sys/arm/include/cpufunc.h
projects/counters/sys/arm/include/intr.h
projects/counters/sys/arm/include/pmap.h
projects/counters/sys/arm/include/vm.h
projects/counters/sys/arm/lpc/if_lpe.c
projects/counters/sys/arm/ti/cpsw/if_cpsw.c
projects/counters/sys/arm/xscale/ixp425/if_npe.c
projects/counters/sys/boot/arm/uboot/Makefile
projects/counters/sys/boot/efi/libefi/libefi.c
projects/counters/sys/boot/fdt/dts/bcm2835-rpi-b.dts
projects/counters/sys/boot/fdt/fdt_loader_cmd.c
projects/counters/sys/boot/forth/beastie.4th.8
projects/counters/sys/boot/forth/check-password.4th
projects/counters/sys/boot/forth/check-password.4th.8
projects/counters/sys/boot/forth/frames.4th
projects/counters/sys/boot/forth/loader.4th.8
projects/counters/sys/boot/forth/loader.conf.5
projects/counters/sys/boot/forth/menu-commands.4th
projects/counters/sys/boot/forth/menu.4th.8
projects/counters/sys/boot/forth/menu.rc
projects/counters/sys/boot/forth/support.4th
projects/counters/sys/boot/i386/efi/exec.c
projects/counters/sys/boot/i386/efi/ldscript.amd64
projects/counters/sys/boot/i386/efi/reloc.c
projects/counters/sys/boot/sparc64/boot1/boot1.c
projects/counters/sys/boot/uboot/common/metadata.c
projects/counters/sys/boot/userboot/userboot/conf.c
projects/counters/sys/boot/userboot/userboot/main.c
projects/counters/sys/bsm/audit_errno.h
projects/counters/sys/bsm/audit_internal.h
projects/counters/sys/bsm/audit_record.h
projects/counters/sys/cam/cam_periph.c
projects/counters/sys/cam/cam_xpt.c
projects/counters/sys/cam/ctl/ctl.c
projects/counters/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/counters/sys/cam/ctl/scsi_ctl.c
projects/counters/sys/cam/scsi/scsi_ch.c
projects/counters/sys/cam/scsi/scsi_enc.c
projects/counters/sys/cam/scsi/scsi_enc_internal.h
projects/counters/sys/cam/scsi/scsi_enc_ses.c
projects/counters/sys/cam/scsi/scsi_pass.c
projects/counters/sys/cam/scsi/scsi_sg.c
projects/counters/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
projects/counters/sys/cddl/compat/opensolaris/sys/kstat.h
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/counters/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/counters/sys/compat/linux/linux_socket.c
projects/counters/sys/compat/ndis/kern_ndis.c
projects/counters/sys/conf/Makefile.arm
projects/counters/sys/conf/files
projects/counters/sys/conf/files.arm
projects/counters/sys/conf/kern.pre.mk
projects/counters/sys/conf/options.arm
projects/counters/sys/dev/acpica/acpi_cpu.c
projects/counters/sys/dev/age/if_age.c
projects/counters/sys/dev/agp/agp_i810.c
projects/counters/sys/dev/ahci/ahci.c
projects/counters/sys/dev/aic7xxx/aicasm/aicasm_gram.y
projects/counters/sys/dev/alc/if_alc.c
projects/counters/sys/dev/ale/if_ale.c
projects/counters/sys/dev/an/if_an.c
projects/counters/sys/dev/arcmsr/arcmsr.c
projects/counters/sys/dev/arcmsr/arcmsr.h
projects/counters/sys/dev/ata/ata-pci.h
projects/counters/sys/dev/ata/chipsets/ata-ati.c
projects/counters/sys/dev/ath/ath_hal/ah.h
projects/counters/sys/dev/ath/ath_hal/ah_regdomain.c
projects/counters/sys/dev/ath/ath_hal/ar5416/ar5416.h
projects/counters/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
projects/counters/sys/dev/ath/ath_hal/ar5416/ar5416_btcoex.c
projects/counters/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
projects/counters/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
projects/counters/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c
projects/counters/sys/dev/ath/if_ath.c
projects/counters/sys/dev/ath/if_ath_beacon.c
projects/counters/sys/dev/ath/if_ath_rx.c
projects/counters/sys/dev/ath/if_ath_rx_edma.c
projects/counters/sys/dev/ath/if_ath_tx.c
projects/counters/sys/dev/ath/if_ath_tx_edma.c
projects/counters/sys/dev/ath/if_ath_tx_ht.c
projects/counters/sys/dev/ath/if_athvar.h
projects/counters/sys/dev/atkbdc/psm.c
projects/counters/sys/dev/bce/if_bce.c
projects/counters/sys/dev/bfe/if_bfe.c
projects/counters/sys/dev/bge/if_bge.c
projects/counters/sys/dev/bge/if_bgereg.h
projects/counters/sys/dev/bm/if_bm.c
projects/counters/sys/dev/bwi/if_bwi.c
projects/counters/sys/dev/bwn/if_bwn.c
projects/counters/sys/dev/bxe/if_bxe.c
projects/counters/sys/dev/cas/if_cas.c
projects/counters/sys/dev/ce/if_ce.c
projects/counters/sys/dev/cm/smc90cx6.c
projects/counters/sys/dev/cp/if_cp.c
projects/counters/sys/dev/cs/if_cs.c
projects/counters/sys/dev/ctau/if_ct.c
projects/counters/sys/dev/cx/if_cx.c
projects/counters/sys/dev/cxgb/cxgb_main.c
projects/counters/sys/dev/cxgb/cxgb_sge.c
projects/counters/sys/dev/cxgb/sys/uipc_mvec.c
projects/counters/sys/dev/cxgbe/t4_sge.c
projects/counters/sys/dev/cxgbe/tom/t4_cpl_io.c
projects/counters/sys/dev/cxgbe/tom/t4_ddp.c
projects/counters/sys/dev/cxgbe/tom/t4_listen.c
projects/counters/sys/dev/cxgbe/tom/t4_tom.h
projects/counters/sys/dev/dc/if_dc.c
projects/counters/sys/dev/de/if_de.c
projects/counters/sys/dev/e1000/if_em.c
projects/counters/sys/dev/e1000/if_igb.c
projects/counters/sys/dev/e1000/if_lem.c
projects/counters/sys/dev/ed/if_ed.c
projects/counters/sys/dev/en/midway.c
projects/counters/sys/dev/ep/if_ep.c
projects/counters/sys/dev/et/if_et.c
projects/counters/sys/dev/ex/if_ex.c
projects/counters/sys/dev/fatm/if_fatm.c
projects/counters/sys/dev/fdt/fdt_common.c
projects/counters/sys/dev/fdt/fdt_common.h
projects/counters/sys/dev/fe/if_fe.c
projects/counters/sys/dev/firewire/fwohci.c
projects/counters/sys/dev/firewire/if_fwe.c
projects/counters/sys/dev/firewire/if_fwip.c
projects/counters/sys/dev/fxp/if_fxp.c
projects/counters/sys/dev/gem/if_gem.c
projects/counters/sys/dev/gxemul/ether/if_gx.c
projects/counters/sys/dev/hatm/if_hatm_intr.c
projects/counters/sys/dev/hatm/if_hatm_tx.c
projects/counters/sys/dev/hifn/hifn7751.c
projects/counters/sys/dev/hme/if_hme.c
projects/counters/sys/dev/ie/if_ie.c
projects/counters/sys/dev/if_ndis/if_ndis.c
projects/counters/sys/dev/ipw/if_ipw.c
projects/counters/sys/dev/isci/isci_io_request.c
projects/counters/sys/dev/iwi/if_iwi.c
projects/counters/sys/dev/iwn/if_iwn.c
projects/counters/sys/dev/ixgb/if_ixgb.c
projects/counters/sys/dev/ixgbe/ixgbe.c
projects/counters/sys/dev/ixgbe/ixgbe.h
projects/counters/sys/dev/ixgbe/ixv.c
projects/counters/sys/dev/jme/if_jme.c
projects/counters/sys/dev/le/lance.c
projects/counters/sys/dev/lge/if_lge.c
projects/counters/sys/dev/lmc/if_lmc.c
projects/counters/sys/dev/malo/if_malo.c
projects/counters/sys/dev/mge/if_mge.c
projects/counters/sys/dev/mii/brgphy.c
projects/counters/sys/dev/mii/miidevs
projects/counters/sys/dev/mn/if_mn.c
projects/counters/sys/dev/msk/if_msk.c
projects/counters/sys/dev/mwl/if_mwl.c
projects/counters/sys/dev/mxge/if_mxge.c
projects/counters/sys/dev/my/if_my.c
projects/counters/sys/dev/netmap/ixgbe_netmap.h
projects/counters/sys/dev/nfe/if_nfe.c
projects/counters/sys/dev/nge/if_nge.c
projects/counters/sys/dev/nve/if_nve.c
projects/counters/sys/dev/nvme/nvme.c
projects/counters/sys/dev/nvme/nvme_ctrlr.c
projects/counters/sys/dev/nvme/nvme_private.h
projects/counters/sys/dev/nxge/if_nxge.c
projects/counters/sys/dev/oce/oce_if.c
projects/counters/sys/dev/patm/if_patm_intr.c
projects/counters/sys/dev/patm/if_patm_rx.c
projects/counters/sys/dev/patm/if_patm_tx.c
projects/counters/sys/dev/pcn/if_pcn.c
projects/counters/sys/dev/pdq/pdq_freebsd.h
projects/counters/sys/dev/pdq/pdq_ifsubr.c
projects/counters/sys/dev/pdq/pdqvar.h
projects/counters/sys/dev/qlxgb/qla_os.c
projects/counters/sys/dev/ral/rt2560.c
projects/counters/sys/dev/ral/rt2661.c
projects/counters/sys/dev/ral/rt2860.c
projects/counters/sys/dev/re/if_re.c
projects/counters/sys/dev/rt/if_rt.c
projects/counters/sys/dev/safe/safe.c
projects/counters/sys/dev/sbni/if_sbni.c
projects/counters/sys/dev/sdhci/sdhci.c
projects/counters/sys/dev/sdhci/sdhci.h
projects/counters/sys/dev/sf/if_sf.c
projects/counters/sys/dev/sfxge/sfxge_dma.c
projects/counters/sys/dev/sfxge/sfxge_tx.c
projects/counters/sys/dev/sge/if_sge.c
projects/counters/sys/dev/sis/if_sis.c
projects/counters/sys/dev/sk/if_sk.c
projects/counters/sys/dev/smc/if_smc.c
projects/counters/sys/dev/sn/if_sn.c
projects/counters/sys/dev/snc/dp83932.c
projects/counters/sys/dev/sound/pci/hda/hdaa_patches.c
projects/counters/sys/dev/sound/pci/hda/hdac.h
projects/counters/sys/dev/sound/pci/hda/hdacc.c
projects/counters/sys/dev/sound/usb/uaudio.c
projects/counters/sys/dev/ste/if_ste.c
projects/counters/sys/dev/stge/if_stge.c
projects/counters/sys/dev/sym/sym_hipd.c
projects/counters/sys/dev/ti/if_ti.c
projects/counters/sys/dev/tl/if_tl.c
projects/counters/sys/dev/tsec/if_tsec.c
projects/counters/sys/dev/tx/if_tx.c
projects/counters/sys/dev/txp/if_txp.c
projects/counters/sys/dev/uart/uart_bus_fdt.c
projects/counters/sys/dev/ubsec/ubsec.c
projects/counters/sys/dev/usb/controller/xhci.c
projects/counters/sys/dev/usb/controller/xhci.h
projects/counters/sys/dev/usb/misc/udbp.c
projects/counters/sys/dev/usb/net/if_axe.c
projects/counters/sys/dev/usb/net/if_cdce.c
projects/counters/sys/dev/usb/net/if_usie.c
projects/counters/sys/dev/usb/net/uhso.c
projects/counters/sys/dev/usb/net/usb_ethernet.c
projects/counters/sys/dev/usb/serial/u3g.c
projects/counters/sys/dev/usb/usbdevs
projects/counters/sys/dev/usb/wlan/if_rum.c
projects/counters/sys/dev/usb/wlan/if_run.c
projects/counters/sys/dev/usb/wlan/if_uath.c
projects/counters/sys/dev/usb/wlan/if_upgt.c
projects/counters/sys/dev/usb/wlan/if_ural.c
projects/counters/sys/dev/usb/wlan/if_urtw.c
projects/counters/sys/dev/usb/wlan/if_zyd.c
projects/counters/sys/dev/vge/if_vge.c
projects/counters/sys/dev/virtio/block/virtio_blk.c
projects/counters/sys/dev/virtio/network/if_vtnet.c
projects/counters/sys/dev/virtio/scsi/virtio_scsi.c
projects/counters/sys/dev/vr/if_vr.c
projects/counters/sys/dev/vte/if_vte.c
projects/counters/sys/dev/vx/if_vx.c
projects/counters/sys/dev/vxge/vxge.c
projects/counters/sys/dev/wb/if_wb.c
projects/counters/sys/dev/wbwd/wbwd.c
projects/counters/sys/dev/wi/if_wi.c
projects/counters/sys/dev/wl/if_wl.c
projects/counters/sys/dev/wpi/if_wpi.c
projects/counters/sys/dev/wtap/if_wtap.c
projects/counters/sys/dev/wtap/plugins/visibility.c
projects/counters/sys/dev/xe/if_xe.c
projects/counters/sys/dev/xen/netfront/netfront.c
projects/counters/sys/dev/xl/if_xl.c
projects/counters/sys/fs/ext2fs/ext2_dinode.h
projects/counters/sys/fs/ext2fs/ext2_inode_cnv.c
projects/counters/sys/fs/ext2fs/ext2_vfsops.c
projects/counters/sys/fs/ext2fs/ext2fs.h
projects/counters/sys/fs/nfs/nfs.h
projects/counters/sys/fs/nfs/nfs_commonkrpc.c
projects/counters/sys/fs/nfs/nfs_commonport.c
projects/counters/sys/fs/nfs/nfs_commonsubs.c
projects/counters/sys/fs/nfs/nfs_var.h
projects/counters/sys/fs/nfs/nfscl.h
projects/counters/sys/fs/nfs/nfsclstate.h
projects/counters/sys/fs/nfs/nfsm_subs.h
projects/counters/sys/fs/nfs/nfsport.h
projects/counters/sys/fs/nfs/nfsproto.h
projects/counters/sys/fs/nfsclient/nfs_clbio.c
projects/counters/sys/fs/nfsclient/nfs_clcomsubs.c
projects/counters/sys/fs/nfsclient/nfs_clkdtrace.c
projects/counters/sys/fs/nfsclient/nfs_clkrpc.c
projects/counters/sys/fs/nfsclient/nfs_clport.c
projects/counters/sys/fs/nfsclient/nfs_clrpcops.c
projects/counters/sys/fs/nfsclient/nfs_clstate.c
projects/counters/sys/fs/nfsclient/nfs_clvfsops.c
projects/counters/sys/fs/nfsclient/nfs_clvnops.c
projects/counters/sys/fs/nfsclient/nfsmount.h
projects/counters/sys/fs/nfsclient/nfsnode.h
projects/counters/sys/fs/nfsserver/nfs_nfsdcache.c
projects/counters/sys/fs/nfsserver/nfs_nfsdport.c
projects/counters/sys/fs/nfsserver/nfs_nfsdstate.c
projects/counters/sys/i386/i386/db_trace.c
projects/counters/sys/i386/pci/pci_cfgreg.c
projects/counters/sys/kern/init_main.c
projects/counters/sys/kern/kern_fork.c
projects/counters/sys/kern/kern_jail.c
projects/counters/sys/kern/kern_ktr.c
projects/counters/sys/kern/kern_lock.c
projects/counters/sys/kern/kern_mbuf.c
projects/counters/sys/kern/kern_mib.c
projects/counters/sys/kern/kern_priv.c
projects/counters/sys/kern/kern_shutdown.c
projects/counters/sys/kern/kern_sig.c
projects/counters/sys/kern/kern_switch.c
projects/counters/sys/kern/kern_time.c
projects/counters/sys/kern/kern_timeout.c
projects/counters/sys/kern/subr_mchain.c
projects/counters/sys/kern/subr_param.c
projects/counters/sys/kern/subr_smp.c
projects/counters/sys/kern/subr_syscall.c
projects/counters/sys/kern/subr_uio.c
projects/counters/sys/kern/subr_witness.c
projects/counters/sys/kern/uipc_domain.c
projects/counters/sys/kern/uipc_mbuf.c
projects/counters/sys/kern/uipc_mbuf2.c
projects/counters/sys/kern/uipc_sockbuf.c
projects/counters/sys/kern/uipc_socket.c
projects/counters/sys/kern/uipc_syscalls.c
projects/counters/sys/kern/uipc_usrreq.c
projects/counters/sys/kern/vfs_bio.c
projects/counters/sys/kern/vfs_export.c
projects/counters/sys/kern/vfs_lookup.c
projects/counters/sys/kern/vfs_mount.c
projects/counters/sys/kern/vfs_mountroot.c
projects/counters/sys/kern/vfs_subr.c
projects/counters/sys/kgssapi/gss_accept_sec_context.c
projects/counters/sys/kgssapi/gss_acquire_cred.c
projects/counters/sys/kgssapi/gss_canonicalize_name.c
projects/counters/sys/kgssapi/gss_delete_sec_context.c
projects/counters/sys/kgssapi/gss_display_status.c
projects/counters/sys/kgssapi/gss_export_name.c
projects/counters/sys/kgssapi/gss_impl.c
projects/counters/sys/kgssapi/gss_import_name.c
projects/counters/sys/kgssapi/gss_init_sec_context.c
projects/counters/sys/kgssapi/gss_pname_to_uid.c
projects/counters/sys/kgssapi/gss_release_cred.c
projects/counters/sys/kgssapi/gss_release_name.c
projects/counters/sys/kgssapi/gss_set_cred_option.c
projects/counters/sys/kgssapi/gssapi_impl.h
projects/counters/sys/mips/adm5120/if_admsw.c
projects/counters/sys/mips/atheros/if_arge.c
projects/counters/sys/mips/cavium/if_octm.c
projects/counters/sys/mips/cavium/octe/ethernet-mem.c
projects/counters/sys/mips/cavium/octe/ethernet-rx.c
projects/counters/sys/mips/idt/if_kr.c
projects/counters/sys/mips/include/param.h
projects/counters/sys/mips/nlm/dev/net/xlpge.c
projects/counters/sys/mips/rmi/dev/nlge/if_nlge.c
projects/counters/sys/mips/rmi/dev/xlr/rge.c
projects/counters/sys/modules/ath/Makefile
projects/counters/sys/modules/iwn/Makefile
projects/counters/sys/net/bpf.c
projects/counters/sys/net/bpf.h
projects/counters/sys/net/bpf_buffer.c
projects/counters/sys/net/bpfdesc.h
projects/counters/sys/net/bridgestp.c
projects/counters/sys/net/ieee8023ad_lacp.c
projects/counters/sys/net/if_arcsubr.c
projects/counters/sys/net/if_atmsubr.c
projects/counters/sys/net/if_bridge.c
projects/counters/sys/net/if_ef.c
projects/counters/sys/net/if_ethersubr.c
projects/counters/sys/net/if_fddisubr.c
projects/counters/sys/net/if_fwsubr.c
projects/counters/sys/net/if_gre.c
projects/counters/sys/net/if_iso88025subr.c
projects/counters/sys/net/if_llatbl.c
projects/counters/sys/net/if_spppfr.c
projects/counters/sys/net/if_spppsubr.c
projects/counters/sys/net/if_stf.c
projects/counters/sys/net/if_tap.c
projects/counters/sys/net/if_tun.c
projects/counters/sys/net/rtsock.c
projects/counters/sys/net80211/ieee80211_adhoc.c
projects/counters/sys/net80211/ieee80211_freebsd.c
projects/counters/sys/net80211/ieee80211_hostap.c
projects/counters/sys/net80211/ieee80211_hwmp.c
projects/counters/sys/net80211/ieee80211_input.c
projects/counters/sys/net80211/ieee80211_mesh.c
projects/counters/sys/net80211/ieee80211_output.c
projects/counters/sys/net80211/ieee80211_proto.c
projects/counters/sys/net80211/ieee80211_regdomain.h
projects/counters/sys/net80211/ieee80211_sta.c
projects/counters/sys/net80211/ieee80211_sta.h
projects/counters/sys/net80211/ieee80211_superg.c
projects/counters/sys/net80211/ieee80211_superg.h
projects/counters/sys/net80211/ieee80211_wds.c
projects/counters/sys/netatalk/aarp.c
projects/counters/sys/netatalk/ddp_output.c
projects/counters/sys/netgraph/atm/ccatm/ng_ccatm.c
projects/counters/sys/netgraph/atm/ng_atm.c
projects/counters/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
projects/counters/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
projects/counters/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
projects/counters/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
projects/counters/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
projects/counters/sys/netgraph/bluetooth/hci/ng_hci_misc.c
projects/counters/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
projects/counters/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
projects/counters/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
projects/counters/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
projects/counters/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
projects/counters/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
projects/counters/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
projects/counters/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
projects/counters/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
projects/counters/sys/netgraph/netflow/netflow.c
projects/counters/sys/netgraph/netflow/netflow_v9.c
projects/counters/sys/netgraph/ng_UI.c
projects/counters/sys/netgraph/ng_atmllc.c
projects/counters/sys/netgraph/ng_bridge.c
projects/counters/sys/netgraph/ng_cisco.c
projects/counters/sys/netgraph/ng_deflate.c
projects/counters/sys/netgraph/ng_device.c
projects/counters/sys/netgraph/ng_frame_relay.c
projects/counters/sys/netgraph/ng_gif.c
projects/counters/sys/netgraph/ng_gif_demux.c
projects/counters/sys/netgraph/ng_hub.c
projects/counters/sys/netgraph/ng_iface.c
projects/counters/sys/netgraph/ng_ipfw.c
projects/counters/sys/netgraph/ng_l2tp.c
projects/counters/sys/netgraph/ng_lmi.c
projects/counters/sys/netgraph/ng_mppc.c
projects/counters/sys/netgraph/ng_one2many.c
projects/counters/sys/netgraph/ng_ppp.c
projects/counters/sys/netgraph/ng_pppoe.c
projects/counters/sys/netgraph/ng_pptpgre.c
projects/counters/sys/netgraph/ng_pred1.c
projects/counters/sys/netgraph/ng_rfc1490.c
projects/counters/sys/netgraph/ng_source.c
projects/counters/sys/netgraph/ng_tee.c
projects/counters/sys/netgraph/ng_tty.c
projects/counters/sys/netgraph/ng_vjc.c
projects/counters/sys/netgraph/ng_vlan.c
projects/counters/sys/netinet/if_ether.c
projects/counters/sys/netinet/igmp.c
projects/counters/sys/netinet/in_gif.c
projects/counters/sys/netinet/in_pcb.c
projects/counters/sys/netinet/ip_icmp.c
projects/counters/sys/netinet/ip_input.c
projects/counters/sys/netinet/ip_mroute.c
projects/counters/sys/netinet/ip_options.c
projects/counters/sys/netinet/ip_output.c
projects/counters/sys/netinet/libalias/alias.c
projects/counters/sys/netinet/raw_ip.c
projects/counters/sys/netinet/sctp_asconf.c
projects/counters/sys/netinet/sctp_auth.c
projects/counters/sys/netinet/sctp_indata.c
projects/counters/sys/netinet/sctp_input.c
projects/counters/sys/netinet/sctp_output.c
projects/counters/sys/netinet/sctp_output.h
projects/counters/sys/netinet/sctp_pcb.c
projects/counters/sys/netinet/sctp_timer.c
projects/counters/sys/netinet/sctp_usrreq.c
projects/counters/sys/netinet/sctputil.c
projects/counters/sys/netinet/tcp_input.c
projects/counters/sys/netinet/tcp_output.c
projects/counters/sys/netinet/tcp_subr.c
projects/counters/sys/netinet/tcp_syncache.c
projects/counters/sys/netinet/tcp_timewait.c
projects/counters/sys/netinet/udp_usrreq.c
projects/counters/sys/netinet6/frag6.c
projects/counters/sys/netinet6/icmp6.c
projects/counters/sys/netinet6/in6.c
projects/counters/sys/netinet6/in6_gif.c
projects/counters/sys/netinet6/in6_var.h
projects/counters/sys/netinet6/ip6_input.c
projects/counters/sys/netinet6/ip6_mroute.c
projects/counters/sys/netinet6/ip6_output.c
projects/counters/sys/netinet6/ip6_var.h
projects/counters/sys/netinet6/mld6.c
projects/counters/sys/netinet6/nd6.c
projects/counters/sys/netinet6/nd6_nbr.c
projects/counters/sys/netinet6/raw_ip6.c
projects/counters/sys/netinet6/scope6.c
projects/counters/sys/netinet6/scope6_var.h
projects/counters/sys/netinet6/udp6_usrreq.c
projects/counters/sys/netipsec/ipsec_mbuf.c
projects/counters/sys/netipsec/ipsec_output.c
projects/counters/sys/netipsec/key.c
projects/counters/sys/netipsec/keysock.c
projects/counters/sys/netipsec/xform_ipip.c
projects/counters/sys/netipx/ipx_outputfl.c
projects/counters/sys/netipx/ipx_usrreq.c
projects/counters/sys/netipx/spx_reass.c
projects/counters/sys/netipx/spx_usrreq.c
projects/counters/sys/netnatm/natm.c
projects/counters/sys/netncp/ncp_sock.c
projects/counters/sys/netpfil/ipfw/ip_dn_glue.c
projects/counters/sys/netpfil/ipfw/ip_fw2.c
projects/counters/sys/netpfil/ipfw/ip_fw_dynamic.c
projects/counters/sys/netpfil/ipfw/ip_fw_pfil.c
projects/counters/sys/netpfil/ipfw/ip_fw_private.h
projects/counters/sys/netpfil/ipfw/ip_fw_sockopt.c
projects/counters/sys/netpfil/pf/if_pfsync.c
projects/counters/sys/netpfil/pf/pf.c
projects/counters/sys/netpfil/pf/pf_if.c
projects/counters/sys/netpfil/pf/pf_ioctl.c
projects/counters/sys/netpfil/pf/pf_norm.c
projects/counters/sys/netsmb/smb_iod.c
projects/counters/sys/netsmb/smb_rq.c
projects/counters/sys/netsmb/smb_trantcp.c
projects/counters/sys/nfs/krpc_subr.c
projects/counters/sys/nfs/nfs_common.c
projects/counters/sys/nfs/nfs_nfssvc.c
projects/counters/sys/nfs/nfssvc.h
projects/counters/sys/nfsclient/nfs_krpc.c
projects/counters/sys/nfsclient/nfs_subs.c
projects/counters/sys/nfsclient/nfsargs.h
projects/counters/sys/nfsserver/nfs_fha.c
projects/counters/sys/nfsserver/nfs_serv.c
projects/counters/sys/nfsserver/nfs_srvkrpc.c
projects/counters/sys/nfsserver/nfs_srvsubs.c
projects/counters/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
projects/counters/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
projects/counters/sys/ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c
projects/counters/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
projects/counters/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c
projects/counters/sys/ofed/drivers/net/mlx4/en_tx.c
projects/counters/sys/pci/if_rl.c
projects/counters/sys/powerpc/ps3/if_glc.c
projects/counters/sys/rpc/clnt.h
projects/counters/sys/rpc/clnt_dg.c
projects/counters/sys/rpc/clnt_rc.c
projects/counters/sys/rpc/clnt_vc.c
projects/counters/sys/rpc/rpc_generic.c
projects/counters/sys/rpc/rpcm_subs.h
projects/counters/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c
projects/counters/sys/rpc/svc.c
projects/counters/sys/rpc/svc.h
projects/counters/sys/rpc/svc_dg.c
projects/counters/sys/rpc/svc_vc.c
projects/counters/sys/security/audit/audit.c
projects/counters/sys/security/audit/audit.h
projects/counters/sys/security/audit/audit_arg.c
projects/counters/sys/security/audit/audit_bsm.c
projects/counters/sys/security/audit/audit_bsm_klib.c
projects/counters/sys/security/audit/audit_private.h
projects/counters/sys/security/audit/audit_worker.c
projects/counters/sys/sparc64/conf/GENERIC
projects/counters/sys/sys/fnv_hash.h
projects/counters/sys/sys/kdb.h
projects/counters/sys/sys/ktr.h
projects/counters/sys/sys/mbuf.h
projects/counters/sys/sys/mount.h
projects/counters/sys/sys/protosw.h
projects/counters/sys/sys/socketvar.h
projects/counters/sys/sys/sysctl.h
projects/counters/sys/sys/systm.h
projects/counters/sys/tools/vnode_if.awk
projects/counters/sys/ufs/ufs/ufs_quota.c
projects/counters/sys/vm/uma.h
projects/counters/sys/vm/uma_core.c
projects/counters/sys/vm/uma_int.h
projects/counters/sys/vm/vm.h
projects/counters/sys/vm/vm_fault.c
projects/counters/sys/vm/vm_map.c
projects/counters/sys/vm/vm_meter.c
projects/counters/sys/vm/vm_mmap.c
projects/counters/sys/vm/vm_object.c
projects/counters/sys/vm/vm_object.h
projects/counters/sys/vm/vm_page.c
projects/counters/sys/vm/vm_pageout.c
projects/counters/sys/vm/vm_unix.c
projects/counters/sys/x86/include/bus.h
projects/counters/sys/x86/x86/io_apic.c
projects/counters/tools/build/mk/OptionalObsoleteFiles.inc
projects/counters/tools/debugscripts/dot.gdbinit
projects/counters/tools/regression/lib/libc/stdio/test-perror.c
projects/counters/tools/regression/usr.bin/printf/regress.sh
projects/counters/tools/test/ppsapi/Makefile
projects/counters/tools/test/ppsapi/README
projects/counters/tools/tools/sysbuild/sysbuild.sh
projects/counters/usr.bin/calendar/parsedata.c
projects/counters/usr.bin/clang/clang-tblgen/Makefile
projects/counters/usr.bin/clang/clang/Makefile
projects/counters/usr.bin/clang/llc/Makefile
projects/counters/usr.bin/clang/lli/Makefile
projects/counters/usr.bin/clang/llvm-mc/Makefile
projects/counters/usr.bin/clang/llvm-objdump/Makefile
projects/counters/usr.bin/clang/llvm-rtdyld/Makefile
projects/counters/usr.bin/clang/opt/Makefile
projects/counters/usr.bin/clang/tblgen/Makefile
projects/counters/usr.bin/fetch/fetch.c
projects/counters/usr.bin/less/zless.sh
projects/counters/usr.bin/locate/locate/locate.c
projects/counters/usr.bin/make/main.c
projects/counters/usr.bin/nfsstat/nfsstat.1
projects/counters/usr.bin/nfsstat/nfsstat.c
projects/counters/usr.bin/printf/printf.c
projects/counters/usr.bin/rctl/rctl.8
projects/counters/usr.bin/sort/sort.c
projects/counters/usr.bin/sort/sort.h
projects/counters/usr.bin/time/time.c
projects/counters/usr.bin/tip/tip/cu.1
projects/counters/usr.sbin/Makefile
projects/counters/usr.sbin/bluetooth/hcseriald/hcseriald.8
projects/counters/usr.sbin/bluetooth/hcseriald/hcseriald.c
projects/counters/usr.sbin/bsdinstall/scripts/mirrorselect
projects/counters/usr.sbin/gssd/gssd.c
projects/counters/usr.sbin/iostat/iostat.8
projects/counters/usr.sbin/iostat/iostat.c
projects/counters/usr.sbin/mergemaster/mergemaster.sh
projects/counters/usr.sbin/moused/moused.8
projects/counters/usr.sbin/ndiscvt/inf-parse.y
projects/counters/usr.sbin/ndp/ndp.8
projects/counters/usr.sbin/ndp/ndp.c
projects/counters/usr.sbin/nfsd/nfsd.8
projects/counters/usr.sbin/nfsd/nfsd.c
projects/counters/usr.sbin/pkg/Makefile
projects/counters/usr.sbin/pkg/pkg.c
projects/counters/usr.sbin/portsnap/portsnap/portsnap.sh
projects/counters/usr.sbin/ppp/README.changes
projects/counters/usr.sbin/ppp/defs.h
projects/counters/usr.sbin/ppp/ppp.8.m4
projects/counters/usr.sbin/pw/bitmap.c
projects/counters/usr.sbin/pw/grupd.c
projects/counters/usr.sbin/pw/pw_group.c
projects/counters/usr.sbin/pw/pw_user.c
projects/counters/usr.sbin/pw/pwupd.c
projects/counters/usr.sbin/pw/rm_r.c
projects/counters/usr.sbin/service/service.8
projects/counters/usr.sbin/service/service.sh
Directory Properties:
projects/counters/ (props changed)
projects/counters/cddl/contrib/opensolaris/ (props changed)
projects/counters/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/counters/contrib/bind9/ (props changed)
projects/counters/contrib/binutils/ (props changed)
projects/counters/contrib/dtc/ (props changed)
projects/counters/contrib/gcc/ (props changed)
projects/counters/contrib/gdb/ (props changed)
projects/counters/contrib/gdtoa/ (props changed)
projects/counters/contrib/less/ (props changed)
projects/counters/contrib/libc++/ (props changed)
projects/counters/contrib/llvm/ (props changed)
projects/counters/contrib/llvm/tools/clang/ (props changed)
projects/counters/contrib/ntp/ (props changed)
projects/counters/contrib/openbsm/ (props changed)
projects/counters/contrib/tcpdump/ (props changed)
projects/counters/contrib/top/ (props changed)
projects/counters/crypto/heimdal/ (props changed)
projects/counters/crypto/openssl/ (props changed)
projects/counters/gnu/lib/ (props changed)
projects/counters/gnu/usr.bin/binutils/ (props changed)
projects/counters/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/counters/lib/libc/ (props changed)
projects/counters/sbin/ (props changed)
projects/counters/share/man/man4/ (props changed)
projects/counters/sys/ (props changed)
projects/counters/sys/boot/ (props changed)
projects/counters/sys/boot/i386/efi/ (props changed)
projects/counters/sys/cddl/contrib/opensolaris/ (props changed)
projects/counters/sys/conf/ (props changed)
projects/counters/sys/powerpc/wii/locore.S (props changed)
projects/counters/usr.bin/calendar/ (props changed)
projects/counters/usr.sbin/ndiscvt/ (props changed)
Modified: projects/counters/Makefile.inc1
==============================================================================
--- projects/counters/Makefile.inc1 Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/Makefile.inc1 Thu Dec 20 13:27:43 2012 (r244488)
@@ -511,6 +511,8 @@ build32:
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
cd ${.CURDIR}/${_dir}; \
+ WORLDTMP=${WORLDTMP} \
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
-DEARLY_BUILD build-tools
@@ -609,7 +611,7 @@ installcheck_DESTDIR:
#
# Check for missing UIDs/GIDs.
#
-CHECK_UIDS=
+CHECK_UIDS= auditdistd
CHECK_GIDS= audit
.if ${MK_SENDMAIL} != "no"
CHECK_UIDS+= smmsp
Modified: projects/counters/ObsoleteFiles.inc
==============================================================================
--- projects/counters/ObsoleteFiles.inc Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/ObsoleteFiles.inc Thu Dec 20 13:27:43 2012 (r244488)
@@ -52,6 +52,9 @@ OLD_FILES+=usr/include/clang/3.2/unwind.
# 20120910: NetBSD compat shims removed
OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
OLD_FILES+=usr/include/sys/device_port.h
+# 20120909: doc and www supfiles removed
+OLD_FILES+=usr/share/examples/cvsup/doc-supfile
+OLD_FILES+=usr/share/examples/cvsup/www-supfile
# 20120908: pf cleanup
OLD_FILES+=usr/include/net/if_pflow.h
# 20120816: new clang import which bumps version from 3.1 to 3.2
Modified: projects/counters/UPDATING
==============================================================================
--- projects/counters/UPDATING Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/UPDATING Thu Dec 20 13:27:43 2012 (r244488)
@@ -4,7 +4,9 @@ This file is maintained and copyrighted
See end of file for further details. For commonly done items, please see the
COMMON ITEMS: section later in the file. These instructions assume that you
basically know what you are doing. If not, then please consult the FreeBSD
-handbook.
+handbook:
+
+ http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
@@ -24,6 +26,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20121217:
+ By default, only the 10 most recent kernel dumps will be saved. To
+ restore the previous behaviour (no limit on the number of kernel dumps
+ stored in the dump directory) add the following line to /etc/rc.conf:
+
+ savecore_flags=""
+
+20121201:
+ With the addition of auditdistd(8), a new auditdistd user is now
+ depended on during installworld. "mergemaster -p" can be used to add
+ the user prior to installworld, as documented in the handbook.
+
20121117:
The sin6_scope_id member variable in struct sockaddr_in6 is now
filled by the kernel before passing the structure to the userland via
Modified: projects/counters/bin/df/df.c
==============================================================================
--- projects/counters/bin/df/df.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/bin/df/df.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -397,7 +397,7 @@ prthumanvalinode(int64_t bytes)
static intmax_t
fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
{
- return (num * (intmax_t) fsbs / bs);
+ return (num * (intmax_t) fsbs / (int64_t) bs);
}
/*
Modified: projects/counters/bin/ps/ps.c
==============================================================================
--- projects/counters/bin/ps/ps.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/bin/ps/ps.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -109,6 +109,7 @@ static int needcomm; /* -o "command" */
static int needenv; /* -e */
static int needuser; /* -o "user" */
static int optfatal; /* Fatal error parsing some list-option. */
+static int pid_max; /* kern.max_pid */
static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
@@ -148,6 +149,7 @@ static int pscomp(const void *, const v
static void saveuser(KINFO *);
static void scanvars(void);
static void sizevars(void);
+static void pidmax_init(void);
static void usage(void);
static char dfmt[] = "pid,tt,state,time,command";
@@ -200,6 +202,8 @@ main(int argc, char *argv[])
if (argc > 1)
argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
+ pidmax_init();
+
all = descendancy = _fmt = nselectors = optfatal = 0;
prtheader = showthreads = wflag = xkeep_implied = 0;
xkeep = -1; /* Neither -x nor -X. */
@@ -722,7 +726,6 @@ addelem_gid(struct listinfo *inf, const
return (1);
}
-#define BSD_PID_MAX 99999 /* Copy of PID_MAX from sys/proc.h. */
static int
addelem_pid(struct listinfo *inf, const char *elem)
{
@@ -740,7 +743,7 @@ addelem_pid(struct listinfo *inf, const
if (*endp != '\0' || tempid < 0 || elem == endp) {
warnx("Invalid %s: %s", inf->lname, elem);
errno = ERANGE;
- } else if (errno != 0 || tempid > BSD_PID_MAX) {
+ } else if (errno != 0 || tempid > pid_max) {
warnx("%s too large: %s", inf->lname, elem);
errno = ERANGE;
}
@@ -753,7 +756,6 @@ addelem_pid(struct listinfo *inf, const
inf->l.pids[(inf->count)++] = tempid;
return (1);
}
-#undef BSD_PID_MAX
/*-
* The user can specify a device via one of three formats:
@@ -1352,6 +1354,18 @@ kludge_oldps_options(const char *optlist
}
static void
+pidmax_init(void)
+{
+ size_t intsize;
+
+ intsize = sizeof(pid_max);
+ if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
+ warn("unable to read kern.pid_max");
+ pid_max = 99999;
+ }
+}
+
+static void
usage(void)
{
#define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
Modified: projects/counters/bin/sh/eval.c
==============================================================================
--- projects/counters/bin/sh/eval.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/bin/sh/eval.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -1070,6 +1070,7 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
+ outclearerror(out1);
/*
* If there is no command word, redirection errors should
* not be fatal but assignment errors should.
@@ -1085,6 +1086,11 @@ evalcommand(union node *cmd, int flags,
builtin_flags = flags;
exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
flushall();
+ if (outiserror(out1)) {
+ warning("write error on stdout");
+ if (exitstatus == 0 || exitstatus == 1)
+ exitstatus = 2;
+ }
cmddone:
if (argc > 0)
bltinunsetlocale();
Modified: projects/counters/bin/sh/output.c
==============================================================================
--- projects/counters/bin/sh/output.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/bin/sh/output.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -239,6 +239,20 @@ freestdout(void)
}
+int
+outiserror(struct output *file)
+{
+ return (file->flags & OUTPUT_ERR);
+}
+
+
+void
+outclearerror(struct output *file)
+{
+ file->flags &= ~OUTPUT_ERR;
+}
+
+
void
outfmt(struct output *file, const char *fmt, ...)
{
Modified: projects/counters/bin/sh/output.h
==============================================================================
--- projects/counters/bin/sh/output.h Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/bin/sh/output.h Thu Dec 20 13:27:43 2012 (r244488)
@@ -66,6 +66,8 @@ void emptyoutbuf(struct output *);
void flushall(void);
void flushout(struct output *);
void freestdout(void);
+int outiserror(struct output *);
+void outclearerror(struct output *);
void outfmt(struct output *, const char *, ...) __printflike(2, 3);
void out1fmt(const char *, ...) __printflike(1, 2);
void out2fmt_flush(const char *, ...) __printflike(1, 2);
Modified: projects/counters/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/counters/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -61,14 +61,16 @@
#undef verify
#include <libzfs.h>
-#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
- zio_compress_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
- zio_checksum_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
- dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
- dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
-#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
+#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
+ zio_compress_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
+ zio_checksum_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
+ dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
+ dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
+#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : \
+ (((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ? \
+ DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
#ifndef lint
extern int zfs_recover;
@@ -3194,7 +3196,13 @@ main(int argc, char **argv)
argv[i], strerror(errno));
}
}
- (os != NULL) ? dump_dir(os) : dump_zpool(spa);
+ if (os != NULL) {
+ dump_dir(os);
+ } else if (zopt_objects > 0 && !dump_opt['m']) {
+ dump_dir(spa->spa_meta_objset);
+ } else {
+ dump_zpool(spa);
+ }
} else {
flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR;
flagbits['c'] = ZDB_FLAG_CHECKSUM;
Modified: projects/counters/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/counters/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -727,7 +727,7 @@ send_iterate_fs(zfs_handle_t *zhp, void
sd->parent_fromsnap_guid = 0;
VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0));
VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0));
- (void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd);
+ (void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd);
VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps));
VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops));
nvlist_free(sd->parent_snaps);
@@ -1945,11 +1945,12 @@ recv_incremental_replication(libzfs_hand
recvflags_t *flags, nvlist_t *stream_nv, avl_tree_t *stream_avl,
nvlist_t *renamed)
{
- nvlist_t *local_nv;
+ nvlist_t *local_nv, *deleted = NULL;
avl_tree_t *local_avl;
nvpair_t *fselem, *nextfselem;
char *fromsnap;
char newname[ZFS_MAXNAMELEN];
+ char guidname[32];
int error;
boolean_t needagain, progress, recursive;
char *s1, *s2;
@@ -1965,6 +1966,8 @@ recv_incremental_replication(libzfs_hand
again:
needagain = progress = B_FALSE;
+ VERIFY(0 == nvlist_alloc(&deleted, NV_UNIQUE_NAME, 0));
+
if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL,
recursive, &local_nv, &local_avl)) != 0)
return (error);
@@ -2079,6 +2082,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", thisguid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2134,6 +2139,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2156,6 +2163,24 @@ again:
s2 = strrchr(stream_fsname, '/');
/*
+ * Check if we're going to rename based on parent guid change
+ * and the current parent guid was also deleted. If it was then
+ * rename will fail and is likely unneeded, so avoid this and
+ * force an early retry to determine the new
+ * parent_fromsnap_guid.
+ */
+ if (stream_parent_fromsnap_guid != 0 &&
+ parent_fromsnap_guid != 0 &&
+ stream_parent_fromsnap_guid != parent_fromsnap_guid) {
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ if (nvlist_exists(deleted, guidname)) {
+ progress = B_TRUE;
+ needagain = B_TRUE;
+ goto doagain;
+ }
+ }
+
+ /*
* Check for rename. If the exact receive path is specified, it
* does not count as a rename, but we still need to check the
* datasets beneath it.
@@ -2209,8 +2234,10 @@ again:
}
}
+doagain:
fsavl_destroy(local_avl);
nvlist_free(local_nv);
+ nvlist_free(deleted);
if (needagain && progress) {
/* do another pass to fix up temporary names */
Modified: projects/counters/contrib/bind9/CHANGES
==============================================================================
--- projects/counters/contrib/bind9/CHANGES Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/CHANGES Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,15 +1,81 @@
- --- 9.8.3-P4 released ---
+ --- 9.8.4-P1 released ---
+
+3407. [security] Named could die on specific queries with dns64 enabled.
+ [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
+ --- 9.8.4 released ---
3383. [security] A certain combination of records in the RBT could
cause named to hang while populating the additional
section of a response. [RT #31090]
- --- 9.8.3-P3 released ---
+3373. [bug] win32: open raw files in binary mode. [RT #30944]
3364. [security] Named could die on specially crafted record.
[RT #30416]
- --- 9.8.3-P2 released ---
+ --- 9.8.4rc1 released ---
+
+3369. [bug] nsupdate terminated unexpectedly in interactive mode
+ if built with readline support. [RT #29550]
+
+3368. [bug] <dns/iptable.h> and <dns/zone.h> were not C++ safe.
+
+3367. [bug] dns_dnsseckey_create() result was not being checked.
+ [RT #30685]
+
+3366. [bug] Fixed Read-After-Write dependency violation for IA64
+ atomic operations. [RT #25181]
+
+3365. [bug] Removed spurious newlines from log messages in
+ zone.c [RT #30675]
+
+3363. [bug] Need to allow "forward" and "fowarders" options
+ in static-stub zones; this had been overlooked.
+ [RT #30482]
+
+3362. [bug] Setting some option values to 0 in named.conf
+ could trigger an assertion failure on startup.
+ [RT #27730]
+
+3360. [bug] 'host -w' could die. [RT #18723]
+
+3359. [bug] An improperly-formed TSIG secret could cause a
+ memory leak. [RT #30607]
+
+3357. [port] Add support for libxml2-2.8.x [RT #30440]
+
+3356. [bug] Cap the TTL of signed RRsets when RRSIGs are
+ approaching their expiry, so they don't remain
+ in caches after expiry. [RT #26429]
+
+ --- 9.8.4b1 released ---
+
+3354. [func] Improve OpenSSL error logging. [RT #29932]
+
+3353. [bug] Use a single task for task exclusive operations.
+ [RT #29872]
+
+3352. [bug] Ensure that learned server attributes timeout of the
+ adb cache. [RT #29856]
+
+3351. [bug] isc_mem_put and isc_mem_putanddetach didn't report
+ caller if either ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX
+ memory debugging flags are set. [RT #30243]
+
+3350. [bug] Memory read overrun in isc___mem_reallocate if
+ ISC_MEM_DEBUGCTX memory debugging flag is set.
+ [RT #30240]
+
+3348. [bug] Prevent RRSIG data from being cached if a negative
+ record matching the covering type exists at a higher
+ trust level. Such data already can't be retrieved from
+ the cache since change 3218 -- this prevents it
+ being inserted into the cache as well. [RT #26809]
+
+3347. [bug] dnssec-settime: Issue a warning when writing a new
+ private key file would cause a change in the
+ permissions of the existing file. [RT #27724]
3346. [security] Bad-cache data could be used before it was
initialized, causing an assert. [RT #30025]
@@ -18,11 +84,47 @@
resulting in excessive cpu usage in some cases.
[RT #29952]
- --- 9.8.3-P1 released ---
+3337. [bug] Change #3294 broke support for the multiple keys
+ in controls. [RT #29694]
+
+3335. [func] nslookup: return a nonzero exit code when unable
+ to get an answer. [RT #29492]
+
+3333. [bug] Setting resolver-query-timeout too low can cause
+ named to not recover if it loses connectivity.
+ [RT #29623]
+
+3332. [bug] Re-use cached DS rrsets if possible. [RT #29446]
3331. [security] dns_rdataslab_fromrdataset could produce bad
rdataslabs. [RT #29644]
-
+
+3330. [func] Fix missing signatures on NOERROR results despite
+ RPZ rewriting. Also
+ - add optional "recursive-only yes|no" to the
+ response-policy statement
+ - add optional "max-policy-ttl" to the response-policy
+ statement to limit the false data that
+ "recursive-only no" can introduce into
+ resolvers' caches
+ - add a RPZ performance test to bin/tests/system/rpz
+ when queryperf is available.
+ - the encoding of PASSTHRU action to "rpz-passthru".
+ (The old encoding is still accepted.)
+ [RT #26172]
+
+
+3329. [bug] Handle RRSIG signer-name case consistently: We
+ generate RRSIG records with the signer-name in
+ lower case. We accept them with any case, but if
+ they fail to validate, we try again in lower case.
+ [RT #27451]
+
+3328. [bug] Fixed inconsistent data checking in dst_parse.c.
+ [RT #29401]
+
+3317. [func] Add ECDSA support (RFC 6605). [RT #21918]
+
--- 9.8.3 released ---
3318. [tuning] Reduce the amount of work performed while holding a
Modified: projects/counters/contrib/bind9/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/counters/contrib/bind9/README
==============================================================================
--- projects/counters/contrib/bind9/README Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/README Thu Dec 20 13:27:43 2012 (r244488)
@@ -51,6 +51,11 @@ BIND 9
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.8.4
+
+ BIND 9.8.4 includes several bug fixes and patches security
+ flaws described in CVE-2012-1667, CVE-2012-3817 and CVE-2012-4244.
+
BIND 9.8.3
BIND 9.8.3 is a maintenance release.
Modified: projects/counters/contrib/bind9/acconfig.h
==============================================================================
--- projects/counters/contrib/bind9/acconfig.h Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/acconfig.h Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -138,6 +138,9 @@ int sigwait(const unsigned int *set, int
/* Define if OpenSSL includes DSA support */
#undef HAVE_OPENSSL_DSA
+/* Define if OpenSSL includes ECDSA support */
+#undef HAVE_OPENSSL_ECDSA
+
/* Define to the length type used by the socket API (socklen_t, size_t, int). */
#undef ISC_SOCKADDR_LEN_T
Modified: projects/counters/contrib/bind9/bin/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/counters/contrib/bind9/bin/check/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/check/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/check/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/counters/contrib/bind9/bin/check/check-tool.c
==============================================================================
--- projects/counters/contrib/bind9/bin/check/check-tool.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/check/check-tool.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -639,6 +639,9 @@ dump_zone(const char *zonename, dns_zone
{
isc_result_t result;
FILE *output = stdout;
+ const char *flags;
+
+ flags = (fileformat == dns_masterformat_text) ? "w+" : "wb+";
if (debug) {
if (filename != NULL && strcmp(filename, "-") != 0)
@@ -649,7 +652,7 @@ dump_zone(const char *zonename, dns_zone
}
if (filename != NULL && strcmp(filename, "-") != 0) {
- result = isc_stdio_open(filename, "w+", &output);
+ result = isc_stdio_open(filename, flags, &output);
if (result != ISC_R_SUCCESS) {
fprintf(stderr, "could not open output "
Modified: projects/counters/contrib/bind9/bin/confgen/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/confgen/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/confgen/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
Modified: projects/counters/contrib/bind9/bin/confgen/unix/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/confgen/unix/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/confgen/unix/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
Modified: projects/counters/contrib/bind9/bin/dig/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/dig/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dig/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/counters/contrib/bind9/bin/dig/nslookup.c
==============================================================================
--- projects/counters/contrib/bind9/bin/dig/nslookup.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dig/nslookup.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -57,6 +57,7 @@ static isc_boolean_t in_use = ISC_FALSE;
static char defclass[MXRD] = "IN";
static char deftype[MXRD] = "A";
static isc_event_t *global_event = NULL;
+static int query_error = 1, print_error = 0;
static char domainopt[DNS_NAME_MAXTEXT];
@@ -406,6 +407,9 @@ isc_result_t
printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
char servtext[ISC_SOCKADDR_FORMATSIZE];
+ /* I've we've gotten this far, we've reached a server. */
+ query_error = 0;
+
debug("printmessage()");
isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
@@ -433,6 +437,9 @@ printmessage(dig_query_t *query, dns_mes
(msg->rcode != dns_rcode_nxdomain) ? nametext :
query->lookup->textname, rcode_totext(msg->rcode));
debug("returning with rcode == 0");
+
+ /* the lookup failed */
+ print_error |= 1;
return (ISC_R_SUCCESS);
}
@@ -887,5 +894,5 @@ main(int argc, char **argv) {
destroy_libs();
isc_app_finish();
- return (0);
+ return (query_error | print_error);
}
Modified: projects/counters/contrib/bind9/bin/dnssec/Makefile.in
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/Makefile.in Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/Makefile.in Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8 Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8 Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -55,7 +55,7 @@ Use SHA\-256 as the digest algorithm.
.RS 4
Select the digest algorithm. The value of
\fBalgorithm\fR
-must be one of SHA\-1 (SHA1), SHA\-256 (SHA256) or GOST. These values are case insensitive.
+must be one of SHA\-1 (SHA1), SHA\-256 (SHA256), GOST or SHA\-384 (SHA384). These values are case insensitive.
.RE
.PP
\-K \fIdirectory\fR
@@ -139,5 +139,5 @@ RFC 4509.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2008\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2008\-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.br
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -296,7 +296,7 @@ usage(void) {
fprintf(stderr, " -K <directory>: directory in which to find "
"key file or keyset file\n");
fprintf(stderr, " -a algorithm: digest algorithm "
- "(SHA-1, SHA-256 or GOST)\n");
+ "(SHA-1, SHA-256, GOST or SHA-384)\n");
fprintf(stderr, " -1: use SHA-1\n");
fprintf(stderr, " -2: use SHA-256\n");
fprintf(stderr, " -l: add lookaside zone and print DLV records\n");
@@ -415,6 +415,9 @@ main(int argc, char **argv) {
else if (strcasecmp(algname, "GOST") == 0)
dtype = DNS_DSDIGEST_GOST;
#endif
+ else if (strcasecmp(algname, "SHA384") == 0 ||
+ strcasecmp(algname, "SHA-384") == 0)
+ dtype = DNS_DSDIGEST_SHA384;
else
fatal("unknown algorithm %s", algname);
}
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook Thu Dec 20 13:27:43 2012 (r244488)
@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "—">]>
<!--
- - Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -39,6 +39,7 @@
<year>2008</year>
<year>2009</year>
<year>2010</year>
+ <year>2012</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
@@ -107,7 +108,8 @@
<para>
Select the digest algorithm. The value of
<option>algorithm</option> must be one of SHA-1 (SHA1),
- SHA-256 (SHA256) or GOST. These values are case insensitive.
+ SHA-256 (SHA256), GOST or SHA-384 (SHA384).
+ These values are case insensitive.
</para>
</listitem>
</varlistentry>
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
<!--
- - Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -32,14 +32,14 @@
<div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code> {-s} [<code class="option">-1</code>] [<code class="option">-2</code>] [<code class="option">-a <em class="replaceable"><code>alg</code></em></code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-s</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>file</code></em></code>] [<code class="option">-A</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {dnsname}</p></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543465"></a><h2>DESCRIPTION</h2>
+<a name="id2543468"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-dsfromkey</strong></span>
outputs the Delegation Signer (DS) resource record (RR), as defined in
RFC 3658 and RFC 4509, for the given key(s).
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543477"></a><h2>OPTIONS</h2>
+<a name="id2543480"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-1</span></dt>
<dd><p>
@@ -54,7 +54,8 @@
<dd><p>
Select the digest algorithm. The value of
<code class="option">algorithm</code> must be one of SHA-1 (SHA1),
- SHA-256 (SHA256) or GOST. These values are case insensitive.
+ SHA-256 (SHA256), GOST or SHA-384 (SHA384).
+ These values are case insensitive.
</p></dd>
<dt><span class="term">-K <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
@@ -100,7 +101,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543664"></a><h2>EXAMPLE</h2>
+<a name="id2543667"></a><h2>EXAMPLE</h2>
<p>
To build the SHA-256 DS RR from the
<strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
@@ -115,7 +116,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543693"></a><h2>FILES</h2>
+<a name="id2543697"></a><h2>FILES</h2>
<p>
The keyfile can be designed by the key identification
<code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
@@ -129,13 +130,13 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543729"></a><h2>CAVEAT</h2>
+<a name="id2543732"></a><h2>CAVEAT</h2>
<p>
A keyfile error can give a "file not found" even if the file exists.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543738"></a><h2>SEE ALSO</h2>
+<a name="id2543741"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -145,7 +146,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543778"></a><h2>AUTHOR</h2>
+<a name="id2543781"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -47,7 +47,7 @@ of the key is specified on the command l
.RS 4
Selects the cryptographic algorithm. The value of
\fBalgorithm\fR
-must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST. These values are case insensitive.
+must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 or ECDSAP384SHA384. These values are case insensitive.
.sp
If no algorithm is specified, then RSASHA1 will be used by default, unless the
\fB\-3\fR
@@ -215,5 +215,5 @@ RFC 4034.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2008\-2011 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2008\-2012 Internet Systems Consortium, Inc. ("ISC")
.br
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -55,7 +55,8 @@ int verbose;
static const char *algs = "RSA | RSAMD5 | DH | DSA | RSASHA1 |"
" NSEC3DSA | NSEC3RSASHA1 |"
- " RSASHA256 | RSASHA512 | ECCGOST";
+ " RSASHA256 | RSASHA512 | ECCGOST |"
+ " ECDSAP256SHA256 | ECDSAP384SHA384";
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
@@ -369,7 +370,8 @@ main(int argc, char **argv) {
if (use_nsec3 &&
alg != DST_ALG_NSEC3DSA && alg != DST_ALG_NSEC3RSASHA1 &&
alg != DST_ALG_RSASHA256 && alg != DST_ALG_RSASHA512 &&
- alg != DST_ALG_ECCGOST) {
+ alg != DST_ALG_ECCGOST &&
+ alg != DST_ALG_ECDSA256 && alg != DST_ALG_ECDSA384) {
fatal("%s is incompatible with NSEC3; "
"do not use the -3 option", algname);
}
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook Thu Dec 20 13:27:43 2012 (r244488)
@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "—">]>
<!--
- - Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +40,7 @@
<year>2009</year>
<year>2010</year>
<year>2011</year>
+ <year>2012</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
@@ -94,7 +95,8 @@
<para>
Selects the cryptographic algorithm. The value of
<option>algorithm</option> must be one of RSAMD5, RSASHA1,
- DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST.
+ DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST,
+ ECDSAP256SHA256 or ECDSAP384SHA384.
These values are case insensitive.
</para>
<para>
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
<!--
- - Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -31,7 +31,7 @@
<div class="cmdsynopsis"><p><code class="command">dnssec-keyfromlabel</code> {-l <em class="replaceable"><code>label</code></em>} [<code class="option">-3</code>] [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-A <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-G</code>] [<code class="option">-I <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-k</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-n <em class="replaceable"><code>nametype</code></em></code>] [<code cl
ass="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-R <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-y</code>] {name}</p></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543495"></a><h2>DESCRIPTION</h2>
+<a name="id2543498"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-keyfromlabel</strong></span>
gets keys with the given label from a crypto hardware and builds
key files for DNSSEC (Secure DNS), as defined in RFC 2535
@@ -44,14 +44,15 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543513"></a><h2>OPTIONS</h2>
+<a name="id2543516"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
<dd>
<p>
Selects the cryptographic algorithm. The value of
<code class="option">algorithm</code> must be one of RSAMD5, RSASHA1,
- DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST.
+ DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST,
+ ECDSAP256SHA256 or ECDSAP384SHA384.
These values are case insensitive.
</p>
<p>
@@ -163,7 +164,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543877"></a><h2>TIMING OPTIONS</h2>
+<a name="id2543880"></a><h2>TIMING OPTIONS</h2>
<p>
Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
If the argument begins with a '+' or '-', it is interpreted as
@@ -210,7 +211,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2544043"></a><h2>GENERATED KEY FILES</h2>
+<a name="id2544046"></a><h2>GENERATED KEY FILES</h2>
<p>
When <span><strong class="command">dnssec-keyfromlabel</strong></span> completes
successfully,
@@ -249,7 +250,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2544116"></a><h2>SEE ALSO</h2>
+<a name="id2544119"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -257,7 +258,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2544149"></a><h2>AUTHOR</h2>
+<a name="id2544152"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.8
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.8 Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.8 Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004, 2005, 2007-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005, 2007-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@ of the key is specified on the command l
.RS 4
Selects the cryptographic algorithm. For DNSSEC keys, the value of
\fBalgorithm\fR
-must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST. For TSIG/TKEY, the value must be DH (Diffie Hellman), HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512. These values are case insensitive.
+must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 or ECDSAP384SHA384. For TSIG/TKEY, the value must be DH (Diffie Hellman), HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512. These values are case insensitive.
.sp
If no algorithm is specified, then RSASHA1 will be used by default, unless the
\fB\-3\fR
@@ -63,7 +63,7 @@ Note 2: DH, HMAC\-MD5, and HMAC\-SHA1 th
.PP
\-b \fIkeysize\fR
.RS 4
-Specifies the number of bits in the key. The choice of key size depends on the algorithm used. RSA keys must be between 512 and 2048 bits. Diffie Hellman keys must be between 128 and 4096 bits. DSA keys must be between 512 and 1024 bits and an exact multiple of 64. HMAC keys must be between 1 and 512 bits.
+Specifies the number of bits in the key. The choice of key size depends on the algorithm used. RSA keys must be between 512 and 2048 bits. Diffie Hellman keys must be between 128 and 4096 bits. DSA keys must be between 512 and 1024 bits and an exact multiple of 64. HMAC keys must be between 1 and 512 bits. Elliptic curve algorithms don't need this parameter.
.sp
The key size does not need to be specified if using a default algorithm. The default key size is 1024 bits for zone signing keys (ZSK's) and 2048 bits for key signing keys (KSK's, generated with
\fB\-f KSK\fR). However, if an algorithm is explicitly specified with the
@@ -81,7 +81,7 @@ must either be ZONE (for a DNSSEC zone k
.PP
\-3
.RS 4
-Use an NSEC3\-capable algorithm to generate a DNSSEC key. If this option is used and no algorithm is explicitly set on the command line, NSEC3RSASHA1 will be used by default. Note that RSASHA256, RSASHA512 and ECCGOST algorithms are NSEC3\-capable.
+Use an NSEC3\-capable algorithm to generate a DNSSEC key. If this option is used and no algorithm is explicitly set on the command line, NSEC3RSASHA1 will be used by default. Note that RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 and ECDSAP384SHA384 algorithms are NSEC3\-capable.
.RE
.PP
\-C
@@ -298,7 +298,7 @@ RFC 4034.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004, 2005, 2007\-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.br
Copyright \(co 2000\-2003 Internet Software Consortium.
.br
Modified: projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.c
==============================================================================
--- projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.c Thu Dec 20 12:46:34 2012 (r244487)
+++ projects/counters/contrib/bind9/bin/dnssec/dnssec-keygen.c Thu Dec 20 13:27:43 2012 (r244488)
@@ -1,5 +1,5 @@
/*
- * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -85,6 +85,7 @@ usage(void) {
fprintf(stderr, " RSA | RSAMD5 | DSA | RSASHA1 | NSEC3RSASHA1"
" | NSEC3DSA |\n");
fprintf(stderr, " RSASHA256 | RSASHA512 | ECCGOST |\n");
+ fprintf(stderr, " ECDSAP256SHA256 | ECDSAP384SHA384 |\n");
fprintf(stderr, " DH | HMAC-MD5 | HMAC-SHA1 | HMAC-SHA224 | "
"HMAC-SHA256 | \n");
fprintf(stderr, " HMAC-SHA384 | HMAC-SHA512\n");
@@ -102,6 +103,8 @@ usage(void) {
fprintf(stderr, " NSEC3DSA:\t[512..1024] and divisible "
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 17:13:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E7B21FA8;
Thu, 20 Dec 2012 17:13:02 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id CA2938FC12;
Thu, 20 Dec 2012 17:13:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKHD2vZ087036;
Thu, 20 Dec 2012 17:13:02 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKHD1kO087031;
Thu, 20 Dec 2012 17:13:01 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212201713.qBKHD1kO087031@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 20 Dec 2012 17:13:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244490 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 17:13:03 -0000
Author: brooks
Date: Thu Dec 20 17:13:01 2012
New Revision: 244490
URL: http://svnweb.freebsd.org/changeset/base/244490
Log:
Introduce a concept of flavors which change the default output and
in the "freebsd9" case change the behavior of some flags to match
FreeBSD. This has been committed upstream. CVS revision numbers will
be looped back in a future commit.
Modified:
projects/mtree/contrib/mtree/create.c
projects/mtree/contrib/mtree/extern.h
projects/mtree/contrib/mtree/mtree.8
projects/mtree/contrib/mtree/mtree.c
projects/mtree/contrib/mtree/spec.c
Modified: projects/mtree/contrib/mtree/create.c
==============================================================================
--- projects/mtree/contrib/mtree/create.c Thu Dec 20 16:21:02 2012 (r244489)
+++ projects/mtree/contrib/mtree/create.c Thu Dec 20 17:13:01 2012 (r244490)
@@ -136,18 +136,22 @@ cwalk(void)
}
switch(p->fts_info) {
case FTS_D:
- printf("\n");
+ if (!bflag)
+ printf("\n");
if (!nflag)
printf("# %s\n", p->fts_path);
statd(t, p, &uid, &gid, &mode, &flags);
statf(indent, p);
break;
case FTS_DP:
- if (p->fts_level > 0) {
+ if (p->fts_level > 0)
if (!nflag)
printf("%*s# %s\n", indent, "",
p->fts_path);
- printf("%*s..\n\n", indent, "");
+ if (p->fts_level > 0 || flavor == F_FREEBSD9) {
+ printf("%*s..\n", indent, "");
+ if (!bflag)
+ printf("\n");
}
break;
case FTS_DNR:
@@ -186,7 +190,7 @@ statf(int indent, FTSENT *p)
else
offset += printf("%*s", (INDENTNAMELEN + indent) - offset, "");
- if (!S_ISREG(p->fts_statp->st_mode))
+ if (!S_ISREG(p->fts_statp->st_mode) && (flavor == F_NETBSD6 || !dflag))
output(indent, &offset, "type=%s",
inotype(p->fts_statp->st_mode));
if (keys & (F_UID | F_UNAME) && p->fts_statp->st_uid != uid) {
@@ -212,7 +216,8 @@ statf(int indent, FTSENT *p)
(long long)p->fts_statp->st_rdev);
if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
- if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
+ if (keys & F_SIZE &&
+ (flavor != F_NETBSD6 || S_ISREG(p->fts_statp->st_mode)))
output(indent, &offset, "size=%lld",
(long long)p->fts_statp->st_size);
if (keys & F_TIME)
@@ -349,29 +354,32 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
maxuid = maxgid = maxmode = maxflags = 0;
for (; p; p = p->fts_link) {
- smode = p->fts_statp->st_mode & MBITS;
- if (smode < MTREE_MAXMODE && ++m[smode] > maxmode) {
- savemode = smode;
- maxmode = m[smode];
- }
- sgid = p->fts_statp->st_gid;
- if (sgid < MTREE_MAXGID && ++g[sgid] > maxgid) {
- savegid = sgid;
- maxgid = g[sgid];
- }
- suid = p->fts_statp->st_uid;
- if (suid < MTREE_MAXUID && ++u[suid] > maxuid) {
- saveuid = suid;
- maxuid = u[suid];
- }
+ if (flavor == F_NETBSD6 || !dflag ||
+ (dflag && S_ISDIR(p->fts_statp->st_mode))) {
+ smode = p->fts_statp->st_mode & MBITS;
+ if (smode < MTREE_MAXMODE && ++m[smode] > maxmode) {
+ savemode = smode;
+ maxmode = m[smode];
+ }
+ sgid = p->fts_statp->st_gid;
+ if (sgid < MTREE_MAXGID && ++g[sgid] > maxgid) {
+ savegid = sgid;
+ maxgid = g[sgid];
+ }
+ suid = p->fts_statp->st_uid;
+ if (suid < MTREE_MAXUID && ++u[suid] > maxuid) {
+ saveuid = suid;
+ maxuid = u[suid];
+ }
#if HAVE_STRUCT_STAT_ST_FLAGS
- sflags = FLAGS2INDEX(p->fts_statp->st_flags);
- if (sflags < MTREE_MAXFLAGS && ++f[sflags] > maxflags) {
- saveflags = p->fts_statp->st_flags;
- maxflags = f[sflags];
- }
+ sflags = FLAGS2INDEX(p->fts_statp->st_flags);
+ if (sflags < MTREE_MAXFLAGS && ++f[sflags] > maxflags) {
+ saveflags = p->fts_statp->st_flags;
+ maxflags = f[sflags];
+ }
#endif
+ }
}
/*
* If the /set record is the same as the last one we do not need to
@@ -384,7 +392,10 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
((keys & F_FLAGS) && (*pflags != saveflags)) ||
first) {
first = 0;
- printf("/set type=file");
+ if (flavor != F_NETBSD6 && dflag)
+ printf("/set type=dir");
+ else
+ printf("/set type=file");
if (keys & (F_UID | F_UNAME)) {
if (keys & F_UNAME &&
(name = user_from_uid(saveuid, 1)) != NULL)
Modified: projects/mtree/contrib/mtree/extern.h
==============================================================================
--- projects/mtree/contrib/mtree/extern.h Thu Dec 20 16:21:02 2012 (r244489)
+++ projects/mtree/contrib/mtree/extern.h Thu Dec 20 17:13:01 2012 (r244490)
@@ -52,6 +52,12 @@
#define MAXHOSTNAMELEN 256
#endif
+enum flavor {
+ F_MTREE,
+ F_FREEBSD9,
+ F_NETBSD6
+};
+
void addtag(slist_t *, char *);
int check_excludes(const char *, const char *);
int compare(NODE *, FTSENT *);
@@ -69,10 +75,11 @@ void read_excludes_file(const char *);
const char *rlink(const char *);
int verify(FILE *);
-extern int dflag, eflag, iflag, jflag, lflag, mflag,
+extern int bflag, dflag, eflag, iflag, jflag, lflag, mflag,
nflag, qflag, rflag, sflag, tflag, uflag;
extern int mtree_Mflag, mtree_Sflag, mtree_Wflag;
extern size_t mtree_lineno;
+extern enum flavor flavor;
extern u_int32_t crc_total;
extern int ftsoptions, keys;
extern char fullpath[];
Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 16:21:02 2012 (r244489)
+++ projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 17:13:01 2012 (r244490)
@@ -64,9 +64,10 @@
.Nd map a directory hierarchy
.Sh SYNOPSIS
.Nm
-.Op Fl CcDdejLlMnPqrStUuWx
+.Op Fl bCcDdejLlMnPqrStUuWx
.Op Fl i | Fl m
.Op Fl E Ar tags
+.Op Fl F Ar flavor
.Op Fl f Ar spec
.Op Fl I Ar tags
.Op Fl K Ar keywords
@@ -92,6 +93,8 @@ missing from either the file hierarchy o
.Pp
The options are as follows:
.Bl -tag -width Xxxexcludexfilexx
+.It Fl b
+Suppress blank lines before entering and after exiting directories.
.It Fl C
Convert a specification into
a format that's easier to parse with various tools.
@@ -140,6 +143,29 @@ and
.It Fl e
Don't complain about files that are in the file hierarchy, but not in the
specification.
+.It Fl F Ar flavor
+Set the compatibilty flavor of the
+.Nm
+utility.
+The
+.Ar flavor
+can be one of
+.Sy mtree ,
+.Sy freebsd9 ,
+or
+.Sy netbsd6 .
+The default is
+.Sy mtree .
+The
+.Sy freebsd9
+and
+.Sy netbsd6
+flavors attempt to preserve output compatiblity and command line optio
+backward compatibility with
+.Fx 9
+and
+.Nx 6
+respectively.
.It Fl f Ar spec
Read the specification from
.Ar file ,
@@ -691,6 +717,35 @@ option can be used in combination with
or
.Fl u
to create directory hierarchies for, for example, distributions.
+.Sh COMPATIBILITY
+The compatibility shims provided by the
+.Fl F
+option are incomplete by design.
+Known limititations are described below.
+.Pp
+The
+.Sy freebsd9
+flavor retains the default handling of lookup failures for the
+.Sy uname
+and
+.Sy group
+keywords by replacing them with appropriate
+.Sy uid
+and
+.Sy gid
+keywords rather than failing and reporting an error.
+The related
+.Fl w
+flag is a no-op rather than causing a warning to be printed and no
+keyword to be emitted.
+The latter behavior is not emulated as it is potentially dangerous in
+the face of /set statements.
+.Pp
+The
+.Sy netbsd6
+flavor does not replicate the historical bug that reported time as
+seconds.nanoseconds without zero padding nanosecond values less than
+100000000.
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr chgrp 1 ,
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Thu Dec 20 16:21:02 2012 (r244489)
+++ projects/mtree/contrib/mtree/mtree.c Thu Dec 20 17:13:01 2012 (r244490)
@@ -59,9 +59,19 @@ __RCSID("$NetBSD: mtree.c,v 1.43 2012/12
#include "extern.h"
int ftsoptions = FTS_PHYSICAL;
-int cflag, Cflag, dflag, Dflag, eflag, iflag, jflag, lflag, mflag,
- nflag, qflag, rflag, sflag, tflag, uflag, Uflag;
+int bflag, cflag, Cflag, dflag, Dflag, eflag, iflag, jflag, lflag, mflag,
+ nflag, qflag, rflag, sflag, tflag, uflag, Uflag, wflag;
char fullpath[MAXPATHLEN];
+enum flavor flavor = F_MTREE;
+
+static struct {
+ enum flavor flavor;
+ const char name[9];
+} flavors[] = {
+ {F_MTREE, "mtree"},
+ {F_FREEBSD9, "freebsd9"},
+ {F_NETBSD6, "netbsd6"},
+};
__dead static void usage(void);
@@ -69,6 +79,7 @@ int
main(int argc, char **argv)
{
int ch, status;
+ uint i;
char *dir, *p;
FILE *spec1, *spec2;
@@ -80,9 +91,12 @@ main(int argc, char **argv)
spec2 = NULL;
while ((ch = getopt(argc, argv,
- "cCdDeE:f:I:ijk:K:lLmMnN:p:PqrR:s:StuUWxX:"))
+ "bcCdDeE:f:F:I:ijk:K:lLmMnN:p:PqrR:s:StuUwWxX:"))
!= -1) {
switch((char)ch) {
+ case 'b':
+ bflag = 1;
+ break;
case 'c':
cflag = 1;
break;
@@ -115,6 +129,15 @@ main(int argc, char **argv)
} else
usage();
break;
+ case 'F':
+ for (i = 0; i < __arraycount(flavors); i++)
+ if (strcmp(optarg, flavors[i].name) == 0) {
+ flavor = flavors[i].flavor;
+ break;
+ }
+ if (i == __arraycount(flavors))
+ usage();
+ break;
case 'i':
iflag = 1;
break;
@@ -193,6 +216,9 @@ main(int argc, char **argv)
case 'U':
Uflag = uflag = 1;
break;
+ case 'w':
+ wflag = 1;
+ break;
case 'W':
mtree_Wflag = 1;
break;
@@ -213,6 +239,36 @@ main(int argc, char **argv)
if (argc)
usage();
+ switch (flavor) {
+ case F_FREEBSD9:
+ if (cflag && iflag) {
+ warnx("-c and -i passed, replacing -i with -j for "
+ "FreeBSD compatibility");
+ iflag = 0;
+ jflag = 1;
+ }
+ if (dflag && !bflag) {
+ warnx("Adding -b to -d for FreeBSD compatibility");
+ bflag = 1;
+ }
+ if (uflag && !iflag) {
+ warnx("Adding -i to -%c for FreeBSD compatibility",
+ Uflag ? 'U' : 'u');
+ iflag = 1;
+ }
+ if (uflag && !tflag) {
+ warnx("Adding -t to -%c for FreeBSD compatibility",
+ Uflag ? 'U' : 'u');
+ tflag = 1;
+ }
+ if (wflag)
+ warnx("The -w flag is a no-op");
+ break;
+ default:
+ if (wflag)
+ usage();
+ }
+
if (spec2 && (cflag || Cflag || Dflag))
mtree_err("Double -f, -c, -C and -D flags are mutually "
"exclusive");
@@ -261,12 +317,18 @@ main(int argc, char **argv)
static void
usage(void)
{
+ uint i;
fprintf(stderr,
- "usage: %s [-CcDdejLlMnPqrStUuWx] [-i|-m] [-E tags]\n"
+ "usage: %s [-bCcDdejLlMnPqrStUuWx] [-i|-m] [-E tags]\n"
"\t\t[-f spec] [-f spec]\n"
"\t\t[-I tags] [-K keywords] [-k keywords] [-N dbdir] [-p path]\n"
- "\t\t[-R keywords] [-s seed] [-X exclude-file]\n",
+ "\t\t[-R keywords] [-s seed] [-X exclude-file]\n"
+ "\t\t[-F flavor]\n",
getprogname());
+ fprintf(stderr, "\nflavors:");
+ for (i = 0; i < __arraycount(flavors); i++)
+ fprintf(stderr, " %s", flavors[i].name);
+ fprintf(stderr, "\n");
exit(1);
}
Modified: projects/mtree/contrib/mtree/spec.c
==============================================================================
--- projects/mtree/contrib/mtree/spec.c Thu Dec 20 16:21:02 2012 (r244489)
+++ projects/mtree/contrib/mtree/spec.c Thu Dec 20 17:13:01 2012 (r244490)
@@ -415,11 +415,15 @@ dump_nodes(const char *dir, NODE *root,
char *
vispath(const char *path)
{
- const char extra[] = { ' ', '\t', '\n', '\\', '#', '*', '?', '[',
- '#', '\0' };
+ const char extra[] = { ' ', '\t', '\n', '\\', '\0' };
+ const char extra_glob[] = { ' ', '\t', '\n', '\\', '#', '*', '?',
+ '[', '\0' };
static char pathbuf[4*MAXPATHLEN + 1];
- strsvis(pathbuf, path, VIS_CSTYLE, extra);
+ if (flavor == F_NETBSD6)
+ strsvis(pathbuf, path, VIS_CSTYLE, extra);
+ else
+ strsvis(pathbuf, path, VIS_OCTAL, extra_glob);
return(pathbuf);
}
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 17:23:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id C9E3D5E7;
Thu, 20 Dec 2012 17:23:41 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id A39E88FC12;
Thu, 20 Dec 2012 17:23:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKHNfdF088683;
Thu, 20 Dec 2012 17:23:41 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKHNeg6088675;
Thu, 20 Dec 2012 17:23:40 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212201723.qBKHNeg6088675@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 20 Dec 2012 17:23:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244492 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 17:23:41 -0000
Author: brooks
Date: Thu Dec 20 17:23:40 2012
New Revision: 244492
URL: http://svnweb.freebsd.org/changeset/base/244492
Log:
Loop back the merge of flavor support and remove obsolete code and
documentation. We are now using 100% stock sources from NetBSD.
Modified:
projects/mtree/contrib/mtree/create.c
projects/mtree/contrib/mtree/extern.h
projects/mtree/contrib/mtree/mtree.8
projects/mtree/contrib/mtree/mtree.c
projects/mtree/contrib/mtree/spec.c
Modified: projects/mtree/contrib/mtree/create.c
==============================================================================
--- projects/mtree/contrib/mtree/create.c Thu Dec 20 17:14:10 2012 (r244491)
+++ projects/mtree/contrib/mtree/create.c Thu Dec 20 17:23:40 2012 (r244492)
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $ */
+/* $NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.67 2012/12/15 01:24:40 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.68 2012/12/20 16:43:16 christos Exp $");
#endif
#endif /* not lint */
Modified: projects/mtree/contrib/mtree/extern.h
==============================================================================
--- projects/mtree/contrib/mtree/extern.h Thu Dec 20 17:14:10 2012 (r244491)
+++ projects/mtree/contrib/mtree/extern.h Thu Dec 20 17:23:40 2012 (r244492)
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.36 2012/10/05 01:26:56 christos Exp $ */
+/* $NetBSD: extern.h,v 1.37 2012/12/20 16:43:16 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
Modified: projects/mtree/contrib/mtree/mtree.8
==============================================================================
--- projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 17:14:10 2012 (r244491)
+++ projects/mtree/contrib/mtree/mtree.8 Thu Dec 20 17:23:40 2012 (r244492)
@@ -1,4 +1,4 @@
-.\" $NetBSD: mtree.8,v 1.64 2012/12/12 15:52:10 christos Exp $
+.\" $NetBSD: mtree.8,v 1.65 2012/12/20 16:43:16 christos Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -56,7 +56,7 @@
.\"
.\" @(#)mtree.8 8.2 (Berkeley) 12/11/93
.\"
-.Dd October 4, 2012
+.Dd December 20, 2012
.Dt MTREE 8
.Os
.Sh NAME
@@ -192,16 +192,6 @@ and
If no inclusion list is provided, the default is to display all files.
.It Fl i
If specified, set the schg and/or sappnd flags.
-For compatiblity with
-.Fx
-if the
-.Fl c
-and
-.Fl i
-option are both passed,
-then the
-.Fl j
-option is implied and a warning is emitted.
.It Fl j
Indent the output 4 spaces each time a directory level is descended when
creating a specification with the
@@ -721,7 +711,7 @@ to create directory hierarchies for, for
The compatibility shims provided by the
.Fl F
option are incomplete by design.
-Known limititations are described below.
+Known limitations are described below.
.Pp
The
.Sy freebsd9
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Thu Dec 20 17:14:10 2012 (r244491)
+++ projects/mtree/contrib/mtree/mtree.c Thu Dec 20 17:23:40 2012 (r244492)
@@ -1,4 +1,4 @@
-/* $NetBSD: mtree.c,v 1.43 2012/12/12 15:51:41 christos Exp $ */
+/* $NetBSD: mtree.c,v 1.44 2012/12/20 16:43:16 christos Exp $ */
/*-
* Copyright (c) 1989, 1990, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mtree.c,v 1.43 2012/12/12 15:51:41 christos Exp $");
+__RCSID("$NetBSD: mtree.c,v 1.44 2012/12/20 16:43:16 christos Exp $");
#endif
#endif /* not lint */
@@ -285,12 +285,6 @@ main(int argc, char **argv)
if ((cflag && Cflag) || (cflag && Dflag) || (Cflag && Dflag))
mtree_err("-c, -C and -D flags are mutually exclusive");
- if (cflag && iflag) {
- warnx("-c and -i specified, setting -j and unsetting -i");
- iflag = 0;
- jflag = 1;
- }
-
if (iflag && mflag)
mtree_err("-i and -m flags are mutually exclusive");
Modified: projects/mtree/contrib/mtree/spec.c
==============================================================================
--- projects/mtree/contrib/mtree/spec.c Thu Dec 20 17:14:10 2012 (r244491)
+++ projects/mtree/contrib/mtree/spec.c Thu Dec 20 17:23:40 2012 (r244492)
@@ -1,4 +1,4 @@
-/* $NetBSD: spec.c,v 1.84 2012/10/07 18:40:49 christos Exp $ */
+/* $NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: spec.c,v 1.84 2012/10/07 18:40:49 christos Exp $");
+__RCSID("$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $");
#endif
#endif /* not lint */
@@ -415,16 +415,16 @@ dump_nodes(const char *dir, NODE *root,
char *
vispath(const char *path)
{
- const char extra[] = { ' ', '\t', '\n', '\\', '\0' };
- const char extra_glob[] = { ' ', '\t', '\n', '\\', '#', '*', '?',
- '[', '\0' };
+ static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' };
+ static const char extra_glob[] = { ' ', '\t', '\n', '\\', '#', '*',
+ '?', '[', '\0' };
static char pathbuf[4*MAXPATHLEN + 1];
if (flavor == F_NETBSD6)
strsvis(pathbuf, path, VIS_CSTYLE, extra);
else
strsvis(pathbuf, path, VIS_OCTAL, extra_glob);
- return(pathbuf);
+ return pathbuf;
}
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 17:53:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5C878E8;
Thu, 20 Dec 2012 17:53:02 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 401468FC0A;
Thu, 20 Dec 2012 17:53:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKHr23k093014;
Thu, 20 Dec 2012 17:53:02 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKHr2aM093013;
Thu, 20 Dec 2012 17:53:02 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212201753.qBKHr2aM093013@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 20 Dec 2012 17:53:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244494 - projects/mtree/lib/libnetbsd/sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 17:53:02 -0000
Author: brooks
Date: Thu Dec 20 17:53:01 2012
New Revision: 244494
URL: http://svnweb.freebsd.org/changeset/base/244494
Log:
Add the __arraycount() macro.
Modified:
projects/mtree/lib/libnetbsd/sys/cdefs.h
Modified: projects/mtree/lib/libnetbsd/sys/cdefs.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sys/cdefs.h Thu Dec 20 17:38:14 2012 (r244493)
+++ projects/mtree/lib/libnetbsd/sys/cdefs.h Thu Dec 20 17:53:01 2012 (r244494)
@@ -7,3 +7,10 @@
#else
#define __dead
#endif
+
+/*
+ * Return the number of elements in a statically-allocated array,
+ * __x.
+ */
+#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
+
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 17:53:46 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 85493204;
Thu, 20 Dec 2012 17:53:46 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 689358FC0A;
Thu, 20 Dec 2012 17:53:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKHrk5W093132;
Thu, 20 Dec 2012 17:53:46 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKHrkRl093131;
Thu, 20 Dec 2012 17:53:46 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212201753.qBKHrkRl093131@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 20 Dec 2012 17:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244495 - projects/mtree/lib/libnetbsd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 17:53:46 -0000
Author: brooks
Date: Thu Dec 20 17:53:45 2012
New Revision: 244495
URL: http://svnweb.freebsd.org/changeset/base/244495
Log:
Declare strsuftoll() and strsuftollx().
Added:
projects/mtree/lib/libnetbsd/stdlib.h (contents, props changed)
Added: projects/mtree/lib/libnetbsd/stdlib.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mtree/lib/libnetbsd/stdlib.h Thu Dec 20 17:53:45 2012 (r244495)
@@ -0,0 +1,7 @@
+/* $FreeBSD$ */
+
+#include_next <stdlib.h>
+
+long long strsuftoll(const char *, const char *, long long, long long);
+long long strsuftollx(const char *, const char *,
+ long long, long long, char *, size_t);
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 18:12:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id BBF67645;
Thu, 20 Dec 2012 18:12:40 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 9F6C28FC0A;
Thu, 20 Dec 2012 18:12:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKICeZE096210;
Thu, 20 Dec 2012 18:12:40 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKICesG096209;
Thu, 20 Dec 2012 18:12:40 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201212201812.qBKICesG096209@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 20 Dec 2012 18:12:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244496 - projects/efika_mx/sys/arm/freescale/imx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 18:12:40 -0000
Author: ray
Date: Thu Dec 20 18:12:40 2012
New Revision: 244496
URL: http://svnweb.freebsd.org/changeset/base/244496
Log:
Copy from sys/powerpc/mpc85xx/i2c.c to keep log.
Sponsored by: FreeBSD Foundation
Added:
projects/efika_mx/sys/arm/freescale/imx/i2c.c
- copied, changed from r243507, projects/efika_mx/sys/powerpc/mpc85xx/i2c.c
Copied and modified: projects/efika_mx/sys/arm/freescale/imx/i2c.c (from r243507, projects/efika_mx/sys/powerpc/mpc85xx/i2c.c)
==============================================================================
--- projects/efika_mx/sys/powerpc/mpc85xx/i2c.c Sun Nov 25 12:11:09 2012 (r243507, copy source)
+++ projects/efika_mx/sys/arm/freescale/imx/i2c.c Thu Dec 20 18:12:40 2012 (r244496)
@@ -130,6 +130,7 @@ static __inline void
i2c_write_reg(struct i2c_softc *sc, bus_size_t off, uint8_t val)
{
+// printf("0x%08x = %02x\n", (uint32_t)(sc->bsh + off), val);
bus_space_write_1(sc->bst, sc->bsh, off, val);
}
@@ -158,7 +159,7 @@ i2c_do_wait(device_t dev, struct i2c_sof
status = i2c_read_reg(sc, I2C_STATUS_REG);
if (status & I2CSR_MIF) {
- if (write && start && (status & I2CSR_RXAK)) {
+ if (write && start && ((status & 0xa2) != (0xa2) )) {
debugf("no ack %s", start ?
"after sending slave address" : "");
err = IIC_ENOACK;
@@ -169,16 +170,19 @@ i2c_do_wait(device_t dev, struct i2c_sof
err = IIC_EBUSERR;
goto error;
}
- if (!write && !(status & I2CSR_MCF)) {
+ if (!write && ( (status & 0x82) != 0x82 )) {
debugf("transfer unfinished");
err = IIC_EBUSERR;
goto error;
}
}
+// i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+
return (IIC_NOERR);
error:
+ printf("wait: st=%02x\n", status);
i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
return (err);
@@ -251,6 +255,21 @@ i2c_attach(device_t dev)
bus_generic_attach(dev);
return (IIC_NOERR);
}
+
+static int
+wait_for_iif(struct i2c_softc *sc)
+{
+ int retry = 10000;
+
+ while (retry --) {
+ if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MIF)
+ return (IIC_NOERR);
+ DELAY(10);
+ }
+
+ return (IIC_ETIMEOUT);
+}
+
static int
i2c_repeated_start(device_t dev, u_char slave, int timeout)
{
@@ -261,12 +280,19 @@ i2c_repeated_start(device_t dev, u_char
mtx_lock(&sc->mutex);
/* Set repeated start condition */
- i2c_flag_set(sc, I2C_CONTROL_REG ,I2CCR_RSTA);
+ i2c_flag_set(sc, I2C_CONTROL_REG ,I2CCR_RSTA|I2CCR_TXAK);
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
- DELAY(1250);
+//2 DELAY(1250);
+
+ if (0) error = i2c_do_wait(dev, sc, 1, 1);
+ error = wait_for_iif(sc);
+
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
- error = i2c_do_wait(dev, sc, 1, 1);
mtx_unlock(&sc->mutex);
if (error)
@@ -283,12 +309,17 @@ i2c_start(device_t dev, u_char slave, in
int error;
sc = device_get_softc(dev);
- DELAY(1000);
+//2 DELAY(1000);
mtx_lock(&sc->mutex);
status = i2c_read_reg(sc, I2C_STATUS_REG);
/* Check if bus is idle or busy */
if (status & I2CSR_MBB) {
+// i2c_write_reg(sc, I2C_CONTROL_REG, 0);
+// DELAY(1000);
+// i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
+
+
debugf("bus busy");
mtx_unlock(&sc->mutex);
i2c_stop(dev);
@@ -296,12 +327,21 @@ i2c_start(device_t dev, u_char slave, in
}
/* Set start condition */
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_TXAK);
+//3 DELAY(1250);
+ DELAY(100);//3
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX | I2CCR_TXAK);
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
- DELAY(1250);
+//1 DELAY(1250);
+
+ if (0) error = i2c_do_wait(dev, sc, 1, 1);
+ error = wait_for_iif(sc);
- error = i2c_do_wait(dev, sc, 1, 1);
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
mtx_unlock(&sc->mutex);
if (error)
@@ -311,6 +351,21 @@ i2c_start(device_t dev, u_char slave, in
}
static int
+wait_for_nibb(struct i2c_softc *sc)
+{
+ int retry = 1000;
+
+ while (retry --) {
+ if ((i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MBB) == 0)
+ return (IIC_NOERR);
+ DELAY(10);
+ }
+
+ return (IIC_ETIMEOUT);
+}
+
+
+static int
i2c_stop(device_t dev)
{
struct i2c_softc *sc;
@@ -318,7 +373,16 @@ i2c_stop(device_t dev)
sc = device_get_softc(dev);
mtx_lock(&sc->mutex);
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
- DELAY(1000);
+//4 DELAY(1000);
+ DELAY(100);//4
+ /* Reset controller if bus still busy after STOP */
+ if (wait_for_nibb(sc) == IIC_ETIMEOUT) {
+ i2c_write_reg(sc, I2C_CONTROL_REG, 0);
+ DELAY(1000);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
+//1 DELAY(1000);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ }
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -348,26 +412,44 @@ i2c_reset(device_t dev, u_char speed, u_
i2c_write_reg(sc, I2C_CONTROL_REG, 0x0);
i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
DELAY(1000);
- i2c_write_reg(sc, I2C_FDR_REG, baud_rate);
+// i2c_write_reg(sc, I2C_FDR_REG, baud_rate);
+ i2c_write_reg(sc, I2C_FDR_REG, 20);
if (!(sc->flags & FSL_IMX_I2C))
i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV);
i2c_write_reg(sc, I2C_CONTROL_REG, I2C_ENABLE);
DELAY(1000);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
}
static int
+wait_for_icf(struct i2c_softc *sc)
+{
+ int retry = 1000;
+
+ while (retry --) {
+// if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MCF)
+ if ((i2c_read_reg(sc, I2C_STATUS_REG) & (I2CSR_MCF|I2CSR_MIF)) == (I2CSR_MCF|I2CSR_MIF))
+ return (IIC_NOERR);
+ DELAY(10);
+ }
+
+ return (IIC_ETIMEOUT);
+}
+
+static int
i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay)
{
struct i2c_softc *sc;
- int error;
+ int error, reg;
sc = device_get_softc(dev);
*read = 0;
mtx_lock(&sc->mutex);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
if (len) {
if (len == 1)
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
@@ -377,18 +459,23 @@ i2c_read(device_t dev, char *buf, int le
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_MSTA);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* dummy read */
+ //printf("RD %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
i2c_read_reg(sc, I2C_DATA_REG);
DELAY(1000);
}
while (*read < len) {
- DELAY(1000);
- error = i2c_do_wait(dev, sc, 0, 0);
+//1 DELAY(1000);
+ if (0) error = i2c_do_wait(dev, sc, 0, 0);
+ error = wait_for_icf(sc);
if (error) {
mtx_unlock(&sc->mutex);
+ //printf("RE %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
return (error);
}
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
if ((*read == len - 2) && last) {
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_MSTA | I2CCR_TXAK);
@@ -399,10 +486,14 @@ i2c_read(device_t dev, char *buf, int le
I2CCR_TXAK);
}
- *buf++ = i2c_read_reg(sc, I2C_DATA_REG);
+ reg = i2c_read_reg(sc, I2C_DATA_REG);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ //printf("R %02x\n", reg);
+ *buf++ = reg;
(*read)++;
- DELAY(1250);
+//1 DELAY(1250);
}
+// printf("RA %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -419,10 +510,13 @@ i2c_write(device_t dev, const char *buf,
mtx_lock(&sc->mutex);
while (*sent < len) {
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
i2c_write_reg(sc, I2C_DATA_REG, *buf++);
- DELAY(1250);
+//1 DELAY(1250);
+
- error = i2c_do_wait(dev, sc, 1, 0);
+ if (0) error = i2c_do_wait(dev, sc, 1, 0);
+ error = wait_for_iif(sc);
if (error) {
mtx_unlock(&sc->mutex);
return (error);
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 18:16:00 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B2BF1D0A;
Thu, 20 Dec 2012 18:16:00 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 95C978FC0C;
Thu, 20 Dec 2012 18:16:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKIG0id096964;
Thu, 20 Dec 2012 18:16:00 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKIG0iD096963;
Thu, 20 Dec 2012 18:16:00 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201212201816.qBKIG0iD096963@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 20 Dec 2012 18:16:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244501 - projects/efika_mx/sys/arm/freescale/imx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 18:16:00 -0000
Author: ray
Date: Thu Dec 20 18:16:00 2012
New Revision: 244501
URL: http://svnweb.freebsd.org/changeset/base/244501
Log:
Revert to original state.
Remove "dirty, under havy work" things.
Modified:
projects/efika_mx/sys/arm/freescale/imx/i2c.c
Modified: projects/efika_mx/sys/arm/freescale/imx/i2c.c
==============================================================================
--- projects/efika_mx/sys/arm/freescale/imx/i2c.c Thu Dec 20 18:13:37 2012 (r244500)
+++ projects/efika_mx/sys/arm/freescale/imx/i2c.c Thu Dec 20 18:16:00 2012 (r244501)
@@ -130,7 +130,6 @@ static __inline void
i2c_write_reg(struct i2c_softc *sc, bus_size_t off, uint8_t val)
{
-// printf("0x%08x = %02x\n", (uint32_t)(sc->bsh + off), val);
bus_space_write_1(sc->bst, sc->bsh, off, val);
}
@@ -159,7 +158,7 @@ i2c_do_wait(device_t dev, struct i2c_sof
status = i2c_read_reg(sc, I2C_STATUS_REG);
if (status & I2CSR_MIF) {
- if (write && start && ((status & 0xa2) != (0xa2) )) {
+ if (write && start && (status & I2CSR_RXAK)) {
debugf("no ack %s", start ?
"after sending slave address" : "");
err = IIC_ENOACK;
@@ -170,19 +169,16 @@ i2c_do_wait(device_t dev, struct i2c_sof
err = IIC_EBUSERR;
goto error;
}
- if (!write && ( (status & 0x82) != 0x82 )) {
+ if (!write && !(status & I2CSR_MCF)) {
debugf("transfer unfinished");
err = IIC_EBUSERR;
goto error;
}
}
-// i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
-
return (IIC_NOERR);
error:
- printf("wait: st=%02x\n", status);
i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
return (err);
@@ -255,21 +251,6 @@ i2c_attach(device_t dev)
bus_generic_attach(dev);
return (IIC_NOERR);
}
-
-static int
-wait_for_iif(struct i2c_softc *sc)
-{
- int retry = 10000;
-
- while (retry --) {
- if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MIF)
- return (IIC_NOERR);
- DELAY(10);
- }
-
- return (IIC_ETIMEOUT);
-}
-
static int
i2c_repeated_start(device_t dev, u_char slave, int timeout)
{
@@ -280,19 +261,12 @@ i2c_repeated_start(device_t dev, u_char
mtx_lock(&sc->mutex);
/* Set repeated start condition */
- i2c_flag_set(sc, I2C_CONTROL_REG ,I2CCR_RSTA|I2CCR_TXAK);
- /* Clear status */
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ i2c_flag_set(sc, I2C_CONTROL_REG ,I2CCR_RSTA);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
-//2 DELAY(1250);
-
- if (0) error = i2c_do_wait(dev, sc, 1, 1);
- error = wait_for_iif(sc);
-
- /* Clear status */
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ DELAY(1250);
+ error = i2c_do_wait(dev, sc, 1, 1);
mtx_unlock(&sc->mutex);
if (error)
@@ -309,17 +283,12 @@ i2c_start(device_t dev, u_char slave, in
int error;
sc = device_get_softc(dev);
-//2 DELAY(1000);
+ DELAY(1000);
mtx_lock(&sc->mutex);
status = i2c_read_reg(sc, I2C_STATUS_REG);
/* Check if bus is idle or busy */
if (status & I2CSR_MBB) {
-// i2c_write_reg(sc, I2C_CONTROL_REG, 0);
-// DELAY(1000);
-// i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
-
-
debugf("bus busy");
mtx_unlock(&sc->mutex);
i2c_stop(dev);
@@ -327,21 +296,12 @@ i2c_start(device_t dev, u_char slave, in
}
/* Set start condition */
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_TXAK);
-//3 DELAY(1250);
- DELAY(100);//3
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX | I2CCR_TXAK);
- /* Clear status */
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
-//1 DELAY(1250);
-
- if (0) error = i2c_do_wait(dev, sc, 1, 1);
- error = wait_for_iif(sc);
+ DELAY(1250);
- /* Clear status */
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ error = i2c_do_wait(dev, sc, 1, 1);
mtx_unlock(&sc->mutex);
if (error)
@@ -351,21 +311,6 @@ i2c_start(device_t dev, u_char slave, in
}
static int
-wait_for_nibb(struct i2c_softc *sc)
-{
- int retry = 1000;
-
- while (retry --) {
- if ((i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MBB) == 0)
- return (IIC_NOERR);
- DELAY(10);
- }
-
- return (IIC_ETIMEOUT);
-}
-
-
-static int
i2c_stop(device_t dev)
{
struct i2c_softc *sc;
@@ -373,16 +318,7 @@ i2c_stop(device_t dev)
sc = device_get_softc(dev);
mtx_lock(&sc->mutex);
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
-//4 DELAY(1000);
- DELAY(100);//4
- /* Reset controller if bus still busy after STOP */
- if (wait_for_nibb(sc) == IIC_ETIMEOUT) {
- i2c_write_reg(sc, I2C_CONTROL_REG, 0);
- DELAY(1000);
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
-//1 DELAY(1000);
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
- }
+ DELAY(1000);
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -412,44 +348,26 @@ i2c_reset(device_t dev, u_char speed, u_
i2c_write_reg(sc, I2C_CONTROL_REG, 0x0);
i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
DELAY(1000);
-// i2c_write_reg(sc, I2C_FDR_REG, baud_rate);
- i2c_write_reg(sc, I2C_FDR_REG, 20);
+ i2c_write_reg(sc, I2C_FDR_REG, baud_rate);
if (!(sc->flags & FSL_IMX_I2C))
i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV);
i2c_write_reg(sc, I2C_CONTROL_REG, I2C_ENABLE);
DELAY(1000);
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
}
static int
-wait_for_icf(struct i2c_softc *sc)
-{
- int retry = 1000;
-
- while (retry --) {
-// if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MCF)
- if ((i2c_read_reg(sc, I2C_STATUS_REG) & (I2CSR_MCF|I2CSR_MIF)) == (I2CSR_MCF|I2CSR_MIF))
- return (IIC_NOERR);
- DELAY(10);
- }
-
- return (IIC_ETIMEOUT);
-}
-
-static int
i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay)
{
struct i2c_softc *sc;
- int error, reg;
+ int error;
sc = device_get_softc(dev);
*read = 0;
mtx_lock(&sc->mutex);
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
if (len) {
if (len == 1)
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
@@ -459,23 +377,18 @@ i2c_read(device_t dev, char *buf, int le
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_MSTA);
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* dummy read */
- //printf("RD %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
i2c_read_reg(sc, I2C_DATA_REG);
DELAY(1000);
}
while (*read < len) {
-//1 DELAY(1000);
- if (0) error = i2c_do_wait(dev, sc, 0, 0);
- error = wait_for_icf(sc);
+ DELAY(1000);
+ error = i2c_do_wait(dev, sc, 0, 0);
if (error) {
mtx_unlock(&sc->mutex);
- //printf("RE %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
return (error);
}
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
if ((*read == len - 2) && last) {
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_MSTA | I2CCR_TXAK);
@@ -486,14 +399,10 @@ i2c_read(device_t dev, char *buf, int le
I2CCR_TXAK);
}
- reg = i2c_read_reg(sc, I2C_DATA_REG);
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
- //printf("R %02x\n", reg);
- *buf++ = reg;
+ *buf++ = i2c_read_reg(sc, I2C_DATA_REG);
(*read)++;
-//1 DELAY(1250);
+ DELAY(1250);
}
-// printf("RA %02x\n", i2c_read_reg(sc, I2C_DATA_REG));
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -510,13 +419,10 @@ i2c_write(device_t dev, const char *buf,
mtx_lock(&sc->mutex);
while (*sent < len) {
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
i2c_write_reg(sc, I2C_DATA_REG, *buf++);
-//1 DELAY(1250);
-
+ DELAY(1250);
- if (0) error = i2c_do_wait(dev, sc, 1, 0);
- error = wait_for_iif(sc);
+ error = i2c_do_wait(dev, sc, 1, 0);
if (error) {
mtx_unlock(&sc->mutex);
return (error);
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 18:30:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 032D0FA;
Thu, 20 Dec 2012 18:30:35 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DD1D08FC0C;
Thu, 20 Dec 2012 18:30:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKIUYel099004;
Thu, 20 Dec 2012 18:30:34 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKIUYq5099003;
Thu, 20 Dec 2012 18:30:34 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201212201830.qBKIUYq5099003@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 20 Dec 2012 18:30:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244502 - projects/efika_mx/sys/arm/freescale/imx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 18:30:35 -0000
Author: ray
Date: Thu Dec 20 18:30:34 2012
New Revision: 244502
URL: http://svnweb.freebsd.org/changeset/base/244502
Log:
Almost new driver. Not so much things left of old powerpc/mpc85xx/i2c.c driver.
Sponsored by: FreeBSD Foundation
Modified:
projects/efika_mx/sys/arm/freescale/imx/i2c.c
Modified: projects/efika_mx/sys/arm/freescale/imx/i2c.c
==============================================================================
--- projects/efika_mx/sys/arm/freescale/imx/i2c.c Thu Dec 20 18:16:00 2012 (r244501)
+++ projects/efika_mx/sys/arm/freescale/imx/i2c.c Thu Dec 20 18:30:34 2012 (r244502)
@@ -1,7 +1,11 @@
/*-
* Copyright (C) 2008-2009 Semihalf, Michal Hajduk
+ * Copyright (c) 2012 The FreeBSD Foundation
* All rights reserved.
*
+ * Portions of this software were developed by Oleksandr Rybalko
+ * under sponsorship from the FreeBSD Foundation.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -54,26 +58,28 @@ __FBSDID("$FreeBSD$");
#define I2C_STATUS_REG 0x0C /* I2C status register */
#define I2C_DATA_REG 0x10 /* I2C data register */
#define I2C_DFSRR_REG 0x14 /* I2C Digital Filter Sampling rate */
-#define I2C_ENABLE 0x80 /* Module enable - interrupt disable */
-#define I2CSR_RXAK 0x01 /* Received acknowledge */
-#define I2CSR_MCF (1<<7) /* Data transfer */
-#define I2CSR_MASS (1<<6) /* Addressed as a slave */
-#define I2CSR_MBB (1<<5) /* Bus busy */
-#define I2CSR_MAL (1<<4) /* Arbitration lost */
-#define I2CSR_SRW (1<<2) /* Slave read/write */
-#define I2CSR_MIF (1<<1) /* Module interrupt */
-#define I2CCR_MEN (1<<7) /* Module enable */
-#define I2CCR_MSTA (1<<5) /* Master/slave mode */
-#define I2CCR_MTX (1<<4) /* Transmit/receive mode */
-#define I2CCR_TXAK (1<<3) /* Transfer acknowledge */
-#define I2CCR_RSTA (1<<2) /* Repeated START */
+
+#define I2CCR_MEN (1 << 7) /* Module enable */
+#define I2CCR_MSTA (1 << 5) /* Master/slave mode */
+#define I2CCR_MTX (1 << 4) /* Transmit/receive mode */
+#define I2CCR_TXAK (1 << 3) /* Transfer acknowledge */
+#define I2CCR_RSTA (1 << 2) /* Repeated START */
+
+#define I2CSR_MCF (1 << 7) /* Data transfer */
+#define I2CSR_MASS (1 << 6) /* Addressed as a slave */
+#define I2CSR_MBB (1 << 5) /* Bus busy */
+#define I2CSR_MAL (1 << 4) /* Arbitration lost */
+#define I2CSR_SRW (1 << 2) /* Slave read/write */
+#define I2CSR_MIF (1 << 1) /* Module interrupt */
+#define I2CSR_RXAK (1 << 0) /* Received acknowledge */
#define I2C_BAUD_RATE_FAST 0x31
#define I2C_BAUD_RATE_DEF 0x3F
#define I2C_DFSSR_DIV 0x10
#ifdef DEBUG
-#define debugf(fmt, args...) do { printf("%s(): ", __func__); printf(fmt,##args); } while (0)
+#define debugf(fmt, args...) do { printf("%s(): ", __func__); \
+ printf(fmt,##args); } while (0)
#else
#define debugf(fmt, args...)
#endif
@@ -83,8 +89,6 @@ struct i2c_softc {
device_t iicbus;
struct resource *res;
struct mtx mutex;
- int flags;
-#define FSL_IMX_I2C (1 << 0) /* To distinguish MPC and i.MX SoCs */
int rid;
bus_space_handle_t bsh;
bus_space_tag_t bst;
@@ -93,12 +97,12 @@ struct i2c_softc {
static int i2c_probe(device_t);
static int i2c_attach(device_t);
-static int i2c_repeated_start(device_t dev, u_char slave, int timeout);
-static int i2c_start(device_t dev, u_char slave, int timeout);
-static int i2c_stop(device_t dev);
-static int i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr);
-static int i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay);
-static int i2c_write(device_t dev, const char *buf, int len, int *sent, int timeout);
+static int i2c_repeated_start(device_t, u_char, int);
+static int i2c_start(device_t, u_char, int);
+static int i2c_stop(device_t);
+static int i2c_reset(device_t, u_char, u_char, u_char *);
+static int i2c_read(device_t, char *, int, int *, int, int);
+static int i2c_write(device_t, const char *, int, int *, int);
static device_method_t i2c_methods[] = {
DEVMETHOD(device_probe, i2c_probe),
@@ -150,38 +154,54 @@ i2c_flag_set(struct i2c_softc *sc, bus_s
i2c_write_reg(sc, off, status);
}
+/* Wait for transfer interrupt flag */
static int
-i2c_do_wait(device_t dev, struct i2c_softc *sc, int write, int start)
+wait_for_iif(struct i2c_softc *sc)
{
- int err;
- uint8_t status;
+ int retry;
- status = i2c_read_reg(sc, I2C_STATUS_REG);
- if (status & I2CSR_MIF) {
- if (write && start && (status & I2CSR_RXAK)) {
- debugf("no ack %s", start ?
- "after sending slave address" : "");
- err = IIC_ENOACK;
- goto error;
- }
- if (status & I2CSR_MAL) {
- debugf("arbitration lost");
- err = IIC_EBUSERR;
- goto error;
- }
- if (!write && !(status & I2CSR_MCF)) {
- debugf("transfer unfinished");
- err = IIC_EBUSERR;
- goto error;
- }
+ retry = 1000;
+ while (retry --) {
+ if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MIF)
+ return (IIC_NOERR);
+ DELAY(10);
}
- return (IIC_NOERR);
+ return (IIC_ETIMEOUT);
+}
-error:
- i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
- return (err);
+/* Wait for free bus */
+static int
+wait_for_nibb(struct i2c_softc *sc)
+{
+ int retry;
+
+ retry = 1000;
+ while (retry --) {
+ if ((i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MBB) == 0)
+ return (IIC_NOERR);
+ DELAY(10);
+ }
+
+ return (IIC_ETIMEOUT);
+}
+
+/* Wait for transfer complete+interrupt flag */
+static int
+wait_for_icf(struct i2c_softc *sc)
+{
+ int retry;
+
+ retry = 1000;
+ while (retry --) {
+
+ if ((i2c_read_reg(sc, I2C_STATUS_REG) &
+ (I2CSR_MCF|I2CSR_MIF)) == (I2CSR_MCF|I2CSR_MIF))
+ return (IIC_NOERR);
+ DELAY(10);
+ }
+
+ return (IIC_ETIMEOUT);
}
static int
@@ -189,16 +209,10 @@ i2c_probe(device_t dev)
{
struct i2c_softc *sc;
- sc = device_get_softc(dev);
-
- if (ofw_bus_is_compatible(dev, "fsl-i2c"))
- /* compatible */;
- else if (ofw_bus_is_compatible(dev, "fsl,imx-i2c"))
- /* compatible, i.MX SoC */
- sc->flags |= FSL_IMX_I2C;
- else
+ if (!ofw_bus_is_compatible(dev, "fsl,imx-i2c"))
return (ENXIO);
+ sc = device_get_softc(dev);
sc->rid = 0;
sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
@@ -212,7 +226,7 @@ i2c_probe(device_t dev)
sc->bsh = rman_get_bushandle(sc->res);
/* Enable I2C */
- i2c_write_reg(sc, I2C_CONTROL_REG, I2C_ENABLE);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN);
bus_release_resource(dev, SYS_RES_MEMORY, sc->rid, sc->res);
device_set_desc(dev, "I2C bus controller");
@@ -223,8 +237,8 @@ static int
i2c_attach(device_t dev)
{
struct i2c_softc *sc;
- sc = device_get_softc(dev);
+ sc = device_get_softc(dev);
sc->dev = dev;
sc->rid = 0;
@@ -251,22 +265,37 @@ i2c_attach(device_t dev)
bus_generic_attach(dev);
return (IIC_NOERR);
}
+
static int
i2c_repeated_start(device_t dev, u_char slave, int timeout)
{
struct i2c_softc *sc;
int error;
-
+
sc = device_get_softc(dev);
mtx_lock(&sc->mutex);
+
+ i2c_write_reg(sc, I2C_ADDR_REG, slave);
+ if ((i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MBB) == 0) {
+ mtx_unlock(&sc->mutex);
+ return (IIC_EBUSBSY);
+ }
+
/* Set repeated start condition */
- i2c_flag_set(sc, I2C_CONTROL_REG ,I2CCR_RSTA);
+ DELAY(10);
+ i2c_flag_set(sc, I2C_CONTROL_REG, I2CCR_RSTA);
+ DELAY(10);
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
- DELAY(1250);
- error = i2c_do_wait(dev, sc, 1, 1);
+ error = wait_for_iif(sc);
+
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+
mtx_unlock(&sc->mutex);
if (error)
@@ -279,29 +308,29 @@ static int
i2c_start(device_t dev, u_char slave, int timeout)
{
struct i2c_softc *sc;
- uint8_t status;
int error;
sc = device_get_softc(dev);
- DELAY(1000);
mtx_lock(&sc->mutex);
- status = i2c_read_reg(sc, I2C_STATUS_REG);
- /* Check if bus is idle or busy */
- if (status & I2CSR_MBB) {
- debugf("bus busy");
+ i2c_write_reg(sc, I2C_ADDR_REG, slave);
+ if (i2c_read_reg(sc, I2C_STATUS_REG) & I2CSR_MBB) {
mtx_unlock(&sc->mutex);
- i2c_stop(dev);
return (IIC_EBUSBSY);
}
/* Set start condition */
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX);
+ i2c_write_reg(sc, I2C_CONTROL_REG,
+ I2CCR_MEN | I2CCR_MSTA | I2CCR_TXAK);
+ DELAY(100);
+ i2c_write_reg(sc, I2C_CONTROL_REG,
+ I2CCR_MEN | I2CCR_MSTA | I2CCR_MTX | I2CCR_TXAK);
+ /* Clear status */
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
/* Write target address - LSB is R/W bit */
i2c_write_reg(sc, I2C_DATA_REG, slave);
- DELAY(1250);
- error = i2c_do_wait(dev, sc, 1, 1);
+ error = wait_for_iif(sc);
mtx_unlock(&sc->mutex);
if (error)
@@ -310,6 +339,7 @@ i2c_start(device_t dev, u_char slave, in
return (IIC_NOERR);
}
+
static int
i2c_stop(device_t dev)
{
@@ -318,7 +348,15 @@ i2c_stop(device_t dev)
sc = device_get_softc(dev);
mtx_lock(&sc->mutex);
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
- DELAY(1000);
+ DELAY(100);
+ /* Reset controller if bus still busy after STOP */
+ if (wait_for_nibb(sc) == IIC_ETIMEOUT) {
+ i2c_write_reg(sc, I2C_CONTROL_REG, 0);
+ DELAY(1000);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN | I2CCR_TXAK);
+
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
+ }
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -348,11 +386,11 @@ i2c_reset(device_t dev, u_char speed, u_
i2c_write_reg(sc, I2C_CONTROL_REG, 0x0);
i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
DELAY(1000);
- i2c_write_reg(sc, I2C_FDR_REG, baud_rate);
- if (!(sc->flags & FSL_IMX_I2C))
- i2c_write_reg(sc, I2C_DFSRR_REG, I2C_DFSSR_DIV);
- i2c_write_reg(sc, I2C_CONTROL_REG, I2C_ENABLE);
+
+ i2c_write_reg(sc, I2C_FDR_REG, 20);
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN);
DELAY(1000);
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
mtx_unlock(&sc->mutex);
return (IIC_NOERR);
@@ -362,12 +400,13 @@ static int
i2c_read(device_t dev, char *buf, int len, int *read, int last, int delay)
{
struct i2c_softc *sc;
- int error;
+ int error, reg;
sc = device_get_softc(dev);
*read = 0;
mtx_lock(&sc->mutex);
+
if (len) {
if (len == 1)
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
@@ -383,25 +422,27 @@ i2c_read(device_t dev, char *buf, int le
}
while (*read < len) {
- DELAY(1000);
- error = i2c_do_wait(dev, sc, 0, 0);
+ error = wait_for_icf(sc);
if (error) {
mtx_unlock(&sc->mutex);
return (error);
}
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
if ((*read == len - 2) && last) {
+ /* NO ACK on last byte */
i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_MSTA | I2CCR_TXAK);
}
if ((*read == len - 1) && last) {
- i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
+ /* Transfer done, remove master bit */
+ i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN |
I2CCR_TXAK);
}
- *buf++ = i2c_read_reg(sc, I2C_DATA_REG);
+ reg = i2c_read_reg(sc, I2C_DATA_REG);
+ *buf++ = reg;
(*read)++;
- DELAY(1250);
}
mtx_unlock(&sc->mutex);
@@ -419,10 +460,10 @@ i2c_write(device_t dev, const char *buf,
mtx_lock(&sc->mutex);
while (*sent < len) {
+ i2c_write_reg(sc, I2C_STATUS_REG, 0x0);
i2c_write_reg(sc, I2C_DATA_REG, *buf++);
- DELAY(1250);
- error = i2c_do_wait(dev, sc, 1, 0);
+ error = wait_for_iif(sc);
if (error) {
mtx_unlock(&sc->mutex);
return (error);
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 19:30:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id AEBB6CB5;
Thu, 20 Dec 2012 19:30:34 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 931D68FC12;
Thu, 20 Dec 2012 19:30:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJUYGW007868;
Thu, 20 Dec 2012 19:30:34 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJUYjN007867;
Thu, 20 Dec 2012 19:30:34 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201930.qBKJUYjN007867@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:30:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244504 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:30:34 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:30:34 2012
New Revision: 244504
URL: http://svnweb.freebsd.org/changeset/base/244504
Log:
Don't hide the diff.out file in the src directory.
Modified:
projects/portbuild/pxedust/pxedust
Modified: projects/portbuild/pxedust/pxedust
==============================================================================
--- projects/portbuild/pxedust/pxedust Thu Dec 20 18:38:02 2012 (r244503)
+++ projects/portbuild/pxedust/pxedust Thu Dec 20 19:30:34 2012 (r244504)
@@ -39,7 +39,7 @@ COMMON_ENV="TARGET=${TARGET} TARGET_ARCH
KERNCONF="PACKAGE_NODE_${TARGET}"
-LOGFILE="diff.out"
+LOGFILE="`pwd -P`/diff.out"
# using a src directory, populate a dst directory, or note differences
setup () {
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 19:40:59 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3E8DC19F;
Thu, 20 Dec 2012 19:40:59 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 229598FC0A;
Thu, 20 Dec 2012 19:40:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJex4m009490;
Thu, 20 Dec 2012 19:40:59 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJex5p009489;
Thu, 20 Dec 2012 19:40:59 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201940.qBKJex5p009489@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:40:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244505 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:40:59 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:40:58 2012
New Revision: 244505
URL: http://svnweb.freebsd.org/changeset/base/244505
Log:
Add a convenience function. Really instead this should be etcmerge or
something.
Modified:
projects/portbuild/pxedust/pxedust
Modified: projects/portbuild/pxedust/pxedust
==============================================================================
--- projects/portbuild/pxedust/pxedust Thu Dec 20 19:30:34 2012 (r244504)
+++ projects/portbuild/pxedust/pxedust Thu Dec 20 19:40:58 2012 (r244505)
@@ -39,7 +39,9 @@ COMMON_ENV="TARGET=${TARGET} TARGET_ARCH
KERNCONF="PACKAGE_NODE_${TARGET}"
-LOGFILE="`pwd -P`/diff.out"
+WHEREFROM="`pwd -P`"
+LOGFILE="${WHEREFROM}/diff.out"
+FIXUP="${WHEREFROM}/fixup.sh"
# using a src directory, populate a dst directory, or note differences
setup () {
@@ -172,4 +174,7 @@ echo "finished."
echo " be sure to check ${LOGFILE} for things that have to be adjusted manually:"
ls -al ${LOGFILE}
+grep "^diff" ${LOGFILE} | sed -e "s/^diff/cp -p/" > ${FIXUP}
+echo " if the < files are a strict superset of the > files, you can just run 'sh ${FIXUP}' ."
+
exit 0
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 19:45:59 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B1BCA3C2;
Thu, 20 Dec 2012 19:45:59 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 93C678FC0A;
Thu, 20 Dec 2012 19:45:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJjxPB010189;
Thu, 20 Dec 2012 19:45:59 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJjxNR010188;
Thu, 20 Dec 2012 19:45:59 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201945.qBKJjxNR010188@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:45:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244506 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:45:59 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:45:59 2012
New Revision: 244506
URL: http://svnweb.freebsd.org/changeset/base/244506
Log:
Fix a subtle mistake.
Modified:
projects/portbuild/pxedust/pxepackages
Modified: projects/portbuild/pxedust/pxepackages
==============================================================================
--- projects/portbuild/pxedust/pxepackages Thu Dec 20 19:40:58 2012 (r244505)
+++ projects/portbuild/pxedust/pxepackages Thu Dec 20 19:45:59 2012 (r244506)
@@ -86,7 +86,7 @@ for port in ${REQUIRED_PORTS}; do
fi
done
-echo "copying `ls -l ${PORTSDIR}/packages/All/`"
-cp -p ${PORTSDIR}/packages/All/* ${WHERETO} || exit 1
+echo "copying `ls -l ${PORTSDIR}/../packages/All/`"
+cp -p ${PORTSDIR}/../packages/All/* ${WHERETO} || exit 1
exit 0
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 19:47:46 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id DFCF74E8;
Thu, 20 Dec 2012 19:47:46 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id C50408FC0A;
Thu, 20 Dec 2012 19:47:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJlk53010467;
Thu, 20 Dec 2012 19:47:46 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJlkHC010466;
Thu, 20 Dec 2012 19:47:46 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201947.qBKJlkHC010466@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:47:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244507 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:47:46 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:47:46 2012
New Revision: 244507
URL: http://svnweb.freebsd.org/changeset/base/244507
Log:
Chicken-and-egg.
Modified:
projects/portbuild/pxedust/pxepackages
Modified: projects/portbuild/pxedust/pxepackages
==============================================================================
--- projects/portbuild/pxedust/pxepackages Thu Dec 20 19:45:59 2012 (r244506)
+++ projects/portbuild/pxedust/pxepackages Thu Dec 20 19:47:46 2012 (r244507)
@@ -86,7 +86,8 @@ for port in ${REQUIRED_PORTS}; do
fi
done
+mkdir -p ${WHERETO}/packages/All || exit 1
echo "copying `ls -l ${PORTSDIR}/../packages/All/`"
-cp -p ${PORTSDIR}/../packages/All/* ${WHERETO} || exit 1
+cp -p ${PORTSDIR}/../packages/All/* ${WHERETO}/packages/All || exit 1
exit 0
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 19:59:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 6275584D;
Thu, 20 Dec 2012 19:59:14 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2B0038FC16;
Thu, 20 Dec 2012 19:59:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKJxES7012075;
Thu, 20 Dec 2012 19:59:14 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKJxESu012074;
Thu, 20 Dec 2012 19:59:14 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212201959.qBKJxESu012074@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 19:59:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244509 - projects/portbuild/pxedust
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 19:59:14 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 19:59:13 2012
New Revision: 244509
URL: http://svnweb.freebsd.org/changeset/base/244509
Log:
Try to make this more robust.
Modified:
projects/portbuild/pxedust/pxepackages
Modified: projects/portbuild/pxedust/pxepackages
==============================================================================
--- projects/portbuild/pxedust/pxepackages Thu Dec 20 19:51:32 2012 (r244508)
+++ projects/portbuild/pxedust/pxepackages Thu Dec 20 19:59:13 2012 (r244509)
@@ -50,9 +50,6 @@ pbc=${PORTBUILD_CHECKOUT:-/var/portbuild
WHERETO=${ARCH_PACKAGES}/${TARGET}/${BRANCH}
-# We need to preserve group writability
-umask 002
-
uid=ports-${TARGET}
if [ ! -z "${PORTBUILD_GROUP}" ]; then
gid=${PORTBUILD_GROUP}
@@ -73,21 +70,19 @@ for port in ${REQUIRED_PORTS}; do
pkg_sufx=`cd ${PORTSDIR}/${port} && make -V PKG_SUFX`
if [ -z "${pkgname}" ]; then
echo "could not figure out PKGNAME for $port!"
+ exit 1
else
- package="${WHERETO}/${pkgname}${pkg_sufx}"
- if [ -e ${package} ]; then
+ package="${pkgname}${pkg_sufx}"
+ if [ -f ${WHERETO}/${package} ]; then
echo "skipping ${package} since it already exists"
else
echo "making ${package}"
dir=`cd ${PORTSDIR}/${port} && make -V PACKAGES`
mkdir -p ${dir}
- cd ${PORTSDIR}/${port} && make -DFORCE_PKG_REGISTER package
+ cd ${PORTSDIR}/${port} && make -DFORCE_PKG_REGISTER package || exit 1
+ cp -p ${dir}/${package} ${WHERETO} || exit 1
fi
fi
done
-mkdir -p ${WHERETO}/packages/All || exit 1
-echo "copying `ls -l ${PORTSDIR}/../packages/All/`"
-cp -p ${PORTSDIR}/../packages/All/* ${WHERETO}/packages/All || exit 1
-
exit 0
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 20:41:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 90D351A7;
Thu, 20 Dec 2012 20:41:02 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 75F208FC0A;
Thu, 20 Dec 2012 20:41:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKKf25P018395;
Thu, 20 Dec 2012 20:41:02 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKKf2eA018394;
Thu, 20 Dec 2012 20:41:02 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201212202041.qBKKf2eA018394@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 20 Dec 2012 20:41:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244511 - projects/efika_mx/sys/arm/freescale/imx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 20:41:02 -0000
Author: ray
Date: Thu Dec 20 20:41:01 2012
New Revision: 244511
URL: http://svnweb.freebsd.org/changeset/base/244511
Log:
Switch to IMX local i2c driver.
Sponsored by: FreeBSD Foundation
Modified:
projects/efika_mx/sys/arm/freescale/imx/imx.files
Modified: projects/efika_mx/sys/arm/freescale/imx/imx.files
==============================================================================
--- projects/efika_mx/sys/arm/freescale/imx/imx.files Thu Dec 20 20:18:27 2012 (r244510)
+++ projects/efika_mx/sys/arm/freescale/imx/imx.files Thu Dec 20 20:41:01 2012 (r244511)
@@ -37,4 +37,4 @@ dev/usb/controller/ehci_imx.c optional
arm/freescale/imx/imx_wdog.c optional imxwdt
# i2c
-powerpc/mpc85xx/i2c.c optional fsliic
+arm/freescale/imx/i2c.c optional fsliic
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 22:22:57 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E6909723;
Thu, 20 Dec 2012 22:22:57 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id CB1BF8FC14;
Thu, 20 Dec 2012 22:22:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKMMviB033697;
Thu, 20 Dec 2012 22:22:57 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKMMvaR033696;
Thu, 20 Dec 2012 22:22:57 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212202222.qBKMMvaR033696@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 22:22:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244513 - projects/portbuild/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 22:22:58 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 22:22:57 2012
New Revision: 244513
URL: http://svnweb.freebsd.org/changeset/base/244513
Log:
Add VCS_PORTBUILD_REPOSITORY.
Modified:
projects/portbuild/conf/server.conf
Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf Thu Dec 20 22:07:47 2012 (r244512)
+++ projects/portbuild/conf/server.conf Thu Dec 20 22:22:57 2012 (r244513)
@@ -136,8 +136,12 @@ VCS_REPOSITORY="svn://svn.FreeBSD.org"
#VCS_REPOSITORY="svn://svn0.us-east.FreeBSD.org"
# West Coast USA mirror
#VCS_REPOSITORY="svn://svn0.us-west.FreeBSD.org"
+# source base subdirectory
VCS_SRC_REPOSITORY="${VCS_REPOSITORY}/base"
+# ports tree subdirectory
VCS_PORTS_REPOSITORY="${VCS_REPOSITORY}/ports"
+# portbuild subdirectory
+VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild"
# used to create URLs in HTML summary pages (see process*)
VCSWEB="http://svnweb.freebsd.org/ports/head"
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 22:31:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 7BECCE5F;
Thu, 20 Dec 2012 22:31:53 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 619FE8FC12;
Thu, 20 Dec 2012 22:31:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKMVrYx035043;
Thu, 20 Dec 2012 22:31:53 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKMVrV9035042;
Thu, 20 Dec 2012 22:31:53 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212202231.qBKMVrV9035042@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 22:31:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244516 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 22:31:53 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 22:31:52 2012
New Revision: 244516
URL: http://svnweb.freebsd.org/changeset/base/244516
Log:
A script to kickstart a portbuild (pointyhat) installation from scratch.
Added:
projects/portbuild/tools/mkportbuild (contents, props changed)
Added: projects/portbuild/tools/mkportbuild
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/portbuild/tools/mkportbuild Thu Dec 20 22:31:52 2012 (r244516)
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# server-side script to setup the portbuild ZFS volume, delegate its
+# administration, and check out the repository. Must be run as root.
+#
+# Designed to be run before anything else.
+#
+
+DEFAULT_PORTBUILD_USER=portbuild
+DEFAULT_VCS_CHECKOUT_COMMAND=svn checkout
+DEFAULT_VCS_REPOSITORY=svn://svn.FreeBSD.org
+DEFAULT_ZFS_VOLUME=a
+DEFAULT_ZFS_PERMISSIONSET=clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot
+
+if [ `id -u` != 0 ]; then
+ echo "$0 must be run as root."
+ exit 1
+fi
+
+if [ -z "${PORTBUILD_USER}" ]; then
+ echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}."
+ exit 1
+fi
+if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then
+ VCS_CHECKOUT_COMMAND=${DEFAULT_VCS_CHECKOUT_COMMAND}
+fi
+if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; then
+ echo "You have not set VCS_PORTBUILD_REPOSITORY. I will try to set it from VCS_REPOSITORY."
+ if [ -z "${VCS_REPOSITORY}" ]; then
+ echo "You have not set VCS_REPOSITORY. I will use the default, ${DEFAULT_VCS_REPOSITORY}."
+ VCS_REPOSITORY=${DEFAULT_VCS_REPOSITORY}
+ fi
+ VCS_PORTBUILD_REPOSITORY=${VCS_REPOSITORY}/base/projects/portbuild
+fi
+if [ -z "${ZFS_VOLUME}" ]; then
+ echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}."
+ exit 1
+fi
+ZFS_MOUNTPOINT="/${ZFS_VOLUME}"
+if [ -z "${ZFS_PERMISSIONSET}" ]; then
+ echo "You have not set ZFS_PERMISSIONSET. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET}."
+fi
+
+# XXX MCL copy to setup instructions
+# sprinkle magic fairy dust to help delegate permissions
+sysctl vfs.usermount=1
+sysctl vfs.zfs.super_owner=1
+
+name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}`
+if [ ! -z "${name}" ]; then
+ echo "ZFS volume ${ZFS_VOLUME} does not exist. You must create it first."
+ exit 1
+fi
+mountpoint=`zfs list -H -t filesystem -o mountpoint ${ZFS_VOLUME}`
+if [ ! -z "${mountpoint}" ]; then
+ echo "ZFS volume ${ZFS_VOLUME} is not mounted. I'll mount it for you."
+ zfs mount ${ZFS_VOLUME} || exit 1
+fi
+chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT} || exit 1
+
+# reset the "zfsadmin" permission set if it already exists.
+zfs unallow -s @zfsadmin ${ZFS_VOLUME} 2> /dev/null
+zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null
+
+# create the "zfsadmin" permission set.
+zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME} || exit 1
+
+# delegate the "zfsadmin" permission set to the PORTBUILD_USER.
+zfs allow -du ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME} || exit 1
+zfs allow -lu ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME} || exit 1
+
+echo "results of ZFS operations:"
+zfs list ${ZFS_VOLUME}
+zfs allow ${ZFS_VOLUME}
+
+# create a place to hold the repository
+su -m ${PORTBUILD_USER} -c "zfs create ${ZFS_VOLUME}/portbuild" || exit 1
+
+echo "checking out the repository ..."
+${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild || exit 1
+
+echo "$0: done. You should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf."
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 22:37:16 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 5549CCD;
Thu, 20 Dec 2012 22:37:16 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 393438FC0C;
Thu, 20 Dec 2012 22:37:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKMbGri035844;
Thu, 20 Dec 2012 22:37:16 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKMbGNZ035843;
Thu, 20 Dec 2012 22:37:16 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201212202237.qBKMbGNZ035843@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 20 Dec 2012 22:37:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244517 - projects/efika_mx/sys/arm/freescale/imx
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 22:37:16 -0000
Author: ray
Date: Thu Dec 20 22:37:15 2012
New Revision: 244517
URL: http://svnweb.freebsd.org/changeset/base/244517
Log:
Add GPIO driver.
Sponsored by: FreeBSD Foundation
Modified:
projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c
Modified: projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c
==============================================================================
--- projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c Thu Dec 20 22:31:52 2012 (r244516)
+++ projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c Thu Dec 20 22:37:15 2012 (r244517)
@@ -94,7 +94,7 @@ struct imx51_gpio_softc {
device_t dev;
struct mtx sc_mtx;
struct resource *sc_res[11]; /* 1 x mem, 2 x IRQ, 8 x IRQ */
- void *gpio_ih[11]; /* 1 pointer is not a big waste */
+ void *gpio_ih[11]; /* 1 ptr is not a big waste */
int sc_l_irq; /* Last irq resource */
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 22:49:05 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8B0864A5;
Thu, 20 Dec 2012 22:49:05 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6FFC28FC12;
Thu, 20 Dec 2012 22:49:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKMn5Cc037575;
Thu, 20 Dec 2012 22:49:05 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKMn5fE037574;
Thu, 20 Dec 2012 22:49:05 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212202249.qBKMn5fE037574@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 22:49:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244518 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 22:49:05 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 22:49:04 2012
New Revision: 244518
URL: http://svnweb.freebsd.org/changeset/base/244518
Log:
Add the default qmanager database acl entry.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Thu Dec 20 22:37:15 2012 (r244517)
+++ projects/portbuild/tools/addarch Thu Dec 20 22:49:04 2012 (r244518)
@@ -141,6 +141,8 @@ else
echo "${QMANAGER} is not running. run /usr/local/etc/rc.d/qmanager.sh and re-run this script."
exit 1
else
+ echo "adding default entry to qmanager ..."
+ python ${pbc}/qmanager/qclient add_acl name=deny_all uidlist= gidlist= sense=0
echo "adding ${arch} to qmanager ..."
python ${pbc}/qmanager/qclient add_acl name=ports-${arch} uidlist=${uid} gidlist=${gid} sense=1
echo "... done."
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 22:49:14 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B4D2D5B8;
Thu, 20 Dec 2012 22:49:14 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 8D9F08FC12;
Thu, 20 Dec 2012 22:49:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKMnELQ037635;
Thu, 20 Dec 2012 22:49:14 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKMnEgL037634;
Thu, 20 Dec 2012 22:49:14 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212202249.qBKMnEgL037634@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 20 Dec 2012 22:49:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244519 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 22:49:14 -0000
Author: linimon (doc,ports committer)
Date: Thu Dec 20 22:49:14 2012
New Revision: 244519
URL: http://svnweb.freebsd.org/changeset/base/244519
Log:
Make it actually work.
Modified:
projects/portbuild/tools/mkportbuild
Modified: projects/portbuild/tools/mkportbuild
==============================================================================
--- projects/portbuild/tools/mkportbuild Thu Dec 20 22:49:04 2012 (r244518)
+++ projects/portbuild/tools/mkportbuild Thu Dec 20 22:49:14 2012 (r244519)
@@ -6,11 +6,11 @@
# Designed to be run before anything else.
#
-DEFAULT_PORTBUILD_USER=portbuild
-DEFAULT_VCS_CHECKOUT_COMMAND=svn checkout
-DEFAULT_VCS_REPOSITORY=svn://svn.FreeBSD.org
-DEFAULT_ZFS_VOLUME=a
-DEFAULT_ZFS_PERMISSIONSET=clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot
+DEFAULT_PORTBUILD_USER="portbuild"
+DEFAULT_VCS_CHECKOUT_COMMAND="svn checkout"
+DEFAULT_VCS_REPOSITORY="svn://svn.FreeBSD.org"
+DEFAULT_ZFS_VOLUME="a"
+DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot"
if [ `id -u` != 0 ]; then
echo "$0 must be run as root."
@@ -22,7 +22,7 @@ if [ -z "${PORTBUILD_USER}" ]; then
exit 1
fi
if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then
- VCS_CHECKOUT_COMMAND=${DEFAULT_VCS_CHECKOUT_COMMAND}
+ VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}"
fi
if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; then
echo "You have not set VCS_PORTBUILD_REPOSITORY. I will try to set it from VCS_REPOSITORY."
@@ -30,7 +30,7 @@ if [ -z "${VCS_PORTBUILD_REPOSITORY}" ];
echo "You have not set VCS_REPOSITORY. I will use the default, ${DEFAULT_VCS_REPOSITORY}."
VCS_REPOSITORY=${DEFAULT_VCS_REPOSITORY}
fi
- VCS_PORTBUILD_REPOSITORY=${VCS_REPOSITORY}/base/projects/portbuild
+ VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild"
fi
if [ -z "${ZFS_VOLUME}" ]; then
echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}."
@@ -39,6 +39,7 @@ fi
ZFS_MOUNTPOINT="/${ZFS_VOLUME}"
if [ -z "${ZFS_PERMISSIONSET}" ]; then
echo "You have not set ZFS_PERMISSIONSET. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET}."
+ ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}"
fi
# XXX MCL copy to setup instructions
@@ -47,12 +48,12 @@ sysctl vfs.usermount=1
sysctl vfs.zfs.super_owner=1
name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}`
-if [ ! -z "${name}" ]; then
+if [ -z "${name}" ]; then
echo "ZFS volume ${ZFS_VOLUME} does not exist. You must create it first."
exit 1
fi
mountpoint=`zfs list -H -t filesystem -o mountpoint ${ZFS_VOLUME}`
-if [ ! -z "${mountpoint}" ]; then
+if [ -z "${mountpoint}" ]; then
echo "ZFS volume ${ZFS_VOLUME} is not mounted. I'll mount it for you."
zfs mount ${ZFS_VOLUME} || exit 1
fi
@@ -74,9 +75,11 @@ zfs list ${ZFS_VOLUME}
zfs allow ${ZFS_VOLUME}
# create a place to hold the repository
-su -m ${PORTBUILD_USER} -c "zfs create ${ZFS_VOLUME}/portbuild" || exit 1
+if [ ! -d ${ZFS_MOUNTPOINT}/portbuild ]; then
+ su -m ${PORTBUILD_USER} -c "zfs create ${ZFS_VOLUME}/portbuild" || exit 1
+fi
echo "checking out the repository ..."
-${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild || exit 1
+su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1
echo "$0: done. You should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf."
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 23:01:54 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2D13596D;
Thu, 20 Dec 2012 23:01:54 +0000 (UTC)
(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 105A48FC0C;
Thu, 20 Dec 2012 23:01:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKN1rQO039662;
Thu, 20 Dec 2012 23:01:53 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKN1r2M039661;
Thu, 20 Dec 2012 23:01:53 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201212202301.qBKN1r2M039661@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 20 Dec 2012 23:01:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244520 - projects/bhyve/usr.sbin/bhyve
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 23:01:54 -0000
Author: grehan
Date: Thu Dec 20 23:01:53 2012
New Revision: 244520
URL: http://svnweb.freebsd.org/changeset/base/244520
Log:
Change thread name for the main kqueue event loop to "<vmname> mevent" so
it can be easily distinguished from other non-vCPU threads in forthcoming
changes.
Obtained from: NetApp
Modified:
projects/bhyve/usr.sbin/bhyve/mevent.c
Modified: projects/bhyve/usr.sbin/bhyve/mevent.c
==============================================================================
--- projects/bhyve/usr.sbin/bhyve/mevent.c Thu Dec 20 22:49:14 2012 (r244519)
+++ projects/bhyve/usr.sbin/bhyve/mevent.c Thu Dec 20 23:01:53 2012 (r244520)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <pthread.h>
+#include <pthread_np.h>
#include "mevent.h"
@@ -55,6 +56,8 @@ __FBSDID("$FreeBSD$");
#define MEV_DISABLE 2
#define MEV_DEL_PENDING 3
+extern char *vmname;
+
static pthread_t mevent_tid;
static int mevent_pipefd[2];
static pthread_mutex_t mevent_lmutex = PTHREAD_MUTEX_INITIALIZER;
@@ -356,6 +359,15 @@ mevent_delete_close(struct mevent *evp)
return (mevent_delete_event(evp, 1));
}
+static void
+mevent_set_name(void)
+{
+ char tname[MAXCOMLEN + 1];
+
+ snprintf(tname, sizeof(tname), "%s mevent", vmname);
+ pthread_set_name_np(mevent_tid, tname);
+}
+
void
mevent_dispatch(void)
{
@@ -367,6 +379,7 @@ mevent_dispatch(void)
int ret;
mevent_tid = pthread_self();
+ mevent_set_name();
mfd = kqueue();
assert(mfd > 0);
From owner-svn-src-projects@FreeBSD.ORG Thu Dec 20 23:06:47 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E4AB2ACB;
Thu, 20 Dec 2012 23:06:47 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id B067B8FC0C;
Thu, 20 Dec 2012 23:06:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKN6lG5040521;
Thu, 20 Dec 2012 23:06:47 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKN6lrf040520;
Thu, 20 Dec 2012 23:06:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212202306.qBKN6lrf040520@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 20 Dec 2012 23:06:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244521 - projects/mtree/contrib/install
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 23:06:48 -0000
Author: brooks
Date: Thu Dec 20 23:06:47 2012
New Revision: 244521
URL: http://svnweb.freebsd.org/changeset/base/244521
Log:
Don't unlink or displace the file just before calling install(). That's
on of the first things it does.
Modified:
projects/mtree/contrib/install/xinstall.c
Modified: projects/mtree/contrib/install/xinstall.c
==============================================================================
--- projects/mtree/contrib/install/xinstall.c Thu Dec 20 23:01:53 2012 (r244520)
+++ projects/mtree/contrib/install/xinstall.c Thu Dec 20 23:06:47 2012 (r244521)
@@ -371,33 +371,16 @@ main(int argc, char *argv[])
/* NOTREACHED */
}
- if (!no_target) {
+ if (!no_target && !dolink) {
/* makelink() handles checks for links */
- if (!dolink) {
- if (stat(*argv, &from_sb))
- err(1, "%s: stat", *argv);
- if (!S_ISREG(to_sb.st_mode))
- errx(1, "%s: not a regular file", to_name);
- if (to_sb.st_dev == from_sb.st_dev &&
- to_sb.st_ino == from_sb.st_ino)
- errx(1, "%s and %s are the same file", *argv,
- to_name);
- }
- /*
- * Unlink now... avoid ETXTBSY errors later. Try and turn
- * off the append/immutable bits -- if we fail, go ahead,
- * it might work.
- */
-#if ! HAVE_NBTOOL_CONFIG_H
-#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | SF_IMMUTABLE | SF_APPEND)
- if (to_sb.st_flags & NOCHANGEBITS)
- (void)chflags(to_name,
- to_sb.st_flags & ~(NOCHANGEBITS));
-#endif
- if (dobackup)
- backup(to_name);
- else if (!dorename)
- (void)unlink(to_name);
+ if (stat(*argv, &from_sb))
+ err(1, "%s: stat", *argv);
+ if (!S_ISREG(to_sb.st_mode))
+ errx(1, "%s: not a regular file", to_name);
+ if (to_sb.st_dev == from_sb.st_dev &&
+ to_sb.st_ino == from_sb.st_ino)
+ errx(1, "%s and %s are the same file", *argv,
+ to_name);
}
install(*argv, to_name, iflags);
exit(0);
@@ -676,6 +659,7 @@ install(char *from_name, char *to_name,
* it might work.
*/
#if ! HAVE_NBTOOL_CONFIG_H
+#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | SF_IMMUTABLE | SF_APPEND)
if (stat(to_name, &to_sb) == 0 &&
to_sb.st_flags & (NOCHANGEBITS))
(void)chflags(to_name, to_sb.st_flags & ~(NOCHANGEBITS));
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 02:42:36 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 890C0523;
Fri, 21 Dec 2012 02:42:36 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6E4698FC0C;
Fri, 21 Dec 2012 02:42:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBL2gaYH072867;
Fri, 21 Dec 2012 02:42:36 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBL2gaCF072866;
Fri, 21 Dec 2012 02:42:36 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212210242.qBL2gaCF072866@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 21 Dec 2012 02:42:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244528 - projects/portbuild/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 02:42:36 -0000
Author: linimon (doc,ports committer)
Date: Fri Dec 21 02:42:35 2012
New Revision: 244528
URL: http://svnweb.freebsd.org/changeset/base/244528
Log:
Remove comment that is now obsolete.
Modified:
projects/portbuild/tools/mkportbuild
Modified: projects/portbuild/tools/mkportbuild
==============================================================================
--- projects/portbuild/tools/mkportbuild Fri Dec 21 02:18:11 2012 (r244527)
+++ projects/portbuild/tools/mkportbuild Fri Dec 21 02:42:35 2012 (r244528)
@@ -42,7 +42,6 @@ if [ -z "${ZFS_PERMISSIONSET}" ]; then
ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}"
fi
-# XXX MCL copy to setup instructions
# sprinkle magic fairy dust to help delegate permissions
sysctl vfs.usermount=1
sysctl vfs.zfs.super_owner=1
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 11:08:49 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 55D58505;
Fri, 21 Dec 2012 11:08:49 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 37C8B8FC0A;
Fri, 21 Dec 2012 11:08:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLB8n3D047409;
Fri, 21 Dec 2012 11:08:49 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLB8jwa047382;
Fri, 21 Dec 2012 11:08:45 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212211108.qBLB8jwa047382@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 21 Dec 2012 11:08:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 11:08:49 -0000
Author: mav
Date: Fri Dec 21 11:08:44 2012
New Revision: 244533
URL: http://svnweb.freebsd.org/changeset/base/244533
Log:
Make callout_reset_bt() handle both relative and absolute struct bintime
arguments. That allows to remove ticks argument and simplify consumers
code in some cases. Add new flags to specify absolute time and alignment
to hardclock() calls. Refactor the rest of APIs to reflect above change.
X_flags() functions are not required any more, so APIs are more compact.
Simplify poll() and select() code using above relative bintime support.
Rewrite kevent() timeout implementation using absolute bintime.
Modified:
projects/calloutng/share/man/man9/Makefile
projects/calloutng/share/man/man9/condvar.9
projects/calloutng/share/man/man9/sleep.9
projects/calloutng/share/man/man9/sleepqueue.9
projects/calloutng/share/man/man9/timeout.9
projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c
projects/calloutng/sys/dev/random/randomdev_soft.c
projects/calloutng/sys/dev/syscons/syscons.c
projects/calloutng/sys/kern/kern_condvar.c
projects/calloutng/sys/kern/kern_event.c
projects/calloutng/sys/kern/kern_resource.c
projects/calloutng/sys/kern/kern_synch.c
projects/calloutng/sys/kern/kern_tc.c
projects/calloutng/sys/kern/kern_time.c
projects/calloutng/sys/kern/kern_timeout.c
projects/calloutng/sys/kern/subr_log.c
projects/calloutng/sys/kern/subr_param.c
projects/calloutng/sys/kern/subr_sleepqueue.c
projects/calloutng/sys/kern/sys_generic.c
projects/calloutng/sys/sys/callout.h
projects/calloutng/sys/sys/condvar.h
projects/calloutng/sys/sys/mutex.h
projects/calloutng/sys/sys/rwlock.h
projects/calloutng/sys/sys/sleepqueue.h
projects/calloutng/sys/sys/sx.h
projects/calloutng/sys/sys/systm.h
projects/calloutng/sys/sys/time.h
Modified: projects/calloutng/share/man/man9/Makefile
==============================================================================
--- projects/calloutng/share/man/man9/Makefile Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/share/man/man9/Makefile Fri Dec 21 11:08:44 2012 (r244533)
@@ -1197,15 +1197,12 @@ MLINKS+=signal.9 cursig.9 \
signal.9 trapsignal.9
MLINKS+=sleep.9 msleep.9 \
sleep.9 msleep_bt.9 \
- sleep.9 msleep_flags.9 \
sleep.9 msleep_spin.9 \
- sleep.9 msleep_spin_flags.9 \
+ sleep.9 msleep_spin_bt.9 \
sleep.9 pause.9 \
sleep.9 pause_bt.9 \
- sleep.9 pause_flags.9 \
sleep.9 tsleep.9 \
sleep.9 tsleep_bt.9 \
- sleep.9 tsleep_flags.9 \
sleep.9 wakeup.9 \
sleep.9 wakeup_one.9
MLINKS+=sleepqueue.9 init_sleepqueues.9 \
@@ -1221,7 +1218,6 @@ MLINKS+=sleepqueue.9 init_sleepqueues.9
sleepqueue.9 sleepq_remove.9 \
sleepqueue.9 sleepq_set_timeout.9 \
sleepqueue.9 sleepq_set_timeout_bt.9 \
- sleepqueue.9 sleepq_set_timeout_flags.9 \
sleepqueue.9 sleepq_signal.9 \
sleepqueue.9 sleepq_timedwait.9 \
sleepqueue.9 sleepq_timedwait_sig.9 \
@@ -1345,10 +1341,8 @@ MLINKS+=timeout.9 callout.9 \
timeout.9 callout_pending.9 \
timeout.9 callout_reset.9 \
timeout.9 callout_reset_bt.9 \
- timeout.9 callout_reset_flags.9 \
timeout.9 callout_reset_on.9 \
timeout.9 callout_reset_bt_on.9 \
- timeout.9 callout_reset_flags_on.9 \
timeout.9 callout_schedule.9 \
timeout.9 callout_stop.9 \
timeout.9 untimeout.9
Modified: projects/calloutng/share/man/man9/condvar.9
==============================================================================
--- projects/calloutng/share/man/man9/condvar.9 Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/share/man/man9/condvar.9 Fri Dec 21 11:08:44 2012 (r244533)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 14, 2012
+.Dd December 21, 2012
.Dt CONDVAR 9
.Os
.Sh NAME
@@ -38,10 +38,8 @@
.Nm cv_wait_unlock ,
.Nm cv_timedwait ,
.Nm cv_timedwait_bt ,
-.Nm cv_timedwait_flags ,
.Nm cv_timedwait_sig ,
.Nm cv_timedwait_sig_bt ,
-.Nm cv_timedwait_sig_flags ,
.Nm cv_signal ,
.Nm cv_broadcast ,
.Nm cv_broadcastpri ,
@@ -64,16 +62,13 @@
.Ft int
.Fn cv_timedwait "struct cv *cvp" "lock" "int timo"
.Ft int
-.Fn cv_timedwait_bt "struct cv *cvp" "lock" "struct bintime *bt" "int flags"
-.Ft int
-.Fn cv_timedwait_flags "struct cv *cvp" "lock" "int timo" "int flags"
+.Fn cv_timedwait_bt "struct cv *cvp" "lock" "struct bintime bt" \
+"struct bintime pr" "int flags"
.Ft int
.Fn cv_timedwait_sig "struct cv *cvp" "lock" "int timo"
.Ft int
-.Fn cv_timedwait_sig_bt "struct cv *cvp" "lock" "struct bintime *bt" \
-"struct bintime *pr"
-.Ft int
-.Fn cv_timedwait_sig_flags "struct cv *cvp" "lock" "int timo" "int flags"
+.Fn cv_timedwait_sig_bt "struct cv *cvp" "lock" "struct bintime bt" \
+"struct bintime pr" "int flags"
.Ft void
.Fn cv_signal "struct cv *cvp"
.Ft void
Modified: projects/calloutng/share/man/man9/sleep.9
==============================================================================
--- projects/calloutng/share/man/man9/sleep.9 Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/share/man/man9/sleep.9 Fri Dec 21 11:08:44 2012 (r244533)
@@ -25,20 +25,17 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 16, 2012
+.Dd December 21, 2012
.Dt SLEEP 9
.Os
.Sh NAME
.Nm msleep ,
-.Nm msleep_flags ,
.Nm msleep_bt ,
.Nm msleep_spin ,
-.Nm msleep_spin_flags ,
+.Nm msleep_spin_bt ,
.Nm pause ,
-.Nm pause_flags ,
.Nm pause_bt ,
.Nm tsleep ,
-.Nm tsleep_flags ,
.Nm tsleep_bt ,
.Nm wakeup
.Nd wait for events
@@ -49,30 +46,23 @@
.Ft int
.Fn msleep "void *chan" "struct mtx *mtx" "int priority" "const char *wmesg" "int timo"
.Ft int
-.Fn msleep_flags "void *chan" "struct mtx *mtx" "int priority" \
-"const char *wmesg" "int timo" "int flags"
-.Ft int
.Fn msleep_bt "void *chan" "struct mtx *mtx" "int priority" \
-"const char *wmesg" "struct bintime *bt" "struct bintime *pr"
+"const char *wmesg" "struct bintime bt" "struct bintime pr" "int flags"
.Ft int
.Fn msleep_spin "void *chan" "struct mtx *mtx" "const char *wmesg" "int timo"
.Ft int
-.Fn msleep_spin_flags "void *chan" "struct mtx *mtx" "const char *wmesg" \
-"int timo" "int flags"
+.Fn msleep_spin_bt "void *chan" "struct mtx *mtx" "const char *wmesg" \
+"struct bintime bt" "struct bintime pr" "int flags"
.Ft void
.Fn pause "const char *wmesg" "int timo"
.Ft void
-.Fn pause_flags "const char *wmesg" "int timo" "int flags"
-.Ft void
-.Fn pause_bt "const char *wmesg" "struct bintime *bt" "struct bintime *pr"
+.Fn pause_bt "const char *wmesg" "struct bintime bt" "struct bintime pr" \
+ "int flags"
.Ft int
.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo"
.Ft int
-.Fn tsleep_flags "void *chan" "int priority" "const char *wmesg" "int timo" \
-"int flags"
-.Ft int
.Fn tsleep_bt "void *chan" "int priority" "const char *wmesg" \
-"struct bintime *bt" "struct bintime *pr"
+"struct bintime bt" "struct bintime pr" "int flags"
.Ft void
.Fn wakeup "void *chan"
.Ft void
@@ -177,8 +167,8 @@ then the sleep function will return
The parameter
.Fa flags
allows to pass additional
-.Fn callout_reset_flags
-flags to specify relative event precision.
+.Fn callout_reset_bt
+flags.
.Pp
.Fn msleep_bt ,
.Fn pause_bt
Modified: projects/calloutng/share/man/man9/sleepqueue.9
==============================================================================
--- projects/calloutng/share/man/man9/sleepqueue.9 Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/share/man/man9/sleepqueue.9 Fri Dec 21 11:08:44 2012 (r244533)
@@ -23,7 +23,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 14, 2012
+.Dd December 21, 2012
.Dt SLEEPQUEUE 9
.Os
.Sh NAME
@@ -41,7 +41,6 @@
.Nm sleepq_remove ,
.Nm sleepq_signal ,
.Nm sleepq_set_timeout ,
-.Nm sleepq_set_timeout_flags ,
.Nm sleepq_set_timeout_bt ,
.Nm sleepq_sleepcnt ,
.Nm sleepq_timedwait ,
@@ -82,10 +81,8 @@
.Ft void
.Fn sleepq_set_timeout "void *wchan" "int timo"
.Ft void
-.Fn sleepq_set_timeout_flags "void *wchan" "int timo" "int flags"
-.Ft void
-.Fn sleepq_set_timeout_bt "void *wchan" "struct bintime *bt" \
-"struct bintime *pr"
+.Fn sleepq_set_timeout_bt "void *wchan" "struct bintime bt" \
+"struct bintime pr" "int flags"
.Ft u_int
.Fn sleepq_sleepcnt "void *wchan" "int queue"
.Ft int
Modified: projects/calloutng/share/man/man9/timeout.9
==============================================================================
--- projects/calloutng/share/man/man9/timeout.9 Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/share/man/man9/timeout.9 Fri Dec 21 11:08:44 2012 (r244533)
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 16, 2012
+.Dd December 21, 2012
.Dt TIMEOUT 9
.Os
.Sh NAME
@@ -42,11 +42,11 @@
.Nm callout_stop ,
.Nm callout_drain ,
.Nm callout_reset ,
-.Nm callout_reset_flags ,
.Nm callout_reset_on ,
-.Nm callout_reset_flags_on ,
-.Nm callout_reset_bt_on ,
.Nm callout_reset_curcpu ,
+.Nm callout_reset_bt ,
+.Nm callout_reset_bt_on ,
+.Nm callout_reset_bt_curcpu ,
.Nm callout_schedule ,
.Nm callout_schedule_on ,
.Nm callout_schedule_curcpu ,
@@ -82,17 +82,11 @@ struct callout_handle handle = CALLOUT_H
.Ft int
.Fn callout_reset "struct callout *c" "int ticks" "timeout_t *func" "void *arg"
.Ft int
-.Fn callout_reset_flags "struct callout *c" "int ticks" "timeout_t *func" \
-"void *arg" "int flags"
-.Ft int
.Fn callout_reset_on "struct callout *c" "int ticks" "timeout_t *func" \
"void *arg" "int cpu"
.Ft int
-.Fn callout_reset_flags_on "struct callout *c" "int ticks" "timeout_t *func" \
-"void *arg" "int cpu" "int flags"
-.Ft int
-.Fn callout_reset_bt_on "struct callout *c" "struct bintime *bt" \
-"struct bintime *pr" "timeout_t *func" "void *arg" "int cpu" "int flags"
+.Fn callout_reset_bt_on "struct callout *c" "struct bintime bt" \
+"struct bintime pr" "timeout_t *func" "void *arg" "int cpu" "int flags"
.Ft int
.Fn callout_reset_curcpu "struct callout *c" "int ticks" "timeout_t *func" \
"void *arg"
@@ -339,38 +333,38 @@ and
but take an extra parameter specifying the target CPU for the callout.
.Pp
The function
-.Fn callout_reset_flags_on
-is equivalent to
-.Fn callout_reset_on
-but takes an extra parameter
-.Fa flags .
+.Fn callout_reset_bt_on
+allows to get higher time resolution, taking absolute time since boot
+in form of struct bintime *, as returned by
+.Fn binuptime
+or
+.Fn getbinuptime
+functions, and precision, instead of relative ticks count.
+If specified time is in past, it will be silently converted to present
+to run handler as soon as possible.
+.Pp
The following
.Fa flags
may be specified:
.Bl -tag -width ".Dv C_DIRECT_EXEC"
+.It Dv C_ALSOLUTE
+Handle the
+.Fa bt
+argument as absolute time of the event since boot, as returned by
+.Fn binuptime
+function.
.It Dv C_DIRECT_EXEC
Run handler directly from hardware interrupt context instead of softclock swi.
It is faster, but puts more constraints on handlers.
Handlers may use only spin mutexes for locking, and they must be fast because
they run with absolute priority.
-.It Fn C_PRELSET
+.It Fn C_PREL
Specifies relative event time precision as binary logarithm of time interval
divided by acceptable time deviation: 1 -- 1/2, 2 -- 1/4, etc.
Smaller value allows to aggregate more events in one timer interrupt to
reduce processing overhead and power consumption.
.El
.Pp
-The function
-.Fn callout_reset_bt_on
-allows to get higher time resolution, taking absolute time since boot
-in form of struct bintime *, as returned by
-.Fn binuptime
-or
-.Fn getbinuptime
-functions, and precision, instead of relative ticks count.
-If specified time is in past, it will be silently converted to present
-to run handler as soon as possible.
-.Pp
The functions
.Fn callout_reset_curcpu
and
Modified: projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c
==============================================================================
--- projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -198,7 +198,8 @@ atkbdtimeout(void *arg)
if (kbdd_check_char(kbd))
kbdd_intr(kbd, NULL);
}
- callout_reset_flags(&sc->callout, hz, atkbdtimeout, dev, C_PRELSET(0));
+ callout_reset_bt(&sc->callout, ticks2bintime(hz), zero_bt,
+ atkbdtimeout, dev, C_PREL(0) | C_HARDCLOCK);
}
DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0);
Modified: projects/calloutng/sys/dev/random/randomdev_soft.c
==============================================================================
--- projects/calloutng/sys/dev/random/randomdev_soft.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/dev/random/randomdev_soft.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -282,8 +282,9 @@ random_kthread(void *arg __unused)
random_kthread_control = 0;
/* Work done, so don't belabour the issue */
- msleep_spin_flags(&random_kthread_control, &harvest_mtx,
- "-", hz / 10, C_PRELSET(1));
+ msleep_spin_bt(&random_kthread_control, &harvest_mtx,
+ "-", ticks2bintime(hz / 10), zero_bt,
+ C_PREL(1) | C_HARDCLOCK);
}
mtx_unlock_spin(&harvest_mtx);
Modified: projects/calloutng/sys/dev/syscons/syscons.c
==============================================================================
--- projects/calloutng/sys/dev/syscons/syscons.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/dev/syscons/syscons.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -1899,8 +1899,8 @@ done:
rate = 2;
else
rate = 30;
- callout_reset_flags(&sc->ctimeout, hz / rate, scrn_timer, sc,
- C_PRELSET(1));
+ callout_reset_bt(&sc->ctimeout, ticks2bintime(hz / rate), zero_bt,
+ scrn_timer, sc, C_PREL(1) | C_HARDCLOCK);
}
}
@@ -3845,8 +3845,8 @@ blink_screen(void *arg)
(*scp->rndr->draw)(scp, 0, scp->xsize*scp->ysize,
scp->sc->blink_in_progress & 1);
scp->sc->blink_in_progress--;
- callout_reset_flags(&scp->sc->cblink, hz / 15, blink_screen, scp,
- C_PRELSET(0));
+ callout_reset_bt(&scp->sc->cblink, ticks2bintime(hz / 15), zero_bt,
+ blink_screen, scp, C_PREL(0) | C_HARDCLOCK);
}
}
Modified: projects/calloutng/sys/kern/kern_condvar.c
==============================================================================
--- projects/calloutng/sys/kern/kern_condvar.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_condvar.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -274,8 +274,8 @@ _cv_wait_sig(struct cv *cvp, struct lock
* cv_signal or cv_broadcast, EWOULDBLOCK if the timeout expires.
*/
int
-_cv_timedwait(struct cv *cvp, struct lock_object *lock, struct bintime *bt,
- struct bintime *precision, int timo, int flags)
+_cv_timedwait_bt(struct cv *cvp, struct lock_object *lock, struct bintime bt,
+ struct bintime pr, int flags)
{
WITNESS_SAVE_DECL(lock_witness);
struct lock_class *class;
@@ -311,10 +311,7 @@ _cv_timedwait(struct cv *cvp, struct loc
DROP_GIANT();
sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR, 0);
- if (bt == NULL)
- sleepq_set_timeout_flags(cvp, timo, flags);
- else
- sleepq_set_timeout_bt(cvp, bt, precision);
+ sleepq_set_timeout_bt(cvp, bt, pr, flags);
if (lock != &Giant.lock_object) {
if (class->lc_flags & LC_SLEEPABLE)
sleepq_release(cvp);
@@ -345,8 +342,8 @@ _cv_timedwait(struct cv *cvp, struct loc
* or ERESTART if a signal was caught.
*/
int
-_cv_timedwait_sig(struct cv *cvp, struct lock_object *lock,
- struct bintime *bt, struct bintime *precision, int timo, int flags)
+_cv_timedwait_sig_bt(struct cv *cvp, struct lock_object *lock,
+ struct bintime bt, struct bintime pr, int flags)
{
WITNESS_SAVE_DECL(lock_witness);
struct lock_class *class;
@@ -383,10 +380,7 @@ _cv_timedwait_sig(struct cv *cvp, struct
sleepq_add(cvp, lock, cvp->cv_description, SLEEPQ_CONDVAR |
SLEEPQ_INTERRUPTIBLE, 0);
- if (bt == NULL)
- sleepq_set_timeout_flags(cvp, timo, flags);
- else
- sleepq_set_timeout_bt(cvp, bt, precision);
+ sleepq_set_timeout_bt(cvp, bt, pr, flags);
if (lock != &Giant.lock_object) {
if (class->lc_flags & LC_SLEEPABLE)
sleepq_release(cvp);
Modified: projects/calloutng/sys/kern/kern_event.c
==============================================================================
--- projects/calloutng/sys/kern/kern_event.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_event.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -520,19 +520,16 @@ knote_fork(struct knlist *list, int pid)
static struct bintime
timer2bintime(intptr_t data)
{
- struct bintime bt, pbt;
+ struct bintime bt;
- getbinuptime(&pbt);
bt.sec = data / 1000;
- bt.frac = (data % 1000) * (uint64_t)1844674407309552ULL;
- bintime_add(&bt, &pbt);
+ bt.frac = (data % 1000) * (((uint64_t)1 << 63) / 500);
return bt;
}
static void
filt_timerexpire(void *knx)
{
- struct bintime bt;
struct callout *calloutp;
struct knote *kn;
@@ -548,10 +545,10 @@ filt_timerexpire(void *knx)
* when we're delayed.
*/
if ((kn->kn_flags & EV_ONESHOT) != EV_ONESHOT) {
- bt = timer2bintime(kn->kn_sdata);
calloutp = (struct callout *)kn->kn_hook;
- callout_reset_bt_on(calloutp, &bt, NULL, filt_timerexpire, kn,
- PCPU_GET(cpuid), 0);
+ callout_reset_bt_on(calloutp,
+ timer2bintime(kn->kn_sdata), zero_bt /* 1ms? */,
+ filt_timerexpire, kn, PCPU_GET(cpuid), 0);
}
}
@@ -561,7 +558,6 @@ filt_timerexpire(void *knx)
static int
filt_timerattach(struct knote *kn)
{
- struct bintime bt;
struct callout *calloutp;
atomic_add_int(&kq_ncallouts, 1);
@@ -576,9 +572,9 @@ filt_timerattach(struct knote *kn)
calloutp = malloc(sizeof(*calloutp), M_KQUEUE, M_WAITOK);
callout_init(calloutp, CALLOUT_MPSAFE);
kn->kn_hook = calloutp;
- bt = timer2bintime(kn->kn_sdata);
- callout_reset_bt_on(calloutp, &bt, NULL, filt_timerexpire, kn,
- PCPU_GET(cpuid), 0);
+ callout_reset_bt_on(calloutp,
+ timer2bintime(kn->kn_sdata), zero_bt /* 1ms? */,
+ filt_timerexpire, kn, PCPU_GET(cpuid), 0);
return (0);
}
@@ -1323,9 +1319,9 @@ kqueue_scan(struct kqueue *kq, int maxev
const struct timespec *tsp, struct kevent *keva, struct thread *td)
{
struct kevent *kevp;
- struct timeval atv, rtv, ttv;
+ struct bintime abt, rbt;
struct knote *kn, *marker;
- int count, timeout, nkev, error, influx;
+ int count, nkev, error, influx;
int haskqglobal, touch;
count = maxevents;
@@ -1337,22 +1333,24 @@ kqueue_scan(struct kqueue *kq, int maxev
goto done_nl;
if (tsp != NULL) {
- TIMESPEC_TO_TIMEVAL(&atv, tsp);
- if (itimerfix(&atv)) {
+ if (tsp->tv_sec < 0 || tsp->tv_nsec < 0 ||
+ tsp->tv_nsec > 1000000000) {
error = EINVAL;
goto done_nl;
}
- if (tsp->tv_sec == 0 && tsp->tv_nsec == 0)
- timeout = -1;
- else
- timeout = atv.tv_sec > 24 * 60 * 60 ?
- 24 * 60 * 60 * hz : tvtohz(&atv);
- getmicrouptime(&rtv);
- timevaladd(&atv, &rtv);
+ if (timespecisset(tsp)) {
+ timespec2bintime(tsp, &rbt);
+ if (TIMESEL(&abt, &rbt))
+ bintime_add(&abt, &tc_tick_bt);
+ bintime_add(&abt, &rbt);
+ bintime_shift(&rbt, -tc_timeexp);
+ } else {
+ abt.sec = -1;
+ abt.frac = 0;
+ }
} else {
- atv.tv_sec = 0;
- atv.tv_usec = 0;
- timeout = 0;
+ abt.sec = 0;
+ abt.frac = 0;
}
marker = knote_alloc(1);
if (marker == NULL) {
@@ -1361,28 +1359,16 @@ kqueue_scan(struct kqueue *kq, int maxev
}
marker->kn_status = KN_MARKER;
KQ_LOCK(kq);
- goto start;
retry:
- if (atv.tv_sec || atv.tv_usec) {
- getmicrouptime(&rtv);
- if (timevalcmp(&rtv, &atv, >=))
- goto done;
- ttv = atv;
- timevalsub(&ttv, &rtv);
- timeout = ttv.tv_sec > 24 * 60 * 60 ?
- 24 * 60 * 60 * hz : tvtohz(&ttv);
- }
-
-start:
kevp = keva;
if (kq->kq_count == 0) {
- if (timeout < 0) {
+ if (abt.sec < 0) {
error = EWOULDBLOCK;
} else {
kq->kq_state |= KQ_SLEEP;
- error = msleep(kq, &kq->kq_lock, PSOCK | PCATCH,
- "kqread", timeout);
+ error = msleep_bt(kq, &kq->kq_lock, PSOCK | PCATCH,
+ "kqread", abt, rbt, C_ABSOLUTE);
}
if (error == 0)
goto retry;
Modified: projects/calloutng/sys/kern/kern_resource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_resource.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_resource.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -645,7 +645,8 @@ lim_cb(void *arg)
}
}
if ((p->p_flag & P_WEXIT) == 0)
- callout_reset_flags(&p->p_limco, hz, lim_cb, p, C_PRELSET(1));
+ callout_reset_bt(&p->p_limco, ticks2bintime(hz), zero_bt,
+ lim_cb, p, C_PREL(1) | C_HARDCLOCK);
}
int
@@ -697,8 +698,8 @@ kern_proc_setrlimit(struct thread *td, s
case RLIMIT_CPU:
if (limp->rlim_cur != RLIM_INFINITY &&
p->p_cpulimit == RLIM_INFINITY)
- callout_reset_flags(&p->p_limco, hz, lim_cb, p,
- C_PRELSET(1));
+ callout_reset_bt(&p->p_limco, ticks2bintime(hz), zero_bt,
+ lim_cb, p, C_PREL(1) | C_HARDCLOCK);
p->p_cpulimit = limp->rlim_cur;
break;
case RLIMIT_DATA:
@@ -1138,7 +1139,8 @@ lim_fork(struct proc *p1, struct proc *p
p2->p_limit = lim_hold(p1->p_limit);
callout_init_mtx(&p2->p_limco, &p2->p_mtx, 0);
if (p1->p_cpulimit != RLIM_INFINITY)
- callout_reset_flags(&p2->p_limco, hz, lim_cb, p2, C_PRELSET(1));
+ callout_reset_bt(&p2->p_limco, ticks2bintime(hz), zero_bt,
+ lim_cb, p2, C_PREL(1) | C_HARDCLOCK);
}
void
Modified: projects/calloutng/sys/kern/kern_synch.c
==============================================================================
--- projects/calloutng/sys/kern/kern_synch.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_synch.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -146,8 +146,7 @@ sleepinit(void)
*/
int
_sleep(void *ident, struct lock_object *lock, int priority,
- const char *wmesg, int timo, struct bintime *bt,
- struct bintime *precision, int flags)
+ const char *wmesg, struct bintime bt, struct bintime pr, int flags)
{
struct thread *td;
struct proc *p;
@@ -163,7 +162,7 @@ _sleep(void *ident, struct lock_object *
#endif
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock,
"Sleeping on \"%s\"", wmesg);
- KASSERT(timo != 0 || bt != NULL || mtx_owned(&Giant) || lock != NULL,
+ KASSERT(bintime_isset(&bt) || mtx_owned(&Giant) || lock != NULL,
("sleeping without a lock"));
KASSERT(p != NULL, ("msleep1"));
KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep"));
@@ -233,19 +232,17 @@ _sleep(void *ident, struct lock_object *
* return from cursig().
*/
sleepq_add(ident, lock, wmesg, sleepq_flags, 0);
- if (bt)
- sleepq_set_timeout_bt(ident, bt, precision);
- else if (timo)
- sleepq_set_timeout_flags(ident, timo, flags);
+ if (bintime_isset(&bt))
+ sleepq_set_timeout_bt(ident, bt, pr, flags);
if (lock != NULL && class->lc_flags & LC_SLEEPABLE) {
sleepq_release(ident);
WITNESS_SAVE(lock, lock_witness);
lock_state = class->lc_unlock(lock);
sleepq_lock(ident);
}
- if ((timo != 0 || bt != NULL) && catch)
+ if (bintime_isset(&bt) && catch)
rval = sleepq_timedwait_sig(ident, pri);
- else if (timo != 0 || bt != NULL)
+ else if (bintime_isset(&bt))
rval = sleepq_timedwait(ident, pri);
else if (catch)
rval = sleepq_wait_sig(ident, pri);
@@ -266,8 +263,8 @@ _sleep(void *ident, struct lock_object *
}
int
-msleep_spin_flags(void *ident, struct mtx *mtx, const char *wmesg, int timo,
- int flags)
+msleep_spin_bt(void *ident, struct mtx *mtx, const char *wmesg,
+ struct bintime bt, struct bintime pr, int flags)
{
struct thread *td;
struct proc *p;
@@ -305,8 +302,8 @@ msleep_spin_flags(void *ident, struct mt
* We put ourselves on the sleep queue and start our timeout.
*/
sleepq_add(ident, &mtx->lock_object, wmesg, SLEEPQ_SLEEP, 0);
- if (timo)
- sleepq_set_timeout_flags(ident, timo, flags);
+ if (bintime_isset(&bt))
+ sleepq_set_timeout_bt(ident, bt, pr, flags);
/*
* Can't call ktrace with any spin locks held so it can lock the
@@ -328,7 +325,7 @@ msleep_spin_flags(void *ident, struct mt
wmesg);
sleepq_lock(ident);
#endif
- if (timo)
+ if (bintime_isset(&bt))
rval = sleepq_timedwait(ident, 0);
else {
sleepq_wait(ident, 0);
@@ -352,37 +349,28 @@ msleep_spin_flags(void *ident, struct mt
* to a "timo" value of one.
*/
int
-_pause(const char *wmesg, int timo, struct bintime *bt, struct bintime *pr,
- int flags)
+pause_bt(const char *wmesg, struct bintime bt, struct bintime pr, int flags)
{
- struct bintime now, bt2;
- KASSERT(timo >= 0, ("pause: timo must be >= 0"));
+ KASSERT(bt.sec >= 0, ("pause: timo must be >= 0"));
/* silently convert invalid timeouts */
- if (timo < 1)
- timo = 1;
+ if (!bintime_isset(&bt))
+ bt = tick_bt;
if (cold) {
- if (bt != NULL) {
- binuptime(&now);
- bt2 = *bt;
- bintime_sub(&bt2, &now);
- timo = bt2.sec * hz + ((bt2.frac >> 32) * hz >> 32);
- }
/*
- * We delay one HZ at a time to avoid overflowing the
+ * We delay one second at a time to avoid overflowing the
* system specific DELAY() function(s):
*/
- while (timo >= hz) {
+ while (bt.sec > 0) {
DELAY(1000000);
- timo -= hz;
+ bt.sec--;
}
- if (timo > 0)
- DELAY(timo * tick);
+ DELAY(bt.frac >> 44);
return (0);
}
- return (_sleep(&pause_wchan, NULL, 0, wmesg, timo, bt, pr, flags));
+ return (_sleep(&pause_wchan, NULL, 0, wmesg, bt, pr, flags));
}
/*
@@ -573,9 +561,9 @@ loadav(void *arg)
* random variation to avoid synchronisation with processes that
* run at regular intervals.
*/
- callout_reset_flags(&loadav_callout,
- hz * 4 + (int)(random() % (hz * 2 + 1)),
- loadav, NULL, C_DIRECT_EXEC);
+ callout_reset_bt(&loadav_callout,
+ ticks2bintime(hz * 4 + (int)(random() % (hz * 2 + 1))), zero_bt,
+ loadav, NULL, C_DIRECT_EXEC | C_HARDCLOCK);
}
/* ARGSUSED */
Modified: projects/calloutng/sys/kern/kern_tc.c
==============================================================================
--- projects/calloutng/sys/kern/kern_tc.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_tc.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -121,11 +121,11 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO,
×tepwarnings, 0, "Log time steps");
struct bintime bt_timethreshold;
+struct bintime bt_tickthreshold;
struct bintime tc_tick_bt;
int tc_timeexp;
int tc_timepercentage = TC_DEFAULTPERC;
TUNABLE_INT("kern.timecounter.alloweddeviation", &tc_timepercentage);
-int tc_timethreshold;
static int sysctl_kern_timecounter_adjprecision(SYSCTL_HANDLER_ARGS);
SYSCTL_PROC(_kern_timecounter, OID_AUTO, alloweddeviation,
CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
@@ -1721,22 +1721,20 @@ tc_ticktock(int cnt)
static void __inline
tc_adjprecision(void)
{
- struct timespec ts;
- int tick_rate, t;
+ int t;
- tick_rate = hz / tc_tick;
if (tc_timepercentage > 0) {
- tc_timethreshold =
- (1000000000 / (tick_rate * tc_timepercentage)) * 100;
t = (99 + tc_timepercentage) / tc_timepercentage;
tc_timeexp = fls(t + (t >> 1)) - 1;
+ FREQ2BT(hz / tc_tick, &bt_timethreshold);
+ FREQ2BT(hz, &bt_tickthreshold);
+ bintime_shift(&bt_timethreshold, tc_timeexp);
+ bintime_shift(&bt_tickthreshold, tc_timeexp);
} else {
- tc_timethreshold = INT_MAX;
tc_timeexp = 31;
+ bintime_clear(&bt_timethreshold);
+ bintime_clear(&bt_tickthreshold);
}
- ts.tv_sec = tc_timethreshold / 1000000000;
- ts.tv_nsec = tc_timethreshold % 1000000000;
- timespec2bintime(&ts, &bt_timethreshold);
}
static int
Modified: projects/calloutng/sys/kern/kern_time.c
==============================================================================
--- projects/calloutng/sys/kern/kern_time.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_time.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -492,15 +492,16 @@ kern_nanosleep(struct thread *td, struct
return (0);
timespec2bintime(rqt, &tmp);
bt_prec = tmp;
- bintime_divpow2(&bt_prec, tc_timeexp);
+ bintime_shift(&bt_prec, -tc_timeexp);
if (TIMESEL(&bt, &tmp))
bintime_add(&bt, &tc_tick_bt);
bintime_add(&bt, &tmp);
- error = tsleep_bt(&nanowait, PWAIT | PCATCH, "nanslp", &bt, &bt_prec);
- TIMESEL(&btt, &tmp);
+ error = tsleep_bt(&nanowait, PWAIT | PCATCH, "nanslp", bt, bt_prec,
+ C_ABSOLUTE);
if (error != EWOULDBLOCK) {
if (error == ERESTART)
error = EINTR;
+ TIMESEL(&btt, &tmp);
if (rmt != NULL) {
tmp = bt;
bintime_sub(&tmp, &btt);
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/kern_timeout.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -896,44 +896,47 @@ DPCPU_DECLARE(struct bintime, hardclockt
* callout_deactivate() - marks the callout as having been serviced
*/
int
-_callout_reset_on(struct callout *c, struct bintime *bt,
- struct bintime *precision, int to_ticks, void (*ftn)(void *),
- void *arg, int cpu, int flags)
+callout_reset_bt_on(struct callout *c, struct bintime bt, struct bintime pr,
+ void (*ftn)(void *), void *arg, int cpu, int flags)
{
- struct bintime to_bt, pr;
+ struct bintime to_bt, pr1;
struct callout_cpu *cc;
int bucket, cancelled, direct;
cancelled = 0;
- if (bt == NULL) {
+ if (flags & C_ABSOLUTE) {
+ to_bt = bt;
+ } else {
+ if ((flags & C_HARDCLOCK) ||
#ifdef NO_EVENTTIMERS
- getbinuptime(&to_bt);
- /* Add safety belt for the case of hz > 1000. */
- bintime_addx(&to_bt, tc_tick_bt.frac - tick_bt.frac);
+ bintime_cmp(&bt, &bt_timethreshold, >=)) {
+ getbinuptime(&to_bt);
+ /* Add safety belt for the case of hz > 1000. */
+ bintime_addx(&to_bt, tc_tick_bt.frac - tick_bt.frac);
#else
- /*
- * Obtain the time of the last hardclock() call on this CPU
- * directly from the kern_clocksource.c. This value is
- * per-CPU, but it is equal for all active ones.
- */
- spinlock_enter();
- to_bt = DPCPU_GET(hardclocktime);
- spinlock_exit();
+ bintime_cmp(&bt, &bt_tickthreshold, >=)) {
+ /*
+ * Obtain the time of the last hardclock() call on
+ * this CPU directly from the kern_clocksource.c.
+ * This value is per-CPU, but it is equal for all
+ * active ones.
+ */
+ spinlock_enter();
+ to_bt = DPCPU_GET(hardclocktime);
+ spinlock_exit();
#endif
- pr = tick_bt;
- if (to_ticks > 1)
- bintime_mul(&pr, to_ticks);
- bintime_add(&to_bt, &pr);
+ if ((flags & C_HARDCLOCK) == 0)
+ bintime_addx(&to_bt, tick_bt.frac);
+ } else
+ binuptime(&to_bt);
+ bintime_add(&to_bt, &bt);
+ pr1 = bt;
if (C_PRELGET(flags) < 0)
- bintime_clear(&pr);
- else
- bintime_divpow2(&pr, C_PRELGET(flags));
- } else {
- to_bt = *bt;
- if (precision != NULL)
- pr = *precision;
+ bintime_shift(&pr1, -tc_timeexp);
else
- bintime_clear(&pr);
+ bintime_shift(&pr1, -C_PRELGET(flags));
+ if (bintime_cmp(&pr1, &pr, >))
+ pr = pr1;
}
/*
* Don't allow migration of pre-allocated callouts lest they
Modified: projects/calloutng/sys/kern/subr_log.c
==============================================================================
--- projects/calloutng/sys/kern/subr_log.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/subr_log.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -117,8 +117,9 @@ logopen(struct cdev *dev, int flags, int
return (EBUSY);
}
log_open = 1;
- callout_reset_flags(&logsoftc.sc_callout, hz / log_wakeups_per_second,
- logtimeout, NULL, C_PRELSET(1));
+ callout_reset_bt(&logsoftc.sc_callout,
+ ticks2bintime(hz / log_wakeups_per_second), zero_bt,
+ logtimeout, NULL, C_PREL(1) | C_HARDCLOCK);
mtx_unlock(&msgbuf_lock);
fsetown(td->td_proc->p_pid, &logsoftc.sc_sigio); /* signal process only */
@@ -246,8 +247,9 @@ done:
printf("syslog wakeup is less than one. Adjusting to 1.\n");
log_wakeups_per_second = 1;
}
- callout_reset_flags(&logsoftc.sc_callout, hz / log_wakeups_per_second,
- logtimeout, NULL, C_PRELSET(1));
+ callout_reset_bt(&logsoftc.sc_callout,
+ ticks2bintime(hz / log_wakeups_per_second), zero_bt,
+ logtimeout, NULL, C_PREL(1) | C_HARDCLOCK);
}
/*ARGSUSED*/
Modified: projects/calloutng/sys/kern/subr_param.c
==============================================================================
--- projects/calloutng/sys/kern/subr_param.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/subr_param.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -84,6 +84,7 @@ static int sysctl_kern_vm_guest(SYSCTL_H
int hz; /* system clock's frequency */
int tick; /* usec per tick (1000000 / hz) */
struct bintime tick_bt; /* bintime per tick (1s / hz) */
+struct bintime zero_bt = { 0, 0 }; /* bintime per tick (1s / hz) */
int maxusers; /* base tunable */
int maxproc; /* maximum # of processes */
int maxprocperuid; /* max # of procs per user */
Modified: projects/calloutng/sys/kern/subr_sleepqueue.c
==============================================================================
--- projects/calloutng/sys/kern/subr_sleepqueue.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/subr_sleepqueue.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -363,8 +363,8 @@ sleepq_add(void *wchan, struct lock_obje
* sleep queue after timo ticks if the thread has not already been awakened.
*/
void
-_sleepq_set_timeout(void *wchan, struct bintime *bt, struct bintime *precision,
- int timo, int flags)
+sleepq_set_timeout_bt(void *wchan, struct bintime bt, struct bintime pr,
+ int flags)
{
struct sleepqueue_chain *sc;
@@ -376,12 +376,8 @@ _sleepq_set_timeout(void *wchan, struct
MPASS(TD_ON_SLEEPQ(td));
MPASS(td->td_sleepqueue == NULL);
MPASS(wchan != NULL);
- if (bt == NULL)
- callout_reset_flags_on(&td->td_slpcallout, timo,
- sleepq_timeout, td, PCPU_GET(cpuid), flags | C_DIRECT_EXEC);
- else
- callout_reset_bt_on(&td->td_slpcallout, bt, precision,
- sleepq_timeout, td, PCPU_GET(cpuid), flags | C_DIRECT_EXEC);
+ callout_reset_bt_on(&td->td_slpcallout, bt, pr,
+ sleepq_timeout, td, PCPU_GET(cpuid), flags | C_DIRECT_EXEC);
}
/*
Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c Fri Dec 21 10:09:45 2012 (r244532)
+++ projects/calloutng/sys/kern/sys_generic.c Fri Dec 21 11:08:44 2012 (r244533)
@@ -102,7 +102,7 @@ static int dofilewrite(struct thread *,
off_t, int);
static void doselwakeup(struct selinfo *, int);
static void seltdinit(struct thread *);
-static int seltdwait(struct thread *, struct bintime *, struct bintime *);
+static int seltdwait(struct thread *, struct bintime);
static void seltdclear(struct thread *);
/*
@@ -902,12 +902,11 @@ kern_select(struct thread *td, int nd, f
*/
fd_mask s_selbits[howmany(2048, NFDBITS)];
fd_mask *ibits[3], *obits[3], *selbits, *sbp;
- struct bintime abt, precision, rbt;
- struct timeval atv;
+ struct bintime rbt;
+ struct timeval rtv;
int error, lf, ndu;
u_int nbufbytes, ncpbytes, ncpubytes, nfdbits;
- timevalclear(&atv);
if (nd < 0)
return (EINVAL);
fdp = td->td_proc->p_fd;
@@ -997,43 +996,26 @@ kern_select(struct thread *td, int nd, f
bzero(selbits, nbufbytes / 2);
if (tvp != NULL) {
- atv = *tvp;
- if (atv.tv_sec < 0 || atv.tv_usec < 0 ||
- atv.tv_usec >= 1000000) {
+ rtv = *tvp;
+ if (rtv.tv_sec < 0 || rtv.tv_usec < 0 ||
+ rtv.tv_usec >= 1000000) {
error = EINVAL;
goto done;
}
- timeval2bintime(&atv, &abt);
- precision = abt;
- bintime_divpow2(&precision, tc_timeexp);
- if (TIMESEL(&rbt, &abt))
- bintime_add(&abt, &tc_tick_bt);
- bintime_add(&abt, &rbt);
+ timeval2bintime(&rtv, &rbt);
} else {
- abt.sec = 0;
- abt.frac = 0;
+ rbt.sec = -1;
+ rbt.frac = 0;
}
seltdinit(td);
- /* Iterate until the timeout expires or descriptors become ready. */
- for (;;) {
- error = selscan(td, ibits, obits, nd);
- if (error || td->td_retval[0] != 0)
- break;
- if (abt.sec || abt.frac) {
- TIMESEL(&rbt, &abt);
- if (bintime_cmp(&rbt, &abt, >=))
- break;
- error = seltdwait(td, &abt, &precision);
- }
- else {
- error = seltdwait(td, NULL, NULL);
- }
- if (error)
- break;
- error = selrescan(td, ibits, obits);
- if (error || td->td_retval[0] != 0)
- break;
- }
+ error = selscan(td, ibits, obits, nd);
+ if (error || td->td_retval[0] != 0)
+ goto done1;
+ error = seltdwait(td, rbt);
+ if (error)
+ goto done1;
+ error = selrescan(td, ibits, obits);
+done1:
seltdclear(td);
done:
@@ -1259,13 +1241,11 @@ sys_poll(td, uap)
{
struct pollfd *bits;
struct pollfd smallbits[32];
- struct bintime abt, precision, rbt;
- struct timeval atv;
+ struct bintime rbt;
int error;
u_int nfds;
size_t ni;
- timevalclear(&atv);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 14:50:52 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B64141EE;
Fri, 21 Dec 2012 14:50:52 +0000 (UTC)
(envelope-from adrian.chadd@gmail.com)
Received: from mail-wi0-x229.google.com (mail-wi0-x229.google.com
[IPv6:2a00:1450:400c:c05::229])
by mx1.freebsd.org (Postfix) with ESMTP id F2ACE8FC14;
Fri, 21 Dec 2012 14:50:51 +0000 (UTC)
Received: by mail-wi0-f169.google.com with SMTP id hq12so1999664wib.0
for <multiple recipients>; Fri, 21 Dec 2012 06:50:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=ja1cxCOKofQAKzwFU7QyWABTE4O6w2xBZ4EfBoDHAN0=;
b=ehB17mvHwfMKA5obv1oWsX1XXeJ8NFl5NcxD050A+JrOWZccc4CqMUmh37PfSj3I54
BbwfcTLR0VJoCVisdAQFAHxI47abmvNaHhM1cm8Ht9HU8cTDjperLMaxschTpJ5zRMVz
tdFzqFBm1IkKxUkZP94ZOeirmyn4qqVLo6Qn0a7t4x0wj5dA36poZHgIQ8b9HKMrQxcq
gzlRK28r1lQn42oDZ78vKM27aNJMTsr0FnXYDOe7VoqEjN+hwrnG+KvC82Q82EdqjdOZ
sE1eAcfs1YQWNYec7IkXb02FyOREPrbCmDQGfb9lTHS562TQicgrm+gyoxjUkqjVkJvY
s/VQ==
MIME-Version: 1.0
Received: by 10.194.83.36 with SMTP id n4mr24015269wjy.59.1356101451201; Fri,
21 Dec 2012 06:50:51 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.217.57.9 with HTTP; Fri, 21 Dec 2012 06:50:51 -0800 (PST)
In-Reply-To: <201212211108.qBLB8jwa047382@svn.freebsd.org>
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
Date: Fri, 21 Dec 2012 06:50:51 -0800
X-Google-Sender-Auth: JhY9vxfMxsB51Ypzhus7-OIqSic
Message-ID: <CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
From: Adrian Chadd <adrian@freebsd.org>
To: Alexander Motin <mav@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 14:50:52 -0000
Hi,
There's a DELAY (bt.frac >> 44) there; please write or use a
BINTIME_TO_USEC macro instead?
Since you're touching kqueue, do you guys have a testing plan for
verifying kqueue operation is still working right?
Adrian
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 14:57:04 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 4A8683E9;
Fri, 21 Dec 2012 14:57:04 +0000 (UTC)
(envelope-from mavbsd@gmail.com)
Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com
[209.85.214.52])
by mx1.freebsd.org (Postfix) with ESMTP id 711E28FC0A;
Fri, 21 Dec 2012 14:57:03 +0000 (UTC)
Received: by mail-bk0-f52.google.com with SMTP id w5so2377318bku.25
for <multiple recipients>; Fri, 21 Dec 2012 06:56:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=x-received:sender:message-id:date:from:user-agent:mime-version:to
:cc:subject:references:in-reply-to:content-type
:content-transfer-encoding;
bh=Pc9Xo+QenByvtFs2Zenr/AN1EoOn/DTITgcLa6712WE=;
b=nQecq5MnbTbxV8qVtFdfvlx82Ob/4ow5fxRmAosx78A5RFgHQMzZ0wBYWw2B9A0Pd6
mVNkFgtm7LYgTu6qswGzf6JQXOHG6GCHhQH3DU25Lgp6wOKIaR2HT38HWen1wIRBiZqv
HOZMM2GfYvukjQhttzVXWN/howXzVt5xCSEzMDWgGZn9QFBnJtc27r8+CnckttiK34vo
/rhtyDKH9ZiXfgzcunSmqg0092zvvu/qHHqz6tOTnI/vmtOZnvGYC2kgFnGQtxugimjX
2eRsVzfDTTbcJLC1h5CxfqAsW0VKRzYvZ1GTVQLYTxpjlgRbcDKdW1ENX1lXih6u+0zt
hXNA==
X-Received: by 10.204.147.8 with SMTP id j8mr6701598bkv.105.1356101816500;
Fri, 21 Dec 2012 06:56:56 -0800 (PST)
Received: from mavbook.mavhome.dp.ua (mavhome.mavhome.dp.ua. [213.227.240.37])
by mx.google.com with ESMTPS id
f24sm10276101bkv.7.2012.12.21.06.56.54
(version=TLSv1/SSLv3 cipher=OTHER);
Fri, 21 Dec 2012 06:56:55 -0800 (PST)
Sender: Alexander Motin <mavbsd@gmail.com>
Message-ID: <50D478B4.7080205@FreeBSD.org>
Date: Fri, 21 Dec 2012 16:56:52 +0200
From: Alexander Motin <mav@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:13.0) Gecko/20120628 Thunderbird/13.0.1
MIME-Version: 1.0
To: Adrian Chadd <adrian@freebsd.org>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
<CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
In-Reply-To: <CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 14:57:04 -0000
On 21.12.2012 16:50, Adrian Chadd wrote:
> There's a DELAY (bt.frac >> 44) there; please write or use a
> BINTIME_TO_USEC macro instead?
I'll look on it.
> Since you're touching kqueue, do you guys have a testing plan for
> verifying kqueue operation is still working right?
I've written simple tools to do basic tests/measurements for all
functions I've touched. If you have some propositions about what
specifically should we take care about, please propose.
--
Alexander Motin
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 14:59:45 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id DD5F451A;
Fri, 21 Dec 2012 14:59:45 +0000 (UTC)
(envelope-from davide.italiano@gmail.com)
Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com
[209.85.212.48])
by mx1.freebsd.org (Postfix) with ESMTP id 38E948FC0A;
Fri, 21 Dec 2012 14:59:44 +0000 (UTC)
Received: by mail-vb0-f48.google.com with SMTP id fc21so5170446vbb.35
for <multiple recipients>; Fri, 21 Dec 2012 06:59:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=GWQx8nasYkXJosckobuWXBGF7lDRBP0QWA4+e95pF5w=;
b=nIKTocgCVAyT1yJqKbibA3va5twfy0mYgr3UwNr4/6hY+4xEBVCvjCcbGpjjzI8SJP
3BScdDd3p96XZYfUSGDi4/B2pQsR3rHklioCv5286fOnstsIcA+Hdj5yRAMQKEDTwNG/
6lXW/vhPJCrnYOE/4q4f8tlHnsCk1sVYVIO9ISiVb7u9pBSy5bd/hICjAWWHF5dI1kti
G1pRpMyhssawGuk4dKXxhRFYGdaRJ3QM3Wle1EX58QhqwfNHJ3K+tUiJsoZl+WHzK3+3
+PQrBu1NyduFQA8RDj9nsLzLkDXJWGjxHF1xqRasS3nxQ+2ztHzaBep4K+0EbhARuvZ2
MasA==
MIME-Version: 1.0
Received: by 10.52.27.138 with SMTP id t10mr18222426vdg.81.1356101984455; Fri,
21 Dec 2012 06:59:44 -0800 (PST)
Sender: davide.italiano@gmail.com
Received: by 10.58.229.136 with HTTP; Fri, 21 Dec 2012 06:59:44 -0800 (PST)
In-Reply-To: <CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
<CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
Date: Fri, 21 Dec 2012 15:59:44 +0100
X-Google-Sender-Auth: 685U6mjtar-QUOKRxGWV42v7aaI
Message-ID: <CACYV=-FLsfP4nJaVYvY76Eda42jgCBJ8Qe3KeuERkGXYsfHd7g@mail.gmail.com>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
From: Davide Italiano <davide@freebsd.org>
To: Adrian Chadd <adrian@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, Alexander Motin <mav@freebsd.org>,
src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 14:59:45 -0000
On Fri, Dec 21, 2012 at 3:50 PM, Adrian Chadd <adrian@freebsd.org> wrote:
> Hi,
>
> There's a DELAY (bt.frac >> 44) there; please write or use a
> BINTIME_TO_USEC macro instead?
>
> Since you're touching kqueue, do you guys have a testing plan for
> verifying kqueue operation is still working right?
>
I do think web servers -- as well as tons of other applications use it.
Other than that, the commit doesn't change kqueue() semantics.
>
>
> Adrian
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 15:02:49 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 7AA9F687;
Fri, 21 Dec 2012 15:02:49 +0000 (UTC)
(envelope-from asmrookie@gmail.com)
Received: from mail-la0-f43.google.com (mail-la0-f43.google.com
[209.85.215.43])
by mx1.freebsd.org (Postfix) with ESMTP id 319498FC15;
Fri, 21 Dec 2012 15:02:48 +0000 (UTC)
Received: by mail-la0-f43.google.com with SMTP id z14so5256220lag.30
for <multiple recipients>; Fri, 21 Dec 2012 07:02:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:reply-to:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=Yicub64Ch/OCksK0jsFuudbW1KJvn3btV7l1IwIPB3s=;
b=1B0WOKe+3Uixsh38I9iNWu63vsVCJqodQJryyhK8jCfd3mxFJu4M3y20ZxBXSMfhb/
l/PVxknd6gj/NriRcdgqDjPrmXosS3l13ua0zW4u1xuEJv8oFThmhEYwQXRm+ucPcPAE
eWRGQLFhUDRwzQq9s56sfwk1bdye4ORtafhicWRK512hFD6JUDDyLbtK9ZwZpQsj/6x0
aS78cTvXsXst3IJoM+qkd9vYfd3DnSXI6NrIB6DJVy7uTOKRPXrfvNaItpHfX3Z8eqZH
HIJBdWXsy70uuhH0/LQuTL3BpygHwEqTthwcpLh4zbiHSQYgQ/ll0pCLPG/m80sxz/6K
yrAA==
MIME-Version: 1.0
Received: by 10.152.132.69 with SMTP id os5mr12219324lab.15.1356102166329;
Fri, 21 Dec 2012 07:02:46 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Fri, 21 Dec 2012 07:02:46 -0800 (PST)
In-Reply-To: <CACYV=-FLsfP4nJaVYvY76Eda42jgCBJ8Qe3KeuERkGXYsfHd7g@mail.gmail.com>
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
<CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
<CACYV=-FLsfP4nJaVYvY76Eda42jgCBJ8Qe3KeuERkGXYsfHd7g@mail.gmail.com>
Date: Fri, 21 Dec 2012 16:02:46 +0100
X-Google-Sender-Auth: 0-HDeYagOliKkXhk_Cq7MkIjeJg
Message-ID: <CAJ-FndAGHs0dYKmRqXiHA8uR=obW9WVcdqq8zS1Yjbn9Xi3A3A@mail.gmail.com>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Davide Italiano <davide@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-projects@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
src-committers@freebsd.org, Alexander Motin <mav@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 15:02:49 -0000
On Fri, Dec 21, 2012 at 3:59 PM, Davide Italiano <davide@freebsd.org> wrote:
> On Fri, Dec 21, 2012 at 3:50 PM, Adrian Chadd <adrian@freebsd.org> wrote:
>> Hi,
>>
>> There's a DELAY (bt.frac >> 44) there; please write or use a
>> BINTIME_TO_USEC macro instead?
>>
>> Since you're touching kqueue, do you guys have a testing plan for
>> verifying kqueue operation is still working right?
>>
>
> I do think web servers -- as well as tons of other applications use it.
> Other than that, the commit doesn't change kqueue() semantics.
This test by gianni@ was very good at finding callout races in the past:
http://people.freebsd.org/~attilio/callout/test.c
Attilio
--
Peace can only be achieved by understanding - A. Einstein
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 15:03:20 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 51D967A6;
Fri, 21 Dec 2012 15:03:20 +0000 (UTC)
(envelope-from asmrookie@gmail.com)
Received: from mail-la0-f53.google.com (mail-la0-f53.google.com
[209.85.215.53])
by mx1.freebsd.org (Postfix) with ESMTP id C491C8FC16;
Fri, 21 Dec 2012 15:03:18 +0000 (UTC)
Received: by mail-la0-f53.google.com with SMTP id w12so5118670lag.26
for <multiple recipients>; Fri, 21 Dec 2012 07:03:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:reply-to:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=8ZfCPae7D+X4aqIwfxOpdjgglmiPaiofMPYqtXxGX9s=;
b=aG7lk2IBSZiGOngojar8jMrZ0xrmkSdfe6rJ7iJWNDb62CBFgMzivzN0ea5TdkMOXT
XKStXu4540nkU7DhxqelSxy8hMIvliPO8xvhb4/qyf8qHXnOz336rMfG8xJggULyzxCr
Jr1vgURCpD9tltzpQMZqbOUDjmSa1DNOGThxkCNkvkNzw3WDjsJof9u58pBSWG/GjJXa
JGiPG4cLcDYCWr6P3Zk3m/PkezippINPLW/elH0qEjh720xOvzYnvgJp8ihmzeUhUivW
PxJY2tLjhUSbuIYPEcevpy8A8QrkKtYDOte/kIpzreVZW0jOBmKlfajJ4jAr4qJ50/q2
meQA==
MIME-Version: 1.0
Received: by 10.152.105.103 with SMTP id gl7mr12435467lab.10.1356102197500;
Fri, 21 Dec 2012 07:03:17 -0800 (PST)
Sender: asmrookie@gmail.com
Received: by 10.112.84.193 with HTTP; Fri, 21 Dec 2012 07:03:17 -0800 (PST)
In-Reply-To: <CAJ-FndAGHs0dYKmRqXiHA8uR=obW9WVcdqq8zS1Yjbn9Xi3A3A@mail.gmail.com>
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
<CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
<CACYV=-FLsfP4nJaVYvY76Eda42jgCBJ8Qe3KeuERkGXYsfHd7g@mail.gmail.com>
<CAJ-FndAGHs0dYKmRqXiHA8uR=obW9WVcdqq8zS1Yjbn9Xi3A3A@mail.gmail.com>
Date: Fri, 21 Dec 2012 16:03:17 +0100
X-Google-Sender-Auth: CQPO83ViapSajYxjVM3ApqsjqR4
Message-ID: <CAJ-FndB4bYAcdWVQhEMKVTxVudk9pXycGZLyM3YSZTLSY=daHA@mail.gmail.com>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
From: Attilio Rao <attilio@freebsd.org>
To: Davide Italiano <davide@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-projects@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
src-committers@freebsd.org, Alexander Motin <mav@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: attilio@FreeBSD.org
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 15:03:20 -0000
On Fri, Dec 21, 2012 at 4:02 PM, Attilio Rao <attilio@freebsd.org> wrote:
> On Fri, Dec 21, 2012 at 3:59 PM, Davide Italiano <davide@freebsd.org> wrote:
>> On Fri, Dec 21, 2012 at 3:50 PM, Adrian Chadd <adrian@freebsd.org> wrote:
>>> Hi,
>>>
>>> There's a DELAY (bt.frac >> 44) there; please write or use a
>>> BINTIME_TO_USEC macro instead?
>>>
>>> Since you're touching kqueue, do you guys have a testing plan for
>>> verifying kqueue operation is still working right?
>>>
>>
>> I do think web servers -- as well as tons of other applications use it.
>> Other than that, the commit doesn't change kqueue() semantics.
>
> This test by gianni@ was very good at finding callout races in the past:
Sorry, callout and kevent races, I mean.
Attilio
--
Peace can only be achieved by understanding - A. Einstein
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 15:03:55 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 1F2858C9;
Fri, 21 Dec 2012 15:03:55 +0000 (UTC)
(envelope-from davide.italiano@gmail.com)
Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com
[209.85.220.179])
by mx1.freebsd.org (Postfix) with ESMTP id 5E58C8FC0A;
Fri, 21 Dec 2012 15:03:54 +0000 (UTC)
Received: by mail-vc0-f179.google.com with SMTP id p1so5291548vcq.10
for <multiple recipients>; Fri, 21 Dec 2012 07:03:47 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date
:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
bh=yrkFmz+DMwfcARYXR8gd0kJU5dF5PGyPyqkSocjeEyk=;
b=xAOMwyI3+Buy3uBKp+ZSxAOlMNTC9OgVC9oRSG+55CbuwIBp96K7a+h1RvbKMXWafg
+G4vZLEJ+YPP4CzbtF3KAozFZhshaOuIuojHo56NBDzpzUU6qDuGCJecLLWz0ipG9l1+
ZBrmh2PXwL9Qpcshqmdp7rub1oScADPO6cwiO11H0cqTrdylKL+u2upPmwMk1rEABa/U
zYCtgB8No6Vk02PQ3NFyj1K7LcDREW40Qq14bMClZ42whK9dguWbU2oTioXRfNnWgsBS
Bd8F7GX97Ul63pPmtLkPUalHJLEQ5ak66m2T9IrgRpuHp2cnSQOPyfVABs44eL4JmLMw
nyVA==
MIME-Version: 1.0
Received: by 10.58.118.115 with SMTP id kl19mr5028374veb.6.1356102227484; Fri,
21 Dec 2012 07:03:47 -0800 (PST)
Sender: davide.italiano@gmail.com
Received: by 10.58.229.136 with HTTP; Fri, 21 Dec 2012 07:03:47 -0800 (PST)
In-Reply-To: <CAJ-FndAGHs0dYKmRqXiHA8uR=obW9WVcdqq8zS1Yjbn9Xi3A3A@mail.gmail.com>
References: <201212211108.qBLB8jwa047382@svn.freebsd.org>
<CAJ-VmokHDoPwO57tgyU_quKjVzEZ1wgZd2w=RxXtgMxSEJRY8Q@mail.gmail.com>
<CACYV=-FLsfP4nJaVYvY76Eda42jgCBJ8Qe3KeuERkGXYsfHd7g@mail.gmail.com>
<CAJ-FndAGHs0dYKmRqXiHA8uR=obW9WVcdqq8zS1Yjbn9Xi3A3A@mail.gmail.com>
Date: Fri, 21 Dec 2012 16:03:47 +0100
X-Google-Sender-Auth: nnSjp_Fhgm8iM8PWRzetqrjmgzY
Message-ID: <CACYV=-Fr7+XwHDqAO2nm4QikWEQOT=8CRs7ffM1eusiC_Era0g@mail.gmail.com>
Subject: Re: svn commit: r244533 - in projects/calloutng: share/man/man9
sys/dev/atkbdc sys/dev/random sys/dev/syscons sys/kern sys/sys
From: Davide Italiano <davide@freebsd.org>
To: attilio@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-projects@freebsd.org, Adrian Chadd <adrian@freebsd.org>,
src-committers@freebsd.org, Alexander Motin <mav@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 15:03:55 -0000
On Fri, Dec 21, 2012 at 4:02 PM, Attilio Rao <attilio@freebsd.org> wrote:
> On Fri, Dec 21, 2012 at 3:59 PM, Davide Italiano <davide@freebsd.org> wrote:
>> On Fri, Dec 21, 2012 at 3:50 PM, Adrian Chadd <adrian@freebsd.org> wrote:
>>> Hi,
>>>
>>> There's a DELAY (bt.frac >> 44) there; please write or use a
>>> BINTIME_TO_USEC macro instead?
>>>
>>> Since you're touching kqueue, do you guys have a testing plan for
>>> verifying kqueue operation is still working right?
>>>
>>
>> I do think web servers -- as well as tons of other applications use it.
>> Other than that, the commit doesn't change kqueue() semantics.
>
> This test by gianni@ was very good at finding callout races in the past:
> http://people.freebsd.org/~attilio/callout/test.c
>
> Attilio
>
>
> --
> Peace can only be achieved by understanding - A. Einstein
Thanks Attilio,
I'm going to run it on my test machine today.
Davide
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 15:06:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3CCD49FE;
Fri, 21 Dec 2012 15:06:41 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 1FC058FC0C;
Fri, 21 Dec 2012 15:06:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLF6eie083084;
Fri, 21 Dec 2012 15:06:40 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLF6eOX083083;
Fri, 21 Dec 2012 15:06:40 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212211506.qBLF6eOX083083@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Fri, 21 Dec 2012 15:06:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244536 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 15:06:41 -0000
Author: linimon (doc,ports committer)
Date: Fri Dec 21 15:06:40 2012
New Revision: 244536
URL: http://svnweb.freebsd.org/changeset/base/244536
Log:
Add an anti-foot-shooting measure.
Modified:
projects/portbuild/scripts/buildproxy-client
Modified: projects/portbuild/scripts/buildproxy-client
==============================================================================
--- projects/portbuild/scripts/buildproxy-client Fri Dec 21 14:17:39 2012 (r244535)
+++ projects/portbuild/scripts/buildproxy-client Fri Dec 21 15:06:40 2012 (r244536)
@@ -22,6 +22,8 @@ config = getConfig( pbc, CONFIG_SUBDIR,
BUILDPROXY_SOCKET_FILE = config.get( 'BUILDPROXY_SOCKET_FILE' )
try:
+ code = None
+
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
s.connect(BUILDPROXY_SOCKET_FILE)
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 16:21:01 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 05CBF858;
Fri, 21 Dec 2012 16:21:01 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DDD988FC14;
Fri, 21 Dec 2012 16:21:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLGL0Br094864;
Fri, 21 Dec 2012 16:21:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLGL0kU094862;
Fri, 21 Dec 2012 16:21:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211621.qBLGL0kU094862@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 16:21:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244539 - projects/mtree/contrib/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 16:21:01 -0000
Author: brooks
Date: Fri Dec 21 16:21:00 2012
New Revision: 244539
URL: http://svnweb.freebsd.org/changeset/base/244539
Log:
Move the flavor to misc.c as done upstream to support programs that use
parts of the mtree source.
Modified:
projects/mtree/contrib/mtree/misc.c
projects/mtree/contrib/mtree/mtree.c
Modified: projects/mtree/contrib/mtree/misc.c
==============================================================================
--- projects/mtree/contrib/mtree/misc.c Fri Dec 21 15:54:13 2012 (r244538)
+++ projects/mtree/contrib/mtree/misc.c Fri Dec 21 16:21:00 2012 (r244539)
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: misc.c,v 1.33 2012/12/
#include "extern.h"
+enum flavor flavor = F_MTREE;
+
typedef struct _key {
const char *name; /* key name */
u_int val; /* value */
Modified: projects/mtree/contrib/mtree/mtree.c
==============================================================================
--- projects/mtree/contrib/mtree/mtree.c Fri Dec 21 15:54:13 2012 (r244538)
+++ projects/mtree/contrib/mtree/mtree.c Fri Dec 21 16:21:00 2012 (r244539)
@@ -62,7 +62,6 @@ int ftsoptions = FTS_PHYSICAL;
int bflag, cflag, Cflag, dflag, Dflag, eflag, iflag, jflag, lflag, mflag,
nflag, qflag, rflag, sflag, tflag, uflag, Uflag, wflag;
char fullpath[MAXPATHLEN];
-enum flavor flavor = F_MTREE;
static struct {
enum flavor flavor;
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 16:24:12 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 287EA9C0;
Fri, 21 Dec 2012 16:24:12 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E791B8FC12;
Fri, 21 Dec 2012 16:24:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLGOBG9095318;
Fri, 21 Dec 2012 16:24:11 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLGOBn9095314;
Fri, 21 Dec 2012 16:24:11 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211624.qBLGOBn9095314@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 16:24:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244540 - projects/mtree/lib/libnetbsd
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 16:24:12 -0000
Author: brooks
Date: Fri Dec 21 16:24:10 2012
New Revision: 244540
URL: http://svnweb.freebsd.org/changeset/base/244540
Log:
Add guards against duplicate includes.
Modified:
projects/mtree/lib/libnetbsd/rmd160.h
projects/mtree/lib/libnetbsd/sha1.h
projects/mtree/lib/libnetbsd/sha2.h
projects/mtree/lib/libnetbsd/stdlib.h
Modified: projects/mtree/lib/libnetbsd/rmd160.h
==============================================================================
--- projects/mtree/lib/libnetbsd/rmd160.h Fri Dec 21 16:21:00 2012 (r244539)
+++ projects/mtree/lib/libnetbsd/rmd160.h Fri Dec 21 16:24:10 2012 (r244540)
@@ -1,5 +1,8 @@
/* $FreeBSD$ */
+#ifndef _RMD160_H_
+#define _RMD160_H_
+
#include <ripemd.h>
#define RMD160_CTX RIPEMD160_CTX
@@ -7,3 +10,5 @@
#define RMD160File RIPEMD160_File
#define RMD160Init RIPEMD160_Init
#define RMD160Update RIPEMD160_Update
+
+#endif /* _RMD160_H_ */
Modified: projects/mtree/lib/libnetbsd/sha1.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sha1.h Fri Dec 21 16:21:00 2012 (r244539)
+++ projects/mtree/lib/libnetbsd/sha1.h Fri Dec 21 16:24:10 2012 (r244540)
@@ -1,8 +1,13 @@
/* $FreeBSD$ */
+#ifndef _SHA1_H_
+#define _SHA1_H_
+
#include <sha.h>
#define SHA1End SHA1_End
#define SHA1File SHA1_File
#define SHA1Init SHA1_Init
#define SHA1Update SHA1_Update
+
+#endif /* _SHA1_H_ */
Modified: projects/mtree/lib/libnetbsd/sha2.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sha2.h Fri Dec 21 16:21:00 2012 (r244539)
+++ projects/mtree/lib/libnetbsd/sha2.h Fri Dec 21 16:24:10 2012 (r244540)
@@ -1,4 +1,9 @@
/* $FreeBSD$ */
+#ifndef _SHA2_H_
+#define _SHA2_H_
+
#include <sha256.h>
#include <sha512.h>
+
+#endif /* _SHA2_H_ */
Modified: projects/mtree/lib/libnetbsd/stdlib.h
==============================================================================
--- projects/mtree/lib/libnetbsd/stdlib.h Fri Dec 21 16:21:00 2012 (r244539)
+++ projects/mtree/lib/libnetbsd/stdlib.h Fri Dec 21 16:24:10 2012 (r244540)
@@ -1,7 +1,12 @@
/* $FreeBSD$ */
+#ifndef _LIBNETBSD_STDLIB_H_
+#define _LIBNETBSD_STDLIB_H_
+
#include_next <stdlib.h>
long long strsuftoll(const char *, const char *, long long, long long);
long long strsuftollx(const char *, const char *,
long long, long long, char *, size_t);
+
+#endif /* _LIBNETBSD_STDLIB_H_ */
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 17:11:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B37668BB;
Fri, 21 Dec 2012 17:11:53 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 971F88FC12;
Fri, 21 Dec 2012 17:11:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLHBrFX002352;
Fri, 21 Dec 2012 17:11:53 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLHBrja002351;
Fri, 21 Dec 2012 17:11:53 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211711.qBLHBrja002351@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 17:11:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244545 - projects/mtree/lib/libnetbsd/sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 17:11:53 -0000
Author: brooks
Date: Fri Dec 21 17:11:53 2012
New Revision: 244545
URL: http://svnweb.freebsd.org/changeset/base/244545
Log:
Add guard against double include.
Modified:
projects/mtree/lib/libnetbsd/sys/cdefs.h
Modified: projects/mtree/lib/libnetbsd/sys/cdefs.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sys/cdefs.h Fri Dec 21 17:08:17 2012 (r244544)
+++ projects/mtree/lib/libnetbsd/sys/cdefs.h Fri Dec 21 17:11:53 2012 (r244545)
@@ -1,5 +1,8 @@
/* $FreeBSD$ */
+#ifndef _LIBNETBSD_SYS_CDEFS_H_
+#define _LIBNETBSD_SYS_CDEFS_H_
+
#include_next <sys/cdefs.h>
#ifdef __dead2
@@ -14,3 +17,4 @@
*/
#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
+#endif /* _LIBNETBSD_SYS_CDEFS_H_ */
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 18:00:13 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 9F38A82E;
Fri, 21 Dec 2012 18:00:13 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 843E38FC17;
Fri, 21 Dec 2012 18:00:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLI0DOB008741;
Fri, 21 Dec 2012 18:00:13 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLI0C24008734;
Fri, 21 Dec 2012 18:00:12 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211800.qBLI0C24008734@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 18:00:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244546 - in projects/mtree/lib/libnetbsd: . sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 18:00:13 -0000
Author: brooks
Date: Fri Dec 21 18:00:11 2012
New Revision: 244546
URL: http://svnweb.freebsd.org/changeset/base/244546
Log:
Add appropriate license blocks to all headers. File sizes have now at
least tripled.
Modified:
projects/mtree/lib/libnetbsd/rmd160.h
projects/mtree/lib/libnetbsd/sha1.h
projects/mtree/lib/libnetbsd/sha2.h
projects/mtree/lib/libnetbsd/stdlib.h
projects/mtree/lib/libnetbsd/sys/cdefs.h
projects/mtree/lib/libnetbsd/util.h
Modified: projects/mtree/lib/libnetbsd/rmd160.h
==============================================================================
--- projects/mtree/lib/libnetbsd/rmd160.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/rmd160.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,35 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _RMD160_H_
#define _RMD160_H_
Modified: projects/mtree/lib/libnetbsd/sha1.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sha1.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/sha1.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,35 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _SHA1_H_
#define _SHA1_H_
Modified: projects/mtree/lib/libnetbsd/sha2.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sha2.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/sha2.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,35 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _SHA2_H_
#define _SHA2_H_
Modified: projects/mtree/lib/libnetbsd/stdlib.h
==============================================================================
--- projects/mtree/lib/libnetbsd/stdlib.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/stdlib.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,63 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Luke Mewburn.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+/*-
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _LIBNETBSD_STDLIB_H_
#define _LIBNETBSD_STDLIB_H_
Modified: projects/mtree/lib/libnetbsd/sys/cdefs.h
==============================================================================
--- projects/mtree/lib/libnetbsd/sys/cdefs.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/sys/cdefs.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,35 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _LIBNETBSD_SYS_CDEFS_H_
#define _LIBNETBSD_SYS_CDEFS_H_
Modified: projects/mtree/lib/libnetbsd/util.h
==============================================================================
--- projects/mtree/lib/libnetbsd/util.h Fri Dec 21 17:11:53 2012 (r244545)
+++ projects/mtree/lib/libnetbsd/util.h Fri Dec 21 18:00:11 2012 (r244546)
@@ -1,5 +1,35 @@
/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2012 SRI International
+ * Copyright (c) 1995
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#ifndef _UTIL_H_
#define _UTIL_H_
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 19:36:09 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 888E3F9E;
Fri, 21 Dec 2012 19:36:09 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6E7308FC0A;
Fri, 21 Dec 2012 19:36:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLJa9nQ023569;
Fri, 21 Dec 2012 19:36:09 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLJa9VV023568;
Fri, 21 Dec 2012 19:36:09 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212211936.qBLJa9VV023568@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 19:36:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244552 - projects/mtree/usr.sbin/nmtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 19:36:09 -0000
Author: brooks
Date: Fri Dec 21 19:36:08 2012
New Revision: 244552
URL: http://svnweb.freebsd.org/changeset/base/244552
Log:
Install the manpage as nmtree(8).
Modified:
projects/mtree/usr.sbin/nmtree/Makefile
Modified: projects/mtree/usr.sbin/nmtree/Makefile
==============================================================================
--- projects/mtree/usr.sbin/nmtree/Makefile Fri Dec 21 19:28:17 2012 (r244551)
+++ projects/mtree/usr.sbin/nmtree/Makefile Fri Dec 21 19:36:08 2012 (r244552)
@@ -9,8 +9,7 @@ PROG= nmtree
CFLAGS+= -DMTREE
CFLAGS+= -DNO_SHA384 -I${.CURDIR}
LDADD+= -lmd -lutil
-#MAN= mtree.8
-MAN=
+MAN= nmtree.8
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \
verify.c \
getid.c pack_dev.c
@@ -25,5 +24,7 @@ LIBNETBSD= ${LIBNETBSDDIR}/libnetbs
DPADD+= ${LIBNETBSD}
LDADD+= ${LIBNETBSD}
+nmtree.8: mtree.8
+ cp ${.ALLSRC} ${.TARGET}
.include <bsd.prog.mk>
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 20:50:48 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 639787C9;
Fri, 21 Dec 2012 20:50:48 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 2F8878FC15;
Fri, 21 Dec 2012 20:50:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLKomaJ035826;
Fri, 21 Dec 2012 20:50:48 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLKomnU035825;
Fri, 21 Dec 2012 20:50:48 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212212050.qBLKomnU035825@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 20:50:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244561 - projects/mtree/usr.sbin/nmtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 20:50:48 -0000
Author: brooks
Date: Fri Dec 21 20:50:47 2012
New Revision: 244561
URL: http://svnweb.freebsd.org/changeset/base/244561
Log:
Pre commit to head makefile tidying.
Modified:
projects/mtree/usr.sbin/nmtree/Makefile
Modified: projects/mtree/usr.sbin/nmtree/Makefile
==============================================================================
--- projects/mtree/usr.sbin/nmtree/Makefile Fri Dec 21 20:48:54 2012 (r244560)
+++ projects/mtree/usr.sbin/nmtree/Makefile Fri Dec 21 20:50:47 2012 (r244561)
@@ -1,28 +1,24 @@
-# $NetBSD: Makefile,v 1.32 2009/04/22 15:23:05 lukem Exp $
-# from: @(#)Makefile 8.2 (Berkeley) 4/27/95
+# $FreeBSD$
.include <bsd.own.mk>
.PATH: ${.CURDIR}/../../contrib/mtree
-PROG= nmtree
-CFLAGS+= -DMTREE
-CFLAGS+= -DNO_SHA384 -I${.CURDIR}
+PROG= nmtree
+MAN= nmtree.8
+SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
+ spec.c specspec.c verify.c
LDADD+= -lmd -lutil
-MAN= nmtree.8
-SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \
- verify.c \
- getid.c pack_dev.c
-
-CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
CFLAGS+= -I${.CURDIR}/../../contrib/mknod
.PATH: ${.CURDIR}/../../contrib/mknod
+SRCS+= pack_dev.c
-LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a
-DPADD+= ${LIBNETBSD}
-LDADD+= ${LIBNETBSD}
+CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
+LIBNETBSDDIR= ${.OBJDIR}/../../lib/libnetbsd
+LIBNETBSD= ${LIBNETBSDDIR}/libnetbsd.a
+DPADD+= {LIBNETBSD}
+LDADD+= ${LIBNETBSD}
nmtree.8: mtree.8
cp ${.ALLSRC} ${.TARGET}
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 21:26:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 3BBDF104;
Fri, 21 Dec 2012 21:26:41 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 1D2898FC13;
Fri, 21 Dec 2012 21:26:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLLQfa6041438;
Fri, 21 Dec 2012 21:26:41 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLLQbF0041413;
Fri, 21 Dec 2012 21:26:37 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212212126.qBLLQbF0041413@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 21:26:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244564 - in projects/mtree: bin/date contrib/gdb/gdb
contrib/mknod contrib/mtree etc etc/periodic/daily lib/libnetbsd
lib/libnetgraph lib/libstand/amd64 sbin/hastd sbin/ifconfig share/...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 21:26:41 -0000
Author: brooks
Date: Fri Dec 21 21:26:36 2012
New Revision: 244564
URL: http://svnweb.freebsd.org/changeset/base/244564
Log:
MFH at r244563 looping back the commit of libnetbsd and NetBSD's mtree.
Added:
projects/mtree/lib/libstand/amd64/
- copied from r244563, head/lib/libstand/amd64/
projects/mtree/sys/arm/arm/cpufunc_asm_arm11x6.S
- copied unchanged from r244563, head/sys/arm/arm/cpufunc_asm_arm11x6.S
projects/mtree/sys/boot/ficl64/
- copied from r244563, head/sys/boot/ficl64/
projects/mtree/sys/kern/subr_busdma_bufalloc.c
- copied unchanged from r244563, head/sys/kern/subr_busdma_bufalloc.c
projects/mtree/sys/sys/busdma_bufalloc.h
- copied unchanged from r244563, head/sys/sys/busdma_bufalloc.h
projects/mtree/tools/regression/usr.bin/printf/regress.zero.out
- copied unchanged from r244563, head/tools/regression/usr.bin/printf/regress.zero.out
Replaced:
projects/mtree/contrib/mknod/
- copied from r244563, head/contrib/mknod/
projects/mtree/contrib/mtree/
- copied from r244563, head/contrib/mtree/
projects/mtree/lib/libnetbsd/
- copied from r244563, head/lib/libnetbsd/
projects/mtree/usr.sbin/nmtree/
- copied from r244563, head/usr.sbin/nmtree/
Deleted:
projects/mtree/sys/boot/userboot/libstand/amd64/
Modified:
projects/mtree/bin/date/netdate.c
projects/mtree/contrib/gdb/gdb/dwarf2read.c
projects/mtree/contrib/gdb/gdb/gdbtypes.c
projects/mtree/contrib/gdb/gdb/gdbtypes.h
projects/mtree/contrib/gdb/gdb/hpread.c
projects/mtree/contrib/gdb/gdb/parse.c
projects/mtree/contrib/gdb/gdb/stabsread.c
projects/mtree/etc/newsyslog.conf
projects/mtree/etc/periodic/daily/Makefile
projects/mtree/lib/libnetgraph/sock.c
projects/mtree/sbin/hastd/parse.y
projects/mtree/sbin/ifconfig/af_nd6.c
projects/mtree/sbin/ifconfig/ifconfig.c
projects/mtree/share/man/man4/arcmsr.4
projects/mtree/share/misc/committers-src.dot
projects/mtree/share/mk/bsd.lib.mk
projects/mtree/share/mk/bsd.own.mk
projects/mtree/sys/arm/arm/busdma_machdep-v6.c
projects/mtree/sys/arm/arm/busdma_machdep.c
projects/mtree/sys/arm/arm/cpufunc.c
projects/mtree/sys/arm/arm/elf_trampoline.c
projects/mtree/sys/arm/arm/identcpu.c
projects/mtree/sys/arm/arm/locore.S
projects/mtree/sys/arm/arm/pmap-v6.c
projects/mtree/sys/arm/arm/pmap.c
projects/mtree/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/mtree/sys/arm/broadcom/bcm2835/files.bcm2835
projects/mtree/sys/arm/conf/PANDABOARD
projects/mtree/sys/arm/conf/RPI-B
projects/mtree/sys/arm/conf/VERSATILEPB
projects/mtree/sys/arm/include/armreg.h
projects/mtree/sys/arm/include/cpuconf.h
projects/mtree/sys/arm/include/cpufunc.h
projects/mtree/sys/arm/include/intr.h
projects/mtree/sys/arm/include/pmap.h
projects/mtree/sys/arm/include/vm.h
projects/mtree/sys/arm/versatile/files.versatile
projects/mtree/sys/boot/ficl/Makefile
projects/mtree/sys/boot/userboot/libstand/Makefile
projects/mtree/sys/cam/scsi/scsi_enc_ses.c
projects/mtree/sys/conf/files
projects/mtree/sys/conf/files.arm
projects/mtree/sys/conf/options.arm
projects/mtree/sys/dev/arcmsr/arcmsr.c
projects/mtree/sys/dev/arcmsr/arcmsr.h
projects/mtree/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
projects/mtree/sys/dev/atkbdc/psm.c
projects/mtree/sys/dev/cxgbe/t4_l2t.c
projects/mtree/sys/dev/ixgbe/ixgbe.c
projects/mtree/sys/dev/ixgbe/ixgbe.h
projects/mtree/sys/dev/mii/brgphy.c
projects/mtree/sys/dev/mii/miidevs
projects/mtree/sys/dev/netmap/ixgbe_netmap.h
projects/mtree/sys/dev/nvme/nvme.c
projects/mtree/sys/dev/nvme/nvme_ctrlr.c
projects/mtree/sys/dev/nvme/nvme_private.h
projects/mtree/sys/dev/nvme/nvme_test.c
projects/mtree/sys/dev/usb/serial/usb_serial.c
projects/mtree/sys/dev/usb/serial/usb_serial.h
projects/mtree/sys/dev/usb/storage/umass.c
projects/mtree/sys/dev/usb/storage/ustorage_fs.c
projects/mtree/sys/dev/usb/usb_busdma.c
projects/mtree/sys/dev/usb/usb_msctest.c
projects/mtree/sys/dev/usb/usb_transfer.c
projects/mtree/sys/dev/usb/usbdi.h
projects/mtree/sys/dev/usb/wlan/if_uath.c
projects/mtree/sys/dev/usb/wlan/if_uathvar.h
projects/mtree/sys/dev/usb/wlan/if_upgt.c
projects/mtree/sys/dev/usb/wlan/if_upgtvar.h
projects/mtree/sys/dev/usb/wlan/if_urtw.c
projects/mtree/sys/dev/usb/wlan/if_urtwvar.h
projects/mtree/sys/fs/ext2fs/ext2_dinode.h
projects/mtree/sys/fs/ext2fs/ext2_inode_cnv.c
projects/mtree/sys/fs/ext2fs/ext2_vfsops.c
projects/mtree/sys/fs/ext2fs/ext2fs.h
projects/mtree/sys/kern/kern_descrip.c
projects/mtree/sys/kern/kern_jail.c
projects/mtree/sys/kern/kern_sig.c
projects/mtree/sys/kern/subr_smp.c
projects/mtree/sys/kern/subr_syscall.c
projects/mtree/sys/kern/vfs_bio.c
projects/mtree/sys/kern/vfs_mount.c
projects/mtree/sys/kern/vfs_subr.c
projects/mtree/sys/mips/include/param.h
projects/mtree/sys/netinet6/ip6_output.c
projects/mtree/sys/sys/ktr.h
projects/mtree/sys/tools/vnode_if.awk
projects/mtree/sys/ufs/ffs/ffs_softdep.c
projects/mtree/sys/vm/uma_int.h
projects/mtree/tools/build/mk/OptionalObsoleteFiles.inc
projects/mtree/tools/regression/usr.bin/printf/regress.sh
projects/mtree/usr.bin/grep/grep.c
projects/mtree/usr.bin/grep/grep.h
projects/mtree/usr.bin/grep/util.c
projects/mtree/usr.bin/printf/printf.c
projects/mtree/usr.bin/sort/sort.c
projects/mtree/usr.sbin/acpi/acpidump/acpi.c
projects/mtree/usr.sbin/acpi/acpidump/acpidump.8
projects/mtree/usr.sbin/bsdconfig/bsdconfig
projects/mtree/usr.sbin/bsdconfig/console/saver
projects/mtree/usr.sbin/bsdconfig/examples/bsdconfigrc
projects/mtree/usr.sbin/bsdconfig/mouse/flags
projects/mtree/usr.sbin/bsdconfig/networking/share/device.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/hostname.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/ipaddr.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/media.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/netmask.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/resolv.subr
projects/mtree/usr.sbin/bsdconfig/networking/share/routing.subr
projects/mtree/usr.sbin/bsdconfig/share/common.subr
projects/mtree/usr.sbin/bsdconfig/share/dialog.subr
projects/mtree/usr.sbin/bsdconfig/share/mustberoot.subr
projects/mtree/usr.sbin/bsdconfig/startup/misc
projects/mtree/usr.sbin/bsdconfig/startup/share/rcconf.subr
projects/mtree/usr.sbin/bsdconfig/startup/share/rcedit.subr
projects/mtree/usr.sbin/bsdconfig/usermgmt/groupdel
projects/mtree/usr.sbin/bsdconfig/usermgmt/groupedit
projects/mtree/usr.sbin/bsdconfig/usermgmt/groupinput
projects/mtree/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
projects/mtree/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
projects/mtree/usr.sbin/bsdconfig/usermgmt/userdel
projects/mtree/usr.sbin/bsdconfig/usermgmt/useredit
projects/mtree/usr.sbin/bsdconfig/usermgmt/userinput
projects/mtree/usr.sbin/bsdconfig/usermgmt/usermgmt
projects/mtree/usr.sbin/mountd/mountd.c
projects/mtree/usr.sbin/mptable/mptable.c
projects/mtree/usr.sbin/mtest/mtest.c
projects/mtree/usr.sbin/nfsd/nfsd.c
projects/mtree/usr.sbin/pkg/pkg.c
projects/mtree/usr.sbin/rpcbind/rpcbind.c
projects/mtree/usr.sbin/syslogd/syslogd.c
projects/mtree/usr.sbin/ypserv/yp_main.c
Directory Properties:
projects/mtree/ (props changed)
projects/mtree/contrib/gdb/ (props changed)
projects/mtree/sbin/ (props changed)
projects/mtree/share/man/man4/ (props changed)
projects/mtree/sys/ (props changed)
projects/mtree/sys/boot/ (props changed)
projects/mtree/sys/conf/ (props changed)
Modified: projects/mtree/bin/date/netdate.c
==============================================================================
--- projects/mtree/bin/date/netdate.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/bin/date/netdate.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -85,7 +85,7 @@ netsettime(time_t tval)
dest.sin_addr.s_addr = htonl((u_long)INADDR_ANY);
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) {
- if (errno != EPROTONOSUPPORT)
+ if (errno != EAFNOSUPPORT)
warn("timed");
return (retval = 2);
}
Modified: projects/mtree/contrib/gdb/gdb/dwarf2read.c
==============================================================================
--- projects/mtree/contrib/gdb/gdb/dwarf2read.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/dwarf2read.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -834,6 +834,8 @@ static void read_tag_const_type (struct
static void read_tag_volatile_type (struct die_info *, struct dwarf2_cu *);
+static void read_tag_restrict_type (struct die_info *, struct dwarf2_cu *);
+
static void read_tag_string_type (struct die_info *, struct dwarf2_cu *);
static void read_subroutine_type (struct die_info *, struct dwarf2_cu *);
@@ -3729,7 +3731,8 @@ read_tag_const_type (struct die_info *di
}
base_type = die_type (die, cu);
- die->type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type, 0);
+ die->type = make_cvr_type (1, TYPE_VOLATILE (base_type),
+ TYPE_RESTRICT (base_type), base_type, 0);
}
static void
@@ -3743,7 +3746,23 @@ read_tag_volatile_type (struct die_info
}
base_type = die_type (die, cu);
- die->type = make_cv_type (TYPE_CONST (base_type), 1, base_type, 0);
+ die->type = make_cvr_type (TYPE_CONST (base_type), 1,
+ TYPE_RESTRICT (base_type), base_type, 0);
+}
+
+static void
+read_tag_restrict_type (struct die_info *die, struct dwarf2_cu *cu)
+{
+ struct type *base_type;
+
+ if (die->type)
+ {
+ return;
+ }
+
+ base_type = die_type (die, cu);
+ die->type = make_cvr_type (TYPE_CONST (base_type), TYPE_VOLATILE (base_type),
+ 1, base_type, 0);
}
/* Extract all information from a DW_TAG_string_type DIE and add to
@@ -6086,6 +6105,9 @@ read_type_die (struct die_info *die, str
case DW_TAG_volatile_type:
read_tag_volatile_type (die, cu);
break;
+ case DW_TAG_restrict_type:
+ read_tag_restrict_type (die, cu);
+ break;
case DW_TAG_string_type:
read_tag_string_type (die, cu);
break;
Modified: projects/mtree/contrib/gdb/gdb/gdbtypes.c
==============================================================================
--- projects/mtree/contrib/gdb/gdb/gdbtypes.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/gdbtypes.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -502,7 +502,8 @@ make_type_with_address_space (struct typ
We allocate new memory if needed. */
struct type *
-make_cv_type (int cnst, int voltl, struct type *type, struct type **typeptr)
+make_cvr_type (int cnst, int voltl, int restrct, struct type *type,
+ struct type **typeptr)
{
struct type *ntype; /* New type */
struct type *tmp_type = type; /* tmp type */
@@ -517,6 +518,9 @@ make_cv_type (int cnst, int voltl, struc
if (voltl)
new_flags |= TYPE_FLAG_VOLATILE;
+ if (restrct)
+ new_flags |= TYPE_FLAG_RESTRICT;
+
if (typeptr && *typeptr != NULL)
{
/* Objfile is per-core-type. This const-qualified type had best
@@ -1371,7 +1375,7 @@ struct type *
check_typedef (struct type *type)
{
struct type *orig_type = type;
- int is_const, is_volatile;
+ int is_const, is_volatile, is_restrict;
while (TYPE_CODE (type) == TYPE_CODE_TYPEDEF)
{
@@ -1407,6 +1411,7 @@ check_typedef (struct type *type)
is_const = TYPE_CONST (type);
is_volatile = TYPE_VOLATILE (type);
+ is_restrict = TYPE_RESTRICT (type);
/* If this is a struct/class/union with no fields, then check whether a
full definition exists somewhere else. This is for systems where a
@@ -1424,7 +1429,7 @@ check_typedef (struct type *type)
}
newtype = lookup_transparent_type (name);
if (newtype)
- make_cv_type (is_const, is_volatile, newtype, &type);
+ make_cvr_type (is_const, is_volatile, is_restrict, newtype, &type);
}
/* Otherwise, rely on the stub flag being set for opaque/stubbed types */
else if (TYPE_STUB (type) && !currently_reading_symtab)
@@ -1442,7 +1447,8 @@ check_typedef (struct type *type)
}
sym = lookup_symbol (name, 0, STRUCT_DOMAIN, 0, (struct symtab **) NULL);
if (sym)
- make_cv_type (is_const, is_volatile, SYMBOL_TYPE (sym), &type);
+ make_cvr_type (is_const, is_volatile, is_restrict, SYMBOL_TYPE (sym),
+ &type);
}
if (TYPE_TARGET_STUB (type))
Modified: projects/mtree/contrib/gdb/gdb/gdbtypes.h
==============================================================================
--- projects/mtree/contrib/gdb/gdb/gdbtypes.h Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/gdbtypes.h Fri Dec 21 21:26:36 2012 (r244564)
@@ -273,6 +273,13 @@ enum type_code
#define TYPE_ADDRESS_CLASS_ALL(t) (TYPE_INSTANCE_FLAGS(t) \
& TYPE_FLAG_ADDRESS_CLASS_ALL)
+/* Restrict type. If this is set, the corresponding type has a
+ * restrict modifier.
+ */
+
+#define TYPE_FLAG_RESTRICT (1 << 17)
+#define TYPE_RESTRICT(t) (TYPE_INSTANCE_FLAGS (t) & TYPE_FLAG_RESTRICT)
+
/* Array bound type. */
enum array_bound_type
{
@@ -1099,7 +1106,8 @@ extern struct type *lookup_reference_typ
extern struct type *make_reference_type (struct type *, struct type **);
-extern struct type *make_cv_type (int, int, struct type *, struct type **);
+extern struct type *make_cvr_type (int, int, int, struct type *,
+ struct type **);
extern void replace_type (struct type *, struct type *);
Modified: projects/mtree/contrib/gdb/gdb/hpread.c
==============================================================================
--- projects/mtree/contrib/gdb/gdb/hpread.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/hpread.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -4939,8 +4939,9 @@ hpread_type_lookup (dnttpointer hp_type,
* "m_void" modifiers? Is static_flag really needed here?
* (m_static used for methods of classes, elsewhere).
*/
- tmp_type = make_cv_type (dn_bufp->dmodifier.m_const,
+ tmp_type = make_cvr_type (dn_bufp->dmodifier.m_const,
dn_bufp->dmodifier.m_volatile,
+ 0,
hpread_type_lookup (dn_bufp->dmodifier.type, objfile),
0);
return tmp_type;
Modified: projects/mtree/contrib/gdb/gdb/parse.c
==============================================================================
--- projects/mtree/contrib/gdb/gdb/parse.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/parse.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -1167,13 +1167,15 @@ follow_types (struct type *follow_type)
case tp_end:
done = 1;
if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
+ follow_type = make_cvr_type (make_const,
+ TYPE_VOLATILE (follow_type),
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
+ follow_type = make_cvr_type (TYPE_CONST (follow_type),
+ make_volatile,
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_addr_space)
follow_type = make_type_with_address_space (follow_type,
make_addr_space);
@@ -1192,13 +1194,15 @@ follow_types (struct type *follow_type)
case tp_pointer:
follow_type = lookup_pointer_type (follow_type);
if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
+ follow_type = make_cvr_type (make_const,
+ TYPE_VOLATILE (follow_type),
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
+ follow_type = make_cvr_type (TYPE_CONST (follow_type),
+ make_volatile,
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_addr_space)
follow_type = make_type_with_address_space (follow_type,
make_addr_space);
@@ -1208,13 +1212,15 @@ follow_types (struct type *follow_type)
case tp_reference:
follow_type = lookup_reference_type (follow_type);
if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
+ follow_type = make_cvr_type (make_const,
+ TYPE_VOLATILE (follow_type),
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
+ follow_type = make_cvr_type (TYPE_CONST (follow_type),
+ make_volatile,
+ TYPE_RESTRICT (follow_type),
+ follow_type, 0);
if (make_addr_space)
follow_type = make_type_with_address_space (follow_type,
make_addr_space);
Modified: projects/mtree/contrib/gdb/gdb/stabsread.c
==============================================================================
--- projects/mtree/contrib/gdb/gdb/stabsread.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/contrib/gdb/gdb/stabsread.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -1750,13 +1750,13 @@ again:
case 'k': /* Const qualifier on some type (Sun) */
type = read_type (pp, objfile);
- type = make_cv_type (1, TYPE_VOLATILE (type), type,
+ type = make_cvr_type (1, TYPE_VOLATILE (type), TYPE_RESTRICT(type), type,
dbx_lookup_type (typenums));
break;
case 'B': /* Volatile qual on some type (Sun) */
type = read_type (pp, objfile);
- type = make_cv_type (TYPE_CONST (type), 1, type,
+ type = make_cvr_type (TYPE_CONST (type), 1, TYPE_RESTRICT(type), type,
dbx_lookup_type (typenums));
break;
Modified: projects/mtree/etc/newsyslog.conf
==============================================================================
--- projects/mtree/etc/newsyslog.conf Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/etc/newsyslog.conf Fri Dec 21 21:26:36 2012 (r244564)
@@ -33,7 +33,7 @@
/var/log/pflog 600 3 100 * JB /var/run/pflogd.pid
/var/log/ppp.log root:network 640 3 100 * JC
/var/log/security 600 10 100 * JC
-/var/log/sendmail.st 640 10 * 168 B
+/var/log/sendmail.st 640 10 * 168 BN
/var/log/utx.log 644 3 * @01T05 B
/var/log/weekly.log 640 5 * $W6D0 JN
/var/log/xferlog 600 7 100 * JC
Modified: projects/mtree/etc/periodic/daily/Makefile
==============================================================================
--- projects/mtree/etc/periodic/daily/Makefile Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/etc/periodic/daily/Makefile Fri Dec 21 21:26:36 2012 (r244564)
@@ -6,7 +6,6 @@ FILES= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
200.backup-passwd \
- 220.backup-pkgdb \
330.news \
400.status-disks \
405.status-ata-raid \
@@ -41,7 +40,8 @@ FILES+= 480.status-ntpd
.endif
.if ${MK_PKGTOOLS} != "no"
-FILES+= 490.status-pkg-changes
+FILES+= 220.backup-pkgdb \
+ 490.status-pkg-changes
.endif
.if ${MK_RCMDS} != "no"
Modified: projects/mtree/lib/libnetgraph/sock.c
==============================================================================
--- projects/mtree/lib/libnetgraph/sock.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/lib/libnetgraph/sock.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -71,10 +71,10 @@ NgMkSockNode(const char *name, int *csp,
name = NULL;
/* Create control socket; this also creates the netgraph node.
- If we get an EPROTONOSUPPORT then the socket node type is
+ If we get an EAFNOSUPPORT then the socket node type is
not loaded, so load it and try again. */
if ((cs = socket(AF_NETGRAPH, SOCK_DGRAM, NG_CONTROL)) < 0) {
- if (errno == EPROTONOSUPPORT) {
+ if (errno == EAFNOSUPPORT) {
if (kldload(NG_SOCKET_KLD) < 0) {
errnosv = errno;
if (_gNgDebugLevel >= 1)
Modified: projects/mtree/sbin/hastd/parse.y
==============================================================================
--- projects/mtree/sbin/hastd/parse.y Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/sbin/hastd/parse.y Fri Dec 21 21:26:36 2012 (r244564)
@@ -769,7 +769,7 @@ family_supported(int family)
int sock;
sock = socket(family, SOCK_STREAM, 0);
- if (sock == -1 && errno == EPROTONOSUPPORT)
+ if (sock == -1 && errno == EAFNOSUPPORT)
return (false);
if (sock >= 0)
(void)close(sock);
Modified: projects/mtree/sbin/ifconfig/af_nd6.c
==============================================================================
--- projects/mtree/sbin/ifconfig/af_nd6.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/sbin/ifconfig/af_nd6.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -148,7 +148,7 @@ nd6_status(int s)
memset(&nd, 0, sizeof(nd));
strncpy(nd.ifname, ifr.ifr_name, sizeof(nd.ifname));
if ((s6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- if (errno != EPROTONOSUPPORT)
+ if (errno != EAFNOSUPPORT)
warn("socket(AF_INET6, SOCK_DGRAM)");
return;
}
Modified: projects/mtree/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/mtree/sbin/ifconfig/ifconfig.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/sbin/ifconfig/ifconfig.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -520,7 +520,7 @@ top:
AF_LOCAL : afp->af_af;
if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0 &&
- (uafp != NULL || errno != EPROTONOSUPPORT ||
+ (uafp != NULL || errno != EAFNOSUPPORT ||
(s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0))
err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family);
Modified: projects/mtree/share/man/man4/arcmsr.4
==============================================================================
--- projects/mtree/share/man/man4/arcmsr.4 Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/share/man/man4/arcmsr.4 Fri Dec 21 21:26:36 2012 (r244564)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 3, 2012
+.Dd December 18, 2012
.Dt ARCMSR 4
.Os
.Sh NAME
@@ -100,6 +100,8 @@ ARC-1212
.It
ARC-1213
.It
+ARC-1214
+.It
ARC-1220
.It
ARC-1222
Modified: projects/mtree/share/misc/committers-src.dot
==============================================================================
--- projects/mtree/share/misc/committers-src.dot Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/share/misc/committers-src.dot Fri Dec 21 21:26:36 2012 (r244564)
@@ -194,6 +194,7 @@ le [label="Lukas Ertl\nle@FreeBSD.org\n2
lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"]
marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"]
marius [label="Marius Strobl\nmarius@FreeBSD.org\n2004/04/17"]
+markj [label="Mark Johnston\nmarkj@FreeBSD.org\n2012/12/18"]
markm [label="Mark Murray\nmarkm@FreeBSD.org\n199?/??/??"]
markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"]
matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"]
@@ -378,6 +379,7 @@ eivind -> rwatson
emaste -> rstone
emaste -> dteske
+emaste -> markj
emax -> markus
@@ -573,6 +575,8 @@ rrs -> brucec
rrs -> jchandra
rrs -> tuexen
+rstone -> markj
+
ru -> ceri
ru -> cjc
ru -> eik
Modified: projects/mtree/share/mk/bsd.lib.mk
==============================================================================
--- projects/mtree/share/mk/bsd.lib.mk Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/share/mk/bsd.lib.mk Fri Dec 21 21:26:36 2012 (r244564)
@@ -282,7 +282,7 @@ _libinstall:
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
.if defined(DEBUG_FLAGS)
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
+ ${_INSTALLFLAGS} \
${SHLIB_NAME}.symbols ${DESTDIR}${SHLIBDIR}
.endif
.if defined(SHLIB_LINK)
Modified: projects/mtree/share/mk/bsd.own.mk
==============================================================================
--- projects/mtree/share/mk/bsd.own.mk Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/share/mk/bsd.own.mk Fri Dec 21 21:26:36 2012 (r244564)
@@ -322,9 +322,6 @@ __DEFAULT_YES_OPTIONS = \
BOOT \
BSD_CPIO \
BSNMP \
- SOURCELESS \
- SOURCELESS_HOST \
- SOURCELESS_UCODE \
BZIP2 \
CALENDAR \
CAPSICUM \
@@ -401,10 +398,13 @@ __DEFAULT_YES_OPTIONS = \
SENDMAIL \
SETUID_LOGIN \
SHAREDOCS \
+ SOURCELESS \
+ SOURCELESS_HOST \
+ SOURCELESS_UCODE \
SSP \
- SYSINSTALL \
SYMVER \
SYSCONS \
+ SYSINSTALL \
TCSH \
TELNET \
TEXTPROC \
@@ -417,14 +417,14 @@ __DEFAULT_YES_OPTIONS = \
ZONEINFO
__DEFAULT_NO_OPTIONS = \
- BMAKE \
- BSD_GREP \
BIND_IDN \
BIND_LARGE_FILE \
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+ BMAKE \
BSDCONFIG \
+ BSD_GREP \
CLANG_EXTRAS \
CTF \
HESIOD \
Modified: projects/mtree/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/mtree/sys/arm/arm/busdma_machdep-v6.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/sys/arm/arm/busdma_machdep-v6.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2012 Ian Lepore
* Copyright (c) 2010 Mark Tinguely
* Copyright (c) 2004 Olivier Houchard
* Copyright (c) 2002 Peter Grehan
@@ -40,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/bus.h>
+#include <sys/busdma_bufalloc.h>
#include <sys/interrupt.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
@@ -53,6 +55,8 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
#include <machine/atomic.h>
#include <machine/bus.h>
@@ -83,7 +87,6 @@ struct bus_dma_tag {
int map_count;
bus_dma_lock_t *lockfunc;
void *lockfuncarg;
- bus_dma_segment_t *segments;
struct bounce_zone *bounce_zone;
/*
* DMA range for this tag. If the page doesn't fall within
@@ -93,6 +96,14 @@ struct bus_dma_tag {
*/
struct arm32_dma_range *ranges;
int _nranges;
+ /*
+ * Most tags need one or two segments, and can use the local tagsegs
+ * array. For tags with a larger limit, we'll allocate a bigger array
+ * on first use.
+ */
+ bus_dma_segment_t *segments;
+ bus_dma_segment_t tagsegs[2];
+
};
@@ -150,6 +161,8 @@ struct bus_dmamap {
pmap_t pmap;
bus_dmamap_callback_t *callback;
void *callback_arg;
+ int flags;
+#define DMAMAP_COHERENT (1 << 0)
STAILQ_ENTRY(bus_dmamap) links;
STAILQ_HEAD(,sync_list) slist;
};
@@ -169,6 +182,38 @@ int run_filter(bus_dma_tag_t dmat, bus_a
static int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
void *buf, bus_size_t buflen, int flags);
+static busdma_bufalloc_t coherent_allocator; /* Cache of coherent buffers */
+static busdma_bufalloc_t standard_allocator; /* Cache of standard buffers */
+static void
+busdma_init(void *dummy)
+{
+
+ /* Create a cache of buffers in standard (cacheable) memory. */
+ standard_allocator = busdma_bufalloc_create("buffer",
+ arm_dcache_align, /* minimum_alignment */
+ NULL, /* uma_alloc func */
+ NULL, /* uma_free func */
+ 0); /* uma_zcreate_flags */
+
+ /*
+ * Create a cache of buffers in uncacheable memory, to implement the
+ * BUS_DMA_COHERENT (and potentially BUS_DMA_NOCACHE) flag.
+ */
+ coherent_allocator = busdma_bufalloc_create("coherent",
+ arm_dcache_align, /* minimum_alignment */
+ busdma_bufalloc_alloc_uncacheable,
+ busdma_bufalloc_free_uncacheable,
+ 0); /* uma_zcreate_flags */
+}
+
+/*
+ * This init historically used SI_SUB_VM, but now the init code requires
+ * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
+ * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
+ * SI_SUB_KMEM and SI_ORDER_THIRD.
+ */
+SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+
static __inline int
_bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr)
{
@@ -322,7 +367,18 @@ bus_dma_tag_create(bus_dma_tag_t parent,
newtag->lockfunc = dflt_lock;
newtag->lockfuncarg = NULL;
}
- newtag->segments = NULL;
+ /*
+ * If all the segments we need fit into the local tagsegs array, set the
+ * pointer now. Otherwise NULL the pointer and an array of segments
+ * will be allocated later, on first use. We don't pre-allocate now
+ * because some tags exist just to pass contraints to children in the
+ * device hierarchy, and they tend to use BUS_SPACE_UNRESTRICTED and we
+ * sure don't want to try to allocate an array for that.
+ */
+ if (newtag->nsegments <= nitems(newtag->tagsegs))
+ newtag->segments = newtag->tagsegs;
+ else
+ newtag->segments = NULL;
/* Take into account any restrictions imposed by our parent tag */
if (parent != NULL) {
@@ -411,7 +467,8 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat)
parent = dmat->parent;
atomic_subtract_int(&dmat->ref_count, 1);
if (dmat->ref_count == 0) {
- if (dmat->segments != NULL)
+ if (dmat->segments != NULL &&
+ dmat->segments != dmat->tagsegs)
free(dmat->segments, M_DEVBUF);
free(dmat, M_DEVBUF);
/*
@@ -545,7 +602,10 @@ int
bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
bus_dmamap_t *mapp)
{
- int mflags, len;
+ busdma_bufalloc_t ba;
+ struct busdma_bufzone *bufzone;
+ vm_memattr_t memattr;
+ int mflags;
if (flags & BUS_DMA_NOWAIT)
mflags = M_NOWAIT;
@@ -579,34 +639,54 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
if (flags & BUS_DMA_ZERO)
mflags |= M_ZERO;
+ if (flags & BUS_DMA_COHERENT) {
+ memattr = VM_MEMATTR_UNCACHEABLE;
+ ba = coherent_allocator;
+ (*mapp)->flags |= DMAMAP_COHERENT;
+ } else {
+ memattr = VM_MEMATTR_DEFAULT;
+ ba = standard_allocator;
+ (*mapp)->flags = 0;
+ }
+#ifdef notyet
+ /* All buffers we allocate are cache-aligned. */
+ map->flags |= DMAMAP_CACHE_ALIGNED;
+#endif
- /*
- * XXX:
- * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
- * alignment guarantees of malloc need to be nailed down, and the
- * code below should be rewritten to take that into account.
- *
- * In the meantime, we'll warn the user if malloc gets it wrong.
- *
- * allocate at least a cache line. This should help avoid cache
- * corruption.
+ /*
+ * Try to find a bufzone in the allocator that holds a cache of buffers
+ * of the right size for this request. If the buffer is too big to be
+ * held in the allocator cache, this returns NULL.
+ */
+ bufzone = busdma_bufalloc_findzone(ba, dmat->maxsize);
+
+ /*
+ * Allocate the buffer from the uma(9) allocator if...
+ * - It's small enough to be in the allocator (bufzone not NULL).
+ * - The alignment constraint isn't larger than the allocation size
+ * (the allocator aligns buffers to their size boundaries).
+ * - There's no need to handle lowaddr/highaddr exclusion zones.
+ * else allocate non-contiguous pages if...
+ * - The page count that could get allocated doesn't exceed nsegments.
+ * - The alignment constraint isn't larger than a page boundary.
+ * - There are no boundary-crossing constraints.
+ * else allocate a block of contiguous pages because one or more of the
+ * constraints is something that only the contig allocator can fulfill.
*/
- len = max(dmat->maxsize, arm_dcache_align);
- if (len <= PAGE_SIZE &&
- (dmat->alignment < len) &&
- !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) {
- *vaddr = malloc(len, M_DEVBUF, mflags);
+ if (bufzone != NULL && dmat->alignment <= bufzone->size &&
+ !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) {
+ *vaddr = uma_zalloc(bufzone->umazone, mflags);
+ } else if (dmat->nsegments >= btoc(dmat->maxsize) &&
+ dmat->alignment <= PAGE_SIZE && dmat->boundary == 0) {
+ *vaddr = (void *)kmem_alloc_attr(kernel_map, dmat->maxsize,
+ mflags, 0, dmat->lowaddr, memattr);
} else {
- /*
- * XXX Use Contigmalloc until it is merged into this facility
- * and handles multi-seg allocations. Nobody is doing
- * multi-seg allocations yet though.
- * XXX Certain AGP hardware does.
- */
- *vaddr = contigmalloc(len, M_DEVBUF, mflags,
- 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
- dmat->boundary);
+ *vaddr = (void *)kmem_alloc_contig(kernel_map, dmat->maxsize,
+ mflags, 0, dmat->lowaddr, dmat->alignment, dmat->boundary,
+ memattr);
}
+
+
if (*vaddr == NULL) {
CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
__func__, dmat, dmat->flags, ENOMEM);
@@ -630,19 +710,24 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
void
bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
{
- int len;
+ struct busdma_bufzone *bufzone;
+ busdma_bufalloc_t ba;
+
+ if (map->flags & DMAMAP_COHERENT)
+ ba = coherent_allocator;
+ else
+ ba = standard_allocator;
+
+ /* Be careful not to access map from here on. */
+
+ bufzone = busdma_bufalloc_findzone(ba, dmat->maxsize);
+
+ if (bufzone != NULL && dmat->alignment <= bufzone->size &&
+ !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr))
+ uma_zfree(bufzone->umazone, vaddr);
+ else
+ kmem_free(kernel_map, (vm_offset_t)vaddr, dmat->maxsize);
-#ifdef mftnotyet
- pmap_change_attr((vm_offset_t)vaddr, dmat->maxsize, ARM_WRITE_BACK);
-#endif
- len = max(dmat->maxsize, arm_dcache_align);
- if (len <= PAGE_SIZE &&
- (dmat->alignment < len) &&
- !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr))
- free(vaddr, M_DEVBUF);
- else {
- contigfree(vaddr, len, M_DEVBUF);
- }
dmat->map_count--;
free(map, M_DEVBUF);
CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags);
@@ -1177,6 +1262,8 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus
dmat->bounce_zone->total_bounced++;
}
}
+ if (map->flags & DMAMAP_COHERENT)
+ return;
sl = STAILQ_FIRST(&map->slist);
while (sl) {
Modified: projects/mtree/sys/arm/arm/busdma_machdep.c
==============================================================================
--- projects/mtree/sys/arm/arm/busdma_machdep.c Fri Dec 21 21:03:34 2012 (r244563)
+++ projects/mtree/sys/arm/arm/busdma_machdep.c Fri Dec 21 21:26:36 2012 (r244564)
@@ -1,4 +1,5 @@
/*-
+ * Copyright (c) 2012 Ian Lepore
* Copyright (c) 2004 Olivier Houchard
* Copyright (c) 2002 Peter Grehan
* Copyright (c) 1997, 1998 Justin T. Gibbs.
@@ -32,7 +33,23 @@
__FBSDID("$FreeBSD$");
/*
- * ARM bus dma support routines
+ * ARM bus dma support routines.
+ *
+ * XXX Things to investigate / fix some day...
+ * - What is the earliest that this API can be called? Could there be any
+ * fallout from changing the SYSINIT() order from SI_SUB_VM to SI_SUB_KMEM?
+ * - The manpage mentions the BUS_DMA_NOWAIT flag only in the context of the
+ * bus_dmamap_load() function. This code has historically (and still does)
+ * honor it in bus_dmamem_alloc(). If we got rid of that we could lose some
+ * error checking because some resource management calls would become WAITOK
+ * and thus "cannot fail."
+ * - The decisions made by _bus_dma_can_bounce() should be made once, at tag
+ * creation time, and the result stored in the tag.
+ * - It should be possible to take some shortcuts when mapping a buffer we know
+ * came from the uma(9) allocators based on what we know about such buffers
+ * (aligned, contiguous, etc).
+ * - The allocation of bounce pages could probably be cleaned up, then we could
+ * retire arm_remap_nocache().
*/
#define _ARM32_BUS_DMA_PRIVATE
@@ -40,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/bus.h>
+#include <sys/busdma_bufalloc.h>
#include <sys/interrupt.h>
#include <sys/lock.h>
#include <sys/proc.h>
@@ -50,7 +68,10 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/sysctl.h>
+#include <vm/uma.h>
#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
@@ -81,7 +102,6 @@ struct bus_dma_tag {
int map_count;
bus_dma_lock_t *lockfunc;
void *lockfuncarg;
- bus_dma_segment_t *segments;
/*
* DMA range for this tag. If the page doesn't fall within
* one of these ranges, an error is returned. The caller
@@ -91,6 +111,13 @@ struct bus_dma_tag {
struct arm32_dma_range *ranges;
int _nranges;
struct bounce_zone *bounce_zone;
+ /*
+ * Most tags need one or two segments, and can use the local tagsegs
+ * array. For tags with a larger limit, we'll allocate a bigger array
+ * on first use.
+ */
+ bus_dma_segment_t *segments;
+ bus_dma_segment_t tagsegs[2];
};
struct bounce_page {
@@ -134,7 +161,7 @@ SYSCTL_INT(_hw_busdma, OID_AUTO, total_b
#define DMAMAP_LINEAR 0x1
#define DMAMAP_MBUF 0x2
#define DMAMAP_UIO 0x4
-#define DMAMAP_ALLOCATED 0x10
+#define DMAMAP_CACHE_ALIGNED 0x10
#define DMAMAP_TYPE_MASK (DMAMAP_LINEAR|DMAMAP_MBUF|DMAMAP_UIO)
#define DMAMAP_COHERENT 0x8
struct bus_dmamap {
@@ -144,9 +171,6 @@ struct bus_dmamap {
bus_dma_tag_t dmat;
int flags;
void *buffer;
- void *origbuffer;
- void *allocbuffer;
- TAILQ_ENTRY(bus_dmamap) freelist;
int len;
STAILQ_ENTRY(bus_dmamap) links;
bus_dmamap_callback_t *callback;
@@ -157,12 +181,6 @@ struct bus_dmamap {
static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
-static TAILQ_HEAD(,bus_dmamap) dmamap_freelist =
- TAILQ_HEAD_INITIALIZER(dmamap_freelist);
-
-#define BUSDMA_STATIC_MAPS 500
-static struct bus_dmamap map_pool[BUSDMA_STATIC_MAPS];
-
static struct mtx busdma_mtx;
MTX_SYSINIT(busdma_mtx, &busdma_mtx, "busdma lock", MTX_DEF);
@@ -180,6 +198,91 @@ static void free_bounce_page(bus_dma_tag
bus_dma_tag_t arm_root_dma_tag;
/*
+ * ----------------------------------------------------------------------------
+ * Begin block of code useful to transplant to other implementations.
+ */
+
+static uma_zone_t dmamap_zone; /* Cache of struct bus_dmamap items */
+
+static busdma_bufalloc_t coherent_allocator; /* Cache of coherent buffers */
+static busdma_bufalloc_t standard_allocator; /* Cache of standard buffers */
+
+/*
+ * This is the ctor function passed to uma_zcreate() for the pool of dma maps.
+ * It'll need platform-specific changes if this code is copied.
+ */
+static int
+dmamap_ctor(void *mem, int size, void *arg, int flags)
+{
+ bus_dmamap_t map;
+ bus_dma_tag_t dmat;
+
+ map = (bus_dmamap_t)mem;
+ dmat = (bus_dma_tag_t)arg;
+
+ dmat->map_count++;
+
+ map->dmat = dmat;
+ map->flags = 0;
+ STAILQ_INIT(&map->bpages);
+
+ return (0);
+}
+
+/*
+ * This is the dtor function passed to uma_zcreate() for the pool of dma maps.
+ * It may need platform-specific changes if this code is copied .
+ */
+static void
+dmamap_dtor(void *mem, int size, void *arg)
+{
+ bus_dmamap_t map;
+
+ map = (bus_dmamap_t)mem;
+
+ map->dmat->map_count--;
+}
+
+static void
+busdma_init(void *dummy)
+{
+
+ /* Create a cache of maps for bus_dmamap_create(). */
+ dmamap_zone = uma_zcreate("dma maps", sizeof(struct bus_dmamap),
+ dmamap_ctor, dmamap_dtor, NULL, NULL, UMA_ALIGN_PTR, 0);
+
+ /* Create a cache of buffers in standard (cacheable) memory. */
+ standard_allocator = busdma_bufalloc_create("buffer",
+ arm_dcache_align, /* minimum_alignment */
+ NULL, /* uma_alloc func */
+ NULL, /* uma_free func */
+ 0); /* uma_zcreate_flags */
+
+ /*
+ * Create a cache of buffers in uncacheable memory, to implement the
+ * BUS_DMA_COHERENT (and potentially BUS_DMA_NOCACHE) flag.
+ */
+ coherent_allocator = busdma_bufalloc_create("coherent",
+ arm_dcache_align, /* minimum_alignment */
+ busdma_bufalloc_alloc_uncacheable,
+ busdma_bufalloc_free_uncacheable,
+ 0); /* uma_zcreate_flags */
+}
+
+/*
+ * This init historically used SI_SUB_VM, but now the init code requires
+ * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
+ * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
+ * SI_SUB_KMEM and SI_ORDER_THIRD.
+ */
+SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+
+/*
+ * End block of code useful to transplant to other implementations.
+ * ----------------------------------------------------------------------------
+ */
+
+/*
* Return true if a match is made.
*
* To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'.
@@ -206,30 +309,26 @@ run_filter(bus_dma_tag_t dmat, bus_addr_
return (retval);
}
-static void
-arm_dmamap_freelist_init(void *dummy)
-{
- int i;
-
- for (i = 0; i < BUSDMA_STATIC_MAPS; i++)
- TAILQ_INSERT_HEAD(&dmamap_freelist, &map_pool[i], freelist);
-}
-
-SYSINIT(busdma, SI_SUB_VM, SI_ORDER_ANY, arm_dmamap_freelist_init, NULL);
-
/*
- * Check to see if the specified page is in an allowed DMA range.
+ * This routine checks the exclusion zone constraints from a tag against the
+ * physical RAM available on the machine. If a tag specifies an exclusion zone
+ * but there's no RAM in that zone, then we avoid allocating resources to bounce
+ * a request, and we can use any memory allocator (as opposed to needing
+ * kmem_alloc_contig() just because it can allocate pages in an address range).
+ *
+ * Most tags have BUS_SPACE_MAXADDR or BUS_SPACE_MAXADDR_32BIT (they are the
+ * same value on 32-bit architectures) as their lowaddr constraint, and we can't
+ * possibly have RAM at an address higher than the highest address we can
+ * express, so we take a fast out.
*/
-
-static __inline int
-bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t *segs,
- bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap,
- int flags, vm_offset_t *lastaddrp, int *segp);
-
static __inline int
_bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr)
{
int i;
+
+ if (lowaddr >= BUS_SPACE_MAXADDR)
+ return (0);
+
for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) {
if ((lowaddr >= phys_avail[i] && lowaddr <= phys_avail[i + 1])
|| (lowaddr < phys_avail[i] &&
@@ -294,38 +393,6 @@ dflt_lock(void *arg, bus_dma_lock_op_t o
#endif
}
-static __inline bus_dmamap_t
-_busdma_alloc_dmamap(void)
-{
- bus_dmamap_t map;
-
- mtx_lock(&busdma_mtx);
- map = TAILQ_FIRST(&dmamap_freelist);
- if (map)
- TAILQ_REMOVE(&dmamap_freelist, map, freelist);
- mtx_unlock(&busdma_mtx);
- if (!map) {
- map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT | M_ZERO);
- if (map)
- map->flags = DMAMAP_ALLOCATED;
- } else
- map->flags = 0;
- STAILQ_INIT(&map->bpages);
- return (map);
-}
-
-static __inline void
-_busdma_free_dmamap(bus_dmamap_t map)
-{
- if (map->flags & DMAMAP_ALLOCATED)
- free(map, M_DEVBUF);
- else {
- mtx_lock(&busdma_mtx);
- TAILQ_INSERT_HEAD(&dmamap_freelist, map, freelist);
- mtx_unlock(&busdma_mtx);
- }
-}
-
/*
* Allocate a device specific dma_tag.
*/
@@ -354,7 +421,7 @@ bus_dma_tag_create(bus_dma_tag_t parent,
}
newtag->parent = parent;
- newtag->alignment = alignment;
+ newtag->alignment = alignment ? alignment : 1;
newtag->boundary = boundary;
newtag->lowaddr = trunc_page((vm_offset_t)lowaddr) + (PAGE_SIZE - 1);
newtag->highaddr = trunc_page((vm_offset_t)highaddr) + (PAGE_SIZE - 1);
@@ -375,9 +442,19 @@ bus_dma_tag_create(bus_dma_tag_t parent,
newtag->lockfunc = dflt_lock;
newtag->lockfuncarg = NULL;
}
- newtag->segments = NULL;
-
- /*
+ /*
+ * If all the segments we need fit into the local tagsegs array, set the
+ * pointer now. Otherwise NULL the pointer and an array of segments
+ * will be allocated later, on first use. We don't pre-allocate now
+ * because some tags exist just to pass contraints to children in the
+ * device hierarchy, and they tend to use BUS_SPACE_UNRESTRICTED and we
+ * sure don't want to try to allocate an array for that.
+ */
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Fri Dec 21 23:12:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E6E42D17;
Fri, 21 Dec 2012 23:12:34 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id CAF248FC0C;
Fri, 21 Dec 2012 23:12:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLNCYfo057464;
Fri, 21 Dec 2012 23:12:34 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLNCYg0057461;
Fri, 21 Dec 2012 23:12:34 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201212212312.qBLNCYg0057461@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Dec 2012 23:12:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244570 - projects/mtree/usr.bin/xinstall
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2012 23:12:35 -0000
Author: brooks
Date: Fri Dec 21 23:12:34 2012
New Revision: 244570
URL: http://svnweb.freebsd.org/changeset/base/244570
Log:
Add the -U option to indicate that install is running unprivileged,
and that it should not try to change the owner, the group, or the
file flags of the destination.
Modified:
projects/mtree/usr.bin/xinstall/install.1
projects/mtree/usr.bin/xinstall/xinstall.c
Modified: projects/mtree/usr.bin/xinstall/install.1
==============================================================================
--- projects/mtree/usr.bin/xinstall/install.1 Fri Dec 21 22:48:12 2012 (r244569)
+++ projects/mtree/usr.bin/xinstall/install.1 Fri Dec 21 23:12:34 2012 (r244570)
@@ -156,6 +156,9 @@ number of systems and binary types.
See below for how
.Nm
can be instructed to use another program to strip binaries.
+.It Fl U
+Indicate that install is running unprivileged, and that it should not
+try to change the owner, the group, or the file flags of the destination.
.It Fl v
Cause
.Nm
Modified: projects/mtree/usr.bin/xinstall/xinstall.c
==============================================================================
--- projects/mtree/usr.bin/xinstall/xinstall.c Fri Dec 21 22:48:12 2012 (r244569)
+++ projects/mtree/usr.bin/xinstall/xinstall.c Fri Dec 21 23:12:34 2012 (r244570)
@@ -78,8 +78,8 @@ static struct passwd *pp;
static struct group *gp;
static gid_t gid;
static uid_t uid;
-static int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy,
- verbose;
+static int dobackup, docompare, dodir, dopreserve, dostrip, dounpriv,
+ nommap, safecopy, verbose;
static mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
static const char *suffix = BACKUP_SUFFIX;
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
iflags = 0;
group = owner = NULL;
- while ((ch = getopt(argc, argv, "B:bCcdf:g:Mm:o:pSsv")) != -1)
+ while ((ch = getopt(argc, argv, "B:bCcdf:g:Mm:o:pSsUv")) != -1)
switch((char)ch) {
case 'B':
suffix = optarg;
@@ -126,9 +126,6 @@ main(int argc, char *argv[])
break;
case 'f':
flags = optarg;
- if (strtofflags(&flags, &fset, NULL))
- errx(EX_USAGE, "%s: invalid flag", flags);
- iflags |= SETFLAGS;
break;
case 'g':
group = optarg;
@@ -155,6 +152,9 @@ main(int argc, char *argv[])
case 's':
dostrip = 1;
break;
+ case 'U':
+ dounpriv = 1;
+ break;
case 'v':
verbose = 1;
break;
@@ -185,7 +185,7 @@ main(int argc, char *argv[])
safecopy = 1;
/* get group and owner id's */
- if (group != NULL) {
+ if (group != NULL && !dounpriv) {
if ((gp = getgrnam(group)) != NULL)
gid = gp->gr_gid;
else
@@ -193,7 +193,7 @@ main(int argc, char *argv[])
} else
gid = (gid_t)-1;
- if (owner != NULL) {
+ if (owner != NULL && !dounpriv) {
if ((pp = getpwnam(owner)) != NULL)
uid = pp->pw_uid;
else
@@ -201,6 +201,12 @@ main(int argc, char *argv[])
} else
uid = (uid_t)-1;
+ if (flags != NULL && !dounpriv) {
+ if (strtofflags(&flags, &fset, NULL))
+ errx(EX_USAGE, "%s: invalid flag", flags);
+ iflags |= SETFLAGS;
+ }
+
if (dodir) {
for (; *argv != NULL; ++argv)
install_dir(*argv);
@@ -464,15 +470,16 @@ install(const char *from_name, const cha
* Set owner, group, mode for target; do the chown first,
* chown may lose the setuid bits.
*/
- if ((gid != (gid_t)-1 && gid != to_sb.st_gid) ||
+ if (!dounpriv && ((gid != (gid_t)-1 && gid != to_sb.st_gid) ||
(uid != (uid_t)-1 && uid != to_sb.st_uid) ||
- (mode != (to_sb.st_mode & ALLPERMS))) {
+ (mode != (to_sb.st_mode & ALLPERMS)))) {
/* Try to turn off the immutable bits. */
if (to_sb.st_flags & NOCHANGEBITS)
(void)fchflags(to_fd, to_sb.st_flags & ~NOCHANGEBITS);
}
- if ((gid != (gid_t)-1 && gid != to_sb.st_gid) ||
+ if (!dounpriv &
+ (gid != (gid_t)-1 && gid != to_sb.st_gid) ||
(uid != (uid_t)-1 && uid != to_sb.st_uid))
if (fchown(to_fd, uid, gid) == -1) {
serrno = errno;
@@ -482,6 +489,8 @@ install(const char *from_name, const cha
}
if (mode != (to_sb.st_mode & ALLPERMS))
+ if (dounpriv)
+ mode &= S_IRWXU|S_IRWXG|S_IRWXO;
if (fchmod(to_fd, mode)) {
serrno = errno;
(void)unlink(to_name);
@@ -496,7 +505,7 @@ install(const char *from_name, const cha
* trying to turn off UF_NODUMP. If we're trying to set real flags,
* then warn if the fs doesn't support it, otherwise fail.
*/
- if (!devnull && (flags & SETFLAGS ||
+ if (!dounpriv & !devnull && (flags & SETFLAGS ||
(from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) &&
fchflags(to_fd,
flags & SETFLAGS ? fset : from_sb.st_flags & ~UF_NODUMP)) {
@@ -771,10 +780,14 @@ install_dir(char *path)
break;
}
- if ((gid != (gid_t)-1 || uid != (uid_t)-1) && chown(path, uid, gid))
- warn("chown %u:%u %s", uid, gid, path);
- if (chmod(path, mode))
- warn("chmod %o %s", mode, path);
+ if (!dounpriv) {
+ if ((gid != (gid_t)-1 || uid != (uid_t)-1) &&
+ chown(path, uid, gid))
+ warn("chown %u:%u %s", uid, gid, path);
+ /* XXXBED: should we do the chmod in the dounpriv case? */
+ if (chmod(path, mode))
+ warn("chmod %o %s", mode, path);
+ }
}
/*
@@ -785,11 +798,11 @@ static void
usage(void)
{
(void)fprintf(stderr,
-"usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+"usage: install [-bCcMpSsUv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
" [-o owner] file1 file2\n"
-" install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
+" install [-bCcMpSsUv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
" [-o owner] file1 ... fileN directory\n"
-" install -d [-v] [-g group] [-m mode] [-o owner] directory ...\n");
+" install -dU [-vU] [-g group] [-m mode] [-o owner] directory ...\n");
exit(EX_USAGE);
/* NOTREACHED */
}
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 00:15:45 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id F3EE284E;
Sat, 22 Dec 2012 00:15:44 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id D91888FC0A;
Sat, 22 Dec 2012 00:15:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBM0FivK068392;
Sat, 22 Dec 2012 00:15:44 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBM0Fi10068391;
Sat, 22 Dec 2012 00:15:44 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212220015.qBM0Fi10068391@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 22 Dec 2012 00:15:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244572 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 00:15:45 -0000
Author: linimon (doc,ports committer)
Date: Sat Dec 22 00:15:44 2012
New Revision: 244572
URL: http://svnweb.freebsd.org/changeset/base/244572
Log:
Add anti-foot-shooting measure.
Modified:
projects/portbuild/scripts/processfail
Modified: projects/portbuild/scripts/processfail
==============================================================================
--- projects/portbuild/scripts/processfail Fri Dec 21 23:47:22 2012 (r244571)
+++ projects/portbuild/scripts/processfail Sat Dec 22 00:15:44 2012 (r244572)
@@ -56,6 +56,9 @@ basename() {
echo ${1##*/}
}
+if [ ! -f failure ]; then
+ touch failure
+fi
sort -r -n -k 4 -t \| failure > newfailure
IFS='|'
while read dir name ver date last count; do
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 07:48:17 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0A4D982C;
Sat, 22 Dec 2012 07:48:17 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id DD6888FC16;
Sat, 22 Dec 2012 07:48:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBM7mGoI034907;
Sat, 22 Dec 2012 07:48:16 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBM7mA5Q034869;
Sat, 22 Dec 2012 07:48:10 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201212220748.qBM7mA5Q034869@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 22 Dec 2012 07:48:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244581 - in projects/arm_eabi: . bin/date bin/df bin/ps
bin/sh cddl/contrib/opensolaris/cmd/zdb
cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9 contrib/bind9/bin
contrib/bind9...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 07:48:17 -0000
Author: andrew
Date: Sat Dec 22 07:48:09 2012
New Revision: 244581
URL: http://svnweb.freebsd.org/changeset/base/244581
Log:
MFC to r244579
Added:
projects/arm_eabi/contrib/bind9/lib/dns/opensslecdsa_link.c
- copied unchanged from r244579, head/contrib/bind9/lib/dns/opensslecdsa_link.c
projects/arm_eabi/contrib/libc-vis/
- copied from r244579, head/contrib/libc-vis/
projects/arm_eabi/contrib/mknod/
- copied from r244579, head/contrib/mknod/
projects/arm_eabi/contrib/mtree/
- copied from r244579, head/contrib/mtree/
projects/arm_eabi/lib/libc/gen/unvis-compat.c
- copied unchanged from r244579, head/lib/libc/gen/unvis-compat.c
projects/arm_eabi/lib/libnetbsd/
- copied from r244579, head/lib/libnetbsd/
projects/arm_eabi/lib/libstand/amd64/
- copied from r244579, head/lib/libstand/amd64/
projects/arm_eabi/sys/arm/arm/cpufunc_asm_arm11x6.S
- copied unchanged from r244579, head/sys/arm/arm/cpufunc_asm_arm11x6.S
projects/arm_eabi/sys/arm/arm/pl190.c
- copied unchanged from r244579, head/sys/arm/arm/pl190.c
projects/arm_eabi/sys/arm/conf/VERSATILEPB
- copied unchanged from r244579, head/sys/arm/conf/VERSATILEPB
projects/arm_eabi/sys/arm/versatile/
- copied from r244579, head/sys/arm/versatile/
projects/arm_eabi/sys/boot/fdt/dts/versatilepb.dts
- copied unchanged from r244579, head/sys/boot/fdt/dts/versatilepb.dts
projects/arm_eabi/sys/boot/ficl64/
- copied from r244579, head/sys/boot/ficl64/
projects/arm_eabi/sys/kern/subr_busdma_bufalloc.c
- copied unchanged from r244579, head/sys/kern/subr_busdma_bufalloc.c
projects/arm_eabi/sys/rpc/krpc.h
- copied unchanged from r244579, head/sys/rpc/krpc.h
projects/arm_eabi/sys/security/audit/bsm_domain.c
- copied unchanged from r244579, head/sys/security/audit/bsm_domain.c
projects/arm_eabi/sys/security/audit/bsm_errno.c
- copied unchanged from r244579, head/sys/security/audit/bsm_errno.c
projects/arm_eabi/sys/security/audit/bsm_fcntl.c
- copied unchanged from r244579, head/sys/security/audit/bsm_fcntl.c
projects/arm_eabi/sys/security/audit/bsm_socket_type.c
- copied unchanged from r244579, head/sys/security/audit/bsm_socket_type.c
projects/arm_eabi/sys/security/audit/bsm_token.c
- copied unchanged from r244579, head/sys/security/audit/bsm_token.c
projects/arm_eabi/sys/sys/busdma_bufalloc.h
- copied unchanged from r244579, head/sys/sys/busdma_bufalloc.h
projects/arm_eabi/tools/regression/bin/sh/errors/write-error1.0
- copied unchanged from r244579, head/tools/regression/bin/sh/errors/write-error1.0
projects/arm_eabi/tools/regression/usr.bin/printf/regress.zero.out
- copied unchanged from r244579, head/tools/regression/usr.bin/printf/regress.zero.out
projects/arm_eabi/usr.sbin/nmtree/
- copied from r244579, head/usr.sbin/nmtree/
Deleted:
projects/arm_eabi/include/vis.h
projects/arm_eabi/lib/libc/gen/unvis.3
projects/arm_eabi/lib/libc/gen/unvis.c
projects/arm_eabi/lib/libc/gen/vis.3
projects/arm_eabi/lib/libc/gen/vis.c
projects/arm_eabi/sys/boot/userboot/libstand/amd64/
projects/arm_eabi/sys/security/audit/audit_bsm_domain.c
projects/arm_eabi/sys/security/audit/audit_bsm_errno.c
projects/arm_eabi/sys/security/audit/audit_bsm_fcntl.c
projects/arm_eabi/sys/security/audit/audit_bsm_socket_type.c
projects/arm_eabi/sys/security/audit/audit_bsm_token.c
Modified:
projects/arm_eabi/UPDATING
projects/arm_eabi/bin/date/netdate.c
projects/arm_eabi/bin/df/df.c
projects/arm_eabi/bin/ps/ps.c
projects/arm_eabi/bin/sh/eval.c
projects/arm_eabi/bin/sh/output.c
projects/arm_eabi/bin/sh/output.h
projects/arm_eabi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
projects/arm_eabi/contrib/bind9/CHANGES
projects/arm_eabi/contrib/bind9/Makefile.in
projects/arm_eabi/contrib/bind9/README
projects/arm_eabi/contrib/bind9/acconfig.h
projects/arm_eabi/contrib/bind9/bin/Makefile.in
projects/arm_eabi/contrib/bind9/bin/check/Makefile.in
projects/arm_eabi/contrib/bind9/bin/check/check-tool.c
projects/arm_eabi/contrib/bind9/bin/confgen/Makefile.in
projects/arm_eabi/contrib/bind9/bin/confgen/unix/Makefile.in
projects/arm_eabi/contrib/bind9/bin/dig/Makefile.in
projects/arm_eabi/contrib/bind9/bin/dig/nslookup.c
projects/arm_eabi/contrib/bind9/bin/dnssec/Makefile.in
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.8
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.c
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.html
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-settime.c
projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-signzone.c
projects/arm_eabi/contrib/bind9/bin/named/Makefile.in
projects/arm_eabi/contrib/bind9/bin/named/builtin.c
projects/arm_eabi/contrib/bind9/bin/named/config.c
projects/arm_eabi/contrib/bind9/bin/named/controlconf.c
projects/arm_eabi/contrib/bind9/bin/named/convertxsl.pl
projects/arm_eabi/contrib/bind9/bin/named/query.c
projects/arm_eabi/contrib/bind9/bin/named/server.c
projects/arm_eabi/contrib/bind9/bin/named/statschannel.c
projects/arm_eabi/contrib/bind9/bin/named/unix/Makefile.in
projects/arm_eabi/contrib/bind9/bin/nsupdate/Makefile.in
projects/arm_eabi/contrib/bind9/bin/nsupdate/nsupdate.c
projects/arm_eabi/contrib/bind9/bin/rndc/Makefile.in
projects/arm_eabi/contrib/bind9/bin/tools/Makefile.in
projects/arm_eabi/contrib/bind9/config.h.in
projects/arm_eabi/contrib/bind9/configure.in
projects/arm_eabi/contrib/bind9/doc/Makefile.in
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM-book.xml
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.ch04.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.ch06.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.ch07.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.ch08.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.ch09.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.html
projects/arm_eabi/contrib/bind9/doc/arm/Bv9ARM.pdf
projects/arm_eabi/contrib/bind9/doc/arm/Makefile.in
projects/arm_eabi/contrib/bind9/doc/arm/man.arpaname.html
projects/arm_eabi/contrib/bind9/doc/arm/man.ddns-confgen.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dig.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-keygen.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-revoke.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-settime.html
projects/arm_eabi/contrib/bind9/doc/arm/man.dnssec-signzone.html
projects/arm_eabi/contrib/bind9/doc/arm/man.genrandom.html
projects/arm_eabi/contrib/bind9/doc/arm/man.host.html
projects/arm_eabi/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
projects/arm_eabi/contrib/bind9/doc/arm/man.named-checkconf.html
projects/arm_eabi/contrib/bind9/doc/arm/man.named-checkzone.html
projects/arm_eabi/contrib/bind9/doc/arm/man.named-journalprint.html
projects/arm_eabi/contrib/bind9/doc/arm/man.named.html
projects/arm_eabi/contrib/bind9/doc/arm/man.nsec3hash.html
projects/arm_eabi/contrib/bind9/doc/arm/man.nsupdate.html
projects/arm_eabi/contrib/bind9/doc/arm/man.rndc-confgen.html
projects/arm_eabi/contrib/bind9/doc/arm/man.rndc.conf.html
projects/arm_eabi/contrib/bind9/doc/arm/man.rndc.html
projects/arm_eabi/contrib/bind9/doc/misc/Makefile.in
projects/arm_eabi/contrib/bind9/doc/misc/format-options.pl
projects/arm_eabi/contrib/bind9/doc/misc/options
projects/arm_eabi/contrib/bind9/doc/misc/sort-options.pl
projects/arm_eabi/contrib/bind9/isc-config.sh.in
projects/arm_eabi/contrib/bind9/lib/Makefile.in
projects/arm_eabi/contrib/bind9/lib/bind9/Makefile.in
projects/arm_eabi/contrib/bind9/lib/bind9/api
projects/arm_eabi/contrib/bind9/lib/bind9/check.c
projects/arm_eabi/contrib/bind9/lib/bind9/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/bind9/include/bind9/Makefile.in
projects/arm_eabi/contrib/bind9/lib/dns/Makefile.in
projects/arm_eabi/contrib/bind9/lib/dns/adb.c
projects/arm_eabi/contrib/bind9/lib/dns/api
projects/arm_eabi/contrib/bind9/lib/dns/db.c
projects/arm_eabi/contrib/bind9/lib/dns/dnssec.c
projects/arm_eabi/contrib/bind9/lib/dns/ds.c
projects/arm_eabi/contrib/bind9/lib/dns/dst_api.c
projects/arm_eabi/contrib/bind9/lib/dns/dst_internal.h
projects/arm_eabi/contrib/bind9/lib/dns/dst_openssl.h
projects/arm_eabi/contrib/bind9/lib/dns/dst_parse.c
projects/arm_eabi/contrib/bind9/lib/dns/dst_parse.h
projects/arm_eabi/contrib/bind9/lib/dns/dst_result.c
projects/arm_eabi/contrib/bind9/lib/dns/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/db.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/dnssec.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/ds.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/iptable.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/keyvalues.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/log.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/rdataset.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/rpz.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/stats.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/view.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dns/zone.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dst/Makefile.in
projects/arm_eabi/contrib/bind9/lib/dns/include/dst/dst.h
projects/arm_eabi/contrib/bind9/lib/dns/include/dst/result.h
projects/arm_eabi/contrib/bind9/lib/dns/log.c
projects/arm_eabi/contrib/bind9/lib/dns/master.c
projects/arm_eabi/contrib/bind9/lib/dns/masterdump.c
projects/arm_eabi/contrib/bind9/lib/dns/openssl_link.c
projects/arm_eabi/contrib/bind9/lib/dns/openssldh_link.c
projects/arm_eabi/contrib/bind9/lib/dns/openssldsa_link.c
projects/arm_eabi/contrib/bind9/lib/dns/opensslgost_link.c
projects/arm_eabi/contrib/bind9/lib/dns/opensslrsa_link.c
projects/arm_eabi/contrib/bind9/lib/dns/rbtdb.c
projects/arm_eabi/contrib/bind9/lib/dns/rcode.c
projects/arm_eabi/contrib/bind9/lib/dns/rdata.c
projects/arm_eabi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
projects/arm_eabi/contrib/bind9/lib/dns/rdata/generic/ds_43.c
projects/arm_eabi/contrib/bind9/lib/dns/rdataset.c
projects/arm_eabi/contrib/bind9/lib/dns/resolver.c
projects/arm_eabi/contrib/bind9/lib/dns/rpz.c
projects/arm_eabi/contrib/bind9/lib/dns/spnego_asn1.pl
projects/arm_eabi/contrib/bind9/lib/dns/validator.c
projects/arm_eabi/contrib/bind9/lib/dns/view.c
projects/arm_eabi/contrib/bind9/lib/dns/zone.c
projects/arm_eabi/contrib/bind9/lib/export/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/dns/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/dns/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/dns/include/dns/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/dns/include/dst/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/irs/include/irs/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/nls/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/nothreads/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/pthreads/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/unix/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in
projects/arm_eabi/contrib/bind9/lib/export/samples/Makefile-postinstall.in
projects/arm_eabi/contrib/bind9/lib/export/samples/Makefile.in
projects/arm_eabi/contrib/bind9/lib/irs/Makefile.in
projects/arm_eabi/contrib/bind9/lib/irs/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/irs/include/irs/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/alpha/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/alpha/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/api
projects/arm_eabi/contrib/bind9/lib/isc/ia64/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/ia64/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/ia64/include/isc/atomic.h
projects/arm_eabi/contrib/bind9/lib/isc/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/include/isc/file.h
projects/arm_eabi/contrib/bind9/lib/isc/include/isc/namespace.h
projects/arm_eabi/contrib/bind9/lib/isc/include/isc/task.h
projects/arm_eabi/contrib/bind9/lib/isc/mem.c
projects/arm_eabi/contrib/bind9/lib/isc/mips/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/mips/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/mips/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/nls/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/noatomic/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/noatomic/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/nothreads/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/nothreads/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/powerpc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/powerpc/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/pthreads/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/pthreads/condition.c
projects/arm_eabi/contrib/bind9/lib/isc/pthreads/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/sparc64/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/sparc64/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/task.c
projects/arm_eabi/contrib/bind9/lib/isc/task_api.c
projects/arm_eabi/contrib/bind9/lib/isc/unix/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/unix/file.c
projects/arm_eabi/contrib/bind9/lib/isc/unix/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/unix/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_32/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_32/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_64/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_64/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isccc/api
projects/arm_eabi/contrib/bind9/lib/isccc/cc.c
projects/arm_eabi/contrib/bind9/lib/isccc/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isccc/include/isccc/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isccfg/api
projects/arm_eabi/contrib/bind9/lib/isccfg/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in
projects/arm_eabi/contrib/bind9/lib/isccfg/namedconf.c
projects/arm_eabi/contrib/bind9/lib/lwres/Makefile.in
projects/arm_eabi/contrib/bind9/lib/lwres/api
projects/arm_eabi/contrib/bind9/lib/lwres/getaddrinfo.c
projects/arm_eabi/contrib/bind9/lib/lwres/include/Makefile.in
projects/arm_eabi/contrib/bind9/lib/lwres/include/lwres/Makefile.in
projects/arm_eabi/contrib/bind9/lib/lwres/man/Makefile.in
projects/arm_eabi/contrib/bind9/make/rules.in
projects/arm_eabi/contrib/bind9/version
projects/arm_eabi/contrib/binutils/gas/config/tc-arm.c
projects/arm_eabi/contrib/gcc/config/arm/arm.h
projects/arm_eabi/contrib/gcc/longlong.h
projects/arm_eabi/contrib/gdb/gdb/dwarf2read.c
projects/arm_eabi/contrib/gdb/gdb/gdbtypes.c
projects/arm_eabi/contrib/gdb/gdb/gdbtypes.h
projects/arm_eabi/contrib/gdb/gdb/hpread.c
projects/arm_eabi/contrib/gdb/gdb/parse.c
projects/arm_eabi/contrib/gdb/gdb/stabsread.c
projects/arm_eabi/contrib/openbsm/INSTALL
projects/arm_eabi/contrib/openbsm/NEWS
projects/arm_eabi/contrib/openbsm/VERSION
projects/arm_eabi/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
projects/arm_eabi/contrib/openbsm/config/config.h
projects/arm_eabi/contrib/openbsm/configure
projects/arm_eabi/contrib/openbsm/configure.ac
projects/arm_eabi/contrib/openbsm/etc/audit_event
projects/arm_eabi/contrib/openbsm/sys/bsm/audit_kevents.h
projects/arm_eabi/contrib/openbsm/sys/bsm/audit_record.h
projects/arm_eabi/contrib/top/top.h
projects/arm_eabi/etc/defaults/rc.conf
projects/arm_eabi/etc/devd/usb.conf
projects/arm_eabi/etc/login.conf
projects/arm_eabi/etc/newsyslog.conf
projects/arm_eabi/etc/periodic/daily/Makefile
projects/arm_eabi/etc/pf.os
projects/arm_eabi/etc/rc.d/auditdistd
projects/arm_eabi/etc/rc.d/savecore
projects/arm_eabi/etc/rc.d/sysctl
projects/arm_eabi/etc/regdomain.xml
projects/arm_eabi/gnu/lib/libgcc/Makefile
projects/arm_eabi/gnu/usr.bin/binutils/as/Makefile
projects/arm_eabi/include/Makefile
projects/arm_eabi/lib/Makefile
projects/arm_eabi/lib/bind/config.h
projects/arm_eabi/lib/bind/dns/Makefile
projects/arm_eabi/lib/bind/isc/isc/platform.h
projects/arm_eabi/lib/clang/Makefile
projects/arm_eabi/lib/libc/gen/Makefile.inc
projects/arm_eabi/lib/libc/gen/Symbol.map
projects/arm_eabi/lib/libc/gen/check_utility_compat.c
projects/arm_eabi/lib/libc/gen/fmtmsg.c
projects/arm_eabi/lib/libc/gen/getcap.c
projects/arm_eabi/lib/libc/gen/getgrent.c
projects/arm_eabi/lib/libc/gen/getnetgrent.c
projects/arm_eabi/lib/libc/gen/getttyent.c
projects/arm_eabi/lib/libc/gen/getusershell.c
projects/arm_eabi/lib/libc/gen/getutxent.c
projects/arm_eabi/lib/libc/gen/sysctlbyname.c
projects/arm_eabi/lib/libc/iconv/citrus_mmap.c
projects/arm_eabi/lib/libc/locale/collate.c
projects/arm_eabi/lib/libc/locale/setrunelocale.c
projects/arm_eabi/lib/libc/nls/msgcat.c
projects/arm_eabi/lib/libc/sys/socket.2
projects/arm_eabi/lib/libcompiler_rt/Makefile
projects/arm_eabi/lib/libdevstat/devstat.3
projects/arm_eabi/lib/libdevstat/devstat.c
projects/arm_eabi/lib/libdevstat/devstat.h
projects/arm_eabi/lib/libnetgraph/sock.c
projects/arm_eabi/lib/libradius/Makefile
projects/arm_eabi/lib/libradius/libradius.3
projects/arm_eabi/lib/libradius/radius.conf.5
projects/arm_eabi/lib/libradius/radlib.c
projects/arm_eabi/lib/libradius/radlib.h
projects/arm_eabi/lib/libradius/radlib_private.h
projects/arm_eabi/lib/libradius/radlib_vs.h
projects/arm_eabi/release/picobsd/floppy.tree/etc/ppp/ppp.conf
projects/arm_eabi/release/picobsd/mfs_tree/etc/remote
projects/arm_eabi/sbin/comcontrol/comcontrol.8
projects/arm_eabi/sbin/growfs/growfs.c
projects/arm_eabi/sbin/hastd/parse.y
projects/arm_eabi/sbin/ifconfig/af_nd6.c
projects/arm_eabi/sbin/ifconfig/ifconfig.c
projects/arm_eabi/sbin/mount_nfs/mount_nfs.8
projects/arm_eabi/sbin/route/route.c
projects/arm_eabi/sbin/savecore/savecore.8
projects/arm_eabi/sbin/savecore/savecore.c
projects/arm_eabi/sbin/setkey/setkey.8
projects/arm_eabi/sbin/sysctl/sysctl.8
projects/arm_eabi/sbin/sysctl/sysctl.c
projects/arm_eabi/share/examples/etc/make.conf
projects/arm_eabi/share/examples/ppp/ppp.conf.sample
projects/arm_eabi/share/examples/ppp/ppp.conf.span-isp
projects/arm_eabi/share/i18n/csmapper/Makefile.part
projects/arm_eabi/share/man/man4/arcmsr.4
projects/arm_eabi/share/man/man4/gdb.4
projects/arm_eabi/share/man/man4/mouse.4
projects/arm_eabi/share/man/man4/ng_netflow.4
projects/arm_eabi/share/man/man5/rc.conf.5
projects/arm_eabi/share/man/man5/remote.5
projects/arm_eabi/share/man/man7/tuning.7
projects/arm_eabi/share/man/man9/Makefile
projects/arm_eabi/share/man/man9/domain.9
projects/arm_eabi/share/man/man9/zone.9
projects/arm_eabi/share/misc/committers-src.dot
projects/arm_eabi/share/misc/iso639
projects/arm_eabi/share/mk/bsd.lib.mk
projects/arm_eabi/share/mk/bsd.own.mk
projects/arm_eabi/share/mk/bsd.prog.mk
projects/arm_eabi/share/mk/sys.mk
projects/arm_eabi/share/syscons/keymaps/spanish.dvorak.kbd
projects/arm_eabi/sys/amd64/amd64/fpu.c
projects/arm_eabi/sys/amd64/amd64/pmap.c
projects/arm_eabi/sys/amd64/include/fpu.h
projects/arm_eabi/sys/arm/arm/busdma_machdep-v6.c
projects/arm_eabi/sys/arm/arm/busdma_machdep.c
projects/arm_eabi/sys/arm/arm/cpufunc.c
projects/arm_eabi/sys/arm/arm/elf_trampoline.c
projects/arm_eabi/sys/arm/arm/identcpu.c
projects/arm_eabi/sys/arm/arm/locore.S
projects/arm_eabi/sys/arm/arm/pmap-v6.c
projects/arm_eabi/sys/arm/arm/pmap.c
projects/arm_eabi/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/arm_eabi/sys/arm/broadcom/bcm2835/files.bcm2835
projects/arm_eabi/sys/arm/conf/PANDABOARD
projects/arm_eabi/sys/arm/conf/RPI-B
projects/arm_eabi/sys/arm/include/armreg.h
projects/arm_eabi/sys/arm/include/cpuconf.h
projects/arm_eabi/sys/arm/include/cpufunc.h
projects/arm_eabi/sys/arm/include/intr.h
projects/arm_eabi/sys/arm/include/pmap.h
projects/arm_eabi/sys/arm/include/vm.h
projects/arm_eabi/sys/boot/arm/uboot/Makefile
projects/arm_eabi/sys/boot/efi/libefi/libefi.c
projects/arm_eabi/sys/boot/ficl/Makefile
projects/arm_eabi/sys/boot/forth/beastie.4th.8
projects/arm_eabi/sys/boot/forth/check-password.4th
projects/arm_eabi/sys/boot/forth/check-password.4th.8
projects/arm_eabi/sys/boot/forth/frames.4th
projects/arm_eabi/sys/boot/forth/loader.4th.8
projects/arm_eabi/sys/boot/forth/loader.conf.5
projects/arm_eabi/sys/boot/forth/menu.4th.8
projects/arm_eabi/sys/boot/forth/support.4th
projects/arm_eabi/sys/boot/i386/efi/ldscript.amd64
projects/arm_eabi/sys/boot/i386/efi/reloc.c
projects/arm_eabi/sys/boot/sparc64/boot1/boot1.c
projects/arm_eabi/sys/boot/userboot/libstand/Makefile
projects/arm_eabi/sys/cam/cam_periph.c
projects/arm_eabi/sys/cam/cam_xpt.c
projects/arm_eabi/sys/cam/ctl/ctl.c
projects/arm_eabi/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/arm_eabi/sys/cam/ctl/scsi_ctl.c
projects/arm_eabi/sys/cam/scsi/scsi_ch.c
projects/arm_eabi/sys/cam/scsi/scsi_enc.c
projects/arm_eabi/sys/cam/scsi/scsi_enc_internal.h
projects/arm_eabi/sys/cam/scsi/scsi_enc_ses.c
projects/arm_eabi/sys/cam/scsi/scsi_pass.c
projects/arm_eabi/sys/cam/scsi/scsi_sg.c
projects/arm_eabi/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
projects/arm_eabi/sys/cddl/compat/opensolaris/sys/kstat.h
projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
projects/arm_eabi/sys/conf/files
projects/arm_eabi/sys/conf/files.arm
projects/arm_eabi/sys/conf/options.arm
projects/arm_eabi/sys/dev/agp/agp_i810.c
projects/arm_eabi/sys/dev/ahci/ahci.c
projects/arm_eabi/sys/dev/ale/if_ale.c
projects/arm_eabi/sys/dev/arcmsr/arcmsr.c
projects/arm_eabi/sys/dev/arcmsr/arcmsr.h
projects/arm_eabi/sys/dev/ata/ata-pci.h
projects/arm_eabi/sys/dev/ata/chipsets/ata-ati.c
projects/arm_eabi/sys/dev/ath/ath_hal/ah_regdomain.c
projects/arm_eabi/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
projects/arm_eabi/sys/dev/ath/if_ath_tx.c
projects/arm_eabi/sys/dev/ath/if_athvar.h
projects/arm_eabi/sys/dev/atkbdc/psm.c
projects/arm_eabi/sys/dev/cxgbe/t4_l2t.c
projects/arm_eabi/sys/dev/ixgbe/ixgbe.c
projects/arm_eabi/sys/dev/ixgbe/ixgbe.h
projects/arm_eabi/sys/dev/mii/brgphy.c
projects/arm_eabi/sys/dev/mii/miidevs
projects/arm_eabi/sys/dev/netmap/ixgbe_netmap.h
projects/arm_eabi/sys/dev/nvme/nvme.c
projects/arm_eabi/sys/dev/nvme/nvme_ctrlr.c
projects/arm_eabi/sys/dev/nvme/nvme_private.h
projects/arm_eabi/sys/dev/nvme/nvme_test.c
projects/arm_eabi/sys/dev/smc/if_smc.c
projects/arm_eabi/sys/dev/sound/pci/hda/hdaa_patches.c
projects/arm_eabi/sys/dev/sound/pci/hda/hdac.h
projects/arm_eabi/sys/dev/sound/usb/uaudio.c
projects/arm_eabi/sys/dev/sym/sym_hipd.c
projects/arm_eabi/sys/dev/uart/uart_bus_fdt.c
projects/arm_eabi/sys/dev/usb/serial/u3g.c
projects/arm_eabi/sys/dev/usb/serial/usb_serial.c
projects/arm_eabi/sys/dev/usb/serial/usb_serial.h
projects/arm_eabi/sys/dev/usb/storage/umass.c
projects/arm_eabi/sys/dev/usb/storage/ustorage_fs.c
projects/arm_eabi/sys/dev/usb/usb_busdma.c
projects/arm_eabi/sys/dev/usb/usb_msctest.c
projects/arm_eabi/sys/dev/usb/usb_transfer.c
projects/arm_eabi/sys/dev/usb/usbdevs
projects/arm_eabi/sys/dev/usb/usbdi.h
projects/arm_eabi/sys/dev/usb/wlan/if_uath.c
projects/arm_eabi/sys/dev/usb/wlan/if_uathvar.h
projects/arm_eabi/sys/dev/usb/wlan/if_upgt.c
projects/arm_eabi/sys/dev/usb/wlan/if_upgtvar.h
projects/arm_eabi/sys/dev/usb/wlan/if_urtw.c
projects/arm_eabi/sys/dev/usb/wlan/if_urtwvar.h
projects/arm_eabi/sys/dev/virtio/block/virtio_blk.c
projects/arm_eabi/sys/dev/virtio/network/if_vtnet.c
projects/arm_eabi/sys/dev/virtio/scsi/virtio_scsi.c
projects/arm_eabi/sys/dev/wbwd/wbwd.c
projects/arm_eabi/sys/dev/wtap/if_wtap.c
projects/arm_eabi/sys/fs/ext2fs/ext2_dinode.h
projects/arm_eabi/sys/fs/ext2fs/ext2_inode_cnv.c
projects/arm_eabi/sys/fs/ext2fs/ext2_vfsops.c
projects/arm_eabi/sys/fs/ext2fs/ext2fs.h
projects/arm_eabi/sys/fs/nfs/nfs.h
projects/arm_eabi/sys/fs/nfs/nfs_commonkrpc.c
projects/arm_eabi/sys/fs/nfs/nfs_commonport.c
projects/arm_eabi/sys/fs/nfs/nfs_commonsubs.c
projects/arm_eabi/sys/fs/nfs/nfs_var.h
projects/arm_eabi/sys/fs/nfs/nfscl.h
projects/arm_eabi/sys/fs/nfs/nfsclstate.h
projects/arm_eabi/sys/fs/nfs/nfsport.h
projects/arm_eabi/sys/fs/nfs/nfsproto.h
projects/arm_eabi/sys/fs/nfsclient/nfs_clbio.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clcomsubs.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clkdtrace.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clkrpc.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clport.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clrpcops.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clstate.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clvfsops.c
projects/arm_eabi/sys/fs/nfsclient/nfs_clvnops.c
projects/arm_eabi/sys/fs/nfsclient/nfsmount.h
projects/arm_eabi/sys/fs/nfsclient/nfsnode.h
projects/arm_eabi/sys/fs/nfsserver/nfs_nfsdstate.c
projects/arm_eabi/sys/kern/kern_descrip.c
projects/arm_eabi/sys/kern/kern_fork.c
projects/arm_eabi/sys/kern/kern_jail.c
projects/arm_eabi/sys/kern/kern_ktr.c
projects/arm_eabi/sys/kern/kern_mbuf.c
projects/arm_eabi/sys/kern/kern_mib.c
projects/arm_eabi/sys/kern/kern_priv.c
projects/arm_eabi/sys/kern/kern_shutdown.c
projects/arm_eabi/sys/kern/kern_sig.c
projects/arm_eabi/sys/kern/kern_switch.c
projects/arm_eabi/sys/kern/subr_param.c
projects/arm_eabi/sys/kern/subr_smp.c
projects/arm_eabi/sys/kern/subr_syscall.c
projects/arm_eabi/sys/kern/subr_witness.c
projects/arm_eabi/sys/kern/uipc_domain.c
projects/arm_eabi/sys/kern/uipc_socket.c
projects/arm_eabi/sys/kern/uipc_usrreq.c
projects/arm_eabi/sys/kern/vfs_bio.c
projects/arm_eabi/sys/kern/vfs_export.c
projects/arm_eabi/sys/kern/vfs_mount.c
projects/arm_eabi/sys/kern/vfs_subr.c
projects/arm_eabi/sys/kgssapi/gss_accept_sec_context.c
projects/arm_eabi/sys/kgssapi/gss_acquire_cred.c
projects/arm_eabi/sys/kgssapi/gss_canonicalize_name.c
projects/arm_eabi/sys/kgssapi/gss_delete_sec_context.c
projects/arm_eabi/sys/kgssapi/gss_display_status.c
projects/arm_eabi/sys/kgssapi/gss_export_name.c
projects/arm_eabi/sys/kgssapi/gss_impl.c
projects/arm_eabi/sys/kgssapi/gss_import_name.c
projects/arm_eabi/sys/kgssapi/gss_init_sec_context.c
projects/arm_eabi/sys/kgssapi/gss_pname_to_uid.c
projects/arm_eabi/sys/kgssapi/gss_release_cred.c
projects/arm_eabi/sys/kgssapi/gss_release_name.c
projects/arm_eabi/sys/kgssapi/gss_set_cred_option.c
projects/arm_eabi/sys/kgssapi/gssapi_impl.h
projects/arm_eabi/sys/mips/include/param.h
projects/arm_eabi/sys/net/bpf.c
projects/arm_eabi/sys/net/bpf.h
projects/arm_eabi/sys/net/bpf_buffer.c
projects/arm_eabi/sys/net/bpfdesc.h
projects/arm_eabi/sys/net/if_bridge.c
projects/arm_eabi/sys/net/if_llatbl.c
projects/arm_eabi/sys/net80211/ieee80211_adhoc.c
projects/arm_eabi/sys/net80211/ieee80211_hostap.c
projects/arm_eabi/sys/net80211/ieee80211_proto.c
projects/arm_eabi/sys/net80211/ieee80211_regdomain.h
projects/arm_eabi/sys/net80211/ieee80211_sta.c
projects/arm_eabi/sys/net80211/ieee80211_sta.h
projects/arm_eabi/sys/net80211/ieee80211_superg.c
projects/arm_eabi/sys/net80211/ieee80211_superg.h
projects/arm_eabi/sys/netinet/if_ether.c
projects/arm_eabi/sys/netinet/in_pcb.c
projects/arm_eabi/sys/netinet/sctp_output.c
projects/arm_eabi/sys/netinet/sctp_output.h
projects/arm_eabi/sys/netinet/tcp_input.c
projects/arm_eabi/sys/netinet/tcp_subr.c
projects/arm_eabi/sys/netinet/udp_usrreq.c
projects/arm_eabi/sys/netinet6/in6.c
projects/arm_eabi/sys/netinet6/in6_var.h
projects/arm_eabi/sys/netinet6/ip6_input.c
projects/arm_eabi/sys/netinet6/ip6_output.c
projects/arm_eabi/sys/netinet6/ip6_var.h
projects/arm_eabi/sys/netinet6/nd6.c
projects/arm_eabi/sys/netpfil/pf/if_pfsync.c
projects/arm_eabi/sys/netpfil/pf/pf.c
projects/arm_eabi/sys/netpfil/pf/pf_if.c
projects/arm_eabi/sys/netpfil/pf/pf_ioctl.c
projects/arm_eabi/sys/netpfil/pf/pf_norm.c
projects/arm_eabi/sys/nfsclient/nfsargs.h
projects/arm_eabi/sys/rpc/clnt.h
projects/arm_eabi/sys/rpc/clnt_rc.c
projects/arm_eabi/sys/rpc/clnt_vc.c
projects/arm_eabi/sys/rpc/svc.h
projects/arm_eabi/sys/rpc/svc_vc.c
projects/arm_eabi/sys/sparc64/conf/GENERIC
projects/arm_eabi/sys/sys/fnv_hash.h
projects/arm_eabi/sys/sys/kdb.h
projects/arm_eabi/sys/sys/ktr.h
projects/arm_eabi/sys/sys/mount.h
projects/arm_eabi/sys/sys/protosw.h
projects/arm_eabi/sys/sys/socketvar.h
projects/arm_eabi/sys/sys/sysctl.h
projects/arm_eabi/sys/sys/systm.h
projects/arm_eabi/sys/tools/vnode_if.awk
projects/arm_eabi/sys/ufs/ffs/ffs_softdep.c
projects/arm_eabi/sys/ufs/ufs/ufs_quota.c
projects/arm_eabi/sys/vm/uma.h
projects/arm_eabi/sys/vm/uma_core.c
projects/arm_eabi/sys/vm/uma_int.h
projects/arm_eabi/sys/vm/vm.h
projects/arm_eabi/sys/vm/vm_fault.c
projects/arm_eabi/sys/vm/vm_map.c
projects/arm_eabi/sys/vm/vm_meter.c
projects/arm_eabi/sys/vm/vm_mmap.c
projects/arm_eabi/sys/vm/vm_object.c
projects/arm_eabi/sys/vm/vm_object.h
projects/arm_eabi/sys/vm/vm_page.c
projects/arm_eabi/sys/vm/vm_pageout.c
projects/arm_eabi/sys/vm/vm_unix.c
projects/arm_eabi/sys/x86/include/bus.h
projects/arm_eabi/tools/build/mk/OptionalObsoleteFiles.inc
projects/arm_eabi/tools/debugscripts/dot.gdbinit
projects/arm_eabi/tools/regression/lib/libc/stdio/test-perror.c
projects/arm_eabi/tools/regression/usr.bin/printf/regress.sh
projects/arm_eabi/tools/test/ppsapi/Makefile
projects/arm_eabi/tools/test/ppsapi/README
projects/arm_eabi/tools/tools/sysbuild/sysbuild.sh
projects/arm_eabi/usr.bin/calendar/parsedata.c
projects/arm_eabi/usr.bin/fetch/fetch.c
projects/arm_eabi/usr.bin/grep/grep.c
projects/arm_eabi/usr.bin/grep/grep.h
projects/arm_eabi/usr.bin/grep/util.c
projects/arm_eabi/usr.bin/indent/indent_globs.h
projects/arm_eabi/usr.bin/locate/locate/locate.c
projects/arm_eabi/usr.bin/printf/printf.c
projects/arm_eabi/usr.bin/sort/sort.c
projects/arm_eabi/usr.bin/sort/sort.h
projects/arm_eabi/usr.bin/time/time.c
projects/arm_eabi/usr.bin/tip/tip/cu.1
projects/arm_eabi/usr.sbin/Makefile
projects/arm_eabi/usr.sbin/acpi/acpidump/acpi.c
projects/arm_eabi/usr.sbin/acpi/acpidump/acpidump.8
projects/arm_eabi/usr.sbin/bluetooth/hcseriald/hcseriald.8
projects/arm_eabi/usr.sbin/bluetooth/hcseriald/hcseriald.c
projects/arm_eabi/usr.sbin/bsdconfig/bsdconfig
projects/arm_eabi/usr.sbin/bsdconfig/console/saver
projects/arm_eabi/usr.sbin/bsdconfig/examples/bsdconfigrc
projects/arm_eabi/usr.sbin/bsdconfig/mouse/flags
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/device.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/hostname.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/ipaddr.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/media.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/netmask.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/resolv.subr
projects/arm_eabi/usr.sbin/bsdconfig/networking/share/routing.subr
projects/arm_eabi/usr.sbin/bsdconfig/share/common.subr
projects/arm_eabi/usr.sbin/bsdconfig/share/dialog.subr
projects/arm_eabi/usr.sbin/bsdconfig/share/mustberoot.subr
projects/arm_eabi/usr.sbin/bsdconfig/startup/misc
projects/arm_eabi/usr.sbin/bsdconfig/startup/share/rcconf.subr
projects/arm_eabi/usr.sbin/bsdconfig/startup/share/rcedit.subr
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/groupdel
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/groupedit
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/groupinput
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/userdel
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/useredit
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/userinput
projects/arm_eabi/usr.sbin/bsdconfig/usermgmt/usermgmt
projects/arm_eabi/usr.sbin/bsdinstall/scripts/mirrorselect
projects/arm_eabi/usr.sbin/gssd/gssd.c
projects/arm_eabi/usr.sbin/iostat/iostat.8
projects/arm_eabi/usr.sbin/iostat/iostat.c
projects/arm_eabi/usr.sbin/mountd/mountd.c
projects/arm_eabi/usr.sbin/moused/moused.8
projects/arm_eabi/usr.sbin/mptable/mptable.c
projects/arm_eabi/usr.sbin/mtest/mtest.c
projects/arm_eabi/usr.sbin/ndp/ndp.8
projects/arm_eabi/usr.sbin/nfsd/nfsd.c
projects/arm_eabi/usr.sbin/pkg/pkg.c
projects/arm_eabi/usr.sbin/portsnap/portsnap/portsnap.sh
projects/arm_eabi/usr.sbin/ppp/README.changes
projects/arm_eabi/usr.sbin/ppp/defs.h
projects/arm_eabi/usr.sbin/ppp/ppp.8.m4
projects/arm_eabi/usr.sbin/rpcbind/rpcbind.c
projects/arm_eabi/usr.sbin/service/service.8
projects/arm_eabi/usr.sbin/service/service.sh
projects/arm_eabi/usr.sbin/syslogd/syslogd.c
projects/arm_eabi/usr.sbin/ypserv/yp_main.c
Directory Properties:
projects/arm_eabi/ (props changed)
projects/arm_eabi/cddl/contrib/opensolaris/ (props changed)
projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/arm_eabi/contrib/bind9/ (props changed)
projects/arm_eabi/contrib/binutils/ (props changed)
projects/arm_eabi/contrib/gcc/ (props changed)
projects/arm_eabi/contrib/gdb/ (props changed)
projects/arm_eabi/contrib/openbsm/ (props changed)
projects/arm_eabi/contrib/top/ (props changed)
projects/arm_eabi/gnu/lib/ (props changed)
projects/arm_eabi/gnu/usr.bin/binutils/ (props changed)
projects/arm_eabi/lib/libc/ (props changed)
projects/arm_eabi/sbin/ (props changed)
projects/arm_eabi/share/man/man4/ (props changed)
projects/arm_eabi/sys/ (props changed)
projects/arm_eabi/sys/boot/ (props changed)
projects/arm_eabi/sys/boot/i386/efi/ (props changed)
projects/arm_eabi/sys/cddl/contrib/opensolaris/ (props changed)
projects/arm_eabi/sys/conf/ (props changed)
projects/arm_eabi/sys/powerpc/wii/locore.S (props changed)
projects/arm_eabi/usr.bin/calendar/ (props changed)
Modified: projects/arm_eabi/UPDATING
==============================================================================
--- projects/arm_eabi/UPDATING Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/UPDATING Sat Dec 22 07:48:09 2012 (r244581)
@@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20121217:
+ By default, only the 10 most recent kernel dumps will be saved. To
+ restore the previous behaviour (no limit on the number of kernel dumps
+ stored in the dump directory) add the following line to /etc/rc.conf:
+
+ savecore_flags=""
+
20121201:
With the addition of auditdistd(8), a new auditdistd user is now
depended on during installworld. "mergemaster -p" can be used to add
Modified: projects/arm_eabi/bin/date/netdate.c
==============================================================================
--- projects/arm_eabi/bin/date/netdate.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/date/netdate.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -85,7 +85,7 @@ netsettime(time_t tval)
dest.sin_addr.s_addr = htonl((u_long)INADDR_ANY);
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0) {
- if (errno != EPROTONOSUPPORT)
+ if (errno != EAFNOSUPPORT)
warn("timed");
return (retval = 2);
}
Modified: projects/arm_eabi/bin/df/df.c
==============================================================================
--- projects/arm_eabi/bin/df/df.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/df/df.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -397,7 +397,7 @@ prthumanvalinode(int64_t bytes)
static intmax_t
fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
{
- return (num * (intmax_t) fsbs / bs);
+ return (num * (intmax_t) fsbs / (int64_t) bs);
}
/*
Modified: projects/arm_eabi/bin/ps/ps.c
==============================================================================
--- projects/arm_eabi/bin/ps/ps.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/ps/ps.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -109,6 +109,7 @@ static int needcomm; /* -o "command" */
static int needenv; /* -e */
static int needuser; /* -o "user" */
static int optfatal; /* Fatal error parsing some list-option. */
+static int pid_max; /* kern.max_pid */
static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
@@ -148,6 +149,7 @@ static int pscomp(const void *, const v
static void saveuser(KINFO *);
static void scanvars(void);
static void sizevars(void);
+static void pidmax_init(void);
static void usage(void);
static char dfmt[] = "pid,tt,state,time,command";
@@ -200,6 +202,8 @@ main(int argc, char *argv[])
if (argc > 1)
argv[1] = kludge_oldps_options(PS_ARGS, argv[1], argv[2]);
+ pidmax_init();
+
all = descendancy = _fmt = nselectors = optfatal = 0;
prtheader = showthreads = wflag = xkeep_implied = 0;
xkeep = -1; /* Neither -x nor -X. */
@@ -722,7 +726,6 @@ addelem_gid(struct listinfo *inf, const
return (1);
}
-#define BSD_PID_MAX 99999 /* Copy of PID_MAX from sys/proc.h. */
static int
addelem_pid(struct listinfo *inf, const char *elem)
{
@@ -740,7 +743,7 @@ addelem_pid(struct listinfo *inf, const
if (*endp != '\0' || tempid < 0 || elem == endp) {
warnx("Invalid %s: %s", inf->lname, elem);
errno = ERANGE;
- } else if (errno != 0 || tempid > BSD_PID_MAX) {
+ } else if (errno != 0 || tempid > pid_max) {
warnx("%s too large: %s", inf->lname, elem);
errno = ERANGE;
}
@@ -753,7 +756,6 @@ addelem_pid(struct listinfo *inf, const
inf->l.pids[(inf->count)++] = tempid;
return (1);
}
-#undef BSD_PID_MAX
/*-
* The user can specify a device via one of three formats:
@@ -1352,6 +1354,18 @@ kludge_oldps_options(const char *optlist
}
static void
+pidmax_init(void)
+{
+ size_t intsize;
+
+ intsize = sizeof(pid_max);
+ if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
+ warn("unable to read kern.pid_max");
+ pid_max = 99999;
+ }
+}
+
+static void
usage(void)
{
#define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
Modified: projects/arm_eabi/bin/sh/eval.c
==============================================================================
--- projects/arm_eabi/bin/sh/eval.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/sh/eval.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -1070,6 +1070,7 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
+ outclearerror(out1);
/*
* If there is no command word, redirection errors should
* not be fatal but assignment errors should.
@@ -1085,6 +1086,11 @@ evalcommand(union node *cmd, int flags,
builtin_flags = flags;
exitstatus = (*builtinfunc[cmdentry.u.index])(argc, argv);
flushall();
+ if (outiserror(out1)) {
+ warning("write error on stdout");
+ if (exitstatus == 0 || exitstatus == 1)
+ exitstatus = 2;
+ }
cmddone:
if (argc > 0)
bltinunsetlocale();
Modified: projects/arm_eabi/bin/sh/output.c
==============================================================================
--- projects/arm_eabi/bin/sh/output.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/sh/output.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -239,6 +239,20 @@ freestdout(void)
}
+int
+outiserror(struct output *file)
+{
+ return (file->flags & OUTPUT_ERR);
+}
+
+
+void
+outclearerror(struct output *file)
+{
+ file->flags &= ~OUTPUT_ERR;
+}
+
+
void
outfmt(struct output *file, const char *fmt, ...)
{
Modified: projects/arm_eabi/bin/sh/output.h
==============================================================================
--- projects/arm_eabi/bin/sh/output.h Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/bin/sh/output.h Sat Dec 22 07:48:09 2012 (r244581)
@@ -66,6 +66,8 @@ void emptyoutbuf(struct output *);
void flushall(void);
void flushout(struct output *);
void freestdout(void);
+int outiserror(struct output *);
+void outclearerror(struct output *);
void outfmt(struct output *, const char *, ...) __printflike(2, 3);
void out1fmt(const char *, ...) __printflike(1, 2);
void out2fmt_flush(const char *, ...) __printflike(1, 2);
Modified: projects/arm_eabi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/arm_eabi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -61,14 +61,16 @@
#undef verify
#include <libzfs.h>
-#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
- zio_compress_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
- zio_checksum_table[(idx)].ci_name : "UNKNOWN")
-#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
- dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
- dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
-#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
+#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \
+ zio_compress_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
+ zio_checksum_table[(idx)].ci_name : "UNKNOWN")
+#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
+ dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
+ dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
+#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : \
+ (((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ? \
+ DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
#ifndef lint
extern int zfs_recover;
@@ -3194,7 +3196,13 @@ main(int argc, char **argv)
argv[i], strerror(errno));
}
}
- (os != NULL) ? dump_dir(os) : dump_zpool(spa);
+ if (os != NULL) {
+ dump_dir(os);
+ } else if (zopt_objects > 0 && !dump_opt['m']) {
+ dump_dir(spa->spa_meta_objset);
+ } else {
+ dump_zpool(spa);
+ }
} else {
flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR;
flagbits['c'] = ZDB_FLAG_CHECKSUM;
Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -727,7 +727,7 @@ send_iterate_fs(zfs_handle_t *zhp, void
sd->parent_fromsnap_guid = 0;
VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0));
VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0));
- (void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd);
+ (void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd);
VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps));
VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops));
nvlist_free(sd->parent_snaps);
@@ -1945,11 +1945,12 @@ recv_incremental_replication(libzfs_hand
recvflags_t *flags, nvlist_t *stream_nv, avl_tree_t *stream_avl,
nvlist_t *renamed)
{
- nvlist_t *local_nv;
+ nvlist_t *local_nv, *deleted = NULL;
avl_tree_t *local_avl;
nvpair_t *fselem, *nextfselem;
char *fromsnap;
char newname[ZFS_MAXNAMELEN];
+ char guidname[32];
int error;
boolean_t needagain, progress, recursive;
char *s1, *s2;
@@ -1965,6 +1966,8 @@ recv_incremental_replication(libzfs_hand
again:
needagain = progress = B_FALSE;
+ VERIFY(0 == nvlist_alloc(&deleted, NV_UNIQUE_NAME, 0));
+
if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL,
recursive, &local_nv, &local_avl)) != 0)
return (error);
@@ -2079,6 +2082,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", thisguid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2134,6 +2139,8 @@ again:
needagain = B_TRUE;
else
progress = B_TRUE;
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ nvlist_add_boolean(deleted, guidname);
continue;
}
@@ -2156,6 +2163,24 @@ again:
s2 = strrchr(stream_fsname, '/');
/*
+ * Check if we're going to rename based on parent guid change
+ * and the current parent guid was also deleted. If it was then
+ * rename will fail and is likely unneeded, so avoid this and
+ * force an early retry to determine the new
+ * parent_fromsnap_guid.
+ */
+ if (stream_parent_fromsnap_guid != 0 &&
+ parent_fromsnap_guid != 0 &&
+ stream_parent_fromsnap_guid != parent_fromsnap_guid) {
+ sprintf(guidname, "%lu", parent_fromsnap_guid);
+ if (nvlist_exists(deleted, guidname)) {
+ progress = B_TRUE;
+ needagain = B_TRUE;
+ goto doagain;
+ }
+ }
+
+ /*
* Check for rename. If the exact receive path is specified, it
* does not count as a rename, but we still need to check the
* datasets beneath it.
@@ -2209,8 +2234,10 @@ again:
}
}
+doagain:
fsavl_destroy(local_avl);
nvlist_free(local_nv);
+ nvlist_free(deleted);
if (needagain && progress) {
/* do another pass to fix up temporary names */
Modified: projects/arm_eabi/contrib/bind9/CHANGES
==============================================================================
--- projects/arm_eabi/contrib/bind9/CHANGES Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/CHANGES Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,15 +1,81 @@
- --- 9.8.3-P4 released ---
+ --- 9.8.4-P1 released ---
+
+3407. [security] Named could die on specific queries with dns64 enabled.
+ [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
+ --- 9.8.4 released ---
3383. [security] A certain combination of records in the RBT could
cause named to hang while populating the additional
section of a response. [RT #31090]
- --- 9.8.3-P3 released ---
+3373. [bug] win32: open raw files in binary mode. [RT #30944]
3364. [security] Named could die on specially crafted record.
[RT #30416]
- --- 9.8.3-P2 released ---
+ --- 9.8.4rc1 released ---
+
+3369. [bug] nsupdate terminated unexpectedly in interactive mode
+ if built with readline support. [RT #29550]
+
+3368. [bug] <dns/iptable.h> and <dns/zone.h> were not C++ safe.
+
+3367. [bug] dns_dnsseckey_create() result was not being checked.
+ [RT #30685]
+
+3366. [bug] Fixed Read-After-Write dependency violation for IA64
+ atomic operations. [RT #25181]
+
+3365. [bug] Removed spurious newlines from log messages in
+ zone.c [RT #30675]
+
+3363. [bug] Need to allow "forward" and "fowarders" options
+ in static-stub zones; this had been overlooked.
+ [RT #30482]
+
+3362. [bug] Setting some option values to 0 in named.conf
+ could trigger an assertion failure on startup.
+ [RT #27730]
+
+3360. [bug] 'host -w' could die. [RT #18723]
+
+3359. [bug] An improperly-formed TSIG secret could cause a
+ memory leak. [RT #30607]
+
+3357. [port] Add support for libxml2-2.8.x [RT #30440]
+
+3356. [bug] Cap the TTL of signed RRsets when RRSIGs are
+ approaching their expiry, so they don't remain
+ in caches after expiry. [RT #26429]
+
+ --- 9.8.4b1 released ---
+
+3354. [func] Improve OpenSSL error logging. [RT #29932]
+
+3353. [bug] Use a single task for task exclusive operations.
+ [RT #29872]
+
+3352. [bug] Ensure that learned server attributes timeout of the
+ adb cache. [RT #29856]
+
+3351. [bug] isc_mem_put and isc_mem_putanddetach didn't report
+ caller if either ISC_MEM_DEBUGSIZE or ISC_MEM_DEBUGCTX
+ memory debugging flags are set. [RT #30243]
+
+3350. [bug] Memory read overrun in isc___mem_reallocate if
+ ISC_MEM_DEBUGCTX memory debugging flag is set.
+ [RT #30240]
+
+3348. [bug] Prevent RRSIG data from being cached if a negative
+ record matching the covering type exists at a higher
+ trust level. Such data already can't be retrieved from
+ the cache since change 3218 -- this prevents it
+ being inserted into the cache as well. [RT #26809]
+
+3347. [bug] dnssec-settime: Issue a warning when writing a new
+ private key file would cause a change in the
+ permissions of the existing file. [RT #27724]
3346. [security] Bad-cache data could be used before it was
initialized, causing an assert. [RT #30025]
@@ -18,11 +84,47 @@
resulting in excessive cpu usage in some cases.
[RT #29952]
- --- 9.8.3-P1 released ---
+3337. [bug] Change #3294 broke support for the multiple keys
+ in controls. [RT #29694]
+
+3335. [func] nslookup: return a nonzero exit code when unable
+ to get an answer. [RT #29492]
+
+3333. [bug] Setting resolver-query-timeout too low can cause
+ named to not recover if it loses connectivity.
+ [RT #29623]
+
+3332. [bug] Re-use cached DS rrsets if possible. [RT #29446]
3331. [security] dns_rdataslab_fromrdataset could produce bad
rdataslabs. [RT #29644]
-
+
+3330. [func] Fix missing signatures on NOERROR results despite
+ RPZ rewriting. Also
+ - add optional "recursive-only yes|no" to the
+ response-policy statement
+ - add optional "max-policy-ttl" to the response-policy
+ statement to limit the false data that
+ "recursive-only no" can introduce into
+ resolvers' caches
+ - add a RPZ performance test to bin/tests/system/rpz
+ when queryperf is available.
+ - the encoding of PASSTHRU action to "rpz-passthru".
+ (The old encoding is still accepted.)
+ [RT #26172]
+
+
+3329. [bug] Handle RRSIG signer-name case consistently: We
+ generate RRSIG records with the signer-name in
+ lower case. We accept them with any case, but if
+ they fail to validate, we try again in lower case.
+ [RT #27451]
+
+3328. [bug] Fixed inconsistent data checking in dst_parse.c.
+ [RT #29401]
+
+3317. [func] Add ECDSA support (RFC 6605). [RT #21918]
+
--- 9.8.3 released ---
3318. [tuning] Reduce the amount of work performed while holding a
Modified: projects/arm_eabi/contrib/bind9/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/arm_eabi/contrib/bind9/README
==============================================================================
--- projects/arm_eabi/contrib/bind9/README Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/README Sat Dec 22 07:48:09 2012 (r244581)
@@ -51,6 +51,11 @@ BIND 9
For up-to-date release notes and errata, see
http://www.isc.org/software/bind9/releasenotes
+BIND 9.8.4
+
+ BIND 9.8.4 includes several bug fixes and patches security
+ flaws described in CVE-2012-1667, CVE-2012-3817 and CVE-2012-4244.
+
BIND 9.8.3
BIND 9.8.3 is a maintenance release.
Modified: projects/arm_eabi/contrib/bind9/acconfig.h
==============================================================================
--- projects/arm_eabi/contrib/bind9/acconfig.h Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/acconfig.h Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -138,6 +138,9 @@ int sigwait(const unsigned int *set, int
/* Define if OpenSSL includes DSA support */
#undef HAVE_OPENSSL_DSA
+/* Define if OpenSSL includes ECDSA support */
+#undef HAVE_OPENSSL_ECDSA
+
/* Define to the length type used by the socket API (socklen_t, size_t, int). */
#undef ISC_SOCKADDR_LEN_T
Modified: projects/arm_eabi/contrib/bind9/bin/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1998-2001 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/arm_eabi/contrib/bind9/bin/check/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/check/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/check/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2003 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/arm_eabi/contrib/bind9/bin/check/check-tool.c
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/check/check-tool.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/check/check-tool.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -639,6 +639,9 @@ dump_zone(const char *zonename, dns_zone
{
isc_result_t result;
FILE *output = stdout;
+ const char *flags;
+
+ flags = (fileformat == dns_masterformat_text) ? "w+" : "wb+";
if (debug) {
if (filename != NULL && strcmp(filename, "-") != 0)
@@ -649,7 +652,7 @@ dump_zone(const char *zonename, dns_zone
}
if (filename != NULL && strcmp(filename, "-") != 0) {
- result = isc_stdio_open(filename, "w+", &output);
+ result = isc_stdio_open(filename, flags, &output);
if (result != ISC_R_SUCCESS) {
fprintf(stderr, "could not open output "
Modified: projects/arm_eabi/contrib/bind9/bin/confgen/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/confgen/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/confgen/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
Modified: projects/arm_eabi/contrib/bind9/bin/confgen/unix/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/confgen/unix/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/confgen/unix/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
Modified: projects/arm_eabi/contrib/bind9/bin/dig/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dig/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dig/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/arm_eabi/contrib/bind9/bin/dig/nslookup.c
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dig/nslookup.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dig/nslookup.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -57,6 +57,7 @@ static isc_boolean_t in_use = ISC_FALSE;
static char defclass[MXRD] = "IN";
static char deftype[MXRD] = "A";
static isc_event_t *global_event = NULL;
+static int query_error = 1, print_error = 0;
static char domainopt[DNS_NAME_MAXTEXT];
@@ -406,6 +407,9 @@ isc_result_t
printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
char servtext[ISC_SOCKADDR_FORMATSIZE];
+ /* I've we've gotten this far, we've reached a server. */
+ query_error = 0;
+
debug("printmessage()");
isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
@@ -433,6 +437,9 @@ printmessage(dig_query_t *query, dns_mes
(msg->rcode != dns_rcode_nxdomain) ? nametext :
query->lookup->textname, rcode_totext(msg->rcode));
debug("returning with rcode == 0");
+
+ /* the lookup failed */
+ print_error |= 1;
return (ISC_R_SUCCESS);
}
@@ -887,5 +894,5 @@ main(int argc, char **argv) {
destroy_libs();
isc_app_finish();
- return (0);
+ return (query_error | print_error);
}
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/Makefile.in
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/Makefile.in Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/Makefile.in Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2005, 2007-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium.
#
# Permission to use, copy, modify, and/or distribute this software for any
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8 Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8 Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -55,7 +55,7 @@ Use SHA\-256 as the digest algorithm.
.RS 4
Select the digest algorithm. The value of
\fBalgorithm\fR
-must be one of SHA\-1 (SHA1), SHA\-256 (SHA256) or GOST. These values are case insensitive.
+must be one of SHA\-1 (SHA1), SHA\-256 (SHA256), GOST or SHA\-384 (SHA384). These values are case insensitive.
.RE
.PP
\-K \fIdirectory\fR
@@ -139,5 +139,5 @@ RFC 4509.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2008\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2008\-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.br
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -296,7 +296,7 @@ usage(void) {
fprintf(stderr, " -K <directory>: directory in which to find "
"key file or keyset file\n");
fprintf(stderr, " -a algorithm: digest algorithm "
- "(SHA-1, SHA-256 or GOST)\n");
+ "(SHA-1, SHA-256, GOST or SHA-384)\n");
fprintf(stderr, " -1: use SHA-1\n");
fprintf(stderr, " -2: use SHA-256\n");
fprintf(stderr, " -l: add lookaside zone and print DLV records\n");
@@ -415,6 +415,9 @@ main(int argc, char **argv) {
else if (strcasecmp(algname, "GOST") == 0)
dtype = DNS_DSDIGEST_GOST;
#endif
+ else if (strcasecmp(algname, "SHA384") == 0 ||
+ strcasecmp(algname, "SHA-384") == 0)
+ dtype = DNS_DSDIGEST_SHA384;
else
fatal("unknown algorithm %s", algname);
}
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook Sat Dec 22 07:48:09 2012 (r244581)
@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "—">]>
<!--
- - Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -39,6 +39,7 @@
<year>2008</year>
<year>2009</year>
<year>2010</year>
+ <year>2012</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
@@ -107,7 +108,8 @@
<para>
Select the digest algorithm. The value of
<option>algorithm</option> must be one of SHA-1 (SHA1),
- SHA-256 (SHA256) or GOST. These values are case insensitive.
+ SHA-256 (SHA256), GOST or SHA-384 (SHA384).
+ These values are case insensitive.
</para>
</listitem>
</varlistentry>
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
<!--
- - Copyright (C) 2008-2010 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -32,14 +32,14 @@
<div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code> {-s} [<code class="option">-1</code>] [<code class="option">-2</code>] [<code class="option">-a <em class="replaceable"><code>alg</code></em></code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-s</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-f <em class="replaceable"><code>file</code></em></code>] [<code class="option">-A</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] {dnsname}</p></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543465"></a><h2>DESCRIPTION</h2>
+<a name="id2543468"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-dsfromkey</strong></span>
outputs the Delegation Signer (DS) resource record (RR), as defined in
RFC 3658 and RFC 4509, for the given key(s).
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543477"></a><h2>OPTIONS</h2>
+<a name="id2543480"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-1</span></dt>
<dd><p>
@@ -54,7 +54,8 @@
<dd><p>
Select the digest algorithm. The value of
<code class="option">algorithm</code> must be one of SHA-1 (SHA1),
- SHA-256 (SHA256) or GOST. These values are case insensitive.
+ SHA-256 (SHA256), GOST or SHA-384 (SHA384).
+ These values are case insensitive.
</p></dd>
<dt><span class="term">-K <em class="replaceable"><code>directory</code></em></span></dt>
<dd><p>
@@ -100,7 +101,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543664"></a><h2>EXAMPLE</h2>
+<a name="id2543667"></a><h2>EXAMPLE</h2>
<p>
To build the SHA-256 DS RR from the
<strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
@@ -115,7 +116,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543693"></a><h2>FILES</h2>
+<a name="id2543697"></a><h2>FILES</h2>
<p>
The keyfile can be designed by the key identification
<code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
@@ -129,13 +130,13 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543729"></a><h2>CAVEAT</h2>
+<a name="id2543732"></a><h2>CAVEAT</h2>
<p>
A keyfile error can give a "file not found" even if the file exists.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543738"></a><h2>SEE ALSO</h2>
+<a name="id2543741"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -145,7 +146,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543778"></a><h2>AUTHOR</h2>
+<a name="id2543781"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -47,7 +47,7 @@ of the key is specified on the command l
.RS 4
Selects the cryptographic algorithm. The value of
\fBalgorithm\fR
-must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST. These values are case insensitive.
+must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 or ECDSAP384SHA384. These values are case insensitive.
.sp
If no algorithm is specified, then RSASHA1 will be used by default, unless the
\fB\-3\fR
@@ -215,5 +215,5 @@ RFC 4034.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2008\-2011 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2008\-2012 Internet Systems Consortium, Inc. ("ISC")
.br
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2007-2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -55,7 +55,8 @@ int verbose;
static const char *algs = "RSA | RSAMD5 | DH | DSA | RSASHA1 |"
" NSEC3DSA | NSEC3RSASHA1 |"
- " RSASHA256 | RSASHA512 | ECCGOST";
+ " RSASHA256 | RSASHA512 | ECCGOST |"
+ " ECDSAP256SHA256 | ECDSAP384SHA384";
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
@@ -369,7 +370,8 @@ main(int argc, char **argv) {
if (use_nsec3 &&
alg != DST_ALG_NSEC3DSA && alg != DST_ALG_NSEC3RSASHA1 &&
alg != DST_ALG_RSASHA256 && alg != DST_ALG_RSASHA512 &&
- alg != DST_ALG_ECCGOST) {
+ alg != DST_ALG_ECCGOST &&
+ alg != DST_ALG_ECDSA256 && alg != DST_ALG_ECDSA384) {
fatal("%s is incompatible with NSEC3; "
"do not use the -3 option", algname);
}
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook Sat Dec 22 07:48:09 2012 (r244581)
@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "—">]>
<!--
- - Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +40,7 @@
<year>2009</year>
<year>2010</year>
<year>2011</year>
+ <year>2012</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
@@ -94,7 +95,8 @@
<para>
Selects the cryptographic algorithm. The value of
<option>algorithm</option> must be one of RSAMD5, RSASHA1,
- DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST.
+ DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST,
+ ECDSAP256SHA256 or ECDSAP384SHA384.
These values are case insensitive.
</para>
<para>
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
<!--
- - Copyright (C) 2008-2011 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008-2012 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -31,7 +31,7 @@
<div class="cmdsynopsis"><p><code class="command">dnssec-keyfromlabel</code> {-l <em class="replaceable"><code>label</code></em>} [<code class="option">-3</code>] [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-A <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-G</code>] [<code class="option">-I <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-k</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-n <em class="replaceable"><code>nametype</code></em></code>] [<code cl
ass="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-R <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-y</code>] {name}</p></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543495"></a><h2>DESCRIPTION</h2>
+<a name="id2543498"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-keyfromlabel</strong></span>
gets keys with the given label from a crypto hardware and builds
key files for DNSSEC (Secure DNS), as defined in RFC 2535
@@ -44,14 +44,15 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543513"></a><h2>OPTIONS</h2>
+<a name="id2543516"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
<dd>
<p>
Selects the cryptographic algorithm. The value of
<code class="option">algorithm</code> must be one of RSAMD5, RSASHA1,
- DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST.
+ DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST,
+ ECDSAP256SHA256 or ECDSAP384SHA384.
These values are case insensitive.
</p>
<p>
@@ -163,7 +164,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543877"></a><h2>TIMING OPTIONS</h2>
+<a name="id2543880"></a><h2>TIMING OPTIONS</h2>
<p>
Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
If the argument begins with a '+' or '-', it is interpreted as
@@ -210,7 +211,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2544043"></a><h2>GENERATED KEY FILES</h2>
+<a name="id2544046"></a><h2>GENERATED KEY FILES</h2>
<p>
When <span><strong class="command">dnssec-keyfromlabel</strong></span> completes
successfully,
@@ -249,7 +250,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2544116"></a><h2>SEE ALSO</h2>
+<a name="id2544119"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -257,7 +258,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2544149"></a><h2>AUTHOR</h2>
+<a name="id2544152"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.8
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.8 Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.8 Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004, 2005, 2007-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004, 2005, 2007-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (C) 2000-2003 Internet Software Consortium.
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
@@ -48,7 +48,7 @@ of the key is specified on the command l
.RS 4
Selects the cryptographic algorithm. For DNSSEC keys, the value of
\fBalgorithm\fR
-must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512 or ECCGOST. For TSIG/TKEY, the value must be DH (Diffie Hellman), HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512. These values are case insensitive.
+must be one of RSAMD5, RSASHA1, DSA, NSEC3RSASHA1, NSEC3DSA, RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 or ECDSAP384SHA384. For TSIG/TKEY, the value must be DH (Diffie Hellman), HMAC\-MD5, HMAC\-SHA1, HMAC\-SHA224, HMAC\-SHA256, HMAC\-SHA384, or HMAC\-SHA512. These values are case insensitive.
.sp
If no algorithm is specified, then RSASHA1 will be used by default, unless the
\fB\-3\fR
@@ -63,7 +63,7 @@ Note 2: DH, HMAC\-MD5, and HMAC\-SHA1 th
.PP
\-b \fIkeysize\fR
.RS 4
-Specifies the number of bits in the key. The choice of key size depends on the algorithm used. RSA keys must be between 512 and 2048 bits. Diffie Hellman keys must be between 128 and 4096 bits. DSA keys must be between 512 and 1024 bits and an exact multiple of 64. HMAC keys must be between 1 and 512 bits.
+Specifies the number of bits in the key. The choice of key size depends on the algorithm used. RSA keys must be between 512 and 2048 bits. Diffie Hellman keys must be between 128 and 4096 bits. DSA keys must be between 512 and 1024 bits and an exact multiple of 64. HMAC keys must be between 1 and 512 bits. Elliptic curve algorithms don't need this parameter.
.sp
The key size does not need to be specified if using a default algorithm. The default key size is 1024 bits for zone signing keys (ZSK's) and 2048 bits for key signing keys (KSK's, generated with
\fB\-f KSK\fR). However, if an algorithm is explicitly specified with the
@@ -81,7 +81,7 @@ must either be ZONE (for a DNSSEC zone k
.PP
\-3
.RS 4
-Use an NSEC3\-capable algorithm to generate a DNSSEC key. If this option is used and no algorithm is explicitly set on the command line, NSEC3RSASHA1 will be used by default. Note that RSASHA256, RSASHA512 and ECCGOST algorithms are NSEC3\-capable.
+Use an NSEC3\-capable algorithm to generate a DNSSEC key. If this option is used and no algorithm is explicitly set on the command line, NSEC3RSASHA1 will be used by default. Note that RSASHA256, RSASHA512, ECCGOST, ECDSAP256SHA256 and ECDSAP384SHA384 algorithms are NSEC3\-capable.
.RE
.PP
\-C
@@ -298,7 +298,7 @@ RFC 4034.
.PP
Internet Systems Consortium
.SH "COPYRIGHT"
-Copyright \(co 2004, 2005, 2007\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004, 2005, 2007\-2010, 2012 Internet Systems Consortium, Inc. ("ISC")
.br
Copyright \(co 2000\-2003 Internet Software Consortium.
.br
Modified: projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.c
==============================================================================
--- projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.c Sat Dec 22 07:47:07 2012 (r244580)
+++ projects/arm_eabi/contrib/bind9/bin/dnssec/dnssec-keygen.c Sat Dec 22 07:48:09 2012 (r244581)
@@ -1,5 +1,5 @@
/*
- * Portions Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -85,6 +85,7 @@ usage(void) {
fprintf(stderr, " RSA | RSAMD5 | DSA | RSASHA1 | NSEC3RSASHA1"
" | NSEC3DSA |\n");
fprintf(stderr, " RSASHA256 | RSASHA512 | ECCGOST |\n");
+ fprintf(stderr, " ECDSAP256SHA256 | ECDSAP384SHA384 |\n");
fprintf(stderr, " DH | HMAC-MD5 | HMAC-SHA1 | HMAC-SHA224 | "
"HMAC-SHA256 | \n");
fprintf(stderr, " HMAC-SHA384 | HMAC-SHA512\n");
@@ -102,6 +103,8 @@ usage(void) {
fprintf(stderr, " NSEC3DSA:\t[512..1024] and divisible "
"by 64\n");
fprintf(stderr, " ECCGOST:\tignored\n");
+ fprintf(stderr, " ECDSAP256SHA256:\tignored\n");
+ fprintf(stderr, " ECDSAP384SHA384:\tignored\n");
fprintf(stderr, " HMAC-MD5:\t[1..512]\n");
fprintf(stderr, " HMAC-SHA1:\t[1..160]\n");
fprintf(stderr, " HMAC-SHA224:\t[1..224]\n");
@@ -549,7 +552,8 @@ main(int argc, char **argv) {
if (use_nsec3 &&
alg != DST_ALG_NSEC3DSA && alg != DST_ALG_NSEC3RSASHA1 &&
alg != DST_ALG_RSASHA256 && alg!= DST_ALG_RSASHA512 &&
- alg != DST_ALG_ECCGOST) {
+ alg != DST_ALG_ECCGOST &&
+ alg != DST_ALG_ECDSA256 && alg != DST_ALG_ECDSA384) {
fatal("%s is incompatible with NSEC3; "
"do not use the -3 option", algname);
}
@@ -579,9 +583,11 @@ main(int argc, char **argv) {
size = 1024;
if (verbose > 0)
fprintf(stderr, "key size not "
- "specified; defaulting "
- "to %d\n", size);
- } else if (alg != DST_ALG_ECCGOST)
+ "specified; defaulting"
+ " to %d\n", size);
+ } else if (alg != DST_ALG_ECCGOST &&
+ alg != DST_ALG_ECDSA256 &&
+ alg != DST_ALG_ECDSA384)
fatal("key size not specified (-b option)");
}
@@ -710,6 +716,8 @@ main(int argc, char **argv) {
fatal("invalid DSS key size: %d", size);
break;
case DST_ALG_ECCGOST:
+ case DST_ALG_ECDSA256:
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 13:02:04 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8582EDF2;
Sat, 22 Dec 2012 13:02:04 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 6A3C18FC0A;
Sat, 22 Dec 2012 13:02:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMD24ID080685;
Sat, 22 Dec 2012 13:02:04 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMD24Vg080683;
Sat, 22 Dec 2012 13:02:04 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212221302.qBMD24Vg080683@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 22 Dec 2012 13:02:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244583 - projects/calloutng/sys/dev/atkbdc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 13:02:04 -0000
Author: mav
Date: Sat Dec 22 13:02:03 2012
New Revision: 244583
URL: http://svnweb.freebsd.org/changeset/base/244583
Log:
Revert atkbd driver changes. They are reported to cause mouse lags and
other problems on some systems. I guess the problem may be in insufficient
locking of the driver.
Modified:
projects/calloutng/sys/dev/atkbdc/atkbd.c
projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c
Modified: projects/calloutng/sys/dev/atkbdc/atkbd.c
==============================================================================
--- projects/calloutng/sys/dev/atkbdc/atkbd.c Sat Dec 22 09:37:34 2012 (r244582)
+++ projects/calloutng/sys/dev/atkbdc/atkbd.c Sat Dec 22 13:02:03 2012 (r244583)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
#include <dev/atkbdc/atkbdreg.h>
#include <dev/atkbdc/atkbdcreg.h>
+static timeout_t atkbd_timeout;
static void atkbd_shutdown_final(void *v);
int
@@ -113,6 +114,12 @@ atkbd_attach_unit(int unit, keyboard_t *
return error;
#endif
+ /*
+ * This is a kludge to compensate for lost keyboard interrupts.
+ * A similar code used to be in syscons. See below. XXX
+ */
+ atkbd_timeout(*kbd);
+
if (bootverbose)
(*sw->diag)(*kbd, bootverbose);
@@ -122,6 +129,53 @@ atkbd_attach_unit(int unit, keyboard_t *
return 0;
}
+static void
+atkbd_timeout(void *arg)
+{
+ keyboard_t *kbd;
+ int s;
+
+ /*
+ * The original text of the following comments are extracted
+ * from syscons.c (1.287)
+ *
+ * With release 2.1 of the Xaccel server, the keyboard is left
+ * hanging pretty often. Apparently an interrupt from the
+ * keyboard is lost, and I don't know why (yet).
+ * This ugly hack calls the low-level interrupt routine if input
+ * is ready for the keyboard and conveniently hides the problem. XXX
+ *
+ * Try removing anything stuck in the keyboard controller; whether
+ * it's a keyboard scan code or mouse data. The low-level
+ * interrupt routine doesn't read the mouse data directly,
+ * but the keyboard controller driver will, as a side effect.
+ */
+ /*
+ * And here is bde's original comment about this:
+ *
+ * This is necessary to handle edge triggered interrupts - if we
+ * returned when our IRQ is high due to unserviced input, then there
+ * would be no more keyboard IRQs until the keyboard is reset by
+ * external powers.
+ *
+ * The keyboard apparently unwedges the irq in most cases.
+ */
+ s = spltty();
+ kbd = (keyboard_t *)arg;
+ if (kbdd_lock(kbd, TRUE)) {
+ /*
+ * We have seen the lock flag is not set. Let's reset
+ * the flag early, otherwise the LED update routine fails
+ * which may want the lock during the interrupt routine.
+ */
+ kbdd_lock(kbd, FALSE);
+ if (kbdd_check_char(kbd))
+ kbdd_intr(kbd, NULL);
+ }
+ splx(s);
+ timeout(atkbd_timeout, arg, hz/10);
+}
+
/* LOW-LEVEL */
#define ATKBD_DEFAULT 0
Modified: projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c
==============================================================================
--- projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c Sat Dec 22 09:37:34 2012 (r244582)
+++ projects/calloutng/sys/dev/atkbdc/atkbd_atkbdc.c Sat Dec 22 13:02:03 2012 (r244583)
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
typedef struct {
struct resource *intr;
void *ih;
- keyboard_t *kbd;
- struct callout callout;
} atkbd_softc_t;
static devclass_t atkbd_devclass;
@@ -58,7 +56,6 @@ static int atkbdprobe(device_t dev);
static int atkbdattach(device_t dev);
static int atkbdresume(device_t dev);
static void atkbdintr(void *arg);
-static timeout_t atkbdtimeout;
static device_method_t atkbd_methods[] = {
DEVMETHOD(device_identify, atkbdidentify),
@@ -116,18 +113,18 @@ static int
atkbdattach(device_t dev)
{
atkbd_softc_t *sc;
+ keyboard_t *kbd;
u_long irq;
int flags;
int rid;
int error;
sc = device_get_softc(dev);
- callout_init(&sc->callout, TRUE);
rid = KBDC_RID_KBD;
irq = bus_get_resource_start(dev, SYS_RES_IRQ, rid);
flags = device_get_flags(dev);
- error = atkbd_attach_unit(device_get_unit(dev), &sc->kbd,
+ error = atkbd_attach_unit(device_get_unit(dev), &kbd,
device_get_unit(device_get_parent(dev)),
irq, flags);
if (error)
@@ -138,17 +135,11 @@ atkbdattach(device_t dev)
if (sc->intr == NULL)
return ENXIO;
error = bus_setup_intr(dev, sc->intr, INTR_TYPE_TTY, NULL, atkbdintr,
- sc->kbd, &sc->ih);
- if (error) {
+ kbd, &sc->ih);
+ if (error)
bus_release_resource(dev, SYS_RES_IRQ, rid, sc->intr);
- return (error);
- }
- /*
- * This is a kludge to compensate for lost keyboard interrupts.
- */
- atkbdtimeout(dev);
- return (0);
+ return error;
}
static int
@@ -159,14 +150,16 @@ atkbdresume(device_t dev)
int args[2];
sc = device_get_softc(dev);
- kbd = sc->kbd;
- kbd->kb_flags &= ~KB_INITIALIZED;
- args[0] = device_get_unit(device_get_parent(dev));
- args[1] = rman_get_start(sc->intr);
- kbdd_init(kbd, device_get_unit(dev), &kbd, args,
- device_get_flags(dev));
- kbdd_clear_state(kbd);
-
+ kbd = kbd_get_keyboard(kbd_find_keyboard(ATKBD_DRIVER_NAME,
+ device_get_unit(dev)));
+ if (kbd) {
+ kbd->kb_flags &= ~KB_INITIALIZED;
+ args[0] = device_get_unit(device_get_parent(dev));
+ args[1] = rman_get_start(sc->intr);
+ kbdd_init(kbd, device_get_unit(dev), &kbd, args,
+ device_get_flags(dev));
+ kbdd_clear_state(kbd);
+ }
return 0;
}
@@ -179,27 +172,4 @@ atkbdintr(void *arg)
kbdd_intr(kbd, NULL);
}
-static void
-atkbdtimeout(void *arg)
-{
- device_t dev = (device_t)arg;
- atkbd_softc_t *sc;
- keyboard_t *kbd;
-
- sc = device_get_softc(dev);
- kbd = sc->kbd;
- if (kbdd_lock(kbd, TRUE)) {
- /*
- * We have seen the lock flag is not set. Let's reset
- * the flag early, otherwise the LED update routine fails
- * which may want the lock during the interrupt routine.
- */
- kbdd_lock(kbd, FALSE);
- if (kbdd_check_char(kbd))
- kbdd_intr(kbd, NULL);
- }
- callout_reset_bt(&sc->callout, ticks2bintime(hz), zero_bt,
- atkbdtimeout, dev, C_PREL(0) | C_HARDCLOCK);
-}
-
DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0);
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 13:44:36 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8F03B9AF;
Sat, 22 Dec 2012 13:44:36 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7420D8FC0A;
Sat, 22 Dec 2012 13:44:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMDia4u087057;
Sat, 22 Dec 2012 13:44:36 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMDia09087056;
Sat, 22 Dec 2012 13:44:36 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212221344.qBMDia09087056@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 22 Dec 2012 13:44:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244586 - projects/calloutng/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 13:44:36 -0000
Author: mav
Date: Sat Dec 22 13:44:35 2012
New Revision: 244586
URL: http://svnweb.freebsd.org/changeset/base/244586
Log:
If sync to the hardclock requested, limit minimal period to one tick.
Modified:
projects/calloutng/sys/kern/kern_timeout.c
Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c Sat Dec 22 13:43:12 2012 (r244585)
+++ projects/calloutng/sys/kern/kern_timeout.c Sat Dec 22 13:44:35 2012 (r244586)
@@ -907,6 +907,8 @@ callout_reset_bt_on(struct callout *c, s
if (flags & C_ABSOLUTE) {
to_bt = bt;
} else {
+ if ((flags & C_HARDCLOCK) && bintime_cmp(&bt, &tick_bt, <))
+ bt = tick_bt;
if ((flags & C_HARDCLOCK) ||
#ifdef NO_EVENTTIMERS
bintime_cmp(&bt, &bt_timethreshold, >=)) {
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 16:42:33 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 10EA710E;
Sat, 22 Dec 2012 16:42:33 +0000 (UTC)
(envelope-from kevlo@FreeBSD.org)
Received: from ns.kevlo.org (kevlo.org [220.128.136.52])
by mx1.freebsd.org (Postfix) with ESMTP id 95E9E8FC18;
Sat, 22 Dec 2012 16:42:31 +0000 (UTC)
Received: from srg.kevlo.org (git.kevlo.org [220.128.136.52])
by ns.kevlo.org (8.14.5/8.14.5) with ESMTP id qBMGgJwR097903;
Sun, 23 Dec 2012 00:42:20 +0800 (CST)
(envelope-from kevlo@FreeBSD.org)
Message-ID: <50D5E2F7.9030203@FreeBSD.org>
Date: Sun, 23 Dec 2012 00:42:31 +0800
From: Kevin Lo <kevlo@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Aleksandr Rybalko <ray@FreeBSD.org>
Subject: Re: svn commit: r244517 - projects/efika_mx/sys/arm/freescale/imx
References: <201212202237.qBKMbGNZ035843@svn.freebsd.org>
In-Reply-To: <201212202237.qBKMbGNZ035843@svn.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 16:42:33 -0000
On 2012/12/21 06:37, Aleksandr Rybalko wrote:
> Author: ray
> Date: Thu Dec 20 22:37:15 2012
> New Revision: 244517
> URL: http://svnweb.freebsd.org/changeset/base/244517
>
> Log:
> Add GPIO driver.
>
> Sponsored by: FreeBSD Foundation
>
> Modified:
> projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c
>
> Modified: projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c
> ==============================================================================
> --- projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c Thu Dec 20 22:31:52 2012 (r244516)
> +++ projects/efika_mx/sys/arm/freescale/imx/imx51_gpio.c Thu Dec 20 22:37:15 2012 (r244517)
> @@ -94,7 +94,7 @@ struct imx51_gpio_softc {
> device_t dev;
> struct mtx sc_mtx;
> struct resource *sc_res[11]; /* 1 x mem, 2 x IRQ, 8 x IRQ */
> - void *gpio_ih[11]; /* 1 pointer is not a big waste */
> + void *gpio_ih[11]; /* 1 ptr is not a big waste */
> int sc_l_irq; /* Last irq resource */
> bus_space_tag_t sc_iot;
> bus_space_handle_t sc_ioh;
>
Did I miss something? This commit only updates the comment...
Kevin
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 19:09:16 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 59CEB174;
Sat, 22 Dec 2012 19:09:16 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 250548FC0C;
Sat, 22 Dec 2012 19:09:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMJ9Gpb035021;
Sat, 22 Dec 2012 19:09:16 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMJ9Gmd035020;
Sat, 22 Dec 2012 19:09:16 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212221909.qBMJ9Gmd035020@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 22 Dec 2012 19:09:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244595 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 19:09:16 -0000
Author: linimon (doc,ports committer)
Date: Sat Dec 22 19:09:15 2012
New Revision: 244595
URL: http://svnweb.freebsd.org/changeset/base/244595
Log:
Add code to test disabling the proxy entirely. Requires zfs delegation
to be set up correctly for it to work.
Modified:
projects/portbuild/scripts/build
Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build Sat Dec 22 15:13:16 2012 (r244594)
+++ projects/portbuild/scripts/build Sat Dec 22 19:09:15 2012 (r244595)
@@ -11,6 +11,8 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
# duplication.
quoted_subdirs="'/src' '/ports' ''"
+#DISABLE_PROXY = True
+
# XXX unused
get_latest_snap() {
snap=$1
@@ -522,6 +524,10 @@ proxy_root() {
shift 5
args=$@
+if DISABLE_PROXY:
+ eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
+ error=$?
+else:
id=$(id -u)
if [ ${id} != "0" ]; then
${pbc}/scripts/buildproxy-client "build ${cmd} ${arch} ${branch} ${buildid} ${args}"
@@ -533,6 +539,7 @@ proxy_root() {
eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
error=$?
fi
+fi
exit ${error}
}
@@ -547,6 +554,10 @@ proxy_user() {
shift 5
args=$@
+if DISABLE_PROXY:
+ eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
+ error=$?
+else:
id=$(id -u)
if [ ${id} != "0" ]; then
eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
@@ -555,6 +566,7 @@ proxy_user() {
su ${uid} -c "${pbc}/scripts/build ${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
error=$?
fi
+fi
exit ${error}
}
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 19:16:01 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0DDDA2B0;
Sat, 22 Dec 2012 19:16:01 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E52C98FC0C;
Sat, 22 Dec 2012 19:16:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMJG0uH036202;
Sat, 22 Dec 2012 19:16:00 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMJG0KR036200;
Sat, 22 Dec 2012 19:16:00 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212221916.qBMJG0KR036200@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 22 Dec 2012 19:16:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244596 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 19:16:01 -0000
Author: linimon (doc,ports committer)
Date: Sat Dec 22 19:16:00 2012
New Revision: 244596
URL: http://svnweb.freebsd.org/changeset/base/244596
Log:
Hey, one languange or another, they're all the same, right?
Modified:
projects/portbuild/scripts/build
Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build Sat Dec 22 19:09:15 2012 (r244595)
+++ projects/portbuild/scripts/build Sat Dec 22 19:16:00 2012 (r244596)
@@ -11,7 +11,7 @@ pbd=${PORTBUILD_DATA:-/var/portbuild}
# duplication.
quoted_subdirs="'/src' '/ports' ''"
-#DISABLE_PROXY = True
+#DISABLE_PROXY=1
# XXX unused
get_latest_snap() {
@@ -524,10 +524,10 @@ proxy_root() {
shift 5
args=$@
-if DISABLE_PROXY:
+if [ ! -z "${DISABLE_PROXY}" ]; then
eval "do_${cmd} ${arch} ${branch} ${buildid} ${builddir} ${args}"
error=$?
-else:
+else
id=$(id -u)
if [ ${id} != "0" ]; then
${pbc}/scripts/buildproxy-client "build ${cmd} ${arch} ${branch} ${buildid} ${args}"
@@ -554,10 +554,10 @@ proxy_user() {
shift 5
args=$@
-if DISABLE_PROXY:
+if [ ! -z "${DISABLE_PROXY}" ]; then
eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
error=$?
-else:
+else
id=$(id -u)
if [ ${id} != "0" ]; then
eval "do_${cmd} ${arch} ${branch} ${buildid} \"${builddir}\" ${args}"
From owner-svn-src-projects@FreeBSD.ORG Sat Dec 22 20:05:42 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id DC61A990;
Sat, 22 Dec 2012 20:05:42 +0000 (UTC)
(envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id C1DB98FC15;
Sat, 22 Dec 2012 20:05:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMK5g4w043224;
Sat, 22 Dec 2012 20:05:42 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMK5gom043223;
Sat, 22 Dec 2012 20:05:42 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212222005.qBMK5gom043223@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sat, 22 Dec 2012 20:05:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244597 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Dec 2012 20:05:42 -0000
Author: linimon (doc,ports committer)
Date: Sat Dec 22 20:05:42 2012
New Revision: 244597
URL: http://svnweb.freebsd.org/changeset/base/244597
Log:
Revert the first change in 244314 for further testing.
This needs to go away exactly when buildproxy goes away and not before.
Modified:
projects/portbuild/scripts/buildproxy
Modified: projects/portbuild/scripts/buildproxy
==============================================================================
--- projects/portbuild/scripts/buildproxy Sat Dec 22 19:16:00 2012 (r244596)
+++ projects/portbuild/scripts/buildproxy Sat Dec 22 20:05:42 2012 (r244597)
@@ -25,6 +25,11 @@ def validate(uid, arch):
if uid == 0:
return True
+ # old theory
+ if getuidbyname("ports-%s" % arch) == uid:
+ return True
+
+ # new theory
if getuidbyname(portbuild_uid) == uid:
return True