From owner-svn-src-user@FreeBSD.ORG Mon Mar 12 15:13:18 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27CC2106566C; Mon, 12 Mar 2012 15:13:18 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1779F8FC0A; Mon, 12 Mar 2012 15:13:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CFDH8E069530; Mon, 12 Mar 2012 15:13:17 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CFDHSD069528; Mon, 12 Mar 2012 15:13:17 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201203121513.q2CFDHSD069528@svn.freebsd.org> From: Andre Oppermann Date: Mon, 12 Mar 2012 15:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232867 - user/andre/tcp_workqueue/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2012 15:13:18 -0000 Author: andre Date: Mon Mar 12 15:13:17 2012 New Revision: 232867 URL: http://svn.freebsd.org/changeset/base/232867 Log: Move *mp0 initialization for the direct mbuf dequeue case before the for() loop to correctly move the mbuf's. Reported by: trociny Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c ============================================================================== --- user/andre/tcp_workqueue/sys/kern/uipc_socket.c Mon Mar 12 15:05:17 2012 (r232866) +++ user/andre/tcp_workqueue/sys/kern/uipc_socket.c Mon Mar 12 15:13:17 2012 (r232867) @@ -2045,6 +2045,10 @@ deliver: if (mp0 != NULL) { /* Dequeue as many mbufs as possible. */ if (!(flags & MSG_PEEK) && len >= sb->sb_mb->m_len) { + if (*mp0 == NULL) + *mp0 = sb->sb_mb; + else + m_cat(*mp0, sb->sb_mb); for (m = sb->sb_mb; m != NULL && m->m_len <= len; m = m->m_next) { @@ -2058,10 +2062,6 @@ deliver: sb->sb_lastrecord = sb->sb_mb; if (sb->sb_mb == NULL) SB_EMPTY_FIXUP(sb); - if (*mp0 != NULL) - m_cat(*mp0, m); - else - *mp0 = m; } /* Copy the remainder. */ if (len > 0) { From owner-svn-src-user@FreeBSD.ORG Mon Mar 12 20:31:09 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C443B1065674; Mon, 12 Mar 2012 20:31:09 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B3A5A8FC0C; Mon, 12 Mar 2012 20:31:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CKV9mA084886; Mon, 12 Mar 2012 20:31:09 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CKV9gp084883; Mon, 12 Mar 2012 20:31:09 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201203122031.q2CKV9gp084883@svn.freebsd.org> From: Andre Oppermann Date: Mon, 12 Mar 2012 20:31:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232885 - user/andre/tcp_workqueue/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2012 20:31:10 -0000 Author: andre Date: Mon Mar 12 20:31:09 2012 New Revision: 232885 URL: http://svn.freebsd.org/changeset/base/232885 Log: Change the syncache count reporting the current number of entries from an unprotected u_int that reports garbage on SMP to a function based sysctl obtaining the current value from UMA. Also read back the actual cache_limit after page size rounding by UMA. PR: kern/165879 Modified: user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c user/andre/tcp_workqueue/sys/netinet/tcp_syncache.h Modified: user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c ============================================================================== --- user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c Mon Mar 12 20:24:59 2012 (r232884) +++ user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c Mon Mar 12 20:31:09 2012 (r232885) @@ -123,6 +123,7 @@ struct syncache *syncache_lookup(struct static int syncache_respond(struct syncache *); static struct socket *syncache_socket(struct syncache *, struct socket *, struct mbuf *m); +static int syncache_sysctl_count(SYSCTL_HANDLER_ARGS); static void syncache_timeout(struct syncache *sc, struct syncache_head *sch, int docallout); static void syncache_timer(void *); @@ -158,8 +159,8 @@ SYSCTL_VNET_UINT(_net_inet_tcp_syncache, &VNET_NAME(tcp_syncache.cache_limit), 0, "Overall entry limit for syncache"); -SYSCTL_VNET_UINT(_net_inet_tcp_syncache, OID_AUTO, count, CTLFLAG_RD, - &VNET_NAME(tcp_syncache.cache_count), 0, +SYSCTL_VNET_PROC(_net_inet_tcp_syncache, OID_AUTO, count, (CTLTYPE_UINT|CTLFLAG_RD), + NULL, 0, &syncache_sysctl_count, "IU", "Current number of entries in syncache"); SYSCTL_VNET_UINT(_net_inet_tcp_syncache, OID_AUTO, hashsize, CTLFLAG_RDTUN, @@ -225,7 +226,6 @@ syncache_init(void) { int i; - V_tcp_syncache.cache_count = 0; V_tcp_syncache.hashsize = TCP_SYNCACHE_HASHSIZE; V_tcp_syncache.bucket_limit = TCP_SYNCACHE_BUCKETLIMIT; V_tcp_syncache.rexmt_limit = SYNCACHE_MAXREXMTS; @@ -269,6 +269,7 @@ syncache_init(void) V_tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); + V_tcp_syncache.cache_limit = uma_zone_get_max(V_tcp_syncache.zone); } #ifdef VIMAGE @@ -296,8 +297,8 @@ syncache_destroy(void) mtx_destroy(&sch->sch_mtx); } - KASSERT(V_tcp_syncache.cache_count == 0, ("%s: cache_count %d not 0", - __func__, V_tcp_syncache.cache_count)); + KASSERT(uma_zone_get_cur(V_tcp_syncache.zone) == 0, + ("%s: cache_count not 0", __func__)); /* Free the allocated global resources. */ uma_zdestroy(V_tcp_syncache.zone); @@ -305,6 +306,15 @@ syncache_destroy(void) } #endif +static int +syncache_sysctl_count(SYSCTL_HANDLER_ARGS) +{ + int count; + + count = uma_zone_get_cur(V_tcp_syncache.zone); + return (sysctl_handle_int(oidp, &count, sizeof(count), req)); +} + /* * Inserts a syncache entry into the specified bucket row. * Locks and unlocks the syncache_head autonomously. @@ -339,7 +349,6 @@ syncache_insert(struct syncache *sc, str SCH_UNLOCK(sch); - V_tcp_syncache.cache_count++; TCPSTAT_INC(tcps_sc_added); } @@ -361,7 +370,6 @@ syncache_drop(struct syncache *sc, struc sc->sc_tu->tu_syncache_event(TOE_SC_DROP, sc->sc_toepcb); #endif syncache_free(sc); - V_tcp_syncache.cache_count--; } /* @@ -927,7 +935,6 @@ syncache_expand(struct in_conninfo *inc, /* Pull out the entry to unlock the bucket row. */ TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); sch->sch_length--; - V_tcp_syncache.cache_count--; SCH_UNLOCK(sch); } Modified: user/andre/tcp_workqueue/sys/netinet/tcp_syncache.h ============================================================================== --- user/andre/tcp_workqueue/sys/netinet/tcp_syncache.h Mon Mar 12 20:24:59 2012 (r232884) +++ user/andre/tcp_workqueue/sys/netinet/tcp_syncache.h Mon Mar 12 20:31:09 2012 (r232885) @@ -119,7 +119,6 @@ struct tcp_syncache { u_int hashsize; u_int hashmask; u_int bucket_limit; - u_int cache_count; /* XXX: unprotected */ u_int cache_limit; u_int rexmt_limit; u_int hash_secret; From owner-svn-src-user@FreeBSD.ORG Mon Mar 12 20:46:19 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B95E106564A; Mon, 12 Mar 2012 20:46:19 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B5068FC17; Mon, 12 Mar 2012 20:46:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CKkJBZ086091; Mon, 12 Mar 2012 20:46:19 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CKkJBn086089; Mon, 12 Mar 2012 20:46:19 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201203122046.q2CKkJBn086089@svn.freebsd.org> From: Andre Oppermann Date: Mon, 12 Mar 2012 20:46:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232891 - user/andre/tcp_workqueue/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Mar 2012 20:46:19 -0000 Author: andre Date: Mon Mar 12 20:46:18 2012 New Revision: 232891 URL: http://svn.freebsd.org/changeset/base/232891 Log: Simplify implementation of net.inet.tcp.reass.cursegments. Modified: user/andre/tcp_workqueue/sys/netinet/tcp_reass.c Modified: user/andre/tcp_workqueue/sys/netinet/tcp_reass.c ============================================================================== --- user/andre/tcp_workqueue/sys/netinet/tcp_reass.c Mon Mar 12 20:44:44 2012 (r232890) +++ user/andre/tcp_workqueue/sys/netinet/tcp_reass.c Mon Mar 12 20:46:18 2012 (r232891) @@ -85,11 +85,8 @@ SYSCTL_VNET_INT(_net_inet_tcp_reass, OID &VNET_NAME(tcp_reass_maxseg), 0, "Global maximum number of TCP Segments in Reassembly Queue"); -static VNET_DEFINE(int, tcp_reass_qsize) = 0; -#define V_tcp_reass_qsize VNET(tcp_reass_qsize) SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments, - CTLTYPE_INT | CTLFLAG_RD, - &VNET_NAME(tcp_reass_qsize), 0, &tcp_reass_sysctl_qsize, "I", + (CTLTYPE_INT | CTLFLAG_RD), NULL, 0, &tcp_reass_sysctl_qsize, "I", "Global number of TCP Segments currently in Reassembly Queue"); static VNET_DEFINE(int, tcp_reass_overflows) = 0; @@ -160,8 +157,10 @@ tcp_reass_flush(struct tcpcb *tp) static int tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS) { - V_tcp_reass_qsize = uma_zone_get_cur(V_tcp_reass_zone); - return (sysctl_handle_int(oidp, arg1, arg2, req)); + int qsize; + + qsize = uma_zone_get_cur(V_tcp_reass_zone); + return (sysctl_handle_int(oidp, &qsize, sizeof(qsize), req)); } int From owner-svn-src-user@FreeBSD.ORG Wed Mar 14 00:41:39 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 227E0106566C; Wed, 14 Mar 2012 00:41:39 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 098738FC08; Wed, 14 Mar 2012 00:41:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2E0fcbJ070115; Wed, 14 Mar 2012 00:41:38 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2E0fc75070087; Wed, 14 Mar 2012 00:41:38 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201203140041.q2E0fc75070087@svn.freebsd.org> From: Florian Smeets Date: Wed, 14 Mar 2012 00:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232952 - in user/attilio/vmcontention: . bin/ps contrib/gdb/gdb contrib/llvm/tools/clang/lib/Basic contrib/ntp/ntpd contrib/tnftp/src contrib/top gnu/usr.bin/gdb/arch/mips include incl... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Mar 2012 00:41:39 -0000 Author: flo (ports committer) Date: Wed Mar 14 00:41:37 2012 New Revision: 232952 URL: http://svn.freebsd.org/changeset/base/232952 Log: IFC at r232948 Approved by: attilio Added: user/attilio/vmcontention/lib/csu/common/ignore_init.c - copied unchanged from r232948, head/lib/csu/common/ignore_init.c user/attilio/vmcontention/lib/csu/common/notes.h - copied unchanged from r232948, head/lib/csu/common/notes.h user/attilio/vmcontention/lib/libc/locale/ctype_l.3 - copied unchanged from r232948, head/lib/libc/locale/ctype_l.3 user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ciu2-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-endor-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-endor-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-eoi-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-eoi-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-cfg.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-cfg.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-cfg.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-ilk.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-ilk.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-helper-ilk.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-hfa.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-hfa.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-hfa.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-hfa.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ilk.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ilk.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-iob1-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-iob1-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-ipd.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-malloc/ - copied from r232948, head/sys/contrib/octeon-sdk/cvmx-malloc/ user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-profiler.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-profiler.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-profiler.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-profiler.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm-tables.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm-tables.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-qlm.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-qlm.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-resources.config - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-resources.config user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shared-linux.ld - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-shared-linux.ld user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sso-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-sso-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-trax-defs.h - copied unchanged from r232948, head/sys/contrib/octeon-sdk/cvmx-trax-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-feature.c - copied unchanged from r232948, head/sys/contrib/octeon-sdk/octeon-feature.c user/attilio/vmcontention/sys/mips/cavium/octeon_irq.h - copied unchanged from r232948, head/sys/mips/cavium/octeon_irq.h user/attilio/vmcontention/sys/mips/mips/libkern_machdep.c - copied unchanged from r232948, head/sys/mips/mips/libkern_machdep.c user/attilio/vmcontention/sys/modules/acl_nfs4/ - copied from r232948, head/sys/modules/acl_nfs4/ user/attilio/vmcontention/sys/modules/acl_posix1e/ - copied from r232948, head/sys/modules/acl_posix1e/ user/attilio/vmcontention/sys/modules/ralfw/rt2860/ - copied from r232948, head/sys/modules/ralfw/rt2860/ user/attilio/vmcontention/sys/x86/x86/intr_machdep.c - copied unchanged from r232948, head/sys/x86/x86/intr_machdep.c user/attilio/vmcontention/tools/regression/bin/sh/expansion/arith12.0 - copied unchanged from r232948, head/tools/regression/bin/sh/expansion/arith12.0 Deleted: user/attilio/vmcontention/Makefile.mips user/attilio/vmcontention/sys/amd64/amd64/intr_machdep.c user/attilio/vmcontention/sys/contrib/dev/ral/rt2661_ucode.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db-support.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-db.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-custom.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-custom.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn30xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn31xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn38xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn38xxp2.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn50xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn52xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn52xxp1.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn56xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn56xxp1.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn58xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn58xxp1.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn63xx.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error-init-cn63xxp1.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-error.h user/attilio/vmcontention/sys/fs/fifofs/fifo.h user/attilio/vmcontention/sys/i386/i386/intr_machdep.c user/attilio/vmcontention/sys/mips/include/bswap.h user/attilio/vmcontention/sys/mips/include/clockvar.h user/attilio/vmcontention/sys/mips/include/cputypes.h user/attilio/vmcontention/sys/mips/include/iodev.h user/attilio/vmcontention/sys/mips/include/mp_watchdog.h user/attilio/vmcontention/sys/mips/include/pci_cfgreg.h user/attilio/vmcontention/sys/mips/include/ppireg.h user/attilio/vmcontention/sys/mips/include/timerreg.h user/attilio/vmcontention/sys/mips/mips/mainbus.c Modified: user/attilio/vmcontention/Makefile user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/bin/ps/ps.1 user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c user/attilio/vmcontention/contrib/gdb/gdb/target.c user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c user/attilio/vmcontention/contrib/tnftp/src/main.c user/attilio/vmcontention/contrib/tnftp/src/util.c user/attilio/vmcontention/contrib/top/top.c user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile user/attilio/vmcontention/include/Makefile user/attilio/vmcontention/include/xlocale/_ctype.h user/attilio/vmcontention/lib/csu/Makefile.inc user/attilio/vmcontention/lib/csu/amd64/Makefile user/attilio/vmcontention/lib/csu/amd64/crt1.c user/attilio/vmcontention/lib/csu/arm/Makefile user/attilio/vmcontention/lib/csu/arm/crt1.c user/attilio/vmcontention/lib/csu/common/crtbrand.c user/attilio/vmcontention/lib/csu/i386-elf/Makefile user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c user/attilio/vmcontention/lib/csu/mips/Makefile user/attilio/vmcontention/lib/csu/mips/crt1.c user/attilio/vmcontention/lib/csu/powerpc/Makefile user/attilio/vmcontention/lib/csu/powerpc/crt1.c user/attilio/vmcontention/lib/csu/powerpc64/Makefile user/attilio/vmcontention/lib/csu/powerpc64/crt1.c user/attilio/vmcontention/lib/csu/sparc64/crt1.c user/attilio/vmcontention/lib/libc/locale/Makefile.inc user/attilio/vmcontention/lib/libc/locale/Symbol.map user/attilio/vmcontention/lib/libc/locale/btowc.3 user/attilio/vmcontention/lib/libc/locale/ctype.3 user/attilio/vmcontention/lib/libc/locale/digittoint.3 user/attilio/vmcontention/lib/libc/locale/isalnum.3 user/attilio/vmcontention/lib/libc/locale/isalpha.3 user/attilio/vmcontention/lib/libc/locale/isblank.3 user/attilio/vmcontention/lib/libc/locale/iscntrl.3 user/attilio/vmcontention/lib/libc/locale/isdigit.3 user/attilio/vmcontention/lib/libc/sys/kill.2 user/attilio/vmcontention/lib/libc/sys/sigqueue.2 user/attilio/vmcontention/libexec/rtld-elf/Makefile user/attilio/vmcontention/libexec/rtld-elf/amd64/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/arm/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/i386/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/ia64/reloc.c user/attilio/vmcontention/libexec/rtld-elf/ia64/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/libmap.c user/attilio/vmcontention/libexec/rtld-elf/map_object.c user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/mips/rtld_start.S user/attilio/vmcontention/libexec/rtld-elf/powerpc/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/powerpc64/rtld_machdep.h user/attilio/vmcontention/libexec/rtld-elf/rtld.c user/attilio/vmcontention/libexec/rtld-elf/rtld.h user/attilio/vmcontention/libexec/rtld-elf/rtld_printf.c user/attilio/vmcontention/libexec/rtld-elf/sparc64/rtld_machdep.h user/attilio/vmcontention/release/Makefile user/attilio/vmcontention/sbin/adjkerntz/adjkerntz.8 user/attilio/vmcontention/sbin/fsdb/Makefile user/attilio/vmcontention/sbin/fsdb/fsdbutil.c user/attilio/vmcontention/sbin/growfs/growfs.c user/attilio/vmcontention/sbin/init/init.c user/attilio/vmcontention/sbin/ipfw/ipfw.8 user/attilio/vmcontention/sbin/ipfw/ipfw2.c user/attilio/vmcontention/share/man/man4/eventtimers.4 user/attilio/vmcontention/share/man/man4/tcp.4 user/attilio/vmcontention/share/man/man4/u3g.4 user/attilio/vmcontention/share/man/man9/LOCK_PROFILING.9 user/attilio/vmcontention/share/man/man9/ifnet.9 user/attilio/vmcontention/share/mk/bsd.sys.mk user/attilio/vmcontention/sys/amd64/amd64/trap.c user/attilio/vmcontention/sys/amd64/linux32/linux32_dummy.c user/attilio/vmcontention/sys/amd64/linux32/linux32_proto.h user/attilio/vmcontention/sys/amd64/linux32/linux32_syscall.h user/attilio/vmcontention/sys/amd64/linux32/linux32_syscalls.c user/attilio/vmcontention/sys/amd64/linux32/linux32_sysent.c user/attilio/vmcontention/sys/amd64/linux32/linux32_systrace_args.c user/attilio/vmcontention/sys/amd64/linux32/syscalls.master user/attilio/vmcontention/sys/boot/common/ufsread.c user/attilio/vmcontention/sys/boot/i386/boot2/boot2.c user/attilio/vmcontention/sys/boot/pc98/boot2/boot2.c user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c user/attilio/vmcontention/sys/conf/Makefile.mips user/attilio/vmcontention/sys/conf/files user/attilio/vmcontention/sys/conf/files.amd64 user/attilio/vmcontention/sys/conf/files.i386 user/attilio/vmcontention/sys/conf/files.mips user/attilio/vmcontention/sys/conf/files.pc98 user/attilio/vmcontention/sys/conf/kern.mk user/attilio/vmcontention/sys/conf/options.mips user/attilio/vmcontention/sys/contrib/dev/ral/rt2860.fw.uu user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmip.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-abi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-access-native.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-access.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-address.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-agl-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-hotplug.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-hotplug.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init-linux.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-app-init.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asm.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asx0-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-asxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-atomic.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootloader.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootmem.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-bootmem.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ciu-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-clock.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-clock.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cmd-queue.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cmd-queue.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-compactflash.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-compactflash.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-core.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-core.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-coremask.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-coremask.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-crypto.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-crypto.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-enums.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-csr.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dbg-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-handler.S user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-remote.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug-uart.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-debug.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfa.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dfm-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dma-engine.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dma-engine.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-dpi-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ebt3000.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ebt3000.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fau.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-flash.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-flash.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-fpa.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gmx.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gmxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gpio-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-gpio.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-board.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-board.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-errata.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-errata.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-fpa.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-fpa.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-jtag.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-jtag.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-loop.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-loop.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-npi.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-npi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-spi.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-spi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-srio.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-srio.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-util.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-util.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-xaui.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper-xaui.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-helper.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-higig.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-interrupt.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-iob-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ipd.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ixf18201.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ixf18201.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-key-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-key.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2c.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2d-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-l2t-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-led-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-llm.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-llm.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-lmcx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log-arc.S user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-log.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-malloc.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mdio.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mio-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mixx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mpi-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-nand.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-nand.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-ndf-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npei-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npi-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-npi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-packet.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pci-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pci.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcie.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcie.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcieepx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pciercx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcm-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcmx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcsx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pcsxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pemx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pescx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pexp-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pip-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pip.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pko.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-platform.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-pow.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-power-throttle.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-power-throttle.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rad-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-raid.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-raid.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rng.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rnm-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rtc.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-rwlock.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-scratch.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shmem.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-shmem.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sim-magic.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sli-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-smi-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-smix-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spi4000.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spinlock.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spx0-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-spxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srio.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srio.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sriomaintx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sriox-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-srxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-stxx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-swap.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sysinfo.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-sysinfo.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-thunder.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-thunder.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tim.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tlb.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tlb.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-tra.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-twsi.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-twsi.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uahcx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uart.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uart.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-uctlx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usb.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usb.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbcx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbd.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbd.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbnx-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-utils.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-version.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-warn.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-warn.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-wqe.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip-defs.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zip.h user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-zone.c user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx.h user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-boot-info.h user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-feature.h user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-model.c user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-model.h user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-pci-console.c user/attilio/vmcontention/sys/contrib/octeon-sdk/octeon-pci-console.h user/attilio/vmcontention/sys/contrib/pf/net/if_pfsync.c user/attilio/vmcontention/sys/dev/aac/aac_pci.c user/attilio/vmcontention/sys/dev/acpica/acpi_hpet.c user/attilio/vmcontention/sys/dev/advansys/adv_eisa.c user/attilio/vmcontention/sys/dev/advansys/adv_isa.c user/attilio/vmcontention/sys/dev/advansys/adv_pci.c user/attilio/vmcontention/sys/dev/advansys/adw_pci.c user/attilio/vmcontention/sys/dev/ahb/ahb.c user/attilio/vmcontention/sys/dev/aic7xxx/ahc_eisa.c user/attilio/vmcontention/sys/dev/aic7xxx/ahc_isa.c user/attilio/vmcontention/sys/dev/aic7xxx/ahc_pci.c user/attilio/vmcontention/sys/dev/aic7xxx/ahd_pci.c user/attilio/vmcontention/sys/dev/amr/amr_pci.c user/attilio/vmcontention/sys/dev/an/if_an_pci.c user/attilio/vmcontention/sys/dev/arcmsr/arcmsr.c user/attilio/vmcontention/sys/dev/asr/asr.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_sysctl.c user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c user/attilio/vmcontention/sys/dev/ath/if_athioctl.h user/attilio/vmcontention/sys/dev/ath/if_athvar.h user/attilio/vmcontention/sys/dev/bge/if_bge.c user/attilio/vmcontention/sys/dev/bge/if_bgereg.h user/attilio/vmcontention/sys/dev/buslogic/bt_pci.c user/attilio/vmcontention/sys/dev/bxe/if_bxe.c user/attilio/vmcontention/sys/dev/cesa/cesa.c user/attilio/vmcontention/sys/dev/ciss/ciss.c user/attilio/vmcontention/sys/dev/cxgb/cxgb_sge.c user/attilio/vmcontention/sys/dev/de/if_de.c user/attilio/vmcontention/sys/dev/dpt/dpt_pci.c user/attilio/vmcontention/sys/dev/en/midway.c user/attilio/vmcontention/sys/dev/glxsb/glxsb.c user/attilio/vmcontention/sys/dev/hatm/if_hatm.c user/attilio/vmcontention/sys/dev/hifn/hifn7751.c user/attilio/vmcontention/sys/dev/hptiop/hptiop.c user/attilio/vmcontention/sys/dev/hptmv/entry.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips24k.c user/attilio/vmcontention/sys/dev/ida/ida_pci.c user/attilio/vmcontention/sys/dev/if_ndis/if_ndis_pci.c user/attilio/vmcontention/sys/dev/iir/iir_pci.c user/attilio/vmcontention/sys/dev/ips/ips_pci.c user/attilio/vmcontention/sys/dev/ipw/if_ipw.c user/attilio/vmcontention/sys/dev/ipw/if_ipwvar.h user/attilio/vmcontention/sys/dev/iwi/if_iwi.c user/attilio/vmcontention/sys/dev/ixgb/if_ixgb.c user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c user/attilio/vmcontention/sys/dev/ixgbe/ixv.c user/attilio/vmcontention/sys/dev/lmc/if_lmc.c user/attilio/vmcontention/sys/dev/mfi/mfi_pci.c user/attilio/vmcontention/sys/dev/mge/if_mge.c user/attilio/vmcontention/sys/dev/mlx/mlx_pci.c user/attilio/vmcontention/sys/dev/mly/mly.c user/attilio/vmcontention/sys/dev/mps/mps_pci.c user/attilio/vmcontention/sys/dev/mxge/if_mxge.c user/attilio/vmcontention/sys/dev/nve/if_nve.c user/attilio/vmcontention/sys/dev/patm/if_patm_attach.c user/attilio/vmcontention/sys/dev/pci/pci.c user/attilio/vmcontention/sys/dev/pci/pci_private.h user/attilio/vmcontention/sys/dev/pci/pcireg.h user/attilio/vmcontention/sys/dev/pci/pcivar.h user/attilio/vmcontention/sys/dev/safe/safe.c user/attilio/vmcontention/sys/dev/trm/trm.c user/attilio/vmcontention/sys/dev/twa/tw_osl.h user/attilio/vmcontention/sys/dev/twa/tw_osl_freebsd.c user/attilio/vmcontention/sys/dev/twe/twe_freebsd.c user/attilio/vmcontention/sys/dev/tws/tws.c user/attilio/vmcontention/sys/dev/ubsec/ubsec.c user/attilio/vmcontention/sys/dev/usb/serial/u3g.c user/attilio/vmcontention/sys/dev/usb/usbdevs user/attilio/vmcontention/sys/dev/wds/wd7000.c user/attilio/vmcontention/sys/dev/wtap/if_wtap.c user/attilio/vmcontention/sys/dev/xen/blkfront/blkfront.c user/attilio/vmcontention/sys/fs/cd9660/cd9660_vnops.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_alloc.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_dinode.h user/attilio/vmcontention/sys/fs/ext2fs/ext2_inode_cnv.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_vfsops.c user/attilio/vmcontention/sys/fs/ext2fs/ext2_vnops.c user/attilio/vmcontention/sys/fs/ext2fs/ext2fs.h user/attilio/vmcontention/sys/fs/ext2fs/inode.h user/attilio/vmcontention/sys/fs/fdescfs/fdesc_vfsops.c user/attilio/vmcontention/sys/fs/fifofs/fifo_vnops.c user/attilio/vmcontention/sys/fs/nfs/nfsport.h user/attilio/vmcontention/sys/fs/nullfs/null_vfsops.c user/attilio/vmcontention/sys/fs/portalfs/portal_vfsops.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/fs/udf/udf_vnops.c user/attilio/vmcontention/sys/fs/unionfs/union_subr.c user/attilio/vmcontention/sys/fs/unionfs/union_vfsops.c user/attilio/vmcontention/sys/geom/part/g_part_bsd.c user/attilio/vmcontention/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c user/attilio/vmcontention/sys/i386/acpica/acpi_wakeup.c user/attilio/vmcontention/sys/i386/i386/exception.s user/attilio/vmcontention/sys/i386/i386/machdep.c user/attilio/vmcontention/sys/i386/i386/trap.c user/attilio/vmcontention/sys/i386/include/intr_machdep.h user/attilio/vmcontention/sys/i386/linux/linux_dummy.c user/attilio/vmcontention/sys/i386/linux/linux_proto.h user/attilio/vmcontention/sys/i386/linux/linux_syscall.h user/attilio/vmcontention/sys/i386/linux/linux_syscalls.c user/attilio/vmcontention/sys/i386/linux/linux_sysent.c user/attilio/vmcontention/sys/i386/linux/linux_systrace_args.c user/attilio/vmcontention/sys/i386/linux/syscalls.master user/attilio/vmcontention/sys/kern/imgact_elf.c user/attilio/vmcontention/sys/kern/kern_clock.c user/attilio/vmcontention/sys/kern/kern_clocksource.c user/attilio/vmcontention/sys/kern/kern_cpu.c user/attilio/vmcontention/sys/kern/kern_descrip.c user/attilio/vmcontention/sys/kern/kern_exec.c user/attilio/vmcontention/sys/kern/kern_exit.c user/attilio/vmcontention/sys/kern/kern_intr.c user/attilio/vmcontention/sys/kern/kern_kthread.c user/attilio/vmcontention/sys/kern/kern_racct.c user/attilio/vmcontention/sys/kern/kern_thr.c user/attilio/vmcontention/sys/kern/sched_4bsd.c user/attilio/vmcontention/sys/kern/sched_ule.c user/attilio/vmcontention/sys/kern/subr_acl_nfs4.c user/attilio/vmcontention/sys/kern/subr_acl_posix1e.c user/attilio/vmcontention/sys/kern/sys_capability.c user/attilio/vmcontention/sys/kern/sys_pipe.c user/attilio/vmcontention/sys/kern/vfs_mount.c user/attilio/vmcontention/sys/kern/vfs_subr.c user/attilio/vmcontention/sys/kern/vfs_syscalls.c user/attilio/vmcontention/sys/kern/vfs_vnops.c user/attilio/vmcontention/sys/mips/adm5120/adm5120_machdep.c user/attilio/vmcontention/sys/mips/adm5120/std.adm5120 user/attilio/vmcontention/sys/mips/alchemy/alchemy_machdep.c user/attilio/vmcontention/sys/mips/alchemy/std.alchemy user/attilio/vmcontention/sys/mips/atheros/apb.c user/attilio/vmcontention/sys/mips/atheros/ar71xx_machdep.c user/attilio/vmcontention/sys/mips/atheros/if_arge.c user/attilio/vmcontention/sys/mips/atheros/std.ar71xx user/attilio/vmcontention/sys/mips/cavium/ciu.c user/attilio/vmcontention/sys/mips/cavium/files.octeon1 user/attilio/vmcontention/sys/mips/cavium/if_octm.c user/attilio/vmcontention/sys/mips/cavium/obio.c user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-rgmii.c user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-rx.c user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-spi.c user/attilio/vmcontention/sys/mips/cavium/octe/ethernet.c user/attilio/vmcontention/sys/mips/cavium/octe/wrapper-cvmx-includes.h user/attilio/vmcontention/sys/mips/cavium/octeon_gpio.c user/attilio/vmcontention/sys/mips/cavium/octeon_machdep.c user/attilio/vmcontention/sys/mips/cavium/octeon_mp.c user/attilio/vmcontention/sys/mips/cavium/octeon_wdog.c user/attilio/vmcontention/sys/mips/cavium/octopci.c user/attilio/vmcontention/sys/mips/cavium/uart_dev_oct16550.c user/attilio/vmcontention/sys/mips/cavium/usb/octusb_octeon.c user/attilio/vmcontention/sys/mips/conf/AR71XX_BASE user/attilio/vmcontention/sys/mips/conf/AR91XX_BASE user/attilio/vmcontention/sys/mips/conf/MALTA user/attilio/vmcontention/sys/mips/conf/MALTA64 user/attilio/vmcontention/sys/mips/conf/OCTEON1 user/attilio/vmcontention/sys/mips/conf/PB92 user/attilio/vmcontention/sys/mips/conf/SWARM user/attilio/vmcontention/sys/mips/conf/SWARM64 user/attilio/vmcontention/sys/mips/conf/SWARM64_SMP user/attilio/vmcontention/sys/mips/conf/SWARM_SMP user/attilio/vmcontention/sys/mips/conf/XLP user/attilio/vmcontention/sys/mips/conf/XLP64 user/attilio/vmcontention/sys/mips/conf/XLPN32 user/attilio/vmcontention/sys/mips/conf/XLR user/attilio/vmcontention/sys/mips/conf/XLR64 user/attilio/vmcontention/sys/mips/conf/XLRN32 user/attilio/vmcontention/sys/mips/idt/idt_machdep.c user/attilio/vmcontention/sys/mips/idt/std.idt user/attilio/vmcontention/sys/mips/include/_bus.h user/attilio/vmcontention/sys/mips/include/bus.h user/attilio/vmcontention/sys/mips/include/cache.h user/attilio/vmcontention/sys/mips/include/cpufunc.h user/attilio/vmcontention/sys/mips/include/frame.h user/attilio/vmcontention/sys/mips/include/hwfunc.h user/attilio/vmcontention/sys/mips/include/md_var.h user/attilio/vmcontention/sys/mips/include/pmap.h user/attilio/vmcontention/sys/mips/include/proc.h user/attilio/vmcontention/sys/mips/include/trap.h user/attilio/vmcontention/sys/mips/malta/malta_machdep.c user/attilio/vmcontention/sys/mips/malta/std.malta user/attilio/vmcontention/sys/mips/mips/bus_space_generic.c user/attilio/vmcontention/sys/mips/mips/cache.c user/attilio/vmcontention/sys/mips/mips/cache_mipsNN.c user/attilio/vmcontention/sys/mips/mips/cpu.c user/attilio/vmcontention/sys/mips/mips/exception.S user/attilio/vmcontention/sys/mips/mips/freebsd32_machdep.c user/attilio/vmcontention/sys/mips/mips/machdep.c user/attilio/vmcontention/sys/mips/mips/nexus.c user/attilio/vmcontention/sys/mips/mips/pm_machdep.c user/attilio/vmcontention/sys/mips/mips/support.S user/attilio/vmcontention/sys/mips/mips/swtch.S user/attilio/vmcontention/sys/mips/mips/sys_machdep.c user/attilio/vmcontention/sys/mips/mips/tick.c user/attilio/vmcontention/sys/mips/mips/vm_machdep.c user/attilio/vmcontention/sys/mips/nlm/tick.c user/attilio/vmcontention/sys/mips/nlm/xlp_machdep.c user/attilio/vmcontention/sys/mips/rmi/tick.c user/attilio/vmcontention/sys/mips/rmi/xlr_machdep.c user/attilio/vmcontention/sys/mips/rt305x/rt305x_machdep.c user/attilio/vmcontention/sys/mips/rt305x/std.rt305x user/attilio/vmcontention/sys/mips/sentry5/s5_machdep.c user/attilio/vmcontention/sys/mips/sentry5/std.sentry5 user/attilio/vmcontention/sys/mips/sibyte/sb_machdep.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/modules/netgraph/netflow/Makefile user/attilio/vmcontention/sys/modules/ralfw/Makefile user/attilio/vmcontention/sys/net/netmap_user.h user/attilio/vmcontention/sys/net80211/ieee80211_radiotap.c user/attilio/vmcontention/sys/netgraph/netflow/netflow.c user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.c user/attilio/vmcontention/sys/netgraph/netflow/ng_netflow.h user/attilio/vmcontention/sys/netgraph/ng_vlan.c user/attilio/vmcontention/sys/netgraph/ng_vlan.h user/attilio/vmcontention/sys/netinet/ip_fw.h user/attilio/vmcontention/sys/netinet/ipfw/ip_fw2.c user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_private.h user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_sockopt.c user/attilio/vmcontention/sys/netinet/ipfw/ip_fw_table.c user/attilio/vmcontention/sys/netinet/sctp_bsd_addr.c user/attilio/vmcontention/sys/netinet/sctp_peeloff.c user/attilio/vmcontention/sys/nfsclient/nfs_vnops.c user/attilio/vmcontention/sys/powerpc/include/endian.h user/attilio/vmcontention/sys/sparc64/include/endian.h user/attilio/vmcontention/sys/sys/cpuset.h user/attilio/vmcontention/sys/sys/mount.h user/attilio/vmcontention/sys/sys/sched.h user/attilio/vmcontention/sys/sys/systm.h user/attilio/vmcontention/sys/sys/unistd.h user/attilio/vmcontention/sys/sys/vnode.h user/attilio/vmcontention/sys/ufs/ffs/ffs_inode.c user/attilio/vmcontention/sys/ufs/ffs/ffs_softdep.c user/attilio/vmcontention/sys/ufs/ffs/ffs_vnops.c user/attilio/vmcontention/sys/ufs/ufs/ufs_extattr.c user/attilio/vmcontention/sys/ufs/ufs/ufs_vnops.c user/attilio/vmcontention/sys/vm/vnode_pager.c user/attilio/vmcontention/sys/x86/include/endian.h user/attilio/vmcontention/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c user/attilio/vmcontention/tools/tools/wtap/vis_map/Makefile user/attilio/vmcontention/tools/tools/wtap/wtap/Makefile user/attilio/vmcontention/usr.bin/netstat/Makefile user/attilio/vmcontention/usr.sbin/Makefile.arm user/attilio/vmcontention/usr.sbin/Makefile.mips user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile user/attilio/vmcontention/usr.sbin/crashinfo/crashinfo.sh user/attilio/vmcontention/usr.sbin/crunch/crunchide/Makefile user/attilio/vmcontention/usr.sbin/diskinfo/diskinfo.c user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/disk-list.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-disk.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-networking.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-newfs.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/functions-unmount.sh user/attilio/vmcontention/usr.sbin/pc-sysinstall/backend/startautoinstall.sh user/attilio/vmcontention/usr.sbin/watch/watch.c Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/contrib/gdb/ (props changed) user/attilio/vmcontention/contrib/llvm/ (props changed) user/attilio/vmcontention/contrib/llvm/tools/clang/ (props changed) user/attilio/vmcontention/contrib/ntp/ (props changed) user/attilio/vmcontention/contrib/tnftp/ (props changed) user/attilio/vmcontention/contrib/top/ (props changed) user/attilio/vmcontention/gnu/usr.bin/gdb/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sbin/ipfw/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/contrib/octeon-sdk/ (props changed) user/attilio/vmcontention/sys/contrib/pf/ (props changed) Modified: user/attilio/vmcontention/Makefile ============================================================================== --- user/attilio/vmcontention/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -18,6 +18,7 @@ # 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. @@ -317,6 +318,9 @@ tinderbox: toolchains: @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe +kernel-toolchains: + @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=kernel-toolchain universe + # # universe # Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/ObsoleteFiles.inc Wed Mar 14 00:41:37 2012 (r232952) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20120309: Remove fifofs header files. +OLD_FILES+=usr/include/fs/fifofs/fifo.h +OLD_DIRS+=usr/include/fs/fifofs # 20120225: libarchive 3.0.3 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \ usr/share/man/man3/archive_read_support_compression_all.3.gz \ @@ -417,6 +420,9 @@ OLD_FILES+=usr/share/man/man5/lastlog.5. OLD_FILES+=usr/share/man/man5/utmp.5.gz OLD_FILES+=usr/share/man/man5/wtmp.5.gz OLD_LIBS+=lib/libutil.so.8 +.if ${TARGET_ARCH} == "amd64" +OLB_LIBS+=usr/lib32/libutil.so.8 +.endif # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed Modified: user/attilio/vmcontention/bin/ps/ps.1 ============================================================================== --- user/attilio/vmcontention/bin/ps/ps.1 Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/bin/ps/ps.1 Wed Mar 14 00:41:37 2012 (r232952) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd November 22, 2011 +.Dd March 8, 2012 .Dt PS 1 .Os .Sh NAME @@ -317,6 +317,7 @@ the include file .It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000 Threads should suspend at user boundary" .It Dv "P_HWPMC" Ta No "0x800000 Process is using HWPMCs" .It Dv "P_JAILED" Ta No "0x1000000 Process is in jail" +.It Dv "P_ORPHAN" Ta No "0x2000000 Orphaned by original parent, reparented to debugger" .It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()" .It Dv "P_STATCHILD" Ta No "0x8000000 Child process stopped or exited" .It Dv "P_INMEM" Ta No "0x10000000 Loaded into memory" Modified: user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/gdb/gdb/mipsfbsd-tdep.c Wed Mar 14 00:41:37 2012 (r232952) @@ -205,6 +205,8 @@ static struct core_fns mipsfbsd_elfcore_ * 0x7ffeffec sigcode -> 44 bytes * * 0x7ffeffc4 sigcode end env strings etc start + * + * XXX This is out-of-date and varies by ABI. */ #define MIPS_FBSD_SIGTRAMP_START (0x7ffeffc4) #define MIPS_FBSD_SIGTRAMP_END (0x7ffeffec) Modified: user/attilio/vmcontention/contrib/gdb/gdb/target.c ============================================================================== --- user/attilio/vmcontention/contrib/gdb/gdb/target.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/gdb/gdb/target.c Wed Mar 14 00:41:37 2012 (r232952) @@ -1425,6 +1425,13 @@ target_resize_to_sections (struct target (*t)->to_sections_end = target->to_sections_end; } } + /* There is a flattened view of the target stack in current_target, + so its to_sections pointer might also need updating. */ + if (current_target.to_sections == old_value) + { + current_target.to_sections = target->to_sections; + current_target.to_sections_end = target->to_sections_end; + } } return old_count; Modified: user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp ============================================================================== --- user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/llvm/tools/clang/lib/Basic/Targets.cpp Wed Mar 14 00:41:37 2012 (r232952) @@ -1583,23 +1583,26 @@ bool X86TargetInfo::setFeatureEnabled(ll (Name != "sse4" && Name != "sse4.2" && Name != "sse4.1")) return false; + // FIXME: this should probably use a switch with fall through. + if (Enabled) { if (Name == "mmx") Features["mmx"] = true; else if (Name == "sse") - Features["sse"] = true; + Features["mmx"] = Features["sse"] = true; else if (Name == "sse2") - Features["sse"] = Features["sse2"] = true; + Features["mmx"] = Features["sse"] = Features["sse2"] = true; else if (Name == "sse3") - Features["sse"] = Features["sse2"] = Features["sse3"] = true; + Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = + true; else if (Name == "ssse3") - Features["sse"] = Features["sse2"] = Features["sse3"] = + Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = true; else if (Name == "sse4" || Name == "sse4.2") - Features["sse"] = Features["sse2"] = Features["sse3"] = + Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = Features["sse42"] = true; else if (Name == "sse4.1") - Features["sse"] = Features["sse2"] = Features["sse3"] = + Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = true; else if (Name == "3dnow") Features["mmx"] = Features["3dnow"] = true; @@ -1608,10 +1611,11 @@ bool X86TargetInfo::setFeatureEnabled(ll else if (Name == "aes") Features["aes"] = true; else if (Name == "avx") - Features["avx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = - Features["ssse3"] = Features["sse41"] = Features["sse42"] = true; + Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = + Features["ssse3"] = Features["sse41"] = Features["sse42"] = + Features["avx"] = true; else if (Name == "sse4a") - Features["sse4a"] = true; + Features["mmx"] = Features["sse4a"] = true; } else { if (Name == "mmx") Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false; @@ -3779,13 +3783,32 @@ TargetInfo *TargetInfo::CreateTargetInfo Target->getDefaultFeatures(Features); // Apply the user specified deltas. + // First the enables. for (std::vector::const_iterator it = Opts.Features.begin(), ie = Opts.Features.end(); it != ie; ++it) { const char *Name = it->c_str(); + if (Name[0] != '+') + continue; + + // Apply the feature via the target. + if (!Target->setFeatureEnabled(Features, Name + 1, true)) { + Diags.Report(diag::err_target_invalid_feature) << Name; + return 0; + } + } + + // Then the disables. + for (std::vector::const_iterator it = Opts.Features.begin(), + ie = Opts.Features.end(); it != ie; ++it) { + const char *Name = it->c_str(); + + if (Name[0] == '+') + continue; + // Apply the feature via the target. - if ((Name[0] != '-' && Name[0] != '+') || - !Target->setFeatureEnabled(Features, Name + 1, (Name[0] == '+'))) { + if (Name[0] != '-' || + !Target->setFeatureEnabled(Features, Name + 1, false)) { Diags.Report(diag::err_target_invalid_feature) << Name; return 0; } Modified: user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c ============================================================================== --- user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/ntp/ntpd/ntp_loopfilter.c Wed Mar 14 00:41:37 2012 (r232952) @@ -646,12 +646,6 @@ local_clock( msyslog(LOG_NOTICE, "kernel time sync error %04x", ntv.status); ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME); - } else { - if ((ntv.status ^ pll_status) & ~STA_FLL) - NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) - msyslog(LOG_NOTICE, - "kernel time sync status change %04x", - ntv.status); } pll_status = ntv.status; #ifdef STA_NANO Modified: user/attilio/vmcontention/contrib/tnftp/src/main.c ============================================================================== --- user/attilio/vmcontention/contrib/tnftp/src/main.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/tnftp/src/main.c Wed Mar 14 00:41:37 2012 (r232952) @@ -146,9 +146,8 @@ main(int volatile argc, char **volatile struct passwd *pw; char *cp, *ep, *anonpass, *upload_path, *src_addr; const char *anonuser; - int dumbterm, s, isupload; + int dumbterm, isupload; size_t len; - socklen_t slen; tzset(); #if 0 /* tnftp */ /* XXX */ @@ -213,35 +212,6 @@ main(int volatile argc, char **volatile if (cp != NULL && strlcpy(netrc, cp, sizeof(netrc)) >= sizeof(netrc)) errx(1, "$NETRC `%s': %s", cp, strerror(ENAMETOOLONG)); - /* - * Get the default socket buffer sizes if we don't already have them. - * It doesn't matter which socket we do this to, because on the first - * call no socket buffer sizes will have been modified, so we are - * guaranteed to get the system defaults. - */ - s = socket(AF_INET, SOCK_STREAM, 0); - if (s == -1) - err(1, "Can't create socket to determine default socket sizes"); - slen = sizeof(rcvbuf_size); - if (getsockopt(s, SOL_SOCKET, SO_RCVBUF, - (void *)&rcvbuf_size, &slen) == -1) - err(1, "Unable to get default rcvbuf size"); - slen = sizeof(sndbuf_size); - if (getsockopt(s, SOL_SOCKET, SO_SNDBUF, - (void *)&sndbuf_size, &slen) == -1) - err(1, "Unable to get default sndbuf size"); - (void)close(s); - /* sanity check returned buffer sizes */ - if (rcvbuf_size <= 0) - rcvbuf_size = 8 * 1024; - if (sndbuf_size <= 0) - sndbuf_size = 8 * 1024; - - if (sndbuf_size > 8 * 1024 * 1024) - sndbuf_size = 8 * 1024 * 1024; - if (rcvbuf_size > 8 * 1024 * 1024) - rcvbuf_size = 8 * 1024 * 1024; - marg_sl = ftp_sl_init(); if ((tmpdir = getenv("TMPDIR")) == NULL) tmpdir = _PATH_TMP; Modified: user/attilio/vmcontention/contrib/tnftp/src/util.c ============================================================================== --- user/attilio/vmcontention/contrib/tnftp/src/util.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/tnftp/src/util.c Wed Mar 14 00:41:37 2012 (r232952) @@ -1060,6 +1060,32 @@ strsuftoi(const char *arg) void setupsockbufsize(int sock) { + socklen_t slen; + + if (0 == rcvbuf_size) { + slen = sizeof(rcvbuf_size); + if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF, + (void *)&rcvbuf_size, &slen) == -1) + err(1, "Unable to determine rcvbuf size"); + if (rcvbuf_size <= 0) + rcvbuf_size = 8 * 1024; + if (rcvbuf_size > 8 * 1024 * 1024) + rcvbuf_size = 8 * 1024 * 1024; + DPRINTF("setupsockbufsize: rcvbuf_size determined as %d\n", + rcvbuf_size); + } + if (0 == sndbuf_size) { + slen = sizeof(sndbuf_size); + if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, + (void *)&sndbuf_size, &slen) == -1) + err(1, "Unable to determine sndbuf size"); + if (sndbuf_size <= 0) + sndbuf_size = 8 * 1024; + if (sndbuf_size > 8 * 1024 * 1024) + sndbuf_size = 8 * 1024 * 1024; + DPRINTF("setupsockbufsize: sndbuf_size determined as %d\n", + sndbuf_size); + } if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (void *)&sndbuf_size, sizeof(sndbuf_size)) == -1) Modified: user/attilio/vmcontention/contrib/top/top.c ============================================================================== --- user/attilio/vmcontention/contrib/top/top.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/contrib/top/top.c Wed Mar 14 00:41:37 2012 (r232952) @@ -723,6 +723,10 @@ restart: if (!interactive) { sleep(delay); + if (leaveflag) { + end_screen(); + exit(0); + } } else while (no_command) { Modified: user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile ============================================================================== --- user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/gnu/usr.bin/gdb/arch/mips/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -1,5 +1,8 @@ # $FreeBSD$ +# +# XXX Should set DEFAULT_BFD_VEC based on target. +# .if !defined(GDB_CROSS_DEBUGGER) LIBSRCS+= mipsfbsd-nat.c fbsd-threads.c .endif Modified: user/attilio/vmcontention/include/Makefile ============================================================================== --- user/attilio/vmcontention/include/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/include/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -43,7 +43,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ - fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ + fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ Modified: user/attilio/vmcontention/include/xlocale/_ctype.h ============================================================================== --- user/attilio/vmcontention/include/xlocale/_ctype.h Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/include/xlocale/_ctype.h Wed Mar 14 00:41:37 2012 (r232952) @@ -68,19 +68,24 @@ _RuneLocale *__runes_for_locale(locale_t #endif /* _XLOCALE_INLINE */ #ifdef _XLOCALE_WCTYPES -static __inline int -__maskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale) +_XLOCALE_INLINE int +__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc); +_XLOCALE_INLINE int +__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc); + +_XLOCALE_INLINE int +__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc) { - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (_c < 0 || _c >= _CACHED_RUNES) ? ___runetype_l(_c, locale) : - runes->__runetype[_c] & _f; + int __limit; + _RuneLocale *runes = __runes_for_locale(__loc, &__limit); + return (__c < 0 || __c >= _CACHED_RUNES) ? ___runetype_l(__c, __loc) : + runes->__runetype[__c] & __f; } -static __inline int -__istype_l(__ct_rune_t _c, unsigned long _f, locale_t locale) +_XLOCALE_INLINE int +__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc) { - return (!!__maskrune_l(_c, _f, locale)); + return (!!__maskrune_l(__c, __f, __loc)); } #define XLOCALE_ISCTYPE(fname, cat) \ @@ -88,25 +93,30 @@ __istype_l(__ct_rune_t _c, unsigned long _XLOCALE_INLINE int isw##fname##_l(int __c, locale_t __l)\ { return __istype_l(__c, cat, __l); } #else -static __inline int -__sbmaskrune_l(__ct_rune_t _c, unsigned long _f, locale_t locale) +_XLOCALE_INLINE int +__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc); +_XLOCALE_INLINE int +__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc); + +_XLOCALE_INLINE int +__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc) { - int mb_sb_limit; - _RuneLocale *runes = __runes_for_locale(locale, &mb_sb_limit); - return (_c < 0 || _c >= mb_sb_limit) ? 0 : - runes->__runetype[_c] & _f; + int __limit; + _RuneLocale *runes = __runes_for_locale(__loc, &__limit); + return (__c < 0 || __c >= __limit) ? 0 : + runes->__runetype[__c] & __f; } -static __inline int -__sbistype_l(__ct_rune_t _c, unsigned long _f, locale_t locale) +_XLOCALE_INLINE int +__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc) { - return (!!__sbmaskrune_l(_c, _f, locale)); + return (!!__sbmaskrune_l(__c, __f, __loc)); } -#define XLOCALE_ISCTYPE(fname, cat) \ - _XLOCALE_INLINE int is##fname##_l(int c, locale_t l); \ - _XLOCALE_INLINE int is##fname##_l(int c, locale_t l)\ - { return __sbistype_l(c, cat, l); } +#define XLOCALE_ISCTYPE(__fname, __cat) \ + _XLOCALE_INLINE int is##__fname##_l(int, locale_t); \ + _XLOCALE_INLINE int is##__fname##_l(int __c, locale_t __l)\ + { return __sbistype_l(__c, __cat, __l); } #endif XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_D) @@ -136,15 +146,15 @@ _XLOCALE_INLINE int towupper_l(int, loca _XLOCALE_INLINE int towlower_l(int __c, locale_t __l) { - int mb_sb_limit; - _RuneLocale *__runes = __runes_for_locale(__l, &mb_sb_limit); + int __limit; + _RuneLocale *__runes = __runes_for_locale(__l, &__limit); return (__c < 0 || __c >= _CACHED_RUNES) ? ___tolower_l(__c, __l) : __runes->__maplower[__c]; } _XLOCALE_INLINE int towupper_l(int __c, locale_t __l) { - int mb_sb_limit; - _RuneLocale *__runes = __runes_for_locale(__l, &mb_sb_limit); + int __limit; + _RuneLocale *__runes = __runes_for_locale(__l, &__limit); return (__c < 0 || __c >= _CACHED_RUNES) ? ___toupper_l(__c, __l) : __runes->__mapupper[__c]; } Modified: user/attilio/vmcontention/lib/csu/Makefile.inc ============================================================================== --- user/attilio/vmcontention/lib/csu/Makefile.inc Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/Makefile.inc Wed Mar 14 00:41:37 2012 (r232952) @@ -2,4 +2,6 @@ SSP_CFLAGS= +SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/' + .include "../Makefile.inc" Modified: user/attilio/vmcontention/lib/csu/amd64/Makefile ============================================================================== --- user/attilio/vmcontention/lib/csu/amd64/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/amd64/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -19,21 +19,21 @@ CLEANFILES+= crt1.s gcrt1.s Scrt1.s crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s Modified: user/attilio/vmcontention/lib/csu/amd64/crt1.c ============================================================================== --- user/attilio/vmcontention/lib/csu/amd64/crt1.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/amd64/crt1.c Wed Mar 14 00:41:37 2012 (r232952) @@ -37,16 +37,10 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "crtbrand.c" - -extern int _DYNAMIC; -#pragma weak _DYNAMIC +#include "ignore_init.c" typedef void (*fptr)(void); -extern void _fini(void); -extern void _init(void); -extern int main(int, char **, char **); - #ifdef GCRT extern void _mcleanup(void); extern void monstartup(void *, void *); @@ -54,9 +48,6 @@ extern int eprol; extern int etext; #endif -char **environ; -const char *__progname = ""; - void _start(char **, void (*)(void)); /* The entry function. */ @@ -66,18 +57,13 @@ _start(char **ap, void (*cleanup)(void)) int argc; char **argv; char **env; - const char *s; argc = *(long *)(void *)ap; argv = ap + 1; env = ap + 2 + argc; environ = env; - if (argc > 0 && argv[0] != NULL) { - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } + if (argc > 0 && argv[0] != NULL) + handle_progname(argv[0]); if (&_DYNAMIC != NULL) atexit(cleanup); @@ -86,12 +72,10 @@ _start(char **ap, void (*cleanup)(void)) #ifdef GCRT atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT monstartup(&eprol, &etext); __asm__("eprol:"); #endif - _init(); - exit( main(argc, argv, env) ); + + handle_static_init(argc, argv, env); + exit(main(argc, argv, env)); } Modified: user/attilio/vmcontention/lib/csu/arm/Makefile ============================================================================== --- user/attilio/vmcontention/lib/csu/arm/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/arm/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -18,21 +18,21 @@ CLEANFILES+= crt1.s gcrt1.s Scrt1.s crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s Modified: user/attilio/vmcontention/lib/csu/arm/crt1.c ============================================================================== --- user/attilio/vmcontention/lib/csu/arm/crt1.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/arm/crt1.c Wed Mar 14 00:41:37 2012 (r232952) @@ -52,16 +52,11 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "crtbrand.c" +#include "ignore_init.c" struct Struct_Obj_Entry; struct ps_strings; -extern int _DYNAMIC; -#pragma weak _DYNAMIC - -extern void _fini(void); -extern void _init(void); -extern int main(int, char **, char **); extern void _start(int, char **, char **, const struct Struct_Obj_Entry *, void (*)(void), struct ps_strings *); @@ -72,8 +67,6 @@ extern int eprol; extern int etext; #endif -char **environ; -const char *__progname = ""; struct ps_strings *__ps_strings; void __start(int, char **, char **, struct ps_strings *, @@ -104,16 +97,11 @@ void __start(int argc, char **argv, char **env, struct ps_strings *ps_strings, const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void)) { - const char *s; environ = env; - if (argc > 0 && argv[0] != NULL) { - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } + if (argc > 0 && argv[0] != NULL) + handle_progname(argv[0]); if (ps_strings != (struct ps_strings *)0) __ps_strings = ps_strings; @@ -124,13 +112,10 @@ __start(int argc, char **argv, char **en _init_tls(); #ifdef GCRT atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT monstartup(&eprol, &etext); #endif - _init(); - exit( main(argc, argv, env) ); + handle_static_init(argc, argv, env); + exit(main(argc, argv, env)); } #ifdef GCRT Modified: user/attilio/vmcontention/lib/csu/common/crtbrand.c ============================================================================== --- user/attilio/vmcontention/lib/csu/common/crtbrand.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/common/crtbrand.c Wed Mar 14 00:41:37 2012 (r232952) @@ -27,10 +27,7 @@ __FBSDID("$FreeBSD$"); #include - -#define ABI_VENDOR "FreeBSD" -#define ABI_SECTION ".note.ABI-tag" -#define ABI_NOTETYPE 1 +#include "notes.h" /* * Special ".note" entry specifying the ABI version. See @@ -55,15 +52,15 @@ __FBSDID("$FreeBSD$"); * These steps are done in the invididual Makefiles for each applicable arch. */ static const struct { - int32_t namesz; - int32_t descsz; - int32_t type; - char name[sizeof ABI_VENDOR]; - int32_t desc; -} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = { - sizeof ABI_VENDOR, - sizeof(int32_t), - ABI_NOTETYPE, - ABI_VENDOR, - __FreeBSD_version + int32_t namesz; + int32_t descsz; + int32_t type; + char name[sizeof(NOTE_FREEBSD_VENDOR)]; + int32_t desc; +} abitag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = { + .namesz = sizeof(NOTE_FREEBSD_VENDOR), + .descsz = sizeof(int32_t), + .type = ABI_NOTETYPE, + .name = NOTE_FREEBSD_VENDOR, + .desc = __FreeBSD_version }; Copied: user/attilio/vmcontention/lib/csu/common/ignore_init.c (from r232948, head/lib/csu/common/ignore_init.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/csu/common/ignore_init.c Wed Mar 14 00:41:37 2012 (r232952, copy of r232948, head/lib/csu/common/ignore_init.c) @@ -0,0 +1,114 @@ +/*- + * Copyright 2012 Konstantin Belousov + * 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 ``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 BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "notes.h" + +extern int main(int, char **, char **); + +extern void (*__preinit_array_start[])(int, char **, char **) __hidden; +extern void (*__preinit_array_end[])(int, char **, char **) __hidden; +extern void (*__init_array_start[])(int, char **, char **) __hidden; +extern void (*__init_array_end[])(int, char **, char **) __hidden; +extern void (*__fini_array_start[])(void) __hidden; +extern void (*__fini_array_end[])(void) __hidden; +extern void _fini(void) __hidden; +extern void _init(void) __hidden; + +extern int _DYNAMIC; +#pragma weak _DYNAMIC + +char **environ; +const char *__progname = ""; + +static void +finalizer(void) +{ + void (*fn)(void); + size_t array_size, n; + + array_size = __fini_array_end - __fini_array_start; + for (n = array_size; n > 0; n--) { + fn = __fini_array_start[n - 1]; + if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1) + (fn)(); + } + _fini(); +} + +static inline void +handle_static_init(int argc, char **argv, char **env) +{ + void (*fn)(int, char **, char **); + size_t array_size, n; + + if (&_DYNAMIC != NULL) + return; + + atexit(finalizer); + + array_size = __preinit_array_end - __preinit_array_start; + for (n = 0; n < array_size; n++) { + fn = __preinit_array_start[n]; + if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1) + fn(argc, argv, env); + } + _init(); + array_size = __init_array_end - __init_array_start; + for (n = 0; n < array_size; n++) { + fn = __init_array_start[n]; + if ((uintptr_t)fn != 0 && (uintptr_t)fn != 1) + fn(argc, argv, env); + } +} + +static inline void +handle_progname(const char *v) +{ + const char *s; + + __progname = v; + for (s = __progname; *s != '\0'; s++) { + if (*s == '/') + __progname = s + 1; + } +} + +static const struct { + int32_t namesz; + int32_t descsz; + int32_t type; + char name[sizeof(NOTE_FREEBSD_VENDOR)]; + uint32_t desc; +} crt_noinit_tag __attribute__ ((section (NOTE_SECTION), + aligned(4))) __used = { + .namesz = sizeof(NOTE_FREEBSD_VENDOR), + .descsz = sizeof(uint32_t), + .type = CRT_NOINIT_NOTETYPE, + .name = NOTE_FREEBSD_VENDOR, + .desc = 0 +}; Copied: user/attilio/vmcontention/lib/csu/common/notes.h (from r232948, head/lib/csu/common/notes.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/lib/csu/common/notes.h Wed Mar 14 00:41:37 2012 (r232952, copy of r232948, head/lib/csu/common/notes.h) @@ -0,0 +1,38 @@ +/*- + * Copyright 2012 Konstantin Belousov + * 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 ``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 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. + * + * $FreeBSD$ + */ + +#ifndef CSU_COMMON_NOTES_H +#define CSU_COMMON_NOTES_H + +#define NOTE_FREEBSD_VENDOR "FreeBSD" + +#define NOTE_SECTION ".note.tag" + +#define ABI_NOTETYPE 1 +#define CRT_NOINIT_NOTETYPE 2 + +#endif Modified: user/attilio/vmcontention/lib/csu/i386-elf/Makefile ============================================================================== --- user/attilio/vmcontention/lib/csu/i386-elf/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/i386-elf/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -18,7 +18,7 @@ CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c. gcrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1_c.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} gcrt1_c.o: gcrt1_c.s ${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1_c.s @@ -28,7 +28,7 @@ gcrt1.o: gcrt1_c.o crt1_s.o crt1_c.s: crt1_c.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1_c.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} crt1_c.o: crt1_c.s ${CC} ${CFLAGS} -c -o ${.TARGET} crt1_c.s @@ -39,7 +39,7 @@ crt1.o: crt1_c.o crt1_s.o Scrt1_c.s: crt1_c.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1_c.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} Scrt1_c.o: Scrt1_c.s ${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1_c.s Modified: user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c ============================================================================== --- user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/i386-elf/crt1_c.c Wed Mar 14 00:41:37 2012 (r232952) @@ -39,15 +39,10 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "crtbrand.c" - -extern int _DYNAMIC; -#pragma weak _DYNAMIC +#include "ignore_init.c" typedef void (*fptr)(void); -extern void _fini(void); -extern void _init(void); -extern int main(int, char **, char **); extern void _start(char *, ...); #ifdef GCRT @@ -57,9 +52,6 @@ extern int eprol; extern int etext; #endif -char **environ; -const char *__progname = ""; - void _start1(fptr, int, char *[]) __dead2; /* The entry function, C part. */ @@ -67,16 +59,11 @@ void _start1(fptr cleanup, int argc, char *argv[]) { char **env; - const char *s; env = argv + argc + 1; environ = env; - if (argc > 0 && argv[0] != NULL) { - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } + if (argc > 0 && argv[0] != NULL) + handle_progname(argv[0]); if (&_DYNAMIC != NULL) atexit(cleanup); @@ -85,14 +72,12 @@ _start1(fptr cleanup, int argc, char *ar #ifdef GCRT atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT monstartup(&eprol, &etext); __asm__("eprol:"); #endif - _init(); - exit( main(argc, argv, env) ); + + handle_static_init(argc, argv, env); + exit(main(argc, argv, env)); } __asm(".hidden _start1"); Modified: user/attilio/vmcontention/lib/csu/mips/Makefile ============================================================================== --- user/attilio/vmcontention/lib/csu/mips/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/mips/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -18,21 +18,21 @@ CLEANFILES+= crt1.s gcrt1.s Scrt1.s crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} gcrt1.o: gcrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s Scrt1.s: crt1.c ${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} Scrt1.o: Scrt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s Modified: user/attilio/vmcontention/lib/csu/mips/crt1.c ============================================================================== --- user/attilio/vmcontention/lib/csu/mips/crt1.c Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/mips/crt1.c Wed Mar 14 00:41:37 2012 (r232952) @@ -43,17 +43,11 @@ __FBSDID("$FreeBSD$"); #include #include "libc_private.h" #include "crtbrand.c" +#include "ignore_init.c" struct Struct_Obj_Entry; struct ps_strings; -extern int _DYNAMIC; -#pragma weak _DYNAMIC - -extern void _init(void); -extern void _fini(void); -extern int main(int, char **, char **); - #ifdef GCRT extern void _mcleanup(void); extern void monstartup(void *, void *); @@ -61,9 +55,6 @@ extern int eprol; extern int etext; #endif -char **environ; -const char *__progname = ""; - void __start(char **, void (*)(void), struct Struct_Obj_Entry *, struct ps_strings *); /* The entry function. */ @@ -81,13 +72,8 @@ __start(char **ap, argv = ap + 1; env = ap + 2 + argc; environ = env; - if (argc > 0 && argv[0] != NULL) { - const char *s; - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } + if (argc > 0 && argv[0] != NULL) + handle_progname(argv[0]); if (&_DYNAMIC != NULL) atexit(cleanup); @@ -96,13 +82,11 @@ __start(char **ap, #ifdef GCRT atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT monstartup(&eprol, &etext); #endif - _init(); - exit( main(argc, argv, env) ); + + handle_static_init(argc, argv, env); + exit(main(argc, argv, env)); } #ifdef GCRT Modified: user/attilio/vmcontention/lib/csu/powerpc/Makefile ============================================================================== --- user/attilio/vmcontention/lib/csu/powerpc/Makefile Wed Mar 14 00:26:36 2012 (r232951) +++ user/attilio/vmcontention/lib/csu/powerpc/Makefile Wed Mar 14 00:41:37 2012 (r232952) @@ -18,21 +18,21 @@ CLEANFILES+= crt1.s gcrt1.s Scrt1.s crt1.s: crt1.c ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c - sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + sed ${SED_FIX_NOTE} ${.TARGET} crt1.o: crt1.s ${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s gcrt1.s: crt1.c ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Mar 16 15:41:08 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B0E9106566B; Fri, 16 Mar 2012 15:41:08 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 77F988FC0A; Fri, 16 Mar 2012 15:41:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2GFf8rY024031; Fri, 16 Mar 2012 15:41:08 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2GFf8PR024028; Fri, 16 Mar 2012 15:41:08 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201203161541.q2GFf8PR024028@svn.freebsd.org> From: Attilio Rao Date: Fri, 16 Mar 2012 15:41:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233034 - in user/attilio/vmcontention/sys: kern vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2012 15:41:08 -0000 Author: attilio Date: Fri Mar 16 15:41:07 2012 New Revision: 233034 URL: http://svn.freebsd.org/changeset/base/233034 Log: Fix the nodes allocator in architectures without direct-mapping: - Fix bugs in the free path where the pages were not unwired and relevant locking wasn't acquired. - Introduce the rnode_map, submap of kernel_map, where to allocate from. The reason is that, in architectures without direct-mapping, kmem_alloc*() will try to insert the newly created mapping while holding the vm_object lock introducing a LOR or lock recursion. rnode_map is however a leafly-used submap, thus there cannot be any deadlock. Notes: Size the submap in order to be, by default, around 64 MB and decrase the size of the nodes as the allocation will be much smaller (and when the compacting code in the vm_radix will be implemented this will aim for much less space to be used). However note that the size of the submap can be changed at boot time via the hw.rnode_map_scale scaling factor. - Use uma_zone_set_max() covering the size of the submap. Tested by: flo Modified: user/attilio/vmcontention/sys/kern/subr_witness.c user/attilio/vmcontention/sys/vm/vm_radix.c Modified: user/attilio/vmcontention/sys/kern/subr_witness.c ============================================================================== --- user/attilio/vmcontention/sys/kern/subr_witness.c Fri Mar 16 13:46:54 2012 (r233033) +++ user/attilio/vmcontention/sys/kern/subr_witness.c Fri Mar 16 15:41:07 2012 (r233034) @@ -602,6 +602,7 @@ static struct witness_order_list_entry o * VM * */ + { "system map", &lock_class_mtx_sleep }, { "vm object", &lock_class_mtx_sleep }, { "page lock", &lock_class_mtx_sleep }, { "vm page queue mutex", &lock_class_mtx_sleep }, Modified: user/attilio/vmcontention/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmcontention/sys/vm/vm_radix.c Fri Mar 16 13:46:54 2012 (r233033) +++ user/attilio/vmcontention/sys/vm/vm_radix.c Fri Mar 16 15:41:07 2012 (r233034) @@ -49,12 +49,30 @@ #include #include #include +#ifndef UMA_MD_SMALL_ALLOC +#include +#endif #include #include #include +#ifndef UMA_MD_SMALL_ALLOC +#define VM_RADIX_RNODE_MAP_SCALE (1024 * 1024 / 2) +#define VM_RADIX_WIDTH 4 + +/* + * Bits of height in root. + * The mask of smaller power of 2 containing VM_RADIX_LIMIT. + */ +#define VM_RADIX_HEIGHT 0x1f +#else #define VM_RADIX_WIDTH 5 + +/* See the comment above. */ +#define VM_RADIX_HEIGHT 0xf +#endif + #define VM_RADIX_COUNT (1 << VM_RADIX_WIDTH) #define VM_RADIX_MASK (VM_RADIX_COUNT - 1) #define VM_RADIX_MAXVAL ((vm_pindex_t)-1) @@ -63,9 +81,6 @@ /* Flag bits stored in node pointers. */ #define VM_RADIX_FLAGS 0x3 -/* Bits of height in root. */ -#define VM_RADIX_HEIGHT 0xf - /* Calculates maximum value for a tree of height h. */ #define VM_RADIX_MAX(h) \ ((h) == VM_RADIX_LIMIT ? VM_RADIX_MAXVAL : \ @@ -84,6 +99,9 @@ CTASSERT(sizeof(struct vm_radix_node) < static uma_zone_t vm_radix_node_zone; #ifndef UMA_MD_SMALL_ALLOC +static vm_map_t rnode_map; +static u_long rnode_map_scale; + static void * vm_radix_node_zone_allocf(uma_zone_t zone, int size, uint8_t *flags, int wait) { @@ -91,7 +109,7 @@ vm_radix_node_zone_allocf(uma_zone_t zon vm_page_t m; int pflags; - /* Inform UMA that this allocator uses kernel_map. */ + /* Inform UMA that this allocator uses rnode_map. */ *flags = UMA_SLAB_KERNEL; pflags = VM_ALLOC_WIRED | VM_ALLOC_NOOBJ; @@ -104,7 +122,7 @@ vm_radix_node_zone_allocf(uma_zone_t zon VM_ALLOC_SYSTEM; if ((wait & M_ZERO) != 0) pflags |= VM_ALLOC_ZERO; - addr = kmem_alloc_nofault(kernel_map, size); + addr = kmem_alloc_nofault(rnode_map, size); if (addr == 0) return (NULL); @@ -112,7 +130,7 @@ vm_radix_node_zone_allocf(uma_zone_t zon m = vm_page_alloc(NULL, OFF_TO_IDX(addr - VM_MIN_KERNEL_ADDRESS), pflags); if (m == NULL) { - kmem_free(kernel_map, addr, size); + kmem_free(rnode_map, addr, size); return (NULL); } if ((wait & M_ZERO) != 0 && (m->flags & PG_ZERO) == 0) @@ -133,14 +151,18 @@ vm_radix_node_zone_freef(void *item, int voitem = (vm_offset_t)item; m = PHYS_TO_VM_PAGE(pmap_kextract(voitem)); pmap_qremove(voitem, 1); + vm_page_lock(m); + vm_page_unwire(m, 0); vm_page_free(m); - kmem_free(kernel_map, voitem, size); + vm_page_unlock(m); + kmem_free(rnode_map, voitem, size); } static void init_vm_radix_alloc(void *dummy __unused) { + uma_zone_set_max(vm_radix_node_zone, rnode_map_scale); uma_zone_set_allocf(vm_radix_node_zone, vm_radix_node_zone_allocf); uma_zone_set_freef(vm_radix_node_zone, vm_radix_node_zone_freef); } @@ -193,9 +215,31 @@ vm_radix_slot(vm_pindex_t index, int lev return ((index >> (level * VM_RADIX_WIDTH)) & VM_RADIX_MASK); } +/* + * Initialize the radix node submap (for architectures not supporting + * direct-mapping) and the radix node zone. + * + * WITNESS reports a lock order reversal, for architectures not + * supporting direct-mapping, between the "system map" lock + * and the "vm object" lock. This is because the well established ordering + * "system map" -> "vm object" is not honoured in this case as allocating + * from the radix node submap ends up adding a mapping entry to it, meaning + * it is necessary to lock the submap. However, the radix node submap is + * a leaf and self-contained, thus a deadlock cannot happen here and + * adding MTX_NOWITNESS to all map locks would be largerly sub-optimal. + */ void vm_radix_init(void) { +#ifndef UMA_MD_SMALL_ALLOC + vm_offset_t maxaddr, minaddr; + + rnode_map_scale = VM_RADIX_RNODE_MAP_SCALE; + TUNABLE_ULONG_FETCH("hw.rnode_map_scale", &rnode_map_scale); + rnode_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, + rnode_map_scale * sizeof(struct vm_radix_node), FALSE); + rnode_map->system_map = 1; +#endif vm_radix_node_zone = uma_zcreate("RADIX NODE", sizeof(struct vm_radix_node), NULL, From owner-svn-src-user@FreeBSD.ORG Fri Mar 16 15:46:45 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62CAB106566B; Fri, 16 Mar 2012 15:46:45 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4AA358FC14; Fri, 16 Mar 2012 15:46:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2GFkjne024256; Fri, 16 Mar 2012 15:46:45 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2GFkjJq024252; Fri, 16 Mar 2012 15:46:45 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201203161546.q2GFkjJq024252@svn.freebsd.org> From: Attilio Rao Date: Fri, 16 Mar 2012 15:46:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233035 - in user/attilio/vmcontention: . contrib/libc++/include contrib/libc++/include/ext contrib/libc++/src contrib/libcxxrt etc include lib/libc++ lib/libc/compat-43 lib/libc/string... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2012 15:46:45 -0000 Author: attilio Date: Fri Mar 16 15:46:44 2012 New Revision: 233035 URL: http://svn.freebsd.org/changeset/base/233035 Log: MFC Added: user/attilio/vmcontention/contrib/libc++/include/__undef_min_max - copied unchanged from r233034, head/contrib/libc++/include/__undef_min_max user/attilio/vmcontention/sys/contrib/dev/ral/microcode.h - copied unchanged from r233034, head/sys/contrib/dev/ral/microcode.h Modified: user/attilio/vmcontention/ObsoleteFiles.inc user/attilio/vmcontention/contrib/libc++/include/__bit_reference user/attilio/vmcontention/contrib/libc++/include/__config user/attilio/vmcontention/contrib/libc++/include/__debug user/attilio/vmcontention/contrib/libc++/include/__functional_03 user/attilio/vmcontention/contrib/libc++/include/__functional_base user/attilio/vmcontention/contrib/libc++/include/__functional_base_03 user/attilio/vmcontention/contrib/libc++/include/__hash_table user/attilio/vmcontention/contrib/libc++/include/__locale user/attilio/vmcontention/contrib/libc++/include/__mutex_base user/attilio/vmcontention/contrib/libc++/include/__split_buffer user/attilio/vmcontention/contrib/libc++/include/__sso_allocator user/attilio/vmcontention/contrib/libc++/include/__std_stream user/attilio/vmcontention/contrib/libc++/include/__tree user/attilio/vmcontention/contrib/libc++/include/__tuple user/attilio/vmcontention/contrib/libc++/include/algorithm user/attilio/vmcontention/contrib/libc++/include/atomic user/attilio/vmcontention/contrib/libc++/include/bitset user/attilio/vmcontention/contrib/libc++/include/chrono user/attilio/vmcontention/contrib/libc++/include/cmath user/attilio/vmcontention/contrib/libc++/include/complex user/attilio/vmcontention/contrib/libc++/include/cstddef user/attilio/vmcontention/contrib/libc++/include/cstdlib user/attilio/vmcontention/contrib/libc++/include/cstring user/attilio/vmcontention/contrib/libc++/include/deque user/attilio/vmcontention/contrib/libc++/include/exception user/attilio/vmcontention/contrib/libc++/include/ext/hash_map user/attilio/vmcontention/contrib/libc++/include/forward_list user/attilio/vmcontention/contrib/libc++/include/fstream user/attilio/vmcontention/contrib/libc++/include/functional user/attilio/vmcontention/contrib/libc++/include/future user/attilio/vmcontention/contrib/libc++/include/initializer_list user/attilio/vmcontention/contrib/libc++/include/iomanip user/attilio/vmcontention/contrib/libc++/include/ios user/attilio/vmcontention/contrib/libc++/include/istream user/attilio/vmcontention/contrib/libc++/include/iterator user/attilio/vmcontention/contrib/libc++/include/limits user/attilio/vmcontention/contrib/libc++/include/list user/attilio/vmcontention/contrib/libc++/include/locale user/attilio/vmcontention/contrib/libc++/include/map user/attilio/vmcontention/contrib/libc++/include/memory user/attilio/vmcontention/contrib/libc++/include/mutex user/attilio/vmcontention/contrib/libc++/include/ostream user/attilio/vmcontention/contrib/libc++/include/random user/attilio/vmcontention/contrib/libc++/include/ratio user/attilio/vmcontention/contrib/libc++/include/regex user/attilio/vmcontention/contrib/libc++/include/sstream user/attilio/vmcontention/contrib/libc++/include/streambuf user/attilio/vmcontention/contrib/libc++/include/string user/attilio/vmcontention/contrib/libc++/include/system_error user/attilio/vmcontention/contrib/libc++/include/thread user/attilio/vmcontention/contrib/libc++/include/tuple user/attilio/vmcontention/contrib/libc++/include/type_traits user/attilio/vmcontention/contrib/libc++/include/unordered_map user/attilio/vmcontention/contrib/libc++/include/utility user/attilio/vmcontention/contrib/libc++/include/valarray user/attilio/vmcontention/contrib/libc++/include/vector user/attilio/vmcontention/contrib/libc++/src/chrono.cpp user/attilio/vmcontention/contrib/libc++/src/condition_variable.cpp user/attilio/vmcontention/contrib/libc++/src/debug.cpp user/attilio/vmcontention/contrib/libc++/src/exception.cpp user/attilio/vmcontention/contrib/libc++/src/future.cpp user/attilio/vmcontention/contrib/libc++/src/hash.cpp user/attilio/vmcontention/contrib/libc++/src/locale.cpp user/attilio/vmcontention/contrib/libc++/src/memory.cpp user/attilio/vmcontention/contrib/libc++/src/mutex.cpp user/attilio/vmcontention/contrib/libc++/src/new.cpp user/attilio/vmcontention/contrib/libc++/src/random.cpp user/attilio/vmcontention/contrib/libc++/src/regex.cpp user/attilio/vmcontention/contrib/libc++/src/stdexcept.cpp user/attilio/vmcontention/contrib/libc++/src/string.cpp user/attilio/vmcontention/contrib/libc++/src/strstream.cpp user/attilio/vmcontention/contrib/libc++/src/thread.cpp user/attilio/vmcontention/contrib/libc++/src/typeinfo.cpp user/attilio/vmcontention/contrib/libcxxrt/auxhelper.cc user/attilio/vmcontention/contrib/libcxxrt/cxxabi.h user/attilio/vmcontention/contrib/libcxxrt/dwarf_eh.h user/attilio/vmcontention/contrib/libcxxrt/dynamic_cast.cc user/attilio/vmcontention/contrib/libcxxrt/exception.cc user/attilio/vmcontention/contrib/libcxxrt/guard.cc user/attilio/vmcontention/contrib/libcxxrt/memory.cc user/attilio/vmcontention/contrib/libcxxrt/stdexcept.cc user/attilio/vmcontention/contrib/libcxxrt/stdexcept.h user/attilio/vmcontention/contrib/libcxxrt/terminate.cc user/attilio/vmcontention/contrib/libcxxrt/typeinfo.cc user/attilio/vmcontention/contrib/libcxxrt/typeinfo.h user/attilio/vmcontention/contrib/libcxxrt/unwind-arm.h user/attilio/vmcontention/contrib/libcxxrt/unwind.h user/attilio/vmcontention/etc/newsyslog.conf user/attilio/vmcontention/etc/rc user/attilio/vmcontention/etc/rc.shutdown user/attilio/vmcontention/include/stdlib.h user/attilio/vmcontention/lib/libc++/Makefile user/attilio/vmcontention/lib/libc/compat-43/killpg.2 user/attilio/vmcontention/lib/libc/string/strerror.c user/attilio/vmcontention/lib/libc/sys/kill.2 user/attilio/vmcontention/lib/libthr/thread/thr_barrier.c user/attilio/vmcontention/lib/libthr/thread/thr_private.h user/attilio/vmcontention/libexec/rtld-elf/libmap.c user/attilio/vmcontention/libexec/rtld-elf/map_object.c user/attilio/vmcontention/libexec/rtld-elf/rtld.c user/attilio/vmcontention/libexec/rtld-elf/rtld.h user/attilio/vmcontention/sbin/init/init.8 user/attilio/vmcontention/sbin/init/init.c user/attilio/vmcontention/sbin/init/pathnames.h user/attilio/vmcontention/sbin/mdconfig/mdconfig.c user/attilio/vmcontention/share/man/man3/pthread_cond_destroy.3 user/attilio/vmcontention/sys/arm/mv/common.c user/attilio/vmcontention/sys/conf/Makefile.mips user/attilio/vmcontention/sys/conf/files.pc98 user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/contrib/dev/ral/Makefile user/attilio/vmcontention/sys/dev/fxp/if_fxp.c user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mips.c user/attilio/vmcontention/sys/dev/ofw/ofw_bus_if.m user/attilio/vmcontention/sys/dev/ofw/ofw_bus_subr.c user/attilio/vmcontention/sys/dev/ofw/ofw_iicbus.c user/attilio/vmcontention/sys/dev/pcf/pcf_ebus.c user/attilio/vmcontention/sys/dev/pci/pci.c user/attilio/vmcontention/sys/dev/uart/uart_bus_pci.c user/attilio/vmcontention/sys/dev/wtap/if_wtap.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_subr.c user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c user/attilio/vmcontention/sys/geom/part/g_part.c user/attilio/vmcontention/sys/geom/part/g_part.h user/attilio/vmcontention/sys/i386/i386/machdep.c user/attilio/vmcontention/sys/i386/include/sysarch.h user/attilio/vmcontention/sys/kern/kern_exit.c user/attilio/vmcontention/sys/kern/kern_linker.c user/attilio/vmcontention/sys/kern/uipc_syscalls.c user/attilio/vmcontention/sys/mips/mips/machdep.c user/attilio/vmcontention/sys/netinet/sctp_peeloff.c user/attilio/vmcontention/sys/netinet/sctp_usrreq.c user/attilio/vmcontention/sys/netinet6/sctp6_usrreq.c user/attilio/vmcontention/sys/pc98/pc98/machdep.c user/attilio/vmcontention/sys/powerpc/aim/mmu_oea.c user/attilio/vmcontention/sys/powerpc/aim/mmu_oea64.c user/attilio/vmcontention/sys/powerpc/ofw/ofw_pcib_pci.c user/attilio/vmcontention/sys/powerpc/ofw/ofw_pcibus.c user/attilio/vmcontention/sys/sparc64/pci/ofw_pcibus.c user/attilio/vmcontention/sys/vm/vm_phys.c user/attilio/vmcontention/sys/x86/isa/atpic.c user/attilio/vmcontention/sys/x86/isa/icu.h user/attilio/vmcontention/sys/x86/x86/intr_machdep.c user/attilio/vmcontention/usr.bin/bc/bc.library user/attilio/vmcontention/usr.bin/bc/bc.y user/attilio/vmcontention/usr.bin/dc/bcode.c user/attilio/vmcontention/usr.sbin/syslogd/syslogd.8 Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/contrib/libc++/ (props changed) user/attilio/vmcontention/contrib/libcxxrt/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) Modified: user/attilio/vmcontention/ObsoleteFiles.inc ============================================================================== --- user/attilio/vmcontention/ObsoleteFiles.inc Fri Mar 16 15:41:07 2012 (r233034) +++ user/attilio/vmcontention/ObsoleteFiles.inc Fri Mar 16 15:46:44 2012 (r233035) @@ -59,9 +59,7 @@ OLD_FILES+=usr/share/man/man3/archive_re usr/share/man/man3/archive_write_set_compression_none.3.gz \ usr/share/man/man3/archive_write_set_compression_program.3.gz OLD_LIBS+=usr/lib/libarchive.so.5 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libarchive.so.5 -.endif # 20120113: removal of wtmpcvt(1) OLD_FILES+=usr/bin/wtmpcvt OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz @@ -74,12 +72,10 @@ OLD_FILES+=usr/lib/libodialog.a OLD_FILES+=usr/lib/libodialog.so OLD_LIBS+=usr/lib/libodialog.so.7 OLD_FILES+=usr/lib/libodialog_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libodialog.a OLD_FILES+=usr/lib32/libodialog.so OLD_LIBS+=usr/lib32/libodialog.so.7 OLD_FILES+=usr/lib32/libodialog_p.a -.endif # 20110930: sysinstall removed OLD_FILES+=usr/sbin/sysinstall OLD_FILES+=usr/share/man/man8/sysinstall.8.gz @@ -87,12 +83,10 @@ OLD_FILES+=usr/lib/libftpio.a OLD_FILES+=usr/lib/libftpio.so OLD_LIBS+=usr/lib/libftpio.so.8 OLD_FILES+=usr/lib/libftpio_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libftpio.a OLD_FILES+=usr/lib32/libftpio.so OLD_LIBS+=usr/lib32/libftpio.so.8 OLD_FILES+=usr/lib32/libftpio_p.a -.endif OLD_FILES+=usr/include/ftpio.h OLD_FILES+=usr/share/man/man3/ftpio.3.gz # 20110915: rename congestion control manpages @@ -111,7 +105,6 @@ OLD_LIBS+=usr/lib/libdwarf.so.2 OLD_LIBS+=usr/lib/libopie.so.6 OLD_LIBS+=usr/lib/librtld_db.so.1 OLD_LIBS+=usr/lib/libtacplus.so.4 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libcam.so.5 OLD_LIBS+=usr/lib32/libpcap.so.7 OLD_LIBS+=usr/lib32/libufs.so.5 @@ -120,7 +113,6 @@ OLD_LIBS+=usr/lib32/libdwarf.so.2 OLD_LIBS+=usr/lib32/libopie.so.6 OLD_LIBS+=usr/lib32/librtld_db.so.1 OLD_LIBS+=usr/lib32/libtacplus.so.4 -.endif # 20110817: no more acd.4, ad.4, afd.4 and ast.4 OLD_FILES+=usr/share/man/man4/acd.4.gz OLD_FILES+=usr/share/man/man4/ad.4.gz @@ -160,17 +152,13 @@ OLD_FILES+=usr/lib/libpkg.a OLD_FILES+=usr/lib/libpkg.so OLD_LIBS+=usr/lib/libpkg.so.0 OLD_FILES+=usr/lib/libpkg_p.a -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libpkg.a OLD_FILES+=usr/lib32/libpkg.so OLD_LIBS+=usr/lib32/libpkg.so.0 OLD_FILES+=usr/lib32/libpkg_p.a -.endif # 20110517: libsbuf version bump OLD_LIBS+=lib/libsbuf.so.5 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/libsbuf.so.5 -.endif # 20110502: new clang import which bumps version from 2.9 to 3.0 OLD_FILES+=usr/include/clang/2.9/emmintrin.h OLD_FILES+=usr/include/clang/2.9/mm_malloc.h @@ -199,12 +187,10 @@ OLD_FILES+=usr/lib/libobjc_p.a OLD_FILES+=usr/libexec/cc1obj OLD_LIBS+=usr/lib/libobjc.so.4 OLD_DIRS+=usr/include/objc -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libobjc.a OLD_FILES+=usr/lib32/libobjc.so OLD_FILES+=usr/lib32/libobjc_p.a OLD_LIBS+=usr/lib32/libobjc.so.4 -.endif # 20110331: firmware.img created at build time OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img # 20110224: sticky.8 -> sticky.7 @@ -326,9 +312,7 @@ OLD_FILES+=usr/include/machine/intr.h .endif # 20100514: library version bump for versioned symbols for liblzma OLD_LIBS+=usr/lib/liblzma.so.0 -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_LIBS+=usr/lib32/liblzma.so.0 -.endif # 20100511: move GCC-specific headers to /usr/include/gcc .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/emmintrin.h @@ -369,9 +353,7 @@ OLD_FILES+=usr/share/info/cpio.info.gz OLD_FILES+=usr/share/man/man1/gcpio.1.gz # 20100322: libz update OLD_LIBS+=lib/libz.so.5 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libz.so.5 -.endif # 20100314: removal of regexp.h OLD_FILES+=usr/include/regexp.h OLD_FILES+=usr/share/man/man3/regexp.3.gz @@ -420,9 +402,7 @@ OLD_FILES+=usr/share/man/man5/lastlog.5. OLD_FILES+=usr/share/man/man5/utmp.5.gz OLD_FILES+=usr/share/man/man5/wtmp.5.gz OLD_LIBS+=lib/libutil.so.8 -.if ${TARGET_ARCH} == "amd64" OLB_LIBS+=usr/lib32/libutil.so.8 -.endif # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed @@ -630,7 +610,6 @@ OLD_LIBS+=usr/lib/snmp_hostres.so.5 OLD_LIBS+=usr/lib/snmp_mibII.so.5 OLD_LIBS+=usr/lib/snmp_netgraph.so.5 OLD_LIBS+=usr/lib/snmp_pf.so.5 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libalias.so.6 OLD_LIBS+=usr/lib32/libarchive.so.4 OLD_LIBS+=usr/lib32/libauditd.so.4 @@ -731,7 +710,6 @@ OLD_LIBS+=usr/lib32/pam_self.so.4 OLD_LIBS+=usr/lib32/pam_ssh.so.4 OLD_LIBS+=usr/lib32/pam_tacplus.so.4 OLD_LIBS+=usr/lib32/pam_unix.so.4 -.endif # 20090718: the gdm pam.d file is no longer required. OLD_FILES+=etc/pam.d/gdm # 20090714: net_add_domain(9) renamed to domain_add(9) @@ -918,9 +896,7 @@ OLD_FILES+=usr/share/man/man8/sliplogin. OLD_FILES+=usr/share/man/man8/slstat.8.gz # 20090321: libpcap upgraded to 1.0.0 OLD_LIBS+=lib/libpcap.so.5 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libpcap.so.5 -.endif # 20090319: uscanner(4) has been removed OLD_FILES+=usr/share/man/man4/uscanner.4.gz # 20090313: k8temp(4) renamed to amdtemp(4) @@ -932,17 +908,13 @@ OLD_FILES+=usr/lib/libusb20.so OLD_FILES+=usr/lib/libusb20_p.a OLD_FILES+=usr/include/libusb20_compat01.h OLD_FILES+=usr/include/libusb20_compat10.h -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libusb20.so.1 OLD_FILES+=usr/lib32/libusb20.a OLD_FILES+=usr/lib32/libusb20.so OLD_FILES+=usr/lib32/libusb20_p.a -.endif # 20090226: libmp(3) functions renamed OLD_LIBS+=usr/lib/libmp.so.6 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libmp.so.6 -.endif # 20090223: changeover of USB stacks OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h @@ -1245,9 +1217,7 @@ OLD_LIBS+=usr/lib/libkadm5srv.so.9 OLD_LIBS+=usr/lib/libkafs5.so.9 OLD_LIBS+=usr/lib/libkrb5.so.9 OLD_LIBS+=usr/lib/libroken.so.9 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libgssapi.so.9 -.endif # 20080420: Symbol card support dropped OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h # 20080420: awi removal @@ -1274,10 +1244,8 @@ OLD_FILES+=usr/share/man/man2/kse_releas OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz -.if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libkse.so OLD_LIBS+=usr/lib32/libkse.so.3 -.endif # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal @@ -1297,11 +1265,9 @@ OLD_FILES+=usr/include/sys/xrpuio.h OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a -.if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libkse.a OLD_FILES+=usr/lib32/libkse_p.a OLD_FILES+=usr/lib32/libkse_pic.a -.endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071125: Renamed to pmc_get_msr() @@ -1401,12 +1367,10 @@ OLD_DIRS+=usr/include/netatm/ipatm OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm -.if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libatm.a OLD_FILES+=usr/lib32/libatm.so OLD_LIBS+=usr/lib32/libatm.so.5 OLD_FILES+=usr/lib32/libatm_p.a -.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -1491,7 +1455,6 @@ OLD_LIBS+=usr/lib/snmp_hostres.so.4 OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libalias.so.5 OLD_LIBS+=usr/lib32/libbsnmp.so.3 OLD_LIBS+=usr/lib32/libdialog.so.5 @@ -1526,7 +1489,6 @@ OLD_LIBS+=usr/lib32/pam_self.so.3 OLD_LIBS+=usr/lib32/pam_ssh.so.3 OLD_LIBS+=usr/lib32/pam_tacplus.so.3 OLD_LIBS+=usr/lib32/pam_unix.so.3 -.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -1596,7 +1558,6 @@ OLD_LIBS+=usr/lib/libwrap.so.4 OLD_LIBS+=usr/lib/libypclnt.so.2 OLD_LIBS+=usr/lib/snmp_bridge.so.3 OLD_LIBS+=usr/lib/snmp_hostres.so.3 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libatm.so.4 OLD_LIBS+=usr/lib32/libbegemot.so.2 OLD_LIBS+=usr/lib32/libbluetooth.so.2 @@ -1655,7 +1616,6 @@ OLD_LIBS+=usr/lib32/libvgl.so.4 OLD_LIBS+=usr/lib32/libwrap.so.4 OLD_LIBS+=usr/lib32/libypclnt.so.2 OLD_LIBS+=usr/lib32/libz.so.3 -.endif # 20070519: GCC 4.2 OLD_FILES+=usr/bin/f77 OLD_FILES+=usr/bin/protoize @@ -1902,9 +1862,7 @@ OLD_FILES+=usr/bin/uuidgen OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libarchive.so.3 -.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz @@ -1921,14 +1879,12 @@ OLD_FILES+=usr/lib/libmytinfo_p.a OLD_FILES+=usr/lib/libmytinfow.a OLD_FILES+=usr/lib/libmytinfow.so OLD_FILES+=usr/lib/libmytinfow_p.a -.if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libmytinfo.a OLD_FILES+=usr/lib32/libmytinfo.so OLD_FILES+=usr/lib32/libmytinfo_p.a OLD_FILES+=usr/lib32/libmytinfow.a OLD_FILES+=usr/lib32/libmytinfow.so OLD_FILES+=usr/lib32/libmytinfow_p.a -.endif # 20070128: remove vnconfig OLD_FILES+=usr/sbin/vnconfig # 20070127: remove bpf_compat.h @@ -5272,40 +5228,32 @@ OLD_LIBS+=usr/lib/libkadm5srv.so.8 OLD_LIBS+=usr/lib/libkafs5.so.8 OLD_LIBS+=usr/lib/libkrb5.so.8 OLD_LIBS+=usr/lib/libobjc.so.2 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libgssapi.so.8 OLD_LIBS+=usr/lib32/libobjc.so.2 -.endif # 20070519: GCC 4.2 OLD_LIBS+=usr/lib/libg2c.a OLD_LIBS+=usr/lib/libg2c.so OLD_LIBS+=usr/lib/libg2c.so.2 OLD_LIBS+=usr/lib/libg2c_p.a OLD_LIBS+=usr/lib/libgcc_pic.a -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libg2c.a OLD_LIBS+=usr/lib32/libg2c.so OLD_LIBS+=usr/lib32/libg2c.so.2 OLD_LIBS+=usr/lib32/libg2c_p.a OLD_LIBS+=usr/lib32/libgcc_pic.a -.endif # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade OLD_LIBS+=lib/libcrypto.so.4 OLD_LIBS+=usr/lib/libssl.so.4 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libcrypto.so.4 OLD_LIBS+=usr/lib32/libssl.so.4 -.endif # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 OLD_LIBS+=lib/libc.so.6 OLD_LIBS+=lib/libutil.so.5 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libatm.so.3 OLD_LIBS+=usr/lib32/libc.so.6 OLD_LIBS+=usr/lib32/libutil.so.5 -.endif # 20060413: shared library moved to /usr/lib OLD_LIBS+=lib/libgpib.so.1 # 20060413: libpcap.so.4 moved to /lib/ @@ -5319,12 +5267,10 @@ OLD_LIBS+=usr/lib/libc_r.a OLD_LIBS+=usr/lib/libc_r.so OLD_LIBS+=usr/lib/libc_r.so.7 OLD_LIBS+=usr/lib/libc_r_p.a -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libc_r.a OLD_LIBS+=usr/lib32/libc_r.so OLD_LIBS+=usr/lib32/libc_r.so.7 OLD_LIBS+=usr/lib32/libc_r_p.a -.endif # 20050722: bump for 6.0-RELEASE OLD_LIBS+=lib/libalias.so.4 OLD_LIBS+=lib/libatm.so.2 @@ -5536,10 +5482,8 @@ OLD_LIBS+=usr/lib/libc_r.so.3 OLD_LIBS+=usr/lib/libarchive.so.2 OLD_LIBS+=usr/lib/libbsnmp.so.1 OLD_LIBS+=usr/lib/libc_r.so.6 -.if ${TARGET_ARCH} == "amd64" OLD_LIBS+=usr/lib32/libarchive.so.2 OLD_LIBS+=usr/lib32/libc_r.so.6 -.endif OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 OLD_LIBS+=usr/lib/libkse.so.1 Modified: user/attilio/vmcontention/contrib/libc++/include/__bit_reference ============================================================================== --- user/attilio/vmcontention/contrib/libc++/include/__bit_reference Fri Mar 16 15:41:07 2012 (r233034) +++ user/attilio/vmcontention/contrib/libc++/include/__bit_reference Fri Mar 16 15:46:44 2012 (r233035) @@ -14,14 +14,16 @@ #include <__config> #include +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif _LIBCPP_BEGIN_NAMESPACE_STD -template class __bit_iterator; -template class __bit_const_reference; +template class __bit_iterator; +template class __bit_const_reference; template struct __has_storage_type @@ -29,22 +31,22 @@ struct __has_storage_type static const bool value = false; }; -template ::value> +template ::value> class __bit_reference { - typedef typename _C::__storage_type __storage_type; - typedef typename _C::__storage_pointer __storage_pointer; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::__storage_pointer __storage_pointer; __storage_pointer __seg_; __storage_type __mask_; #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self; #else - friend class _C::__self; + friend class _Cp::__self; #endif - friend class __bit_const_reference<_C>; - friend class __bit_iterator<_C, false>; + friend class __bit_const_reference<_Cp>; + friend class __bit_iterator<_Cp, false>; public: _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT {return static_cast(*__seg_ & __mask_);} @@ -66,74 +68,74 @@ public: {return operator=(static_cast(__x));} _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;} - _LIBCPP_INLINE_VISIBILITY __bit_iterator<_C, false> operator&() const _NOEXCEPT - {return __bit_iterator<_C, false>(__seg_, static_cast(__ctz(__mask_)));} + _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT + {return __bit_iterator<_Cp, false>(__seg_, static_cast(__ctz(__mask_)));} private: _LIBCPP_INLINE_VISIBILITY __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT : __seg_(__s), __mask_(__m) {} }; -template -class __bit_reference<_C, false> +template +class __bit_reference<_Cp, false> { }; -template +template _LIBCPP_INLINE_VISIBILITY inline void -swap(__bit_reference<_C> __x, __bit_reference<_D> __y) _NOEXCEPT +swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT { bool __t = __x; __x = __y; __y = __t; } -template +template _LIBCPP_INLINE_VISIBILITY inline void -swap(__bit_reference<_C> __x, bool& __y) _NOEXCEPT +swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT { bool __t = __x; __x = __y; __y = __t; } -template +template _LIBCPP_INLINE_VISIBILITY inline void -swap(bool& __x, __bit_reference<_C> __y) _NOEXCEPT +swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT { bool __t = __x; __x = __y; __y = __t; } -template +template class __bit_const_reference { - typedef typename _C::__storage_type __storage_type; - typedef typename _C::__const_storage_pointer __storage_pointer; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::__const_storage_pointer __storage_pointer; __storage_pointer __seg_; __storage_type __mask_; #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self; #else - friend class _C::__self; + friend class _Cp::__self; #endif - friend class __bit_iterator<_C, true>; + friend class __bit_iterator<_Cp, true>; public: _LIBCPP_INLINE_VISIBILITY - __bit_const_reference(const __bit_reference<_C>& __x) _NOEXCEPT + __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT : __seg_(__x.__seg_), __mask_(__x.__mask_) {} _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT {return static_cast(*__seg_ & __mask_);} - _LIBCPP_INLINE_VISIBILITY __bit_iterator<_C, true> operator&() const _NOEXCEPT - {return __bit_iterator<_C, true>(__seg_, static_cast(__ctz(__mask_)));} + _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT + {return __bit_iterator<_Cp, true>(__seg_, static_cast(__ctz(__mask_)));} private: _LIBCPP_INLINE_VISIBILITY __bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT @@ -144,11 +146,11 @@ private: // find -template -__bit_iterator<_C, false> -__find_bool_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template +__bit_iterator<_Cp, false> +__find_bool_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; // do first partial word @@ -178,11 +180,11 @@ __find_bool_true(__bit_iterator<_C, fals return _It(__first.__seg_, static_cast(__n)); } -template -__bit_iterator<_C, false> -__find_bool_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template +__bit_iterator<_Cp, false> +__find_bool_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; // do first partial word @@ -215,23 +217,23 @@ __find_bool_false(__bit_iterator<_C, fal return _It(__first.__seg_, static_cast(__n)); } -template +template inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -find(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, const _Tp& __value_) +__bit_iterator<_Cp, false> +find(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, const _Tp& __value_) { if (static_cast(__value_)) - return __find_bool_true(__first, static_cast(__last - __first)); - return __find_bool_false(__first, static_cast(__last - __first)); + return __find_bool_true(__first, static_cast(__last - __first)); + return __find_bool_false(__first, static_cast(__last - __first)); } // count -template -typename __bit_iterator<_C, false>::difference_type -__count_bool_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template +typename __bit_iterator<_Cp, false>::difference_type +__count_bool_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; typedef typename _It::difference_type difference_type; static const unsigned __bits_per_word = _It::__bits_per_word; @@ -258,11 +260,11 @@ __count_bool_true(__bit_iterator<_C, fal return __r; } -template -typename __bit_iterator<_C, false>::difference_type -__count_bool_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +template +typename __bit_iterator<_Cp, false>::difference_type +__count_bool_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; typedef typename _It::difference_type difference_type; static const unsigned __bits_per_word = _It::__bits_per_word; @@ -289,23 +291,23 @@ __count_bool_false(__bit_iterator<_C, fa return __r; } -template +template inline _LIBCPP_INLINE_VISIBILITY -typename __bit_iterator<_C, false>::difference_type -count(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, const _Tp& __value_) +typename __bit_iterator<_Cp, false>::difference_type +count(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, const _Tp& __value_) { if (static_cast(__value_)) - return __count_bool_true(__first, static_cast(__last - __first)); - return __count_bool_false(__first, static_cast(__last - __first)); + return __count_bool_true(__first, static_cast(__last - __first)); + return __count_bool_false(__first, static_cast(__last - __first)); } // fill_n -template +template void -__fill_n_false(__bit_iterator<_C, false> __first, typename _C::size_type __n) +__fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; // do first partial word @@ -331,11 +333,11 @@ __fill_n_false(__bit_iterator<_C, false> } } -template +template void -__fill_n_true(__bit_iterator<_C, false> __first, typename _C::size_type __n) +__fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n) { - typedef __bit_iterator<_C, false> _It; + typedef __bit_iterator<_Cp, false> _It; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; // do first partial word @@ -361,10 +363,10 @@ __fill_n_true(__bit_iterator<_C, false> } } -template +template _LIBCPP_INLINE_VISIBILITY inline void -fill_n(__bit_iterator<_C, false> __first, typename _C::size_type __n, bool __value_) +fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __value_) { if (__n > 0) { @@ -377,22 +379,22 @@ fill_n(__bit_iterator<_C, false> __first // fill -template +template inline _LIBCPP_INLINE_VISIBILITY void -fill(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __last, bool __value_) +fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value_) { - _VSTD::fill_n(__first, static_cast(__last - __first), __value_); + _VSTD::fill_n(__first, static_cast(__last - __first), __value_); } // copy -template -__bit_iterator<_C, false> -__copy_aligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template +__bit_iterator<_Cp, false> +__copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result) { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In; typedef typename _In::difference_type difference_type; typedef typename _In::__storage_type __storage_type; static const unsigned __bits_per_word = _In::__bits_per_word; @@ -434,12 +436,12 @@ __copy_aligned(__bit_iterator<_C, _IsCon return __result; } -template -__bit_iterator<_C, false> -__copy_unaligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template +__bit_iterator<_Cp, false> +__copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result) { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In; typedef typename _In::difference_type difference_type; typedef typename _In::__storage_type __storage_type; static const unsigned __bits_per_word = _In::__bits_per_word; @@ -512,10 +514,10 @@ __copy_unaligned(__bit_iterator<_C, _IsC return __result; } -template +template inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -copy(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) { if (__first.__ctz_ == __result.__ctz_) return __copy_aligned(__first, __last, __result); @@ -524,12 +526,12 @@ copy(__bit_iterator<_C, _IsConst> __firs // copy_backward -template -__bit_iterator<_C, false> -__copy_backward_aligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template +__bit_iterator<_Cp, false> +__copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result) { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In; typedef typename _In::difference_type difference_type; typedef typename _In::__storage_type __storage_type; static const unsigned __bits_per_word = _In::__bits_per_word; @@ -571,12 +573,12 @@ __copy_backward_aligned(__bit_iterator<_ return __result; } -template -__bit_iterator<_C, false> -__copy_backward_unaligned(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, - __bit_iterator<_C, false> __result) +template +__bit_iterator<_Cp, false> +__copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, + __bit_iterator<_Cp, false> __result) { - typedef __bit_iterator<_C, _IsConst> _In; + typedef __bit_iterator<_Cp, _IsConst> _In; typedef typename _In::difference_type difference_type; typedef typename _In::__storage_type __storage_type; static const unsigned __bits_per_word = _In::__bits_per_word; @@ -635,7 +637,7 @@ __copy_backward_unaligned(__bit_iterator { __m = ~__storage_type(0) << (__bits_per_word - __n); __storage_type __b = *--__last.__seg_ & __m; - unsigned __clz_r = __bits_per_word - __result.__ctz_; + __clz_r = __bits_per_word - __result.__ctz_; __storage_type __dn = _VSTD::min(__n, static_cast(__result.__ctz_)); __m = (~__storage_type(0) << (__result.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_r); *__result.__seg_ &= ~__m; @@ -657,10 +659,10 @@ __copy_backward_unaligned(__bit_iterator return __result; } -template +template inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -copy_backward(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) { if (__last.__ctz_ == __result.__ctz_) return __copy_backward_aligned(__first, __last, __result); @@ -669,20 +671,20 @@ copy_backward(__bit_iterator<_C, _IsCons // move -template +template inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -move(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +move(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) { return _VSTD::copy(__first, __last, __result); } // move_backward -template +template inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C, false> -move_backward(__bit_iterator<_C, _IsConst> __first, __bit_iterator<_C, _IsConst> __last, __bit_iterator<_C, false> __result) +__bit_iterator<_Cp, false> +move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) { return _VSTD::copy(__first, __last, __result); } @@ -852,34 +854,33 @@ swap_ranges(__bit_iterator<__C1, false> // rotate -template +template struct __bit_array { - typedef typename _C::difference_type difference_type; - typedef typename _C::__storage_type __storage_type; - typedef typename _C::iterator iterator; - static const unsigned __bits_per_word = _C::__bits_per_word; - static const unsigned _N = 4; + typedef typename _Cp::difference_type difference_type; + typedef typename _Cp::__storage_type __storage_type; + typedef typename _Cp::iterator iterator; + static const unsigned __bits_per_word = _Cp::__bits_per_word; + static const unsigned _Np = 4; difference_type __size_; - __storage_type __word_[_N]; + __storage_type __word_[_Np]; _LIBCPP_INLINE_VISIBILITY static difference_type capacity() - {return static_cast(_N * __bits_per_word);} + {return static_cast(_Np * __bits_per_word);} _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {} _LIBCPP_INLINE_VISIBILITY iterator begin() {return iterator(__word_, 0);} _LIBCPP_INLINE_VISIBILITY iterator end() {return iterator(__word_ + __size_ / __bits_per_word, static_cast(__size_ % __bits_per_word));} }; -template -__bit_iterator<_C, false> -rotate(__bit_iterator<_C, false> __first, __bit_iterator<_C, false> __middle, __bit_iterator<_C, false> __last) +template +__bit_iterator<_Cp, false> +rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle, __bit_iterator<_Cp, false> __last) { - typedef __bit_iterator<_C, false> _I1; + typedef __bit_iterator<_Cp, false> _I1; typedef typename _I1::difference_type difference_type; typedef typename _I1::__storage_type __storage_type; - static const unsigned __bits_per_word = _I1::__bits_per_word; difference_type __d1 = __middle - __first; difference_type __d2 = __last - __middle; _I1 __r = __first + __d2; @@ -887,16 +888,16 @@ rotate(__bit_iterator<_C, false> __first { if (__d1 <= __d2) { - if (__d1 <= __bit_array<_C>::capacity()) + if (__d1 <= __bit_array<_Cp>::capacity()) { - __bit_array<_C> __b(__d1); + __bit_array<_Cp> __b(__d1); _VSTD::copy(__first, __middle, __b.begin()); _VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first)); break; } else { - __bit_iterator<_C, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle); + __bit_iterator<_Cp, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle); __first = __middle; __middle = __mp; __d2 -= __d1; @@ -904,16 +905,16 @@ rotate(__bit_iterator<_C, false> __first } else { - if (__d2 <= __bit_array<_C>::capacity()) + if (__d2 <= __bit_array<_Cp>::capacity()) { - __bit_array<_C> __b(__d2); + __bit_array<_Cp> __b(__d2); _VSTD::copy(__middle, __last, __b.begin()); _VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last)); break; } else { - __bit_iterator<_C, false> __mp = __first + __d2; + __bit_iterator<_Cp, false> __mp = __first + __d2; _VSTD::swap_ranges(__first, __mp, __middle); __first = __mp; __d1 -= __d2; @@ -925,12 +926,12 @@ rotate(__bit_iterator<_C, false> __first // equal -template +template bool -__equal_unaligned(__bit_iterator<_C, true> __first1, __bit_iterator<_C, true> __last1, - __bit_iterator<_C, true> __first2) +__equal_unaligned(__bit_iterator<_Cp, true> __first1, __bit_iterator<_Cp, true> __last1, + __bit_iterator<_Cp, true> __first2) { - typedef __bit_iterator<_C, true> _It; + typedef __bit_iterator<_Cp, true> _It; typedef typename _It::difference_type difference_type; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; @@ -1003,12 +1004,12 @@ __equal_unaligned(__bit_iterator<_C, tru return true; } -template +template bool -__equal_aligned(__bit_iterator<_C, true> __first1, __bit_iterator<_C, true> __last1, - __bit_iterator<_C, true> __first2) +__equal_aligned(__bit_iterator<_Cp, true> __first1, __bit_iterator<_Cp, true> __last1, + __bit_iterator<_Cp, true> __first2) { - typedef __bit_iterator<_C, true> _It; + typedef __bit_iterator<_Cp, true> _It; typedef typename _It::difference_type difference_type; typedef typename _It::__storage_type __storage_type; static const unsigned __bits_per_word = _It::__bits_per_word; @@ -1046,31 +1047,31 @@ __equal_aligned(__bit_iterator<_C, true> return true; } -template +template inline _LIBCPP_INLINE_VISIBILITY bool -equal(__bit_iterator<_C, _IC1> __first1, __bit_iterator<_C, _IC1> __last1, __bit_iterator<_C, _IC2> __first2) +equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2) { if (__first1.__ctz_ == __first2.__ctz_) return __equal_aligned(__first1, __last1, __first2); return __equal_unaligned(__first1, __last1, __first2); } -template +template class __bit_iterator { public: - typedef typename _C::difference_type difference_type; + typedef typename _Cp::difference_type difference_type; typedef bool value_type; typedef __bit_iterator pointer; - typedef typename conditional<_IsConst, __bit_const_reference<_C>, __bit_reference<_C> >::type reference; + typedef typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >::type reference; typedef random_access_iterator_tag iterator_category; private: - typedef typename _C::__storage_type __storage_type; - typedef typename conditional<_IsConst, typename _C::__const_storage_pointer, - typename _C::__storage_pointer>::type __storage_pointer; - static const unsigned __bits_per_word = _C::__bits_per_word; + typedef typename _Cp::__storage_type __storage_type; + typedef typename conditional<_IsConst, typename _Cp::__const_storage_pointer, + typename _Cp::__storage_pointer>::type __storage_pointer; + static const unsigned __bits_per_word = _Cp::__bits_per_word; __storage_pointer __seg_; unsigned __ctz_; @@ -1079,7 +1080,7 @@ public: _LIBCPP_INLINE_VISIBILITY __bit_iterator() _NOEXCEPT {} _LIBCPP_INLINE_VISIBILITY - __bit_iterator(const __bit_iterator<_C, false>& __it) _NOEXCEPT + __bit_iterator(const __bit_iterator<_Cp, false>& __it) _NOEXCEPT : __seg_(__it.__seg_), __ctz_(__it.__ctz_) {} _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT @@ -1187,34 +1188,34 @@ private: : __seg_(__s), __ctz_(__ctz) {} #if defined(__clang__) - friend typename _C::__self; + friend typename _Cp::__self; #else - friend class _C::__self; + friend class _Cp::__self; #endif - friend class __bit_reference<_C>; - friend class __bit_const_reference<_C>; - friend class __bit_iterator<_C, true>; - template friend struct __bit_array; - template friend void __fill_n_false(__bit_iterator<_D, false> __first, typename _D::size_type __n); - template friend void __fill_n_true(__bit_iterator<_D, false> __first, typename _D::size_type __n); - template friend __bit_iterator<_D, false> __copy_aligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template friend __bit_iterator<_D, false> __copy_unaligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template friend __bit_iterator<_D, false> copy(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template friend __bit_iterator<_D, false> __copy_backward_aligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template friend __bit_iterator<_D, false> __copy_backward_unaligned(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); - template friend __bit_iterator<_D, false> copy_backward(__bit_iterator<_D, _IC> __first, - __bit_iterator<_D, _IC> __last, - __bit_iterator<_D, false> __result); + friend class __bit_reference<_Cp>; + friend class __bit_const_reference<_Cp>; + friend class __bit_iterator<_Cp, true>; + template friend struct __bit_array; + template friend void __fill_n_false(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n); + template friend void __fill_n_true(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n); + template friend __bit_iterator<_Dp, false> __copy_aligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template friend __bit_iterator<_Dp, false> __copy_unaligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template friend __bit_iterator<_Dp, false> copy(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template friend __bit_iterator<_Dp, false> __copy_backward_aligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template friend __bit_iterator<_Dp, false> __copy_backward_unaligned(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); + template friend __bit_iterator<_Dp, false> copy_backward(__bit_iterator<_Dp, _IC> __first, + __bit_iterator<_Dp, _IC> __last, + __bit_iterator<_Dp, false> __result); template friend __bit_iterator<__C2, false> __swap_ranges_aligned(__bit_iterator<__C1, false>, __bit_iterator<__C1, false>, __bit_iterator<__C2, false>); @@ -1224,22 +1225,22 @@ private: template friend __bit_iterator<__C2, false> swap_ranges(__bit_iterator<__C1, false>, __bit_iterator<__C1, false>, __bit_iterator<__C2, false>); - template friend __bit_iterator<_D, false> rotate(__bit_iterator<_D, false>, - __bit_iterator<_D, false>, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***