From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:30:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27854106567E; Sun, 17 Aug 2008 00:30:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8EF7106566C for ; Sun, 17 Aug 2008 00:30:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3E8D8FC23 for ; Sun, 17 Aug 2008 00:30:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H0Uvtt004551 for ; Sun, 17 Aug 2008 00:30:57 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H0UvSF004549 for perforce@freebsd.org; Sun, 17 Aug 2008 00:30:57 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 00:30:57 GMT Message-Id: <200808170030.m7H0UvSF004549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:30:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147620 Change 147620 by bz@bz_dumpster on 2008/08/17 00:30:03 A few ore missed V_ Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#8 (text+ko) ==== @@ -432,7 +432,7 @@ "ICMP6 checksum error(%d|%x) %s\n", icmp6->icmp6_type, sum, ip6_sprintf(ip6bufs, &ip6->ip6_src))); - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; goto freeit; } ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#5 (text+ko) ==== @@ -229,7 +229,7 @@ if_name(ifp), (unsigned long)ndi->maxmtu); } - if (ndi->maxmtu > in6_maxmtu) + if (ndi->maxmtu > V_in6_maxmtu) in6_setmaxmtu(); /* check all interfaces just in case */ #undef MIN ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#5 (text+ko) ==== @@ -596,7 +596,7 @@ #else IP6_EXTHDR_GET(nd_na, struct nd_neighbor_advert *, m, off, icmp6len); if (nd_na == NULL) { - icmp6stat.icp6s_tooshort++; + V_icmp6stat.icp6s_tooshort++; return; } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#5 (text+ko) ==== @@ -189,7 +189,7 @@ return; bad: - icmp6stat.icp6s_badrs++; + V_icmp6stat.icp6s_badrs++; m_freem(m); } @@ -244,7 +244,7 @@ #else IP6_EXTHDR_GET(nd_ra, struct nd_router_advert *, m, off, icmp6len); if (nd_ra == NULL) { - icmp6stat.icp6s_tooshort++; + V_icmp6stat.icp6s_tooshort++; return; } #endif @@ -621,7 +621,7 @@ if (V_ip6_forwarding || !V_ip6_accept_rtadv) { nd6log((LOG_WARNING, "defrouter_select: called unexpectedly (forwarding=%d, " - "accept_rtadv=%d)\n", ip6_forwarding, ip6_accept_rtadv)); + "accept_rtadv=%d)\n", ip6_forwarding, V_ip6_accept_rtadv)); splx(s); return; } ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#8 (text+ko) ==== @@ -1937,7 +1937,7 @@ static void ipsec_attach(void) { - SECPOLICY_LOCK_INIT(&ip4_def_policy); + SECPOLICY_LOCK_INIT(&V_ip4_def_policy); ip4_def_policy.refcnt = 1; /* NB: disallow free */ } SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL); From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:38:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 220D91065677; Sun, 17 Aug 2008 00:38:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9446106566C; Sun, 17 Aug 2008 00:38:12 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id B2E388FC08; Sun, 17 Aug 2008 00:38:12 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from [10.0.0.128] (p54.kientzle.com [66.166.149.54]) by kientzle.com (8.12.9/8.12.9) with ESMTP id m7H0cCtv024122; Sat, 16 Aug 2008 17:38:12 -0700 (PDT) (envelope-from kientzle@freebsd.org) Message-ID: <48A77330.3080501@freebsd.org> Date: Sat, 16 Aug 2008 17:39:12 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Anselm Strauss References: <200808161208.m7GC8kiI099130@repoman.freebsd.org> In-Reply-To: <200808161208.m7GC8kiI099130@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:38:13 -0000 > + /* TODO: reader does not yet respect data descriptors. */ > + /*assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); When writing uncompressed files, you *must* fill in the compressed and uncompressed sizes in the local file header (you can put them in the data descriptor also, but they must go into the local file header). Otherwise, the reader cannot tell where the data ends. (Unless it reads the central directory first, which it can't always do. For example, when reading archives from stdin, the reader cannot read the central directory first.) The CRC32, of course, cannot go in the local file header, so must go into the data descriptor. Tim From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:56:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D338D1065672; Sun, 17 Aug 2008 00:56:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 977B4106564A for ; Sun, 17 Aug 2008 00:56:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8315D8FC12 for ; Sun, 17 Aug 2008 00:56:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H0uNkW015771 for ; Sun, 17 Aug 2008 00:56:23 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H0uNoA015769 for perforce@freebsd.org; Sun, 17 Aug 2008 00:56:23 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 00:56:23 GMT Message-Id: <200808170056.m7H0uNoA015769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:56:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147621 Change 147621 by bz@bz_dumpster on 2008/08/17 00:55:54 We are not quite there yet. This is a temporary thing for Stage 1 and should away once the next Stages hit the tree. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#13 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#13 (text+ko) ==== @@ -155,9 +155,13 @@ /* then define the macro(s) that hook into the vimage macros */ #if defined(__FreeBSD__) && __FreeBSD_version >= 800044 && defined(VIMAGE) +#if 0 #define VSYMNAME(__MODULE) vnet_ ## __MODULE #define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL) #else +#define MODULE_GLOBAL(__MODULE, __SYMBOL) V_ ## __SYMBOL +#endif +#else #define MODULE_GLOBAL(__MODULE, __SYMBOL) (__SYMBOL) #endif /* From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:58:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28774106567B; Sun, 17 Aug 2008 00:58:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E00251065678 for ; Sun, 17 Aug 2008 00:58:25 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B13CD8FC19 for ; Sun, 17 Aug 2008 00:58:25 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H0wPB3015944 for ; Sun, 17 Aug 2008 00:58:25 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H0wPcn015942 for perforce@freebsd.org; Sun, 17 Aug 2008 00:58:25 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 00:58:25 GMT Message-Id: <200808170058.m7H0wPcn015942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:58:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147622 Change 147622 by bz@bz_dumpster on 2008/08/17 00:57:45 GC ip6_esp_randpad Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#9 (text+ko) ==== @@ -125,7 +125,6 @@ #define V_ip6_defmcasthlim ip6_defmcasthlim #define V_ip6_desync_factor ip6_desync_factor #define V_ip6_esp_net_deflev ip6_esp_net_deflev -#define V_ip6_esp_randpad ip6_esp_randpad #define V_ip6_esp_trans_deflev ip6_esp_trans_deflev #define V_ip6_forward_rt ip6_forward_rt #define V_ip6_forward_srcrt ip6_forward_srcrt From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:58:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1ADC71065737; Sun, 17 Aug 2008 00:58:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0C761065679 for ; Sun, 17 Aug 2008 00:58:25 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC4918FC1A for ; Sun, 17 Aug 2008 00:58:25 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H0wPOu015949 for ; Sun, 17 Aug 2008 00:58:25 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H0wPKm015947 for perforce@freebsd.org; Sun, 17 Aug 2008 00:58:25 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 00:58:25 GMT Message-Id: <200808170058.m7H0wPKm015947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:58:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=147623 Change 147623 by bz@bz_dumpster on 2008/08/17 00:58:02 more V_ missing Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#7 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#6 (text+ko) ==== @@ -1137,7 +1137,7 @@ ia->ia6_flags &= ~IN6_IFF_TENTATIVE; return; } - if (!ip6_dad_count) { + if (!V_ip6_dad_count) { ia->ia6_flags &= ~IN6_IFF_TENTATIVE; return; } From owner-p4-projects@FreeBSD.ORG Sun Aug 17 01:32:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97116106567C; Sun, 17 Aug 2008 01:32:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A0101065679 for ; Sun, 17 Aug 2008 01:32:00 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45C2A8FC15 for ; Sun, 17 Aug 2008 01:32:00 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H1VxJO019746 for ; Sun, 17 Aug 2008 01:31:59 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H1VxSK019744 for perforce@freebsd.org; Sun, 17 Aug 2008 01:31:59 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 01:31:59 GMT Message-Id: <200808170131.m7H1VxSK019744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 01:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147625 Change 147625 by bz@bz_dumpster on 2008/08/17 01:30:58 move V_ missing; down to V_k* && halt -p Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#8 (text+ko) ==== @@ -4588,7 +4588,7 @@ } ip_fw_ctl_ptr = ipfw_ctl; ip_fw_chk_ptr = ipfw_chk; - callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL); + callout_reset(&V_ipfw_timeout, hz, ipfw_tick, NULL); LIST_INIT(&layer3_chain.nat); return (0); } @@ -4600,7 +4600,7 @@ ip_fw_chk_ptr = NULL; ip_fw_ctl_ptr = NULL; - callout_drain(&ipfw_timeout); + callout_drain(&V_ipfw_timeout); IPFW_WLOCK(&layer3_chain); flush_tables(&layer3_chain); layer3_chain.reap = NULL; ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#9 (text+ko) ==== @@ -2784,8 +2784,8 @@ first = MODULE_GLOBAL(MOD_INET, ipport_lowfirstauto); last = MODULE_GLOBAL(MOD_INET, ipport_lowlastauto); } else { - first = ipport_firstauto; - last = ipport_lastauto; + first = MODULE_GLOBAL(MOD_INET, ipport_firstauto); + last = MODULE_GLOBAL(MOD_INET, ipport_lastauto); } if (first > last) { uint16_t temp; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#6 (text+ko) ==== @@ -621,7 +621,7 @@ if (V_ip6_forwarding || !V_ip6_accept_rtadv) { nd6log((LOG_WARNING, "defrouter_select: called unexpectedly (forwarding=%d, " - "accept_rtadv=%d)\n", ip6_forwarding, V_ip6_accept_rtadv)); + "accept_rtadv=%d)\n", V_ip6_forwarding, V_ip6_accept_rtadv)); splx(s); return; } From owner-p4-projects@FreeBSD.ORG Sun Aug 17 03:23:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A31171065679; Sun, 17 Aug 2008 03:23:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60C2A1065676 for ; Sun, 17 Aug 2008 03:23:53 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E4018FC1E for ; Sun, 17 Aug 2008 03:23:53 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H3Nr8m032036 for ; Sun, 17 Aug 2008 03:23:53 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H3Nrpe032034 for perforce@freebsd.org; Sun, 17 Aug 2008 03:23:53 GMT (envelope-from diego@FreeBSD.org) Date: Sun, 17 Aug 2008 03:23:53 GMT Message-Id: <200808170323.m7H3Nrpe032034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 147626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 03:23:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=147626 Change 147626 by diego@diego_black on 2008/08/17 03:23:45 Many many changes, including: - Add audit_pfil_enter and audit_pfil_exit like their syscall equivalents. - Add support for creating records inside locks and by ithreads by preallocating records using M_NOWAIT - Add support for network statefull records (flow records) on ipfw - Add support for nested record generation, specially usefull on ithreads context. - Improve admin records generation. - We don't need audit_pfil.c anymore, remove it. - We don't need AUDIT_CALL macro anymore, remove it. - More to come. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/conf/files#8 edit .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#4 edit .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#7 edit .. //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw_pfil.c#4 edit .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.c#7 edit .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_private.h#5 edit .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_syscalls.c#2 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#8 (text+ko) ==== @@ -2115,7 +2115,6 @@ security/audit/audit_bsm.c optional audit security/audit/audit_bsm_klib.c optional audit security/audit/audit_bsm_token.c optional audit -security/audit/audit_pfil.c optional audit security/audit/audit_pipe.c optional audit security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit ==== //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -102,6 +102,7 @@ O_PROBE_STATE, /* none */ O_KEEP_STATE, /* none */ + //O_AUDIT, /* none */ O_LIMIT, /* ipfw_insn_limit */ O_LIMIT_PARENT, /* dyn_type, not an opcode. */ ==== //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw2.c#7 (text+ko) ==== @@ -104,6 +104,8 @@ #include /* XXX for in_cksum */ +#include + #include #include @@ -1036,27 +1038,57 @@ return i; } +static void +addr_port_to_sin(u_int32_t addr, u_int16_t port, struct sockaddr_in *sin) +{ + sin->sin_len = sizeof(struct sockaddr_in); + sin->sin_family = PF_INET; + sin->sin_port = port; + sin->sin_addr.s_addr = addr; +} + /** * unlink a dynamic rule from a chain. prev is a pointer to * the previous one, q is a pointer to the rule to delete, * head is a pointer to the head of the queue. * Modifies q and potentially also head. */ -#define UNLINK_DYN_RULE(prev, head, q) { \ +#define UNLINK_DYN_RULE(prev, head, q) \ +{ \ ipfw_dyn_rule *old_q = q; \ + struct ipfw_flow_id *id = &q->id; \ + struct thread *td = curthread; \ + struct sockaddr_in lsin; \ + struct sockaddr_in rsin; \ + int error = 0; \ \ /* remove a refcount to the parent */ \ if (q->dyn_type == O_LIMIT) \ q->parent->count--; \ - DEB(printf("ipfw: unlink entry 0x%08x %d -> 0x%08x %d, %d left\n",\ - (q->id.src_ip), (q->id.src_port), \ - (q->id.dst_ip), (q->id.dst_port), dyn_count-1 ); ) \ - if (prev != NULL) \ - prev->next = q = q->next; \ - else \ - head = q = q->next; \ - dyn_count--; \ - uma_zfree(ipfw_dyn_rule_zone, old_q); } + /*if (q->dyn_type == O_AUDIT) { */ \ + AUDIT_PFIL_ENTER(AUE_PFIL_FLOW_END, td, error); \ + if (error == 0) { \ + AUDIT_ARG(text, "ipfw"); \ + addr_port_to_sin(id->src_ip, id->src_port, &lsin); \ + addr_port_to_sin(id->dst_ip, id->dst_port, &rsin); \ + AUDIT_ARG(socket_ex, AF_INET, SOCK_STREAM, \ + (struct sockaddr *)&lsin, (struct sockaddr *)&rsin); \ + } \ + /*}*/ \ + if (!error) { \ + DEB(printf( \ + "ipfw: unlink entry 0x%08x %d -> 0x%08x %d, %d left\n", \ + (q->id.src_ip), (q->id.src_port), \ + (q->id.dst_ip), (q->id.dst_port), dyn_count-1 );) \ + if (prev != NULL) \ + prev->next = q = q->next; \ + else \ + head = q = q->next; \ + dyn_count--; \ + uma_zfree(ipfw_dyn_rule_zone, old_q); \ + } \ + AUDIT_PFIL_EXIT(error, td); \ +} \ #define TIME_LEQ(a,b) ((int)((a)-(b)) <= 0) @@ -1153,6 +1185,7 @@ #define MATCH_FORWARD 1 #define MATCH_NONE 2 #define MATCH_UNKNOWN 3 + int i, dir = MATCH_NONE; ipfw_dyn_rule *prev, *q=NULL; @@ -1224,21 +1257,13 @@ #define BOTH_SYN (TH_SYN | (TH_SYN << 8)) #define BOTH_FIN (TH_FIN | (TH_FIN << 8)) q->state |= (dir == MATCH_FORWARD ) ? flags : (flags << 8); + switch (q->state) { case TH_SYN: /* opening */ q->expire = time_uptime + dyn_syn_lifetime; break; case BOTH_SYN: /* move to established */ - if (IS_IP6_FLOW_ID(pkt)) { - AUDIT_CALL(audit_ipfw_flow6_begin(&pkt->src_ip6, - pkt->src_port, &pkt->dst_ip6, - pkt->dst_port, 0)); - } else { - AUDIT_CALL(audit_ipfw_flow4_begin(pkt->src_ip, - pkt->src_port, pkt->dst_ip, pkt->dst_port, - 0)); - } case BOTH_SYN | TH_FIN : /* one side tries to close */ case BOTH_SYN | (TH_FIN << 8) : if (tcp) { @@ -1349,23 +1374,42 @@ static ipfw_dyn_rule * add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule) { - ipfw_dyn_rule *r; + ipfw_dyn_rule *r = NULL; + struct thread *td = curthread; + struct sockaddr_in lsin; + struct sockaddr_in rsin; int i; + int error = 0; IPFW_DYN_LOCK_ASSERT(); + //if (dyn_type == O_AUDIT) + { + AUDIT_PFIL_ENTER(AUE_PFIL_FLOW_BEGIN, td, error); + if (error != 0) + goto done; + AUDIT_ARG(text, "ipfw"); + addr_port_to_sin(id->src_ip, id->src_port, &lsin); + addr_port_to_sin(id->dst_ip, id->dst_port, &rsin); + AUDIT_ARG(socket_ex, AF_INET, SOCK_STREAM, + (struct sockaddr *)&lsin, (struct sockaddr *)&rsin); + } + if (ipfw_dyn_v == NULL || (dyn_count == 0 && dyn_buckets != curr_dyn_buckets)) { realloc_dynamic_table(); - if (ipfw_dyn_v == NULL) - return NULL; /* failed ! */ + if (ipfw_dyn_v == NULL) { + error = ENOMEM; + goto done; + } } i = hash_packet(id); r = uma_zalloc(ipfw_dyn_rule_zone, M_NOWAIT | M_ZERO); if (r == NULL) { printf ("ipfw: sorry cannot allocate state\n"); - return NULL; + error = ENOMEM; + goto done; } /* increase refcount on parent, and set pointer */ @@ -1393,7 +1437,11 @@ dyn_type, (r->id.src_ip), (r->id.src_port), (r->id.dst_ip), (r->id.dst_port), - dyn_count ); ) + dyn_count)); + +done: + //if (dyn_type == O_AUDIT) + AUDIT_PFIL_EXIT(error, td); return r; } @@ -3165,6 +3213,7 @@ &dyn_dir, proto == IPPROTO_TCP ? TCP(ulp) : NULL)) != NULL) { + /* * Found dynamic entry, update stats * and jump to the 'action' part of @@ -3403,18 +3452,12 @@ struct ip_fw *rule, *f, *prev; int l = RULESIZE(input_rule); - if (chain->rules == NULL && input_rule->rulenum != IPFW_DEFAULT_RULE) { - AUDIT_CALL(audit_ipfw_addrule(input_rule->set, - input_rule->rulenum, EINVAL)); + if (chain->rules == NULL && input_rule->rulenum != IPFW_DEFAULT_RULE) return (EINVAL); - } rule = malloc(l, M_IPFW, M_NOWAIT | M_ZERO); - if (rule == NULL) { - AUDIT_CALL(audit_ipfw_addrule(input_rule->set, - input_rule->rulenum, ENOSPC)); + if (rule == NULL) return (ENOSPC); - } bcopy(input_rule, rule, l); @@ -3474,7 +3517,6 @@ static_count++; static_len += l; IPFW_WUNLOCK(chain); - AUDIT_CALL(audit_ipfw_addrule(rule->set, rule->rulenum, 0)); DEB(printf("ipfw: installed rule %d, static count now %d\n", rule->rulenum, static_count);) return (0); @@ -3571,6 +3613,7 @@ del_entry(struct ip_fw_chain *chain, u_int32_t arg) { struct ip_fw *prev = NULL, *rule; + struct thread *td = curthread; u_int16_t rulenum; /* rule or old_set */ u_int8_t cmd, new_set; @@ -3578,18 +3621,13 @@ cmd = (arg >> 24) & 0xff; new_set = (arg >> 16) & 0xff; - if (cmd > 5 || new_set > RESVD_SET) { - AUDIT_CALL(audit_ipfw_delrule(new_set, rulenum, EINVAL)); + if (cmd > 5 || new_set > RESVD_SET) return EINVAL; - } if (cmd == 0 || cmd == 2 || cmd == 5) { - if (rulenum >= IPFW_DEFAULT_RULE) { - AUDIT_CALL(audit_ipfw_delrule(-1, rulenum, EINVAL)); + if (rulenum >= IPFW_DEFAULT_RULE) return EINVAL; - } } else { if (rulenum > RESVD_SET) { /* old_set */ - AUDIT_CALL(audit_ipfw_delrule(rulenum, -1, EINVAL)); return EINVAL; } } @@ -3599,6 +3637,8 @@ chain->reap = NULL; switch (cmd) { case 0: /* delete rules with given number */ + AUDIT_ARG(text, "ipfw: rule=%05u", rulenum); + /* * locate first rule to delete */ @@ -3616,19 +3656,17 @@ flush_rule_ptrs(chain); while (rule->rulenum == rulenum) { rule = remove_rule(chain, rule, prev); - AUDIT_CALL(audit_ipfw_delrule(rule->set, rule->rulenum, - 0)); } break; case 1: /* delete all rules with given set number */ + AUDIT_ARG(text, "ipfw: set=%02u", rulenum); + flush_rule_ptrs(chain); rule = chain->rules; while (rule->rulenum < IPFW_DEFAULT_RULE) { if (rule->set == rulenum) { rule = remove_rule(chain, rule, prev); - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); } else { prev = rule; rule = rule->next; @@ -3637,50 +3675,45 @@ break; case 2: /* move rules with given number to new set */ + AUDIT_ARG(text, "ipfw: move rule=%05u, set=%02u", rulenum, + new_set); + rule = chain->rules; for (; rule->rulenum < IPFW_DEFAULT_RULE; rule = rule->next) { if (rule->rulenum == rulenum) { - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); rule->set = new_set; - AUDIT_CALL(audit_ipfw_addrule(rule->set, - rule->rulenum, 0)); } } break; case 3: /* move rules with given set number to new set */ + AUDIT_ARG(text, "ipfw: move set=%02u, newset=%02u", rulenum, + new_set); + for (; rule->rulenum < IPFW_DEFAULT_RULE; rule = rule->next) { if (rule->set == rulenum) { - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); rule->set = new_set; - AUDIT_CALL(audit_ipfw_addrule(rule->set, - rule->rulenum, 0)); } } break; case 4: /* swap two sets */ + AUDIT_ARG(text, "ipfw: swap set=%02u, set=%02u", rulenum, + new_set); + for (; rule->rulenum < IPFW_DEFAULT_RULE; rule = rule->next) if (rule->set == rulenum) { - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); rule->set = new_set; - AUDIT_CALL(audit_ipfw_addrule(rule->set, - rule->rulenum, 0)); } else if (rule->set == new_set) { - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); rule->set = rulenum; - AUDIT_CALL(audit_ipfw_addrule(rule->set, - rule->rulenum, 0)); } break; case 5: /* delete rules with given number and with given set number. * rulenum - given rule number; * new_set - given set number. */ + AUDIT_ARG(text, "ipfw: set=%02u, rule=%05u", new_set, rulenum); + for (; rule->rulenum < rulenum; prev = rule, rule = rule->next) ; if (rule->rulenum != rulenum) { @@ -3691,8 +3724,6 @@ while (rule->rulenum == rulenum) { if (rule->set == new_set) { rule = remove_rule(chain, rule, prev); - AUDIT_CALL(audit_ipfw_delrule(rule->set, - rule->rulenum, 0)); } else { prev = rule; rule = rule->next; @@ -4190,9 +4221,9 @@ { #define RULE_MAXSIZE (256*sizeof(u_int32_t)) int error; - int set; size_t size; struct ip_fw *buf, *rule; + struct thread *td = curthread; u_int32_t rulenum[2]; error = priv_check(sopt->sopt_td, PRIV_NETINET_IPFW); @@ -4254,15 +4285,18 @@ * the old list without the need for a lock. */ - IPFW_WLOCK(&layer3_chain); - layer3_chain.reap = NULL; - free_chain(&layer3_chain, 0 /* keep default rule */); - rule = layer3_chain.reap; - layer3_chain.reap = NULL; - IPFW_WUNLOCK(&layer3_chain); - if (rule != NULL) - reap_rules(rule); - AUDIT_CALL(audit_ipfw_flush(error)); + AUDIT_PFIL_ENTER(AUE_PFIL_POLICY_FLUSH, td, error); + if (error == 0) { + IPFW_WLOCK(&layer3_chain); + layer3_chain.reap = NULL; + free_chain(&layer3_chain, 0 /* keep default rule */); + rule = layer3_chain.reap; + layer3_chain.reap = NULL; + IPFW_WUNLOCK(&layer3_chain); + if (rule != NULL) + reap_rules(rule); + } + AUDIT_PFIL_EXIT(error, td); break; case IP_FW_ADD: @@ -4272,10 +4306,16 @@ if (error == 0) error = check_ipfw_struct(rule, sopt->sopt_valsize); if (error == 0) { - error = add_rule(&layer3_chain, rule); - size = RULESIZE(rule); - if (!error && sopt->sopt_dir == SOPT_GET) - error = sooptcopyout(sopt, rule, size); + AUDIT_PFIL_ENTER(AUE_PFIL_POLICY_ADDRULE, td, error); + if (error == 0) { + AUDIT_ARG(text, "ipfw: set=%02u, rule=%05u", + rule->set, rule->rulenum); + error = add_rule(&layer3_chain, rule); + size = RULESIZE(rule); + if (!error && sopt->sopt_dir == SOPT_GET) + error = sooptcopyout(sopt, rule, size); + } + AUDIT_PFIL_EXIT(error, td); } free(rule, M_TEMP); break; @@ -4298,26 +4338,26 @@ if (error) break; size = sopt->sopt_valsize; - if (size == sizeof(u_int32_t)) /* delete or reassign */ - error = del_entry(&layer3_chain, rulenum[0]); - else if (size == 2*sizeof(u_int32_t)) { /* set enable/disable */ - set_disable = - (set_disable | rulenum[0]) & ~rulenum[1] & - ~(1<>=1) { - if (rulenum[0] & 1) - AUDIT_CALL(audit_ipfw_delrule(set, -1, - 0)); + AUDIT_ARG(text, + "ipfw: oldsets=0x%x, newsets=0x%x", + set_disable, new_set_disable); + set_disable = new_set_disable; } - - /* Audit newly enabled sets */ - for (set = 0; rulenum[1] != 0; set++, rulenum[1]>>=1) { - if (rulenum[1] & 1) - AUDIT_CALL(audit_ipfw_addrule(set, -1, - 0)); - } + AUDIT_PFIL_EXIT(error, td); } else error = EINVAL; break; @@ -4343,9 +4383,13 @@ sizeof(ent), sizeof(ent)); if (error) break; - error = add_table_entry(&layer3_chain, ent.tbl, - ent.addr, ent.masklen, ent.value); - AUDIT_CALL(audit_ipfw_addtable(ent.tbl, error)); + AUDIT_PFIL_ENTER(AUE_PFIL_POLICY_ADDTABLE, td, error); + if (error == 0) { + AUDIT_ARG(text, "ipfw: table=%u", ent.tbl); + error = add_table_entry(&layer3_chain, ent.tbl, + ent.addr, ent.masklen, ent.value); + } + AUDIT_PFIL_EXIT(error, td); } break; @@ -4357,9 +4401,13 @@ sizeof(ent), sizeof(ent)); if (error) break; - error = del_table_entry(&layer3_chain, ent.tbl, - ent.addr, ent.masklen); - AUDIT_CALL(audit_ipfw_deltable(ent.tbl, error)); + AUDIT_PFIL_ENTER(AUE_PFIL_POLICY_DELTABLE, td, error); + if (error == 0) { + AUDIT_ARG(text, "ipfw: table=%u", ent.tbl); + error = del_table_entry(&layer3_chain, ent.tbl, + ent.addr, ent.masklen); + } + AUDIT_PFIL_EXIT(error, td); } break; @@ -4371,10 +4419,14 @@ sizeof(tbl), sizeof(tbl)); if (error) break; - IPFW_WLOCK(&layer3_chain); - error = flush_table(&layer3_chain, tbl); - IPFW_WUNLOCK(&layer3_chain); - AUDIT_CALL(audit_ipfw_flushtable(tbl, error)); + AUDIT_PFIL_ENTER(AUE_PFIL_POLICY_FLUSHTABLE, td, error); + if (error == 0) { + AUDIT_ARG(text, "ipfw: table=%u", tbl); + IPFW_WLOCK(&layer3_chain); + error = flush_table(&layer3_chain, tbl); + IPFW_WUNLOCK(&layer3_chain); + } + AUDIT_PFIL_EXIT(error, td); } break; ==== //depot/projects/soc2008/diego-audit/src/sys/netinet/ip_fw_pfil.c#4 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ #include +#include #include int fw_enable = 1; @@ -526,10 +528,15 @@ static int ipfw_modevent(module_t mod, int type, void *unused) { + struct thread *td = curthread; int err = 0; switch (type) { case MOD_LOAD: + AUDIT_PFIL_ENTER(AUE_PFIL_ENABLE, td, err); + if (err != 0) + break; + if ((err = ipfw_init()) != 0) { printf("ipfw_init() error\n"); break; @@ -544,10 +551,13 @@ break; } #endif - AUDIT_CALL(audit_ipfw_enable(err)); break; case MOD_UNLOAD: + AUDIT_PFIL_ENTER(AUE_PFIL_DISABLE, td, err); + if (err != 0) + break; + if ((err = ipfw_unhook()) > 0) break; #ifdef INET6 @@ -555,13 +565,14 @@ break; #endif ipfw_destroy(); - AUDIT_CALL(audit_ipfw_disable(err)); break; default: return EOPNOTSUPP; break; } + AUDIT_ARG(text, "ipfw"); + AUDIT_PFIL_EXIT(err, td); return err; } ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.c#7 (text) ==== @@ -298,43 +298,62 @@ * XXXAUDIT: Shouldn't there be logic here to sleep waiting on available * pre_q space, suspending the system call until there is room? */ -struct kaudit_record * -audit_new(int event, struct thread *td) +int +audit_new(struct kaudit_record **arp, int event, struct thread *td, int flags) { struct kaudit_record *ar; int no_record; + char **textp; mtx_lock(&audit_mtx); no_record = (audit_suspended || !audit_enabled); mtx_unlock(&audit_mtx); - if (no_record) - return (NULL); + if (no_record) { + *arp = NULL; + return (0); + } + + if (flags & AR_WAITOK) { + ar = uma_zalloc_arg(audit_record_zone, td, M_WAITOK); + } else if (flags & AR_NOWAIT) { + ar = uma_zalloc_arg(audit_record_zone, td, M_NOWAIT); + if (ar == NULL) + return (ENOMEM); + + /* + * XXXDG: Perhaps we should preallocate other dynamic allocated + * args also. + */ + textp = &ar->k_ar.ar_arg_text; + *textp = malloc(MAXPATHLEN, M_AUDITTEXT, M_NOWAIT); + if (*textp == NULL) { + free(ar, M_AUDITTEXT); + return (ENOMEM); + } + } else + return (EINVAL); - /* - * Note: the number of outstanding uncommitted audit records is - * limited to the number of concurrent threads servicing system calls - * in the kernel. - */ - ar = uma_zalloc_arg(audit_record_zone, td, M_WAITOK); ar->k_ar.ar_event = event; + *arp = ar; mtx_lock(&audit_mtx); audit_pre_q_len++; mtx_unlock(&audit_mtx); - return (ar); + return (0); } /* - * Allocate a new record if preselection allows it. Otherwise, return NULL. + * Allocate a new record if preselection allows it. */ -struct kaudit_record * -audit_begin(int event, struct thread *td) +static int +audit_begin(struct kaudit_record **arp, int event, struct thread *td, int flags) { struct kaudit_record *ar; struct au_mask *aumask; au_class_t class; au_id_t auid; + int error; KASSERT(event != AUE_NULL, ("audit_begin: event == AUE_NULL")); @@ -370,13 +389,16 @@ cv_wait(&audit_fail_cv, &audit_mtx); panic("audit_failing_stop: thread continued"); } - ar = audit_new(event, td); - } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) - ar = audit_new(event, td); - else + error = audit_new(&ar, event, td, flags); + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) { + error = audit_new(&ar, event, td, flags); + } else { ar = NULL; + error = 0; + } - return (ar); + *arp = ar; + return (error); } void @@ -484,20 +506,19 @@ } /* - * Check if there's already a record being constructed. If true, save it - * into thread's record queue. + * Save the current thread's record (if there's one) into thread's record queue + * and establish a new record. */ static void -audit_enter(struct thread *td) +audit_enter(struct kaudit_record *ar, struct thread *td) { if (td->td_ar != NULL) TAILQ_INSERT_TAIL(td->td_arq, td->td_ar, k_q); - td->td_ar = NULL; + td->td_ar = ar; } /* - * Check if there were a previous record being constructed. If true, make it - * the current record and remove it from thread's record queue. + * Turn the previous saved record (if there's one) into thread's current record. */ static void audit_exit(struct thread *td) @@ -534,16 +555,9 @@ if (event == AUE_NULL) return; - ar = audit_begin(event, td); - if (ar != NULL) { - /* - * Save the current record into thread's record queue and - * create a new record. - */ - - audit_enter(td); - td->td_ar = ar; - } + (void)audit_begin(&ar, event, td, AR_WAITOK); + if (ar != NULL) + audit_enter(ar, td); } /* @@ -568,29 +582,20 @@ else retval = td->td_retval[0]; - /* - * Commit the current record. Turn the previous saved record into the - * current one. - */ audit_commit(td->td_ar, error, retval); audit_exit(td); } -void +int audit_pfil_enter(unsigned short event, struct thread *td) { struct kaudit_record *ar; + int error; - ar = audit_begin(event, td); - if (ar != NULL) { - /* - * Save the current record into thread's record queue and - * create a new record. - */ - - audit_enter(td); - td->td_ar = ar; - } + error = audit_begin(&ar, event, td, AR_NOWAIT); + if (error == 0 && ar != NULL) + audit_enter(ar, td); + return (error); } void @@ -603,10 +608,6 @@ else retval = 0; - /* - * Commit the current record. Turn the previous saved record into the - * current one. - */ audit_commit(td->td_ar, error, retval); audit_exit(td); } @@ -706,7 +707,7 @@ * Where possible coredump records should contain a pathname and arg32 * (signal) tokens. */ - ar = audit_new(AUE_CORE, td); + (void)audit_new(&ar, AUE_CORE, td, AR_WAITOK); if (path != NULL) { pathp = &ar->k_ar.ar_arg_upath1; *pathp = malloc(MAXPATHLEN, M_AUDITPATH, M_WAITOK); ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_private.h#5 (text) ==== @@ -87,6 +87,12 @@ #define AR_PRESELECT_USER_PIPE 0x00008000U /* + * Flags to indicate which allocation scheme to use for allocating records. + */ +#define AR_WAITOK 0x00000001U +#define AR_NOWAIT 0x00000002U + +/* * Audit data is generated as a stream of struct audit_record structures, * linked by struct kaudit_record, and contain storage for possible audit so * that it will not need to be allocated during the processing of a system @@ -248,11 +254,10 @@ * Functions to manage the allocation, release, and commit of kernel audit * records. */ -void audit_abort(struct kaudit_record *ar); -void audit_commit(struct kaudit_record *ar, int error, - int retval); -struct kaudit_record *audit_new(int event, struct thread *td); -struct kaudit_record *audit_begin(int event, struct thread *td); +void audit_abort(struct kaudit_record *ar); +void audit_commit(struct kaudit_record *ar, int error, int retval); +int audit_new(struct kaudit_record **arp, int event, struct thread *td, + int flags); /* Functions to add arguments to kernel audit records. */ ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_syscalls.c#2 (text) ==== @@ -93,10 +93,10 @@ * XXXAUDIT: Maybe AUE_AUDIT in the system call context and * special pre-select handling? */ - td->td_ar = audit_new(AUE_NULL, td); + (void)audit_new(&ar, AUE_NULL, td, AR_WAITOK); + td->td_ar = ar; if (td->td_ar == NULL) return (ENOTSUP); - ar = td->td_ar; } if (uap->length > MAX_AUDIT_RECORD_SIZE) From owner-p4-projects@FreeBSD.ORG Sun Aug 17 03:25:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95AF21065671; Sun, 17 Aug 2008 03:25:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59875106564A for ; Sun, 17 Aug 2008 03:25:55 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 487948FC22 for ; Sun, 17 Aug 2008 03:25:55 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H3Ptep032223 for ; Sun, 17 Aug 2008 03:25:55 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H3PtaD032221 for perforce@freebsd.org; Sun, 17 Aug 2008 03:25:55 GMT (envelope-from diego@FreeBSD.org) Date: Sun, 17 Aug 2008 03:25:55 GMT Message-Id: <200808170325.m7H3PtaD032221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 147627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 03:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=147627 Change 147627 by diego@diego_black on 2008/08/17 03:25:19 Forgot to submit changes to audit_arg.c and to remove audit_pfil.c on last commit. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#5 edit .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_pfil.c#11 delete Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit_arg.c#5 (text) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,8 @@ #include #include +#include + #include #include @@ -753,10 +756,18 @@ } void -audit_record_arg_text(struct kaudit_record *ar, char *text) +audit_arg_text(char *text, ...) { - KASSERT(ar != NULL, ("audit_record_arg_text: ar == NULL")); - KASSERT(text != NULL, ("audit_record_arg_text: text == NULL")); + struct kaudit_record *ar; + struct sbuf sb; + va_list ap; + + ar = currecord(); + if (ar == NULL) + return; + + KASSERT(ar != NULL, ("audit_arg_text: ar == NULL")); + KASSERT(text != NULL, ("audit_arg_text: text == NULL")); /* Invalidate the text string */ ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_TEXT); @@ -765,23 +776,16 @@ ar->k_ar.ar_arg_text = malloc(MAXPATHLEN, M_AUDITTEXT, M_WAITOK); - strncpy(ar->k_ar.ar_arg_text, text, MAXPATHLEN); + sbuf_new(&sb, ar->k_ar.ar_arg_text, MAXPATHLEN, SBUF_FIXEDLEN); + va_start(ap, text); + sbuf_vprintf(&sb, text, ap); + va_end(ap); + sbuf_finish(&sb); + sbuf_delete(&sb); ARG_SET_VALID(ar, ARG_TEXT); } void -audit_arg_text(char *text) -{ - struct kaudit_record *ar; - - ar = currecord(); - if (ar == NULL) - return; - - audit_record_arg_text(ar, text); -} - -void audit_record_arg_cmd(struct kaudit_record *ar, int cmd) { KASSERT(ar != NULL, ("audit_record_arg_cmd: ar == NULL")); From owner-p4-projects@FreeBSD.ORG Sun Aug 17 03:26:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5E041065678; Sun, 17 Aug 2008 03:26:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81D091065675 for ; Sun, 17 Aug 2008 03:26:56 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 708DD8FC13 for ; Sun, 17 Aug 2008 03:26:56 +0000 (UTC) (envelope-from diego@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H3QuDL032293 for ; Sun, 17 Aug 2008 03:26:56 GMT (envelope-from diego@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H3QuPu032291 for perforce@freebsd.org; Sun, 17 Aug 2008 03:26:56 GMT (envelope-from diego@FreeBSD.org) Date: Sun, 17 Aug 2008 03:26:56 GMT Message-Id: <200808170326.m7H3QuPu032291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to diego@FreeBSD.org using -f From: Diego Giagio To: Perforce Change Reviews Cc: Subject: PERFORCE change 147628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 03:26:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147628 Change 147628 by diego@diego_black on 2008/08/17 03:26:41 Also forgot to submit this one. Need some coffee. Affected files ... .. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.h#15 edit Differences ... ==== //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.h#15 (text) ==== @@ -127,30 +127,22 @@ /* * Functions for auditing packet filter events. */ -void audit_pfil_enter(unsigned short event, struct thread *td); +int audit_pfil_enter(unsigned short event, struct thread *td); void audit_pfil_exit(int error, struct thread *td); -void audit_ipfw_enable(int error); -void audit_ipfw_disable(int error); -void audit_ipfw_addrule(int set, int rulenum, int error); -void audit_ipfw_delrule(int set, int rulenum, int error); -void audit_ipfw_flush(int error); -void audit_ipfw_addtable(u_int table, int error); -void audit_ipfw_deltable(u_int table, int error); -void audit_ipfw_flushtable(u_int table, int error); +void audit_ipfw_enable(void); +void audit_ipfw_disable(void); +void audit_ipfw_addrule(int set, int rulenum); +void audit_ipfw_delrule(int set, int rulenum); +void audit_ipfw_flush(void); +void audit_ipfw_addtable(u_int table); +void audit_ipfw_deltable(u_int table); +void audit_ipfw_flushtable(u_int table); void audit_ipfw_flow4_begin(u_int32_t src, u_int16_t src_port, - u_int32_t dst, u_int16_t dst_port, int error); + u_int32_t dst, u_int16_t dst_port); struct in6_addr; void audit_ipfw_flow6_begin(struct in6_addr *src, u_int16_t src_port, - struct in6_addr *dst, u_int16_t dst_port, int error); - -void audit_pf_enable(int error); -void audit_pf_disable(int error); -void audit_pf_addrule(char *anchor, int nrules, int error); -void audit_pf_delrule(char *anchor, int error); -void audit_pf_flush(char *anchor, int nrules, int error); -void audit_pf_addtable(char *anchor, char *table, int nadd, int error); -void audit_pf_deltable(char *anchor, char *table, int ndel, int error); + struct in6_addr *dst, u_int16_t dst_port); /* * The remaining kernel functions are conditionally compiled in as they are @@ -194,7 +186,7 @@ void audit_arg_auditinfo_addr(struct auditinfo_addr *au_info); void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags); void audit_arg_vnode(struct vnode *vp, u_int64_t flags); -void audit_arg_text(char *text); +void audit_arg_text(char *text, ...); void audit_arg_cmd(int cmd); void audit_arg_svipc_cmd(int cmd); void audit_arg_svipc_perm(struct ipc_perm *perm); @@ -230,16 +222,28 @@ } \ } while (0) +#define AUDIT_PFIL_ENTER(code, td, error) do { \ + if (audit_enabled) { \ + error = audit_pfil_enter(code, td); \ + } \ +} while (0) + /* - * Wrap the audit_syscall_exit() function so that it is called only when - * auditing is enabled, or we have a audit record on the thread. It is - * possible that an audit record was begun before auditing was turned off. + * Wrap audit_syscall_exit() and audit_pfil_exit() functions so that they are + * called only when auditing is enabled, or we have a audit record on the + * thread. It it is possible that an audit record was begun before auditing + * was turned off. */ #define AUDIT_SYSCALL_EXIT(error, td) do { \ if (audit_enabled || (td->td_ar != NULL)) \ audit_syscall_exit(error, td); \ } while (0) +#define AUDIT_PFIL_EXIT(error, td) do { \ + if (audit_enabled || (td->td_ar != NULL)) \ + audit_pfil_exit(error, td); \ +} while (0) + /* * A Macro to wrap the audit_sysclose() function. */ From owner-p4-projects@FreeBSD.ORG Sun Aug 17 07:00:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E849E106568C; Sun, 17 Aug 2008 07:00:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A43C71065689 for ; Sun, 17 Aug 2008 07:00:37 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D71E8FC0A for ; Sun, 17 Aug 2008 07:00:37 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H70bSp062688 for ; Sun, 17 Aug 2008 07:00:37 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H70bFI062686 for perforce@freebsd.org; Sun, 17 Aug 2008 07:00:37 GMT (envelope-from konrad@FreeBSD.org) Date: Sun, 17 Aug 2008 07:00:37 GMT Message-Id: <200808170700.m7H70bFI062686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 07:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=147629 Change 147629 by konrad@vspredator on 2008/08/17 06:59:44 Back out my excessive optimization. Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/string/strxfrm.c#8 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/string/strxfrm.c#8 (text+ko) ==== @@ -138,7 +138,7 @@ } sverrno = errno; free(wcs); - for (i = COLL_WEIGHTS_MAX - 1; i >= 0; i--) + for (i = 0; i < COLL_WEIGHTS_MAX; i++) free(xf[i]); errno = sverrno; From owner-p4-projects@FreeBSD.ORG Sun Aug 17 07:04:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 421561065673; Sun, 17 Aug 2008 07:04:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0684C106566B for ; Sun, 17 Aug 2008 07:04:42 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EDAE08FC13 for ; Sun, 17 Aug 2008 07:04:41 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H74fNK064051 for ; Sun, 17 Aug 2008 07:04:41 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H74fhQ064049 for perforce@freebsd.org; Sun, 17 Aug 2008 07:04:41 GMT (envelope-from mayur@FreeBSD.org) Date: Sun, 17 Aug 2008 07:04:41 GMT Message-Id: <200808170704.m7H74fhQ064049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 147630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 07:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=147630 Change 147630 by mayur@mayur_freebsd_vm on 2008/08/17 07:04:37 benchmarking object of different sizes Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#5 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.h#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#5 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#5 (text+ko) ==== @@ -92,7 +92,8 @@ if(!SLIST_EMPTY(&res_rnodes_head)){ rnode = SLIST_FIRST(&res_rnodes_head); SLIST_REMOVE_HEAD(&res_rnodes_head, next); - bzero((void *)rnode, sizeof(struct radix_node)); + bzero((void *)rnode, sizeof(struct radix_node) + + sizeof(void *) * (MASK(rtree->rt_bits_per_level) + 1)); return rnode; } return NULL; @@ -174,6 +175,10 @@ /*just add a node at required height*/ while (index > max_index(rtree,rtree->rt_height)) rtree->rt_height++; + + /* this happens when index == 0*/ + if(rtree->rt_height == 0) + rtree->rt_height = 1; rnode = get_radix_node(rtree); if (rnode == NULL){ return (ENOMEM); @@ -311,8 +316,9 @@ if (level == 0){ val = tmp->rn_children[slot]; if (tmp->rn_children[slot] == NULL){ - printf("radix_tree_remove: index %d not present in the tree.\n", - index); + //printf("radix_tree_remove: index " + // " %d not present in the tree.\n", + // index); return NULL; } tmp->rn_children[slot] = NULL; @@ -483,11 +489,13 @@ void radix_tree_init(){ int i; char *mem = (char *)malloc(RESERVED_NODE_COUNT * - sizeof(struct radix_node)); + (sizeof(struct radix_node) + + sizeof(void *) * (MASK(4) + 1))); for(i = 0; i < RESERVED_NODE_COUNT; i++) { SLIST_INSERT_HEAD(&res_rnodes_head, (struct radix_node *)mem, next); - mem += sizeof(struct radix_node); + mem += (sizeof(struct radix_node) + + (sizeof(void *) * (MASK(4) + 1))); } } ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.h#3 (text+ko) ==== @@ -30,4 +30,5 @@ void *radix_tree_remove(rtidx_t index, struct radix_tree *rtree); void *radix_tree_lookup(rtidx_t index, struct radix_tree *rtree); void radix_tree_shrink(struct radix_tree *rtree); +void radix_tree_init(void); #endif ==== //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#5 (text+ko) ==== @@ -8,25 +8,24 @@ #define N 0xffff #define X 0xfff -extern -int main(void) -{ +void benchmark(int max_idx){ unsigned long long splay, radix; struct radix_tree *rtree; int i,j; int vals[N], lookups[N],inserts[N],removes[N]; unsigned long long t_start, t_end,t; - + + radix_tree_init(); rtree = create_radix_tree(4); for(i = 0; i < N; i++){ - vals[i] = random(); + vals[i] = random() % max_idx; /* about 50% are hits*/ - lookups[i] = ( i % 2 ? vals[i] : random()); - inserts[i] = random(); + lookups[i] = ( i % 2 ? vals[i] : (random() % max_idx)); + inserts[i] = random() % max_idx; } for(i = 0; i < X; i++){ - j = random(); + j = random() % max_idx; splay_insert(j); radix_tree_insert(j, rtree, &i); } @@ -80,3 +79,17 @@ printf("TSC difference after removes: %lld\n", (t_end - t_start)); } +extern +int main(void) +{ + int max_idx[] = {2, 16, 64, 256, 1024, 4096, 262144}; + int i; + + for(i = 0; i < 7; i++){ + printf("\n==== Benchmarking with max index = %d \n", + max_idx[i]); + benchmark(max_idx[i]); + } +} + + From owner-p4-projects@FreeBSD.ORG Sun Aug 17 07:19:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFD3D1065689; Sun, 17 Aug 2008 07:19:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 736CE1065674 for ; Sun, 17 Aug 2008 07:19:57 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CAEB8FC18 for ; Sun, 17 Aug 2008 07:19:57 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H7JvLQ065215 for ; Sun, 17 Aug 2008 07:19:57 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H7JvFY065213 for perforce@freebsd.org; Sun, 17 Aug 2008 07:19:57 GMT (envelope-from konrad@FreeBSD.org) Date: Sun, 17 Aug 2008 07:19:57 GMT Message-Id: <200808170719.m7H7JvFY065213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 07:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147631 Change 147631 by konrad@vspredator on 2008/08/17 07:19:40 Add a file which invokes sort with my libc and my collation data. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/invoke_sort.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 17 07:44:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4576A1065679; Sun, 17 Aug 2008 07:44:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E6B0106566C for ; Sun, 17 Aug 2008 07:44:22 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 683698FC12 for ; Sun, 17 Aug 2008 07:44:22 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H7iM3O067136 for ; Sun, 17 Aug 2008 07:44:22 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H7iMfl067134 for perforce@freebsd.org; Sun, 17 Aug 2008 07:44:22 GMT (envelope-from konrad@FreeBSD.org) Date: Sun, 17 Aug 2008 07:44:22 GMT Message-Id: <200808170744.m7H7iMfl067134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 07:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147633 Change 147633 by konrad@vspredator on 2008/08/17 07:44:16 Add real world test data for Greek supplied by Diomidis. Also, make invoke_sort.sh randomize the tested file. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/invoke_sort.sh#2 edit .. //depot/projects/soc2008/konrad_collation/test/native_tests/el_GR#1 add Differences ... ==== //depot/projects/soc2008/konrad_collation/test/invoke_sort.sh#2 (text+ko) ==== @@ -7,4 +7,4 @@ export PATH_LOCALE=../locale export LD_PRELOAD=../libc/libc.so.7 -sort < $1 +regression/randomize.pl < $1 | sort From owner-p4-projects@FreeBSD.ORG Sun Aug 17 10:34:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65219106567A; Sun, 17 Aug 2008 10:34:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28CDF106566C for ; Sun, 17 Aug 2008 10:34:14 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B00A8FC23 for ; Sun, 17 Aug 2008 10:34:14 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HAYDVo093111 for ; Sun, 17 Aug 2008 10:34:13 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HAYD9x093109 for perforce@freebsd.org; Sun, 17 Aug 2008 10:34:13 GMT (envelope-from trasz@freebsd.org) Date: Sun, 17 Aug 2008 10:34:13 GMT Message-Id: <200808171034.m7HAYD9x093109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 10:34:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=147636 Change 147636 by trasz@trasz_traszkan on 2008/08/17 10:33:56 Make UFS behave the same as ZFS (and UFS in SunOS) does when moving a subdirectory between two directories. Without this change, moving a/x/ to b/ requires write permission on a/, b/, _and_ a/x/. After this change, it requires only write permissions on a/ and b/. I guess this may be a little controversial. ;-) Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#15 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#15 (text+ko) ==== @@ -1164,19 +1164,14 @@ * If ".." must be changed (ie the directory gets a new * parent) then the source directory must not be in the * directory hierarchy above the target, as this would - * orphan everything below the source directory. Also - * the user must have write permission in the source so - * as to be able to change "..". We must repeat the call - * to namei, as the parent directory is unlocked by the - * call to checkpath(). + * orphan everything below the source directory. We must + * repeat the call to namei, as the parent directory + * is unlocked by the call to checkpath(). */ - error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_thread); VOP_UNLOCK(fvp, 0); if (oldparent != dp->i_number) newparent = dp->i_number; if (doingdirectory && newparent) { - if (error) /* write access check above */ - goto bad; if (xp != NULL) vput(tvp); error = ufs_checkpath(ip, dp, tcnp->cn_cred); From owner-p4-projects@FreeBSD.ORG Sun Aug 17 10:42:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2C65106567A; Sun, 17 Aug 2008 10:42:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96C121065677 for ; Sun, 17 Aug 2008 10:42:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E6688FC1B for ; Sun, 17 Aug 2008 10:42:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HAgMdJ093778 for ; Sun, 17 Aug 2008 10:42:22 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HAgMfb093776 for perforce@freebsd.org; Sun, 17 Aug 2008 10:42:22 GMT (envelope-from trasz@freebsd.org) Date: Sun, 17 Aug 2008 10:42:22 GMT Message-Id: <200808171042.m7HAgMfb093776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 10:42:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147637 Change 147637 by trasz@trasz_traszkan on 2008/08/17 10:41:48 Test for removing the directories. There are still a few cases where semantics is different than with files; I'm not sure why. I'll look into that later. These cases are marked with 'XXX'. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 17 10:47:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 225D61065672; Sun, 17 Aug 2008 10:47:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCBE5106564A for ; Sun, 17 Aug 2008 10:47:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B408C8FC1A for ; Sun, 17 Aug 2008 10:47:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HAlRAM094156 for ; Sun, 17 Aug 2008 10:47:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HAlRx9094154 for perforce@freebsd.org; Sun, 17 Aug 2008 10:47:27 GMT (envelope-from trasz@freebsd.org) Date: Sun, 17 Aug 2008 10:47:27 GMT Message-Id: <200808171047.m7HAlRx9094154@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 10:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=147638 Change 147638 by trasz@trasz_traszkan on 2008/08/17 10:47:07 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#43 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#43 (text+ko) ==== @@ -6,8 +6,6 @@ to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. -- Find out how _directory_ removal access checking works in ZFS. - - Make 'struct acl' variable size. - Benchmark things. From owner-p4-projects@FreeBSD.ORG Sun Aug 17 12:19:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D15EA106568D; Sun, 17 Aug 2008 12:19:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 952B01065680 for ; Sun, 17 Aug 2008 12:19:00 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80B388FC1B for ; Sun, 17 Aug 2008 12:19:00 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HCJ0mK004066 for ; Sun, 17 Aug 2008 12:19:00 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HCJ0QW004064 for perforce@freebsd.org; Sun, 17 Aug 2008 12:19:00 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 12:19:00 GMT Message-Id: <200808171219.m7HCJ0QW004064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 12:19:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147639 Change 147639 by bz@bz_dumpster on 2008/08/17 12:18:47 GC a dead global, more V_ Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#9 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#9 (text+ko) ==== @@ -4579,17 +4579,17 @@ printf("limited to %d packets/entry by default\n", verbose_limit); - error = init_tables(&layer3_chain); + error = init_tables(&V_layer3_chain); if (error) { IPFW_DYN_LOCK_DESTROY(); - IPFW_LOCK_DESTROY(&layer3_chain); + IPFW_LOCK_DESTROY(&V_layer3_chain); uma_zdestroy(ipfw_dyn_rule_zone); return (error); } ip_fw_ctl_ptr = ipfw_ctl; ip_fw_chk_ptr = ipfw_chk; callout_reset(&V_ipfw_timeout, hz, ipfw_tick, NULL); - LIST_INIT(&layer3_chain.nat); + LIST_INIT(&V_layer3_chain.nat); return (0); } @@ -4601,10 +4601,10 @@ ip_fw_chk_ptr = NULL; ip_fw_ctl_ptr = NULL; callout_drain(&V_ipfw_timeout); - IPFW_WLOCK(&layer3_chain); - flush_tables(&layer3_chain); - layer3_chain.reap = NULL; - free_chain(&layer3_chain, 1 /* kill default rule */); + IPFW_WLOCK(&V_layer3_chain); + flush_tables(&V_layer3_chain); + V_layer3_chain.reap = NULL; + free_chain(&V_layer3_chain, 1 /* kill default rule */); reap = V_layer3_chain.reap, V_layer3_chain.reap = NULL; IPFW_WUNLOCK(&V_layer3_chain); if (reap != NULL) ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#10 (text+ko) ==== @@ -210,7 +210,6 @@ #define V_key_blockacq_lifetime key_blockacq_lifetime #define V_key_cb key_cb #define V_key_debug_level key_debug_level -#define V_key_dst key_dst #define V_key_int_random key_int_random #define V_key_larval_lifetime key_larval_lifetime #define V_key_preferred_oldsa key_preferred_oldsa From owner-p4-projects@FreeBSD.ORG Sun Aug 17 13:01:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE0671065748; Sun, 17 Aug 2008 13:01:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9AC81065688 for ; Sun, 17 Aug 2008 13:01:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78A718FC1A for ; Sun, 17 Aug 2008 13:01:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HD1h6Z020031 for ; Sun, 17 Aug 2008 13:01:43 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HD1hNB020029 for perforce@freebsd.org; Sun, 17 Aug 2008 13:01:43 GMT (envelope-from trasz@freebsd.org) Date: Sun, 17 Aug 2008 13:01:43 GMT Message-Id: <200808171301.m7HD1hNB020029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 13:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147640 Change 147640 by trasz@trasz_traszkan on 2008/08/17 13:00:51 Add the ACL fuzzer. Isn't as useful as I hoped it would be, but hey, it's on the deliverables list. ;-) Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 17 13:40:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B1C01065674; Sun, 17 Aug 2008 13:40:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1933106567B for ; Sun, 17 Aug 2008 13:40:22 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8E2F8FC0C for ; Sun, 17 Aug 2008 13:40:22 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HDeMJP024287 for ; Sun, 17 Aug 2008 13:40:22 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HDeMdo024285 for perforce@freebsd.org; Sun, 17 Aug 2008 13:40:22 GMT (envelope-from brooks@freebsd.org) Date: Sun, 17 Aug 2008 13:40:22 GMT Message-Id: <200808171340.m7HDeMdo024285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 147643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 13:40:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147643 Change 147643 by brooks@brooks_coredump on 2008/08/17 13:39:26 Fix missing V_ for ifindex_table due to mis-intergrate. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#7 (text+ko) ==== @@ -171,7 +171,7 @@ struct ifnet *ifp; IFNET_RLOCK(); - ifp = ifindex_table[idx].ife_ifnet; + ifp = V_ifindex_table[idx].ife_ifnet; IFNET_RUNLOCK(); return (ifp); } @@ -182,7 +182,7 @@ IFNET_WLOCK_ASSERT(); - ifindex_table[idx].ife_ifnet = ifp; + V_ifindex_table[idx].ife_ifnet = ifp; } struct ifaddr * @@ -202,7 +202,7 @@ struct cdev *cdev; IFNET_RLOCK(); - cdev = ifindex_table[idx].ife_dev; + cdev = V_ifindex_table[idx].ife_dev; IFNET_RUNLOCK(); return (cdev); } @@ -212,7 +212,7 @@ { IFNET_WLOCK(); - ifindex_table[idx].ife_dev = cdev; + V_ifindex_table[idx].ife_dev = cdev; IFNET_WUNLOCK(); } From owner-p4-projects@FreeBSD.ORG Sun Aug 17 13:44:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170DE1065676; Sun, 17 Aug 2008 13:44:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6B961065674 for ; Sun, 17 Aug 2008 13:44:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DE548FC13 for ; Sun, 17 Aug 2008 13:44:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HDiRtF024588 for ; Sun, 17 Aug 2008 13:44:27 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HDiR0Z024586 for perforce@freebsd.org; Sun, 17 Aug 2008 13:44:27 GMT (envelope-from zec@tel.fer.hr) Date: Sun, 17 Aug 2008 13:44:27 GMT Message-Id: <200808171344.m7HDiR0Z024586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 13:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=147645 Change 147645 by zec@zec_tpx32 on 2008/08/17 13:44:00 A placeholder for writing down things to resolve before proceeding on further commit steps. Affected files ... .. //depot/projects/vimage-commit2/TODO#1 add .. //depot/projects/vimage/var_rename.tcl#2 edit Differences ... ==== //depot/projects/vimage/var_rename.tcl#2 (text+ko) ==== @@ -37,6 +37,10 @@ # containing macros which resolve V_ instances back to their original # counterparts (e.g. V_rt_tables -> rt_tables). # +# Alternatively, the script may be invoked in a hint-only mode, so that +# instead of actually modifying files it prints out lines where candidates +# for the V_-transformation might be found. +# # Best effort is made not to change any variable declarations nor field # names in structure declarations and / or C-style comments. The script # attempts to avoid changing structure names if they happen to have the @@ -44,7 +48,7 @@ # # Typically this script should be invoked as follows: # -# cat vimage_globals | xargs var_rename.tcl sys +# cat vimage_globals | xargs var_rename.tcl change sys # # Note that running the script over the entire sys tree can take a # significant amount of time to complete (longer than make buildworld). @@ -52,18 +56,25 @@ set vimage_h "vimage.h" -if { [llength $argv] < 2 } { - puts "usage: var_rename.tcl srcdir varname ..." +if { [llength $argv] < 3 || ([lindex $argv 0] != "hint" && + [lindex $argv 1] != "change")} { + puts "usage: var_rename.tcl hint|change srcdir varname ..." exit 1 } -set srcdir [lindex $argv 0] +if { [lindex $argv 0] == "change" } { + set change_mode 1 +} else { + set change_mode 0 +} + +set srcdir [lindex $argv 1] if { [catch { exec find $srcdir -type f } filelist] != 0 } { puts "Error: $filelist" exit 1 } -set items [lrange $argv 1 end] +set items [lrange $argv 2 end] set xitems "/* */ LIST_HEAD( TAILQ_HEAD( SYSCTL_ ) [lsort -decreasing [lrange $argv 1 end]]" # read the contents of the $vimage_h file @@ -73,13 +84,15 @@ close $f # reopen for writing and append missing #defines +if { $change_mode } { set f [open $vimage_h a] -foreach item $items { - if { [string first "#define V_$item $item" $data] == -1 } { - puts $f "#define V_$item $item" + foreach item $items { + if { [string first "#define V_$item $item" $data] == -1 } { + puts $f "#define V_$item $item" + } } + close $f } -close $f # walk the file list parsing each file and update it if necessary foreach fname $filelist { @@ -104,13 +117,15 @@ puts "Processing $fname" } - set f [open $fname w] - set first_line true + if { $change_mode } { + set f [open $fname w] + } + set changed false - set in_comment false set in_struct false set in_forbidden_macro false + set line_number 0 foreach line [split $data \n] { set pos 0 @@ -239,14 +254,23 @@ } } - if { $first_line == true } { - set first_line false + if { $change_mode } { + if { $line_number > 0 } { + puts $f "" + } + puts -nonewline $f "$line" } else { - puts $f "" + # hint only mode + if { $changed == true } { + puts "$line_number:$line" + set changed false + } } - puts -nonewline $f "$line" + incr line_number + } + if { $change_mode } { + close $f } - close $f # insert a #include line if the file was modified. if { $changed == true && $fextn == ".c" } { From owner-p4-projects@FreeBSD.ORG Sun Aug 17 13:48:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3BC81065675; Sun, 17 Aug 2008 13:48:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77FC81065672 for ; Sun, 17 Aug 2008 13:48:03 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id 0050C8FC19 for ; Sun, 17 Aug 2008 13:48:02 +0000 (UTC) (envelope-from zec@freebsd.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 5A1379B651; Sun, 17 Aug 2008 15:48:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from localhost (imunes.tel.fer.hr [161.53.19.8]) by xaqua.tel.fer.hr (Postfix) with ESMTP id E6B7D9B64F for ; Sun, 17 Aug 2008 15:47:59 +0200 (CEST) From: Marko Zec To: Perforce Change Reviews Date: Sun, 17 Aug 2008 14:47:51 +0200 User-Agent: KMail/1.9.7 References: <200808171344.m7HDiR0Z024586@repoman.freebsd.org> In-Reply-To: <200808171344.m7HDiR0Z024586@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200808171447.51397.zec@freebsd.org> Cc: Subject: Re: PERFORCE change 147645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 13:48:03 -0000 On Sunday 17 August 2008 15:44:27 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=147645 > > Change 147645 by zec@zec_tpx32 on 2008/08/17 13:44:00 > > A placeholder for writing down things to resolve before > proceeding on further commit steps. Oops, another change also leaked in here, aimed at allowing the variable renaming TCL script to be used in a hint-only mode -> the description how this is supposed to work is embedded in the var_rename.tcl file Marko > Affected files ... > > .. //depot/projects/vimage-commit2/TODO#1 add > .. //depot/projects/vimage/var_rename.tcl#2 edit > > Differences ... > > ==== //depot/projects/vimage/var_rename.tcl#2 (text+ko) ==== > > @@ -37,6 +37,10 @@ > # containing macros which resolve V_ instances back to their > original # counterparts (e.g. V_rt_tables -> rt_tables). > # > +# Alternatively, the script may be invoked in a hint-only mode, so > that +# instead of actually modifying files it prints out lines where > candidates +# for the V_-transformation might be found. > +# > # Best effort is made not to change any variable declarations nor > field # names in structure declarations and / or C-style comments. > The script # attempts to avoid changing structure names if they > happen to have the @@ -44,7 +48,7 @@ > # > # Typically this script should be invoked as follows: > # > -# cat vimage_globals | xargs var_rename.tcl sys > +# cat vimage_globals | xargs var_rename.tcl change sys > # > # Note that running the script over the entire sys tree can take a > # significant amount of time to complete (longer than make > buildworld). @@ -52,18 +56,25 @@ > > set vimage_h "vimage.h" > > -if { [llength $argv] < 2 } { > - puts "usage: var_rename.tcl srcdir varname ..." > +if { [llength $argv] < 3 || ([lindex $argv 0] != "hint" && > + [lindex $argv 1] != "change")} { > + puts "usage: var_rename.tcl hint|change srcdir varname ..." > exit 1 > } > > -set srcdir [lindex $argv 0] > +if { [lindex $argv 0] == "change" } { > + set change_mode 1 > +} else { > + set change_mode 0 > +} > + > +set srcdir [lindex $argv 1] > if { [catch { exec find $srcdir -type f } filelist] != 0 } { > puts "Error: $filelist" > exit 1 > } > > -set items [lrange $argv 1 end] > +set items [lrange $argv 2 end] > set xitems "/* */ LIST_HEAD( TAILQ_HEAD( SYSCTL_ ) [lsort > -decreasing [lrange $argv 1 end]]" > > # read the contents of the $vimage_h file > @@ -73,13 +84,15 @@ > close $f > > # reopen for writing and append missing #defines > +if { $change_mode } { > set f [open $vimage_h a] > -foreach item $items { > - if { [string first "#define V_$item $item" $data] == -1 } { > - puts $f "#define V_$item $item" > + foreach item $items { > + if { [string first "#define V_$item $item" $data] == -1 } { > + puts $f "#define V_$item $item" > + } > } > + close $f > } > -close $f > > # walk the file list parsing each file and update it if necessary > foreach fname $filelist { > @@ -104,13 +117,15 @@ > puts "Processing $fname" > } > > - set f [open $fname w] > - set first_line true > + if { $change_mode } { > + set f [open $fname w] > + } > + > set changed false > - > set in_comment false > set in_struct false > set in_forbidden_macro false > + set line_number 0 > > foreach line [split $data \n] { > set pos 0 > @@ -239,14 +254,23 @@ > } > } > > - if { $first_line == true } { > - set first_line false > + if { $change_mode } { > + if { $line_number > 0 } { > + puts $f "" > + } > + puts -nonewline $f "$line" > } else { > - puts $f "" > + # hint only mode > + if { $changed == true } { > + puts "$line_number:$line" > + set changed false > + } > } > - puts -nonewline $f "$line" > + incr line_number > + } > + if { $change_mode } { > + close $f > } > - close $f > > # insert a #include line if the file was > modified. if { $changed == true && $fextn == ".c" } { From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:01:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD5521065675; Sun, 17 Aug 2008 14:01:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A186E106566B for ; Sun, 17 Aug 2008 14:01:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87DBA8FC14 for ; Sun, 17 Aug 2008 14:01:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HE1jkN025949 for ; Sun, 17 Aug 2008 14:01:45 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HE1jgT025947 for perforce@freebsd.org; Sun, 17 Aug 2008 14:01:45 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 17 Aug 2008 14:01:45 GMT Message-Id: <200808171401.m7HE1jgT025947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147647 Change 147647 by ed@ed_dull on 2008/08/17 14:01:38 Biggest XXX ever: at least make the Xen console driver compile. Someone still has to test it. Affected files ... .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#3 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/xen/console/console.c#3 (text+ko) ==== @@ -32,9 +32,7 @@ static char driver_name[] = "xc"; devclass_t xc_devclass; /* do not make static */ -static void xcstart (struct tty *); -static int xcparam (struct tty *, struct termios *); -static void xcstop (struct tty *, int); +static void xcoutwakeup(struct tty *); static void xc_timeout(void *); static void __xencons_tx_flush(void); static boolean_t xcons_putc(int c); @@ -97,25 +95,17 @@ struct xc_softc { int xc_unit; - struct cdev *xc_dev; }; -static d_open_t xcopen; -static d_close_t xcclose; -static d_ioctl_t xcioctl; +static tsw_open_t xcopen; +static tsw_close_t xcclose; -static struct cdevsw xc_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_TTY | D_NEEDGIANT, - .d_name = driver_name, - .d_open = xcopen, - .d_close = xcclose, - .d_read = ttyread, - .d_write = ttywrite, - .d_ioctl = xcioctl, - .d_poll = ttypoll, - .d_kqfilter = ttykqfilter, +static struct ttydevsw xc_ttydevsw = { + .tsw_flags = TF_NOPREFIX, + .tsw_open = xcopen, + .tsw_close = xcclose, + .tsw_outwakeup = xcoutwakeup, }; static void @@ -241,16 +231,8 @@ xc_consdev.cn_putc = xccnputc_dom0; } - sc->xc_dev = make_dev(&xc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "xc%r", 0); - xccons = ttyalloc(); - - sc->xc_dev->si_drv1 = (void *)sc; - sc->xc_dev->si_tty = xccons; - - xccons->t_oproc = xcstart; - xccons->t_param = xcparam; - xccons->t_stop = xcstop; - xccons->t_dev = sc->xc_dev; + xccons = tty_alloc(&xc_ttydevsw, sc, NULL); + tty_makedev(xccons, NULL, "xc%r", 0); callout_init(&xc_callout, 0); @@ -294,11 +276,15 @@ { int i; struct tty *tp = xccons; - - for (i = 0; i < len; i++) { - if (xen_console_up) - (*linesw[tp->t_line]->l_rint)(buf[i], tp); - else + + if (xen_console_up) { + tty_lock(tp); + for (i = 0; i < len; i++) + ttydisc_rint(tp, buf[i], 0); + ttydisc_rint_done(tp); + tty_unlock(tp); + } else { + for (i = 0; i < len; i++) rbuf[RBUF_MASK(rp++)] = buf[i]; } } @@ -306,7 +292,7 @@ static void __xencons_tx_flush(void) { - int sz, work_done = 0; + int sz; CN_LOCK(cn_mtx); while (wc != wp) { @@ -323,16 +309,8 @@ break; wc += sent; } - work_done = 1; } CN_UNLOCK(cn_mtx); - - /* - * ttwakeup calls routines using blocking locks - * - */ - if (work_done && xen_console_up && curthread->td_critnest == 0) - ttwakeup(xccons); } void @@ -354,76 +332,19 @@ xencons_tx(); } -int -xcopen(struct cdev *dev, int flag, int mode, struct thread *td) +static int +xcopen(struct tty *tp) { - struct xc_softc *sc; - int unit = XCUNIT(dev); - struct tty *tp; - int s, error; - sc = (struct xc_softc *)device_get_softc( - devclass_get_device(xc_devclass, unit)); - if (sc == NULL) - return (ENXIO); - - tp = dev->si_tty; - s = spltty(); - if (!ISTTYOPEN(tp)) { - tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - xcparam(tp, &tp->t_termios); - ttsetwater(tp); - } else if (tp->t_state & TS_XCLUDE && priv_check(td, PRIV_ROOT)) { - splx(s); - return (EBUSY); - } - splx(s); - xen_console_up = 1; - - error = (*linesw[tp->t_line]->l_open)(dev, tp); - return error; -} - -int -xcclose(struct cdev *dev, int flag, int mode, struct thread *td) -{ - struct tty *tp = dev->si_tty; - - if (tp == NULL) - return (0); - xen_console_up = 0; - - spltty(); - (*linesw[tp->t_line]->l_close)(tp, flag); - tty_close(tp); - spl0(); return (0); } - -int -xcioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) +static void +xcclose(struct tty *tp) { - struct tty *tp = dev->si_tty; - int error; - - error = (*linesw[tp->t_line]->l_ioctl)(tp, cmd, data, flag, td); - if (error != ENOIOCTL) - return (error); - error = ttioctl(tp, cmd, data, flag); - - if (error != ENOIOCTL) - return (error); - - return (ENOTTY); + xen_console_up = 0; } static inline int @@ -438,31 +359,15 @@ static void -xcstart(struct tty *tp) +xcoutwakeup(struct tty *tp) { boolean_t cons_full = FALSE; + char c; - CN_LOCK(cn_mtx); - if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { - CN_UNLOCK(cn_mtx); + while (ttydisc_getc(tp, &c, 1) == 1 && !cons_full) + cons_full = xcons_putc(c); - ttwwakeup(tp); - return; - } - - tp->t_state |= TS_BUSY; - CN_UNLOCK(cn_mtx); - - while (tp->t_outq.c_cc != 0 && !cons_full) - cons_full = xcons_putc(getc(&tp->t_outq)); - - /* if the console is close to full leave our state as busy */ - if (!cons_full) { - CN_LOCK(cn_mtx); - tp->t_state &= ~TS_BUSY; - CN_UNLOCK(cn_mtx); - ttwwakeup(tp); - } else { + if (cons_full) { /* let the timeout kick us in a bit */ xc_start_needed = TRUE; } @@ -470,17 +375,6 @@ } static void -xcstop(struct tty *tp, int flag) -{ - - if (tp->t_state & TS_BUSY) { - if ((tp->t_state & TS_TTSTOP) == 0) { - tp->t_state |= TS_FLUSH; - } - } -} - -static void xc_timeout(void *v) { struct tty *tp; @@ -488,33 +382,19 @@ tp = (struct tty *)v; - while ((c = xccncheckc(NULL)) != -1) { - if (tp->t_state & TS_ISOPEN) { - (*linesw[tp->t_line]->l_rint)(c, tp); - } - } + tty_lock(tp); + while ((c = xccncheckc(NULL)) != -1) + ttydisc_rint(tp, c, 0); + tty_unlock(tp); if (xc_start_needed) { xc_start_needed = FALSE; - xcstart(tp); + xcoutwakeup(tp); } callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, tp); } -/* - * Set line parameters. - */ -int -xcparam(struct tty *tp, struct termios *t) -{ - tp->t_ispeed = t->c_ispeed; - tp->t_ospeed = t->c_ospeed; - tp->t_cflag = t->c_cflag; - return (0); -} - - static device_method_t xc_methods[] = { DEVMETHOD(device_identify, xc_identify), DEVMETHOD(device_probe, xc_probe), From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:05:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B3341065689; Sun, 17 Aug 2008 14:05:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8DF41065687 for ; Sun, 17 Aug 2008 14:05:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFC758FC21 for ; Sun, 17 Aug 2008 14:05:49 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HE5nO6027392 for ; Sun, 17 Aug 2008 14:05:49 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HE5nnR027390 for perforce@freebsd.org; Sun, 17 Aug 2008 14:05:49 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 17 Aug 2008 14:05:49 GMT Message-Id: <200808171405.m7HE5nnR027390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147648 Change 147648 by ed@ed_dull on 2008/08/17 14:04:51 Remove unused softc. Affected files ... .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#4 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/xen/console/console.c#4 (text+ko) ==== @@ -93,11 +93,6 @@ static struct tty *xccons; -struct xc_softc { - int xc_unit; -}; - - static tsw_open_t xcopen; static tsw_close_t xcclose; @@ -215,23 +210,18 @@ static int xc_probe(device_t dev) { - struct xc_softc *sc = (struct xc_softc *)device_get_softc(dev); - - sc->xc_unit = device_get_unit(dev); return (0); } static int xc_attach(device_t dev) { - struct xc_softc *sc = (struct xc_softc *)device_get_softc(dev); - if (xen_start_info->flags & SIF_INITDOMAIN) { xc_consdev.cn_putc = xccnputc_dom0; } - xccons = tty_alloc(&xc_ttydevsw, sc, NULL); + xccons = tty_alloc(&xc_ttydevsw, NULL, NULL); tty_makedev(xccons, NULL, "xc%r", 0); callout_init(&xc_callout, 0); @@ -405,7 +395,7 @@ static driver_t xc_driver = { driver_name, xc_methods, - sizeof(struct xc_softc), + 0, }; /*** Forcibly flush console data before dying. ***/ From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:06:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4909B1065671; Sun, 17 Aug 2008 14:06:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C7CF106564A for ; Sun, 17 Aug 2008 14:06:51 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5F3D8FC13 for ; Sun, 17 Aug 2008 14:06:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HE6okg027469 for ; Sun, 17 Aug 2008 14:06:50 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HE6oK3027467 for perforce@freebsd.org; Sun, 17 Aug 2008 14:06:50 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 17 Aug 2008 14:06:50 GMT Message-Id: <200808171406.m7HE6oK3027467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=147649 Change 147649 by ed@ed_dull on 2008/08/17 14:06:36 (Very small) IFC. Affected files ... .. //depot/projects/mpsafetty/share/man/man4/tcp.4#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/units/units.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/units/units.lib#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pw/pw_user.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/share/man/man4/tcp.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.59 2007/04/03 18:57:09 ru Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.60 2008/08/16 21:12:25 rpaulo Exp $ .\" -.Dd February 28, 2007 +.Dd August 16, 2008 .Dt TCP 4 .Os .Sh NAME @@ -514,6 +514,14 @@ .Dv FIN_WAIT_2 connections. Defaults to 60 seconds. +.It Va ecn.enable +Enable support for TCP Explicit Congestion Notification (ECN). +ECN allows a TCP sender to reduce the transmission rate in order to +avoid packet drops. +.It Va ecn.maxretries +Number of retries (SYN or SYN/ACK retransmits) before disabling ECN on a +specific connection. This is needed to help with connection establishment +when a broken firewall is in the network path. .El .Sh ERRORS A socket operation may fail with one of the following errors returned: @@ -568,6 +576,13 @@ .%T "Protection of BGP Sessions via the TCP MD5 Signature Option" .%O "RFC 2385" .Re +.Rs +.%A "K. Ramakrishnan" +.%A "S. Floyd" +.%A "D. Black" +.%T "The Addition of Explicit Congestion Notification (ECN) to IP" +.%O "RFC 3168" +.Re .Sh HISTORY The .Tn TCP ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); #include @@ -65,7 +65,7 @@ #endif /* !_KERNEL */ /* - * This is the default number of seconds we wait for devices to settle + * This is the default number of milliseconds we wait for devices to settle * after a SCSI bus reset. */ #ifndef SCSI_DELAY ==== //depot/projects/mpsafetty/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.51 2008/07/23 09:44:36 luoqi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.53 2008/08/16 21:51:54 imp Exp $"); /* * PCI:PCI bridge support. @@ -139,6 +139,8 @@ { struct pcib_softc *sc; uint8_t iolow; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); sc->dev = dev; @@ -148,6 +150,7 @@ */ sc->command = pci_read_config(dev, PCIR_COMMAND, 1); sc->domain = pci_get_domain(dev); + sc->pribus = pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->secstat = pci_read_config(dev, PCIR_SECSTAT_1, 2); @@ -155,6 +158,20 @@ sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); /* + * Setup sysctl reporting nodes + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->domain, 0, "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->pribus, 0, "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->secbus, 0, "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->subbus, 0, "Subordinate bus number"); + + /* * Determine current I/O decode. */ if (sc->command & PCIM_CMD_PORTEN) { @@ -447,7 +464,6 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ -#if 1 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -460,7 +476,6 @@ end = sc->pmemlimit; } } -#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/mpsafetty/sys/dev/pci/pcib_private.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.14 2008/08/16 20:18:40 imp Exp $ */ #ifndef __PCIB_PRIVATE_H__ @@ -48,9 +48,10 @@ #define PCIB_SUBTRACTIVE 0x1 #define PCIB_DISABLE_MSI 0x2 uint16_t command; /* command register */ - uint32_t domain; /* domain number */ - uint8_t secbus; /* secondary bus number */ - uint8_t subbus; /* subordinate bus number */ + u_int domain; /* domain number */ + u_int pribus; /* primary bus number */ + u_int secbus; /* secondary bus number */ + u_int subbus; /* subordinate bus number */ pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ ==== //depot/projects/mpsafetty/sys/i386/i386/swtch.s#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.156 2007/08/22 05:06:14 jkoshy Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.157 2008/08/16 21:38:46 kmacy Exp $ */ #include "opt_npx.h" @@ -88,7 +88,7 @@ movl 8(%esp),%ecx /* New thread */ movl TD_PCB(%ecx),%edx movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* set bit in new pm_active */ movl TD_PROC(%ecx),%eax movl P_VMSPACE(%eax), %ebx @@ -181,10 +181,10 @@ cmpl %eax,IdlePTD /* Kernel address space? */ #endif je sw0 - movl %cr3,%ebx /* The same address space? */ + READ_CR3(%ebx) /* The same address space? */ cmpl %ebx,%eax je sw0 - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* new address space */ movl %esi,%eax movl PCPU(CPUID),%esi SETOP %eax,TD_LOCK(%edi) /* Switchout td_lock */ @@ -211,6 +211,18 @@ SETOP %esi,TD_LOCK(%edi) /* Switchout td_lock */ sw1: BLOCK_SPIN(%ecx) +#ifdef XEN + pushl %eax + pushl %ecx + pushl %edx + call xen_handle_thread_switch + popl %edx + popl %ecx + popl %eax + /* + * XXX set IOPL + */ +#else /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. @@ -259,7 +271,7 @@ movl 12(%esi), %ebx movl %eax, 8(%edi) movl %ebx, 12(%edi) - +#endif /* Restore context. */ movl PCB_EBX(%edx),%ebx movl PCB_ESP(%edx),%esp @@ -285,7 +297,7 @@ movl _default_ldt,%eax cmpl PCPU(CURRENTLDT),%eax je 2f - lldt _default_ldt + LLDT(_default_ldt) movl %eax,PCPU(CURRENTLDT) jmp 2f 1: @@ -389,7 +401,7 @@ * parent's npx state for forks by forgetting to reload. */ pushfl - cli + CLI movl PCPU(FPCURTHREAD),%eax testl %eax,%eax je 1f ==== //depot/projects/mpsafetty/sys/kern/vfs_cache.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.122 2008/07/31 16:57:41 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.123 2008/08/16 21:48:10 alfred Exp $"); #include #include @@ -199,10 +199,12 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { + CACHE_LOCK(); count = 0; LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); error = SYSCTL_OUT(req, &count, sizeof(count)); if (error) return (error); @@ -231,9 +233,11 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { count = 0; + CACHE_LOCK(); LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); if (count) used++; if (maxlength < count) ==== //depot/projects/mpsafetty/sys/net/if_bridge.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.114 2008/07/03 15:58:30 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.115 2008/08/16 23:59:17 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -166,10 +166,6 @@ * List of capabilities to possibly mask on the member interface. */ #define BRIDGE_IFCAPS_MASK (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM) -/* - * List of capabilities to disable on the member interface. - */ -#define BRIDGE_IFCAPS_STRIP IFCAP_LRO /* * Bridge interface list entry. @@ -798,10 +794,15 @@ LIST_FOREACH(bif, &sc->sc_iflist, bif_next) { enabled = bif->bif_ifp->if_capenable; - enabled &= ~BRIDGE_IFCAPS_STRIP; /* strip off mask bits and enable them again if allowed */ enabled &= ~BRIDGE_IFCAPS_MASK; enabled |= mask; + /* + * Receive offload can only be enabled if all members also + * support send offload. + */ + if ((enabled & IFCAP_TSO) == 0) + enabled &= ~IFCAP_LRO; bridge_set_ifcap(sc, bif, enabled); } ==== //depot/projects/mpsafetty/usr.bin/units/units.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.bin/units/units.c,v 1.10 2002/07/28 16:23:28 dwmalone Exp $"; + "$FreeBSD: src/usr.bin/units/units.c,v 1.11 2008/08/16 16:27:41 dwmalone Exp $"; #endif /* not lint */ #include @@ -53,6 +53,8 @@ char *numerator[MAXSUBUNITS]; char *denominator[MAXSUBUNITS]; double factor; + double offset; + int quantity; }; struct { @@ -78,7 +80,7 @@ int addsubunit(char *product[], char *toadd); void showunit(struct unittype * theunit); void zeroerror(void); -int addunit(struct unittype * theunit, char *toadd, int flip); +int addunit(struct unittype *theunit, char *toadd, int flip, int quantity); int compare(const void *item1, const void *item2); void sortunit(struct unittype * theunit); void cancelunit(struct unittype * theunit); @@ -207,8 +209,10 @@ void initializeunit(struct unittype * theunit) { + theunit->numerator[0] = theunit->denominator[0] = NULL; theunit->factor = 1.0; - theunit->numerator[0] = theunit->denominator[0] = NULL; + theunit->offset = 0.0; + theunit->quantity = 0; } @@ -237,6 +241,8 @@ int counter = 1; printf("\t%.8g", theunit->factor); + if (theunit->offset) + printf("&%.8g", theunit->offset); for (ptr = theunit->numerator; *ptr; ptr++) { if (ptr > theunit->numerator && **ptr && !strcmp(*ptr, *(ptr - 1))) @@ -284,16 +290,17 @@ /* Adds the specified string to the unit. Flip is 0 for adding normally, 1 for adding reciprocal. + Quantity is 1 if this is a quantity to be converted rather than a pure unit. Returns 0 for successful addition, nonzero on error. */ int -addunit(struct unittype * theunit, char *toadd, int flip) +addunit(struct unittype * theunit, char *toadd, int flip, int quantity) { char *scratch, *savescr; char *item; - char *divider, *slash; + char *divider, *slash, *offset; int doingtop; if (!strlen(toadd)) @@ -313,7 +320,17 @@ item = strtok(scratch, " *\t\n/"); while (item) { if (strchr("0123456789.", *item)) { /* item is a number */ - double num; + double num, offsetnum; + + if (quantity) + theunit->quantity = 1; + + offset = strchr(item, '&'); + if (offset) { + *offset = 0; + offsetnum = atof(offset+1); + } else + offsetnum = 0.0; divider = strchr(item, '|'); if (divider) { @@ -323,19 +340,25 @@ zeroerror(); return 1; } - if (doingtop ^ flip) + if (doingtop ^ flip) { theunit->factor *= num; - else + theunit->offset *= num; + } else { theunit->factor /= num; + theunit->offset /= num; + } num = atof(divider + 1); if (!num) { zeroerror(); return 1; } - if (doingtop ^ flip) + if (doingtop ^ flip) { theunit->factor /= num; - else + theunit->offset /= num; + } else { theunit->factor *= num; + theunit->offset *= num; + } } else { num = atof(item); @@ -343,12 +366,16 @@ zeroerror(); return 1; } - if (doingtop ^ flip) + if (doingtop ^ flip) { theunit->factor *= num; - else + theunit->offset *= num; + } else { theunit->factor /= num; - + theunit->offset /= num; + } } + if (doingtop ^ flip) + theunit->offset += offsetnum; } else { /* item is not a number */ int repeat = 1; @@ -534,7 +561,7 @@ free(*product); *product = NULLUNIT; } - if (addunit(theunit, toadd, flip)) + if (addunit(theunit, toadd, flip, 0)) return ERROR; } } @@ -613,6 +640,20 @@ showunit(have); showunit(want); } + else if (have->offset != want->offset) { + if (want->quantity) + printf("WARNING: conversion of non-proportional quantities.\n"); + printf("\t"); + if (have->quantity) + printf("%.8g\n", + (have->factor + have->offset-want->offset)/want->factor); + else + printf(" (-> x*%.8g %+.8g)\n\t (<- y*%.8g %+.8g)\n", + have->factor / want->factor, + (have->offset-want->offset)/want->factor, + want->factor / have->factor, + (want->offset - have->offset)/have->factor); + } else printf("\t* %.8g\n\t/ %.8g\n", have->factor / want->factor, want->factor / have->factor); @@ -666,10 +707,10 @@ strlcpy(havestr, argv[optind], sizeof(havestr)); strlcpy(wantstr, argv[optind + 1], sizeof(wantstr)); initializeunit(&have); - addunit(&have, havestr, 0); + addunit(&have, havestr, 0, 1); completereduce(&have); initializeunit(&want); - addunit(&want, wantstr, 0); + addunit(&want, wantstr, 0, 1); completereduce(&want); showanswer(&have, &want); } @@ -687,7 +728,7 @@ putchar('\n'); exit(0); } - } while (addunit(&have, havestr, 0) || + } while (addunit(&have, havestr, 0, 1) || completereduce(&have)); do { initializeunit(&want); @@ -698,7 +739,7 @@ putchar('\n'); exit(0); } - } while (addunit(&want, wantstr, 0) || + } while (addunit(&want, wantstr, 0, 1) || completereduce(&want)); showanswer(&have, &want); } ==== //depot/projects/mpsafetty/usr.bin/units/units.lib#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/ $FreeBSD: src/usr.bin/units/units.lib,v 1.18 2008/08/07 05:35:01 edwin Exp $ +/ $FreeBSD: src/usr.bin/units/units.lib,v 1.19 2008/08/16 16:27:41 dwmalone Exp $ / primitive units @@ -671,14 +671,14 @@ k 1.38047e-16 erg/degC -degC K +degC 1&+273.15 K kelvin K brewster 1e-12 m2/newton -degF 5|9 degC -degreesrankine degF +degF 5|9&255.37222222222222222222 K +degreesrankine 5|9 K degrankine degreesrankine -degreerankine degF -degreaumur 10|8 degC +degreerankine degreesrankine +degreaumur 10|8&+273.15 K drachm 60 grain poncelet 100 kg m g / sec denier .05|450 gram / m ==== //depot/projects/mpsafetty/usr.sbin/pw/pw_user.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.62 2008/05/27 19:04:31 antoine Exp $"; + "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.63 2008/08/16 15:41:03 ache Exp $"; #endif /* not lint */ #include @@ -43,9 +43,6 @@ #include #include #include -#if defined(USE_MD5RAND) -#include -#endif #include "pw.h" #include "bitmap.h" @@ -1045,74 +1042,24 @@ * Calculate a salt value */ for (i = 0; i < SALTSIZE; i++) - salt[i] = chars[arc4random() % (sizeof(chars) - 1)]; + salt[i] = chars[arc4random_uniform(sizeof(chars) - 1)]; salt[SALTSIZE] = '\0'; return strcpy(buf, crypt(password, salt)); } -#if defined(USE_MD5RAND) -u_char * -pw_getrand(u_char *buf, int len) /* cryptographically secure rng */ -{ - int i; - for (i=0;i> 24) ^ (val >> 16) ^ (val >> 8) ^ val); - } - return buf; -} - -#endif - static char * pw_password(struct userconf * cnf, struct cargs * args, char const * user) { int i, l; char pwbuf[32]; - u_char rndbuf[sizeof pwbuf]; switch (cnf->default_password) { case -1: /* Random password */ l = (arc4random() % 8 + 8); /* 8 - 16 chars */ - pw_getrand(rndbuf, l); for (i = 0; i < l; i++) - pwbuf[i] = chars[rndbuf[i] % (sizeof(chars)-1)]; + pwbuf[i] = chars[arc4random_uniform(sizeof(chars)-1)]; pwbuf[i] = '\0'; /* From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:18:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C68C3106567E; Sun, 17 Aug 2008 14:18:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89992106567A for ; Sun, 17 Aug 2008 14:18:02 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E48B8FC1A for ; Sun, 17 Aug 2008 14:18:02 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HEI2o6028808 for ; Sun, 17 Aug 2008 14:18:02 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HEI2Ak028806 for perforce@freebsd.org; Sun, 17 Aug 2008 14:18:02 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 14:18:02 GMT Message-Id: <200808171418.m7HEI2Ak028806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147650 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=147650 Change 147650 by bz@bz_dumpster on 2008/08/17 14:17:03 more V_ we are very close now... Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 (text+ko) ==== @@ -293,8 +293,8 @@ /* Sendbuffer is in units of 32KB. */ - if (tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) - req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15)); + if (V_tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) + req->param |= htonl(V_TX_SNDBUF(V_tcp_autosndbuf_max >> 15)); else { req->param |= htonl(V_TX_SNDBUF(snd->sb_hiwat >> 15)); } @@ -1215,7 +1215,7 @@ if (space > MAX_RCV_WND) space = MAX_RCV_WND; - if (tcp_do_rfc1323) + if (V_tcp_do_rfc1323) for (; space > 65535 && wscale < 14; space >>= 1, ++wscale) ; return (wscale); @@ -1234,8 +1234,8 @@ rcv = so_sockbuf_rcv(so); - if (tcp_do_autorcvbuf) - wnd = tcp_autorcvbuf_max; + if (V_tcp_do_autorcvbuf) + wnd = V_tcp_autorcvbuf_max; else wnd = rcv->sb_hiwat; @@ -3821,7 +3821,7 @@ #endif toep->tp_state = tp->t_state; - tcpstat.tcps_connects++; + V_tcpstat.tcps_connects++; } ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#8 (text+ko) ==== @@ -1260,13 +1260,13 @@ { struct inpcb *inp; - INP_INFO_RLOCK(&tcbinfo); + INP_INFO_RLOCK(&V_tcbinfo); LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) { INP_WLOCK(inp); func(inp, arg); INP_WUNLOCK(inp); } - INP_INFO_RUNLOCK(&tcbinfo); + INP_INFO_RUNLOCK(&V_tcbinfo); } struct socket * ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#10 (text+ko) ==== @@ -4569,15 +4569,15 @@ V_fw_verbose = 1; #endif #ifdef IPFIREWALL_VERBOSE_LIMIT - verbose_limit = IPFIREWALL_VERBOSE_LIMIT; + V_verbose_limit = IPFIREWALL_VERBOSE_LIMIT; #endif if (V_fw_verbose == 0) printf("disabled\n"); - else if (verbose_limit == 0) + else if (V_verbose_limit == 0) printf("unlimited\n"); else printf("limited to %d packets/entry by default\n", - verbose_limit); + V_verbose_limit); error = init_tables(&V_layer3_chain); if (error) { ==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#8 (text+ko) ==== @@ -253,7 +253,7 @@ last = NULL; hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr, ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask); - INP_INFO_RLOCK(&ripcbinfo); + INP_INFO_RLOCK(&V_ripcbinfo); LIST_FOREACH(inp, &V_ripcbinfo.ipi_hashbase[hash], inp_hash) { if (inp->inp_ip_p != proto) continue; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#5 (text+ko) ==== @@ -555,7 +555,7 @@ else hc_entry->rmx_bandwidth = (hc_entry->rmx_bandwidth + hcml->rmx_bandwidth) / 2; - /* tcpstat.tcps_cachedbandwidth++; */ + /* V_tcpstat.tcps_cachedbandwidth++; */ } if (hcml->rmx_cwnd != 0) { if (hc_entry->rmx_cwnd == 0) @@ -563,7 +563,7 @@ else hc_entry->rmx_cwnd = (hc_entry->rmx_cwnd + hcml->rmx_cwnd) / 2; - /* tcpstat.tcps_cachedcwnd++; */ + /* V_tcpstat.tcps_cachedcwnd++; */ } if (hcml->rmx_sendpipe != 0) { if (hc_entry->rmx_sendpipe == 0) @@ -571,7 +571,7 @@ else hc_entry->rmx_sendpipe = (hc_entry->rmx_sendpipe + hcml->rmx_sendpipe) /2; - /* tcpstat.tcps_cachedsendpipe++; */ + /* V_tcpstat.tcps_cachedsendpipe++; */ } if (hcml->rmx_recvpipe != 0) { if (hc_entry->rmx_recvpipe == 0) @@ -579,7 +579,7 @@ else hc_entry->rmx_recvpipe = (hc_entry->rmx_recvpipe + hcml->rmx_recvpipe) /2; - /* tcpstat.tcps_cachedrecvpipe++; */ + /* V_tcpstat.tcps_cachedrecvpipe++; */ } TAILQ_REMOVE(&hc_entry->rmx_head->hch_bucket, hc_entry, rmx_q); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#7 (text+ko) ==== @@ -952,13 +952,13 @@ switch (iptos & IPTOS_ECN_MASK) { case IPTOS_ECN_CE: tp->t_flags |= TF_ECN_SND_ECE; - tcpstat.tcps_ecn_ce++; + V_tcpstat.tcps_ecn_ce++; break; case IPTOS_ECN_ECT0: - tcpstat.tcps_ecn_ect0++; + V_tcpstat.tcps_ecn_ect0++; break; case IPTOS_ECN_ECT1: - tcpstat.tcps_ecn_ect1++; + V_tcpstat.tcps_ecn_ect1++; break; } @@ -971,7 +971,7 @@ */ if ((thflags & TH_ECE) && SEQ_LEQ(th->th_ack, tp->snd_recover)) { - tcpstat.tcps_ecn_rcwnd++; + V_tcpstat.tcps_ecn_rcwnd++; tcp_congestion_exp(tp); } } @@ -1370,7 +1370,7 @@ if ((thflags & TH_ECE) && V_tcp_do_ecn) { tp->t_flags |= TF_ECN_PERMIT; - tcpstat.tcps_ecn_shs++; + V_tcpstat.tcps_ecn_shs++; } /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#3 (text+ko) ==== @@ -102,20 +102,20 @@ tcp_offload_twstart(struct tcpcb *tp) { - INP_INFO_WLOCK(&tcbinfo); + INP_INFO_WLOCK(&V_tcbinfo); INP_WLOCK(tp->t_inpcb); tcp_twstart(tp); - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&V_tcbinfo); } struct tcpcb * tcp_offload_close(struct tcpcb *tp) { - INP_INFO_WLOCK(&tcbinfo); + INP_INFO_WLOCK(&V_tcbinfo); INP_WLOCK(tp->t_inpcb); tp = tcp_close(tp); - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&V_tcbinfo); if (tp) INP_WUNLOCK(tp->t_inpcb); @@ -126,10 +126,10 @@ tcp_offload_drop(struct tcpcb *tp, int error) { - INP_INFO_WLOCK(&tcbinfo); + INP_INFO_WLOCK(&V_tcbinfo); INP_WLOCK(tp->t_inpcb); tp = tcp_drop(tp, error); - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&V_tcbinfo); if (tp) INP_WUNLOCK(tp->t_inpcb); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#8 (text+ko) ==== @@ -906,7 +906,7 @@ else #endif ip->ip_tos |= IPTOS_ECN_ECT0; - tcpstat.tcps_ecn_ect0++; + V_tcpstat.tcps_ecn_ect0++; } /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#10 (text+ko) ==== @@ -450,7 +450,7 @@ } (void) syncache_respond(sc); - tcpstat.tcps_sc_retransmitted++; + V_tcpstat.tcps_sc_retransmitted++; syncache_timeout(sc, sch, 0); } if (!TAILQ_EMPTY(&(sch)->sch_bucket)) @@ -544,7 +544,7 @@ log(LOG_DEBUG, "%s; %s: Spurious RST without matching " "syncache entry (possibly syncookie only), " "segment ignored\n", s, __func__); - tcpstat.tcps_badrst++; + V_tcpstat.tcps_badrst++; goto done; } @@ -574,7 +574,7 @@ log(LOG_DEBUG, "%s; %s: RST with invalid SEQ %u != " "IRS %u (+WND %u), segment ignored\n", s, __func__, th->th_seq, sc->sc_irs, sc->sc_wnd); - tcpstat.tcps_badrst++; + V_tcpstat.tcps_badrst++; } done: @@ -969,9 +969,9 @@ { int rc; - INP_INFO_WLOCK(&tcbinfo); + INP_INFO_WLOCK(&V_tcbinfo); rc = syncache_expand(inc, to, th, lsop, m); - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&V_tcbinfo); return (rc); } @@ -1377,7 +1377,7 @@ if (sc->sc_flags & SCF_ECN) { th->th_flags |= TH_ECE; - tcpstat.tcps_ecn_shs++; + V_tcpstat.tcps_ecn_shs++; } /* Tack on the TCP options. */ ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#11 (text+ko) ==== @@ -544,7 +544,7 @@ * Check the minimum TTL for socket. */ INP_RLOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); + INP_INFO_RUNLOCK(&V_udbinfo); if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) { INP_RUNLOCK(inp); goto badunlocked; @@ -892,7 +892,7 @@ laddr = inp->inp_laddr; lport = inp->inp_lport; if (src.sin_family == AF_INET) { - INP_INFO_LOCK_ASSERT(&udbinfo); + INP_INFO_LOCK_ASSERT(&V_udbinfo); if ((lport == 0) || (laddr.s_addr == INADDR_ANY && src.sin_addr.s_addr == INADDR_ANY)) { @@ -943,7 +943,7 @@ inp->inp_lport == 0 || sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_BROADCAST) { - INP_INFO_LOCK_ASSERT(&udbinfo); + INP_INFO_LOCK_ASSERT(&V_udbinfo); error = in_pcbconnect_setup(inp, addr, &laddr.s_addr, &lport, &faddr.s_addr, &fport, NULL, td->td_ucred); @@ -957,7 +957,7 @@ /* Commit the local port if newly assigned. */ if (inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0) { - INP_INFO_WLOCK_ASSERT(&udbinfo); + INP_INFO_WLOCK_ASSERT(&V_udbinfo); INP_WLOCK_ASSERT(inp); /* * Remember addr if jailed, to prevent ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#9 (text+ko) ==== @@ -1974,7 +1974,7 @@ } last = in6p; } - INP_INFO_RUNLOCK(&ripcbinfo); + INP_INFO_RUNLOCK(&V_ripcbinfo); if (last) { if (last->in6p_flags & IN6P_CONTROLOPTS) ip6_savecontrol(last, m, &opts); ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#6 (text+ko) ==== @@ -443,7 +443,7 @@ switch (ln->ln_state) { case ND6_LLINFO_INCOMPLETE: - if (ln->ln_asked < nd6_mmaxtries) { + if (ln->ln_asked < V_nd6_mmaxtries) { ln->ln_asked++; nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000); nd6_ns_output(ifp, NULL, dst, ln, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#7 (text+ko) ==== @@ -210,7 +210,7 @@ } last = in6p; } - INP_INFO_RUNLOCK(&ripcbinfo); + INP_INFO_RUNLOCK(&V_ripcbinfo); #ifdef IPSEC /* * Check AH/ESP integrity. ==== //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#6 (text+ko) ==== @@ -345,7 +345,7 @@ return (IPPROTO_DONE); } INP_RLOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); + INP_INFO_RUNLOCK(&V_udbinfo); udp6_append(inp, m, off, &fromsa); INP_RUNLOCK(inp); return (IPPROTO_DONE); From owner-p4-projects@FreeBSD.ORG Sun Aug 17 14:24:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19B5B1065673; Sun, 17 Aug 2008 14:24:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D152D1065671 for ; Sun, 17 Aug 2008 14:24:08 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6F778FC08 for ; Sun, 17 Aug 2008 14:24:08 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HEO89l029297 for ; Sun, 17 Aug 2008 14:24:08 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HEO8r8029295 for perforce@freebsd.org; Sun, 17 Aug 2008 14:24:08 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 14:24:08 GMT Message-Id: <200808171424.m7HEO8r8029295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 14:24:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=147651 Change 147651 by bz@bz_dumpster on 2008/08/17 14:23:49 V_ification of udp_blackhole Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#12 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#2 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#11 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#12 (text+ko) ==== @@ -321,7 +321,7 @@ * Save a copy of the IP header in case we want restore it for * sending an ICMP error message in response. */ - if (!udp_blackhole) + if (!V_udp_blackhole) save_ip = *ip; else memset(&save_ip, 0, sizeof(save_ip)); @@ -529,7 +529,7 @@ V_udpstat.udps_noportbcast++; goto badheadlocked; } - if (udp_blackhole) + if (V_udp_blackhole) goto badheadlocked; if (badport_bandlim(BANDLIM_ICMP_UNREACH) < 0) goto badheadlocked; ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#7 (text+ko) ==== @@ -337,7 +337,7 @@ goto badheadlocked; } INP_INFO_RUNLOCK(&V_udbinfo); - if (udp_blackhole) + if (V_udp_blackhole) goto badunlocked; if (badport_bandlim(BANDLIM_ICMP6_UNREACH) < 0) goto badunlocked; ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#11 (text+ko) ==== @@ -334,6 +334,7 @@ #define V_twq_2msl twq_2msl #define V_udb udb #define V_udbinfo udbinfo +#define V_udp_blackhole udp_blackhole #define V_udp6_recvspace udp6_recvspace #define V_udp6_sendspace udp6_sendspace #define V_udpstat udpstat From owner-p4-projects@FreeBSD.ORG Sun Aug 17 15:01:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D64FA1065676; Sun, 17 Aug 2008 15:01:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96FA21065671 for ; Sun, 17 Aug 2008 15:01:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 612A48FC08 for ; Sun, 17 Aug 2008 15:01:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HF1mFs032271 for ; Sun, 17 Aug 2008 15:01:48 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HF1mEK032269 for perforce@freebsd.org; Sun, 17 Aug 2008 15:01:48 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 15:01:48 GMT Message-Id: <200808171501.m7HF1mEK032269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 15:01:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147652 Change 147652 by bz@bz_dumpster on 2008/08/17 15:01:01 include sys/vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Aug 17 15:03:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C8271065674; Sun, 17 Aug 2008 15:03:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C506D106564A for ; Sun, 17 Aug 2008 15:03:50 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3D68FC08 for ; Sun, 17 Aug 2008 15:03:50 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HF3o00033548 for ; Sun, 17 Aug 2008 15:03:50 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HF3oip033546 for perforce@freebsd.org; Sun, 17 Aug 2008 15:03:50 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 15:03:50 GMT Message-Id: <200808171503.m7HF3oip033546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 15:03:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=147653 Change 147653 by bz@bz_dumpster on 2008/08/17 15:03:36 Implicitly include sys/vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#4 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Aug 17 15:57:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BE961065676; Sun, 17 Aug 2008 15:57:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F5E1106564A for ; Sun, 17 Aug 2008 15:57:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18A7B8FC20 for ; Sun, 17 Aug 2008 15:57:45 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HFvjW3037750 for ; Sun, 17 Aug 2008 15:57:45 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HFviLT037748 for perforce@freebsd.org; Sun, 17 Aug 2008 15:57:44 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 17 Aug 2008 15:57:44 GMT Message-Id: <200808171557.m7HFviLT037748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 15:57:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=147654 Change 147654 by ed@ed_dull on 2008/08/17 15:57:40 Small whitespace issue pointed out by attilio. Thanks! Affected files ... .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/xen/console/console.c#5 (text+ko) ==== @@ -210,6 +210,7 @@ static int xc_probe(device_t dev) { + return (0); } From owner-p4-projects@FreeBSD.ORG Sun Aug 17 16:55:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D22E61065675; Sun, 17 Aug 2008 16:55:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 969401065671 for ; Sun, 17 Aug 2008 16:55:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63C408FC0A for ; Sun, 17 Aug 2008 16:55:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HGtitC055659 for ; Sun, 17 Aug 2008 16:55:44 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HGtiZP055655 for perforce@freebsd.org; Sun, 17 Aug 2008 16:55:44 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 16:55:44 GMT Message-Id: <200808171655.m7HGtiZP055655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 16:55:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=147656 Change 147656 by bz@bz_dumpster on 2008/08/17 16:55:27 remove the include for now Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #endif #include #include -#include #if defined (__OpenBSD__) #include From owner-p4-projects@FreeBSD.ORG Sun Aug 17 16:59:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12BC3106567E; Sun, 17 Aug 2008 16:59:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA99A1065679 for ; Sun, 17 Aug 2008 16:59:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 988EB8FC1B for ; Sun, 17 Aug 2008 16:59:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HGxmNJ055911 for ; Sun, 17 Aug 2008 16:59:48 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HGxmi4055909 for perforce@freebsd.org; Sun, 17 Aug 2008 16:59:48 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 16:59:48 GMT Message-Id: <200808171659.m7HGxmi4055909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 16:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147657 Change 147657 by bz@bz_dumpster on 2008/08/17 16:58:59 put it back, we indirectly need it Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#6 (text+ko) ==== @@ -48,6 +48,7 @@ #endif #include #include +#include #if defined (__OpenBSD__) #include From owner-p4-projects@FreeBSD.ORG Sun Aug 17 20:24:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F056C1065684; Sun, 17 Aug 2008 20:24:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2F931065678 for ; Sun, 17 Aug 2008 20:24:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D75E8FC15 for ; Sun, 17 Aug 2008 20:24:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HKOJdO076486 for ; Sun, 17 Aug 2008 20:24:19 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HKOJTQ076484 for perforce@freebsd.org; Sun, 17 Aug 2008 20:24:19 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 17 Aug 2008 20:24:19 GMT Message-Id: <200808172024.m7HKOJTQ076484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 20:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147669 Change 147669 by pgj@disznohal on 2008/08/17 20:23:40 MFen: 1.106 -> 1.107 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.180 -> 1.183 hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml 1.100 -> 1.101 hu_HU.ISO8859-2/share/sgml/freebsd.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -6248,6 +6248,21 @@ &prompt.root; smbpasswd -a felhasználónév + + A Samba a 3.0.23c + verziójától kezdõdõen a + hitelesítéshez szükséges + állományokat a /usr/local/etc/samba + könyvtárban tárolja. A + felhasználói hozzáférések + hozzáadására innentõl már a + tdbsam parancs használata + javasolt: + + &prompt.root; pdbedit felhasználónév + + A hivatalos Samba HOGYAN ezekrõl a @@ -6323,7 +6338,7 @@ &prompt.root; /usr/local/etc/rc.d/samba stop A Samba egy összetett - szoftercsomag, amely a µsoft.windows; + szoftvercsomag, amely a µsoft.windows; hálózatokkal kapcsolatos széles körû együttmûködést tesz lehetõvé. Az általa felkínált ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -475,8 +475,8 @@ sorban folytatódik. A ppp.conf állományban bármelyik parancs, - ahol a \ karakterrel zárjuk a - sort, az ugyanígy folytatható a + ahol a \ karakterrel zárjuk + a sort, az ugyanígy folytatható a következõben. @@ -529,7 +529,8 @@ bejegyzés. Ezt késõbb akár ki is cserélhetjük az internet-szolgáltatónk nevére, - így a + így a beállítással tudjuk majd beindítani a kapcsolatot. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#5 (text+ko) ==== @@ -12,7 +12,7 @@ - - + + [ OK ]"> From owner-p4-projects@FreeBSD.ORG Sun Aug 17 20:44:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C9631065677; Sun, 17 Aug 2008 20:44:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40B5E1065674 for ; Sun, 17 Aug 2008 20:44:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B0238FC17 for ; Sun, 17 Aug 2008 20:44:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HKieRF078102 for ; Sun, 17 Aug 2008 20:44:40 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HKieAU078100 for perforce@freebsd.org; Sun, 17 Aug 2008 20:44:40 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 17 Aug 2008 20:44:40 GMT Message-Id: <200808172044.m7HKieAU078100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 20:44:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=147671 Change 147671 by pgj@disznohal on 2008/08/17 20:43:57 MFen: 1.14 -> 1.15 hu/docproj/who.sgml 1.112 -> 1.113 hu/search/search.sgml 1.90 -> 1.91 hu/search/web.atoz Affected files ... .. //depot/projects/docproj_hu/www/hu/docproj/who.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/search/search.sgml#10 edit .. //depot/projects/docproj_hu/www/hu/search/web.atoz#9 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docproj/who.sgml#8 (text+ko) ==== @@ -10,7 +10,7 @@ @@ -30,7 +30,7 @@ href="&enbase;/doc/en/articles/contributors/staff-committers.html">itt, a &os; Dokumentációs Projekt fontosabb tagjainak listáját pedig itt + href="&enbase;/administration.html#t-doceng">itt tekinthetjük meg.

Mások jogosultságok nélkül is ==== //depot/projects/docproj_hu/www/hu/search/search.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -95,7 +95,7 @@ márciusától tartalmazza a leveleket).

A &os; levelezési listáit (ahogyan sok egyebet is) a - GeoCrawler is + MarkMail is archiválja.

==== //depot/projects/docproj_hu/www/hu/search/web.atoz#9 (text+ko) ==== @@ -9,7 +9,7 @@ # The FreeBSD Hungarian Documentation Project # Translated by: Gabor Kovesdan # %SOURCE% en/search/web.atoz -# %SRCID% 1.90 +# %SRCID% 1.91 # NOTE: the entries should be sorted alphabetically by their relative # path to www/en. E.g. docs/man.sgml comes after docs/books.sgml, @@ -514,7 +514,7 @@ Orosz weboldalak|&enbase;/ru/index.html # Who's Who -A Projekt munkatársai|&enbase;/doc/en/articles/contributors/staff-who.html -Munkatársak, Projekt|&enbase;/doc/en/articles/contributors/staff-who.html -Ki kicsoda?|&enbase;/doc/en/articles/contributors/staff-who.html -Tisztségviselõk, Projekt|&enbase;/doc/en/articles/contributors/staff-who.html +A Projekt munkatársai|&enbase;/administration.html +Munkatársak, Projekt|&enbase;/administration.html +Ki kicsoda?|&enbase;/administration.html +Tisztségviselõk, Projekt|&enbase;/administration.html From owner-p4-projects@FreeBSD.ORG Sun Aug 17 21:08:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 380691065673; Sun, 17 Aug 2008 21:08:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F02C2106566B for ; Sun, 17 Aug 2008 21:08:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA4778FC13 for ; Sun, 17 Aug 2008 21:08:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HL84I0090321 for ; Sun, 17 Aug 2008 21:08:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HL84sD090319 for perforce@freebsd.org; Sun, 17 Aug 2008 21:08:04 GMT (envelope-from trasz@freebsd.org) Date: Sun, 17 Aug 2008 21:08:04 GMT Message-Id: <200808172108.m7HL84sD090319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 21:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=147672 Change 147672 by trasz@trasz_traszkan on 2008/08/17 21:07:45 Make aclfuzzer clean after itself. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#2 (text+ko) ==== @@ -25,10 +25,10 @@ { rnd=`rnd_from_0_to 3` case $rnd in - 0) echo "aaa" ;; - 1) echo "bbb" ;; - 2) echo "aaa/ccc" ;; - 3) echo "bbb/ddd" ;; + 0) echo "$TMP/aaa" ;; + 1) echo "$TMP/bbb" ;; + 2) echo "$TMP/aaa/ccc" ;; + 3) echo "$TMP/bbb/ddd" ;; esac } @@ -105,7 +105,7 @@ f_ls_mode() { file=`rnd_path` - run_command "ls -l $file | cut -d' ' -f1" + run_command "ls -al $file | sed -n '2p' | cut -d' ' -f1" } f_chmod() @@ -177,8 +177,11 @@ } echo "# Fuzzing; will stop after $NUMBER_OF_COMMANDS commands." +TMP="aclfuzzer_`dd if=/dev/random bs=1k count=1 2>/dev/null | openssl md5`" + run_command "whoami" -run_command "umask" +run_command "umask 022" +run_command "mkdir $TMP" i=0; while [ "$i" -lt "$NUMBER_OF_COMMANDS" ]; do @@ -187,5 +190,8 @@ i=`expr $i + 1` done +run_command "find $TMP -exec setfacl -a0 everyone@:rxd:allow {} \;" +run_command "rm -rfv $TMP" + echo "# Fuzzed, thank you." From owner-p4-projects@FreeBSD.ORG Sun Aug 17 21:10:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F4AD106568F; Sun, 17 Aug 2008 21:10:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63266106567C for ; Sun, 17 Aug 2008 21:10:07 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0AA3D8FC14 for ; Sun, 17 Aug 2008 21:10:07 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HLA7lE090531 for ; Sun, 17 Aug 2008 21:10:07 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HLA6Qp090529 for perforce@freebsd.org; Sun, 17 Aug 2008 21:10:06 GMT (envelope-from marius@freebsd.org) Date: Sun, 17 Aug 2008 21:10:06 GMT Message-Id: <200808172110.m7HLA6Qp090529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 147673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 21:10:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=147673 Change 147673 by marius@flak on 2008/08/17 21:09:44 Flesh out; this is self-hosting on Blade 1000 (USIII MP; CPUs at mixed speeds thought to be working but untested), Blade 1500 (USIIIi), Blade 2000 (USIII+ MP) and Fire V210 (USIIIi MP). Affected files ... .. //depot/projects/usiii/boot/common/dev_net.c#3 edit .. //depot/projects/usiii/boot/sparc64/loader/main.c#3 edit .. //depot/projects/usiii/conf/files.sparc64#6 edit .. //depot/projects/usiii/conf/options.sparc64#2 edit .. //depot/projects/usiii/sparc64/include/cache.h#3 edit .. //depot/projects/usiii/sparc64/include/clock.h#3 edit .. //depot/projects/usiii/sparc64/include/cpu.h#2 edit .. //depot/projects/usiii/sparc64/include/cpufunc.h#3 edit .. //depot/projects/usiii/sparc64/include/dcr.h#1 add .. //depot/projects/usiii/sparc64/include/pcpu.h#3 edit .. //depot/projects/usiii/sparc64/include/smp.h#3 edit .. //depot/projects/usiii/sparc64/include/tick.h#2 edit .. //depot/projects/usiii/sparc64/include/tlb.h#4 edit .. //depot/projects/usiii/sparc64/include/trap.h#2 edit .. //depot/projects/usiii/sparc64/include/tte.h#3 edit .. //depot/projects/usiii/sparc64/include/ver.h#2 edit .. //depot/projects/usiii/sparc64/pci/ofw_pci.h#3 edit .. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#8 edit .. //depot/projects/usiii/sparc64/pci/psycho.c#11 edit .. //depot/projects/usiii/sparc64/pci/schizo.c#9 edit .. //depot/projects/usiii/sparc64/pci/schizoreg.h#3 edit .. //depot/projects/usiii/sparc64/pci/schizovar.h#3 edit .. //depot/projects/usiii/sparc64/sparc64/cache.c#3 edit .. //depot/projects/usiii/sparc64/sparc64/cheetah.c#5 edit .. //depot/projects/usiii/sparc64/sparc64/clock.c#4 edit .. //depot/projects/usiii/sparc64/sparc64/exception.S#5 edit .. //depot/projects/usiii/sparc64/sparc64/genassym.c#3 edit .. //depot/projects/usiii/sparc64/sparc64/jbusppm.c#1 add .. //depot/projects/usiii/sparc64/sparc64/locore.S#3 edit .. //depot/projects/usiii/sparc64/sparc64/machdep.c#6 edit .. //depot/projects/usiii/sparc64/sparc64/mp_exception.S#2 edit .. //depot/projects/usiii/sparc64/sparc64/mp_locore.S#3 edit .. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#6 edit .. //depot/projects/usiii/sparc64/sparc64/pmap.c#7 edit .. //depot/projects/usiii/sparc64/sparc64/schppm.c#1 add .. //depot/projects/usiii/sparc64/sparc64/spitfire.c#4 edit .. //depot/projects/usiii/sparc64/sparc64/support.S#3 edit .. //depot/projects/usiii/sparc64/sparc64/swtch.S#3 edit .. //depot/projects/usiii/sparc64/sparc64/tick.c#5 edit .. //depot/projects/usiii/sparc64/sparc64/tlb.c#4 edit .. //depot/projects/usiii/sparc64/sparc64/trap.c#5 edit Differences ... ==== //depot/projects/usiii/boot/common/dev_net.c#3 (text+ko) ==== @@ -144,6 +144,9 @@ return (error); } } +#if defined(__sparc64__) + netdev_opens++; +#endif } netdev_opens++; f->f_devdata = &netdev_sock; ==== //depot/projects/usiii/boot/sparc64/loader/main.c#3 (text+ko) ==== @@ -6,9 +6,35 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. */ +/*- + * Copyright (c) 2008 Marius Strobl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ #include __FBSDID("$FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.33 2008/08/07 22:46:25 marius Exp $"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * @@ -28,7 +54,6 @@ #include #include -#include #include #include #include @@ -36,6 +61,8 @@ #include #include #include +#include +#include #include "bootstrap.h" #include "libofw.h" @@ -57,10 +84,13 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); +static inline u_long dtlb_get_data_sun4u(int slot); static void dtlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t); +static inline u_long itlb_get_data_sun4u(int slot); static void itlb_enter_sun4u(u_long vpn, u_long data); static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t); +static void itlb_relocate_locked0_sun4u(void); extern vm_offset_t md_load(char *, vm_offset_t *); static int sparc64_autoload(void); static ssize_t sparc64_readin(const int, vm_offset_t, const size_t); @@ -92,6 +122,7 @@ struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; +int cpu_impl; static int dtlb_slot_max; static int itlb_slot_max; @@ -365,6 +396,30 @@ panic("%s: exec returned", __func__); } +static inline u_long +dtlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_DTLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG)); +} + +static inline u_long +itlb_get_data_sun4u(int slot) +{ + + /* + * We read ASI_ITLB_DATA_ACCESS_REG twice in order to work + * around errata of USIII and beyond. + */ + (void)ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG); + return (ldxa(TLB_DAR_SLOT(slot), ASI_ITLB_DATA_ACCESS_REG)); +} + static vm_offset_t dtlb_va_to_pa_sun4u(vm_offset_t va) { @@ -375,7 +430,9 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + reg = dtlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); @@ -391,38 +448,107 @@ reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); if (TLB_TAR_VA(reg) != va) continue; - reg = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + reg = itlb_get_data_sun4u(i); + if (cpu_impl >= CPU_IMPL_ULTRASPARCIII) + return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT); return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT); } return (-1); } static void -itlb_enter_sun4u(u_long vpn, u_long data) +dtlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_IMMU_TAR, ASI_IMMU, vpn); - stxa(0, ASI_ITLB_DATA_IN_REG, data); + stxa(AA_DMMU_TAR, ASI_DMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); wrpr(pstate, reg, 0); } static void -dtlb_enter_sun4u(u_long vpn, u_long data) +itlb_enter_sun4u(u_long vpn, u_long data) { u_long reg; + int i; reg = rdpr(pstate); wrpr(pstate, reg & ~PSTATE_IE, 0); - stxa(AA_DMMU_TAR, ASI_DMMU, vpn); - stxa(0, ASI_DTLB_DATA_IN_REG, data); - membar(Sync); + + if (cpu_impl == CPU_IMPL_ULTRASPARCIIIp) { + /* + * Search an unused slot != 0 and explicitly enter the data + * and tag there in order to avoid Cheetah+ erratum 34. + */ + for (i = 1; i < itlb_slot_max; i++) { + if ((itlb_get_data_sun4u(i) & TD_V) != 0) + continue; + + stxa(AA_IMMU_TAR, ASI_IMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data); + flush(KERNBASE); + break; + } + wrpr(pstate, reg, 0); + if (i == itlb_slot_max) + panic("%s: could not find an unused slot", __func__); + return; + } + + stxa(AA_IMMU_TAR, ASI_IMMU, + TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL)); + stxa(0, ASI_ITLB_DATA_IN_REG, data); + flush(KERNBASE); wrpr(pstate, reg, 0); } +static void +itlb_relocate_locked0_sun4u(void) +{ + u_long data, pstate, tag; + int i; + + if (cpu_impl != CPU_IMPL_ULTRASPARCIIIp) + return; + + pstate = rdpr(pstate); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + + data = itlb_get_data_sun4u(0); + if ((data & (TD_V | TD_L)) != (TD_V | TD_L)) { + wrpr(pstate, pstate, 0); + return; + } + + /* Flush the mapping of slot 0. */ + tag = ldxa(TLB_DAR_SLOT(0), ASI_ITLB_TAG_READ_REG); + stxa(TLB_DEMAP_VA(TLB_TAR_VA(tag)) | TLB_DEMAP_PRIMARY | + TLB_DEMAP_PAGE, ASI_IMMU_DEMAP, 0); + flush(0); /* The USIII-family ignores the address. */ + + /* + * Search a replacement slot != 0 and enter the data and tag + * that formerly were in slot 0. + */ + for (i = 1; i < itlb_slot_max; i++) { + if ((itlb_get_data_sun4u(i) & TD_V) != 0) + continue; + + stxa(AA_IMMU_TAR, ASI_IMMU, tag); + stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data); + flush(0); /* The USIII-family ignores the address. */ + break; + } + wrpr(pstate, pstate, 0); + if (i == itlb_slot_max) + panic("%s: could not find a replacement slot", __func__); +} + static int mmu_mapin_sun4u(vm_offset_t va, vm_size_t len) { @@ -438,7 +564,7 @@ while (len) { if (dtlb_va_to_pa_sun4u(va) == (vm_offset_t)-1 || itlb_va_to_pa_sun4u(va) == (vm_offset_t)-1) { - /* Allocate a physical page, claim the virtual area */ + /* Allocate a physical page, claim the virtual area. */ if (pa == (vm_offset_t)-1) { pa = alloc_phys(PAGE_SIZE_4M, PAGE_SIZE_4M); if (pa == (vm_offset_t)-1) @@ -448,7 +574,9 @@ panic("%s: can't claim virtual page " "(wanted %#lx, got %#lx)", __func__, va, mva); - /* The mappings may have changed, be paranoid. */ + /* + * The mappings may have changed, be paranoid. + */ continue; } /* @@ -537,27 +665,46 @@ u_int bootcpu; u_int cpu; + cpu_impl = VER_IMPL(rdpr(ver)); bootcpu = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (child == -1) - panic("%s: can't get child phandle", __func__); - if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 && - strcmp(buf, "cpu") == 0) { - if (OF_getprop(child, "upa-portid", &cpu, - sizeof(cpu)) == -1 && OF_getprop(child, "portid", - &cpu, sizeof(cpu)) == -1) - panic("%s: can't get portid", __func__); - if (cpu == bootcpu) - break; - } + if (OF_getprop(child, "device_type", buf, sizeof(buf)) <= 0) + continue; + if (strcmp(buf, "cpu") != 0) + continue; + if (OF_getprop(child, cpu_impl < CPU_IMPL_ULTRASPARCIII ? + "upa-portid" : "portid", &cpu, sizeof(cpu)) <= 0) + continue; + if (cpu == bootcpu) + break; } if (cpu != bootcpu) panic("%s: no node for bootcpu?!?!", __func__); + if (OF_getprop(child, "#dtlb-entries", &dtlb_slot_max, sizeof(dtlb_slot_max)) == -1 || OF_getprop(child, "#itlb-entries", &itlb_slot_max, sizeof(itlb_slot_max)) == -1) panic("%s: can't get TLB slot max.", __func__); + + if (cpu_impl == CPU_IMPL_ULTRASPARCIIIp) { +#ifdef LOADER_DEBUG + printf("pre fixup:\n"); + pmap_print_tlb_sun4u(); +#endif + + /* + * Relocate the locked entry in it16 slot 0 (if existent) + * as part of working around Cheetah+ erratum 34. + */ + itlb_relocate_locked0_sun4u(); + +#ifdef LOADER_DEBUG + printf("post fixup:\n"); + pmap_print_tlb_sun4u(); +#endif + } + dtlb_store = malloc(dtlb_slot_max * sizeof(*dtlb_store)); itlb_store = malloc(itlb_slot_max * sizeof(*itlb_store)); if (dtlb_store == NULL || itlb_store == NULL) @@ -580,7 +727,7 @@ struct devsw **dp; /* - * Tell the Open Firmware functions where they find the ofw gate. + * Tell the Open Firmware functions where they find the OFW gate. */ OF_init(openfirm); @@ -709,10 +856,14 @@ pmap_print_tlb_sun4u(void) { tte_t tag, tte; + u_long pstate; int i; + pstate = rdpr(pstate); for (i = 0; i < itlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = itlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_ITLB_TAG_READ_REG); @@ -720,7 +871,9 @@ pmap_print_tte_sun4u(tag, tte); } for (i = 0; i < dtlb_slot_max; i++) { - tte = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_DATA_ACCESS_REG); + wrpr(pstate, pstate & ~PSTATE_IE, 0); + tte = dtlb_get_data_sun4u(i); + wrpr(pstate, pstate, 0); if (!(tte & TD_V)) continue; tag = ldxa(TLB_DAR_SLOT(i), ASI_DTLB_TAG_READ_REG); ==== //depot/projects/usiii/conf/files.sparc64#6 (text+ko) ==== @@ -101,19 +101,23 @@ sparc64/sparc64/db_hwwatch.c optional ddb sparc64/sparc64/dump_machdep.c standard sparc64/sparc64/elf_machdep.c standard -sparc64/sparc64/exception.S standard no-obj +sparc64/sparc64/exception.S standard no-obj \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \ eeprom sbus sparc64/sparc64/gdb_machdep.c optional gdb sparc64/sparc64/identcpu.c standard sparc64/sparc64/in_cksum.c optional inet -sparc64/sparc64/interrupt.S standard no-obj +sparc64/sparc64/interrupt.S standard no-obj \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/intr_machdep.c standard sparc64/sparc64/iommu.c standard +sparc64/sparc64/jbusppm.c standard sparc64/sparc64/locore.S standard no-obj sparc64/sparc64/machdep.c standard sparc64/sparc64/mem.c optional mem -sparc64/sparc64/mp_exception.S optional smp +sparc64/sparc64/mp_exception.S optional smp \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/mp_locore.S optional smp sparc64/sparc64/mp_machdep.c optional smp sparc64/sparc64/nexus.c standard @@ -124,9 +128,11 @@ sparc64/sparc64/rtc.c optional rtc ebus | rtc isa sparc64/sparc64/rwindow.c standard sparc64/sparc64/sc_machdep.c optional sc +sparc64/sparc64/schppm.c standard sparc64/sparc64/spitfire.c standard sparc64/sparc64/stack_machdep.c optional ddb | stack -sparc64/sparc64/support.S standard +sparc64/sparc64/support.S standard \ + compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/sys_machdep.c standard sparc64/sparc64/swtch.S standard sparc64/sparc64/tick.c standard ==== //depot/projects/usiii/conf/options.sparc64#2 (text+ko) ==== @@ -1,22 +1,30 @@ # $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $ -SUN4U opt_global.h - GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h GFB_NO_MODE_CHANGE opt_gfb.h -PSYCHO_DEBUG opt_psycho.h -DEBUGGER_ON_POWERFAIL opt_psycho.h +SUN4U opt_global.h + +ATKBD_DFLT_KEYMAP opt_atkbd.h + +# Debug IOMMU inserts/removes using diagnostic accesses. This is very loud. +IOMMU_DIAG opt_iommu.h + +OFWCONS_POLL_HZ opt_ofw.h + OFW_PCI_DEBUG opt_ofw_pci.h -OFWCONS_POLL_HZ opt_ofw.h -# Debug IOMMU inserts/removes using diagnostic accesses. Very loud. -IOMMU_DIAG opt_iommu.h + PMAP_STATS opt_pmap.h -ATKBD_DFLT_KEYMAP opt_atkbd.h PSM_DEBUG opt_psm.h PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h + +DEBUGGER_ON_POWERFAIL opt_psycho.h +PSYCHO_DEBUG opt_psycho.h + +SCHIZO_DEBUG opt_schizo.h + SUNKBD_DFLT_KEYMAP opt_sunkbd.h SUNKBD_EMULATE_ATKBD opt_sunkbd.h ==== //depot/projects/usiii/sparc64/include/cache.h#3 (text+ko) ==== @@ -45,10 +45,6 @@ #ifndef _MACHINE_CACHE_H_ #define _MACHINE_CACHE_H_ -#ifndef LOCORE -#include -#endif - #define DCACHE_COLOR_BITS (1) #define DCACHE_COLORS (1 << DCACHE_COLOR_BITS) #define DCACHE_COLOR_MASK (DCACHE_COLORS - 1) @@ -80,31 +76,27 @@ * Cache control information */ struct cacheinfo { - u_int c_enabled; /* true => cache is enabled */ u_int ic_size; /* instruction cache */ - u_int ic_set; - u_int ic_l2set; u_int ic_assoc; u_int ic_linesize; u_int dc_size; /* data cache */ - u_int dc_l2size; u_int dc_assoc; u_int dc_linesize; u_int ec_size; /* external cache info */ u_int ec_assoc; - u_int ec_l2set; u_int ec_linesize; - u_int ec_l2linesize; }; #ifdef _KERNEL +struct pcpu; + typedef void cache_enable_t(void); typedef void cache_flush_t(void); typedef void dcache_page_inval_t(vm_paddr_t pa); typedef void icache_page_inval_t(vm_paddr_t pa); -void cache_init(phandle_t node); +void cache_init(struct pcpu *pcpu); cache_enable_t cheetah_cache_enable; cache_flush_t cheetah_cache_flush; @@ -121,8 +113,6 @@ extern dcache_page_inval_t *dcache_page_inval; extern icache_page_inval_t *icache_page_inval; -extern struct cacheinfo cache; - #endif /* KERNEL */ #endif /* !LOCORE */ ==== //depot/projects/usiii/sparc64/include/clock.h#3 (text+ko) ==== @@ -29,8 +29,10 @@ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ -extern u_long tick_increment; -extern u_long tick_freq; -extern u_long tick_MHz; +extern void (*delay_func)(int usec); +extern u_long clock_boot; + +void delay_boot(int usec); +void delay_tick(int usec); #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/usiii/sparc64/include/cpu.h#2 (text+ko) ==== @@ -52,6 +52,7 @@ extern char btext[]; extern char etext[]; +void cheetah_init(void); void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); ==== //depot/projects/usiii/sparc64/include/cpufunc.h#3 (text+ko) ==== @@ -174,17 +174,28 @@ } while (0) /* + * Trick GAS/GCC into compiling access to STICK/STICK_COMPARE independently + * of the selected instruction set. + */ +#define rdstick() rd(asr24) +#define rdstickcmpr() rd(asr25) +#define wrstick(val, xor) wr(asr24, (val), (xor)) +#define wrstickcmpr(val, xor) wr(asr25, (val), (xor)) + +/* * Macro intended to be used instead of wr(asr23, val, xor) for writing to * the TICK_COMPARE register in order to avoid a bug in BlackBird CPUs that * can cause these writes to fail under certain condidtions which in turn - * causes the hardclock to stop. The workaround is to perform the write - * at the beginning of an I-Cache line directly followed by a dummy read. + * causes the hardclock to stop. The workaround is to read the TICK_COMPARE + * register back immediately after writing to it with these two instructions + * aligned to a quadword boundary in order to ensure that I$ misses won't + * split them up. */ #define wrtickcmpr(val, xor) ({ \ __asm __volatile( \ " ba,pt %%xcc, 1f ; " \ " nop ; " \ - " .align 64 ; " \ + " .align 128 ; " \ "1: wr %0, %1, %%asr23 ; " \ " rd %%asr23, %%g0 ; " \ : : "r" (val), "rI" (xor)); \ ==== //depot/projects/usiii/sparc64/include/pcpu.h#3 (text+ko) ==== @@ -33,6 +33,7 @@ #ifdef _KERNEL #include +#include #include #include @@ -45,6 +46,7 @@ * point at the globaldata structure. */ #define PCPU_MD_FIELDS \ + struct cacheinfo pc_cache; \ struct intr_request pc_irpool[IR_FREE]; \ struct intr_request *pc_irhead; \ struct intr_request **pc_irtail; \ @@ -53,6 +55,7 @@ vm_offset_t pc_addr; \ u_long pc_tickref; \ u_long pc_tickadj; \ + u_int pc_clock; \ u_int pc_mid; \ u_int pc_node; \ u_int pc_tlb_ctx; \ ==== //depot/projects/usiii/sparc64/include/smp.h#3 (text+ko) ==== @@ -29,9 +29,10 @@ #ifndef _MACHINE_SMP_H_ #define _MACHINE_SMP_H_ -#define CPU_CLKSYNC 1 -#define CPU_INIT 2 -#define CPU_BOOTSTRAP 3 +#define CPU_TICKSYNC 1 +#define CPU_STICKSYNC 2 +#define CPU_INIT 3 +#define CPU_BOOTSTRAP 4 #ifndef LOCORE @@ -62,6 +63,7 @@ u_int csa_state; vm_offset_t csa_pcpu; u_long csa_tick; + u_long csa_stick; u_long csa_ver; struct tte csa_ttes[PCPU_PAGES]; }; ==== //depot/projects/usiii/sparc64/include/tick.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef _MACHINE_TICK_H_ #define _MACHINE_TICK_H_ -void tick_init(u_long clock); +void tick_clear(void); void tick_start(void); void tick_stop(void); ==== //depot/projects/usiii/sparc64/include/tlb.h#4 (text+ko) ==== @@ -51,6 +51,26 @@ #define TLB_TAR_VA(va) ((va) & ~TAR_CTX_MASK) #define TLB_TAR_CTX(ctx) ((ctx) & TAR_CTX_MASK) +#define TLB_CXR_CTX_BITS (13) +#define TLB_CXR_CTX_MASK \ + (((1UL << TLB_CXR_CTX_BITS) - 1) << TLB_CXR_CTX_SHIFT) +#define TLB_CXR_CTX_SHIFT (0) +#define TLB_CXR_PGSZ_BITS (3) +#define TLB_PCXR_PGSZ_MASK \ + ((((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_PCXR_N_PGSZ0_SHIFT) | \ + (((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_PCXR_N_PGSZ1_SHIFT) | \ + (((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_PCXR_P_PGSZ0_SHIFT) | \ + (((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_PCXR_P_PGSZ1_SHIFT)) +#define TLB_PCXR_N_PGSZ0_SHIFT (61) +#define TLB_PCXR_N_PGSZ1_SHIFT (58) +#define TLB_PCXR_P_PGSZ0_SHIFT (16) +#define TLB_PCXR_P_PGSZ1_SHIFT (19) +#define TLB_SCXR_PGSZ_MASK \ + ((((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_SCXR_S_PGSZ0_SHIFT) | \ + (((1UL << TLB_CXR_PGSZ_BITS) - 1) << TLB_SCXR_S_PGSZ1_SHIFT)) +#define TLB_SCXR_S_PGSZ1_SHIFT (19) +#define TLB_SCXR_S_PGSZ0_SHIFT (16) + #define TLB_DEMAP_ID_SHIFT (4) #define TLB_DEMAP_ID_PRIMARY (0) #define TLB_DEMAP_ID_SECONDARY (1) @@ -59,8 +79,7 @@ #define TLB_DEMAP_TYPE_SHIFT (6) #define TLB_DEMAP_TYPE_PAGE (0) #define TLB_DEMAP_TYPE_CONTEXT (1) -/* US-III and greater only */ -#define TLB_DEMAP_TYPE_ALL (2) +#define TLB_DEMAP_TYPE_ALL (2) /* USIII and beyond only */ #define TLB_DEMAP_VA(va) ((va) & ~PAGE_MASK) #define TLB_DEMAP_ID(id) ((id) << TLB_DEMAP_ID_SHIFT) ==== //depot/projects/usiii/sparc64/include/trap.h#2 (text+ko) ==== @@ -90,6 +90,7 @@ #define T_KERNEL 64 #ifndef LOCORE +void sun4u_set_traptable(void *tba_addr); extern const char *trap_msg[]; #endif ==== //depot/projects/usiii/sparc64/include/tte.h#3 (text+ko) ==== @@ -36,21 +36,24 @@ #define TD_SIZE_SHIFT (61) #define TD_SOFT2_SHIFT (50) -#define TD_DIAG_SHIFT (41) +#define TD_DIAG_SF_SHIFT (41) +#define TD_RSVD_CH_SHIFT (43) #define TD_PA_SHIFT (13) #define TD_SOFT_SHIFT (7) #define TD_SIZE_BITS (2) #define TD_SOFT2_BITS (9) -#define TD_DIAG_BITS (9) +#define TD_DIAG_SF_BITS (9) +#define TD_RSVD_CH_BITS (7) #define TD_PA_CH_BITS (30) #define TD_PA_SF_BITS (28) -#define TD_PA_BITS TD_PA_SF_BITS +#define TD_PA_BITS TD_PA_CH_BITS #define TD_SOFT_BITS (6) #define TD_SIZE_MASK ((1UL << TD_SIZE_BITS) - 1) #define TD_SOFT2_MASK ((1UL << TD_SOFT2_BITS) - 1) -#define TD_DIAG_MASK ((1UL << TD_DIAG_BITS) - 1) +#define TD_DIAG_SF_MASK ((1UL << TD_DIAG_SF_BITS) - 1) +#define TD_RSVD_CH_MASK ((1UL << TD_RSVD_CH_BITS) - 1) #define TD_PA_CH_MASK ((1UL << TD_PA_CH_BITS) - 1) #define TD_PA_SF_MASK ((1UL << TD_PA_SF_BITS) - 1) #define TD_PA_MASK ((1UL << TD_PA_BITS) - 1) ==== //depot/projects/usiii/sparc64/include/ver.h#2 (text+ko) ==== @@ -41,6 +41,8 @@ #define VER_MAXTL_SIZE (8) #define VER_MAXWIN_SIZE (5) +#ifndef LOCORE + #define VER_MANUF_MASK (((1L< @@ -40,7 +40,7 @@ /* PCI range child spaces. XXX: are these MI? */ #define OFW_PCI_CS_CONFIG 0x00 -#define OFW_PCI_CS_IO 0x01 +#define OFW_PCI_CS_IO 0x01 #define OFW_PCI_CS_MEM32 0x02 #define OFW_PCI_CS_MEM64 0x03 @@ -62,4 +62,7 @@ (((uint64_t)(r)->size_hi << 32) | (uint64_t)(r)->size_lo) #define OFW_PCI_RANGE_CS(r) (((r)->cspace >> 24) & 0x03) +/* default values */ +#define OFW_PCI_LATENCY 64 + #endif /* ! _SPARC64_PCI_OFW_PCI_H_ */ ==== //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#8 (text+ko) ==== @@ -60,10 +60,10 @@ #include "pcib_if.h" #include "pci_if.h" -/* Helper functions. */ +/* Helper functions */ static void ofw_pcibus_setup_device(device_t, u_int, u_int, u_int); -/* Methods. */ +/* Methods */ static device_probe_t ofw_pcibus_probe; static device_attach_t ofw_pcibus_attach; static pci_assign_interrupt_t ofw_pcibus_assign_interrupt; @@ -120,48 +120,82 @@ static void ofw_pcibus_setup_device(device_t bridge, u_int busno, u_int slot, u_int func) { +#ifndef SUN4V uint32_t reg; /* - * Initialize the latency timer register for busmaster devices to work - * properly. This is another task which the firmware does not always - * perform. The Min_Gnt register can be used to compute it's recommended - * value: it contains the desired latency in units of 1/4 us. To - * calculate the correct latency timer value, the clock frequency of - * the bus (defaulting to 33Mhz) should be used and no wait states - * should be assumed. + * Initialize the latency timer register for busmaster devices to + * work properly. This is another task which the firmware doesn't + * always perform. The Min_Gnt register can be used to compute its + * recommended value: it contains the desired latency in units of + * 1/4 us assuming a clock rate of 33MHz. To calculate the correct + * latency timer value, the clock frequency of the bus (defaulting + * to 33MHz) should be used and no wait states assumed. */ - if (OF_getprop(ofw_bus_get_node(bridge), "clock-frequency", ®, - sizeof(reg)) == -1) - reg = 33000000; - reg = PCIB_READ_CONFIG(bridge, busno, slot, func, PCIR_MINGNT, 1) * - reg / 1000000 / 4; - if (reg != 0) { + if ((PCIB_READ_CONFIG(bridge, busno, slot, func, PCIR_HDRTYPE, 1) & + PCIM_HDRTYPE) == PCIM_HDRTYPE_BRIDGE) { + reg = PCIB_READ_CONFIG(bridge, busno, slot, func, + PCIR_BRIDGECTL_1, 1); + reg |= PCIB_BCR_MASTER_ABORT_MODE | PCIB_BCR_SERR_ENABLE | + PCIB_BCR_PERR_ENABLE; +#ifdef OFW_PCI_DEBUG + device_printf(bridge, + "bridge %d/%d/%d: control 0x%x -> 0x%x\n", + busno, slot, func, PCIB_READ_CONFIG(bridge, busno, slot, + func, PCIR_SECLAT_1, 1), reg); +#endif /* OFW_PCI_DEBUG */ + PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_BRIDGECTL_1, + reg, 1); + + reg = OFW_PCI_LATENCY; +#ifdef OFW_PCI_DEBUG + device_printf(bridge, + "bridge %d/%d/%d: latency timer %d -> %d\n", + busno, slot, func, PCIB_READ_CONFIG(bridge, busno, slot, + func, PCIR_SECLAT_1, 1), reg); +#endif /* OFW_PCI_DEBUG */ + PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_SECLAT_1, + reg, 1); + } else { + if (OF_getprop(ofw_bus_get_node(bridge), "clock-frequency", + ®, sizeof(reg)) == -1) + reg = 33000000; + switch (reg) { + case 33000000: + reg = 8; + break; + case 66000000: + reg = 4; + break; + } + reg *= PCIB_READ_CONFIG(bridge, busno, slot, func, + PCIR_MINGNT, 1); + if (reg == 0) + reg = OFW_PCI_LATENCY; #ifdef OFW_PCI_DEBUG - device_printf(bridge, "device %d/%d/%d: latency timer %d -> " - "%d\n", busno, slot, func, - PCIB_READ_CONFIG(bridge, busno, slot, func, - PCIR_LATTIMER, 1), reg); + device_printf(bridge, + "device %d/%d/%d: latency timer %d -> %d\n", + busno, slot, func, PCIB_READ_CONFIG(bridge, busno, slot, + func, PCIR_LATTIMER, 1), reg); #endif /* OFW_PCI_DEBUG */ PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_LATTIMER, min(reg, 255), 1); } -#ifndef SUN4V /* * Compute a value to write into the cache line size register. * The role of the streaming cache is unclear in write invalidate - * transfers, so it is made sure that it's line size is always reached. - * Generally, the cache line size is fixed at 64 bytes by Fireplane/ - * Safari, JBus and UPA. + * transfers, so it is made sure that it's line size is always + * reached. Generally, the cache line size is fixed at 64 bytes + * by Fireplane/Safari, JBus and UPA. */ PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_CACHELNSZ, STRBUF_LINESZ / sizeof(uint32_t), 1); #endif /* - * The preset in the intline register is usually wrong. Reset it to 255, - * so that the PCI code will reroute the interrupt if needed. + * The preset in the intline register is usually wrong. Reset it to + * 255, so that the PCI code will reroute the interrupt if needed. */ PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_INTLINE, PCI_INVALID_IRQ, 1); @@ -237,7 +271,8 @@ } else if (intr >= 255) { /* * A fully specified interrupt (including IGN), as present on - * SPARCengine Ultra AX and e450. Extract the INO and return it. + * SPARCengine Ultra AX and e450. Extract the INO and return + * it. */ return (INTINO(intr)); #endif @@ -245,11 +280,12 @@ /* * If we got intr from a property, it may or may not be an intpin. * For on-board devices, it frequently is not, and is completely out - * of the valid intpin range. For PCI slots, it hopefully is, otherwise - * we will have trouble interfacing with non-OFW buses such as cardbus. + * of the valid intpin range. For PCI slots, it hopefully is, + * otherwise we will have trouble interfacing with non-OFW buses + * such as cardbus. * Since we cannot tell which it is without violating layering, we - * will always use the route_interrupt method, and treat exceptions on - * the level they become apparent. + * will always use the route_interrupt method, and treat exceptions + * on the level they become apparent. */ return (PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, intr)); } ==== //depot/projects/usiii/sparc64/pci/psycho.c#11 (text+ko) ==== @@ -281,7 +281,6 @@ device_set_desc(dev, "U2P UPA-PCI bridge"); return (0); } - return (ENXIO); } @@ -331,6 +330,7 @@ default: panic("%s: bogus PCI control register location", __func__); + /* NOTREACHED */ } } else { rid = 0; @@ -651,7 +651,7 @@ * firmware. */ PCIB_WRITE_CONFIG(dev, sc->sc_pci_secbus, PCS_DEVICE, PCS_FUNC, - PCIR_LATTIMER, 64, 1); + PCIR_LATTIMER, OFW_PCI_LATENCY, 1); for (n = PCIR_VENDOR; n < PCIR_STATUS; n += sizeof(uint16_t)) le16enc(&sc->sc_pci_hpbcfg[n], bus_space_read_2( @@ -966,6 +966,7 @@ break; default: panic("%s: bad width", __func__); + /* NOTREACHED */ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 17 21:17:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC4FF1065671; Sun, 17 Aug 2008 21:17:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A06CD106566B for ; Sun, 17 Aug 2008 21:17:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 886E48FC16 for ; Sun, 17 Aug 2008 21:17:14 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HLHERF091089 for ; Sun, 17 Aug 2008 21:17:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HLHEBe091087 for perforce@freebsd.org; Sun, 17 Aug 2008 21:17:14 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 17 Aug 2008 21:17:14 GMT Message-Id: <200808172117.m7HLHEBe091087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 21:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=147674 Change 147674 by pgj@disznohal on 2008/08/17 21:16:22 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#2 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/docproj/who.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/internal/internal.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2004-07-2004-12.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2005-01-2005-03.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2005-03-2005-06.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2005-10-2005-12.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2006-01-2006-03.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2006-04-2006-06.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2006-06-2006-10.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2006-10-2006-12.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2007-01-2007-03.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2007-04-2007-06.xml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.3R/errata.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.0R/errata.html#2 integrate .. //depot/projects/docproj_hu/www/en/search/web.atoz#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#4 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#2 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + [ OK ]"> ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#2 (text+ko) ==== @@ -37,7 +37,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.4 2008/04/17 19:03:43 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.5 2008/08/17 12:58:32 bmah Exp $ 2008 @@ -154,6 +154,12 @@ 17 April 2008 OpenSSH X11-forwarding privilege escalation + + SA-08:06.bind + 13 July 2008 + DNS cache poisoning + @@ -183,12 +189,12 @@ (on HEAD) has solved their problems, or at least mitigated them. - [20080229] A change in the way that &os; sends TCP options - has been reported to cause odd interactions with some cable - modem routers. While this issue is still under investigation, - a change has been committed to HEAD that returns the option - processing to that of &os; 6. So far, this change has shown some promising - results. + [20080229, updated 20080817] A change in the way that &os; sends TCP options + has been reported to cause connectivity issues. + This problem has been corrected on + HEAD and the RELENG_7 and RELENG_7_0 branches.. Further + details are contained in errta notice + FreeBSD-EN-08:02.tcp. [20080307] The &os; implementation of SCTP currently depends on having INET6 support compiled into the ==== //depot/projects/docproj_hu/www/en/docproj/who.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -17,7 +17,7 @@ href="../doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"> all FreeBSD developers with commit privileges, as well as a list of the + href="../administration.html#t-doceng"> principal committers for the FreeBSD Documentation Project.

Others do not have commit privileges, but they write and submit ==== //depot/projects/docproj_hu/www/en/internal/internal.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -38,11 +38,12 @@

People

-

The -FreeBSD Project Staff -consists of the FreeBSD Core Team and the FreeBSD Developers; this document -contains a list of them, as well as explanations of who is responsible -for what.

+

The &os; Project Staff consists of teams, groups and individuals + with designated project roles and areas of responsibility and the developers. + By following the links, one will find a list of them, as well as + explanations of who is responsible for what.

Here are some personal homepages ==== //depot/projects/docproj_hu/www/en/news/status/report-2004-07-2004-12.xml#2 (text+ko) ==== @@ -1615,7 +1615,7 @@ Security Officer Charter + href="http://www.freebsd.org/administration.html#t-secteam"> FreeBSD Security Team members FreeBSD VuXML web site ==== //depot/projects/docproj_hu/www/en/news/status/report-2005-01-2005-03.xml#2 (text+ko) ==== @@ -1967,7 +1967,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2005-03-2005-06.xml#2 (text+ko) ==== @@ -556,7 +556,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2005-10-2005-12.xml#2 (text+ko) ==== @@ -622,7 +622,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2006-01-2006-03.xml#2 (text+ko) ==== @@ -125,7 +125,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2006-04-2006-06.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + April-June @@ -1802,7 +1802,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2006-06-2006-10.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + July-September @@ -1042,7 +1042,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2006-10-2006-12.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + October-December @@ -1908,7 +1908,7 @@ + href="http://www.FreeBSD.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2007-01-2007-03.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + January-March @@ -739,7 +739,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/news/status/report-2007-04-2007-06.xml#2 (text+ko) ==== @@ -2,7 +2,7 @@ - + April-June @@ -2185,7 +2185,7 @@ + href="http://www.freebsd.org/administration.html#t-secteam" /> ==== //depot/projects/docproj_hu/www/en/releases/6.3R/errata.html#2 (text+ko) ==== @@ -19,8 +19,8 @@

Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The FreeBSD Documentation Project

-

$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v -1.73.2.58 2008/04/20 17:55:48 bmah Exp $
+

$FreeBSD: stable/6/release/doc/en_US.ISO8859-1/errata/article.sgml +181797 2008-08-17 13:01:37Z bmah $

@@ -143,6 +143,15 @@

OpenSSH X11-forwarding privilege escalation

+ + +SA-08:06.bind +13 July 2008 + +

DNS cache poisoning

+ +
==== //depot/projects/docproj_hu/www/en/releases/7.0R/errata.html#2 (text+ko) ==== @@ -18,8 +18,8 @@

Copyright © 2008 The FreeBSD Documentation Project

-

$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v -1.73.4.4 2008/04/17 19:03:43 delphij Exp $
+

$FreeBSD: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml +181796 2008-08-17 12:58:32Z bmah $

@@ -113,6 +113,15 @@

OpenSSH X11-forwarding privilege escalation

+ + +SA-08:06.bind +13 July 2008 + +

DNS cache poisoning

+ +
@@ -141,10 +150,11 @@ Some users have reported that using a newer version of this driver (on HEAD) has solved their problems, or at least mitigated them.

-

[20080229] A change in the way that FreeBSD sends TCP options has been reported to -cause odd interactions with some cable modem routers. While this issue is still under -investigation, a change has been committed to HEAD that returns the option processing to -that of FreeBSD 6. So far, this change has shown some promising results.

+

[20080229, updated 20080817] A change in the way that FreeBSD sends TCP options has +been reported to cause connectivity issues. This problem has been corrected on HEAD and +the RELENG_7 and RELENG_7_0 branches.. Further details are contained in errta notice FreeBSD-EN-08:02.tcp.

[20080307] The FreeBSD implementation of SCTP currently depends on having INET6 support compiled into the kernel. This requirement is planned ==== //depot/projects/docproj_hu/www/en/search/web.atoz#2 (text+ko) ==== @@ -4,7 +4,7 @@ # With the format `|<url>'. # Empty lines or comments are ignored. # -# $FreeBSD: www/en/search/web.atoz,v 1.90 2008/03/12 11:14:50 remko Exp $ +# $FreeBSD: www/en/search/web.atoz,v 1.91 2008/08/16 21:55:59 pgj Exp $ # # NOTE: the entries should be sorted alphabetically by their relative # path to www/en. E.g. docs/man.sgml comes after docs/books.sgml, @@ -520,7 +520,7 @@ Japanese web pages|&base;/ja/index.html # Who's Who -Project Staff|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html -Staff, Project|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html -Who's Who|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html -Officers, Project|&base;/doc/en_US.ISO8859-1/articles/contributors/staff-who.html +Project Staff|&base;/administration.html +Staff, Project|&base;/administration.html +Who's Who|&base;/administration.html +Officers, Project|&base;/administration.html ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#4 (text+ko) ==== @@ -10,7 +10,7 @@ <events> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/events.xml,v 1.54 2008/06/29 19:25:35 murray Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.55 2008/08/17 13:04:06 chinsan Exp $ </cvs:keyword> </cvs:keywords> @@ -65,6 +65,30 @@ (NYC*BUG).</description> </event> + <event id="coscup-2008"> + <name>COSCUP 2008 - Conference for Open Source Coders, Users and Promoters</name> + <url>http://coscup.org/2008/</url> + <startdate> + <year>2008</year> + <month>8</month> + <day>23</day> + </startdate> + <enddate> + <year>2008</year> + <month>8</month> + <day>24</day> + </enddate> + <location> + <country code="TW">Taiwan (ROC)</country> + <city>Taipei</city> + <site>International Conference Hall, Institute of Applied Mechanics, + National Taiwan University</site> + </location> + <description>COSCUP 2008 is the 3rd incarnation of the series, + and becomes the biggest annual open source community party in Taiwan. + Several FreeBSD contributions will be presenting on FreeBSD topics.</description> + </event> + <event id="froscon-2008"> <name>FrOSCon 2008</name> <url>http://www.froscon.org/</url> From owner-p4-projects@FreeBSD.ORG Sun Aug 17 22:00:59 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0368F106568B; Sun, 17 Aug 2008 22:00:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB5E01065681 for <perforce@FreeBSD.org>; Sun, 17 Aug 2008 22:00:58 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BBAC8FC13 for <perforce@FreeBSD.org>; Sun, 17 Aug 2008 22:00:58 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HM0wJF094574 for <perforce@FreeBSD.org>; Sun, 17 Aug 2008 22:00:58 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HM0w6x094572 for perforce@freebsd.org; Sun, 17 Aug 2008 22:00:58 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 17 Aug 2008 22:00:58 GMT Message-Id: <200808172200.m7HM0w6x094572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas <snb@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 17 Aug 2008 22:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147675 Change 147675 by snb@snb_unagi on 2008/08/17 22:00:14 Tests for finding a good vfs.ufs.dirhash_reclaimage Affected files ... .. //depot/projects/soc2008/snb-dirhash/benchmark/eat_memory.c#1 add .. //depot/projects/soc2008/snb-dirhash/benchmark/reclaimage_test.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 17 23:57:31 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 745751065673; Sun, 17 Aug 2008 23:57:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F1CA106566C for <perforce@freebsd.org>; Sun, 17 Aug 2008 23:57:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06DCD8FC1B for <perforce@freebsd.org>; Sun, 17 Aug 2008 23:57:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HNvUrm007670 for <perforce@freebsd.org>; Sun, 17 Aug 2008 23:57:30 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7HNvUQL007668 for perforce@freebsd.org; Sun, 17 Aug 2008 23:57:30 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 23:57:30 GMT Message-Id: <200808172357.m7HNvUQL007668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 17 Aug 2008 23:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=147684 Change 147684 by bz@bz_dumpster on 2008/08/17 23:57:02 IFC @147683 After vimage step 1 commit to svn r181803 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.i386#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/XEN#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/features.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#10 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); #include <sys/param.h> @@ -65,7 +65,7 @@ #endif /* !_KERNEL */ /* - * This is the default number of seconds we wait for devices to settle + * This is the default number of milliseconds we wait for devices to settle * after a SCSI bus reset. */ #ifndef SCSI_DELAY ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/queue.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.223 2008/07/23 17:19:02 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.224 2008/08/17 23:27:27 bz Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/proc.h> ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.25 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1725,6 +1725,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2339,3 +2340,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-commit2/src/sys/conf/files.i386#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -275,11 +276,13 @@ i386/i386/io.c optional io i386/i386/io_apic.c optional apic i386/i386/k6_mem.c optional mem -i386/i386/legacy.c standard +i386/i386/legacy.c optional native i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/vimage-commit2/src/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.633 2008/07/18 14:44:51 dwmalone Exp $ +# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ # # On the handling of kernel options # ==== //depot/projects/vimage-commit2/src/sys/conf/options.i386#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.10 2007/07/12 17:00:51 njl Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -158,7 +158,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */ #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); #endif #include <sys/param.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/condvar.h> ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#5 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include "opt_config.h" ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.17 2008/07/31 01:52:04 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.18 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.102 2008/05/10 13:40:41 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.103 2008/08/17 23:27:27 bz Exp $ * */ ==== //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.51 2008/07/23 09:44:36 luoqi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.54 2008/08/17 17:34:07 imp Exp $"); /* * PCI:PCI bridge support. @@ -139,6 +139,8 @@ { struct pcib_softc *sc; uint8_t iolow; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); sc->dev = dev; @@ -148,6 +150,7 @@ */ sc->command = pci_read_config(dev, PCIR_COMMAND, 1); sc->domain = pci_get_domain(dev); + sc->pribus = pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->secstat = pci_read_config(dev, PCIR_SECSTAT_1, 2); @@ -155,6 +158,20 @@ sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); /* + * Setup sysctl reporting nodes + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->domain, 0, "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->pribus, 0, "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->secbus, 0, "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->subbus, 0, "Subordinate bus number"); + + /* * Determine current I/O decode. */ if (sc->command & PCIM_CMD_PORTEN) { @@ -276,14 +293,16 @@ /* * XXX If the secondary bus number is zero, we should assign a bus number - * since the BIOS hasn't, then initialise the bridge. - */ - - /* - * XXX If the subordinate bus number is less than the secondary bus number, + * since the BIOS hasn't, then initialise the bridge. A simple + * bus_alloc_resource with the a couple of busses seems like the right + * approach, but we don't know what busses the BIOS might have already + * assigned to other bridges on this bus that probe later than we do. + * + * If the subordinate bus number is less than the secondary bus number, * we should pick a better value. One sensible alternative would be to * pick 255; the only tradeoff here is that configuration transactions - * would be more widely routed than absolutely necessary. + * would be more widely routed than absolutely necessary. We could + * then do a walk of the tree later and fix it. */ } @@ -299,7 +318,7 @@ child = device_add_child(dev, "pci", sc->secbus); if (child != NULL) return(bus_generic_attach(dev)); - } + } /* no secondary bus; we should have fixed this */ return(0); @@ -447,7 +466,6 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ -#if 1 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -460,7 +478,6 @@ end = sc->pmemlimit; } } -#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage-commit2/src/sys/dev/pci/pcib_private.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.14 2008/08/16 20:18:40 imp Exp $ */ #ifndef __PCIB_PRIVATE_H__ @@ -48,9 +48,10 @@ #define PCIB_SUBTRACTIVE 0x1 #define PCIB_DISABLE_MSI 0x2 uint16_t command; /* command register */ - uint32_t domain; /* domain number */ - uint8_t secbus; /* secondary bus number */ - uint8_t subbus; /* subordinate bus number */ + u_int domain; /* domain number */ + u_int pribus; /* primary bus number */ + u_int secbus; /* secondary bus number */ + u_int subbus; /* subordinate bus number */ pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ ==== //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ + * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.26 2008/08/17 23:27:27 bz Exp $ */ #include <sys/param.h> ==== //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/xen/blkfront/blkfront.c,v 1.1 2008/08/12 20:01:57 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/blkfront/blkfront.c,v 1.2 2008/08/17 23:33:33 kmacy Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,8 +129,8 @@ static struct mtx blkif_io_lock; -static unsigned long -pfn_to_mfn(unsigned long pfn) +static vm_paddr_t +pfn_to_mfn(vm_paddr_t pfn) { return (phystomach(pfn << PAGE_SHIFT) >> PAGE_SHIFT); } @@ -241,7 +241,8 @@ "virtual-device", "%i", &vdevice); if (err != 1) { xenbus_dev_fatal(dev, err, "reading virtual-device"); - return err; + printf("couldn't find virtual device"); + return (err); } info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT|M_ZERO); @@ -660,10 +661,10 @@ static int blkif_queue_request(struct bio *bp) { caddr_t alignbuf; - unsigned long buffer_ma; + vm_paddr_t buffer_ma; blkif_request_t *ring_req; unsigned long id; - unsigned int fsect, lsect; + uint64_t fsect, lsect; struct xb_softc *sc = (struct xb_softc *)bp->bio_disk->d_drv1; struct blkfront_info *info = sc->xb_info; int ref; @@ -841,7 +842,7 @@ } if ( unlikely(bret->status != BLKIF_RSP_OKAY) ) { - XENPRINTF("Bad return from blkdev data request: %x\n", + printf("Bad return from blkdev data request: %x\n", bret->status); bp->bio_flags |= BIO_ERROR; } ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.32 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.29 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/bio.h> ==== //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.13 2008/03/12 10:11:57 jeff Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.14 2008/08/15 20:58:57 kmacy Exp $ machine i386 @@ -22,3 +22,7 @@ # Default partitioning schemes options GEOM_BSD options GEOM_MBR + +# enable support for native hardware +options NATIVE +device atpic ==== //depot/projects/vimage-commit2/src/sys/i386/i386/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.93 2008/07/15 03:34:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.94 2008/08/15 20:51:31 kmacy Exp $"); #include <sys/param.h> #include <sys/kdb.h> @@ -144,6 +144,11 @@ int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, int flags); +#ifdef XEN +#undef pmap_kextract +#define pmap_kextract pmap_kextract_ma +#endif + /* * Return true if a match is made. * ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/i386/i386/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.162 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.163 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -228,3 +228,9 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include <machine/xen/hypervisor.h> +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.670 2008/04/25 05:18:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.672 2008/08/17 23:38:14 kmacy Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -141,6 +141,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include <machine/xen/xen-os.h> +#include <machine/xen/hypervisor.h> +#include <machine/xen/xen-os.h> +#include <machine/xen/xenvar.h> +#include <machine/xen/xenfunc.h> +#include <machine/xen/xen_intr.h> + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +extern unsigned long physfree; +#endif /* XEN */ + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -287,8 +306,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1118,6 +1138,24 @@ return (0); } + +void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ + +#ifdef XEN + +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_hlt(int busy) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1128,8 +1166,6 @@ __asm__ ("hlt"); } -void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ - static void cpu_idle_hlt(int busy) { @@ -1143,6 +1179,7 @@ else __asm __volatile("sti; hlt"); } +#endif static void cpu_idle_acpi(int busy) @@ -1437,10 +1474,16 @@ */ int _default_ldt; + +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1465,7 +1508,7 @@ { 0x0, /* segment base address */ 0x0, /* length */ 0, /* segment type */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 18 06:45:31 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0681065679; Mon, 18 Aug 2008 06:45:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 303F31065673 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 06:45:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 253128FC0A for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 06:45:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7I6jUPf073754 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 06:45:31 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7I6jUhL073751 for perforce@freebsd.org; Mon, 18 Aug 2008 06:45:30 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 06:45:30 GMT Message-Id: <200808180645.m7I6jUhL073751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 06:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=147696 Change 147696 by ed@ed_dull on 2008/08/18 06:45:21 IFC. (the vimage stuff) Affected files ... .. //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#5 integrate .. //depot/projects/mpsafetty/sys/conf/options#4 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/mpsafetty/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/exception.s#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mib.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_poll.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/mpsafetty/sys/net/bridgestp.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_ef.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_faith.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_loop.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_mib.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_stf.c#2 integrate .. //depot/projects/mpsafetty/sys/net/if_vlan.c#3 integrate .. //depot/projects/mpsafetty/sys/net/raw_cb.c#3 integrate .. //depot/projects/mpsafetty/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/mpsafetty/sys/net/route.c#3 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_gif.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip6.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_options.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_output.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/dest6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/frag6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/route6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/scope6.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/key.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/key_debug.h#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#3 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#1 branch .. //depot/projects/mpsafetty/sys/vm/vm_page.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/gnttab.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tar/matching.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,6 +34,7 @@ #include <sys/sysctl.h> #include <sys/kernel.h> #include <sys/kerneldump.h> +#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/elf.h> @@ -118,7 +119,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,6 +34,7 @@ #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> +#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/atomic.h> @@ -94,7 +95,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/mpsafetty/sys/arm/arm/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -34,6 +34,7 @@ #include <sys/kernel.h> #include <sys/proc.h> #include <sys/kerneldump.h> +#include <sys/vimage.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/elf.h> @@ -116,7 +117,7 @@ kdh->dumplength = htod64(dumplen); kdh->dumptime = htod64(time_second); kdh->blocksize = htod32(blksz); - strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); + strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); ==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -71,6 +71,7 @@ #include <sys/user.h> #include <sys/vmmeter.h> #include <sys/vnode.h> +#include <sys/vimage.h> #include <net/if.h> @@ -1008,7 +1009,7 @@ "bytes packets errs drop fifo frame compressed"); IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); sbuf_printf(sb, "%6.6s:", ifname); sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ", ==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,6 +56,8 @@ #include <sys/sx.h> #include <sys/tty.h> #include <sys/uio.h> +#include <sys/vimage.h> + #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> @@ -2059,7 +2061,7 @@ /* Determine the (relative) unit number for ethernet interfaces */ ethno = 0; IFNET_RLOCK(); - TAILQ_FOREACH(ifscan, &ifnet, if_link) { + TAILQ_FOREACH(ifscan, &V_ifnet, if_link) { if (ifscan == ifp) { IFNET_RUNLOCK(); return (snprintf(buffer, buflen, "eth%d", ethno)); @@ -2098,7 +2100,7 @@ index = 0; is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { /* * Allow Linux programs to use FreeBSD names. Don't presume * we never have an interface named "eth", so don't make @@ -2142,7 +2144,7 @@ /* handle the 'request buffer size' case */ if (ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct sockaddr *sa = ifa->ifa_addr; if (sa->sa_family == AF_INET) @@ -2169,7 +2171,7 @@ /* Return all AF_INET addresses of all interfaces */ IFNET_RLOCK(); /* could sleep XXX */ - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { int addrs = 0; bzero(&ifr, sizeof(ifr)); ==== //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.223 2008/07/23 17:19:02 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.224 2008/08/17 23:27:27 bz Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,6 +64,7 @@ #include <sys/vnode.h> #include <sys/wait.h> #include <sys/cpuset.h> +#include <sys/vimage.h> #include <security/mac/mac_framework.h> @@ -765,7 +766,7 @@ strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME); #endif /* __i386__ */ mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME); + strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); mtx_unlock(&hostname_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); ==== //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -50,6 +50,7 @@ #include <sys/uio.h> #include <sys/syslog.h> #include <sys/un.h> +#include <sys/vimage.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -588,7 +589,7 @@ * XXX: Avoid undefined symbol error with an IPv4 only * kernel. */ - && ip6_v6only + && V_ip6_v6only #endif ) { int v6only; ==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -36,6 +36,7 @@ #include <sys/filedesc.h> #include <sys/sockio.h> #include <sys/socket.h> +#include <sys/vimage.h> #include <net/if.h> @@ -103,7 +104,7 @@ * entry per physical interface? */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) if (TAILQ_EMPTY(&ifp->if_addrhead)) ifnum++; else ==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_stat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.25 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -43,6 +43,7 @@ #include <sys/sysctl.h> #include <sys/sysproto.h> #include <sys/un.h> +#include <sys/vimage.h> #include <vm/vm.h> @@ -426,7 +427,7 @@ break; case SVR4_SI_HOSTNAME: - str = hostname; + str = V_hostname; break; case SVR4_SI_RELEASE: @@ -455,7 +456,7 @@ case SVR4_SI_SRPC_DOMAIN: /* XXXRW: locking? */ - str = domainname; + str = V_domainname; break; case SVR4_SI_PLATFORM: ==== //depot/projects/mpsafetty/sys/conf/files.i386#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -276,7 +276,7 @@ i386/i386/io.c optional io i386/i386/io_apic.c optional apic i386/i386/k6_mem.c optional mem -i386/i386/legacy.c standard +i386/i386/legacy.c optional native i386/i386/local_apic.c optional apic i386/i386/locore.s optional native no-obj i386/xen/locore.s optional xen no-obj ==== //depot/projects/mpsafetty/sys/conf/options#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.633 2008/07/18 14:44:51 dwmalone Exp $ +# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ # # On the handling of kernel options # @@ -765,3 +765,6 @@ #Disable code to dispatch tcp offloading TCP_OFFLOAD_DISABLE opt_inet.h + +# Virtualize the network stack +VIMAGE ==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.10 2007/07/12 17:00:51 njl Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* @@ -77,6 +77,7 @@ #include <sys/bus.h> #include <sys/cpu.h> #include <sys/eventhandler.h> +#include <sys/vimage.h> #include <machine/clock.h> #endif #if defined(__i386__) @@ -460,7 +461,7 @@ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) IFNET_RLOCK(); #endif - for (ifp = TAILQ_FIRST(&ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { + for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { /* read from if_snd unlocked */ if (!TBR_IS_ENABLED(&ifp->if_snd)) continue; ==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -33,6 +33,9 @@ # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA # endif +# if (__FreeBSD_version >= 800044) +# include <sys/vimage.h> +# endif # endif # include <sys/filio.h> #else @@ -155,7 +158,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */ #endif ==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -62,6 +62,12 @@ #else # include <sys/select.h> #endif +#if __FreeBSD_version >= 800044 +# include <sys/vimage.h> +#else +#define V_path_mtu_discovery path_mtu_discovery +#define V_ipforwarding ipforwarding +#endif #include <net/if.h> #if __FreeBSD_version >= 300000 @@ -234,7 +240,7 @@ fr_running = 1; if (fr_control_forwarding & 1) - ipforwarding = 1; + V_ipforwarding = 1; SPL_X(s); #if (__FreeBSD_version >= 300000) @@ -257,7 +263,7 @@ int s; #endif if (fr_control_forwarding & 2) - ipforwarding = 0; + V_ipforwarding = 0; SPL_NET(s); @@ -652,11 +658,11 @@ ip->ip_tos = oip->ip_tos; ip->ip_id = fin->fin_ip->ip_id; #if (__FreeBSD_version > 460000) - ip->ip_off = path_mtu_discovery ? IP_DF : 0; + ip->ip_off = V_path_mtu_discovery ? IP_DF : 0; #else ip->ip_off = 0; #endif - ip->ip_ttl = ip_defttl; + ip->ip_ttl = V_ip_defttl; ip->ip_sum = 0; hlen = sizeof(*oip); break; ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ @@ -92,6 +92,7 @@ #include <sys/kthread.h> #include <sys/lock.h> #include <sys/sx.h> +#include <sys/vimage.h> #else #include <sys/rwlock.h> #endif @@ -1917,13 +1918,13 @@ h->ip_hl = sizeof(*h) >> 2; h->ip_tos = IPTOS_LOWDELAY; #ifdef __FreeBSD__ - h->ip_off = path_mtu_discovery ? IP_DF : 0; + h->ip_off = V_path_mtu_discovery ? IP_DF : 0; h->ip_len = len; #else h->ip_off = htons(ip_mtudisc ? IP_DF : 0); h->ip_len = htons(len); #endif - h->ip_ttl = ttl ? ttl : ip_defttl; + h->ip_ttl = ttl ? ttl : V_ip_defttl; h->ip_sum = 0; if (eh == NULL) { #ifdef __FreeBSD__ @@ -2954,7 +2955,7 @@ sport = pd->hdr.tcp->th_sport; dport = pd->hdr.tcp->th_dport; #ifdef __FreeBSD__ - pi = &tcbinfo; + pi = &V_tcbinfo; #else tb = &tcbtable; #endif @@ -2965,7 +2966,7 @@ sport = pd->hdr.udp->uh_sport; dport = pd->hdr.udp->uh_dport; #ifdef __FreeBSD__ - pi = &udbinfo; + pi = &V_udbinfo; #else tb = &udbtable; #endif @@ -3103,7 +3104,7 @@ int hlen; u_int8_t hdr[60]; u_int8_t *opt, optlen; - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; hlen = th_off << 2; /* hlen <= sizeof(hdr) */ if (hlen <= sizeof(struct tcphdr)) @@ -3148,7 +3149,7 @@ #endif /* INET6 */ struct rtentry *rt = NULL; int hlen = 0; /* make the compiler happy */ - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; switch (af) { #ifdef INET @@ -3196,7 +3197,7 @@ if (rt && rt->rt_ifp) { mss = rt->rt_ifp->if_mtu - hlen - sizeof(struct tcphdr); - mss = max(tcp_mssdflt, mss); + mss = max(V_tcp_mssdflt, mss); RTFREE(rt); } mss = min(mss, offer); @@ -3252,7 +3253,7 @@ u_short reason; int rewrite = 0; int tag = -1, rtableid = -1; - u_int16_t mss = tcp_mssdflt; + u_int16_t mss = V_tcp_mssdflt; int asd = 0; int match = 0; @@ -6152,7 +6153,7 @@ if (r->rt == PF_FASTROUTE) { in_rtalloc(ro, 0); if (ro->ro_rt == 0) { - ipstat.ips_noroute++; + V_ipstat.ips_noroute++; goto bad; } @@ -6283,16 +6284,16 @@ if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) && ifp->if_bridge == NULL) { m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; - ipstat.ips_outhwcsum++; + V_ipstat.ips_outhwcsum++; } else { ip->ip_sum = 0; ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } /* Update relevant hardware checksum stats for TCP/UDP */ if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT) - tcpstat.tcps_outhwcsum++; + V_tcpstat.tcps_outhwcsum++; else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT) - udpstat.udps_outhwcsum++; + V_udpstat.udps_outhwcsum++; error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL); goto done; } @@ -6302,7 +6303,7 @@ * Must be able to put at least 8 bytes per fragment. */ if (ip->ip_off & htons(IP_DF)) { - ipstat.ips_cantfrag++; + V_ipstat.ips_cantfrag++; if (r->rt != PF_DUPTO) { #ifdef __FreeBSD__ /* icmp_error() expects host byte ordering */ @@ -6359,7 +6360,7 @@ } if (error == 0) - ipstat.ips_fragmented++; + V_ipstat.ips_fragmented++; done: if (r->rt != PF_DUPTO) @@ -6632,17 +6633,17 @@ if (sum) { switch (p) { case IPPROTO_TCP: - tcpstat.tcps_rcvbadsum++; + V_tcpstat.tcps_rcvbadsum++; break; case IPPROTO_UDP: - udpstat.udps_badsum++; + V_udpstat.udps_badsum++; break; case IPPROTO_ICMP: - icmpstat.icps_checksum++; + V_icmpstat.icps_checksum++; break; #ifdef INET6 case IPPROTO_ICMPV6: - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; break; #endif /* INET6 */ } @@ -6728,17 +6729,17 @@ m->m_pkthdr.csum_flags |= flag_bad; switch (p) { case IPPROTO_TCP: - tcpstat.tcps_rcvbadsum++; + V_tcpstat.tcps_rcvbadsum++; break; case IPPROTO_UDP: - udpstat.udps_badsum++; + V_udpstat.udps_badsum++; break; case IPPROTO_ICMP: - icmpstat.icps_checksum++; + V_icmpstat.icps_checksum++; break; #ifdef INET6 case IPPROTO_ICMPV6: - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; break; #endif /* INET6 */ } ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); #endif #include <sys/param.h> @@ -54,6 +54,7 @@ #include <sys/device.h> #endif #include <sys/time.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> @@ -141,9 +142,9 @@ struct ifnet *ifp; IFNET_RLOCK(); - TAILQ_FOREACH(ifg, &ifg_head, ifg_next) + TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next) pfi_attach_ifgroup(ifg); - TAILQ_FOREACH(ifp, &ifnet, if_link) + TAILQ_FOREACH(ifp, &V_ifnet, if_link) pfi_attach_ifnet(ifp); IFNET_RUNLOCK(); ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ @@ -86,6 +86,7 @@ #include <sys/conf.h> #include <sys/proc.h> #include <sys/sysctl.h> +#include <sys/vimage.h> #else #include <sys/timeout.h> #include <sys/pool.h> @@ -3713,7 +3714,7 @@ * order to support scoped addresses. In order to support stateful * filtering we have change this to lo0 as it is the case in IPv4. */ - chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m, + chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &V_loif[0] : ifp, m, NULL, inp); if (chk && *m) { m_freem(*m); ==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -45,6 +45,7 @@ #include <sys/socketvar.h> #include <sys/systm.h> #include <sys/time.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/if_types.h> @@ -127,9 +128,9 @@ struct pf_state_host *src, *dst; /* Seed if this is the first use, reseed if requested. */ - if (isn_last_reseed == 0) { - read_random(&isn_secret, sizeof(isn_secret)); - isn_last_reseed = ticks; + if (V_isn_last_reseed == 0) { + read_random(&V_isn_secret, sizeof(V_isn_secret)); + V_isn_last_reseed = ticks; } if (s->direction == PF_IN) { @@ -141,28 +142,28 @@ } /* Compute the md5 hash and return the ISN. */ - MD5Init(&isn_ctx); - MD5Update(&isn_ctx, (u_char *) &dst->port, sizeof(u_short)); - MD5Update(&isn_ctx, (u_char *) &src->port, sizeof(u_short)); + MD5Init(&V_isn_ctx); + MD5Update(&V_isn_ctx, (u_char *) &dst->port, sizeof(u_short)); + MD5Update(&V_isn_ctx, (u_char *) &src->port, sizeof(u_short)); #ifdef INET6 if (s->af == AF_INET6) { - MD5Update(&isn_ctx, (u_char *) &dst->addr, + MD5Update(&V_isn_ctx, (u_char *) &dst->addr, sizeof(struct in6_addr)); - MD5Update(&isn_ctx, (u_char *) &src->addr, + MD5Update(&V_isn_ctx, (u_char *) &src->addr, sizeof(struct in6_addr)); } else #endif { - MD5Update(&isn_ctx, (u_char *) &dst->addr, + MD5Update(&V_isn_ctx, (u_char *) &dst->addr, sizeof(struct in_addr)); - MD5Update(&isn_ctx, (u_char *) &src->addr, + MD5Update(&V_isn_ctx, (u_char *) &src->addr, sizeof(struct in_addr)); } - MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); - MD5Final((u_char *) &md5_buffer, &isn_ctx); + MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret)); + MD5Final((u_char *) &md5_buffer, &V_isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - isn_offset += ISN_STATIC_INCREMENT + + V_isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += isn_offset; + new_isn += V_isn_offset; return (new_isn); } ==== //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/condvar.h> @@ -46,6 +46,7 @@ #include <sys/taskqueue.h> #include <sys/priv.h> #include <sys/syslog.h> +#include <sys/vimage.h> #include <netinet/in.h> #include <netinet/in_pcb.h> @@ -1962,18 +1963,18 @@ if (ret) goto err1; - if (port > ipport_lastauto) { - if (next_port != ipport_firstauto) { + if (port > V_ipport_lastauto) { + if (next_port != V_ipport_firstauto) { kvl_delete(ps, port); - next_port = ipport_firstauto; + next_port = V_ipport_firstauto; goto retry; } ret = EADDRNOTAVAIL; goto err2; } - if (port == ipport_lastauto) - next_port = ipport_firstauto; + if (port == V_ipport_lastauto) + next_port = V_ipport_firstauto; else next_port = port + 1; @@ -1997,7 +1998,7 @@ sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr; snum = ntohs(sin->sin_port); - if (snum <= ipport_reservedhigh && snum >= ipport_reservedlow && + if (snum <= V_ipport_reservedhigh && snum >= V_ipport_reservedlow && priv_check(curthread, PRIV_NETINET_RESERVEDPORT)) return (EACCES); @@ -2917,8 +2918,8 @@ arc4rand(&next_port, sizeof next_port, 0); next_port = ((unsigned int) next_port % - (ipport_lastauto - ipport_firstauto)) + - ipport_firstauto; + (V_ipport_lastauto - V_ipport_firstauto)) + + V_ipport_firstauto; cma_wq = taskqueue_create("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue, &cma_wq); ==== //depot/projects/mpsafetty/sys/ddb/db_textdump.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include "opt_config.h" @@ -68,6 +68,7 @@ #include <sys/msgbuf.h> #include <sys/sysctl.h> >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 18 08:44:32 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF27A106567E; Mon, 18 Aug 2008 08:44:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B25F4106567A for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 08:44:31 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90F8B8FC16 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 08:44:31 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7I8iVL1087315 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 08:44:31 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7I8iVBo087312 for perforce@freebsd.org; Mon, 18 Aug 2008 08:44:31 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 08:44:31 GMT Message-Id: <200808180844.m7I8iVBo087312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 08:44:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147698 Change 147698 by konrad@vspredator on 2008/08/18 08:43:47 Fix unitialized variable. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/sort/sort.c#4 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/sort/sort.c#4 (text+ko) ==== @@ -69,7 +69,7 @@ char *p; int ch; int num_lines; /* Number of lines read from input. */ - int xfrm; /* Do we use strxfrm? */ + int xfrm = 0; /* Do we use strxfrm? */ while ((ch = getopt(argc, argv, "xh")) != -1) { switch (ch) { From owner-p4-projects@FreeBSD.ORG Mon Aug 18 09:07:55 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4DB01065681; Mon, 18 Aug 2008 09:07:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 785D61065688 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7149C8FC12 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7I97tmH099610 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 09:07:55 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7I97tJL099608 for perforce@freebsd.org; Mon, 18 Aug 2008 09:07:55 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 09:07:55 GMT Message-Id: <200808180907.m7I97tJL099608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 09:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147700 Change 147700 by konrad@vspredator on 2008/08/18 09:06:59 Disable additional conversions, to ease debugging. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/sort/sort.c#5 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/sort/sort.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ } *lines[MAXSIZE]; static int -read_input(void) +read_input(int xfrm) { char buf[1000]; int i = 0, len; @@ -26,10 +26,12 @@ err(1, "malloc"); if ((line->sline = strdup(buf)) == NULL) err(1, "strdup"); - len = strxfrm(NULL, buf, 0); - if ((line->trans = malloc(len + 1)) == NULL) - err(1, "malloc"); - strxfrm(line->trans, buf, len); + if (xfrm) { + len = strxfrm(NULL, buf, 0); + if ((line->trans = malloc(len + 1)) == NULL) + err(1, "malloc"); + strxfrm(line->trans, buf, len); + } lines[i] = line; i++; } @@ -91,7 +93,7 @@ } if ((p = setlocale(LC_ALL, "")) == NULL) errx(1, "setlocale"); - num_lines = read_input(); + num_lines = read_input(xfrm); fprintf(stderr, "setlocale: %s\n", p); if (xfrm) qsort(lines, num_lines, sizeof(struct line *), strcmp_compare); From owner-p4-projects@FreeBSD.ORG Mon Aug 18 10:07:57 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F243B1065687; Mon, 18 Aug 2008 10:07:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1FE61065694 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 10:07:56 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC06C8FC23 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 10:07:56 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IA7unl008827 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 10:07:56 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IA7umY008825 for perforce@freebsd.org; Mon, 18 Aug 2008 10:07:56 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 10:07:56 GMT Message-Id: <200808181007.m7IA7umY008825@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147705 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 10:07:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147705 Change 147705 by ed@ed_dull on 2008/08/18 10:06:58 Increment the FreeBSD version and already prepare a note for the UPDATING file. Affected files ... .. //depot/projects/mpsafetty/UPDATING#4 edit .. //depot/projects/mpsafetty/sys/sys/param.h#6 edit Differences ... ==== //depot/projects/mpsafetty/UPDATING#4 (text+ko) ==== @@ -22,6 +22,25 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080820: + The TTY subsystem of the kernel has been replaced by a new + implementation, which provides better scalability and an + improved driver model. Most common drivers have been migrated to + the new TTY subsystem, while others have not. The following + drivers have not yet been ported to the new TTY layer yet: + + PCI/ISA: + cy, digi, rc, rp, si, sio + + USB: + ubser, ucycom, ufoma + + Line disciplines: + ng_h4, ng_tty, ppp, sl, snp + + Adding these drivers to your kernel configuration file shall + cause compilation to fail. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the ==== //depot/projects/mpsafetty/sys/sys/param.h#6 (text+ko) ==== @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800044 /* Master, propagated to newvers */ +#define __FreeBSD_version 800045 /* Master, propagated to newvers */ #ifndef LOCORE #include <sys/types.h> From owner-p4-projects@FreeBSD.ORG Mon Aug 18 11:15:09 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7360F1065693; Mon, 18 Aug 2008 11:15:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F5E2106567B for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:15:09 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1A5E8FC16 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:15:07 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IBF7c6023656 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:15:07 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IBF7ne023652 for perforce@freebsd.org; Mon, 18 Aug 2008 11:15:07 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 11:15:07 GMT Message-Id: <200808181115.m7IBF7ne023652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 11:15:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147709 Change 147709 by konrad@vspredator on 2008/08/18 11:14:10 Finally, fix the bug which caused above then second level sorting to be skipped. Also, fix a possible stack overwriting if __collate_info->directive_count > COLL_WEIGHTS_MAX. Minor enhacement to generate_apple - can now regenerate just one file, instead of them all. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#6 edit .. //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#8 edit .. //depot/projects/soc2008/konrad_collation/libc/string/strxfrm.c#9 edit .. //depot/projects/soc2008/konrad_collation/libc/string/wcscoll.c#7 edit .. //depot/projects/soc2008/konrad_collation/scripts/generate_apple.sh#3 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#6 (text+ko) ==== @@ -286,11 +286,13 @@ if (localedef) { if (nsubst[0] == nsubst[1] && (nsubst[0] == 0 || memcmp(__collate_substitute_table[0], __collate_substitute_table[1], nsubst[0] * sizeof(struct __collate_st_subst)) == 0)) { - info.flags |= COLLATE_SUBST_DUP; + if (COLL_WEIGHTS_MAX == 2) + info.flags |= COLLATE_SUBST_DUP; nsubst[1] = 0; } } else { - info.flags |= COLLATE_SUBST_DUP; + if (COLL_WEIGHTS_MAX == 2) + info.flags |= COLLATE_SUBST_DUP; nsubst[1] = 0; } ==== //depot/projects/soc2008/konrad_collation/libc/locale/collate.c#8 (text+ko) ==== @@ -178,8 +178,12 @@ vp += info.subst_count[0] * sizeof(struct __collate_st_subst); } else TMP->__substitute_table[0] = NULL; - if (info.flags & COLLATE_SUBST_DUP) + if (info.flags & COLLATE_SUBST_DUP) { +#ifdef LOCALE_DEBUG + fprintf(stderr, "COLLATE_SUBST_DUP in effect\n"); +#endif TMP->__substitute_table[1] = TMP->__substitute_table[0]; + } else if (info.subst_count[1] > 0) { TMP->__substitute_table[1] = (struct __collate_st_subst *)vp; vp += info.subst_count[1] * sizeof(struct __collate_st_subst); @@ -242,6 +246,8 @@ #ifdef LOCALE_DEBUG fprintf(stderr, "__collate_load_tables: loaded successfully\n"); #endif + if (__collate_info->directive_count > COLL_WEIGHTS_MAX) + __collate_info->directive_count = COLL_WEIGHTS_MAX; return (_LDP_LOADED); } @@ -520,6 +526,9 @@ else t = (const wchar_t *)src; sverrno = errno; +#ifdef LOCALE_DEBUG + fprintf(stderr, "allocating xf[%d]\n", pass); +#endif if ((xf[pass] = (wchar_t *)malloc(sizeof(wchar_t) * (wcslen(t) + 1))) == NULL) { errno = sverrno; ==== //depot/projects/soc2008/konrad_collation/libc/string/strxfrm.c#9 (text+ko) ==== @@ -138,7 +138,7 @@ } sverrno = errno; free(wcs); - for (i = 0; i < COLL_WEIGHTS_MAX; i++) + for (i = 0; i < __collate_data->__info.directive_count; i++) free(xf[i]); errno = sverrno; ==== //depot/projects/soc2008/konrad_collation/libc/string/wcscoll.c#7 (text+ko) ==== @@ -60,7 +60,8 @@ if ((info->directive[0] & NOTFORWARD) || (info->directive[1] & NOTFORWARD) || (!(info->flags && COLLATE_SUBST_DUP) && - (info->subst_count[0] > 0 || info->subst_count[1] > 0))) { + (info->subst_count[0] > 0 || info->subst_count[1] > 0)) || + COLL_WEIGHTS_MAX > 2) { int direc, pass; for(pass = 0; pass < info->directive_count; pass++) { direc = info->directive[pass]; ==== //depot/projects/soc2008/konrad_collation/scripts/generate_apple.sh#3 (text+ko) ==== @@ -1,8 +1,12 @@ #!/bin/sh [ -d ../locale ] || mkdir ../locale +MASK="*" +if [ "$1" != "" ]; then + MASK="$1" +fi -for f in `echo ../posix/*.src`; do +for f in `echo ../posix/$MASK.src`; do NAME=`echo $f | awk -F '.' ' { print $3 } ' | \ awk -F '/' ' { print $3 } '` NAME="$NAME.UTF-8" @@ -11,5 +15,4 @@ [ -d ../locale/$NAME ] || mkdir ../locale/$NAME ../colldef.apple/colldef -o ../locale/$NAME/LC_COLLATE collate_in.src done -rm colldef_in.src -rm colldef_in.src.simple +rm collate_in.src From owner-p4-projects@FreeBSD.ORG Mon Aug 18 11:16:09 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AA6E106567F; Mon, 18 Aug 2008 11:16:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF3F31065677 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C96D28FC16 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IBG84e023743 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 11:16:08 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IBG8i8023741 for perforce@freebsd.org; Mon, 18 Aug 2008 11:16:08 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 11:16:08 GMT Message-Id: <200808181116.m7IBG8i8023741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 11:16:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=147710 Change 147710 by konrad@vspredator on 2008/08/18 11:15:11 Fix memory leak in wcsxfrm - analogous to the fix to strxfrm earlier this week. Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/string/wcsxfrm.c#7 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/string/wcsxfrm.c#7 (text+ko) ==== @@ -43,8 +43,9 @@ wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len) { size_t slen; - wchar_t *xf[2]; + wchar_t *xf[COLL_WEIGHTS_MAX]; int sverrno; + int i; if (*src == L'\0') { if (len != 0) @@ -91,8 +92,9 @@ *dest = 0; } sverrno = errno; - free(xf[0]); - free(xf[1]); + for (i = 0; i < __collate_data->__info.directive_count; i++) { + free(xf[i]); + } errno = sverrno; return (slen); From owner-p4-projects@FreeBSD.ORG Mon Aug 18 12:38:33 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 038761065674; Mon, 18 Aug 2008 12:38:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBC061065671 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:38:32 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B9C88FC1B for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:38:32 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ICcWLY032473 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:38:32 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ICcWkB032471 for perforce@freebsd.org; Mon, 18 Aug 2008 12:38:32 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 12:38:32 GMT Message-Id: <200808181238.m7ICcWkB032471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 12:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147715 Change 147715 by konrad@vspredator on 2008/08/18 12:38:10 Add a collation file that contains all the languages. Will need some more polishing to work with colldef.apple. Affected files ... .. //depot/projects/soc2008/konrad_collation/posix/universal.UTF-8.src#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 18 12:44:39 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CB63106567C; Mon, 18 Aug 2008 12:44:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F1531065673 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:44:39 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2C4A8FC2B for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:44:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ICicIP033096 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 12:44:38 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ICicUF033094 for perforce@freebsd.org; Mon, 18 Aug 2008 12:44:38 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 12:44:38 GMT Message-Id: <200808181244.m7ICicUF033094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 12:44:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=147716 Change 147716 by ed@ed_dull on 2008/08/18 12:43:43 Remove redundant "yet". Spotted by: remko Affected files ... .. //depot/projects/mpsafetty/UPDATING#5 edit Differences ... ==== //depot/projects/mpsafetty/UPDATING#5 (text+ko) ==== @@ -27,7 +27,7 @@ implementation, which provides better scalability and an improved driver model. Most common drivers have been migrated to the new TTY subsystem, while others have not. The following - drivers have not yet been ported to the new TTY layer yet: + drivers have not yet been ported to the new TTY layer: PCI/ISA: cy, digi, rc, rp, si, sio From owner-p4-projects@FreeBSD.ORG Mon Aug 18 13:28:26 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E6F01065677; Mon, 18 Aug 2008 13:28:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 320C7106566C for <perforce@freebsd.org>; Mon, 18 Aug 2008 13:28:26 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25F2D8FC12 for <perforce@freebsd.org>; Mon, 18 Aug 2008 13:28:26 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IDSPpp047144 for <perforce@freebsd.org>; Mon, 18 Aug 2008 13:28:25 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IDSPV8047142 for perforce@freebsd.org; Mon, 18 Aug 2008 13:28:25 GMT (envelope-from bz@freebsd.org) Date: Mon, 18 Aug 2008 13:28:25 GMT Message-Id: <200808181328.m7IDSPV8047142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 13:28:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147720 Change 147720 by bz@bz_dumpster on 2008/08/18 13:27:50 IFC @147719 After step 1.5.1 resolve file local statics with conflicting names. Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/rpcclnt.c#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ */ #include "opt_atpic.h" @@ -636,13 +636,10 @@ .globl doreti_iret_fault doreti_iret_fault: subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */ - testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ - swapgs -1: testl $PSL_I,TF_RFLAGS(%rsp) - jz 2f + testl $PSL_I,TF_RFLAGS(%rsp) + jz 1f sti -2: movq %rdi,TF_RDI(%rsp) +1: movq %rdi,TF_RDI(%rsp) movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) ==== //depot/projects/vimage-commit2/src/sys/dev/usb/ehci.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.64 2008/06/10 02:41:36 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.66 2008/08/18 10:39:59 kris Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,7 +129,10 @@ u_int length; } bulk; /* Iso pipe */ - /* XXX */ + struct { + u_int next_frame; + u_int cur_xfers; + } isoc; } u; }; @@ -139,6 +142,8 @@ static int ehci_intr1(ehci_softc_t *); static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle); static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *); +static void ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *); +static void ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *); static void ehci_idone(struct ehci_xfer *); static void ehci_timeout(void *); static void ehci_timeout_task(void *); @@ -205,6 +210,12 @@ static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *, ehci_soft_qtd_t *, ehci_soft_qtd_t *); +static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *); +static void ehci_free_itd(ehci_softc_t *, ehci_soft_itd_t *); +static void ehci_rem_free_itd_chain(ehci_softc_t *, + struct ehci_xfer *); +static void ehci_abort_isoc_xfer(usbd_xfer_handle, usbd_status); + static usbd_status ehci_device_request(usbd_xfer_handle xfer); static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *, @@ -228,6 +239,10 @@ static void ehci_dump_sqtd(ehci_soft_qtd_t *); static void ehci_dump_qtd(ehci_qtd_t *); static void ehci_dump_sqh(ehci_soft_qh_t *); +#ifdef notyet +static void ehci_dump_sitd(struct ehci_soft_itd *); +static void ehci_dump_itd(struct ehci_soft_itd *); +#endif #ifdef DIAGNOSTIC static void ehci_dump_exfer(struct ehci_xfer *); #endif @@ -414,8 +429,19 @@ return (err); DPRINTF(("%s: flsize=%d\n", device_get_nameunit(sc->sc_bus.bdev),sc->sc_flsize)); sc->sc_flist = KERNADDR(&sc->sc_fldma, 0); + + for (i = 0; i < sc->sc_flsize; i++) { + sc->sc_flist[i] = EHCI_NULL; + } + EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0)); + sc->sc_softitds = malloc(sc->sc_flsize * sizeof(ehci_soft_itd_t *), + M_USB, M_NOWAIT | M_ZERO); + if (sc->sc_softitds == NULL) + return (ENOMEM); + LIST_INIT(&sc->sc_freeitds); + /* Set up the bus struct. */ sc->sc_bus.methods = &ehci_bus_methods; sc->sc_bus.pipe_size = sizeof(struct ehci_pipe); @@ -714,19 +740,31 @@ void ehci_check_intr(ehci_softc_t *sc, struct ehci_xfer *ex) { + int attr; + + DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex)); + + attr = ex->xfer.pipe->endpoint->edesc->bmAttributes; + if (UE_GET_XFERTYPE(attr) == UE_ISOCHRONOUS) + ehci_check_itd_intr(sc, ex); + else + ehci_check_qh_intr(sc, ex); +} + +void +ehci_check_qh_intr(ehci_softc_t *sc, struct ehci_xfer *ex) +{ ehci_soft_qtd_t *sqtd, *lsqtd; u_int32_t status; - DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex)); - if (ex->sqtdstart == NULL) { - printf("ehci_check_intr: sqtdstart=NULL\n"); + printf("ehci_check_qh_intr: not valid sqtd\n"); return; } lsqtd = ex->sqtdend; #ifdef DIAGNOSTIC if (lsqtd == NULL) { - printf("ehci_check_intr: lsqtd==0\n"); + printf("ehci_check_qh_intr: lsqtd==0\n"); return; } #endif @@ -761,6 +799,64 @@ } void +ehci_check_itd_intr(ehci_softc_t *sc, struct ehci_xfer *ex) +{ + ehci_soft_itd_t *itd; + int i; + + if (ex->itdstart == NULL) { + printf("ehci_check_itd_intr: not valid itd\n"); + return; + } + + itd = ex->itdend; +#ifdef DIAGNOSTIC + if (itd == NULL) { + printf("ehci_check_itd_intr: itdend == 0\n"); + return; + } +#endif + + /* + * Step 1, check no active transfers in last itd, meaning we're finished + */ + for (i = 0; i < 8; i++) { + if (le32toh(itd->itd.itd_ctl[i]) & EHCI_ITD_ACTIVE) + break; + } + + if (i == 8) { + goto done; /* All 8 descriptors inactive, it's done */ + } + + /* + * Step 2, check for errors in status bits, throughout chain... + */ + + DPRINTFN(12, ("ehci_check_itd_intr: active ex=%p\n", ex)); + + for (itd = ex->itdstart; itd != ex->itdend; itd = itd->xfer_next) { + for (i = 0; i < 8; i++) { + if (le32toh(itd->itd.itd_ctl[i]) & (EHCI_ITD_BUF_ERR | + EHCI_ITD_BABBLE | EHCI_ITD_ERROR)) + break; + } + if (i != 8) { /* Error in one of the itds */ + goto done; + } + } /* itd search loop */ + + DPRINTFN(12, ("ehci_check_itd_intr: ex %p itd %p still active\n", ex, + ex->itdstart)); + return; +done: + DPRINTFN(12, ("ehci_check_itd_intr: ex=%p done\n", ex)); + callout_stop(&ex->xfer.timeout_handle); + usb_rem_task(ex->xfer.pipe->device, &ex->abort_task); + ehci_idone(ex); +} + +void ehci_idone(struct ehci_xfer *ex) { usbd_xfer_handle xfer = &ex->xfer; @@ -826,9 +922,64 @@ } /* The transfer is done, compute actual length and status. */ + if (UE_GET_XFERTYPE(xfer->pipe->endpoint->edesc->bmAttributes) + == UE_ISOCHRONOUS) { + /* Isoc transfer */ + struct ehci_soft_itd *itd; + int i, nframes, len, uframes; + + nframes = 0; + actlen = 0; + + switch (xfer->pipe->endpoint->edesc->bInterval) { + case 0: + panic("ehci: isoc xfer suddenly has 0 bInterval, " + "invalid\n"); + case 1: + uframes = 1; + break; + case 2: + uframes = 2; + break; + case 3: + uframes = 4; + break; + default: + uframes = 8; + break; + } + + for (itd = ex->itdstart; itd != NULL; itd = itd->xfer_next) { + for (i = 0; i < 8; i += uframes) { + /* XXX - driver didn't fill in the frame full + * of uframes. This leads to scheduling + * inefficiencies, but working around + * this doubles complexity of tracking + * an xfer. + */ + if (nframes >= xfer->nframes) + break; + + status = le32toh(itd->itd.itd_ctl[i]); + len = EHCI_ITD_GET_LEN(status); + xfer->frlengths[nframes++] = len; + actlen += len; + } + if (nframes >= xfer->nframes) + break; + } + xfer->actlen = actlen; + xfer->status = USBD_NORMAL_COMPLETION; + + goto end; + } + + /* Continue processing xfers using queue heads */ + lsqtd = ex->sqtdend; actlen = 0; - for (sqtd = ex->sqtdstart; sqtd != lsqtd->nextqtd; sqtd=sqtd->nextqtd) { + for (sqtd = ex->sqtdstart; sqtd != lsqtd->nextqtd; + sqtd =sqtd->nextqtd) { nstatus = le32toh(sqtd->qtd.qtd_status); if (nstatus & EHCI_QTD_ACTIVE) break; @@ -871,7 +1022,11 @@ } else { xfer->status = USBD_NORMAL_COMPLETION; } - +end: + /* XXX transfer_complete memcpys out transfer data (for in endpoints) + * during this call, before methods->done is called: dma sync required + * beforehand? + */ usb_transfer_complete(xfer); DPRINTFN(/*12*/2, ("ehci_idone: ex=%p done\n", ex)); } @@ -1319,11 +1474,51 @@ ehci_dump_qtd(&qh->qh_qtd); } +#ifdef notyet +void +ehci_dump_itd(struct ehci_soft_itd *itd) +{ + ehci_isoc_trans_t t; + ehci_isoc_bufr_ptr_t b, b2, b3; + int i; + + printf("ITD: next phys=%X\n", itd->itd.itd_next); + + for (i = 0; i < 8;i++) { + t = le32toh(itd->itd.itd_ctl[i]); + printf("ITDctl %d: stat=%X len=%X ioc=%X pg=%X offs=%X\n", i, + EHCI_ITD_GET_STATUS(t), EHCI_ITD_GET_LEN(t), + EHCI_ITD_GET_IOC(t), EHCI_ITD_GET_PG(t), + EHCI_ITD_GET_OFFS(t)); + } + printf("ITDbufr: "); + for (i = 0; i < 7; i++) + printf("%X,", EHCI_ITD_GET_BPTR(le32toh(itd->itd.itd_bufr[i]))); + + b = le32toh(itd->itd.itd_bufr[0]); + b2 = le32toh(itd->itd.itd_bufr[1]); + b3 = le32toh(itd->itd.itd_bufr[2]); + printf("\nep=%X daddr=%X dir=%d maxpkt=%X multi=%X\n", + EHCI_ITD_GET_EP(b), EHCI_ITD_GET_DADDR(b), EHCI_ITD_GET_DIR(b2), + EHCI_ITD_GET_MAXPKT(b2), EHCI_ITD_GET_MULTI(b3)); +} + +void +ehci_dump_sitd(struct ehci_soft_itd *itd) +{ + printf("SITD %p next=%p prev=%p xfernext=%p physaddr=%X slot=%d\n", + itd, itd->u.frame_list.next, itd->u.frame_list.prev, + itd->xfer_next, itd->physaddr, itd->slot); +} +#endif + #ifdef DIAGNOSTIC -static void +void ehci_dump_exfer(struct ehci_xfer *ex) { - printf("ehci_dump_exfer: ex=%p\n", ex); + printf("ehci_dump_exfer: ex=%p sqtdstart=%p end=%p itdstart=%p " + "end=%p isdone=%d\n", ex, ex->sqtdstart, ex->sqtdend, ex->itdstart, + ex->itdend, ex->isdone); } #endif #endif @@ -1366,6 +1561,8 @@ pipe->methods = &ehci_root_intr_methods; break; default: + DPRINTF(("ehci_open: bad bEndpointAddress 0x%02x\n", + ed->bEndpointAddress)); return (USBD_INVAL); } return (USBD_NORMAL_COMPLETION); @@ -1379,42 +1576,46 @@ default: panic("ehci_open: bad device speed %d", dev->speed); } if (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_ISOCHRONOUS) { - printf("%s: *** WARNING: opening low/full speed device, this " - "does not work yet.\n", - device_get_nameunit(sc->sc_bus.bdev)); + printf("%s: *** Error: opening low/full speed isoc device on" + "ehci, this does not work yet. Feel free to implement\n", + device_get_nameunit(sc->sc_bus.bdev)); DPRINTFN(1,("ehci_open: hshubaddr=%d hshubport=%d\n", hshubaddr, hshubport)); return USBD_INVAL; } naks = 8; /* XXX */ - sqh = ehci_alloc_sqh(sc); - if (sqh == NULL) - goto bad0; - /* qh_link filled when the QH is added */ - sqh->qh.qh_endp = htole32( - EHCI_QH_SET_ADDR(addr) | - EHCI_QH_SET_ENDPT(UE_GET_ADDR(ed->bEndpointAddress)) | - EHCI_QH_SET_EPS(speed) | - (xfertype == UE_CONTROL ? EHCI_QH_DTC : 0) | - EHCI_QH_SET_MPL(UGETW(ed->wMaxPacketSize)) | - (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_CONTROL ? - EHCI_QH_CTL : 0) | - EHCI_QH_SET_NRL(naks) - ); - sqh->qh.qh_endphub = htole32( - EHCI_QH_SET_MULT(1) | - EHCI_QH_SET_HUBA(hshubaddr) | - EHCI_QH_SET_PORT(hshubport) | - EHCI_QH_SET_CMASK(0x1c) | - EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x01 : 0) - ); - sqh->qh.qh_curqtd = EHCI_NULL; - /* The overlay qTD was already set up by ehci_alloc_sqh(). */ - sqh->qh.qh_qtd.qtd_status = - htole32(EHCI_QTD_SET_TOGGLE(pipe->endpoint->savedtoggle)); - - epipe->sqh = sqh; + /* Allocate sqh for everything, save isoc xfers */ + if (xfertype != UE_ISOCHRONOUS) { + sqh = ehci_alloc_sqh(sc); + if (sqh == NULL) + goto bad0; + /* qh_link filled when the QH is added */ + sqh->qh.qh_endp = htole32( + EHCI_QH_SET_ADDR(addr) | + EHCI_QH_SET_ENDPT(UE_GET_ADDR(ed->bEndpointAddress)) | + EHCI_QH_SET_EPS(speed) | + (xfertype == UE_CONTROL ? EHCI_QH_DTC : 0) | + EHCI_QH_SET_MPL(UGETW(ed->wMaxPacketSize)) | + (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_CONTROL ? + EHCI_QH_CTL : 0) | + EHCI_QH_SET_NRL(naks) + ); + sqh->qh.qh_endphub = htole32( + EHCI_QH_SET_MULT(1) | + EHCI_QH_SET_HUBA(hshubaddr) | + EHCI_QH_SET_PORT(hshubport) | + EHCI_QH_SET_CMASK(0x1c) | + EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x01 : 0) + ); + sqh->qh.qh_curqtd = EHCI_NULL; + /* The overlay qTD was already set up by ehci_alloc_sqh(). */ + sqh->qh.qh_qtd.qtd_status = + htole32(EHCI_QTD_SET_TOGGLE(pipe->endpoint->savedtoggle)); + epipe->sqh = sqh; + } else { + sqh = NULL; + } switch (xfertype) { case UE_CONTROL: @@ -1445,14 +1646,29 @@ return (ehci_device_setintr(sc, sqh, ival)); case UE_ISOCHRONOUS: pipe->methods = &ehci_device_isoc_methods; - return (USBD_INVAL); + if (ed->bInterval == 0 || ed->bInterval > 16) { + printf("ehci: opening pipe with invalid bInterval\n"); + err = USBD_INVAL; + goto bad1; + } + if (UGETW(ed->wMaxPacketSize) == 0) { + printf("ehci: zero length endpoint open request\n"); + err = USBD_INVAL; + goto bad1; + } + epipe->u.isoc.next_frame = 0; + epipe->u.isoc.cur_xfers = 0; + break; default: + DPRINTF(("ehci: bad xfer type %d\n", xfertype)); return (USBD_INVAL); } return (USBD_NORMAL_COMPLETION); bad1: - ehci_free_sqh(sc, sqh); + if (sqh != NULL) + ehci_free_sqh(sc, sqh); + return (err); bad0: return (USBD_NOMEM); } @@ -1569,6 +1785,49 @@ DPRINTFN(2,("ehci_sync_hc: exit\n")); } +/*Call at splusb*/ +void +ehci_rem_free_itd_chain(ehci_softc_t *sc, struct ehci_xfer *exfer) +{ + struct ehci_soft_itd *itd, *prev; + + prev = NULL; + + if (exfer->itdstart == NULL || exfer->itdend == NULL) + panic("ehci isoc xfer being freed, but with no itd chain\n"); + + for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) { + prev = itd->u.frame_list.prev; + /* Unlink itd from hardware chain, or frame array */ + if (prev == NULL) { /* We're at the table head */ + sc->sc_softitds[itd->slot] = itd->u.frame_list.next; + sc->sc_flist[itd->slot] = itd->itd.itd_next; + + if (itd->u.frame_list.next != NULL) + itd->u.frame_list.next->u.frame_list.prev = + NULL; + } else { + /* XXX this part is untested... */ + prev->itd.itd_next = itd->itd.itd_next; + prev->u.frame_list.next = itd->u.frame_list.next; + if (itd->u.frame_list.next != NULL) + itd->u.frame_list.next->u.frame_list.prev = + prev; + } + } + + prev = NULL; + for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) { + if (prev != NULL) + ehci_free_itd(sc, prev); + prev = itd; + } + if (prev) + ehci_free_itd(sc, prev); + exfer->itdstart = NULL; + exfer->itdend = NULL; +} + /***********/ /* @@ -2463,6 +2722,76 @@ } } +ehci_soft_itd_t * +ehci_alloc_itd(ehci_softc_t *sc) +{ + struct ehci_soft_itd *itd, *freeitd; + usbd_status err; + int i, s, offs, frindex, previndex; + usb_dma_t dma; + + s = splusb(); + + /* Find an itd that wasn't freed this frame or last frame. This can + * discard itds that were freed before frindex wrapped around + * XXX - can this lead to thrashing? Could fix by enabling wrap-around + * interrupt and fiddling with list when that happens */ + frindex = (EOREAD4(sc, EHCI_FRINDEX) + 1) >> 3; + previndex = (frindex != 0) ? frindex - 1 : sc->sc_flsize; + + freeitd = NULL; + LIST_FOREACH(itd, &sc->sc_freeitds, u.free_list) { + if (itd == NULL) + break; + if (itd->slot != frindex && itd->slot != previndex) { + freeitd = itd; + break; + } + } + + if (freeitd == NULL) { + DPRINTFN(2, ("ehci_alloc_itd allocating chunk\n")); + err = usb_allocmem(&sc->sc_bus, EHCI_ITD_SIZE * EHCI_ITD_CHUNK, + EHCI_PAGE_SIZE, &dma); + + if (err) { + DPRINTF(("ehci_alloc_itd, alloc returned %d\n", err)); + return NULL; + } + + for (i = 0; i < EHCI_ITD_CHUNK; i++) { + offs = i * EHCI_ITD_SIZE; + itd = KERNADDR(&dma, offs); + itd->physaddr = DMAADDR(&dma, offs); + itd->dma = dma; + itd->offs = offs; + LIST_INSERT_HEAD(&sc->sc_freeitds, itd, u.free_list); + } + freeitd = LIST_FIRST(&sc->sc_freeitds); + } + + itd = freeitd; + LIST_REMOVE(itd, u.free_list); + memset(&itd->itd, 0, sizeof(ehci_itd_t)); + itd->u.frame_list.next = NULL; + itd->u.frame_list.prev = NULL; + itd->xfer_next = NULL; + itd->slot = 0; + splx(s); + + return (itd); +} + +void +ehci_free_itd(ehci_softc_t *sc, ehci_soft_itd_t *itd) +{ + int s; + + s = splusb(); + LIST_INSERT_AFTER(LIST_FIRST(&sc->sc_freeitds), itd, u.free_list); + splx(s); +} + /****************/ /* @@ -2522,7 +2851,7 @@ return; } - if (xfer->device->bus->intr_context || !curproc) + if (xfer->device->bus->intr_context) panic("ehci_abort_xfer: not in process context"); /* @@ -2692,6 +3021,86 @@ } void +ehci_abort_isoc_xfer(usbd_xfer_handle xfer, usbd_status status) +{ + ehci_isoc_trans_t trans_status; + struct ehci_pipe *epipe; + struct ehci_xfer *exfer; + ehci_softc_t *sc; + struct ehci_soft_itd *itd; + int s, i; + + epipe = (struct ehci_pipe *) xfer->pipe; + exfer = EXFER(xfer); + sc = (ehci_softc_t *)epipe->pipe.device->bus; + + DPRINTF(("ehci_abort_isoc_xfer: xfer %p pipe %p\n", xfer, epipe)); + + if (sc->sc_dying) { + s = splusb(); + xfer->status = status; + callout_stop(&xfer->timeout_handle); + usb_rem_task(epipe->pipe.device, &exfer->abort_task); + usb_transfer_complete(xfer); + splx(s); + return; + } + + if (exfer->ehci_xfer_flags & EHCI_XFER_ABORTING) { + DPRINTFN(2, ("ehci_abort_isoc_xfer: already aborting\n")); + +#ifdef DIAGNOSTIC + if (status == USBD_TIMEOUT) + printf("ehci_abort_xfer: TIMEOUT while aborting\n"); +#endif + + xfer->status = status; + DPRINTFN(2, ("ehci_abort_xfer: waiting for abort to finish\n")); + exfer->ehci_xfer_flags |= EHCI_XFER_ABORTWAIT; + while (exfer->ehci_xfer_flags & EHCI_XFER_ABORTING) + tsleep(&exfer->ehci_xfer_flags, PZERO, "ehciaw", 0); + return; + } + exfer->ehci_xfer_flags |= EHCI_XFER_ABORTING; + + xfer->status = status; + callout_stop(&xfer->timeout_handle); + usb_rem_task(epipe->pipe.device, &exfer->abort_task); + + s = splusb(); + for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) { + + for (i = 0; i < 8; i++) { + trans_status = le32toh(itd->itd.itd_ctl[i]); + trans_status &= ~EHCI_ITD_ACTIVE; + itd->itd.itd_ctl[i] = htole32(trans_status); + } + + } + splx(s); + + s = splusb(); +#ifdef USB_USE_SOFTINTR + sc->sc_softwake = 1; +#endif /* USB_USE_SOFTINTR */ + usb_schedsoftintr(&sc->sc_bus); +#ifdef USB_USE_SOFTINTR + tsleep(&sc->sc_softwake, PZERO, "ehciab", 0); +#endif /* USB_USE_SOFTINTR */ + splx(s); + +#ifdef DIAGNOSTIC + exfer->isdone = 1; +#endif + exfer->ehci_xfer_flags &= ~EHCI_XFER_ABORTING; + if (exfer->ehci_xfer_flags & EHCI_XFER_ABORTWAIT) { + exfer->ehci_xfer_flags &= ~EHCI_XFER_ABORTWAIT; + wakeup(&exfer->ehci_xfer_flags); + } + usb_transfer_complete(xfer); +} + +void ehci_timeout_task(void *addr) { usbd_xfer_handle xfer = addr; @@ -3270,6 +3679,11 @@ DPRINTFN(1, ("ehci_device_intr_abort: remove\n")); xfer->pipe->intrxfer = NULL; } + /* + * XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance + * async doorbell. That's dependant on the async list, wheras + * intr xfers are periodic, should not use this? + */ ehci_abort_xfer(xfer, USBD_CANCELLED); } @@ -3362,8 +3776,314 @@ /************************/ -static usbd_status ehci_device_isoc_transfer(usbd_xfer_handle xfer) { return USBD_IOERROR; } -static usbd_status ehci_device_isoc_start(usbd_xfer_handle xfer) { return USBD_IOERROR; } -static void ehci_device_isoc_abort(usbd_xfer_handle xfer) { } -static void ehci_device_isoc_close(usbd_pipe_handle pipe) { } -static void ehci_device_isoc_done(usbd_xfer_handle xfer) { } +static usbd_status +ehci_device_isoc_transfer(usbd_xfer_handle xfer) +{ + usbd_status err; + + err = usb_insert_transfer(xfer); + if (err && err != USBD_IN_PROGRESS) + return (err); + + return (ehci_device_isoc_start(xfer)); +} + +static usbd_status +ehci_device_isoc_start(usbd_xfer_handle xfer) +{ + struct ehci_pipe *epipe; + usbd_device_handle dev; + ehci_softc_t *sc; + struct ehci_xfer *exfer; + ehci_soft_itd_t *itd, *prev, *start, *stop; + usb_dma_t *dma_buf; + int i, j, k, frames, uframes, ufrperframe; + int s, trans_count, offs, total_length; + int frindex; + + start = NULL; + prev = NULL; + itd = NULL; + trans_count = 0; + total_length = 0; + exfer = (struct ehci_xfer *) xfer; + sc = (ehci_softc_t *)xfer->pipe->device->bus; + dev = xfer->pipe->device; + epipe = (struct ehci_pipe *)xfer->pipe; + + /* + * To allow continuous transfers, above we start all transfers + * immediately. However, we're still going to get usbd_start_next call + * this when another xfer completes. So, check if this is already + * in progress or not + */ + + if (exfer->itdstart != NULL) + return (USBD_IN_PROGRESS); + + DPRINTFN(2, ("ehci_device_isoc_start: xfer %p len %d flags %d\n", + xfer, xfer->length, xfer->flags)); + + if (sc->sc_dying) + return (USBD_IOERROR); + + /* + * To avoid complication, don't allow a request right now that'll span + * the entire frame table. To within 4 frames, to allow some leeway + * on either side of where the hc currently is. + */ + if ((1 << (epipe->pipe.endpoint->edesc->bInterval)) * + xfer->nframes >= (sc->sc_flsize - 4) * 8) { + printf("ehci: isoc descriptor requested that spans the entire" + " frametable, too many frames\n"); + return (USBD_INVAL); + } + +#ifdef DIAGNOSTIC + if (xfer->rqflags & URQ_REQUEST) + panic("ehci_device_isoc_start: request\n"); + + if (!exfer->isdone) + printf("ehci_device_isoc_start: not done, ex = %p\n", exfer); + exfer->isdone = 0; +#endif + + /* + * Step 1: Allocate and initialize itds, how many do we need? + * One per transfer if interval >= 8 microframes, fewer if we use + * multiple microframes per frame. + */ + + i = epipe->pipe.endpoint->edesc->bInterval; + if (i > 16 || i == 0) { + /* Spec page 271 says intervals > 16 are invalid */ + DPRINTF(("ehci_device_isoc_start: bInvertal %d invalid\n", i)); + return (USBD_INVAL); + } + + switch (i) { + case 1: + ufrperframe = 8; + break; + case 2: + ufrperframe = 4; + break; + case 3: + ufrperframe = 2; + break; + default: + ufrperframe = 1; + break; + } + frames = (xfer->nframes + (ufrperframe - 1)) / ufrperframe; + uframes = 8 / ufrperframe; + + if (frames == 0) { + DPRINTF(("ehci_device_isoc_start: frames == 0\n")); + return (USBD_INVAL); + } + + dma_buf = xfer->buffer; + offs = 0; + + for (i = 0; i < frames; i++) { + int froffs = offs; + itd = ehci_alloc_itd(sc); + + if (prev != NULL) { + prev->itd.itd_next = + htole32(itd->physaddr | EHCI_LINK_ITD); + prev->xfer_next = itd; + } else { + start = itd; + } + + /* + * Step 1.5, initialize uframes + */ + for (j = 0; j < 8; j += uframes) { + /* Calculate which page in the list this starts in */ + int addr = DMAADDR(dma_buf, froffs); + addr = EHCI_PAGE_OFFSET(addr); + addr += (offs - froffs); + addr = EHCI_PAGE(addr); + addr /= EHCI_PAGE_SIZE; + + /* This gets the initial offset into the first page, + * looks how far further along the current uframe + * offset is. Works out how many pages that is. + */ + + itd->itd.itd_ctl[j] = htole32 ( EHCI_ITD_ACTIVE | + EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) | + EHCI_ITD_SET_PG(addr) | + EHCI_ITD_SET_OFFS(EHCI_PAGE_OFFSET(DMAADDR(dma_buf, + offs)))); + + total_length += xfer->frlengths[trans_count]; + offs += xfer->frlengths[trans_count]; + trans_count++; + + if (trans_count >= xfer->nframes) { /*Set IOC*/ + itd->itd.itd_ctl[j] |= htole32(EHCI_ITD_IOC); + } + } + + /* Step 1.75, set buffer pointers. To simplify matters, all + * pointers are filled out for the next 7 hardware pages in + * the dma block, so no need to worry what pages to cover + * and what to not. + */ + + for (j=0; j < 7; j++) { + /* + * Don't try to lookup a page that's past the end + * of buffer + */ + int page_offs = EHCI_PAGE(froffs + + (EHCI_PAGE_SIZE * j)); + if (page_offs >= dma_buf->block->size) + break; + + int page = DMAADDR(dma_buf, page_offs); + page = EHCI_PAGE(page); + itd->itd.itd_bufr[j] = + htole32(EHCI_ITD_SET_BPTR(page) | EHCI_LINK_ITD); + } + + /* + * Other special values + */ + + k = epipe->pipe.endpoint->edesc->bEndpointAddress; + itd->itd.itd_bufr[0] |= htole32( + EHCI_ITD_SET_EP(UE_GET_ADDR(k)) | + EHCI_ITD_SET_DADDR(epipe->pipe.device->address)); + + k = (UE_GET_DIR(epipe->pipe.endpoint->edesc->bEndpointAddress)) + ? 1 : 0; + j = UE_GET_SIZE( + UGETW(epipe->pipe.endpoint->edesc->wMaxPacketSize)); + itd->itd.itd_bufr[1] |= htole32(EHCI_ITD_SET_DIR(k) | + EHCI_ITD_SET_MAXPKT(UE_GET_SIZE(j))); + + /* FIXME: handle invalid trans */ + itd->itd.itd_bufr[2] |= + htole32(EHCI_ITD_SET_MULTI(UE_GET_TRANS(j)+1)); + prev = itd; + } /* End of frame */ + + stop = itd; + stop->xfer_next = NULL; + exfer->isoc_len = total_length; + + /* + * Part 2: Transfer descriptors have now been set up, now they must + * be scheduled into the period frame list. Erk. Not wanting to + * complicate matters, transfer is denied if the transfer spans + * more than the period frame list. + */ + + s = splusb(); + + /* Start inserting frames */ + if (epipe->u.isoc.cur_xfers > 0) { + frindex = epipe->u.isoc.next_frame; + } else { + frindex = EOREAD4(sc, EHCI_FRINDEX); + frindex = frindex >> 3; /* Erase microframe index */ + frindex += 2; + } + + if (frindex >= sc->sc_flsize) + frindex &= (sc->sc_flsize - 1); + + /* Whats the frame interval? */ + i = (1 << epipe->pipe.endpoint->edesc->bInterval); + if (i / 8 == 0) + i = 1; + else + i /= 8; + + itd = start; + for (j = 0; j < frames; j++) { + if (itd == NULL) + panic("ehci: unexpectedly ran out of isoc itds," + "isoc_start\n"); + + itd->itd.itd_next = sc->sc_flist[frindex]; + if (itd->itd.itd_next == 0) + /* FIXME: frindex table gets initialized to NULL + * or EHCI_NULL? */ + itd->itd.itd_next = htole32(EHCI_NULL); + + sc->sc_flist[frindex] = htole32(EHCI_LINK_ITD | itd->physaddr); + + itd->u.frame_list.next = sc->sc_softitds[frindex]; + sc->sc_softitds[frindex] = itd; + if (itd->u.frame_list.next != NULL) + itd->u.frame_list.next->u.frame_list.prev = itd; + itd->slot = frindex; + itd->u.frame_list.prev = NULL; + + frindex += i; + if (frindex >= sc->sc_flsize) + frindex -= sc->sc_flsize; + + itd = itd->xfer_next; + } + + epipe->u.isoc.cur_xfers++; + epipe->u.isoc.next_frame = frindex; + + exfer->itdstart = start; + exfer->itdend = stop; + exfer->sqtdstart = NULL; + exfer->sqtdstart = NULL; + + ehci_add_intr_list(sc, exfer); + xfer->status = USBD_IN_PROGRESS; + xfer->done = 0; + splx(s); + + if (sc->sc_bus.use_polling) { + printf("Starting ehci isoc xfer with polling. Bad idea?\n"); + ehci_waitintr(sc, xfer); + } + + return (USBD_IN_PROGRESS); +} + +static void +ehci_device_isoc_abort(usbd_xfer_handle xfer) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:09:08 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D363D1065698; Mon, 18 Aug 2008 14:09:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BC5A1065688 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E56F8FC17 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IE97Dd051599 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IE97BN051597 for perforce@freebsd.org; Mon, 18 Aug 2008 14:09:07 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 14:09:07 GMT Message-Id: <200808181409.m7IE97BN051597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:09:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147721 Change 147721 by ed@ed_dull on 2008/08/18 14:08:25 Fix a compatibility regression: I thought I had older FreeBSD versions working, but it turned out openpty() does things differently than posix_openpt()/ptsname(). We had openpty() working, but ptsname() failed, because the minor number that gets returned should get translated to the master device, not the slave device. Make the PTS_EXTERNAL interface a little more ugly by changing the fstat() and FIODGNAME stuff to return the device number for the master part. Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#10 edit .. //depot/projects/mpsafetty/sys/kern/tty_pty.c#8 edit .. //depot/projects/mpsafetty/sys/sys/tty.h#11 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#10 (text+ko) ==== @@ -85,8 +85,7 @@ struct selinfo pts_outpoll; /* (t) Select queue for read(). */ #ifdef PTS_EXTERNAL - pts_external_free_t *pts_external_free; /* (c) Destructor callback. */ - void *pts_external_softc; /* (c) Destructor softc. */ + struct cdev *pts_cdev; /* (c) Master device node. */ #endif /* PTS_EXTERNAL */ struct uidinfo *pts_uidinfo; /* (c) Resource limit. */ @@ -243,7 +242,12 @@ /* Reverse device name lookups, for ptsname() and ttyname(). */ fgn = data; - p = tty_devname(tp); +#ifdef PTS_EXTERNAL + if (psc->pts_cdev != NULL) + p = devtoname(psc->pts_cdev); + else +#endif /* PTS_EXTERNAL */ + p = tty_devname(tp); i = strlen(p) + 1; if (i > fgn->len) return (EINVAL); @@ -393,6 +397,9 @@ struct thread *td) { struct tty *tp = fp->f_data; +#ifdef PTS_EXTERNAL + struct pts_softc *psc = tty_softc(tp); +#endif /* PTS_EXTERNAL */ /* * According to POSIX, we must implement an fstat(). This also @@ -405,7 +412,12 @@ */ bzero(sb, sizeof *sb); - sb->st_ino = sb->st_rdev = tty_udev(tp); +#ifdef PTS_EXTERNAL + if (psc->pts_cdev != NULL) + sb->st_ino = sb->st_rdev = dev2udev(psc->pts_cdev); + else +#endif /* PTS_EXTERNAL */ + sb->st_ino = sb->st_rdev = tty_udev(tp); sb->st_mode = S_IFCHR; sb->st_uid = tp->t_dev->si_cred->cr_ruid; sb->st_gid = GID_TTY; @@ -479,9 +491,9 @@ uifree(psc->pts_uidinfo); #ifdef PTS_EXTERNAL - /* Call shutdown hook. */ - if (psc->pts_external_free != NULL) - psc->pts_external_free(psc->pts_external_softc); + /* Destroy master device as well. */ + if (psc->pts_cdev != NULL) + destroy_dev_sched(psc->pts_cdev); #endif /* PTS_EXTERNAL */ free(psc, M_PTS); @@ -540,7 +552,7 @@ #ifdef PTS_EXTERNAL int pts_alloc_external(int fflags, struct thread *td, struct file *fp, - pts_external_free_t freefunc, void *softc, const char *name) + struct cdev *dev, const char *name) { int ok; struct tty *tp; @@ -561,8 +573,7 @@ cv_init(&psc->pts_outwait, "pts outwait"); psc->pts_unit = -1; - psc->pts_external_free = freefunc; - psc->pts_external_softc = softc; + psc->pts_cdev = dev; psc->pts_uidinfo = uid; uihold(uid); ==== //depot/projects/mpsafetty/sys/kern/tty_pty.c#8 (text+ko) ==== @@ -48,15 +48,6 @@ static int pty_warningcnt = 10; -static void -ptydev_free(void *softc) -{ - struct cdev *dev = softc; - - /* Remove the master device. */ - destroy_dev_sched(dev); -} - static int ptydev_fdopen(struct cdev *dev, int fflags, struct thread *td, struct file *fp) { @@ -71,8 +62,7 @@ name[3] = u >> 8; name[4] = u; - error = pts_alloc_external(fflags & (FREAD|FWRITE), td, fp, - ptydev_free, dev, name); + error = pts_alloc_external(fflags & (FREAD|FWRITE), td, fp, dev, name); if (error != 0) { destroy_dev_sched(dev); return (error); ==== //depot/projects/mpsafetty/sys/sys/tty.h#11 (text+ko) ==== @@ -186,9 +186,8 @@ void tty_info(struct tty *); /* Pseudo-terminal hooks. */ -typedef void pts_external_free_t(void *); int pts_alloc_external(int, struct thread *, struct file *, - pts_external_free_t, void *, const char *); + struct cdev *, const char *); /* Drivers and line disciplines also need to call these. */ #include <sys/ttydevsw.h> From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:09:08 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 234AD10656F1; Mon, 18 Aug 2008 14:09:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADCF4106568F for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 +0000 (UTC) (envelope-from bilouro@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F4A28FC19 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 +0000 (UTC) (envelope-from bilouro@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IE97K2051604 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:09:07 GMT (envelope-from bilouro@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IE97Yc051602 for perforce@freebsd.org; Mon, 18 Aug 2008 14:09:07 GMT (envelope-from bilouro@FreeBSD.org) Date: Mon, 18 Aug 2008 14:09:07 GMT Message-Id: <200808181409.m7IE97Yc051602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bilouro@FreeBSD.org using -f From: Victor Hugo Bilouro <bilouro@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:09:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147722 Change 147722 by bilouro@bilouro_tcptest on 2008/08/18 14:08:36 Documentation Affected files ... .. //depot/projects/soc2008/bilouro_tcptest/README#2 edit .. //depot/projects/soc2008/bilouro_tcptest/SETUP#1 add .. //depot/projects/soc2008/bilouro_tcptest/TODO#5 edit .. //depot/projects/soc2008/bilouro_tcptest/USING#1 add .. //depot/projects/soc2008/bilouro_tcptest/src/scripts/tests/cresetFromNonSyncState.py#2 edit Differences ... ==== //depot/projects/soc2008/bilouro_tcptest/README#2 (text+ko) ==== @@ -1,1 +1,56 @@ -TCP/IP Regression Test Suite +== WHAT == + A multi-platform TCP/IP v4 Stack Testing Tool, + + As a testing tool, it can perform regression, protocol conformance, and fuzz tests. The tool may also be employed as an aid to protocol developers and both testing and debugging of firewalls/routers. + + +== USING == + It's built on top of PCS(Packet Construction Set) + + "PCS is a set of Python modules and objects that make building network protocol code easier for the protocol developer. The core of the system is the pcs module itself which provides the necessary functionality to create classes that implement packets." [[http://pcs.sourceforge.net/|PCS]] + + PCS enables testing at OSI layers 3, 4, and 5. + + +== HOW == + Tcptest mainly is a python module and one script for each test covered (more then one per script often) + The module count with methods acting as fasteners, doing things like (a)three way handshake, (b)active/passive close and (c)several createXX and assertXX, where XX=(ip, tcp, rst, urg, fin, syn, psh, so on...) + As the tests are being created, the number of 'fasteners' are growing, turning each moment easier to create new tests. + + +== PHILOSOPHY == + Use of small tests. So we can cover a wide range of traffics, events and transitions predetermined separately. + + The development would be like a protocol, but without covering all possible events and transitions, only traffic previously determined. + + Instead of targeting a TCP Finite State Machine (FSM) like the implementation of TCP/IP protocols, the development will be based towards flow of packets, where traffic is composed of packets that are sent and received in a previously registered way. + +== THE FOLLOWING TESTS WILL BE INITIALLY COVERED == + + 1. Three-way handshake [done] + 2. Reset from closed state [done] + 3. Reset from non syncronized state [done] + 4. Reset from syncronized state [done] + 5. Sliding Window Protocol + 6. Urgent Pointer + 7. TCP Options establishment + 8. Selective Acknowledgments + 9. TCP Timestamps + 10. Time-wait configuration [done] + 11. Connection close [done] + 12. Simultaneous close + 13. Receive Window Size Advertisement + 14. Transmit Window Size Advertisement + 15. Support Partner’s Shrinking Window + 16. Silly Window Syndrome Avoidance + 17. Zero Window Handling + 18. Receive ACKs, RSTs, and URGs while Window is Zero + 19. Zero window Probing + +== MENTOR == + * George Neville-Neil + + +== STUDENT == + * Victor Hugo Bilouro + ==== //depot/projects/soc2008/bilouro_tcptest/TODO#5 (text+ko) ==== @@ -1,10 +1,5 @@ use the last version of pcs -rewrite connection establishment and finalization pcb-like oriented -elicit with net@ some regression test suggested create connection establishment options test -create some regression test scripts -create some conformance test scripts -choose the better method to create tests, programmatically or parsing oriented Think about: to be able make synchronous tests, will be wonderful remotely @@ -13,7 +8,7 @@ self.output = { self.thisside : pcs.PcapConnector("ed0") , \ self.thatside : pcs.PcapConnector(remoteip,"ed0") } - this.packet == that.packet will be possible + test this.packet == that.packet will be possible Think about: self.ethersrc = ethernet.ether_atob("00:1c:42:47:3f:cd") @@ -23,5 +18,6 @@ * may be as a utility method ethernet().configue(ip) -done: --manually establish a tcp connection using pcs +Rewrite method that receives data from socket, with timeout. For some tests we have to listen for a packet only to certify the DUT doesn't send anything back. + +Use the latest version of pcs from http://neville-neil.com/hg ==== //depot/projects/soc2008/bilouro_tcptest/src/scripts/tests/cresetFromNonSyncState.py#2 (text+ko) ==== @@ -119,9 +119,6 @@ (ip, tcp) = tcptest.createoutofwindowack(self, self.tcb, self.thisside, self.thatside) tcptest.createwritepacket(self, self.tcb, ip, tcp, self.thisside, self.thatside) - (ip, tcp) = tcptest.createip(self, self.tcb, self.thisside, self.thatside) - tcptest.createwritepacket(self, self.tcb, ip, tcp, self.thisside, self.thatside) - (iprst, tcprst) = tcptest.receive(self, self.tcb, self.thisside, self.thatside) tcptest.assertReset(self, self.tcb, tcprst, self.thisside, self.thatside, tcp) From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:11:10 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 724B2106567C; Mon, 18 Aug 2008 14:11:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01E8F1065677 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:11:10 +0000 (UTC) (envelope-from bilouro@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CDC288FC19 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:11:09 +0000 (UTC) (envelope-from bilouro@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IEB93O051850 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:11:09 GMT (envelope-from bilouro@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IEB9FP051848 for perforce@freebsd.org; Mon, 18 Aug 2008 14:11:09 GMT (envelope-from bilouro@FreeBSD.org) Date: Mon, 18 Aug 2008 14:11:09 GMT Message-Id: <200808181411.m7IEB9FP051848@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bilouro@FreeBSD.org using -f From: Victor Hugo Bilouro <bilouro@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:11:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147723 Change 147723 by bilouro@bilouro_tcptest on 2008/08/18 14:10:37 Doxygen config file Affected files ... .. //depot/projects/soc2008/bilouro_tcptest/config.dox#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:43:43 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 530CF1065672; Mon, 18 Aug 2008 14:43:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1737D106566B for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:43:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1F3A8FC0C for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:43:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IEhggq054649 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:43:42 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IEhg1Z054647 for perforce@freebsd.org; Mon, 18 Aug 2008 14:43:42 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 14:43:42 GMT Message-Id: <200808181443.m7IEhg1Z054647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147725 Change 147725 by ed@ed_dull on 2008/08/18 14:43:04 Small consistency fix: use a tab instead of a space before the function name. Affected files ... .. //depot/projects/mpsafetty/sys/sys/tty.h#12 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/tty.h#12 (text+ko) ==== @@ -186,7 +186,7 @@ void tty_info(struct tty *); /* Pseudo-terminal hooks. */ -int pts_alloc_external(int, struct thread *, struct file *, +int pts_alloc_external(int, struct thread *, struct file *, struct cdev *, const char *); /* Drivers and line disciplines also need to call these. */ From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:46:46 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD5D1065676; Mon, 18 Aug 2008 14:46:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 315691065673 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:46:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21FAA8FC16 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:46:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IEkkEq054915 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:46:46 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IEkjDk054913 for perforce@freebsd.org; Mon, 18 Aug 2008 14:46:45 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 18 Aug 2008 14:46:45 GMT Message-Id: <200808181446.m7IEkjDk054913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:46:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147726 Change 147726 by ed@ed_dull on 2008/08/18 14:46:04 Only set PTS_EXTERNAL when we're really to include the pty(4) driver. It makes pts(4) almost 10% smaller. Affected files ... .. //depot/projects/mpsafetty/sys/conf/options#5 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#11 edit Differences ... ==== //depot/projects/mpsafetty/sys/conf/options#5 (text+ko) ==== @@ -656,6 +656,7 @@ DEV_BPF opt_bpf.h DEV_MCA opt_mca.h DEV_CARP opt_carp.h +DEV_PTY opt_tty.h DEV_SPLASH opt_splash.h # EISA support ==== //depot/projects/mpsafetty/sys/kern/tty_pts.c#11 (text+ko) ==== @@ -30,10 +30,14 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_tty.h" + /* Add compatibility bits for FreeBSD. */ #define PTS_COMPAT +#ifdef DEV_PTY /* Add /dev/ptyXX compat bits. */ #define PTS_EXTERNAL +#endif /* DEV_PTY */ /* Add bits to make Linux binaries work. */ #define PTS_LINUX From owner-p4-projects@FreeBSD.ORG Mon Aug 18 14:53:54 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC3B106567E; Mon, 18 Aug 2008 14:53:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C36421065678 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:53:53 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B37088FC30 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:53:53 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IErr7x055502 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 14:53:53 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IErrge055500 for perforce@freebsd.org; Mon, 18 Aug 2008 14:53:53 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 14:53:53 GMT Message-Id: <200808181453.m7IErrge055500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 14:53:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=147729 Change 147729 by konrad@vspredator on 2008/08/18 14:53:30 More advanced version of cut.sh. Previous didn't work againsta all test files. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/regression/cut.sh#2 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/regression/cut.sh#2 (text+ko) ==== @@ -1,3 +1,12 @@ #!/bin/sh -printf '/coll\n.+4,$-3p\n' | ed -s $1 | sed -n -e '2,$p' +if [ "$1" = "" ]; then + echo "supply argument" + exit +fi + +LINE1=`awk '/coll/ { print FNR }' $1 | head -n 1` +LINE1=$(($LINE1+4)) +LINE2=`tail -n +$LINE1 $1 | awk '/result/ { print FNR }' | head -n 1` +LINE2=$(($LINE2-1)) +tail -n +$LINE1 $1 | head -n $LINE2 From owner-p4-projects@FreeBSD.ORG Mon Aug 18 16:06:08 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7DE31065682; Mon, 18 Aug 2008 16:06:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 745561065676 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 600DC8FC21 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IG67tQ068900 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:06:07 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IG67l5068898 for perforce@freebsd.org; Mon, 18 Aug 2008 16:06:07 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 16:06:07 GMT Message-Id: <200808181606.m7IG67l5068898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 16:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147733 Change 147733 by konrad@vspredator on 2008/08/18 16:05:58 Make go.sh much more robust. It sets correct LC_COLLATE now, based on input file, and also can take an argument to test only one language. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/regression/go.sh#2 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/regression/go.sh#2 (text+ko) ==== @@ -1,20 +1,34 @@ #!/bin/sh -SOURCE="../cldr_tests/*.xml" +MASK="*" +if [ "$1" != "" ]; then + MASK="$1" +fi +SOURCE="../cldr_tests/$MASK.xml" -echo "1..`ls $SOURCE | wc -l | tr -d ' '`" +#echo "1..`ls $SOURCE | wc -l | tr -d ' '`" for i in $SOURCE; do # echo $i - ./cut.sh ../cldr_tests/$i | tr -d '\r$' > orig + LOCALES=`grep ^locales $i | tail -n 1 | + sed -e "s/.*='//g" -e "s/'.*//g"` + ./cut.sh $i | tr -d '\r$' > orig +# echo "LOCALES: $LOCALES" ./randomize.pl < orig > unsorted - export PATH_LOCALE=../../locale - export LD_PRELOAD=../../libc/libc.so.7 - sort < unsorted > sorted + for j in $LOCALES; do + DATAFILE=../../locale/$j.UTF-8 + if ! test -d $DATAFILE; then +# echo "not ok # $DATAFILE does not exist" + continue + fi + env PATH_LOCALE=../../locale LD_PRELOAD=../../libc/libc.so.7 \ + LC_COLLATE=$j.UTF-8 sort < unsorted > sorted - if cmp -s orig sorted; then - echo "ok # $i" - else - echo "not ok # $i" - fi + if cmp -s orig sorted; then + echo "ok # $i collation $j" + else + echo "not ok # $i collation $j" + fi + done +# exit done rm -f orig sorted unsorted From owner-p4-projects@FreeBSD.ORG Mon Aug 18 16:52:56 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E496C1065679; Mon, 18 Aug 2008 16:52:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A88D31065674 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 784318FC25 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:52:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IGqtHA082294 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 16:52:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IGqtnH082292 for perforce@freebsd.org; Mon, 18 Aug 2008 16:52:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 18 Aug 2008 16:52:55 GMT Message-Id: <200808181652.m7IGqtnH082292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 16:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147739 Change 147739 by hselasky@hselasky_laptop001 on 2008/08/18 16:52:09 Add missing files. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 add .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 18 17:28:33 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2FF41065678; Mon, 18 Aug 2008 17:28:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B67821065672 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:28:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CF078FC16 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:28:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IHSWrb097669 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:28:32 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IHSWi4097667 for perforce@freebsd.org; Mon, 18 Aug 2008 17:28:32 GMT (envelope-from julian@freebsd.org) Date: Mon, 18 Aug 2008 17:28:32 GMT Message-Id: <200808181728.m7IHSWi4097667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 17:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147744 Change 147744 by julian@julian_trafmon1 on 2008/08/18 17:27:52 IF-vimage-commit2 loopback that the first commit was made to SVN. also catch the Xen stuff and a few fixes Affected files ... .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files#6 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files.i386#4 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options#5 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options.i386#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/XEN#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/init_main.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_ef.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_faith.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_gif.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_loop.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_mib.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_stf.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/net/route.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/rtsock.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/dest6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/route6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/key.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/key_debug.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/authunix_prot.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/dump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/sys/param.h#6 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#6 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_page.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/xen/features.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/gnttab.c#2 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ */ #include "opt_atpic.h" @@ -636,13 +636,10 @@ .globl doreti_iret_fault doreti_iret_fault: subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */ - testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ - swapgs -1: testl $PSL_I,TF_RFLAGS(%rsp) - jz 2f + testl $PSL_I,TF_RFLAGS(%rsp) + jz 1f sti -2: movq %rdi,TF_RDI(%rsp) +1: movq %rdi,TF_RDI(%rsp) movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#6 (text) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); #include <sys/param.h> @@ -65,7 +65,7 @@ #endif /* !_KERNEL */ /* - * This is the default number of seconds we wait for devices to settle + * This is the default number of milliseconds we wait for devices to settle * after a SCSI bus reset. */ #ifndef SCSI_DELAY ==== //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/queue.h> ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.223 2008/07/23 17:19:02 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.224 2008/08/17 23:27:27 bz Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/proc.h> ==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.25 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit3/src/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1725,6 +1725,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2339,3 +2340,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-commit3/src/sys/conf/files.i386#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -275,11 +276,13 @@ i386/i386/io.c optional io i386/i386/io_apic.c optional apic i386/i386/k6_mem.c optional mem -i386/i386/legacy.c standard +i386/i386/legacy.c optional native i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/vimage-commit3/src/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.633 2008/07/18 14:44:51 dwmalone Exp $ +# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ # # On the handling of kernel options # ==== //depot/projects/vimage-commit3/src/sys/conf/options.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/vimage-commit3/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.10 2007/07/12 17:00:51 njl Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ /* ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -158,7 +158,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */ #endif ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_if.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $"); #endif #include <sys/param.h> ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $"); #endif #ifdef __FreeBSD__ ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/condvar.h> ==== //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $"); #include "opt_config.h" ==== //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.17 2008/07/31 01:52:04 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c,v 1.18 2008/08/17 23:27:27 bz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,6 +48,7 @@ #include <sys/syslog.h> #include <sys/protosw.h> #include <sys/priv.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/route.h> @@ -293,8 +294,8 @@ /* Sendbuffer is in units of 32KB. */ - if (tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) - req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15)); + if (V_tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) + req->param |= htonl(V_TX_SNDBUF(V_tcp_autosndbuf_max >> 15)); else { req->param |= htonl(V_TX_SNDBUF(snd->sb_hiwat >> 15)); } @@ -1215,7 +1216,7 @@ if (space > MAX_RCV_WND) space = MAX_RCV_WND; - if (tcp_do_rfc1323) + if (V_tcp_do_rfc1323) for (; space > 65535 && wscale < 14; space >>= 1, ++wscale) ; return (wscale); @@ -1234,8 +1235,8 @@ rcv = so_sockbuf_rcv(so); - if (tcp_do_autorcvbuf) - wnd = tcp_autorcvbuf_max; + if (V_tcp_do_autorcvbuf) + wnd = V_tcp_autorcvbuf_max; else wnd = rcv->sb_hiwat; @@ -3821,7 +3822,7 @@ #endif toep->tp_state = tp->t_state; - tcpstat.tcps_connects++; + V_tcpstat.tcps_connects++; } ==== //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.102 2008/05/10 13:40:41 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.103 2008/08/17 23:27:27 bz Exp $ * */ ==== //depot/projects/vimage-commit3/src/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.51 2008/07/23 09:44:36 luoqi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.54 2008/08/17 17:34:07 imp Exp $"); /* * PCI:PCI bridge support. @@ -139,6 +139,8 @@ { struct pcib_softc *sc; uint8_t iolow; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); sc->dev = dev; @@ -148,6 +150,7 @@ */ sc->command = pci_read_config(dev, PCIR_COMMAND, 1); sc->domain = pci_get_domain(dev); + sc->pribus = pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->secstat = pci_read_config(dev, PCIR_SECSTAT_1, 2); @@ -155,6 +158,20 @@ sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); /* + * Setup sysctl reporting nodes + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->domain, 0, "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->pribus, 0, "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->secbus, 0, "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->subbus, 0, "Subordinate bus number"); + + /* * Determine current I/O decode. */ if (sc->command & PCIM_CMD_PORTEN) { @@ -276,14 +293,16 @@ /* * XXX If the secondary bus number is zero, we should assign a bus number - * since the BIOS hasn't, then initialise the bridge. - */ - - /* - * XXX If the subordinate bus number is less than the secondary bus number, + * since the BIOS hasn't, then initialise the bridge. A simple + * bus_alloc_resource with the a couple of busses seems like the right + * approach, but we don't know what busses the BIOS might have already + * assigned to other bridges on this bus that probe later than we do. + * + * If the subordinate bus number is less than the secondary bus number, * we should pick a better value. One sensible alternative would be to * pick 255; the only tradeoff here is that configuration transactions - * would be more widely routed than absolutely necessary. + * would be more widely routed than absolutely necessary. We could + * then do a walk of the tree later and fix it. */ } @@ -299,7 +318,7 @@ child = device_add_child(dev, "pci", sc->secbus); if (child != NULL) return(bus_generic_attach(dev)); - } + } /* no secondary bus; we should have fixed this */ return(0); @@ -447,7 +466,6 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ -#if 1 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -460,7 +478,6 @@ end = sc->pmemlimit; } } -#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage-commit3/src/sys/dev/pci/pcib_private.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.14 2008/08/16 20:18:40 imp Exp $ */ #ifndef __PCIB_PRIVATE_H__ @@ -48,9 +48,10 @@ #define PCIB_SUBTRACTIVE 0x1 #define PCIB_DISABLE_MSI 0x2 uint16_t command; /* command register */ - uint32_t domain; /* domain number */ - uint8_t secbus; /* secondary bus number */ - uint8_t subbus; /* subordinate bus number */ + u_int domain; /* domain number */ + u_int pribus; /* primary bus number */ + u_int secbus; /* secondary bus number */ + u_int subbus; /* subordinate bus number */ pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ ==== //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ + * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.26 2008/08/17 23:27:27 bz Exp $ */ #include <sys/param.h> ==== //depot/projects/vimage-commit3/src/sys/dev/usb/ehci.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.64 2008/06/10 02:41:36 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.66 2008/08/18 10:39:59 kris Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,7 +129,10 @@ u_int length; } bulk; /* Iso pipe */ - /* XXX */ + struct { + u_int next_frame; + u_int cur_xfers; + } isoc; } u; }; @@ -139,6 +142,8 @@ static int ehci_intr1(ehci_softc_t *); static void ehci_waitintr(ehci_softc_t *, usbd_xfer_handle); static void ehci_check_intr(ehci_softc_t *, struct ehci_xfer *); +static void ehci_check_qh_intr(ehci_softc_t *, struct ehci_xfer *); +static void ehci_check_itd_intr(ehci_softc_t *, struct ehci_xfer *); static void ehci_idone(struct ehci_xfer *); static void ehci_timeout(void *); static void ehci_timeout_task(void *); @@ -205,6 +210,12 @@ static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qh_t *, ehci_soft_qtd_t *, ehci_soft_qtd_t *); +static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *); +static void ehci_free_itd(ehci_softc_t *, ehci_soft_itd_t *); +static void ehci_rem_free_itd_chain(ehci_softc_t *, + struct ehci_xfer *); +static void ehci_abort_isoc_xfer(usbd_xfer_handle, usbd_status); + static usbd_status ehci_device_request(usbd_xfer_handle xfer); static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *, @@ -228,6 +239,10 @@ static void ehci_dump_sqtd(ehci_soft_qtd_t *); static void ehci_dump_qtd(ehci_qtd_t *); static void ehci_dump_sqh(ehci_soft_qh_t *); +#ifdef notyet +static void ehci_dump_sitd(struct ehci_soft_itd *); +static void ehci_dump_itd(struct ehci_soft_itd *); +#endif #ifdef DIAGNOSTIC static void ehci_dump_exfer(struct ehci_xfer *); #endif @@ -414,8 +429,19 @@ return (err); DPRINTF(("%s: flsize=%d\n", device_get_nameunit(sc->sc_bus.bdev),sc->sc_flsize)); sc->sc_flist = KERNADDR(&sc->sc_fldma, 0); + + for (i = 0; i < sc->sc_flsize; i++) { + sc->sc_flist[i] = EHCI_NULL; + } + EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0)); + sc->sc_softitds = malloc(sc->sc_flsize * sizeof(ehci_soft_itd_t *), + M_USB, M_NOWAIT | M_ZERO); + if (sc->sc_softitds == NULL) + return (ENOMEM); + LIST_INIT(&sc->sc_freeitds); + /* Set up the bus struct. */ sc->sc_bus.methods = &ehci_bus_methods; sc->sc_bus.pipe_size = sizeof(struct ehci_pipe); @@ -714,19 +740,31 @@ void ehci_check_intr(ehci_softc_t *sc, struct ehci_xfer *ex) { + int attr; + + DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex)); + + attr = ex->xfer.pipe->endpoint->edesc->bmAttributes; + if (UE_GET_XFERTYPE(attr) == UE_ISOCHRONOUS) + ehci_check_itd_intr(sc, ex); + else + ehci_check_qh_intr(sc, ex); +} + +void +ehci_check_qh_intr(ehci_softc_t *sc, struct ehci_xfer *ex) +{ ehci_soft_qtd_t *sqtd, *lsqtd; u_int32_t status; - DPRINTFN(/*15*/2, ("ehci_check_intr: ex=%p\n", ex)); - if (ex->sqtdstart == NULL) { - printf("ehci_check_intr: sqtdstart=NULL\n"); + printf("ehci_check_qh_intr: not valid sqtd\n"); return; } lsqtd = ex->sqtdend; #ifdef DIAGNOSTIC if (lsqtd == NULL) { - printf("ehci_check_intr: lsqtd==0\n"); + printf("ehci_check_qh_intr: lsqtd==0\n"); return; } #endif @@ -761,6 +799,64 @@ } void +ehci_check_itd_intr(ehci_softc_t *sc, struct ehci_xfer *ex) +{ + ehci_soft_itd_t *itd; + int i; + + if (ex->itdstart == NULL) { + printf("ehci_check_itd_intr: not valid itd\n"); + return; + } + + itd = ex->itdend; +#ifdef DIAGNOSTIC + if (itd == NULL) { + printf("ehci_check_itd_intr: itdend == 0\n"); + return; + } +#endif + + /* + * Step 1, check no active transfers in last itd, meaning we're finished + */ + for (i = 0; i < 8; i++) { + if (le32toh(itd->itd.itd_ctl[i]) & EHCI_ITD_ACTIVE) + break; + } + + if (i == 8) { + goto done; /* All 8 descriptors inactive, it's done */ + } + + /* + * Step 2, check for errors in status bits, throughout chain... + */ + + DPRINTFN(12, ("ehci_check_itd_intr: active ex=%p\n", ex)); + + for (itd = ex->itdstart; itd != ex->itdend; itd = itd->xfer_next) { + for (i = 0; i < 8; i++) { + if (le32toh(itd->itd.itd_ctl[i]) & (EHCI_ITD_BUF_ERR | + EHCI_ITD_BABBLE | EHCI_ITD_ERROR)) + break; + } + if (i != 8) { /* Error in one of the itds */ + goto done; + } + } /* itd search loop */ + + DPRINTFN(12, ("ehci_check_itd_intr: ex %p itd %p still active\n", ex, + ex->itdstart)); + return; +done: + DPRINTFN(12, ("ehci_check_itd_intr: ex=%p done\n", ex)); + callout_stop(&ex->xfer.timeout_handle); + usb_rem_task(ex->xfer.pipe->device, &ex->abort_task); + ehci_idone(ex); +} + +void ehci_idone(struct ehci_xfer *ex) { usbd_xfer_handle xfer = &ex->xfer; @@ -826,9 +922,64 @@ } /* The transfer is done, compute actual length and status. */ + if (UE_GET_XFERTYPE(xfer->pipe->endpoint->edesc->bmAttributes) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 18 17:33:38 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445D71065687; Mon, 18 Aug 2008 17:33:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 055B2106567F for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:33:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEF768FC08 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:33:37 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IHXbmB098095 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:33:37 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IHXb4C098093 for perforce@freebsd.org; Mon, 18 Aug 2008 17:33:37 GMT (envelope-from julian@freebsd.org) Date: Mon, 18 Aug 2008 17:33:37 GMT Message-Id: <200808181733.m7IHXb4C098093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 17:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=147745 Change 147745 by julian@julian_trafmon1 on 2008/08/18 17:33:03 IFC@174743 get current before we start integrating between branches Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/options#7 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#12 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ +# $FreeBSD: src/sys/conf/options,v 1.635 2008/08/18 16:48:09 attilio Exp $ # # On the handling of kernel options # @@ -48,6 +48,7 @@ # Debugging options. DDB +DDB_BUFR_SIZE opt_ddb.h DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h ==== //depot/projects/vimage-commit2/src/sys/ddb/db_output.c#2 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.38 2007/12/25 23:06:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.40 2008/08/18 16:51:44 attilio Exp $"); + +#include "opt_ddb.h" #include <sys/param.h> #include <sys/systm.h> @@ -47,6 +49,13 @@ #include <ddb/ddb.h> #include <ddb/db_output.h> +struct dbputchar_arg { + size_t da_nbufr; + size_t da_remain; + char *da_pbufr; + char *da_pnext; +}; + /* * Character output - tracks position in line. * To do this correctly, we should know how wide @@ -73,6 +82,8 @@ SYSCTL_INT(_debug, OID_AUTO, ddb_use_printf, CTLFLAG_RW, &ddb_use_printf, 0, "use printf for all ddb output"); +static void db_putc(int c); +static void db_puts(const char *str); static void db_putchar(int c, void *arg); static void db_pager(void); @@ -107,9 +118,34 @@ * Output character. Buffer whitespace. */ static void -db_putchar(c, arg) - int c; /* character to output */ - void * arg; +db_putchar(int c, void *arg) +{ + struct dbputchar_arg *dap = arg; + + if (dap->da_pbufr == NULL) { + + /* No bufferized output is provided. */ + db_putc(c); + } else { + + *dap->da_pnext++ = c; + dap->da_remain--; + + /* Leave always the buffer 0 terminated. */ + *dap->da_pnext = '\0'; + + /* Check if the buffer needs to be flushed. */ + if (dap->da_remain < 2 || c == '\n') { + db_puts(dap->da_pbufr); + dap->da_pnext = dap->da_pbufr; + dap->da_remain = dap->da_nbufr; + *dap->da_pnext = '\0'; + } + } +} + +static void +db_putc(int c) { /* @@ -180,6 +216,15 @@ /* other characters are assumed non-printing */ } +static void +db_puts(const char *str) +{ + int i; + + for (i = 0; str[i] != '\0'; i++) + db_putc(str[i]); +} + /* * Turn on the pager. */ @@ -272,30 +317,43 @@ * Printing */ void -#if __STDC__ db_printf(const char *fmt, ...) +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; +#endif + struct dbputchar_arg dca; + va_list listp; + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; #else -db_printf(fmt) - const char *fmt; + dca.da_pbufr = NULL; #endif -{ - va_list listp; va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } int db_indent; void -#if __STDC__ db_iprintf(const char *fmt,...) -#else -db_iprintf(fmt) - const char *fmt; +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; #endif -{ + struct dbputchar_arg dca; register int i; va_list listp; @@ -303,9 +361,25 @@ db_printf("\t"); while (--i >= 0) db_printf(" "); + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; +#else + dca.da_pbufr = NULL; +#endif + va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } /* ==== //depot/projects/vimage-commit2/src/sys/dev/usb/hid.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.29 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.31 2008/08/18 17:05:59 kaiw Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -193,8 +193,11 @@ case 0: /* Main */ switch (bTag) { case 8: /* Input */ - if (!(s->kindset & (1 << hid_input))) + if (!(s->kindset & (1 << hid_input))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_input; c->flags = dval; ret: @@ -223,8 +226,11 @@ return (1); } case 9: /* Output */ - if (!(s->kindset & (1 << hid_output))) + if (!(s->kindset & (1 << hid_output))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_output; c->flags = dval; goto ret; @@ -237,8 +243,11 @@ s->nu = 0; return (1); case 11: /* Feature */ - if (!(s->kindset & (1 << hid_feature))) + if (!(s->kindset & (1 << hid_feature))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_feature; c->flags = dval; goto ret; @@ -266,7 +275,7 @@ c->logical_maximum = dval; break; case 3: - c->physical_maximum = dval; + c->physical_minimum = dval; break; case 4: c->physical_maximum = dval; ==== //depot/projects/vimage-commit2/src/sys/dev/usb/ums.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.99 2008/04/30 19:37:54 kaiw Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.101 2008/08/18 17:13:23 kaiw Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -283,6 +283,9 @@ /* Try the wheel first as the Z activator since it's tradition. */ wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), + hid_input, &sc->sc_loc_z, &flags) || + hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags); if (wheel) { @@ -359,12 +362,6 @@ hid_input, &sc->sc_loc_btn[i-1], 0); sc->sc_isize = hid_report_size(desc, size, hid_input, &sc->sc_iid); - sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT); - if (!sc->sc_ibuf) { - printf("%s: no memory\n", device_get_nameunit(sc->sc_dev)); - free(sc->sc_loc_btn, M_USB); - return ENXIO; - } /* * The Microsoft Wireless Notebook Optical Mouse seems to be in worse @@ -407,6 +404,13 @@ sc->sc_loc_btn[2].pos = 2; } + sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT); + if (!sc->sc_ibuf) { + printf("%s: no memory\n", device_get_nameunit(sc->sc_dev)); + free(sc->sc_loc_btn, M_USB); + return ENXIO; + } + sc->sc_ep_addr = ed->bEndpointAddress; sc->sc_disconnected = 0; free(desc, M_TEMP); ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/sys/vimage.h,v 1.2 2008/08/18 13:16:19 bz Exp $ */ #ifndef _SYS_VIMAGE_H_ @@ -271,13 +271,16 @@ #define V_rsvp_on rsvp_on #define V_rt_tables rt_tables #define V_rtq_minreallyold rtq_minreallyold +#define V_rtq_minreallyold6 rtq_minreallyold6 #define V_rtq_mtutimer rtq_mtutimer #define V_rtq_reallyold rtq_reallyold +#define V_rtq_reallyold6 rtq_reallyold6 #define V_rtq_timeout rtq_timeout #define V_rtq_timeout6 rtq_timeout6 #define V_rtq_timer rtq_timer #define V_rtq_timer6 rtq_timer6 #define V_rtq_toomany rtq_toomany +#define V_rtq_toomany6 rtq_toomany6 #define V_rtstat rtstat #define V_rttrash rttrash #define V_sahtree sahtree From owner-p4-projects@FreeBSD.ORG Mon Aug 18 17:38:44 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EF69106569D; Mon, 18 Aug 2008 17:38:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 426F61065697 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:38:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29A4A8FC13 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:38:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IHch2r098504 for <perforce@freebsd.org>; Mon, 18 Aug 2008 17:38:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IHchkp098502 for perforce@freebsd.org; Mon, 18 Aug 2008 17:38:43 GMT (envelope-from julian@freebsd.org) Date: Mon, 18 Aug 2008 17:38:43 GMT Message-Id: <200808181738.m7IHchkp098502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147747 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 17:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147747 Change 147747 by julian@julian_trafmon1 on 2008/08/18 17:37:45 IF-vimage-commit2 @147746 Affected files ... .. //depot/projects/vimage-commit3/src/sys/conf/options#6 integrate .. //depot/projects/vimage-commit3/src/sys/ddb/db_output.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#7 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ +# $FreeBSD: src/sys/conf/options,v 1.635 2008/08/18 16:48:09 attilio Exp $ # # On the handling of kernel options # @@ -48,6 +48,7 @@ # Debugging options. DDB +DDB_BUFR_SIZE opt_ddb.h DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h ==== //depot/projects/vimage-commit3/src/sys/ddb/db_output.c#2 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.38 2007/12/25 23:06:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.40 2008/08/18 16:51:44 attilio Exp $"); + +#include "opt_ddb.h" #include <sys/param.h> #include <sys/systm.h> @@ -47,6 +49,13 @@ #include <ddb/ddb.h> #include <ddb/db_output.h> +struct dbputchar_arg { + size_t da_nbufr; + size_t da_remain; + char *da_pbufr; + char *da_pnext; +}; + /* * Character output - tracks position in line. * To do this correctly, we should know how wide @@ -73,6 +82,8 @@ SYSCTL_INT(_debug, OID_AUTO, ddb_use_printf, CTLFLAG_RW, &ddb_use_printf, 0, "use printf for all ddb output"); +static void db_putc(int c); +static void db_puts(const char *str); static void db_putchar(int c, void *arg); static void db_pager(void); @@ -107,9 +118,34 @@ * Output character. Buffer whitespace. */ static void -db_putchar(c, arg) - int c; /* character to output */ - void * arg; +db_putchar(int c, void *arg) +{ + struct dbputchar_arg *dap = arg; + + if (dap->da_pbufr == NULL) { + + /* No bufferized output is provided. */ + db_putc(c); + } else { + + *dap->da_pnext++ = c; + dap->da_remain--; + + /* Leave always the buffer 0 terminated. */ + *dap->da_pnext = '\0'; + + /* Check if the buffer needs to be flushed. */ + if (dap->da_remain < 2 || c == '\n') { + db_puts(dap->da_pbufr); + dap->da_pnext = dap->da_pbufr; + dap->da_remain = dap->da_nbufr; + *dap->da_pnext = '\0'; + } + } +} + +static void +db_putc(int c) { /* @@ -180,6 +216,15 @@ /* other characters are assumed non-printing */ } +static void +db_puts(const char *str) +{ + int i; + + for (i = 0; str[i] != '\0'; i++) + db_putc(str[i]); +} + /* * Turn on the pager. */ @@ -272,30 +317,43 @@ * Printing */ void -#if __STDC__ db_printf(const char *fmt, ...) +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; +#endif + struct dbputchar_arg dca; + va_list listp; + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; #else -db_printf(fmt) - const char *fmt; + dca.da_pbufr = NULL; #endif -{ - va_list listp; va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } int db_indent; void -#if __STDC__ db_iprintf(const char *fmt,...) -#else -db_iprintf(fmt) - const char *fmt; +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; #endif -{ + struct dbputchar_arg dca; register int i; va_list listp; @@ -303,9 +361,25 @@ db_printf("\t"); while (--i >= 0) db_printf(" "); + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; +#else + dca.da_pbufr = NULL; +#endif + va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } /* ==== //depot/projects/vimage-commit3/src/sys/dev/usb/hid.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.29 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.31 2008/08/18 17:05:59 kaiw Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -193,8 +193,11 @@ case 0: /* Main */ switch (bTag) { case 8: /* Input */ - if (!(s->kindset & (1 << hid_input))) + if (!(s->kindset & (1 << hid_input))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_input; c->flags = dval; ret: @@ -223,8 +226,11 @@ return (1); } case 9: /* Output */ - if (!(s->kindset & (1 << hid_output))) + if (!(s->kindset & (1 << hid_output))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_output; c->flags = dval; goto ret; @@ -237,8 +243,11 @@ s->nu = 0; return (1); case 11: /* Feature */ - if (!(s->kindset & (1 << hid_feature))) + if (!(s->kindset & (1 << hid_feature))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_feature; c->flags = dval; goto ret; @@ -266,7 +275,7 @@ c->logical_maximum = dval; break; case 3: - c->physical_maximum = dval; + c->physical_minimum = dval; break; case 4: c->physical_maximum = dval; ==== //depot/projects/vimage-commit3/src/sys/dev/usb/ums.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.99 2008/04/30 19:37:54 kaiw Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.101 2008/08/18 17:13:23 kaiw Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -283,6 +283,9 @@ /* Try the wheel first as the Z activator since it's tradition. */ wheel = hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), + hid_input, &sc->sc_loc_z, &flags) || + hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, + HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags); if (wheel) { @@ -359,12 +362,6 @@ hid_input, &sc->sc_loc_btn[i-1], 0); sc->sc_isize = hid_report_size(desc, size, hid_input, &sc->sc_iid); - sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT); - if (!sc->sc_ibuf) { - printf("%s: no memory\n", device_get_nameunit(sc->sc_dev)); - free(sc->sc_loc_btn, M_USB); - return ENXIO; - } /* * The Microsoft Wireless Notebook Optical Mouse seems to be in worse @@ -407,6 +404,13 @@ sc->sc_loc_btn[2].pos = 2; } + sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT); + if (!sc->sc_ibuf) { + printf("%s: no memory\n", device_get_nameunit(sc->sc_dev)); + free(sc->sc_loc_btn, M_USB); + return ENXIO; + } + sc->sc_ep_addr = ed->bEndpointAddress; sc->sc_disconnected = 0; free(desc, M_TEMP); ==== //depot/projects/vimage-commit3/src/sys/sys/vimage.h#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 18 18:38:45 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7965710656E9; Mon, 18 Aug 2008 18:38:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3788910656BE for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C9888FC23 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IIcjFG005180 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 18:38:45 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IIcjaf005178 for perforce@freebsd.org; Mon, 18 Aug 2008 18:38:45 GMT (envelope-from mayur@FreeBSD.org) Date: Mon, 18 Aug 2008 18:38:45 GMT Message-Id: <200808181838.m7IIcjaf005178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul <mayur@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 18:38:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147750 Change 147750 by mayur@mayur_freebsd_vm on 2008/08/18 18:38:25 Added more checks Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#3 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/kern/src/sys/vm/vm_reserv.c#3 (text+ko) ==== @@ -314,10 +314,11 @@ msucc = NULL; //mpred = object->root; mpred = radix_tree_lookup_le(pindex, &object->rtree); - if(mpred != NULL){ + if(mpred != NULL && mpred->object == object){ KASSERT(mpred->pindex != pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(mpred); + KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv")); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; //Handle vm_page_rename(m, new_object, ...). @@ -326,12 +327,16 @@ vm_reserv_populate(rv); return (m); } + }else{ + mpred = NULL; } + msucc = radix_tree_lookup_ge(pindex, &object->rtree); - if(msucc != NULL){ + if(msucc != NULL && msucc->object == object){ KASSERT(msucc->pindex != pindex, ("vm_reserv_alloc_page: pindex already allocated")); rv = vm_reserv_from_page(msucc); + KASSERT( rv != NULL, ("vm_reserv_alloc_page: null rv")); if (rv->object == object && vm_reserv_has_pindex(rv, pindex)) { m = &rv->pages[VM_RESERV_INDEX(object, pindex)]; //Handle vm_page_rename(m, new_object, ...). @@ -340,6 +345,8 @@ vm_reserv_populate(rv); return (m); } + }else{ + msucc = NULL; } /* while (mpred != NULL) { From owner-p4-projects@FreeBSD.ORG Mon Aug 18 19:03:12 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44EB51065685; Mon, 18 Aug 2008 19:03:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 083B71065672 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 19:03:12 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7B4C8FC1C for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 19:03:11 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IJ3B1H011328 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 19:03:11 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IJ3BgD011326 for perforce@freebsd.org; Mon, 18 Aug 2008 19:03:11 GMT (envelope-from konrad@FreeBSD.org) Date: Mon, 18 Aug 2008 19:03:11 GMT Message-Id: <200808181903.m7IJ3BgD011326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski <konrad@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 19:03:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=147755 Change 147755 by konrad@vspredator on 2008/08/18 19:02:21 Fix errors in debug mode of colldef.apple. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#7 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#7 (text+ko) ==== @@ -395,11 +395,12 @@ if (fclose(fp) != 0) err(EX_IOERR, "IO error closing destination file %s", out_file); - #ifdef COLLATE_DEBUG + /* Do it first, before conversion to network byte order. */ if (debug) collate_print_tables(); #endif + exit(EX_OK); } ; @@ -509,6 +510,10 @@ order_line1 : | ELEM { struct symbol *s = getsymbol($1, EXISTS); + +#ifdef VSDEBUG + printf("\n%s(%d) ", showwcs(s->name, CHARMAP_SYMBOL_LEN), s->u.wc); +#endif if (s->val != PRI_UNDEFINED) yyerror("<%s> redefined", showwcs($1, CHARMAP_SYMBOL_LEN)); if (prev_line == LINE_ELLIPSIS) { @@ -789,10 +794,16 @@ ; expansion : weight_ex - | expansion weight_ex + | expansion weight_ex_null ; weight2 : weight - | EXPAND expansion EXPAND { weight_index++; } + | EXPAND expansion EXPAND { +#ifdef VSDEBUG + printf("[%d]=%d ", + weight_index, weight_table[weight_index]->val); +#endif + weight_index++; + } ; weights : | weight @@ -833,6 +844,17 @@ weight_table[weight_index] = s; } ; +weight_ex_null : ELEM { + struct symbol *s; + + if (weight_index >= directive_count) + yyerror("More weights than specified by order_start (%d >= %d, %s)", weight_index, + directive_count, showwcs($1, CHARMAP_SYMBOL_LEN)); + s = getsymbol($1, EXISTS); + if (order_pass && s->val == PRI_UNDEFINED) + printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); +} +; order_end : ORDER_END '\n' ; charmap : DEFN CHAR { @@ -1419,7 +1441,7 @@ for (i = 0; i < UCHAR_MAX + 1; i++, p2++) { printf("\t%s :", show(i)); for(z = 0; z < info.directive_count; z++) - printf(" %d", p2->pri[z]); + printf(" %d", ntohl(p2->pri[z])); putchar('\n'); } } @@ -1427,9 +1449,9 @@ struct __collate_st_large_char_pri *p2 = __collate_large_char_pri_table; printf("Large priority table:\n"); for (i = info.large_pri_count; i-- > 0; p2++) { - printf("\t%s :", show(p2->val)); + printf("\t%s :", show(ntohl(p2->val))); for(z = 0; z < info.directive_count; z++) - printf(" %d", p2->pri.pri[z]); + printf(" %d", ntohl(p2->pri.pri[z])); putchar('\n'); } } From owner-p4-projects@FreeBSD.ORG Mon Aug 18 21:19:33 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AE681065679; Mon, 18 Aug 2008 21:19:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EF9E106568D for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:19:33 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 421E28FC12 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:19:33 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ILJX81043043 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:19:33 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ILJXWb043041 for perforce@freebsd.org; Mon, 18 Aug 2008 21:19:33 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 18 Aug 2008 21:19:33 GMT Message-Id: <200808182119.m7ILJXWb043041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French <rfrench@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 21:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=147776 Change 147776 by rfrench@rfrench_mpls on 2008/08/18 21:19:25 Last submission for Google Summer of Code. Unfortunately not working yet, but I feel it is very close. I will continue to work on this until it is working, at least to some standard. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#5 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#4 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#4 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#4 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#4 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#5 (text+ko) ==== @@ -807,36 +807,36 @@ isr = NETISR_AARP; break; #endif /* NETATALK */ -#ifdef MPLS - case AF_MPLS: - printf("mpls packet received\n"); - if (rt) - dst = rt_key(rt); - else - senderr(EHOSTUNREACH); - - switch (dst->sa_family) { - case AF_LINK: - if (((struct sockaddr_dl *) dst)->sdl_alen < - sizeof(edst)) - senderr(EHOSTUNREACH); - bcopy(LLADDR(((struct sockaddr_dl *)dst)), edst, - sizeof(edst)); - break; - case AF_INET: - if (!arpresolve(ac, rt, m, dst, edst)) - return (0); /* if not yet resolved */ - break; - default: - senderr(EHOSTUNREACH); - } +//#ifdef MPLS + case ETHERTYPE_MPLS: + printf("MPLS packet received\n"); +// if (rt) +// dst = rt_key(rt); +// else +// senderr(EHOSTUNREACH); +// +// switch (dst->sa_family) { +// case AF_LINK: +// if (((struct sockaddr_dl *) dst)->sdl_alen < +// sizeof(edst)) +// senderr(EHOSTUNREACH); +// bcopy(LLADDR(((struct sockaddr_dl *)dst)), edst, +// sizeof(edst)); +// break; +// case AF_INET: +// if (!arpresolve(ac, rt, m, dst, edst)) +// return (0); /* if not yet resolved */ +// break; +// default: +// senderr(EHOSTUNREACH); +// } /* XXX handling for simplex devices in case of M/BCAST ?? */ if (m->m_flags && (M_BCAST | M_MCAST)) isr = NETISR_MPLS_MCAST; else isr = NETISR_MPLS; break; -#endif /* MPLS */ +//#endif /* MPLS */ default: #ifdef IPX if (ef_inputp && ef_inputp(ifp, eh, m) == 0) ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#4 (text+ko) ==== @@ -40,6 +40,9 @@ #include <net/if.h> #include <net/if_dl.h> +#define MPLS +#define MPLS_DEBUG + /* * Structure of a SHIM header. */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#4 (text+ko) ==== ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#4 (text+ko) ==== @@ -48,6 +48,9 @@ * MPLS protocol family: */ +#define MPLS +#define MPLS_DEBUG + extern struct domain mplsdomain; extern struct pr_usrreqs mpls_raw_usrreq; @@ -55,23 +58,20 @@ { .pr_type = 0, .pr_domain = &mplsdomain, - .pr_init = mpls_init/*, - .pr_sysctl = mpls_sysctl*/ + .pr_init = mpls_init, }, { .pr_type = SOCK_DGRAM, .pr_domain = &mplsdomain, .pr_flags = PR_ATOMIC | PR_ADDR, - .pr_usrreqs = &mpls_raw_usrreq/*, - .pr_sysctl = mpls_sysctl*/ + .pr_usrreqs = &mpls_raw_usrreq, }, /* raw wildcard */ { .pr_type = SOCK_RAW, .pr_domain = &mplsdomain, .pr_flags = PR_ATOMIC | PR_ADDR, - .pr_usrreqs = &mpls_raw_usrreq/*, - .pr_sysctl = mpls_sysctl*/ + .pr_usrreqs = &mpls_raw_usrreq, }, }; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#4 (text+ko) ==== @@ -52,9 +52,18 @@ u_long mpls_raw_sendspace = MPLS_RAW_SNDQ; u_long mpls_raw_recvspace = MPLS_RAW_RCVQ; -int mpls_enable = 0; +int mpls_enable = 1; +// SYSCTL_INT( _net_mpls, MPLSCTL_ENABLE, enable, CTLFLAG_RW, +// &mpls_enable, 0, "Enable the MPLS protocol"); + int mpls_defttl = 255; +// SYSCTL_INT( _net_mpls, MPLSCTL_DEFTTL, ttl, CTLFLAG_RW, +// &mpls_defttl, 0, "Maximum TTL on MPLS packets"); + int mpls_inkloop = 16; +// SYSCTL_INT( _net_mpls, MPLSCTL_MAXINKLOOP, inkloop, CTLFLAG_RW, +// &mpls_inkloop, 0, "Set MPLS Max Ink Loop"); + int mpls_push_expnull_ip = 0; int mpls_push_expnull_ip6 = 0; int mpls_mapttl_ip = 1; @@ -63,7 +72,7 @@ int *mplsctl_vars[MPLSCTL_MAXID] = MPLSCTL_VARS; int mpls_control(struct socket *, u_long, caddr_t, struct ifnet *, struct thread *); -static int mpls_attach(struct socket *); +static int mpls_attach(struct socket *, int, struct thread *); /* * Generic MPLS control operations (ioctl's). @@ -77,7 +86,7 @@ } static int -mpls_attach(struct socket *so) +mpls_attach(struct socket *so, int proto, struct thread *td) { int error = 0; if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { From owner-p4-projects@FreeBSD.ORG Mon Aug 18 21:22:37 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B36106567B; Mon, 18 Aug 2008 21:22:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B551F1065673 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:22:36 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 992088FC16 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:22:36 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ILMaLw043379 for <perforce@FreeBSD.org>; Mon, 18 Aug 2008 21:22:36 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ILMapp043377 for perforce@freebsd.org; Mon, 18 Aug 2008 21:22:36 GMT (envelope-from rfrench@FreeBSD.org) Date: Mon, 18 Aug 2008 21:22:36 GMT Message-Id: <200808182122.m7ILMapp043377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French <rfrench@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Cc: Subject: PERFORCE change 147778 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 21:22:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=147778 Change 147778 by rfrench@rfrench_mpls on 2008/08/18 21:22:26 Forgot to uncomment some code in the ether_demux fucntion. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#6 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#6 (text+ko) ==== @@ -807,7 +807,7 @@ isr = NETISR_AARP; break; #endif /* NETATALK */ -//#ifdef MPLS +#ifdef MPLS case ETHERTYPE_MPLS: printf("MPLS packet received\n"); // if (rt) @@ -836,7 +836,7 @@ else isr = NETISR_MPLS; break; -//#endif /* MPLS */ +#endif /* MPLS */ default: #ifdef IPX if (ef_inputp && ef_inputp(ifp, eh, m) == 0) From owner-p4-projects@FreeBSD.ORG Mon Aug 18 23:02:20 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 183681065744; Mon, 18 Aug 2008 23:02:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE3291065742 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:02:19 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF3B38FC12 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:02:19 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IN2JmG058576 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:02:19 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IN2J4r058574 for perforce@freebsd.org; Mon, 18 Aug 2008 23:02:19 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 18 Aug 2008 23:02:19 GMT Message-Id: <200808182302.m7IN2J4r058574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 23:02:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147784 Change 147784 by alepulver@alepulver_deimos on 2008/08/18 23:01:43 - Update from depot Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde4.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ldap.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.python.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.qt.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#3 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#3 integrate Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.cmake.mk#2 (text+ko) ==== @@ -20,7 +20,7 @@ # Default: ${PREFIX} # # -# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.1 2008/05/27 22:12:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.cmake.mk,v 1.2 2008/08/10 15:43:46 miwi Exp $ CMAKE_MAINTAINER= kde@FreeBSD.org @@ -78,7 +78,7 @@ # # Force makefile verbosity if needed # -.if defined(CMAKE_VERBOSE) +.if defined(CMAKE_VERBOSE) || defined(BATCH) CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.database.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.29 2008/06/09 06:01:41 vanilla Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.30 2008/07/26 08:38:53 ale Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -102,6 +102,7 @@ MYSQL41_LIBVER= 14 MYSQL50_LIBVER= 15 MYSQL51_LIBVER= 16 +MYSQL60_LIBVER= 16 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#3 (text+ko) ==== @@ -31,7 +31,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.17 2008/06/28 16:52:40 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.20 2008/08/17 06:57:17 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -40,7 +40,7 @@ # All GCC versions supported by the ports framework. # Please keep them in ascending order. # -GCCVERSIONS= 020702 020801 029500 030200 030301 030402 040100 040200 040300 +GCCVERSIONS= 020801 029500 030301 030402 040100 040200 040300 # # Versions of GCC shipped. @@ -49,10 +49,8 @@ # the base system. # The third field is the version as USE_GCC would use. # -GCCVERSION_020702= 000000 000000 2.7 GCCVERSION_020801= 000000 400012 2.8 GCCVERSION_029500= 400012 500035 2.95 -GCCVERSION_030200= 500039 501103 3.2 GCCVERSION_030301= 501103 502126 3.3 GCCVERSION_030402= 502126 700042 3.4 GCCVERSION_040100= 999999 999999 4.1 @@ -196,8 +194,6 @@ BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif -MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" - .endif # defined(USE_GCC) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <ahze@FreeBSD.org> # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.2 2008/07/04 08:14:21 adamw Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.4 2008/08/06 16:26:17 mezz Exp $ # $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.8 2008/06/20 22:17:41 mezz Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -12,10 +12,10 @@ # ======================= USERS ================================= # To specify which gecko-based backend you prefer, use something like: # -# WITH_GECKO= firefox3 +# WITH_GECKO= firefox # # The valid backends are: -# firefox firefox3 flock nvu seamonkey thunderbird xulrunner +# firefox flock nvu seamonkey thunderbird xulrunner # # See below for more details. # ======================= /USERS ================================ @@ -79,12 +79,7 @@ # ${WRKSRC}/configure # .endif -.if ${OSVERSION} >= 500000 -.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock firefox3 -.endif -.endif -_GECKO_ALL+= mozilla +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla thunderbird_PORTSDIR= mail ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.50 2008/06/20 15:13:50 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.51 2008/08/12 09:26:51 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -265,11 +265,7 @@ # using any backend # .if defined(USE_GNUSTEP_BACK) -.if defined(WITH_GNUSTEP_DEVEL) BACKSUFFIX?= -014 -.else -BACKSUFFIX?= -012 -.endif .if defined(WITH_GNUSTEP_XDPS) GNUSTEP_WITH_XDPS=yes .elif defined(WITH_GNUSTEP_LIBART) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.java.mk#2 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.82 2007/10/28 15:09:43 hq Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.84 2008/08/18 15:42:41 glewis Exp $ # .if !defined(Java_Include) @@ -169,6 +169,8 @@ # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO= PORT=java/diablo-jdk16 HOME=${LOCALBASE}/diablo-jdk1.6.0 \ + VERSION=1.6.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ VERSION=1.5.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \ @@ -201,15 +203,15 @@ _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ - (${ARCH} == "i386" && ${OSVERSION} < 700000) -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 +. if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000) +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 . else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 . endif # List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ + JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ @@ -249,34 +251,30 @@ . endfor # Error checking: JAVA_VERSION +.if !defined(_JAVA_VERSION_LIST_REGEXP) _JAVA_VERSION_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VERSION_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_VERSION!= ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_VERSION_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_VERSION} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; - @${FALSE} -. endif + @test ! -z "${JAVA_VERSION}" && ( ${ECHO_CMD} "${JAVA_VERSION}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VERSION_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VERSION}\" is not a valid value for JAVA_VERSION. It should be one or more of: ${__JAVA_VERSION_LIST} (with an optional \"+\" suffix.)"; ${FALSE})) || true # Error checking: JAVA_VENDOR +.if !defined(_JAVA_VENDOR_LIST_REGEXP) _JAVA_VENDOR_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_VENDOR_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_VENDOR!= ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_VENDOR_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_VENDOR} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; - @${FALSE} -. endif + @test ! -z "${JAVA_VENDOR}" && ( ${ECHO_CMD} "${JAVA_VENDOR}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_VENDOR_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_VENDOR}\" is not a valid value for JAVA_VENDOR. It should be one or more of: ${_JAVA_VENDOR_LIST}"; \ + ${FALSE})) || true # Error checking: JAVA_OS +.if !defined(_JAVA_OS_LIST_REGEXP) _JAVA_OS_LIST_REGEXP!= ${ECHO_CMD} "${_JAVA_OS_LIST}" | ${SED} "s/ /\\\|/g" -_ERROR_CHECKING_JAVA_OS!= ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" \ - | ${GREP} -v "${_JAVA_OS_LIST_REGEXP}" || true -. if (${_ERROR_CHECKING_JAVA_OS} != "") +.endif check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; - @${FALSE} -. endif + @test ! -z "${JAVA_OS}" && ( ${ECHO_CMD} "${JAVA_OS}" | ${TR} " " "\n" | ${GREP} -q "${_JAVA_OS_LIST_REGEXP}" || \ + (${ECHO_CMD} "${PKGNAME}: Makefile error: \"${JAVA_OS}\" is not a valid value for JAVA_OS. It should be one or more of: ${_JAVA_OS_LIST}"; \ + ${FALSE})) || true # Set default values for JAVA_BUILD and JAVA_RUN # When nothing is set, assume JAVA_BUILD=jdk and JAVA_RUN=jre @@ -313,18 +311,30 @@ A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} +.if !defined(_JAVA_PORTS_INSTALLED) A_JAVA_PORT_INSTALLED!= ${TEST} -x "${A_JAVA_PORT_HOME}/${_JDK_FILE}" \ && ${ECHO_CMD} "${A_JAVA_PORT}" \ || ${TRUE} __JAVA_PORTS_INSTALLED!= ${ECHO_CMD} "${__JAVA_PORTS_INSTALLED} ${A_JAVA_PORT_INSTALLED}" -A_JAVA_PORT_POSSIBLE!= ${ECHO_CMD} "${_JAVA_VERSION}" | ${GREP} -q "${A_JAVA_PORT_VERSION}" \ - && ${ECHO_CMD} "${_JAVA_OS}" | ${GREP} -q "${A_JAVA_PORT_OS}" \ - && ${ECHO_CMD} "${_JAVA_VENDOR}" | ${GREP} -q "${A_JAVA_PORT_VENDOR}" \ - && ${ECHO_CMD} "${A_JAVA_PORT}" \ - || ${TRUE} -__JAVA_PORTS_POSSIBLE!= ${ECHO_CMD} "${__JAVA_PORTS_POSSIBLE} ${A_JAVA_PORT_POSSIBLE}" +.endif + +# The magic here is that we want to test for a substring using only shell builtins (to avoid forking) +# Our shell does not have an explicit substring operator, but we can build one by using the '#' +# deletion operator ('%' would also work). We try to delete the pattern "*${substr}*" and compare it +# to the original string. If they differ, the substring matched. +# +# We can't do this in make because it doesn't allow nested modifiers ${foo:${bar}} +# +A_JAVA_PORT_POSSIBLE!= ver="${_JAVA_VERSION}"; os="${_JAVA_OS}"; vendor="${_JAVA_VENDOR}"; \ + ${TEST} "$${ver\#*${A_JAVA_PORT_VERSION}*}" != "${_JAVA_VERSION}" -a \ + "$${os\#*${A_JAVA_PORT_OS}*}" != "${_JAVA_OS}" -a \ + "$${vendor\#*${A_JAVA_PORT_VENDOR}*}" != "${_JAVA_VENDOR}" && \ + ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} +__JAVA_PORTS_POSSIBLE:= ${__JAVA_PORTS_POSSIBLE} ${A_JAVA_PORT_POSSIBLE} . endfor +.if !defined(_JAVA_PORTS_INSTALLED) _JAVA_PORTS_INSTALLED= ${__JAVA_PORTS_INSTALLED:C/ [ ]+/ /g} +.endif _JAVA_PORTS_POSSIBLE= ${__JAVA_PORTS_POSSIBLE:C/ [ ]+/ /g} @@ -337,20 +347,28 @@ . undef _JAVA_PORTS_INSTALLED_POSSIBLE . for A_JAVA_PORT in ${_JAVA_PORTS_POSSIBLE} -A_JAVA_PORT_INSTALLED_POSSIBLE!= ${ECHO_CMD} "${_JAVA_PORTS_INSTALLED}" | ${GREP} -q "${A_JAVA_PORT}" \ - && ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} -__JAVA_PORTS_INSTALLED_POSSIBLE!= ${ECHO_CMD} "${__JAVA_PORTS_INSTALLED_POSSIBLE} ${A_JAVA_PORT_INSTALLED_POSSIBLE}" +A_JAVA_PORT_INSTALLED_POSSIBLE!= inst="${_JAVA_PORTS_INSTALLED}"; \ + ${TEST} "$${inst\#*${A_JAVA_PORT}*}" != "${_JAVA_PORTS_INSTALLED}" && \ + ${ECHO_CMD} "${A_JAVA_PORT}" || ${TRUE} +__JAVA_PORTS_INSTALLED_POSSIBLE:= ${__JAVA_PORTS_INSTALLED_POSSIBLE} ${A_JAVA_PORT_INSTALLED_POSSIBLE} . endfor -_JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/ [ ]+/ /g} +_JAVA_PORTS_INSTALLED_POSSIBLE= ${__JAVA_PORTS_INSTALLED_POSSIBLE:C/[ ]+//g} . if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != "" -_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_INSTALLED_POSSIBLE}" \ - | ${AWK} '{ print $$1 }' - +. for i in ${_JAVA_PORTS_INSTALLED_POSSIBLE} +. if !defined(_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit) +_JAVA_PORT= $i +_JAVA_PORTS_INSTALLED_POSSIBLE_shortcircuit= 1 +. endif +. endfor # If no installed JDK port fits, then pick one from the list of possible ones . else -_JAVA_PORT!= ${ECHO_CMD} "${_JAVA_PORTS_POSSIBLE}" \ - | ${AWK} '{ print $$1 }' +. for i in ${_JAVA_PORTS_POSSIBLE} +. if !defined(_JAVA_PORTS_POSSIBLE_shortcircuit) +_JAVA_PORT= $i +_JAVA_PORTS_POSSIBLE_shortcircuit= 1 +. endif +. endfor . endif _JAVA_PORT_INFO:= ${_JAVA_PORT:S/^/\${_/:S/$/_INFO}/} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.kde.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.76 2008/04/19 17:46:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.78 2008/08/18 09:21:32 miwi Exp $ # # Please view me with 4 column tabs! @@ -34,11 +34,11 @@ # USE_KDEBASE_VER section .if defined(USE_KDEBASE_VER) .if ${USE_KDEBASE_VER} == CVS -LIB_DEPENDS+= kfontinst:${PORTSDIR}/x11/kdebase +LIB_DEPENDS+= kfontinst.0:${PORTSDIR}/x11/kdebase USE_KDELIBS_VER=CVS .elif ${USE_KDEBASE_VER} == 3 # kdebase 3.x common stuff -LIB_DEPENDS+= kfontinst:${PORTSDIR}/x11/kdebase3 +LIB_DEPENDS+= kfontinst.0:${PORTSDIR}/x11/kdebase3 USE_KDELIBS_VER=3 .endif # ${USE_KDEBASE_VER} == 3 .endif # defined(USE_KDEBASE_VER) @@ -64,12 +64,12 @@ .endif .if ${USE_KDELIBS_VER} == CVS -LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs +LIB_DEPENDS+= kimproxy.0:${PORTSDIR}/x11/kdelibs USE_QT_VER= CVS PREFIX= ${KDE_CVS_PREFIX} .elif ${USE_KDELIBS_VER} == 3 # kdelibs 3.x common stuff -LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 +LIB_DEPENDS+= kimproxy.0:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} .else @@ -102,7 +102,7 @@ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.8 +KDE_VERSION= 3.5.9 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.linux-rpm.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.12 2008/04/29 19:20:52 bsam Exp $ +# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.13 2008/08/15 12:29:42 bsam Exp $ # # Variables: @@ -105,6 +105,20 @@ BRANDELF_DIRS?= BRANDELF_FILES?= +# For ports that define PORTDOCS, be sure not to install +# documentation if NOPORTDOCS is defined +. if defined(PORTDOCS) && defined(NOPORTDOCS) +pre-patch: linux-rpm-clean-portdocs + +. if !target(linux-rpm-clean-portdocs) +linux-rpm-clean-portdocs: +. for x in ${PORTDOCS} + @${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x} +. endfor + @${RMDIR} ${WRKDIR}/${DOCSDIR_REL} +. endif +. endif + . if defined(AUTOMATIC_PLIST) . if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes" ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.lua.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.16 2008/02/18 18:41:26 alepulver Exp $ +# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.18 2008/08/10 19:29:42 alepulver Exp $ # # bsd.lua.mk - Support for Lua based ports. # @@ -105,6 +105,26 @@ # running. # USE_LUA_NOT=5.1 # +# Notes about the integration of lua related ports with bsd.lua.mk: +# (please read when updating ports referred here, see lang/lua[0-9]*) +# +# The lua/tolua ports have to be patched so they can coexist, as the internal +# application build infrastructure does not handle it automatically. Currently +# the framework provides variables to the lua ports themselves, so changing +# some things here won't require changes in lang/{lua,tolua}*. +# +# For lua ports: if they install a static library, use the same method for +# tolua ports, otherwise in addition the libraries have to be symlinked to the +# common library directory with a versioned name, and linked with the -soname +# parameter (so when a port links with -L/usr/local/lib/lua51 -llua, it stores +# the dynamic dependency as the name which figures under /usr/local/lib). +# +# For tolua ports: as it is a static library (.a), installing binaries, +# headers and libraries under a versioned directory is fine (binary has also a +# symlink). +# +# The lua modules install in a separate directory, so there is no problem. +# LUA_Include_MAINTAINER= alepulver@FreeBSD.org @@ -150,7 +170,7 @@ _LUA_PORT_lua_5.0= lang/lua50 _LUA_DEPTYPE_lua_5.0= lib -_LUA_PORT_tolua_5.0= lang/tolua +_LUA_PORT_tolua_5.0= lang/tolua50 _LUA_PORT_ruby_5.0= lang/ruby-lua _LUA_PORT_app_5.0= devel/lua50-app @@ -164,13 +184,14 @@ _LUA_PORT_socket_5.0= net/lua50-luasocket _LUA_PORT_lua_5.1= lang/lua -_LUA_DEPTYPE_lua_5.1= build +_LUA_DEPTYPE_lua_5.1= lib _LUA_PORT_filename_5.1= devel/lua-filename _LUA_PORT_gettext_5.1= devel/lua-gettext _LUA_PORT_posix_5.1= devel/lua-posix _LUA_PORT_pty_5.1= devel/lua-pty _LUA_PORT_socket_5.1= net/luasocket +_LUA_PORT_tolua_5.1= lang/tolua . for comp in ${_LUA_COMPS_ALL} _LUA_COMP= ${comp} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.openssl.mk#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Date created: 31 May 2002 # Whom: dinoex # -# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.38 2008/03/30 11:38:02 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.openssl.mk,v 1.39 2008/08/05 09:33:07 dinoex Exp $ # # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk # @@ -121,11 +121,14 @@ exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) # find installed port and use it for dependency PKG_DBDIR?= ${DESTDIR}/var/db/pkg -OPENSSL_INSTALLED!= grep -l -r "^lib/libssl.so." "${PKG_DBDIR}" | \ +.if !defined(OPENSSL_INSTALLED) +OPENSSL_INSTALLED!= find "${PKG_DBDIR}" -type f -name "+CONTENTS" -print0 | \ + xargs -0 grep -l "^lib/libssl.so." | \ while read contents; do \ sslprefix=`grep "^@cwd " "$${contents}" | ${HEAD} -n 1`; \ if test "$${sslprefix}" = "@cwd ${LOCALBASE}" ; then \ echo "$${contents}"; break; fi; done +.endif OPENSSL_PORT!= grep "^@comment ORIGIN:" "${OPENSSL_INSTALLED}" | ${CUT} -d : -f 2 OPENSSL_SHLIBFILE!= grep "^lib/libssl.so." "${OPENSSL_INSTALLED}" OPENSSL_SHLIBVER?= ${OPENSSL_SHLIBFILE:E} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.php.mk#2 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.45 2008/01/21 07:19:24 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.46 2008/07/11 10:57:15 ale Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -234,7 +234,7 @@ # Extensions .if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes" # non-version specific components -_USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dbase \ +_USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba dbase \ exif fileinfo fribidi ftp gd gettext gmp \ hash iconv imap interbase json ldap mbstring mcrypt \ memcache mhash mssql mysql ncurses odbc \ @@ -249,6 +249,7 @@ pdo_mysql pdo_sqlite \ simplexml soap spl sqlite tidy xmlreader xmlwriter xsl +apc_DEPENDS= www/pecl-APC bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset bz2_DEPENDS= archivers/php${PHP_VER}-bz2 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.595 2008/06/30 20:16:17 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.601 2008/08/09 16:52:04 miwi Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -312,9 +312,6 @@ # GMAKE - Set to path of GNU make if not in $PATH. # Default: gmake ## -# USE_GETOPT_LONG -# - If set, this port uses getopt_long. May be obsolete. -## # USE_ICONV - If set, this port uses libiconv. # USE_GETTEXT - If set, this port uses GNU gettext (libintl). ## @@ -384,7 +381,7 @@ # Supported components are: glut, glu, glw, gl and linux. # If set to "yes", this is equivalent to "glu". Note that # glut depends on glu, glw and glu depend on gl. -# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XPM. +# USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XORG+= xpm # NO_OPENMOTIF - If set, this port uses a custom Motif toolkit # instead of Openmotif. # Used only when USE_MOTIF is set. @@ -394,14 +391,13 @@ ## # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. -# USE_XPM - If set, this port uses the xpm graphics libraries. ## # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. # Implies: WANT_OPENLDAP_VER?=23 # WANT_OPENLDAP_VER -# - Legal values are: 22, 23, 24 +# - Legal values are: 23, 24 # If set to an unkown value, the port is marked BROKEN. # WANT_OPENLDAP_SASL # - If set, the system should use OpenLDAP libraries @@ -465,10 +461,15 @@ # USE_KDELIBS_VER - Set to 3 to use the KDE libraries. # Implies inclusion of bsd.kde.mk. # +# USE_KDE4 - A list of the KDE4 dependencies the port has (e.g., +# kdelibs, kdebase). Implies that the port needs KDE. +# Implies inclusion of bsd.kde4.mk. See bsd.kde4.mk +# for more details. +# # USE_QT_VER - Set to 3 or 4 to use the respective version # of the QT libraries. # Implies inclusion of bsd.kde.mk. -## +# # USE_LINUX - Set to yes to say the port needs the default linux base port. # Set to value <X>, if the port needs emulators/linux_base-<X>. # If set to "7", a dependency is registered to emulators/linux_base. @@ -594,7 +595,7 @@ # - A command to install binary executables. (By # default, also strips them, unless ${STRIP} is # overridden to be the empty string). -# INSTALL_KLD - As INSTALL_KLD, but without the STRIP. +# INSTALL_KLD - As INSTALL_PROGRAM, but without the STRIP. # INSTALL_SCRIPT # - A command to install executable scripts. # INSTALL_DATA - A command to install sharable data. @@ -807,7 +808,7 @@ # FETCH_BINARY - Path to ftp/http fetch command if not in $PATH. # Default: "/usr/bin/fetch" # FETCH_ARGS - Arguments to ftp/http fetch command. -# Default: "-ARr" +# Default: "-ApRr" # FETCH_CMD - ftp/http fetch command. # Default: ${FETCH_BINARY} ${FETCH_ARGS} # FETCH_BEFORE_ARGS @@ -1129,13 +1130,13 @@ .else -# Look for ${WRKSRC}/.../*.orig files, and (re-)create +# Look for ${PATCH_WRKSRC}/.../*.orig files, and (re-)create # ${FILEDIR}/patch-* files from them. .if !target(makepatch) makepatch: @cd ${.CURDIR} && ${MKDIR} ${FILESDIR} - @(cd ${WRKSRC}; \ + @(cd ${PATCH_WRKSRC}; \ for i in `find . -type f -name '*.orig'`; do \ ORG=$$i; \ NEW=$${i%.orig}; \ @@ -1241,14 +1242,13 @@ UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} .endif OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options -_OPTIONSFILE!= ${ECHO_CMD} "${OPTIONSFILE}" .if defined(OPTIONS) # include OPTIONSFILE first if exists -. if exists(${_OPTIONSFILE}) && !make(rmconfig) -. include "${_OPTIONSFILE}" +. if exists(${OPTIONSFILE}) && !make(rmconfig) +. include "${OPTIONSFILE}" . endif -. if exists(${_OPTIONSFILE}.local) -. include "${_OPTIONSFILE}.local" +. if exists(${OPTIONSFILE}.local) +. include "${OPTIONSFILE}.local" . endif WITHOUT:= WITH:= @@ -1504,7 +1504,7 @@ .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -1532,6 +1532,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_KDE4) || defined(KDE4_BUILDENV) +.include "${PORTSDIR}/Mk/bsd.kde4.mk" +.endif + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if (${PREFIX:C,(^.).*,\1,} != "/") @@ -1545,8 +1549,6 @@ # Location of mounted CDROM(s) to search for files CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} -WANT_OPENLDAP_VER?= 23 - # Owner and group of the WWW user WWWOWN?= www WWWGRP?= www @@ -1587,6 +1589,10 @@ PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true! PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1${RC_SUBR_SUFFIX} forcestop 2>/dev/null || true! +# kludge to strip trailing whitespace from CFLAGS; +# sub-configure will not # survive double space +CFLAGS:= ${CFLAGS:C/ $//} + .if defined(WITHOUT_CPU_CFLAGS) .if defined(_CPUCFLAGS) .if !empty(_CPUCFLAGS) @@ -1654,7 +1660,7 @@ HAVE_COMPAT_IA32_LIBS?= YES .endif .if !defined(HAVE_COMPAT_IA32_KERN) -HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi +HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi .endif .endif @@ -1690,26 +1696,8 @@ .include "${PORTSDIR}/Mk/bsd.gcc.mk" .endif -.if defined(USE_OPENLDAP_VER) -USE_OPENLDAP?= yes -WANT_OPENLDAP_VER= ${USE_OPENLDAP_VER} -.endif - -.if defined(USE_OPENLDAP) -.if defined(WANT_OPENLDAP_SASL) -_OPENLDAP_FLAVOUR= -sasl -.else -_OPENLDAP_FLAVOUR= -.endif -.if ${WANT_OPENLDAP_VER} == 22 -LIB_DEPENDS+= ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client -.elif ${WANT_OPENLDAP_VER} == 23 -LIB_DEPENDS+= ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client -.elif ${WANT_OPENLDAP_VER} == 24 -LIB_DEPENDS+= ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client -.else -IGNORE= cannot be built with unknown OpenLDAP version: ${WANT_OPENLDAP_VER} -.endif +.if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) +.include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif .if defined(USE_FAM) @@ -1834,7 +1822,7 @@ .endif .if defined(USE_MOTIF) -USE_XPM= yes +USE_XORG+= xpm .if defined(WANT_LESSTIF) LIB_DEPENDS+= Xm:${PORTSDIR}/x11-toolkits/lesstif NO_OPENMOTIF= yes @@ -1880,7 +1868,7 @@ .endif .if defined(USE_XPM) -USE_XORG+= xpm +IGNORE= USE_XPM is deprecated. Use USE_XORG=xpm instead. .endif XAWVER= 8 @@ -2017,7 +2005,7 @@ .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.if defined(WANT_GNOME) || defined(USE_GNOME) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -2025,6 +2013,10 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif +.if defined(USE_KDE4) +.include "${PORTSDIR}/Mk/bsd.kde4.mk" +.endif + .if defined(USE_CMAKE) .include "${PORTSDIR}/Mk/bsd.cmake.mk" .endif @@ -2112,8 +2104,9 @@ MAKEFILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ - MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" + MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \ + CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ + MANPREFIX="${MANPREFIX}" # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. # gcc 4.x enable strict aliasing optimization with -O2 which is known to break @@ -2257,7 +2250,7 @@ MAKE_ENV+= ${INSTALL_MACROS} SCRIPTS_ENV+= ${INSTALL_MACROS} -# Macro for coping entire directory tree with correct permissions +# Macro for copying entire directory tree with correct permissions .if ${UID} == 0 COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ 2>&1) && \ @@ -2357,7 +2350,7 @@ .include "${PORTSDIR}/Mk/bsd.licenses.mk" # Popular master sites -.include "bsd.sites.mk" +.include "${PORTSDIR}/Mk/bsd.sites.mk" # Empty declaration to avoid "variable MASTER_SITES recursive" error MASTER_SITES?= @@ -3286,8 +3279,8 @@ .endif .if defined(_OPTIONS_READ) @${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}" -.if ${OPTIONSFILE} != ${_OPTIONSFILE} - @${ECHO_MSG} "===> *** CAUTION *** Using wrong configuration file ${_OPTIONSFILE}" +.if ${OPTIONSFILE} != ${OPTIONSFILE} + @${ECHO_MSG} "===> *** CAUTION *** Using wrong configuration file ${OPTIONSFILE}" .endif .endif @@ -5303,14 +5296,46 @@ # If this ever changes, portmgr should contact the portsnap maintainer # first to avoid gratuitous breakage. -.if !target(describe) +# XXX Older versions do not support the :u make modifier. The .else +# clause can be removed once 6.3-RELEASE is no longer supported. +.if ${OSVERSION} >= 603104 +. if !target(describe) +_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} +_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS} +_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS} +. if exists(${DESCR}) +_DESCR=${DESCR} +. else +_DESCR=/dev/null +. endif + +describe: + @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|"; \ + ${ECHO_CMD} -n ${COMMENT:Q}; \ + ${ECHO_CMD} -n "|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|"; \ + while read one two discard; do \ + case "$$one" in \ + WWW:) case "$$two" in \ + https://*|http://*|ftp://*) ${ECHO_CMD} -n "$$two" ;; \ + *) ${ECHO_CMD} -n "http://$$two" ;; \ + esac; \ + break; \ + ;; \ + esac; \ + done < ${DESCR}; ${ECHO_CMD} +. endif +.else +. if !target(describe) describe: @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|" -.if defined(COMMENT) +. if defined(COMMENT) @${ECHO_CMD} -n ${COMMENT:Q} -.else +. else @${ECHO_CMD} -n '** No Description' -.endif +. endif @perl -e ' \ if ( -f q{${DESCR}} ) { \ print q{|${DESCR}}; \ @@ -5365,6 +5390,7 @@ } \ } \ print qq{\n};' +. endif .endif www-site: @@ -5792,23 +5818,23 @@ .if !defined(OPTIONS) @${ECHO_MSG} "===> No options to configure" .else -.if ${OPTIONSFILE} != ${_OPTIONSFILE} - @${ECHO_MSG} "===> Using wrong configuration file ${_OPTIONSFILE}" +.if ${OPTIONSFILE} != ${OPTIONSFILE} + @${ECHO_MSG} "===> Using wrong configuration file ${OPTIONSFILE}" @exit 1 .endif .if ${UID} != 0 && !defined(INSTALL_AS_USER) - @optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + @optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ ${ECHO_MSG} "===> Switching to root credentials to create $${optionsdir}"; \ (${SU_CMD} "${SH} -c \"${MKDIR} $${optionsdir} 2> /dev/null\"") || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1); \ ${ECHO_MSG} "===> Returning to user credentials" .else - @(optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + @(optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ ${MKDIR} $${optionsdir} 2> /dev/null) || \ (${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) .endif - -@if [ -e ${_OPTIONSFILE} ]; then \ - . ${_OPTIONSFILE}; \ + -@if [ -e ${OPTIONSFILE} ]; then \ + . ${OPTIONSFILE}; \ fi; \ set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ @@ -5858,11 +5884,11 @@ fi; \ done; \ if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to write ${_OPTIONSFILE}"; \ - ${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${_OPTIONSFILE}"; \ + ${ECHO_MSG} "===> Switching to root credentials to write ${OPTIONSFILE}"; \ + ${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \ ${ECHO_MSG} "===> Returning to user credentials"; \ else \ - ${CAT} $${TMPOPTIONSFILE} > ${_OPTIONSFILE}; \ + ${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \ fi; \ ${RM} -f $${TMPOPTIONSFILE} .endif @@ -5879,9 +5905,9 @@ .if !target(config-conditional) config-conditional: .if defined(OPTIONS) -.if exists(${_OPTIONSFILE}) +.if exists(${OPTIONSFILE}) # scan saved options and invalidate them, if the set of options does not match - @. ${_OPTIONSFILE}; \ + @. ${OPTIONSFILE}; \ set ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ withvar=WITH_$$1; \ @@ -5913,8 +5939,8 @@ showconfig: .if defined(OPTIONS) @${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}:" - -@if [ -e ${_OPTIONSFILE} ]; then \ - . ${_OPTIONSFILE}; \ + -@if [ -e ${OPTIONSFILE} ]; then \ + . ${OPTIONSFILE}; \ fi; \ set -- ${OPTIONS} XXX; \ while [ $$# -gt 3 ]; do \ @@ -5939,16 +5965,16 @@ .if !target(rmconfig) rmconfig: -.if defined(OPTIONS) && exists(${_OPTIONSFILE}) +.if defined(OPTIONS) && exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${_OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ if [ `${ID} -u` != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ - ${ECHO_MSG} "===> Switching to root credentials to remove ${_OPTIONSFILE} and $${optionsdir}"; \ - ${SU_CMD} "${RM} -f ${_OPTIONSFILE} ; \ + ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ + ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ ${RMDIR} $${optionsdir}"; \ ${ECHO_MSG} "===> Returning to user credentials"; \ else \ - ${RM} -f ${_OPTIONSFILE}; \ + ${RM} -f ${OPTIONSFILE}; \ ${RMDIR} $${optionsdir}; \ fi .else ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.subdir.mk#2 (text+ko) ==== @@ -2,7 +2,7 @@ # ex:ts=4 # # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.74 2008/03/12 00:13:06 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.75 2008/07/19 17:59:41 kris Exp $ # # The include file <bsd.port.subdir.mk> contains the default targets # for building ports subdirectories. @@ -63,13 +63,15 @@ STRIP?= -s .endif +# These are variables that are invariant for the lifetime of a recursive port traversal +# (index build, etc), so it is more efficient to precompute them here and pass them in +# to child makes explicitly, instead of recomputing them tens of thousands of times. + .if !defined(NOPRECIOUSMAKEVARS) .if !defined(ARCH) ARCH!= ${UNAME} -p .endif -.if !defined(OSREL) -OSREL!= ${UNAME} -r | ${SED} -e 's/[-(].*//' -.endif + .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h @@ -79,23 +81,76 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif + +.if !defined(_OSRELEASE) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 18 23:03:21 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF6A1065673; Mon, 18 Aug 2008 23:03:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0088C106567E for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:03:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D70388FC0A for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:03:20 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IN3Kjr059776 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:03:20 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IN3Kk7059774 for perforce@freebsd.org; Mon, 18 Aug 2008 23:03:20 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 18 Aug 2008 23:03:20 GMT Message-Id: <200808182303.m7IN3Kk7059774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 23:03:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=147785 Change 147785 by alepulver@alepulver_deimos on 2008/08/18 23:02:48 - Add FOSSology port (partially working; reported upstream) Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/distinfo#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/fossology.in#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__checksum.c#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__departition.c#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__ununpack.h#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-cli__Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-mkinstall.sh#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__spawn.c#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__spawn.h#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-install.in#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-message.in#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/setup-script.sh.in#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/log.txt#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-descr#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 18 23:51:10 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39BB11065677; Mon, 18 Aug 2008 23:51:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D950D1065689 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:51:09 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BB0AD8FC15 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:51:09 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7INp9i4064087 for <perforce@freebsd.org>; Mon, 18 Aug 2008 23:51:09 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7INp9VI064085 for perforce@freebsd.org; Mon, 18 Aug 2008 23:51:09 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 18 Aug 2008 23:51:09 GMT Message-Id: <200808182351.m7INp9VI064085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 18 Aug 2008 23:51:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147790 Change 147790 by alepulver@alepulver_deimos on 2008/08/18 23:50:52 - Move licenses database (placeholder for FOSSology's db) to a separate file bsd.licenses.db.mk. - Update README's TODO list. - Update comments in bsd.licenses.mk. - Add code to keep previous configuration when saving. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#5 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.db.mk#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#5 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#5 (text+ko) ==== @@ -81,25 +81,22 @@ -> 2 nested loops are needed, and 2 scans: 1 for "license combinations" (OR), containing inside individual licenses (AND), a minimal report has to be made about each combination -* allow to view license properties from menu (prepend info to license) +* allow to view license properties from menu (prepend info to license), + together with previous item (in separate script file, with env vars) +* root switching support (like options) when asking to save license + approval/reject not implemented (for now avoids the error if trying + to save), may require adding "ask-license" to _EXTRACT_SUSEQ (maybe + can be done only if required, from bsd.licenses.mk) + +Test/fix: +* SHA256 +* save/load maintaining other choices -General: +Maybe: * additional targets (show-license, show-license-report, show-known-licenses, etc) - and ports framework configuration -* add common licenses (check a web page or try FOSSology) - -Maybe: -* separate groups into another variable (either internally and/or externally->better) * Consider licenses that need manual agreement/manual fetching provide framework help for manual distfile placing, etc maybe also add pkg-fetch-message or some variables to avoid manual IGNORE/printf? -* incorporate pattern matching in licenses/groups/distfiles/lic files - -> only if variables are solely used in commands - -Other: -* make 3 ports, each being an example of the 3 cases -* update wiki, save "script(1)" session and put there as demonstration, - update TODO list, put questions, put comments in tables ============================================================================== ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#5 (text+ko) ==== @@ -112,61 +112,10 @@ # - Check user and framework configuration. # - Define targets. -# XXX Start of editable section +# Include known licenses from database -# License definitions -# -# _LICENSE_LIST - List of defined licenses -# _LICENSE_LIST_GROUPS - List of defined license groups -# - -_LICENSE_LIST= GPLv2 -_LICENSE_LIST_GROUPS= FSF - -# Properties of license/group "xxx" (similar to port's variables, but single) -# _LICENSE_NAME_xxx - Full name/description of license/group -# _LICENSE_PERMS_xxx - Permissions -# _LICENSE_COMPAT_xxx - Compatibility -# _LICENSE_INCOMPAT_xxx - Incompatibility - -# List of licenses - -_LICENSE_NAME_GPLv2= GNU General Public License version 2 -_LICENSE_PERMS_GPLv2= dist-redist dist-sell pkg-redist pkg-sell auto-accept -_LICENSE_COMPAT_GPLv2= # -_LICENSE_INCOMPAT_GPLv2=# - -# List of groups - -_LICENSE_NAME_FSF= Free Software Foundation approved -_LICENSE_PERMS_FSF= # -_LICENSE_COMPAT_FSF= # -_LICENSE_INCOMPAT_FSF= # +.include "${PORTSDIR}/Mk/bsd.licenses.db.mk" -# Grouping -# -# - Method 1: -# _LICENSE_LIST_GROUP_xxx - List of licenses under the "xxx" group - -_LICENSE_LIST_GROUP_FSF= GPLv2 - -# - Method 2: -# _LICENSE_GROUPS_xxx - Groups the license/group belongs to - -# empty - -# XXX End of editable section - -# Method 1 expands to method 2 -.for group in ${_LICENSE_LIST_GROUPS} -. for lic in ${_LICENSE_LIST_GROUP_${group}} -_LICENSE_GROUPS_${lic}?= # -. if ${_LICENSE_GROUPS_${lic}:M${group}} == "" -_LICENSE_GROUPS_${lic}+= ${group} -. endif -. endfor -.endfor - # Lists of variables and valid components # # _LICENSE_LIST_PERMS - Valid permission components @@ -207,17 +156,17 @@ # _LICENSE_SINGLE - Defined for a single license # _LICENSE_MULTI - Set to "and"/"or"? (XXX Not implemented) -.for lic in ${_LICENSE} -. if defined(_LICENSE_DEFINED) -_LICENSE_MULTI= yes -. else -_LICENSE_DEFINED?= ${lic} -. endif -.endfor -.if !defined(_LICENSE_MULTI) -_LICENSE_SINGLE= yes -.endif -.undef _LICENSE_DEFINED +#.for lic in ${_LICENSE} +#. if defined(_LICENSE_DEFINED) +#_LICENSE_MULTI= yes +#. else +#_LICENSE_DEFINED?= ${lic} +#. endif +#.endfor +#.if !defined(_LICENSE_MULTI) +#_LICENSE_SINGLE= yes +#.endif +#.undef _LICENSE_DEFINED # Evaluate port license groups and permissions # @@ -225,11 +174,10 @@ # Case 1: "known" (license info taken from internal database) # Case 2: "variant" (LICENSE is known, but info taken from port) # Case 3: "unknown" (LICENSE is not known, and info taken from port) -# -# Make sure required variables are defined, and remove conflicting (positive +# # Make sure required variables are defined, and remove conflicting (positive # and negative) and duplicated components. -.if defined(_LICENSE_SINGLE) +#.if defined(_LICENSE_SINGLE) . for lic in ${_LICENSE} . if ${_LICENSE_LIST:M${lic}} != "" . for var in ${_LICENSE_LIST_PORT_VARS} @@ -314,9 +262,9 @@ _LICENSE_FILE= ${LICENSE_FILE} . endif . endfor -.else +#.else # XXX dual/multiple licenses -.endif +#.endif # Check if the user agrees with the license # @@ -358,7 +306,7 @@ _LICENSE_TYPE_PAIRS_variant= _LICENSES,config _LICENSE_TYPE_PAIRS_unknown= _LICENSES,config -.if defined(_LICENSE_SINGLE) +#.if defined(_LICENSE_SINGLE) # User and saved configuration . for lic in ${_LICENSE} . for pair in ${_LICENSE_TYPE_PAIRS_${_LICENSE_TYPE}} @@ -407,9 +355,9 @@ . endif . endfor -.else +#.else # XXX dual/multiple licenses -.endif +#.endif # Check variables are correctly defined and print status up to here @@ -418,7 +366,7 @@ @${ECHO_MSG} "===> License not correctly defined: ${_LICENSE_ERROR}" @exit 1 .endif -.if defined(_LICENSE_SINGLE) +#.if defined(_LICENSE_SINGLE) . if ${_LICENSE_STATUS} == "rejected" @${ECHO_MSG} "===> License ${_LICENSE} rejected by the user (by ${_LICENSE_STATUS_FROM})" @exit 1 @@ -428,12 +376,12 @@ @${ECHO_MSG} "===> License ${_LICENSE} needs agreement, will ask later (by ${_LICENSE_STATUS_FROM})" . endif . if !defined(LICENSE_FILE) && defined(LICENSE_TEXT) -# XXX escape shell chars +# XXX escape shell chars? @${ECHO_CMD} ${LICENSE_TEXT} > ${_LICENSE_FILE} . endif -.else +#.else # XXX dual/multiple licenses -.endif +#.endif .if defined(LICENSES_CONFIG) _LICENSES_CONFIG= yes @@ -441,6 +389,14 @@ _LICENSES_CONFIG= no .endif +# XXX Check if this works +# For config when user accepts +_LICENSES_ACCEPTED_YES= ${_LICENSES_ACCEPTED} ${_LICENSE} +_LICENSES_REJECTED_YES= ${_LICENSES_REJECTED:N${_LICENSE}} +# For config when user rejects +_LICENSES_ACCEPTED_NO= ${_LICENSES_ACCEPTED:N${_LICENSE}} +_LICENSES_REJECTED_NO= ${_LICENSES_REJECTED} ${_LICENSE} + # Display, ask and save preference if requested ask-license: @@ -478,7 +434,8 @@ ${ECHO_MSG} "===> You don't have permissions to save the choice"; \ else \ ${MKDIR} ${_LICENSE_CFG:H}; \ - (${ECHO_CMD} _LICENSES_ACCEPTED=${_LICENSE}; \ + (${ECHO_CMD} _LICENSES_ACCEPTED=${_LICENSES_ACCEPTED_YES}; \ + ${ECHO_CMD} _LICENSES_REJECTED=${_LICENSES_REJECTED_YES}; \ if [ ${_LICENSE_TYPE} != "known" ]; then \ ${ECHO_CMD} _LICENSE_${_LICENSE}_CHK=`${SHA256} -q ${_LICENSE_FILE}`; \ fi) > ${_LICENSE_FILE}; \ @@ -489,7 +446,8 @@ ${ECHO_MSG} "===> You don't have permissions to save the choice"; \ else \ ${MKDIR} ${_LICENSE_CFG:H}; \ - (${ECHO_CMD} _LICENSES_REJECTED=${_LICENSE}; \ + (${ECHO_CMD} _LICENSES_ACCEPTED=${_LICENSES_ACCEPTED_NO}; \ + ${ECHO_CMD} _LICENSES_REJECTED=${_LICENSES_REJECTED_NO}; \ if [ ${_LICENSE_TYPE} != "known" ]; then \ ${ECHO_CMD} _LICENSE_${_LICENSE}_CHK=`${SHA256} -q ${_LICENSE_FILE}`; \ fi) > ${_LICENSE_FILE}; \ @@ -500,8 +458,10 @@ esac; \ done -# License compatibility check (XXX is it useful? empty vaules of COMPAT do not -# mean "nothing") +# License compatibility check + +# XXX is it useful? Maybe BUILD/LIB depends too? +# also empty vaules of COMPAT do not mean "incompatible with all" .if !empty(_LICENSE_COMPAT) || !empty(_LICENSE_INCOMPAT) . for port in ${RUN_DEPENDS} @@ -559,7 +519,7 @@ .else # !LICENSE check-license: - @${ECHO_MSG} "===> WARNING: port has no defined LICENSE, check disabled" + @${ECHO_MSG} "===> License check disabled, port has not defined LICENSE" ask-license: @${DO_NADA} From owner-p4-projects@FreeBSD.ORG Tue Aug 19 00:05:25 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DECAD106567F; Tue, 19 Aug 2008 00:05:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A29BB106564A for <perforce@freebsd.org>; Tue, 19 Aug 2008 00:05:24 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84D678FC0A for <perforce@freebsd.org>; Tue, 19 Aug 2008 00:05:24 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7J05OVP066366 for <perforce@freebsd.org>; Tue, 19 Aug 2008 00:05:24 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7J05Oim066364 for perforce@freebsd.org; Tue, 19 Aug 2008 00:05:24 GMT (envelope-from alepulver@freebsd.org) Date: Tue, 19 Aug 2008 00:05:24 GMT Message-Id: <200808190005.m7J05Oim066364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver <alepulver@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 19 Aug 2008 00:05:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147792 Change 147792 by alepulver@alepulver_deimos on 2008/08/19 00:04:41 - Fix saving/loading configuration. - Fix LICENSE_TEXT. - Update README's TODO list (features to test are working). - Modify test port to check new features. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#6 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#6 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#3 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#6 (text+ko) ==== @@ -88,10 +88,6 @@ to save), may require adding "ask-license" to _EXTRACT_SUSEQ (maybe can be done only if required, from bsd.licenses.mk) -Test/fix: -* SHA256 -* save/load maintaining other choices - Maybe: * additional targets (show-license, show-license-report, show-known-licenses, etc) ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#6 (text+ko) ==== @@ -375,10 +375,6 @@ . elif ${_LICENSE_STATUS} == "ask" @${ECHO_MSG} "===> License ${_LICENSE} needs agreement, will ask later (by ${_LICENSE_STATUS_FROM})" . endif -. if !defined(LICENSE_FILE) && defined(LICENSE_TEXT) -# XXX escape shell chars? - @${ECHO_CMD} ${LICENSE_TEXT} > ${_LICENSE_FILE} -. endif #.else # XXX dual/multiple licenses #.endif @@ -389,17 +385,24 @@ _LICENSES_CONFIG= no .endif -# XXX Check if this works # For config when user accepts _LICENSES_ACCEPTED_YES= ${_LICENSES_ACCEPTED} ${_LICENSE} -_LICENSES_REJECTED_YES= ${_LICENSES_REJECTED:N${_LICENSE}} +.for lic in ${_LICENSE} +_LICENSES_REJECTED_YES= ${_LICENSES_REJECTED:N${lic}} +.endfor # For config when user rejects -_LICENSES_ACCEPTED_NO= ${_LICENSES_ACCEPTED:N${_LICENSE}} +.for lic in ${_LICENSE} +_LICENSES_ACCEPTED_NO= ${_LICENSES_ACCEPTED:N${lic}} +.endfor _LICENSES_REJECTED_NO= ${_LICENSES_REJECTED} ${_LICENSE} # Display, ask and save preference if requested ask-license: +.if !defined(LICENSE_FILE) && defined(LICENSE_TEXT) +# XXX escape shell chars? + @${ECHO_CMD} ${LICENSE_TEXT} > ${_LICENSE_FILE} +.endif @if [ ! -f ${_LICENSE_FILE} ]; then \ ${ECHO_MSG} "===> License not found in \"${_LICENSE_FILE}\", aborting."; \ exit 1; \ @@ -438,7 +441,7 @@ ${ECHO_CMD} _LICENSES_REJECTED=${_LICENSES_REJECTED_YES}; \ if [ ${_LICENSE_TYPE} != "known" ]; then \ ${ECHO_CMD} _LICENSE_${_LICENSE}_CHK=`${SHA256} -q ${_LICENSE_FILE}`; \ - fi) > ${_LICENSE_FILE}; \ + fi) > ${_LICENSE_CFG}; \ ${ECHO_MSG} "===> License accepted by user and saved"; \ status=done; \ fi;; \ @@ -450,7 +453,7 @@ ${ECHO_CMD} _LICENSES_REJECTED=${_LICENSES_REJECTED_NO}; \ if [ ${_LICENSE_TYPE} != "known" ]; then \ ${ECHO_CMD} _LICENSE_${_LICENSE}_CHK=`${SHA256} -q ${_LICENSE_FILE}`; \ - fi) > ${_LICENSE_FILE}; \ + fi) > ${_LICENSE_CFG}; \ ${ECHO_MSG} "===> License rejected by user and saved"; \ exit 1; \ fi;; \ ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#3 (text+ko) ==== @@ -17,16 +17,14 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/MyFile -#LICENSE_PERMS= no-pkg-sell no-dist-sell -#LICENSE_NAME= Berkeley Software Distribution License -#LICENSE_GROUPS= # -#LICENSE_PERMS= dist-redist pkg-redist auto-accept +LICENSE= MyLic +LICENSE_TEXT= This license is at www.example.com +LICENSE_PERMS= redist +LICENSE_NAME= My Example License +LICENSE_GROUPS= # do-extract: @${MKDIR} ${WRKDIR} - @${ECHO_CMD} "example" > ${LICENSE_FILE} do-install: From owner-p4-projects@FreeBSD.ORG Tue Aug 19 14:10:41 2008 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF5CE1065688; Tue, 19 Aug 2008 14:10:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FFF21065684 for <perforce@freebsd.org>; Tue, 19 Aug 2008 14:10:41 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 639368FC18 for <perforce@freebsd.org>; Tue, 19 Aug 2008 14:10:41 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JEAft8030703 for <perforce@freebsd.org>; Tue, 19 Aug 2008 14:10:41 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JEAfd1030701 for perforce@freebsd.org; Tue, 19 Aug 2008 14:10:41 GMT (envelope-from remko@freebsd.org) Date: Tue, 19 Aug 2008 14:10:41 GMT Message-Id: <200808191410.m7JEAfd1030701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder <remko@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 147805 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 19 Aug 2008 14:10:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=147805 Change 147805 by remko@remko_nakur on 2008/08/19 14:10:35 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/Makefile#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.ent#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#7 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#13 edit .. //depot/projects/docproj_nl/share/pgpkeys/bz.key#2 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#2 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/docproj/who.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/internal.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2004-07-2004-12.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-01-2005-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-03-2005-06.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2005-10-2005-12.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-01-2006-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-04-2006-06.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-06-2006-10.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2006-10-2006-12.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2007-01-2007-03.xml#2 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2007-04-2007-06.xml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.3R/errata.html#2 integrate .. //depot/projects/docproj_nl/www/en/releases/7.0R/errata.html#2 integrate .. //depot/projects/docproj_nl/www/en/search/search.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/search/web.atoz#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#5 (text+ko) ==== @@ -13,7 +13,7 @@ </author> </authorgroup> - <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.277 2008/08/06 22:03:48 pgj Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.278 2008/08/16 21:42:35 pgj Exp $</pubdate> <copyright> <year>1999</year> @@ -2020,8 +2020,7 @@ someone who manages an overall category of FreeBSD evolution, such as internationalization or networking. See <ulink - url="&url.articles.contributors;/staff-who.html"> - http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html</ulink> + url="&url.base;/administration.html"></ulink> for more information on this.</para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/Makefile,v 1.10 2005/09/20 20:55:51 joel Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/Makefile,v 1.11 2008/08/16 22:21:38 pgj Exp $ # # Article: Contributors to FreeBSD @@ -16,12 +16,8 @@ SRCS+= contrib.386bsd.sgml SRCS+= contrib.additional.sgml SRCS+= contrib.committers.sgml -SRCS+= contrib.core.sgml SRCS+= contrib.corealumni.sgml SRCS+= contrib.develalumni.sgml -SRCS+= contrib.docproj.sgml -SRCS+= contrib.staff.sgml -SRCS+= contrib.who.sgml URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/article.sgml#2 (text+ko) ==== @@ -10,7 +10,7 @@ <articleinfo> <title>Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.448 2006/09/11 06:49:41 obrien Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.449 2008/08/16 22:21:38 pgj Exp $ &tm-attrib.freebsd; @@ -318,46 +318,6 @@ - - - - The FreeBSD Core Team - - The FreeBSD core team constitutes the project's Board of - Directors, responsible for deciding the project's overall goals - and direction as well as managing specific - areas of the FreeBSD project landscape. - - Primary contact address: - core@FreeBSD.org - - (in alphabetical order by last name): - - &contrib.core; - - - - - - Other &os; Teams - - The &os; project delegates certain individuals to work - on various teams according to project needs. The following - list contains the current information on those individuals and - their designated areas: - - &contrib.staff; - - - - The FreeBSD Developers @@ -369,23 +329,6 @@ &contrib.committers; - - - The FreeBSD Documentation Project - - The FreeBSD - Documentation Project is responsible for a number of different - services, each service being run by an individual and his - deputies (if any): - - &contrib.docproj; - - - - Who is Responsible for What - - &contrib.who; - Core Team Alumni ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#5 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.wes; (2002 - 2008) + + + + &a.imp; (2000 - 2008) + + + &a.markm; (2002 - 2006) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -93,9 +93,11 @@ &a.sf; (2000 - 2006) + &a.ue; (2001 - 2006) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.ent#2 (text+ko) ==== @@ -1,11 +1,7 @@ - + - - - - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#2 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.79 2007/01/17 07:08:16 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.80 2008/08/16 21:42:36 pgj Exp $ &tm-attrib.freebsd; @@ -1113,8 +1113,8 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"> - [6] FreeBSD Core-Team - + [6] FreeBSD Core Team + [7] FreeBSD Handbook ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -267,7 +267,7 @@ Any encumbered file requires specific approval from the - Core team before it is added to the + Core Team before it is added to the CVS repository. @@ -298,9 +298,9 @@ Should always be in LINT, but the - Core team decides per case if it + Core Team decides per case if it should be commented out or not. The - Core team can, of course, change + Core Team can, of course, change their minds later on. @@ -317,13 +317,13 @@ core team - The Core team decides if + The Core team decides if the code should be part of make world. - release engineer - The Release Engineer + release engineering + The Release Engineering decides if it goes into the release. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#7 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1097 2008/08/09 23:19:31 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1098 2008/08/16 21:22:24 pgj Exp $ 1995 @@ -1461,7 +1461,7 @@ It has been reported that later IBM BIOS revisions may have reintroduced the bug. This message - from Jacques Vidrine to the &a.mobile; describes a procedure + from &a.nectar; to the &a.mobile; describes a procedure which may work if your newer IBM laptop does not boot &os; properly, and you can upgrade or downgrade the BIOS. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4610,6 +4610,16 @@ &prompt.root; smbpasswd -a username + + Since Samba 3.0.23c, the actual + directory for authentication files is + /usr/local/etc/samba. The + recommended backend is now tdbsam, and the + following command should be used to add user accounts: + + &prompt.root; pdbedit username + + Please see the Official Samba HOWTO ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -183,7 +183,7 @@ Your login name and password. (Either a regular &unix; style login and password pair, or a PAP or CHAP - login and password pair.) + login and password pair). @@ -322,11 +322,11 @@ Enables logging parameters. When the configuration is working satisfactorily, this line should be reduced - to saying + to saying: - set log phase tun + set log phase tun - in order to avoid excessive log file sizes. + in order to avoid excessive log file sizes. @@ -382,7 +382,7 @@ Note that this command continues onto the next line for readability. Any command in ppp.conf may do this if the last - character on the line is a ``\'' character. + character on the line is a \ character. @@ -421,7 +421,7 @@ Identifies an entry for a provider called provider. This could be changed to the name of your ISP so - that later you can use the + that later you can use the to start the connection. @@ -433,7 +433,7 @@ Sets the phone number for this provider. Multiple phone numbers may be specified using the colon (:) or pipe character - (|)as a separator. The difference + (|) as a separator. The difference between the two separators is described in &man.ppp.8;. To summarize, if you want to rotate through the numbers, use a colon. If you want to always attempt to dial the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3446,7 +3446,7 @@ ipfw add 00201 allow log esp from any to any ipfw add 00202 allow log ah from any to any ipfw add 00203 allow log ipencap from any to any -ipfw add 00204 allow log usp from any 500 to any +ipfw add 00204 allow log udp from any 500 to any The rule numbers may need to be altered depending ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -1058,7 +1058,7 @@ d (there may be any number of characters between the brackets); [0-9] matches any single character - that is between 0and + that is between 0 and 9 (i.e. any digit. This form may be freely mixed with the other bracket form), and \ is used to escape any of the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ 8.0-CURRENT after addition of cpuctl(4). 800042 + + 8.0-CURRENT after changing bpf(4) to use a + single device node, instead of device cloning. + 800043 + + + 8.0-CURRENT after the commit of the first step of + the vimage project renaming global variables to be + virtualized with a V_ prefix with macros to map them + back to their global names. + 800044 + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#13 (text+ko) ==== @@ -1443,22 +1443,22 @@ - My A, T, or X series IBM Thinkpad locks up when I first - booted up my &os; installation. How can I solve - this? + Mijn A, T of X serie IBM Thinkpad hangt terwijl ik + de &os; installatie probeer op te starten. Hoe kan ik + dit oplossen? - A bug in early revisions of IBM's BIOS on these machines - mistakenly identifies the &os; partition as a potential FAT - suspend-to-disk partition. When the BIOS tries to parse the - &os; partition it hangs. + In eerdere revisies van IBM's BIOS zit een bug waarbij + de machine de &os; partitie ziet als potentiele FAT + suspend-to-disk partitie. Zodra de BIOS de &os; partitie + probeert uit te lezen, hangt deze. - According to IBM - In an email from Keith Frechette + Volgens IBM + In een email van Keith Frechette kfrechet@us.ibm.com., - the following model/BIOS release numbers incorporate the - fix. + zijn de volgende modellen/BIOS versies voorzien van een + oplossing: @@ -1466,7 +1466,7 @@ Model - BIOS revision + BIOS revisie @@ -1474,37 +1474,37 @@ T20 - IYET49WW or later + IYET49WW of later T21 - KZET22WW or later + KZET22WW of later A20p - IVET62WW or later + IVET62WW of later A20m - IWET54WW or later + IWET54WW of later A21p - KYET27WW or later + KYET27WW of later A21m - KXET24WW or later + KXET24WW of later @@ -1516,12 +1516,13 @@ - It has been reported that later IBM BIOS revisions may - have reintroduced the bug. This message - from Jacques Vidrine to the &a.mobile; describes a procedure - which may work if your newer IBM laptop does not boot &os; - properly, and you can upgrade or downgrade the BIOS. + Er wordt gezegd dat latere IBM BIOS revisies de bug + opnieuw geïtroduceerd hebben. Dit bericht + van Jacques Vidrine naar de &a.mobile; beschrijft een + procedure die zou kunnen werken als je nieuwere IBM + laptop &os; niet kan opstarten en waar het mogelijk is + om de BIOS te upgraden of downgraden. If you have an earlier BIOS, and upgrading is not an option, a workaround is to install &os;, change the partition ==== //depot/projects/docproj_nl/share/pgpkeys/bz.key#2 (text+ko) ==== @@ -1,47 +1,210 @@ - + - Key fingerprint = 5E31 F886 E2EE BA7E 2AA5 DDD4 21C5 0916 0E4A 7875 -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -sub 1024g/6139751B 2000-02-04 +pub 1024D/3CCF1842 2007-02-20 + Key fingerprint = 1400 3F19 8FEF A3E7 7207 EE8D 2B58 B8F8 3CCF 1842 +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +sub 4096g/F36BDC5D 2007-02-20 ]]> ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#2 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + [ OK ]"> ==== //depot/projects/docproj_nl/www/en/administration.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -309,7 +309,6 @@

  • &a.mnag; <mnag@FreeBSD.org>
  • &a.remko; <remko@FreeBSD.org>
    • -
  • &a.gnn; <gnn@FreeBSD.org>
  • &a.simon; <simon@FreeBSD.org> (Officer Deputy)
  • &a.philip; <philip@FreeBSD.org>
    • ==== //depot/projects/docproj_nl/www/en/docproj/who.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -17,7 +17,7 @@ href="../doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"> all FreeBSD developers with commit privileges, as well as a list of the + href="../administration.html#t-doceng"> principal committers for the FreeBSD Documentation Project.

    Others do not have commit privileges, but they write and submit ==== //depot/projects/docproj_nl/www/en/internal/internal.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 19 14:50:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 483791065671; Tue, 19 Aug 2008 14:50:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AADD1065680 for ; Tue, 19 Aug 2008 14:50:22 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2D8E8FC28 for ; Tue, 19 Aug 2008 14:50:21 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JEoL8Q034353 for ; Tue, 19 Aug 2008 14:50:21 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JEoLj2034351 for perforce@freebsd.org; Tue, 19 Aug 2008 14:50:21 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 19 Aug 2008 14:50:21 GMT Message-Id: <200808191450.m7JEoLj2034351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 14:50:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=147809 Change 147809 by konrad@vspredator on 2008/08/19 14:49:35 With this change we pass the regression tests for much more languages. Affected files ... .. //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#8 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/colldef.apple/parse.y#8 (text+ko) ==== @@ -89,9 +89,9 @@ static DB *chaindb; static int nchain = 0; static DB *stringdb; -static struct symbol *prev_weight_table[COLL_WEIGHTS_MAX]; -static struct symbol *prev2_weight_table[COLL_WEIGHTS_MAX]; -static struct symbol *weight_table[COLL_WEIGHTS_MAX]; +static struct symbol prev_weight_table[COLL_WEIGHTS_MAX]; +static struct symbol prev2_weight_table[COLL_WEIGHTS_MAX]; +static struct symbol weight_table[COLL_WEIGHTS_MAX]; static int prev_line = LINE_NONE; static struct symbol *prev_elem; static int weight_index = 0; @@ -548,7 +548,7 @@ yyerror("Can't specify weights for collating symbol <%s>", showwcs($1, CHARMAP_SYMBOL_LEN)); } else if (weight_index == 0) { for(i = 0; i < directive_count; i++) - weight_table[i] = s; + weight_table[i] = *s; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); @@ -565,13 +565,13 @@ yyerror("Ellipsis line must follow a collating identifier lines"); if (weight_index == 0) { for(i = 0; i < directive_count; i++) - weight_table[i] = &sym_ellipsis; + weight_table[i] = sym_ellipsis; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); for(i = 0; i < directive_count; i++) { - if (weight_table[i]->type != SYMBOL_ELLIPSIS) + if (weight_table[i].type != SYMBOL_ELLIPSIS) continue; - switch (prev_weight_table[i]->type) { + switch (prev_weight_table[i].type) { case SYMBOL_CHAIN: yyerror("Startpoint of ellipsis can't be a collating element"); case SYMBOL_IGNORE: @@ -596,9 +596,9 @@ } weights { int i; if (weight_index == 0) { - weight_table[0] = &sym_undefined; + weight_table[0] = sym_undefined; for(i = 1; i < directive_count; i++) - weight_table[i] = &sym_ellipsis; + weight_table[i] = sym_ellipsis; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); memcpy(prev_weight_table, weight_table, sizeof(weight_table)); @@ -620,13 +620,13 @@ yyerror("Can't specify weights for collating symbol <%s>", showwcs($1, CHARMAP_SYMBOL_LEN)); } else if (weight_index == 0) { for(i = 0; i < directive_count; i++) - weight_table[i] = s; + weight_table[i] = *s; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); if (prev_line == LINE_ELLIPSIS) { int w, x; for(i = 0; i < directive_count; i++) { - switch (prev_weight_table[i]->type) { + switch (prev_weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: case SYMBOL_IGNORE: @@ -635,12 +635,12 @@ struct __collate_st_char_pri *p = getpri(w); if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", w); - p->pri[i] = prev_weight_table[i]->val; + p->pri[i] = prev_weight_table[i].val; } break; case SYMBOL_ELLIPSIS: - switch (weight_table[i]->type) { + switch (weight_table[i].type) { case SYMBOL_STRING: yyerror("Strings can't be endpoints of ellipsis"); case SYMBOL_CHAIN: @@ -650,9 +650,9 @@ case SYMBOL_SYMBOL: yyerror("Collation symbols can't be endpoints of ellipsis"); } - if (s->val - prev_elem->val != weight_table[i]->val - prev2_weight_table[i]->val) + if (s->val - prev_elem->val != weight_table[i].val - prev2_weight_table[i].val) yyerror("Range mismatch in weight %d", i); - x = prev2_weight_table[i]->val + 1; + x = prev2_weight_table[i].val + 1; for (w = prev_elem->u.wc + 1; w < s->u.wc; w++) { struct __collate_st_char_pri *p = getpri(w); if (p->pri[i] != PRI_UNDEFINED) @@ -665,8 +665,8 @@ struct __collate_st_char_pri *p = getpri(w); if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", w); - putsubst(w, i, prev_weight_table[i]->u.str); - p->pri[i] = prev_weight_table[i]->val; + putsubst(w, i, prev_weight_table[i].u.str); + p->pri[i] = prev_weight_table[i].val; } break; } @@ -676,20 +676,20 @@ case SYMBOL_CHAR: { struct __collate_st_char_pri *p = getpri(s->u.wc); for(i = 0; i < directive_count; i++) { - switch (weight_table[i]->type) { + switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", s->u.wc); - p->pri[i] = weight_table[i]->val; + p->pri[i] = weight_table[i].val; break; case SYMBOL_STRING: if (p->pri[i] != PRI_UNDEFINED) yyerror("Char 0x%02x previously defined", s->u.wc); - putsubst(s->u.wc, i, weight_table[i]->u.str); - p->pri[i] = weight_table[i]->val; + putsubst(s->u.wc, i, weight_table[i].u.str); + p->pri[i] = weight_table[i].val; break; } } @@ -698,24 +698,24 @@ case SYMBOL_CHAIN: { struct __collate_st_chain_pri *p = getchain(s->u.str, EXISTS); for(i = 0; i < directive_count; i++) { - switch (weight_table[i]->type) { + switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: if (p->pri[i] != PRI_UNDEFINED) yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); - p->pri[i] = weight_table[i]->val; + p->pri[i] = weight_table[i].val; break; case SYMBOL_STRING : - if (wcsncmp(s->u.str, weight_table[i]->u.str, STR_LEN) != 0) + if (wcsncmp(s->u.str, weight_table[i].u.str, STR_LEN) != 0) yyerror("Chain/string mismatch"); if (p->pri[i] != PRI_UNDEFINED) yyerror("Chain %s previously defined", showwcs(s->u.str, STR_LEN)); /* negative value mean don't substitute * the chain, but it is in an * equivalence class */ - p->pri[i] = -weight_table[i]->val; + p->pri[i] = -weight_table[i].val; } } break; @@ -735,13 +735,13 @@ yyerror("Ellipsis line must follow a collating identifier lines"); if (weight_index == 0) { for(i = 0; i < directive_count; i++) - weight_table[i] = &sym_ellipsis; + weight_table[i] = sym_ellipsis; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); for(i = 0; i < directive_count; i++) { - if (weight_table[i]->type != SYMBOL_ELLIPSIS) + if (weight_table[i].type != SYMBOL_ELLIPSIS) continue; - switch (prev_weight_table[i]->type) { + switch (prev_weight_table[i].type) { case SYMBOL_CHAIN: yyerror("Startpoint of ellipsis can't be a collating element"); case SYMBOL_IGNORE: @@ -761,18 +761,18 @@ int i; if (weight_index == 0) { - weight_table[0] = &sym_undefined; + weight_table[0] = sym_undefined; for(i = 1; i < directive_count; i++) - weight_table[i] = &sym_ellipsis; + weight_table[i] = sym_ellipsis; } else if (weight_index != directive_count) yyerror("Not enough weights specified"); for(i = 0; i < directive_count; i++) { - switch (weight_table[i]->type) { + switch (weight_table[i].type) { case SYMBOL_CHAR: case SYMBOL_CHAIN: case SYMBOL_IGNORE: case SYMBOL_SYMBOL: - info.undef_pri[i] = weight_table[i]->val; + info.undef_pri[i] = weight_table[i].val; break; case SYMBOL_ELLIPSIS : /* Negative values mean that the priority is @@ -815,19 +815,19 @@ yyerror("More weights than specified by order_start"); if (!allow_ellipsis) yyerror("Ellipsis weight not allowed"); - weight_table[weight_index++] = &sym_ellipsis; + weight_table[weight_index++] = sym_ellipsis; } | IGNORE { if (weight_index >= directive_count) yyerror("More weights than specified by order_start"); - weight_table[weight_index++] = &sym_ignore; + weight_table[weight_index++] = sym_ignore; } | STRING { if (weight_index >= directive_count) yyerror("More weights than specified by order_start"); if (wcslen($1) > STR_LEN) yyerror("String '%s' is too long", showwcs($1, STR_LEN)); - weight_table[weight_index++] = getstring($1); + weight_table[weight_index++] = *getstring($1); } ; weight_ex1 : weight_ex { weight_index++; } @@ -841,7 +841,7 @@ s = getsymbol($1, EXISTS); if (order_pass && s->val == PRI_UNDEFINED) printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); - weight_table[weight_index] = s; + weight_table[weight_index] = *s; } ; weight_ex_null : ELEM { @@ -853,6 +853,7 @@ s = getsymbol($1, EXISTS); if (order_pass && s->val == PRI_UNDEFINED) printf("<%s> is undefined\n", showwcs($1, CHARMAP_SYMBOL_LEN)); + weight_table[weight_index].val += s->val; } ; order_end : ORDER_END '\n' @@ -1449,6 +1450,8 @@ struct __collate_st_large_char_pri *p2 = __collate_large_char_pri_table; printf("Large priority table:\n"); for (i = info.large_pri_count; i-- > 0; p2++) { + if (p2->val == 0) + break; printf("\t%s :", show(ntohl(p2->val))); for(z = 0; z < info.directive_count; z++) printf(" %d", ntohl(p2->pri.pri[z])); From owner-p4-projects@FreeBSD.ORG Tue Aug 19 16:37:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBB8106566C; Tue, 19 Aug 2008 16:37:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F88C106568D for ; Tue, 19 Aug 2008 16:37:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 048B08FC19 for ; Tue, 19 Aug 2008 16:37:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JGbAOf045483 for ; Tue, 19 Aug 2008 16:37:10 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JGbAsO045481 for perforce@freebsd.org; Tue, 19 Aug 2008 16:37:10 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 19 Aug 2008 16:37:10 GMT Message-Id: <200808191637.m7JGbAsO045481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 16:37:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=147814 Change 147814 by rpaulo@rpaulo_epsilon on 2008/08/19 16:36:47 Cope with FIN rxmts. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#12 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#11 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#12 $ */ #include @@ -361,6 +361,10 @@ DPRINTF(DEBUG_FSM, "FSM transition: %p " "FIN_WAIT_1 -> CLOSING\n", tp); break; + case TCPS_CLOSING: + case TCPS_CLOSE_WAIT: + /* ignore retransmission */ + break; default: dumper_error(cp, "FIN with no known state"); break; From owner-p4-projects@FreeBSD.ORG Tue Aug 19 16:53:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC4A1065692; Tue, 19 Aug 2008 16:53:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94F2E106568E for ; Tue, 19 Aug 2008 16:53:27 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89F728FC4B for ; Tue, 19 Aug 2008 16:53:27 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JGrRci056724 for ; Tue, 19 Aug 2008 16:53:27 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JGrRL5056722 for perforce@freebsd.org; Tue, 19 Aug 2008 16:53:27 GMT (envelope-from konrad@FreeBSD.org) Date: Tue, 19 Aug 2008 16:53:27 GMT Message-Id: <200808191653.m7JGrRL5056722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 16:53:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=147815 Change 147815 by konrad@vspredator on 2008/08/19 16:53:22 Add script for regression testing of hand written by native speakers tests. Also, new version of el_GR by Diomidis. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/native_tests/el_GR#2 edit .. //depot/projects/soc2008/konrad_collation/test/regression/native_go.sh#1 add Differences ... ==== //depot/projects/soc2008/konrad_collation/test/native_tests/el_GR#2 (text+ko) ==== @@ -1,108 +1,108 @@ -Α -Ά -ά -α -ανθρωπογένεση -ανθρωποειδής -ανθρωποθάλασσα -ανθρωποκεντρισμός -ανθρωποκτονία -ανθρωποκτόνος -ανθρωπολογία -ανθρωπολογικός -ανθρωπολόγος -ανθρωπομορφισμός -ανθρωποπίθηκος -άνθρωπος -ανθρωποσοφιστής -ανθρωποφαγία -ανθρωποφάγος -ανθρωπόμορφος -ανθρωπότητα -ανίατος -ανίδεος -Άννα -Αννίβας -άνοιξη -ανοιξιάτικος -ανορθογραφία -ανορθόγραφος -ανορθογραφώ -αρχαίζω -αρχαϊκός -αρχαιοδίφης -αρχαίος -αρχαιότητα -αυλός -άϋλος -αυξάνω -αύξηση -αυξητικός -αυξομειώνω -αυξομείωση -β -Β -Γ -γ -δ -Δ -ε -Ε -έ -ζ -Ζ -ή -Η -Ή -η -θ -Θ -ι -ϊ -ΐ -Ι -Ϊ -Ί -κ -Κ -Λ -λ -μ -Μ -ν -Ν -ξ -Ξ -ο -Ο -Ό -ό -π -Π -παιδάκια -παϊδάκια -παίδη -ρ -Ρ -σ -Σ -ς -τ -Τ -υ -ϋ -ύ -ΰ -Ύ -Ϋ -Υ -φ -Φ -Χ -χ -ψ -Ψ -ω -ώ -Ώ -Ω +Α +Ά +ά +α +ανθρωπογένεση +ανθρωποειδής +ανθρωποθάλασσα +ανθρωποκεντρισμός +ανθρωποκτονία +ανθρωποκτόνος +ανθρωπολογία +ανθρωπολογικός +ανθρωπολόγος +ανθρωπομορφισμός +ανθρωπόμορφος +ανθρωποπίθηκος +άνθρωπος +ανθρωποσοφιστής +ανθρωπότητα +ανθρωποφαγία +ανθρωποφάγος +ανίατος +ανίδεος +Άννα +Αννίβας +άνοιξη +ανοιξιάτικος +ανορθογραφία +ανορθόγραφος +ανορθογραφώ +αρχαίζω +αρχαϊκός +αρχαιοδίφης +αρχαίος +αρχαιότητα +αυλός +άϋλος +αυξάνω +αύξηση +αυξητικός +αυξομειώνω +αυξομείωση +β +Β +Γ +γ +δ +Δ +ε +Ε +έ +ζ +Ζ +ή +Η +Ή +η +θ +Θ +ι +ϊ +ΐ +Ι +Ϊ +Ί +κ +Κ +Λ +λ +μ +Μ +ν +Ν +ξ +Ξ +ο +Ο +Ό +ό +π +Π +παιδάκια +παϊδάκια +παίδη +ρ +Ρ +σ +Σ +ς +τ +Τ +υ +ϋ +ύ +ΰ +Ύ +Ϋ +Υ +φ +Φ +Χ +χ +ψ +Ψ +ω +ώ +Ώ +Ω From owner-p4-projects@FreeBSD.ORG Tue Aug 19 17:29:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4358F1065673; Tue, 19 Aug 2008 17:29:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08D29106566B for ; Tue, 19 Aug 2008 17:29:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F22708FC17 for ; Tue, 19 Aug 2008 17:29:03 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JHT3bt064752 for ; Tue, 19 Aug 2008 17:29:03 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JHT3Su064750 for perforce@freebsd.org; Tue, 19 Aug 2008 17:29:03 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 19 Aug 2008 17:29:03 GMT Message-Id: <200808191729.m7JHT3Su064750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 17:29:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=147816 Change 147816 by rpaulo@rpaulo_phi on 2008/08/19 17:28:13 Fix previous commit, wrong state. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#13 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#12 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#13 $ */ #include @@ -361,8 +361,7 @@ DPRINTF(DEBUG_FSM, "FSM transition: %p " "FIN_WAIT_1 -> CLOSING\n", tp); break; - case TCPS_CLOSING: - case TCPS_CLOSE_WAIT: + case TCPS_LAST_ACK: /* ignore retransmission */ break; default: From owner-p4-projects@FreeBSD.ORG Tue Aug 19 17:50:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB194106567F; Tue, 19 Aug 2008 17:50:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE11E106567A for ; Tue, 19 Aug 2008 17:50:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2EF58FC17 for ; Tue, 19 Aug 2008 17:50:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JHoPNo067990 for ; Tue, 19 Aug 2008 17:50:25 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JHoPYR067988 for perforce@freebsd.org; Tue, 19 Aug 2008 17:50:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 19 Aug 2008 17:50:25 GMT Message-Id: <200808191750.m7JHoPYR067988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 17:50:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147817 Change 147817 by rpaulo@rpaulo_phi on 2008/08/19 17:50:20 Cope with more retransmissions. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#14 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#13 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#14 $ */ #include @@ -412,6 +412,9 @@ LIST_REMOVE(cp, entries); free(cp); break; + case TCPS_TIME_WAIT: + /* ignore retransmissions */ + break; case TCPS_ESTABLISHED: /* SEQ processing */ if (tlen == 0) { @@ -481,8 +484,7 @@ } break; default: - if (cp) - dumper_error(cp, "ACK with no known state"); + dumper_error(cp, "ACK with no known state"); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 19 18:39:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9875110656A1; Tue, 19 Aug 2008 18:39:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B8DC106569A for ; Tue, 19 Aug 2008 18:39:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 504368FC26 for ; Tue, 19 Aug 2008 18:39:15 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JIdFhI076434 for ; Tue, 19 Aug 2008 18:39:15 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JIdFjf076432 for perforce@freebsd.org; Tue, 19 Aug 2008 18:39:15 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 19 Aug 2008 18:39:15 GMT Message-Id: <200808191839.m7JIdFjf076432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 18:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=147823 Change 147823 by rpaulo@rpaulo_phi on 2008/08/19 18:38:55 Cope with more FIN retransmissions. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#15 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#14 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#15 $ */ #include @@ -361,6 +361,7 @@ DPRINTF(DEBUG_FSM, "FSM transition: %p " "FIN_WAIT_1 -> CLOSING\n", tp); break; + case TCPS_CLOSE_WAIT: case TCPS_LAST_ACK: /* ignore retransmission */ break; From owner-p4-projects@FreeBSD.ORG Tue Aug 19 18:43:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2FE31065694; Tue, 19 Aug 2008 18:43:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96FDC106568D for ; Tue, 19 Aug 2008 18:43:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B0CE8FC12 for ; Tue, 19 Aug 2008 18:43:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JIhJoq076794 for ; Tue, 19 Aug 2008 18:43:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JIhJS1076792 for perforce@freebsd.org; Tue, 19 Aug 2008 18:43:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 19 Aug 2008 18:43:19 GMT Message-Id: <200808191843.m7JIhJS1076792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 18:43:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147824 Change 147824 by rpaulo@rpaulo_phi on 2008/08/19 18:42:48 Add one more FIN retransmit case. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#16 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#15 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#16 $ */ #include @@ -363,6 +363,7 @@ break; case TCPS_CLOSE_WAIT: case TCPS_LAST_ACK: + case TCPS_CLOSING: /* ignore retransmission */ break; default: From owner-p4-projects@FreeBSD.ORG Tue Aug 19 19:04:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86979106567A; Tue, 19 Aug 2008 19:04:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A6831065682 for ; Tue, 19 Aug 2008 19:04:41 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A7368FC23 for ; Tue, 19 Aug 2008 19:04:41 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JJ4fRf079516 for ; Tue, 19 Aug 2008 19:04:41 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JJ4fSw079514 for perforce@freebsd.org; Tue, 19 Aug 2008 19:04:41 GMT (envelope-from remko@freebsd.org) Date: Tue, 19 Aug 2008 19:04:41 GMT Message-Id: <200808191904.m7JJ4fSw079514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 147825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 19:04:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=147825 Change 147825 by remko@remko_nakur on 2008/08/19 19:03:56 Import Rene's Bluetooth work and improved documentation. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#7 (text+ko) ==== @@ -1426,7 +1426,7 @@ wordt WPA WPA-Enterprise genoemd om het verschil met het minder veilige WPA-Personal met de vooraf gedeelde sleutel aan te duiden. De authenticatie in WPA-Enterprise is - gebaseerd op EAP (Uitbreidbaar Authenticatie-Protocol). + gebaseerd op EAP (Extensible Authentication Protocol). EAP wordt niet met een encryptiemethode geleverd, het @@ -1435,7 +1435,7 @@ EAP-authenticatiemethodes ontworpen, de meest voorkomende methodes zijn EAP-TLS, EAP-TTLS, en EAP-PEAP. - EAP-TLS (EAP met TransportLaagBeveiliging) is een zeer + EAP-TLS (EAP met Transport Layer Security) is een zeer goed ondersteund authenticatieprotocol in de draadloze wereld aangezien het de eerste EAP-methode was die gecertificeerd werd door de + cliëntcertificaat voor elke draadloze cliënt. + Bij deze EAP-methode authenticeren zowel de + authenticatieserver als de draadloze cliënt elkaar + door hun respectievelijke certificaten te laten zien, en + ze controleren dat deze certificaten zijn getekend door de + certificatenauthoriteit (CA) van de organisatie. Zoals voorheen gebeurt het instellen via /etc/wpa_supplicant.conf: @@ -1502,15 +1502,15 @@ De regel client_cert geeft de - padnaam van het clientcertificaatbestand aan. Dit - certificaat is uniek voor elke draadloze client van - het netwerk. + padnaam van het cliëntcertificaatbestand aan. + Dit certificaat is uniek voor elke draadloze + cliënt van het netwerk. Het veld private_key is de padnaam naar het bestand dat de privésleutel - van het clientcertificaat bevat. + van het cliëntcertificaat bevat. @@ -1554,14 +1554,14 @@ WPA met EAP-TTLS Bij EAP-TLS hebben zowel de authenticatieserver als de - client een certificaat nodig, met EAP-TTLS (EAP-Getunnelde - TransportLaagBeveiliging) is een clientcertificaat - optioneel. Deze methode komt in de buurt van wat sommige - beveiligde websites doen, waar de webserver een veilige - SSL-tunnel kan aanmaken zelfs als de bezoekers geen - client-side certificaten hebben. EAP-TTLS zal de - versleutelde TLS-tunnel gebruiken voor het veilig - transporteren van de authenticatiegegevens. + cliënt een certificaat nodig, met EAP-TTLS ( + EAP-Tunneled Transport Layer Security) is een + cliëntcertificaat optioneel. Deze methode komt in de + buurt van wat sommige beveiligde websites doen, waar de + webserver een veilige SSL-tunnel kan aanmaken zelfs als de + bezoekers geen certificaten aan de cliëntkant hebben. + EAP-TTLS zal de versleutelde TLS-tunnel gebruiken voor het + veilig transporteren van de authenticatiegegevens. De instellingen worden gedaan via het bestand /etc/wpa_supplicant.conf: @@ -1648,16 +1648,16 @@ PEAP is soortgelijk aan EAP-TTLS: het gebruikt een - server-side certificaat om de clients te authenticeren - door een beveiligde TLS-tunnel tussen de client en de - authenticatieserver aan te maken, welke de uitwisseling - van de authenticatie-informatie beschermt. Vanuit een - beveiligingsoogpunt gezien is het verschil tussen EAP-TTLS - en PEAP dat PEAP-authenticatie de gebruikersnaam - onversleuteld uitzendt, alleen het wachtwoord wordt in de - beveiligde TLS-tunnel verzonden. EAP-TTLS gebruikt de - TLS-tunnel voor zowel de gebruikersnaam als het wachtwoord - . + server-side certificaat om de cliënten te + authenticeren door een beveiligde TLS-tunnel tussen de + cliënt en de authenticatieserver aan te maken, welke + de uitwisseling van de authenticatie-informatie beschermt. + Vanuit een beveiligingsoogpunt gezien is het verschil + tussen EAP-TTLS en PEAP dat PEAP-authenticatie de + gebruikersnaam onversleuteld uitzendt, alleen het + wachtwoord wordt in de beveiligde TLS-tunnel verzonden. + EAP-TTLS gebruikt de TLS-tunnel voor zowel de + gebruikersnaam als het wachtwoord. Het bestand /etc/wpa_supplicant.conf dient @@ -1748,7 +1748,7 @@ WEP - WEP (Bedraad Equivalent Privacy) maakt deel uit van de + WEP (Wired Equivalent Privacy) maakt deel uit van de oorspronkelijke 802.11 standaard. Er is geen authenticatiemechanisme, slechts een zwakke vorm van toegangscontrole, en het is gemakkelijk te kraken. @@ -1940,7 +1940,7 @@ vorm van authenticatie of encryptie te draaien, is dit een eenvoudige manier om te controleren of het AP werkt. Deze configuratie is ook belangrijk voor het debuggen van problemen - met clients. + met cliënten. Nadat het AP is ingesteld als eerder is laten zien, is het mogelijk om van een andere draadloze machine een scan te @@ -1950,7 +1950,7 @@ SSID BSSID CHAN RATE S:N INT CAPS freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 ES - De clientmachine heeft het AP gevonden en kan ermee + De cliëntmachine heeft het AP gevonden en kan ermee geassocieeerd worden: &prompt.root; ifconfig ath0 ssid freebsdap inet 192.168.0.2 netmask 255.255.255.0 @@ -1971,11 +1971,11 @@ Deze sectie zal zich richten op opzetten van een &os; toegangspunt dat het beveilingsprotocol WPA gebruikt. Meer details over WPA en het instellen van op WPA gebaseerde - draadloze clients kan gevonden worden in . De daemon hostapd wordt - gebruikt om clientauthenticatie en sleutelbeheer op het + gebruikt om cliëntauthenticatie en sleutelbeheer op het toegangspunt met WPA af te handelen. In het volgende zullen alle instellingsbewerkingen worden @@ -2093,8 +2093,8 @@ ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac authmode WPA2/802.11i privacy MIXED deftxkey 2 TKIP 2:128-bit txpowmax 36 protmode CTS dtimperiod 1 bintval 100 - Het toegangspunt draait nu, de clienten kunnen er nu mee - worden geassocieerd, zie Het toegangspunt draait nu, de cliënten kunnen er + nu mee worden geassocieerd, zie voor meer details. Het is mogelijk om de stations die met het AP geassocieerd zijn te zien door het commando ifconfig @@ -2163,10 +2163,10 @@ SSID BSSID CHAN RATE S:N INT CAPS freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS - De clientmachine heeft het toegangspunt gevonden en kan - ermee geassocieerd worden door de juiste parameters (sleutel, - enz.) te gebruiken, zie - voor meer details. + De cliëntmachine heeft het toegangspunt gevonden en + kan ermee geassocieerd worden door de juiste parameters ( + sleutel, enz.) te gebruiken, zie voor meer details. @@ -2249,7 +2249,7 @@ Lucistnik Geschreven door -

    pav@oook.cz
    +
    pav@FreeBSD.org
    @@ -2265,16 +2265,16 @@ Bluetooth is een draadloze technologie om persoonlijke netwerken aan te maken die in de vrije 2,4GHz-band werken binnen een straal van 10 meter. Deze netwerken worden gewoonlijk - ad-hoc gevormd en bestaan uit mobiele telefoons, handhelds en - laptops. In tegenstelling tot die andere populaire draadloze - techniek, Wi-Fi, biedt Bluetooth een hoger niveau van - serviceprofielen, zoals FTP-achtige bestandsservers, pushing van - bestanden, stemtransport, communicatie over seriële lijnen, - en meer. + ad-hoc gevormd en bestaan uit draagbare apparaten zoals mobiele + telefoons, handhelds en laptops. In tegenstelling tot die + andere populaire draadloze techniek, Wi-Fi, biedt Bluetooth een + hoger niveau van serviceprofielen, zoals FTP-achtige + bestandsservers, pushing van bestanden, stemtransport, emulatie + van seriële lijnen, en meer. De Bluetooth stack is in &os; geïmplementeerd door - gebruik te maken van het Netgraph-raamwerk (zie &man.netgraph.4;). - Een rijke variëteit van Bluetooth USB-dongles wordt + gebruik te maken van het Netgraph-raamwerk (zie &man.netgraph.4; + ). Een rijke variëteit van Bluetooth USB-dongles wordt ondersteund door het stuurprogramma &man.ng.ubt.4;. Apparaten gebaseerd op de Broadcom BCM2033 chip worden ondersteund door de stuurprogramma's &man.ubtbcmfw.4; en &man.ng.ubt.4;. De 3Com @@ -2291,7 +2291,7 @@ Standaard zijn stuurprogramma's voor Bluetooth-apparaten beschikbaar als kernelmodules. Voordat een apparaat wordt aangekoppeld, dient het stuurprogramma in de kernel geladen te - zijn: + worden: &prompt.root; kldload ng_ubt Indien het Bluetooth-apparaat tijdens het opstarten van het @@ -2301,29 +2301,24 @@ ng_ubt_load="YES" Prik de USB-dongle in. Uitvoer vergelijkbaar aan de - onderstaande zal op de console (of in syslog) verschijnen: + onderstaande zal op de console (of in syslog) verschijnen: + ubt0: vendor 0x0a12 product 0x0001, rev 1.10/5.25, addr 2 ubt0: Interface 0 endpoints: interrupt=0x81, bulk-in=0x82, bulk-out=0x2 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3, wMaxPacketSize=49, nframes=6, buffer size=294 - - De Bluetooth-stack moet handmatig worden opgestart in &os; - 6.0, en op &os; 5.X vóór 5.5. Het gebeurt - automatisch vanuit &man.devd.8; op &os; 5.5, 6.1, en nieuwer. + Kopieer + /usr/share/examples/netgraph/bluetooth/rc.bluetooth + naar een handige plaats zoals + /etc/rc.bluetooth. Dit script wordt + gebruikt om de Bluetooth-stack te starten en te stoppen. Het is + een goed idee om de Bluetooth-stack te stoppen voordat het + apparaat wordt losgekoppeld, maar het is gewoonlijk niet fataal. + Tijdens het opstarten van de stack verschijnt er uitvoer + vergelijkbaar aan de onderstaande: - - Kopieer - /usr/share/examples/netgraph/bluetooth/rc.bluetooth - naar een handige plaats zoals /etc/rc.bluetooth. - Dit script wordt gebruikt om de Bluetooth-stack te starten en - te stoppen. Het is een goed idee om de Bluetooth-stack te - stoppen vóórdat het apparaat wordt losgekoppeld, - maar het is gewoonlijk niet fataal. Tijdens het opstarten van - de stack verschijnt er uitvoer vergelijkbaar met de - onderstaande: - &prompt.root; /etc/rc.bluetooth start ubt0 BD_ADDR: 00:02:72:00:d4:1a Features: 0xff 0xff 0xf 00 00 00 00 00 @@ -2336,7 +2331,6 @@ Number of ACL packets: 8 Max. SCO packet size: 64 bytes Number of SCO packets: 8 - HCI @@ -2345,8 +2339,9 @@ Host Controller Interface (HCI) Het Host Controller Interface (HCI) biedt een - opdrachtinterfce naar de controller van de basisband en de - verbindingsbeheerder. Deze interface biedt een uniforme manier + opdrachtinterface naar de controller van de basisband en de + verbindingsbeheerder, en toegang tot hardwarestatus en + controleregisters. Deze interface biedt een uniforme manier om de mogelijkheden van de basisband van Bluetooth te benaderen. De HCI-laag op de gastheer wisselt gegevens en opdrachten uit met de HCI-firmware in de Bluetooth-hardware. Het @@ -2356,7 +2351,7 @@ Voor een enkel Bluetooth-apparaat wordt een enkele Netgraph knoop van het type hci aangemaakt. De - HCI-knoop is normaalgesproken verbonden met de knoop van het + HCI-knoop is normaliter verbonden met de knoop van het Bluetooth-apparaatstuurprogramma (naar beneden toe) en de L2CAP-knoop (naar boven toe). Alle HCI-bewerkingen dienen te worden uitgevoerd op de HCI-knoop en niet op de knoop van het @@ -2369,10 +2364,10 @@ wordt ondervragen genoemd. Ondervragen en andere HCI-gerelateerde bewerkingen worden uitgevoerd met het programma &man.hccontrol.8;. Het onderstaande voorbeeld laat - zien hoe kan worden ontdekt welke Bluetooth-apparaten zich - binnen bereik bevinden. De lijst met apparaten zou binnen - enkele seconden moeten binnenkomen. Bedenk dat een afstandelijk - apparaat alleen antwoord op de ondervraging zal geven indien het + zien hoe kan worden uitgezocht welke Bluetooth-apparaten zich + binnen het bereik bevinden. De lijst met apparaten zou binnen + enkele seconden moeten binnenkomen. Bedenk dat een apparaat op + afstand alleen antwoord op de ondervraging zal geven indien het in ontdekbare modus staat. &prompt.user; hccontrol -n ubt0hci inquiry @@ -2393,17 +2388,18 @@ aan een BD_ADDR toe te kennen. Het bestand /etc/bluetooth/hosts bevat informatie over de bekende Bluetooth-gastheren. Het volgende voorbeeld laat - zien hoe de menselijk leesbare naam dat aan het afstandelijke - apparaat was toegekend te verkrijgen is: + zien hoe de menselijk leesbare naam dat aan het apparaat op + afstand was toegekend te verkrijgen is: &prompt.user; hccontrol -n ubt0hci remote_name_request 00:80:37:29:19:a4 BD_ADDR: 00:80:37:29:19:a4 Name: Pav's T39 Tijdens het uitvoeren van een ondervraging op een - afstandelijk Bluetooth-apparaat zal het de computer als - computer.naam (ubt0) vinden. De naam die aan het - lokale apparaat is toegekend, kan altijd gewijzigd worden. + Bluetooth-apparaat op afstand zal het de computer als + uw.gastheer.naam (ubt0) vinden. De naam die aan + het lokale apparaat is toegekend, kan altijd gewijzigd worden. + Het Bluetooth-systeem biedt een punt-naar-punt-verbinding (slechts twee Bluetooth-eenheden betrokken), of een @@ -2418,10 +2414,10 @@ 00:80:37:29:19:a4 41 ACL 0 MAST NONE 0 0 OPEN Een verbindingshandvat is nuttig indien - het beeindigen van de basisbandverbinding noodzakelijk is. + het beëindigen van de basisbandverbinding noodzakelijk is. Normaalgesproken is het niet nodig om dit handmatig te doen. De stack zal automatisch niet-actieve basisbandverbindingen - beeindigen. + beëindigen. &prompt.root; hccontrol -n ubt0hci disconnect 41 Connection handle: 41 @@ -2432,6 +2428,8 @@ HCI-opdrachten zijn geen beheerdersrechten nodig. + L2CAP + Logical Link Control and Adaptation Protocol (L2CAP) @@ -2492,9 +2490,9 @@ Een ander diagnostisch programma is &man.btsockstat.1;. Het heeft ongeveer hetzelfde doel als &man.netstat.1;, maar dan voor - Bluetooth-gerelateerde gegevensstructuren. Het onderstaande - voorbeeld laat dezelfde logische verbinding zien als die van - &man.l2control.8; hierboven. + Bluetooth-netwerkgerelateerde gegevensstructuren. Het + onderstaande voorbeeld laat dezelfde logische verbinding zien + als die van &man.l2control.8; hierboven. &prompt.user; btsockstat Active L2CAP sockets @@ -2515,11 +2513,12 @@ Het RFCOMM-protocol biedt emulatie van seriële poorten over het L2CAP-protocol. Het protocol is gebaseerd op de - ETSI-standaard TS 07.10. RDCOMM is een envoudig + ETSI-standaard TS 07.10. RFCOMM is een envoudig transportprotocol, met aanvullende voorzieningen om de 9 circuits van RS-232- (EIATIA-232-E-) seriële poorten te emuleren. Het RFCOMM-protocol ondersteunt tot 60 gelijktijdige - verbindingen (RFCOMM-kanalen) tussen twee Bluetooth-apparaten. + verbindingen (RFCOMM-kanalen) tussen twee Bluetooth-apparaten. + Het is de bedoeling van RFCOMM dat in een volledig communicatiepad twee toepassingen op verschillende apparaten @@ -2541,8 +2540,10 @@ Bluetooth-stopcontacten geïmplementeerd. + paren + - Apparaatparen + Het paren van apparaten Standaard is Bluetooth-communicatie niet geauthenticeerd en kan elk apparaat met elk ander apparaat praten. Een @@ -2550,9 +2551,9 @@ ervoor kiezen dat voor bepaalde diensten authenticatie nodig is (bijvoorbeeld voor de inbeldienst). Bluetooth-authenticatie geschied normaalgesproken met PIN-codes. - Een PIN-code is hier een ACII-reeks van maximaal 16 tekens lang. - De gebruiker dient dezelfde PIN-code op beide apparaten in te - geven. Nadat de gebruiker de PIN-code heeft ingevoerd, zullen + Een PIN-code is een ACII-reeks van maximaal 16 tekens lang. De + gebruiker dient dezelfde PIN-code op beide apparaten in te + voeren. Nadat de gebruiker de PIN-code heeft ingevoerd, zullen beide apparaten een verbindingssleutel aanmaken. Hierna kan de verbindingssleutel òfwel in de apparaten zelf, òfwel in een permanente opslag worden @@ -2565,9 +2566,10 @@ De daemon &man.hcsecd.8; is verantwoordelijk voor het behandelen van alle verzoeken voor Bluetooth-authenticatie. Het standaard instellingenbestand is - /etc/bluetooth.conf. Een voorbeeldsectie - voor een mobiele telefoon waarvan de PIN-code willekeurig op - 1234 is hieronder beschreven: + /etc/bluetooth/hcsecd.conf. Een + voorbeeldsectie voor een mobiele telefoon waarvan de PIN-code + willekeurig op 1234 is hieronder beschreven: + device { bgaddr 00:80:37:29:19:a4; @@ -2581,13 +2583,13 @@ PIN-code vast zijn ingebouwd. De schakelaar dwingt de daemon &man.hcsecd.8; om op de voorgrond te blijven, zodat het gemakkelijk is om te zien wat er gebeurt. Stel het - afstandelijke apparaat in om paren te ontvangen en initialiseer - de Bluetooth-verbinding naar het afstandelijke apparaat. Het - apparaat moet zeggen dat het paren geaccepteerd is en om de - PIN-code vragen. Geef dezelfde pincode in als in - hcsecd.conf. Nu zijn de PC en het - afstandelijke apparaat gepaard. Als alternatief kan paren op - het afstandelijke apparaat worden geïnitialiseerd. + andere apparaat in om paarverzoeken te ontvangen en initialiseer + de Bluetooth-verbinding naar het andere apparaat. Het apparaat + moet zeggen dat het paarverzoek geaccepteerd is en om de + PIN-code vragen. Geef dezelfde PIN-code op als in + hcsecd.conf. Nu zijn de PC en het andere + apparaat gepaard. Als alternatief kan paren op het andere + apparaat worden geïnitialiseerd. Op &os; 5.5, 6.1, en nieuwer kan de volgende regel aan het bestand /etc/rc.conf worden toegvoegd @@ -2616,12 +2618,12 @@ cliënttoepassingen de mogelijkheid om diensten te ontdekken die door servertoepassingen worden aangeboden alsook de kenmerken van deze diensten. De kenmerken van een dienst - omvatten de het soort of klasse van de aangeboden dienst en de + omvatten de soort of klasse van de aangeboden dienst en de informatie over het mechanisme of protocol dat nodig is om de dienst te gebruiken. SDP omvat communicatie tussen een SDP-server en een - SDP-cliënt. De server houdt een lijst een van + SDP-cliënt. De server houdt een lijst van dienstenregistraties bij die de eigenschappen van de diensten beschrijven die met de server geassocieerd zijn. Elke dienstregistratie bevat informatie over een enkele dienst. Een @@ -2636,7 +2638,7 @@ Normaalgesproken zoekt een SDP-cliënt naar diensten naar aanleiding van enkele gewenste eigenschappen van die - diensten. Soms is het ecter wenselijk om te ontdekken welke + diensten. Soms is het echter wenselijk om te ontdekken welke soorten diensten door de dienstregistraties van een SDP-server worden beschreven zonder enige voorkennis van deze diensten. Dit kijken naar alle aangeboden diensten wordt @@ -2644,8 +2646,8 @@ De Bluetooth SDP-server &man.sdpd.8; en de opdrachtregelcliënt &man.sdpcontrol.8; zitten in de - standaard &os;-installatie. Het volgende voorbeeld laat het - SDP browsen wordt gedaan. + standaard &os;-installatie. Het volgende voorbeeld laat zien + hoe een SDP-browse query uit te voeren. &prompt.user; sdpcontrol -a 00:01:03:fc:6e:ec browse Record Handle: 00000000 @@ -2675,7 +2677,7 @@ attributen heeft (bijvoorbeeld een RFCOMM-kanaal). Afhankelijk van de dienst kan het nodig zijn om een aantekening van sommige attributen te maken. Sommige Bluetooth-implementaties - ondersteunen dienst-browsen niet en kunnen een lege lijst + ondersteunen dienst-browsen niet en zullen een lege lijst teruggeven. In dit geval is het mogelijk om naar de specifieke dienst te zoeken. Het onderstaande voorbeeld laat zien hoe naar de dienst OBEX Object Push (OPUSH) gezocht kan worden: @@ -2685,7 +2687,8 @@ Het aanbieden van diensten op &os; aan Bluetooth-cliënten wordt gedaan met de server &man.sdpd.8;. Op &os; 5.5, 6.1, en nieuwer, kan de volgende regel aan het - bestand /etc/rc.conf worden toegevoegd: + bestand /etc/rc.conf worden toegevoegd: + sdpd_enable="YES" @@ -2694,19 +2697,12 @@ &prompt.root; /etc/rc.d/sdpd start - Op &os; 6.0, en op &os; 5.X voor 5.5, is - sdpd niet in de opstartscripts van - het systeem geïntegreerd. Het dient handmatig te worden - gestart met: - - &prompt.root; sdpd - - De plaatselijke servertoepassingen die Bluetooth-diensten - willen aanbieden aan verre cliënten zullen de diensten - registreren bij de plaatselijke SDP-daemon. Een voorbeeld van - zo'n toepassing is &man.rfcomm.pppd.8;. Nadat het gestart is - zal het de Bluetooth LAN-dienst bij de plaatselijke SDP-daemon - registreren. + De plaatselijke servertoepassing die Bluetooth-diensten wil + aanbieden aan verre cliënten zal de dienst registreren bij + de plaatselijke SDP-daemon. Een voorbeeld van zo'n toepassing + is &man.rfcomm.pppd.8;. Nadat het gestart is zal het de + Bluetooth LAN-dienst bij de plaatselijke SDP-daemon registreren. + De lijst met diensten die bij de plaatselijke SDP-server zijn geregistreerd kan worden opgevraagd door te SDP-browsen @@ -2716,7 +2712,7 @@ - Dial-Up Networking (DUN) en netwerk toegang met PPP (LAN) + <title>Dial-Up Networking (DUN) en netwerktoegang met PPP (LAN) profielen Het inbelnetwerk (DUN) profiel wordt het meeste gebruikt met @@ -2737,22 +2733,36 @@ - Op &os; zijn beide profielen met &man.ppp.8; en - &man.rfcomm.pppd.8; - een wrapper die een RFCOMM - Bluetooth-verbinding omzet in iets waar PPP mee overweg kan - - geïmplementeerd. Voordat een profiel gebruikt kan worden, - dient een nieuw PPP-label in het bestand - /etc/ppp/ppp.conf te worden aangemaakt. - Raadpleeg de hulppagina &man.rfcomm.pppd.8; voor voorbeelden. + Het profiel voor netwerktoegang met PPP (LAN) kan in de + volgende situaties gebruikt worden: + + + LAN-toegang voor een enkel Bluetooth-apparaat; + + + LAN-toegang voor meerdere Bluetooth-apparaten; + + + PC naar PC (door PPP-netwerken over een + seriële kabel te emuleren). + + + Op &os; zijn beide profielen geïmplementeerd met + &man.ppp.8; en &man.rfcomm.pppd.8; - een wrapper die een RFCOMM + Bluetooth-verbinding omzet in iets waar PPP mee overweg kan. + Voordat een profiel gebruikt kan worden, dient een nieuw + PPP-label in het bestand /etc/ppp/ppp.conf + te worden aangemaakt. Raadpleeg de hulppagina + &man.rfcomm.pppd.8; voor voorbeelden. - In het volgende voorbeeld al &man.rfcomm.pppd.8; gebruikt + In het volgende voorbeeld zal &man.rfcomm.pppd.8; gebruikt worden om RFCOMM-verbinding met een ver apparaat met BD_ADDR 00:80:37:29:19:a4 op een DUN RFCOMM-kanaal te maken. Het eigenlijke RFCOMM-kanaalnummer wordt via SDP van het verre apparaat verkregen. Het is mogelijk om het RFCOMM-kanaal handmatig op te geven, en in dat geval zal &man.rfcomm.pppd.8; - het verzoek niet uitvoeren. Gebruik &man.sdpcontrol.8;om het - RFCOMM-kanaal op het verre apparaat te achterhalen. + het SDP-verzoek niet uitvoeren. Gebruik &man.sdpcontrol.8; om + het RFCOMM-kanaal op het verre apparaat te achterhalen. &prompt.root; rfcomm_pppd -a 00:80:37:29:19:a4 -c -C dun -l rfcomm-dialup @@ -2770,6 +2780,8 @@ &prompt.root; rfcomm_pppd -s -C 7 -l rfcomm-server + OBEX + Het OBEX Object Push (OPUSH) profiel @@ -2790,10 +2802,10 @@ bijvoorbeeld een visitekaart of een afspraak zijn. De OBEX-cliënt kan het RFCOMM-kanaalnummer van het verre apparaat via SDP opvragen. Dit kan gedaan worden door de - naam van de dienst in plaats van het RFCOMM-kanaalnummer op te - geven. De ondersteunde dienstnamen zijn: IrMC, FTRN, en OPUSH. - Het is mogelijk om het RFCOMM-kanaal als een nummer op te geven. - Het onderstaande is een voorbeeld van een OBEX-sessie, waar een + dienstnaam in plaats van het RFCOMM-kanaalnummer op te geven. + De ondersteunde dienstnamen zijn: IrMC, FTRN, en OPUSH. Het is + mogelijk om het RFCOMM-kanaal als een nummer op te geven. Het + onderstaande is een voorbeeld van een OBEX-sessie, waar een apparaatinformatie-object van de mobiele telefoon wordt getrokken, en een nieuw object (een visitekaart) in de gids van de telefoon wordt geduwd: @@ -2807,9 +2819,9 @@ Success, response: OK, Success (0x20) Om de dienst OBEX Object Push aan te bieden, moet de server - &man.sdpd.8; draaien. Er moet een rootmap worden aangemaakt + &man.sdpd.8; draaien. Er moet een hoofdmap worden aangemaakt waarin alle binnenkomende objecten worden opgeslagen. Het - standaardpad naar de rootmap is + standaardpad naar de hoofdmap is /var/spool/obex. Tenslotte moet de OBEX-server op een geldig RFCOMM-kanaal worden gestart. De OBEX-server zal automatisch de dienst OBEX Object Push bij de @@ -2836,7 +2848,8 @@ verre apparaten te verbinden. Merk op dat het niet nodig is om een RFCOMM-kanaal te kiezen - &man.rfcomm.sppd.1; kan het via SDP van het verre apparaat verkrijgen. Dit kan worden overruled - door een RFCOMM-kanaal op de opdrachtregel te specificeren. + door een RFCOMM-kanaal op de opdrachtregel te specificeren. + &prompt.root; rfcomm_sppd -a 00:07:E0:00:0B:CA -t /dev/ttyp6 rfcomm_sppd[94692]: Starting on /dev/ttyp6... @@ -2853,23 +2866,22 @@ Een apparaat op afstand kan geen verbinding maken - Sommige oudere Bluetooth-apparaten ondersteuenen het - wisselen van rol niet. Standaard probeert het apparaat, - wanneer &os; een nieuwe verbinding accepteert, een - rolwisseling uit te voeren en meester te worden. Apparaten - die dit niet onderrsteunen zullen niet kunnen verbinden. Merk - op dat van rol wordt gewisseld wanneer een niewue verbinding - wordt gemaakt, dus het is niet mogelijk om het apparaat op - afstand te vragen als het rolwisseling niet ondersteunt. Er - is een HCI-optie om rolwisselen aan de plaatselijke kant uit - te zetten: + Sommige oudere Bluetooth-apparaten ondersteunen het + wisselen van rol niet. Standaard probeert &os;, wanneer het + een nieuwe verbinding accepteert, een rolwisseling uit te + voeren en meester te worden. Apparaten die dit niet + ondersteunen zullen niet kunnen verbinden. Merk op dat van + rol wordt gewisseld wanneer een nieuwe verbinding wordt + gemaakt, dus het is niet mogelijk om het verre apparaat te + vragen of het rolwisseling ondersteunt. Er is een HCI-optie + om rolwisselen aan de plaatselijke kant uit te zetten: &prompt.root; hccontrol -n ubt0hci write_node_role_switch 0 - Er gaat iets mis, kan ik ergens precies zien wat er - gebeurt? + Er gaat iets mis, kan ik precies zien wat er gebeurt? + Ja, dit is mogelijk. Gebruik het pakket hcidump, dat beschikbaar is als de @@ -2877,7 +2889,8 @@ gereedschap hcidump is vergelijkbaar met &man.tcpdump.1;. Het kan gebruikt worden om de inhoud van Bluetooth-pakketten op de terminal te laten zien - en om de Bluetooth-pakketten naar een bestand te schrijven. + en om de Bluetooth-pakketten naar een bestand te schrijven. + From owner-p4-projects@FreeBSD.ORG Tue Aug 19 19:29:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6885D106567D; Tue, 19 Aug 2008 19:29:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A6DF1065676 for ; Tue, 19 Aug 2008 19:29:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18D728FC08 for ; Tue, 19 Aug 2008 19:29:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JJT5bN081407 for ; Tue, 19 Aug 2008 19:29:05 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JJT53t081405 for perforce@freebsd.org; Tue, 19 Aug 2008 19:29:05 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 19 Aug 2008 19:29:05 GMT Message-Id: <200808191929.m7JJT53t081405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147826 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 19:29:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=147826 Change 147826 by ed@ed_dull on 2008/08/19 19:28:58 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile.inc1#3 integrate .. //depot/projects/mpsafetty/UPDATING#6 integrate .. //depot/projects/mpsafetty/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/mpsafetty/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/mpsafetty/etc/defaults/rc.conf#5 integrate .. //depot/projects/mpsafetty/etc/rc.d/kernel#3 delete .. //depot/projects/mpsafetty/etc/rc.d/kernel_symlink#1 branch .. //depot/projects/mpsafetty/share/man/man4/ata.4#2 integrate .. //depot/projects/mpsafetty/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/mpsafetty/sys/conf/options#6 integrate .. //depot/projects/mpsafetty/sys/ddb/db_output.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/hid.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_rum.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ums.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/pmap.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenpmap.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/mpsafetty/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/mpsafetty/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/bpf/Makefile#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/Makefile#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/bpf_test.c#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0001.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0002.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0003.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0004.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0005.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0006.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0007.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0008.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0009.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0010.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0011.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0012.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0013.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0014.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0015.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0016.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0017.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0018.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0019.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0020.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0021.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0022.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0023.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0024.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0025.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0026.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0027.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0028.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0029.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0030.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0031.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0032.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0033.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0034.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0035.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0036.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0037.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0038.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0039.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0040.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0041.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0042.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0043.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0044.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0045.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0046.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0047.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0048.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0049.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0050.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0051.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0052.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0053.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0054.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0055.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0056.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0057.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0058.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0059.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0060.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0061.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0062.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0063.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0064.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0065.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0066.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0067.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0068.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0069.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0070.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0071.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0072.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0073.h#1 branch .. //depot/projects/mpsafetty/tools/regression/bpf/bpf_filter/tests/test0074.h#1 branch .. //depot/projects/mpsafetty/usr.bin/tar/matching.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.609 2008/08/02 12:14:22 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -259,11 +259,11 @@ LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if empty(TARGET_CPUTYPE) -LIB32CPUTYPE= k8 +LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 .else -LIB32CPUTYPE= ${TARGET_CPUTYPE} +LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif -LIB32FLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT \ +LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ -iprefix ${LIB32TMP}/usr/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 ==== //depot/projects/mpsafetty/UPDATING#6 (text+ko) ==== @@ -52,6 +52,17 @@ instead of "ttyd0". You may need to reconfigure applications to use the new device names. + When using the serial port as a boot console, be sure to update + /boot/device.hints and /etc/ttys before booting the new kernel. + If you forget to do so, you can still manually specify the hints + at the loader prompt: + + set hint.uart.0.at="isa" + set hint.uart.0.port="0x3F8" + set hint.uart.0.flags="0x10" + set hint.uart.0.irq="4" + boot -s + 20080609: The gpt(8) utility has been removed. Use gpart(8) to partition disks instead. @@ -1097,4 +1108,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.537 2008/07/25 09:30:53 maxim Exp $ +$FreeBSD: src/UPDATING,v 1.538 2008/08/18 10:38:16 ed Exp $ ==== //depot/projects/mpsafetty/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.341 2008/08/15 19:20:59 jhb Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.342 2008/08/19 14:23:31 obrien Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -552,8 +552,7 @@ sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO). linux_enable="NO" # Linux binary compatibility loaded at startup (or NO). svr4_enable="NO" # SysVR4 emulation loaded at startup (or NO). - -kernel_enable="NO" # Symlink kernel directory to /boot/kernel if not exist. +kernel_symlink_enable="NO" # Symlink booted kernel to /boot/kernel if missing. clear_tmp_enable="NO" # Clear /tmp at startup. clear_tmp_X="YES" # Clear and recreate X11-related directories in /tmp ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks ==== //depot/projects/mpsafetty/share/man/man4/ata.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (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: src/share/man/man4/ata.4,v 1.74 2007/10/05 07:06:51 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ata.4,v 1.76 2008/08/18 09:45:26 simon Exp $ .\" -.Dd October 5, 2007 +.Dd August 18, 2008 .Dt ATA 4 .Os .Sh NAME @@ -85,6 +85,8 @@ .Bl -ohang .It Va hw.ata.ata_dma set to 1 for DMA access, 0 for PIO (default is DMA). +.It Va hw.ata.ata_dma_check_80pin +set to 0 to disable the 80pin cable check (default is 1, check the cable) .It Va hw.ata.atapi_dma set to 1 for DMA access, 0 for PIO (default is DMA). .It Va hw.ata.wc @@ -170,6 +172,9 @@ or could not be detected properly, or that one of the devices on the channel only accepts up to UDMA2/ATA33. +The +.Va hw.ata.ata_dma_check_80pin +tunable can be set to 0 to disable this check. .Pp Unknown ATAPI devices are initialized to DMA mode if the .Va hw.ata.atapi_dma ==== //depot/projects/mpsafetty/share/man/man5/rc.conf.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.344 2008/08/09 06:35:19 obrien Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.345 2008/08/19 14:23:31 obrien Exp $ .\" .Dd June 21, 2008 .Dt RC.CONF 5 @@ -3116,16 +3116,16 @@ If set to .Dq Li YES , load System V IPC primitives at boot time. -.It Va kernel_enable +.It Va kernel_symlink_enable .Pq Vt bool Set to .Dq Li YES -to symlink +to symbolicly link .Pa /boot/kernel to the directory that contains the kernel you booted from, unless .Pa /boot/kernel -already exists and is not a symlink. +already exists and is not a symbolic link. .It Va clear_tmp_enable .Pq Vt bool Set to ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ==== @@ -30,18 +30,22 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $"); +#ifdef _KERNEL #include "opt_bpf.h" - #include #include #include -#include #include #include +#include +#else +#include +#endif + +#include -#include #include #include @@ -53,7 +57,7 @@ * emit routine to update the jump table */ static void -emit_length(bpf_bin_stream *stream, u_int value, u_int len) +emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len) { (stream->refs)[stream->bpf_pc] += len; @@ -108,8 +112,12 @@ return (NULL); /* Allocate the reference table for the jumps */ +#ifdef _KERNEL stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); +#else + stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int)); +#endif if (stream.refs == NULL) return (NULL); @@ -141,7 +149,11 @@ switch (ins->code) { default: +#ifdef _KERNEL return (NULL); +#else + abort(); +#endif case BPF_RET|BPF_K: MOVid(ins->k, EAX); @@ -155,11 +167,13 @@ break; case BPF_LD|BPF_W|BPF_ABS: - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int32_t), ECX); - CMPrd(EDI, ECX); - JBEb(6); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -169,11 +183,13 @@ case BPF_LD|BPF_H|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int16_t), ECX); - CMPrd(EDI, ECX); - JBEb(4); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JAb(12); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -182,12 +198,12 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); - MOVid(ins->k, ECX); - CMPrd(EDI, ECX); - JBEb(4); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(4); MOVrq3(R8, RBX); RET(); - MOVobb(RBX, RCX, AL); + MOVobb(RBX, RSI, AL); break; case BPF_LD|BPF_W|BPF_LEN: @@ -199,12 +215,18 @@ break; case BPF_LD|BPF_W|BPF_IND: - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int32_t), ECX); - CMPrd(EDI, ECX); - JBEb(6); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int32_t), ECX); + JAEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -214,12 +236,18 @@ case BPF_LD|BPF_H|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - MOVrd(ECX, ESI); - ADDib(sizeof(int16_t), ECX); - CMPrd(EDI, ECX); - JBEb(4); + CMPrd(EDI, EDX); + JAb(27); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JBb(14); + ADDrd(EDX, ESI); + MOVrd(EDI, ECX); + SUBrd(ESI, ECX); + CMPid(sizeof(int16_t), ECX); + JAEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -228,24 +256,28 @@ case BPF_LD|BPF_B|BPF_IND: ZEROrd(EAX); - MOVid(ins->k, ECX); - ADDrd(EDX, ECX); - CMPrd(EDI, ECX); - JBEb(4); + CMPrd(EDI, EDX); + JAEb(13); + MOVid(ins->k, ESI); + MOVrd(EDI, ECX); + SUBrd(EDX, ECX); + CMPrd(ESI, ECX); + JAb(4); MOVrq3(R8, RBX); RET(); - MOVobb(RBX, RCX, AL); + ADDrd(EDX, ESI); + MOVobb(RBX, RSI, AL); break; case BPF_LDX|BPF_MSH|BPF_B: - MOVid(ins->k, ECX); - CMPrd(EDI, ECX); - JBEb(6); + MOVid(ins->k, ESI); + CMPrd(EDI, ESI); + JBb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); ZEROrd(EDX); - MOVobb(RBX, RCX, DL); + MOVobb(RBX, RSI, DL); ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -450,11 +482,19 @@ if (pass == 2) break; +#ifdef _KERNEL stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); return (NULL); } +#else + stream.ibuf = (char *)malloc(stream.cur_ip); + if (stream.ibuf == NULL) { + free(stream.refs); + return (NULL); + } +#endif /* * modify the reference table to contain the offsets and @@ -475,7 +515,11 @@ * the reference table is needed only during compilation, * now we can free it */ +#ifdef _KERNEL free(stream.refs, M_BPFJIT); +#else + free(stream.refs); +#endif return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -381,15 +381,27 @@ } \ } while (0) +/* jb off8 */ +#define JBb(off8) do { \ + emitm(&stream, 0x72, 1); \ + emitm(&stream, off8, 1); \ +} while (0) + +/* jae off8 */ +#define JAEb(off8) do { \ + emitm(&stream, 0x73, 1); \ + emitm(&stream, off8, 1); \ +} while (0) + /* jne off8 */ #define JNEb(off8) do { \ emitm(&stream, 0x75, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* jbe off8 */ -#define JBEb(off8) do { \ - emitm(&stream, 0x76, 1); \ +/* ja off8 */ +#define JAb(off8) do { \ + emitm(&stream, 0x77, 1); \ emitm(&stream, off8, 1); \ } while (0) ==== //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ */ #include "opt_atpic.h" @@ -636,13 +636,10 @@ .globl doreti_iret_fault doreti_iret_fault: subq $TF_RIP,%rsp /* space including tf_err, tf_trapno */ - testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ - jz 1f /* already running with kernel GS.base */ - swapgs -1: testl $PSL_I,TF_RFLAGS(%rsp) - jz 2f + testl $PSL_I,TF_RFLAGS(%rsp) + jz 1f sti -2: movq %rdi,TF_RDI(%rsp) +1: movq %rdi,TF_RDI(%rsp) movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) ==== //depot/projects/mpsafetty/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $ +# $FreeBSD: src/sys/conf/options,v 1.635 2008/08/18 16:48:09 attilio Exp $ # # On the handling of kernel options # @@ -48,6 +48,7 @@ # Debugging options. DDB +DDB_BUFR_SIZE opt_ddb.h DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h ==== //depot/projects/mpsafetty/sys/ddb/db_output.c#2 (text+ko) ==== @@ -33,7 +33,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.38 2007/12/25 23:06:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.40 2008/08/18 16:51:44 attilio Exp $"); + +#include "opt_ddb.h" #include #include @@ -47,6 +49,13 @@ #include #include +struct dbputchar_arg { + size_t da_nbufr; + size_t da_remain; + char *da_pbufr; + char *da_pnext; +}; + /* * Character output - tracks position in line. * To do this correctly, we should know how wide @@ -73,6 +82,8 @@ SYSCTL_INT(_debug, OID_AUTO, ddb_use_printf, CTLFLAG_RW, &ddb_use_printf, 0, "use printf for all ddb output"); +static void db_putc(int c); +static void db_puts(const char *str); static void db_putchar(int c, void *arg); static void db_pager(void); @@ -107,9 +118,34 @@ * Output character. Buffer whitespace. */ static void -db_putchar(c, arg) - int c; /* character to output */ - void * arg; +db_putchar(int c, void *arg) +{ + struct dbputchar_arg *dap = arg; + + if (dap->da_pbufr == NULL) { + + /* No bufferized output is provided. */ + db_putc(c); + } else { + + *dap->da_pnext++ = c; + dap->da_remain--; + + /* Leave always the buffer 0 terminated. */ + *dap->da_pnext = '\0'; + + /* Check if the buffer needs to be flushed. */ + if (dap->da_remain < 2 || c == '\n') { + db_puts(dap->da_pbufr); + dap->da_pnext = dap->da_pbufr; + dap->da_remain = dap->da_nbufr; + *dap->da_pnext = '\0'; + } + } +} + +static void +db_putc(int c) { /* @@ -180,6 +216,15 @@ /* other characters are assumed non-printing */ } +static void +db_puts(const char *str) +{ + int i; + + for (i = 0; str[i] != '\0'; i++) + db_putc(str[i]); +} + /* * Turn on the pager. */ @@ -272,30 +317,43 @@ * Printing */ void -#if __STDC__ db_printf(const char *fmt, ...) +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; +#endif + struct dbputchar_arg dca; + va_list listp; + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; #else -db_printf(fmt) - const char *fmt; + dca.da_pbufr = NULL; #endif -{ - va_list listp; va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } int db_indent; void -#if __STDC__ db_iprintf(const char *fmt,...) -#else -db_iprintf(fmt) - const char *fmt; +{ +#ifdef DDB_BUFR_SIZE + char bufr[DDB_BUFR_SIZE]; #endif -{ + struct dbputchar_arg dca; register int i; va_list listp; @@ -303,9 +361,25 @@ db_printf("\t"); while (--i >= 0) db_printf(" "); + +#ifdef DDB_BUFR_SIZE + dca.da_pbufr = bufr; + dca.da_pnext = dca.da_pbufr; + dca.da_nbufr = sizeof(bufr); + dca.da_remain = sizeof(bufr); + *dca.da_pnext = '\0'; +#else + dca.da_pbufr = NULL; +#endif + va_start(listp, fmt); - kvprintf (fmt, db_putchar, NULL, db_radix, listp); + kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); + +#ifdef DDB_BUFR_SIZE + if (*dca.da_pbufr != '\0') + db_puts(dca.da_pbufr); +#endif } /* ==== //depot/projects/mpsafetty/sys/dev/usb/ehci.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.65 2008/08/18 04:49:58 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.66 2008/08/18 10:39:59 kris Exp $"); #include #include @@ -239,7 +239,7 @@ static void ehci_dump_sqtd(ehci_soft_qtd_t *); static void ehci_dump_qtd(ehci_qtd_t *); static void ehci_dump_sqh(ehci_soft_qh_t *); -#if notyet +#ifdef notyet static void ehci_dump_sitd(struct ehci_soft_itd *); static void ehci_dump_itd(struct ehci_soft_itd *); #endif @@ -1474,7 +1474,7 @@ ehci_dump_qtd(&qh->qh_qtd); } -#if notyet +#ifdef notyet void ehci_dump_itd(struct ehci_soft_itd *itd) { ==== //depot/projects/mpsafetty/sys/dev/usb/hid.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.29 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/hid.c,v 1.31 2008/08/18 17:05:59 kaiw Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -193,8 +193,11 @@ case 0: /* Main */ switch (bTag) { case 8: /* Input */ - if (!(s->kindset & (1 << hid_input))) + if (!(s->kindset & (1 << hid_input))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_input; c->flags = dval; ret: @@ -223,8 +226,11 @@ return (1); } case 9: /* Output */ - if (!(s->kindset & (1 << hid_output))) + if (!(s->kindset & (1 << hid_output))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_output; c->flags = dval; goto ret; @@ -237,8 +243,11 @@ s->nu = 0; return (1); case 11: /* Feature */ - if (!(s->kindset & (1 << hid_feature))) + if (!(s->kindset & (1 << hid_feature))) { + if (s->nu > 0) + s->nu--; continue; + } c->kind = hid_feature; c->flags = dval; goto ret; @@ -266,7 +275,7 @@ c->logical_maximum = dval; break; case 3: - c->physical_maximum = dval; + c->physical_minimum = dval; break; case 4: c->physical_maximum = dval; ==== //depot/projects/mpsafetty/sys/dev/usb/if_rum.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.25 2008/07/30 00:38:10 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.26 2008/08/19 01:44:56 kevlo Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.25 2008/07/30 00:38:10 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.26 2008/08/19 01:44:56 kevlo Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -98,6 +98,7 @@ { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1 }, { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340 }, { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111 }, + { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110 }, { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWB01GS }, { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWI05GS }, { USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573 }, ==== //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#2 (text+ko) ==== @@ -1,8 +1,10 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ +#define UFOMA_HANDSFREE #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.10 2007/07/27 12:00:29 takawata Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.11 2008/08/18 11:56:13 takawata Exp $"); + /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . @@ -193,11 +195,13 @@ static char *ufoma_mode_to_str(int); static int ufoma_str_to_mode(char *); -/*Pseudo ucom stuff*/ +#ifdef UFOMA_HANDSFREE +/*Pseudo ucom stuff(for Handsfree interface)*/ static int ufoma_init_pseudo_ucom(struct ufoma_softc *); static t_open_t ufomaopen; static t_close_t ufomaclose; static t_oproc_t ufomastart; +#endif /*umodem like stuff*/ static int ufoma_init_modem(struct ufoma_softc *, struct usb_attach_arg *); @@ -291,8 +295,9 @@ return (UMATCH_NONE); } -#if 0 - if(mad->bType != UMCPC_ACM_TYPE_AB5){ +#ifndef UFOMA_HANDSFREE + if((mad->bType == UMCPC_ACM_TYPE_AB5)|| + (mad->bType == UMCPC_ACM_TYPE_AB6)){ return UMATCH_NONE; } #endif @@ -375,12 +380,17 @@ } } printf("\n"); - if((mad->bType == UMCPC_ACM_TYPE_AB5) ||(mad->bType == UMCPC_ACM_TYPE_AB6)){ +#ifdef UFOMA_HANDSFREE /*These does not have data interface*/ sc->sc_is_ucom = 0; ufoma_init_pseudo_ucom(sc); +#else + /*Should not happen*/ + goto error; +#endif + }else{ if(ufoma_init_modem(sc, uaa)){ goto error; @@ -429,10 +439,15 @@ sc->sc_ucom.sc_dying = 1; usbd_abort_pipe(sc->sc_notify_pipe); usbd_close_pipe(sc->sc_notify_pipe); - if(sc->sc_is_ucom) + if(sc->sc_is_ucom){ ucom_detach(&sc->sc_ucom); - else + } +#ifdef UFOMA_HANDSFREE + else{ ttyfree(sc->sc_ucom.sc_tty); + } + +#endif free(sc->sc_modetable, M_USBDEV); return rv; } @@ -547,7 +562,7 @@ return 0; } - +#ifdef UFOMA_HANDSFREE static inline void ufoma_setup_msg_req(struct ufoma_softc *sc, usb_device_request_t *req) { req->bmRequestType = UT_READ_CLASS_INTERFACE; @@ -583,15 +598,18 @@ mtx_unlock(&sc->sc_mtx); } - +#endif static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) { struct ufoma_softc *sc = priv; unsigned int a; struct ucom_softc *ucom =&sc->sc_ucom; + u_char mstatus; +#ifdef UFOMA_HANDSFREE usb_device_request_t req; + ufoma_setup_msg_req(sc, &req); - u_char mstatus; +#endif if (sc->sc_ucom.sc_dying) return; @@ -616,6 +634,7 @@ return; } switch(sc->sc_notify_buf.bNotification){ +#ifdef UFOMA_HANDSFREE case UCDC_N_RESPONSE_AVAILABLE: if(sc->sc_is_ucom){ printf("%s:wrong response request?\n", device_get_nameunit(ucom->sc_dev)); @@ -632,6 +651,7 @@ sc->sc_nummsg++; mtx_unlock(&sc->sc_mtx); break; +#endif case UCDC_N_SERIAL_STATE: if(!sc->sc_is_ucom){ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 19 19:51:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D93B106567E; Tue, 19 Aug 2008 19:51:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01587106567C for ; Tue, 19 Aug 2008 19:51:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E55128FC08 for ; Tue, 19 Aug 2008 19:51:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JJpS7L083408 for ; Tue, 19 Aug 2008 19:51:28 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JJpSMT083406 for perforce@freebsd.org; Tue, 19 Aug 2008 19:51:28 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 19 Aug 2008 19:51:28 GMT Message-Id: <200808191951.m7JJpSMT083406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 19:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=147828 Change 147828 by ed@ed_dull on 2008/08/19 19:51:27 Integrate my sound(4) changes. Affected files ... .. //depot/projects/mpsafetty/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pcm/sound.h#2 integrate Differences ... ==== //depot/projects/mpsafetty/sys/dev/sound/midi/sequencer.c#2 (text) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.28 2008/05/21 23:04:10 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.29 2008/08/19 19:45:08 ed Exp $"); #include #include ==== //depot/projects/mpsafetty/sys/dev/sound/pcm/sound.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.78 2007/06/16 03:37:28 ariff Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.79 2008/08/19 19:45:08 ed Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Tue Aug 19 21:08:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF071106568F; Tue, 19 Aug 2008 21:08:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A25C41065678 for ; Tue, 19 Aug 2008 21:08:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91D5B8FC36 for ; Tue, 19 Aug 2008 21:08:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JL8q9q006576 for ; Tue, 19 Aug 2008 21:08:52 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JL8qU7006574 for perforce@freebsd.org; Tue, 19 Aug 2008 21:08:52 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 19 Aug 2008 21:08:52 GMT Message-Id: <200808192108.m7JL8qU7006574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 21:08:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=147836 Change 147836 by ed@ed_dull on 2008/08/19 21:08:04 Add an unused example of how we could implement a safer TTY flushing routine for the input path, which would be very useful for utilities like passwd to call, because it guarantees we internally zeroise all buffers. I've not hooked it up to anything yet, but let's hope someone (me?) picks this up after the MPSAFE TTY import. While there, fix some small style(9) issues in tty_*q.c, as I didn't know we had the single line of whitespace rule when I wrote the code in question. Requested by: csjp Affected files ... .. //depot/projects/mpsafetty/sys/kern/tty_inq.c#4 edit .. //depot/projects/mpsafetty/sys/kern/tty_outq.c#4 edit Differences ... ==== //depot/projects/mpsafetty/sys/kern/tty_inq.c#4 (text+ko) ==== @@ -145,6 +145,7 @@ ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio, size_t rlen, size_t flen) { + MPASS(rlen <= uio->uio_resid); while (rlen > 0) { @@ -261,6 +262,7 @@ ttyinq_set_quotes(struct ttyinq_block *tib, size_t offset, size_t length, int value) { + if (value) { /* Set the bits. */ for (; length > 0; length--, offset++) @@ -336,6 +338,7 @@ void ttyinq_canonicalize(struct ttyinq *ti) { + ti->ti_linestart = ti->ti_reprint = ti->ti_end; ti->ti_startblock = ti->ti_reprintblock = ti->ti_lastblock; } @@ -369,12 +372,29 @@ void ttyinq_flush(struct ttyinq *ti) { + ti->ti_begin = 0; ti->ti_linestart = 0; ti->ti_reprint = 0; ti->ti_end = 0; } +#if 0 +void +ttyinq_flush_safe(struct ttyinq *ti) +{ + struct ttyinq_block *tib; + + ttyinq_flush(ti); + + /* Zero all data in the input queue to make it more safe */ + TAILQ_FOREACH(tib, &ti->ti_list, tib_list) { + bzero(&tib->tib_quotes, sizeof tib->tib_quotes); + bzero(&tib->tib_data, sizeof tib->tib_data); + } +} +#endif + int ttyinq_peekchar(struct ttyinq *ti, char *c, int *quote) { @@ -396,6 +416,7 @@ void ttyinq_unputchar(struct ttyinq *ti) { + MPASS(ti->ti_linestart < ti->ti_end); if (--ti->ti_end % TTYINQ_DATASIZE == 0) { @@ -413,6 +434,7 @@ void ttyinq_reprintpos_set(struct ttyinq *ti) { + ti->ti_reprint = ti->ti_end; ti->ti_reprintblock = ti->ti_lastblock; } @@ -420,6 +442,7 @@ void ttyinq_reprintpos_reset(struct ttyinq *ti) { + ti->ti_reprint = ti->ti_linestart; ti->ti_reprintblock = ti->ti_startblock; } @@ -454,6 +477,7 @@ ttyinq_line_iterate_from_linestart(struct ttyinq *ti, ttyinq_line_iterator_t *iterator, void *data) { + ttyinq_line_iterate(ti, iterator, data, ti->ti_linestart, ti->ti_startblock); } @@ -462,6 +486,7 @@ ttyinq_line_iterate_from_reprintpos(struct ttyinq *ti, ttyinq_line_iterator_t *iterator, void *data) { + ttyinq_line_iterate(ti, iterator, data, ti->ti_reprint, ti->ti_reprintblock); } @@ -469,6 +494,7 @@ static void ttyinq_startup(void *dummy) { + ttyinq_zone = uma_zcreate("ttyinq", sizeof(struct ttyinq_block), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); } ==== //depot/projects/mpsafetty/sys/kern/tty_outq.c#4 (text+ko) ==== @@ -70,6 +70,7 @@ void ttyoutq_flush(struct ttyoutq *to) { + to->to_begin = 0; to->to_end = 0; } @@ -197,6 +198,7 @@ int ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio) { + while (uio->uio_resid > 0) { int error; struct ttyoutq_block *tob; @@ -355,6 +357,7 @@ static void ttyoutq_startup(void *dummy) { + ttyoutq_zone = uma_zcreate("ttyoutq", sizeof(struct ttyoutq_block), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); } From owner-p4-projects@FreeBSD.ORG Tue Aug 19 22:02:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 103AE1065688; Tue, 19 Aug 2008 22:02:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD3551065704 for ; Tue, 19 Aug 2008 22:02:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B59D8FC17 for ; Tue, 19 Aug 2008 22:02:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7JM2mkN016521 for ; Tue, 19 Aug 2008 22:02:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7JM2lYe016519 for perforce@freebsd.org; Tue, 19 Aug 2008 22:02:47 GMT (envelope-from jb@freebsd.org) Date: Tue, 19 Aug 2008 22:02:47 GMT Message-Id: <200808192202.m7JM2lYe016519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 147841 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2008 22:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147841 Change 147841 by jb@freebsd3 on 2008/08/19 22:02:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#23 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/Makefile#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#86 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#53 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#21 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#3 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#14 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#4 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#28 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#18 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#26 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#81 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#3 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/Makefile#3 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/articles/contributors/article.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ppp-and-slip/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#17 integrate .. //depot/projects/dtrace/ports/MOVED#103 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#11 integrate .. //depot/projects/dtrace/ports/Mk/bsd.java.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#10 integrate .. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#14 integrate .. //depot/projects/dtrace/ports/UPDATING#86 integrate .. //depot/projects/dtrace/src/Makefile.inc1#50 integrate .. //depot/projects/dtrace/src/UPDATING#37 integrate .. //depot/projects/dtrace/src/contrib/ntp/FREEBSD-Xlist#4 delete .. //depot/projects/dtrace/src/contrib/ntp/FREEBSD-upgrade#4 delete .. //depot/projects/dtrace/src/etc/defaults/rc.conf#39 integrate .. //depot/projects/dtrace/src/etc/rc.d/kernel#5 delete .. //depot/projects/dtrace/src/etc/rc.d/kernel_symlink#1 branch .. //depot/projects/dtrace/src/etc/rc.firewall#12 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#27 integrate .. //depot/projects/dtrace/src/lib/libc/uuid/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/uuid/uuid.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/uuid/uuid_stream.c#1 branch .. //depot/projects/dtrace/src/lib/libkvm/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm.h#5 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_getpcpu.3#1 branch .. //depot/projects/dtrace/src/lib/libkvm/kvm_pcpu.c#1 branch .. //depot/projects/dtrace/src/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ata.4#11 integrate .. //depot/projects/dtrace/src/share/man/man4/snp.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/tcp.4#6 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#33 integrate .. //depot/projects/dtrace/src/sys/Makefile#18 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/bpf_jit_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/dump_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/exception.S#11 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pcpu.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.c#7 integrate .. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#12 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#17 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#27 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#104 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#39 integrate .. //depot/projects/dtrace/src/sys/conf/options#56 integrate .. //depot/projects/dtrace/src/sys/conf/options.i386#13 integrate .. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/fil.c#10 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#15 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/dtrace/src/sys/ddb/db_output.c#8 integrate .. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#31 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pcib_private.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/dtrace/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/snp/snp.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/midi/sequencer.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/sound.h#9 integrate .. //depot/projects/dtrace/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/dtrace/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/dtrace/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehcireg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehcivar.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/hid.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ufoma.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ums.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/dtrace/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/dtrace/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#13 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XEN#1 branch .. //depot/projects/dtrace/src/sys/i386/i386/bpf_jit_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/bpf_jit_machdep.h#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/dump_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/genassym.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/dtrace/src/sys/i386/i386/minidump_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/i386/support.s#9 integrate .. //depot/projects/dtrace/src/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#34 integrate .. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/include/asmacros.h#6 integrate .. //depot/projects/dtrace/src/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/pcpu.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#15 integrate .. //depot/projects/dtrace/src/sys/i386/include/segments.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/trap.h#4 integrate .. //depot/projects/dtrace/src/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/dtrace/src/sys/i386/isa/npx.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_cfgreg.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_pir.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/dtrace/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/dtrace/src/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_poll.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/dtrace/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/dtrace/src/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/dtrace/src/sys/modules/pcn/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/ste/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/tl/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/modules/wb/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/net/bpf_jitter.c#4 integrate .. //depot/projects/dtrace/src/sys/net/bpf_jitter.h#4 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.c#17 integrate .. //depot/projects/dtrace/src/sys/net/if.c#19 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#30 integrate .. //depot/projects/dtrace/src/sys/net/if_ef.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/dtrace/src/sys/net/if_faith.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.c#12 integrate .. //depot/projects/dtrace/src/sys/net/if_loop.c#14 integrate .. //depot/projects/dtrace/src/sys/net/if_mib.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_stf.c#11 integrate .. //depot/projects/dtrace/src/sys/net/if_vlan.c#16 integrate .. //depot/projects/dtrace/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#8 integrate .. //depot/projects/dtrace/src/sys/net/route.c#17 integrate .. //depot/projects/dtrace/src/sys/net/rtsock.c#14 integrate .. //depot/projects/dtrace/src/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#24 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/in.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/in_var.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip6.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#32 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_pfil.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#19 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_var.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#24 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/dtrace/src/sys/netinet6/dest6.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_ipsec.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet6/route6.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/scope6.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#14 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_input.c#11 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_mbuf.c#5 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_output.c#9 integrate .. //depot/projects/dtrace/src/sys/netipsec/key.c#11 integrate .. //depot/projects/dtrace/src/sys/netipsec/key_debug.h#4 integrate .. //depot/projects/dtrace/src/sys/netipsec/keysock.c#10 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_ipip.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/bootp_subr.c#10 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_diskless.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#24 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vnops.c#20 integrate .. //depot/projects/dtrace/src/sys/pci/if_pcn.c#9 delete .. //depot/projects/dtrace/src/sys/pci/if_pcnreg.h#7 delete .. //depot/projects/dtrace/src/sys/pci/if_ste.c#7 delete .. //depot/projects/dtrace/src/sys/pci/if_stereg.h#6 delete .. //depot/projects/dtrace/src/sys/pci/if_tl.c#7 delete .. //depot/projects/dtrace/src/sys/pci/if_tlreg.h#6 delete .. //depot/projects/dtrace/src/sys/pci/if_wb.c#8 delete .. //depot/projects/dtrace/src/sys/pci/if_wbreg.h#6 delete .. //depot/projects/dtrace/src/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/dtrace/src/sys/rpc/authunix_prot.c#5 integrate .. //depot/projects/dtrace/src/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/dtrace/src/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/include/pcpu.h#15 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/dump_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/libkern.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#60 integrate .. //depot/projects/dtrace/src/sys/sys/pcpu.h#19 integrate .. //depot/projects/dtrace/src/sys/sys/types.h#9 integrate .. //depot/projects/dtrace/src/sys/sys/vimage.h#1 branch .. //depot/projects/dtrace/src/sys/vm/vm_page.c#36 integrate .. //depot/projects/dtrace/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/features.c#1 branch .. //depot/projects/dtrace/src/sys/xen/gnttab.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/dtrace/src/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/dtrace/src/tools/regression/bpf/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/bpf_test.c#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0001.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0002.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0003.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0004.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0005.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0006.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0007.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0008.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0009.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0010.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0011.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0012.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0013.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0014.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0015.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0016.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0017.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0018.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0019.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0020.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0021.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0022.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0023.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0024.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0025.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0026.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0027.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0028.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0029.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0030.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0031.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0032.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0033.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0034.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0035.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0036.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0037.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0038.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0039.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0040.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0041.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0042.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0043.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0044.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0045.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0046.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0047.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0048.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0049.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0050.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0051.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0052.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0053.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0054.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0055.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0056.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0057.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0058.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0059.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0060.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0061.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0062.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0063.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0064.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0065.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0066.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0067.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0068.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0069.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0070.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0071.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0072.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0073.h#1 branch .. //depot/projects/dtrace/src/tools/regression/bpf/bpf_filter/tests/test0074.h#1 branch .. //depot/projects/dtrace/src/tools/tools/nanobsd/nanobsd.sh#17 integrate .. //depot/projects/dtrace/src/usr.bin/tar/matching.c#8 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/test_copy.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/test_option_T.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/test_patterns.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/tar/test/test_patterns.tgz.err.uu#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_patterns.tgz.out.uu#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/test/test_patterns.tgz.uu#1 branch .. //depot/projects/dtrace/src/usr.bin/units/units.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/units/units.lib#5 integrate .. //depot/projects/dtrace/src/usr.sbin/iostat/iostat.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/pw/pw_user.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#12 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.h#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/menus.c#13 integrate .. //depot/projects/dtrace/src/usr.sbin/watch/watch.c#5 integrate .. //depot/projects/dtrace/www/en/administration.sgml#8 integrate .. //depot/projects/dtrace/www/en/docproj/who.sgml#4 integrate .. //depot/projects/dtrace/www/en/internal/internal.sgml#6 integrate .. //depot/projects/dtrace/www/en/news/status/report-2004-07-2004-12.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2005-01-2005-03.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2005-03-2005-06.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2005-10-2005-12.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-01-2006-03.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-04-2006-06.xml#3 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-06-2006-10.xml#3 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-10-2006-12.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2007-01-2007-03.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2007-04-2007-06.xml#3 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#8 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/errata.html#3 integrate .. //depot/projects/dtrace/www/en/search/web.atoz#6 integrate .. //depot/projects/dtrace/www/hu/docproj/who.sgml#4 integrate .. //depot/projects/dtrace/www/hu/search/search.sgml#8 integrate .. //depot/projects/dtrace/www/hu/search/web.atoz#7 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#16 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#29 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#23 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.277 2008/08/06 22:03:48 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.278 2008/08/16 21:42:35 pgj Exp $ 1999 @@ -2020,8 +2020,7 @@ someone who manages an overall category of FreeBSD evolution, such as internationalization or networking. See - http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html + url="&url.base;/administration.html"> for more information on this. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/Makefile,v 1.10 2005/09/20 20:55:51 joel Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/Makefile,v 1.11 2008/08/16 22:21:38 pgj Exp $ # # Article: Contributors to FreeBSD @@ -16,12 +16,8 @@ SRCS+= contrib.386bsd.sgml SRCS+= contrib.additional.sgml SRCS+= contrib.committers.sgml -SRCS+= contrib.core.sgml SRCS+= contrib.corealumni.sgml SRCS+= contrib.develalumni.sgml -SRCS+= contrib.docproj.sgml -SRCS+= contrib.staff.sgml -SRCS+= contrib.who.sgml URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/article.sgml#4 (text+ko) ==== @@ -10,7 +10,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.448 2006/09/11 06:49:41 obrien Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.449 2008/08/16 22:21:38 pgj Exp $ &tm-attrib.freebsd; @@ -318,46 +318,6 @@ - - - - The FreeBSD Core Team - - The FreeBSD core team constitutes the project's Board of - Directors, responsible for deciding the project's overall goals - and direction as well as managing specific - areas of the FreeBSD project landscape. - - Primary contact address: - core@FreeBSD.org - - (in alphabetical order by last name): - - &contrib.core; - - - - - - Other &os; Teams - - The &os; project delegates certain individuals to work - on various teams according to project needs. The following - list contains the current information on those individuals and - their designated areas: - - &contrib.staff; - - - - The FreeBSD Developers @@ -369,23 +329,6 @@ &contrib.committers; - - - The FreeBSD Documentation Project - - The FreeBSD - Documentation Project is responsible for a number of different - services, each service being run by an individual and his - deputies (if any): - - &contrib.docproj; - - - - Who is Responsible for What - - &contrib.who; - Core Team Alumni ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#86 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.wes; (2002 - 2008) + + + + &a.imp; (2000 - 2008) + + + &a.markm; (2002 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#21 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -93,9 +93,11 @@ &a.sf; (2000 - 2006) + &a.ue; (2001 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#3 (text+ko) ==== @@ -1,11 +1,7 @@ - + - - - - ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#6 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.79 2007/01/17 07:08:16 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.80 2008/08/16 21:42:36 pgj Exp $ &tm-attrib.freebsd; @@ -1113,8 +1113,8 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html"> - [6] FreeBSD Core-Team - + [6] FreeBSD Core Team + [7] FreeBSD Handbook ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -267,7 +267,7 @@ Any encumbered file requires specific approval from the - Core team before it is added to the + Core Team before it is added to the CVS repository. @@ -298,9 +298,9 @@ Should always be in LINT, but the - Core team decides per case if it + Core Team decides per case if it should be commented out or not. The - Core team can, of course, change + Core Team can, of course, change their minds later on. @@ -317,13 +317,13 @@ core team - The Core team decides if + The Core team decides if the code should be part of make world. - release engineer - The Release Engineer + release engineering + The Release Engineering decides if it goes into the release. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#28 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1097 2008/08/09 23:19:31 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1098 2008/08/16 21:22:24 pgj Exp $ 1995 @@ -1461,7 +1461,7 @@ It has been reported that later IBM BIOS revisions may have reintroduced the bug. This message - from Jacques Vidrine to the &a.mobile; describes a procedure + from &a.nectar; to the &a.mobile; describes a procedure which may work if your newer IBM laptop does not boot &os; properly, and you can upgrade or downgrade the BIOS. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4610,6 +4610,16 @@ &prompt.root; smbpasswd -a username + + Since Samba 3.0.23c, the actual + directory for authentication files is + /usr/local/etc/samba. The + recommended backend is now tdbsam, and the + following command should be used to add user accounts: + + &prompt.root; pdbedit username + + Please see the Official Samba HOWTO ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -322,11 +322,11 @@ Enables logging parameters. When the configuration is working satisfactorily, this line should be reduced - to saying + to saying: - set log phase tun + set log phase tun - in order to avoid excessive log file sizes. + in order to avoid excessive log file sizes. @@ -382,7 +382,7 @@ Note that this command continues onto the next line for readability. Any command in ppp.conf may do this if the last - character on the line is a ``\'' character. + character on the line is a \ character. @@ -421,7 +421,7 @@ Identifies an entry for a provider called provider. This could be changed to the name of your ISP so - that later you can use the + that later you can use the to start the connection. @@ -433,7 +433,7 @@ Sets the phone number for this provider. Multiple phone numbers may be specified using the colon (:) or pipe character - (|)as a separator. The difference + (|) as a separator. The difference between the two separators is described in &man.ppp.8;. To summarize, if you want to rotate through the numbers, use a colon. If you want to always attempt to dial the ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#26 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3446,7 +3446,7 @@ ipfw add 00201 allow log esp from any to any ipfw add 00202 allow log ah from any to any ipfw add 00203 allow log ipencap from any to any -ipfw add 00204 allow log usp from any 500 to any +ipfw add 00204 allow log udp from any 500 to any The rule numbers may need to be altered depending ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#81 (text+ko) ==== @@ -1,7 +1,7 @@ 800043 + + 8.0-CURRENT after the commit of the first step of + the vimage project renaming global variables to be + virtualized with a V_ prefix with macros to map them + back to their global names. + 800044 + ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#5 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -6248,6 +6248,21 @@ &prompt.root; smbpasswd -a felhasználónév + + A Samba a 3.0.23c + verziójától kezdõdõen a + hitelesítéshez szükséges + állományokat a /usr/local/etc/samba + könyvtárban tárolja. A + felhasználói hozzáférések + hozzáadására innentõl már a + tdbsam parancs használata + javasolt: + + &prompt.root; pdbedit felhasználónév + + A hivatalos Samba HOGYAN ezekrõl a @@ -6323,7 +6338,7 @@ &prompt.root; /usr/local/etc/rc.d/samba stop A Samba egy összetett - szoftercsomag, amely a µsoft.windows; + szoftvercsomag, amely a µsoft.windows; hálózatokkal kapcsolatos széles körû együttmûködést tesz lehetõvé. Az általa felkínált ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#4 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -475,8 +475,8 @@ sorban folytatódik. A ppp.conf állományban bármelyik parancs, - ahol a \ karakterrel zárjuk a - sort, az ugyanígy folytatható a + ahol a \ karakterrel zárjuk + a sort, az ugyanígy folytatható a következõben. @@ -529,7 +529,8 @@ bejegyzés. Ezt késõbb akár ki is cserélhetjük az internet-szolgáltatónk nevére, - így a + így a