From owner-p4-projects@FreeBSD.ORG Sun Jul 31 20:42:52 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0A281065673; Sun, 31 Jul 2011 20:42: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 93248106564A for ; Sun, 31 Jul 2011 20:42:51 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 808CC8FC0C for ; Sun, 31 Jul 2011 20:42:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6VKgpUO065623 for ; Sun, 31 Jul 2011 20:42:51 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6VKgpV7065620 for perforce@freebsd.org; Sun, 31 Jul 2011 20:42:51 GMT (envelope-from cnicutar@freebsd.org) Date: Sun, 31 Jul 2011 20:42:51 GMT Message-Id: <201107312042.p6VKgpV7065620@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 196988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2011 20:42:52 -0000 http://p4web.freebsd.org/@@196988?ac=10 Change 196988 by cnicutar@cnicutar_cronos on 2011/07/31 20:42:13 Change the way disconnection is simulated (route blackhole doesn't work for IPv6 routes). Add 2 new IPv6 tests. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/long_uto.c#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/runtest.sh#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/short_uto.c#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.c#3 edit .. //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.h#3 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/long_uto.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ err(EX_OSERR, "fork"); break; case 0: - server_disconnect(saddr, port, caddr, DOWNTIME, UTO, 1); + server_disconnect(saddr, port, DOWNTIME, UTO, 1); exit(EX_OK); break; } ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/runtest.sh#3 (text+ko) ==== @@ -110,6 +110,25 @@ runtest "$addr $PORT" ;; + "5") + name="short_utov6" + bin="short_uto" + client="2001:db80:5::2" + server="2001:db80:5::3" + ipv6="yes" + + test_with_loopback $client $server + ;; + "6") + name="long_utov6" + bin="long_uto" + client="2001:db80:5::2" + server="2001:db80:5::3" + ipv6="yes" + + test_with_loopback $client $server + ;; + esac ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/short_uto.c#3 (text+ko) ==== @@ -49,7 +49,7 @@ err(EX_OSERR, "fork"); break; case 0: - server_disconnect(saddr, port, caddr, DOWNTIME, UTO, 1); + server_disconnect(saddr, port, DOWNTIME, UTO, 1); exit(EX_OK); break; } ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.c#3 (text+ko) ==== @@ -96,9 +96,6 @@ return (rp == NULL) ? -1 : s; } - - - /* * Set UTO values on a socket. */ @@ -168,43 +165,29 @@ return s; } -int -is_v6(char *addr) -{ - return strchr(addr, ':') != NULL; -} /* - * Simulate broken connectivity by setting the "blackhole" flag on a route; - * setting the interface to "down" or deleting the route has unfortunate - * side-effects (sending ARPs etc). + * Simulate broken connectivity by diverting the traffic to an unlistened + * port. */ void -route_down(char *addr) +port_down(char *port) { static char cmd[256]; - - if (is_v6(addr)) - snprintf(cmd, sizeof(cmd), "route change -inet6 %s -blackhole", - addr); - else - snprintf(cmd, sizeof(cmd), "route change -inet %s -blackhole", - addr); + + snprintf(cmd, sizeof(cmd), "ipfw add 00050 divert 5000 tcp from" + " any %s to any", port); + system(cmd); } /* - * Remove the blackhole flag from a route. See the route_down function. + * Remove the rule added by port_down. */ void -route_up(char *addr) +port_up() { - static char cmd[256]; - if (is_v6(addr)) - snprintf(cmd, sizeof(cmd), "route change -inet6 %s", addr); - else - snprintf(cmd, sizeof(cmd), "route change %s", addr); - system(cmd); + system("ipfw delete 00050"); } @@ -216,8 +199,8 @@ * If the connection is dead, write(2) should trigger an EPIPE. */ void -server_disconnect(char *laddr, char *lport, char *downaddr, int downtime, - int send_uto, int recv_uto) +server_disconnect(char *laddr, char *lport, int downtime, int send_uto, + int recv_uto) { int listen_sock; int sock; @@ -233,7 +216,7 @@ /* Take the route down and then attempt to send data. */ if (downtime) - route_down(downaddr); + port_down(lport); bytes = send(sock, &buf, sizeof(buf), MSG_NOSIGNAL); if (bytes < 0) @@ -242,7 +225,7 @@ /* Sleep through downtime and then bring the route back up. */ if (downtime) { sleep(downtime); - route_up(downaddr); + port_up(); } /* Try again. If it succeeds, the connection is still up. */ ==== //depot/projects/soc2011/cnicutar_tcputo_8/src/tools/regression/netinet/tcputo/test_utils.h#3 (text+ko) ==== @@ -10,10 +10,10 @@ void uto_get(int s, int *send_uto, int *recv_uto); int listen_uto(char *laddr, char *port, int send_uto, int recv_uto); int connect_uto(char *laddr, char *raddr, char *rport, int send_uto, int recv_uto); -void route_down(char *addr); -void route_up(char *addr); -void server_disconnect(char *laddr, char *lport, char *downaddr, int downtime, - int send_uto, int recv_uto); +void port_down(char *port); +void port_up(); +void server_disconnect(char *laddr, char *lport, int downtime, int send_uto, + int recv_uto); void client_generic(char *laddr, char *raddr, char *rport, int send_uto, int recv_uto); From owner-p4-projects@FreeBSD.ORG Mon Aug 1 17:08:44 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8012B1065672; Mon, 1 Aug 2011 17:08: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 42BC5106566B for ; Mon, 1 Aug 2011 17:08:44 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 284598FC14 for ; Mon, 1 Aug 2011 17:08:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p71H8ih5011739 for ; Mon, 1 Aug 2011 17:08:44 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p71H8i6N011736 for perforce@freebsd.org; Mon, 1 Aug 2011 17:08:44 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Aug 2011 17:08:44 GMT Message-Id: <201108011708.p71H8i6N011736@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 17:08:44 -0000 http://p4web.freebsd.org/@@197025?ac=10 Change 197025 by rene@rene_acer on 2011/08/01 17:07:56 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#42 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#35 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#23 integrate .. //depot/projects/docproj_nl/www/en/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#41 integrate .. //depot/projects/docproj_nl/www/en/privacy.sgml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#11 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#26 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#42 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.301 2011/07/18 12:57:33 gjb Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.302 2011/08/01 06:51:56 hrs Exp $ 1999 @@ -2186,23 +2186,23 @@ mandate:
- Our 32-bit reference platform is i386, and our 64-bit - reference platform is Sparc64. Major design work (including + Our 32-bit reference platform is &arch.i386;, and our 64-bit + reference platform is &arch.sparc64;. Major design work (including major API and ABI changes) must prove itself on at least one 32-bit and at least one 64-bit platform, preferably the primary reference platforms, before it may be committed to the source tree.
- The i386 and Sparc64 platforms were chosen due to being more + The &arch.i386; and &arch.sparc64; platforms were chosen due to being more readily available to developers and as representatives of more diverse processor and system designs - big vs little endian, register file vs register stack, different DMA and cache implementations, hardware page tables vs software TLB management etc. - The ia64 platform has many of the same complications that - Sparc64 has, but is still limited in availability to + The &arch.ia64; platform has many of the same complications that + &arch.sparc64; has, but is still limited in availability to developers. We will continue to re-evaluate this policy as cost and @@ -2362,7 +2362,7 @@ documents. All relevant integration documentation must also be integrated into the tree, or readily available. - Current Tier 1 platforms are i386, AMD64, and PC98. + Current Tier 1 platforms are &arch.i386; and &arch.amd64;. @@ -2414,7 +2414,7 @@ old. It should be integrated into the FreeBSD documentation. - Current Tier 2 platforms are ARM, PowerPC, ia64, and Sparc64. + Current Tier 2 platforms are &arch.arm;, &arch.ia64;, &arch.pc98;, &arch.powerpc;, and &arch.sparc64;. @@ -2443,7 +2443,7 @@ hardware or emulation environment. This documentation need not be integrated into the FreeBSD tree. - Current Tier 3 platforms are MIPS and &s390;. + Current Tier 3 platforms are &arch.mips; and &s390;. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#35 (text+ko) ==== @@ -1,7 +1,7 @@ + Logo
  • Donations
  • Legal Notices
    • +
  • Privacy Policy
    • '> ]]> ==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#26 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.108 2011/07/14 16:52:21 arved Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.109 2011/08/01 15:23:11 jkois Exp $ @@ -611,6 +611,17 @@ + + The Raleigh BSD Users Group + http://www.raleighbug.org/ + The Raleigh BSD Users group welcomes all BSD users + of the Raleigh, NC area. The purpose of the group is to + exchange ideas and learn about Unix. Please visit our website for + more information. + + + The Sacramento BSD and Linux Users Group (SacBLUG) http://sacblug.org/ From owner-p4-projects@FreeBSD.ORG Mon Aug 1 21:32:05 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F10A1065675; Mon, 1 Aug 2011 21:32: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 30CCD106564A for ; Mon, 1 Aug 2011 21:32:05 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1BF418FC25 for ; Mon, 1 Aug 2011 21:32:05 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p71LW4WE066029 for ; Mon, 1 Aug 2011 21:32:04 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p71LW4Pr066026 for perforce@freebsd.org; Mon, 1 Aug 2011 21:32:04 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 1 Aug 2011 21:32:04 GMT Message-Id: <201108012132.p71LW4Pr066026@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 21:32:05 -0000 http://p4web.freebsd.org/@@197034?ac=10 Change 197034 by ilya@ilya_triton2011 on 2011/08/01 21:31:52 Use fuse-freebsd name instead of fuse4bsd. fuse4bsd is not used anywhere and may be confusing Clean Makefile, remove disabled definitions. opt_global.h is included automatically if available. Remove config.h Wrap long lines in mount_fusefs Rename fuse_module directory to fuse Affected files ... .. //depot/projects/soc2011/ilya_fuse/Makefile#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/Makefile#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/config.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_device.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_kernel.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_main.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_param.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_version.h#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vfsops.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#1 move/add .. //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#12 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/config.h#3 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#16 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#15 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#14 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.h#6 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#20 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#20 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#21 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#12 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#16 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#17 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_kernel.h#3 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#10 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#22 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#21 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_param.h#5 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#25 move/delete .. //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#45 move/delete .. //depot/projects/soc2011/ilya_fuse/include/fuse4bsd.h#2 move/delete .. //depot/projects/soc2011/ilya_fuse/mount_fusefs/Makefile#2 edit .. //depot/projects/soc2011/ilya_fuse/mount_fusefs/mount_fusefs.8#2 edit .. //depot/projects/soc2011/ilya_fuse/mount_fusefs/mount_fusefs.c#2 edit Moved files ... .. //depot/projects/soc2011/ilya_fuse/fuse/Makefile#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/Makefile#11 .. //depot/projects/soc2011/ilya_fuse/fuse/config.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/config.h#2 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse.h#15 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_device.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_device.c#14 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.c#13 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_file.h#5 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.c#19 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_internal.h#19 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.c#20 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_io.h#11 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.c#15 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_ipc.h#16 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_kernel.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_kernel.h#2 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_main.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_main.c#9 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.c#21 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_node.h#20 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_param.h#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_param.h#4 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_version.h#1 moved from //depot/projects/soc2011/ilya_fuse/include/fuse4bsd.h#1 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vfsops.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vfsops.c#24 .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#1 moved from //depot/projects/soc2011/ilya_fuse/fuse_module/fuse_vnops.c#44 Differences ... ==== //depot/projects/soc2011/ilya_fuse/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -SUBDIR = fuse_module mount_fusefs +SUBDIR = fuse mount_fusefs .include ==== //depot/projects/soc2011/ilya_fuse/fuse/Makefile#1 (text+ko) ==== @@ -1,7 +1,5 @@ -.undef KERNCONF +KMOD= fuse -.include "../Makefile.common" - SRCS= fuse.h \ fuse_kernel.h \ fuse_device.c \ @@ -20,19 +18,7 @@ fuse_vnops.c \ vnode_if.h -CFLAGS+= -I../include -DEBUG_FLAGS+= -g -DFUSE_DEBUG_VNOPS=1 - -.if defined(KERNCONF) -KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g' -KRNLOBJDIR!= make -C /usr/src -f /usr/src/Makefile.inc1 -V KRNLOBJDIR -KERNCONFDIR= ${KRNLOBJDIR}/${KERNCONF1} -.endif - -.if defined(KERNCONFDIR) -CFLAGS+= -DKERNCONFDIR="\"${KERNCONFDIR}\"" -I${KERNCONFDIR} -.endif - -KMOD=fuse +DEBUG_FLAGS+= -g +# -DFUSE_DEBUG_VNOPS=1 -DFUSE_DEBUG_IPC=1 -DFUSE_DEBUG_VFSOPS=1 .include ==== //depot/projects/soc2011/ilya_fuse/fuse/config.h#1 (text+ko) ==== @@ -1,3 +1,0 @@ -#ifdef KERNCONFDIR -#include -#endif ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse.h#1 (text+ko) ==== @@ -3,7 +3,7 @@ * and debugging. */ -#include "fuse4bsd.h" +#include "fuse_version.h" #include "fuse_kernel.h" #define FUSE_DEFAULT_DAEMON_TIMEOUT 60 /* s */ ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_device.c#1 (text+ko) ==== @@ -2,8 +2,6 @@ * I/O methods for fuse devices. */ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_internal.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.c#1 (text+ko) ==== @@ -1,5 +1,3 @@ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include @@ -51,8 +49,8 @@ static fuse_handler_t fuse_standard_handler; SYSCTL_NODE(_vfs, OID_AUTO, fuse, CTLFLAG_RW, 0, "FUSE tunables"); -SYSCTL_STRING(_vfs_fuse, OID_AUTO, fuse4bsd_version, CTLFLAG_RD, - FUSE4BSD_VERSION, 0, "fuse4bsd version"); +SYSCTL_STRING(_vfs_fuse, OID_AUTO, version, CTLFLAG_RD, + FUSE_FREEBSD_VERSION, 0, "fuse-freebsd version"); static int fuse_ticket_count = 0; SYSCTL_INT(_vfs_fuse, OID_AUTO, ticket_count, CTLFLAG_RW, &fuse_ticket_count, 0, "number of allocated tickets"); ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_kernel.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_main.c#1 (text+ko) ==== @@ -2,8 +2,6 @@ * Module load/unload stuff. */ -#include "config.h" - #include #include #include @@ -92,13 +90,9 @@ if ((err = vfs_modevent(NULL, what, &fuse_vfsconf))) fuse_bringdown(eh_tag); else - printf("fuse4bsd: version %s, FUSE ABI %d.%d\n" -#ifdef KERNCONFDIR - "fuse4bsd: compiled against kernel config " - KERNCONFDIR "\n" -#endif - , FUSE4BSD_VERSION, - FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); + printf("fuse-freebsd: version %s, FUSE ABI %d.%d\n", + FUSE_FREEBSD_VERSION, + FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); break; case MOD_UNLOAD: ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_param.h#1 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_version.h#1 (text+ko) ==== @@ -1,3 +1,3 @@ -#ifndef FUSE4BSD_VERSION -#define FUSE4BSD_VERSION "0.3.9-pre1" +#ifndef FUSE_FREEBSD_VERSION +#define FUSE_FREEBSD_VERSION "0.4.2" #endif ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_vfsops.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include @@ -209,11 +207,12 @@ if (vfs_scanopt(opts, "max_read=", "%u", &max_read) == 1) max_read_set = 1; if (vfs_scanopt(opts, "timeout=", "%u", &daemon_timeout) == 1) { - if (daemon_timeout < FUSE_MIN_DAEMON_TIMEOUT) - daemon_timeout = FUSE_MIN_DAEMON_TIMEOUT; - else if (daemon_timeout > FUSE_MAX_DAEMON_TIMEOUT) - daemon_timeout = FUSE_MAX_DAEMON_TIMEOUT; - data->daemon_timeout = daemon_timeout; + if (daemon_timeout < FUSE_MIN_DAEMON_TIMEOUT) + daemon_timeout = FUSE_MIN_DAEMON_TIMEOUT; + else if (daemon_timeout > FUSE_MAX_DAEMON_TIMEOUT) + daemon_timeout = FUSE_MAX_DAEMON_TIMEOUT; + } else { + daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT; } subtype = vfs_getopts(opts, "subtype=", &err); err = 0; @@ -259,6 +258,7 @@ data->mp = mp; data->dataflags |= mntopts; data->max_read = max_read; + data->daemon_timeout = daemon_timeout; #ifdef XXXIP if (!priv_check(td, PRIV_VFS_FUSE_SYNC_UNMOUNT)) data->dataflags |= FSESS_CAN_SYNC_UNMOUNT; ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#1 (text+ko) ==== @@ -3,8 +3,6 @@ * Amit Singh */ -#include "config.h" - #include #include #include ==== //depot/projects/soc2011/ilya_fuse/mount_fusefs/Makefile#2 (text+ko) ==== @@ -1,16 +1,13 @@ # $FreeBSD$ -.include "../Makefile.common" +PROG= mount_fusefs +SRCS= mount_fusefs.c getmntopts.c +MAN8= mount_fusefs.8 +NO_MANCOMPRESS?= yes -PROG = mount_fusefs -SRCS = mount_fusefs.c getmntopts.c -MAN8 = mount_fusefs.8 -NO_MANCOMPRESS?= yes - # mount_fusefs needs mntopts.h and getmntopts.c from src/sbin/mount/ -MOUNT ?= /usr/src/sbin/mount -CFLAGS += -I${MOUNT} -I../include - +MOUNT?= /usr/src/sbin/mount +CFLAGS+= -I${MOUNT} -I../fuse .PATH: ${MOUNT} .include ==== //depot/projects/soc2011/ilya_fuse/mount_fusefs/mount_fusefs.8#2 (text+ko) ==== ==== //depot/projects/soc2011/ilya_fuse/mount_fusefs/mount_fusefs.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2005 Jean-Sébastien Pédron - * Copyright (c) 2005 Csaba Henk + * Copyright (c) 2005 Csaba Henk * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,13 +46,14 @@ #include #include -#include "fuse4bsd.h" +#include "fuse_version.h" #include "mntopts.h" -void __usage_short(void); +void usage_short(void); void usage(void); void helpmsg(void); void showversion(void); +int init_backgrounded(void); struct mntopt mopts[] = { #define ALTF_PRIVATE 0x01 @@ -92,8 +93,6 @@ { 0, NULL, 0 } }; -char *progname; - #define DEFAULT_MOUNT_FLAGS ALTF_PRIVATE | ALTF_SYNC_UNMOUNT int @@ -126,8 +125,6 @@ char *ep; char *daemon = NULL, *daemon_opts = NULL; - progname = argv[0]; - /* * We want a parsing routine which is not sensitive to * the position of args/opts; it should extract the @@ -215,7 +212,7 @@ errx(1, "mount path specified inconsistently"); diro = optarg; break; - case 'v': + case 'v': verbose = 1; break; case 'h': @@ -232,7 +229,8 @@ } if (done) break; - } while ((ch = getopt_long(argc, argv, "AvVho:SD:O:s:m:", longopts, NULL)) != -1); + } while ((ch = getopt_long(argc, argv, "AvVho:SD:O:s:m:", longopts, + NULL)) != -1); argc -= optind; argv += optind; @@ -242,7 +240,8 @@ errx(1, "special specified inconsistently"); dev = devo; } else if (diro) - errx(1, "if mountpoint is given via an option, special should also be given via an option"); + errx(1, "if mountpoint is given via an option, " + "special should also be given via an option"); if (diro) { if (dir) @@ -275,19 +274,22 @@ * negative of allow_other: if this is set, * allow_other is blocked, period. */ - errx(1, "\"allow_other\" usage is banned by respective option"); + errx(1, "\"allow_other\" usage is banned by " + "respective option"); for (mv = mvals; mv->mv_flag; ++mv) { if (mo->m_flag != mv->mv_flag) continue; if (mv->mv_value) { - build_iovec(&iov, &iovlen, mo->m_option, mv->mv_value, mv->mv_len); + build_iovec(&iov, &iovlen, mo->m_option, + mv->mv_value, mv->mv_len); iov_done = 1; break; } } if (! iov_done) - build_iovec(&iov, &iovlen, mo->m_option, "", -1); + build_iovec(&iov, &iovlen, mo->m_option, + "", -1); } if (__altflags & mo->m_flag) { char *uscore_opt; @@ -320,7 +322,8 @@ if (strcmp(dev, "/dev/fuse") == 0) { if (! (argc > 0 || daemon)) { - fprintf(stderr, "Please also specify the fuse daemon to run when mounting via the multiplexer!\n"); + fprintf(stderr, "Please also specify the fuse daemon " + "to run when mounting via the multiplexer!\n"); usage(); } if ((fd = open(dev, O_RDWR)) < 0) @@ -359,7 +362,7 @@ if (fd < 0 && (fd = open(dev, O_RDWR)) < 0) err(1, "failed to open fuse device"); - + if (asprintf(&fds, "%d", fd) == -1) err(1, "failed to allocate memory"); setenv("FUSE_DEV_FD", fds, 1); @@ -419,10 +422,11 @@ } void -__usage_short(void) { +usage_short(void) { fprintf(stderr, - "usage:\n%s [-A|-S|-v|-V|-h|-D daemon|-O args|-s special|-m node|-o option...] special node [daemon args...]\n\n", - basename(progname)); + "usage:\n%s [-A|-S|-v|-V|-h|-D daemon|-O args|-s special|-m node|" + "-o option...] special node [daemon args...]\n\n", + basename(getprogname())); } void @@ -430,13 +434,13 @@ { struct mntopt *mo; - __usage_short(); + usage_short(); fprintf(stderr, "known options:\n"); for (mo = mopts; mo->m_flag; ++mo) fprintf(stderr, "\t%s\n", mo->m_option); - fprintf(stderr, "\n(use -h for a detailed description of these options)\n"); + fprintf(stderr, "\n(use -h for a detailed description of options)\n"); exit(EX_USAGE); } @@ -444,7 +448,7 @@ helpmsg(void) { if (! getenv("MOUNT_FUSEFS_CALL_BY_LIB")) { - __usage_short(); + usage_short(); fprintf(stderr, "description of options:\n"); } @@ -465,7 +469,7 @@ " -o max_read=N set maximum size of read requests\n" " -o noprivate allow secondary mounting of the filesystem\n" " -o neglect_shares don't report EBUSY when unmount attempted\n" - " in presence of secondary mounts\n" + " in presence of secondary mounts\n" " -o push_symlinks_in prefix absolute symlinks with mountpoint\n" " -o sync_unmount do unmount synchronously\n" ); @@ -475,7 +479,7 @@ void showversion(void) { - puts("mount_fusefs [fuse4bsd] version: " FUSE4BSD_VERSION); + puts("mount_fusefs fuse-freebsd version: " FUSE_FREEBSD_VERSION); exit(EX_USAGE); } From owner-p4-projects@FreeBSD.ORG Mon Aug 1 21:37:34 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76FF4106566C; Mon, 1 Aug 2011 21:37:34 +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 38D43106564A for ; Mon, 1 Aug 2011 21:37:34 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1D6D68FC0A for ; Mon, 1 Aug 2011 21:37:34 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p71LbYIU066545 for ; Mon, 1 Aug 2011 21:37:34 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p71LbXxZ066542 for perforce@freebsd.org; Mon, 1 Aug 2011 21:37:33 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 1 Aug 2011 21:37:33 GMT Message-Id: <201108012137.p71LbXxZ066542@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 21:37:34 -0000 http://p4web.freebsd.org/@@197036?ac=10 Change 197036 by ilya@ilya_triton2011 on 2011/08/01 21:36:33 Use per file system rename lock Print 'filehandle not valid' message only if it's meaningful Correct setparent in rename, clear node parent reference Invalidate buffers for revoked vnode, flush buffers only for files Add reclaim_revoked sysctl Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.c#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.c#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.c#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#2 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#2 (text+ko) ==== @@ -50,11 +50,11 @@ int oflags = 0; int op = FUSE_OPEN; - fuse_trace_printf("fuse_filehandle_get(vp=%p, fufh_type=%d)\n", + fuse_trace_printf("fuse_filehandle_open(vp=%p, fufh_type=%d)\n", vp, fufh_type); if (fuse_filehandle_valid(vp, fufh_type)) { - panic("FUSE: filehandle_get called despite valid fufh (type=%d)", + panic("FUSE: filehandle_open called despite valid fufh (type=%d)", fufh_type); /* NOTREACHED */ } @@ -173,10 +173,8 @@ struct fuse_filehandle *fufh; fufh = &(fvdat->fufh[fufh_type]); - if (!FUFH_IS_VALID(fufh)) { - printf("FUSE: filehandle is not valid (type=%d)\n", fufh_type); + if (!FUFH_IS_VALID(fufh)) return EBADF; - } if (fufhp != NULL) *fufhp = fufh; return 0; ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_io.c#2 (text+ko) ==== @@ -65,7 +65,7 @@ err = fuse_filehandle_getrw(vp, (uio->uio_rw == UIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh); if (err) { - DEBUG("fetching filehandle failed\n"); + printf("FUSE: io dispatch: filehandles are closed\n"); return err; } @@ -562,7 +562,7 @@ error = fuse_filehandle_getrw(vp, (bp->b_iocmd == BIO_READ) ? FUFH_RDONLY : FUFH_WRONLY, &fufh); if (error) { - DEBUG("fetching filehandle failed\n"); + printf("FUSE: strategy: filehandles are closed\n"); bp->b_ioflags |= BIO_ERROR; bp->b_error = error; return (error); ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.c#2 (text+ko) ==== @@ -346,10 +346,7 @@ TAILQ_INIT(&data->aw_head); data->daemoncred = crhold(cred); data->daemon_timeout = FUSE_DEFAULT_DAEMON_TIMEOUT; - -#ifdef FUSE_EXPLICIT_RENAME_LOCK sx_init(&data->rename_lock, "fuse rename lock"); -#endif return data; } @@ -376,9 +373,7 @@ /* Driving off stage all that stuff thrown at device... */ mtx_destroy(&data->ms_mtx); mtx_destroy(&data->aw_mtx); -#ifdef FUSE_EXPLICIT_RENAME_LOCK sx_destroy(&data->rename_lock); -#endif crfree(data->daemoncred); ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_ipc.h#2 (text+ko) ==== @@ -138,9 +138,7 @@ u_long ticketer; -#ifdef FUSE_EXPLICIT_RENAME_LOCK struct sx rename_lock; -#endif uint32_t fuse_libabi_major; uint32_t fuse_libabi_minor; ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.c#2 (text+ko) ==== @@ -192,7 +192,7 @@ return err; } - if (dvp != NULL && vnode_vtype(*vpp) == VDIR) { + if (dvp != NULL) { MPASS((cnp->cn_flags & ISDOTDOT) == 0); MPASS(!(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')); fuse_vnode_setparent(*vpp, dvp); ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_node.h#2 (text+ko) ==== @@ -76,7 +76,7 @@ static __inline void fuse_vnode_setparent(struct vnode *vp, struct vnode *dvp) { - if (vp->v_type == VDIR) { + if (dvp != NULL && vp->v_type == VDIR) { MPASS(dvp->v_type == VDIR); VTOFUD(vp)->parent_nid = VTOI(dvp); } ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#2 (text+ko) ==== @@ -122,6 +122,10 @@ SYSCTL_INT(_vfs_fuse, OID_AUTO, lookup_cache_enable, CTLFLAG_RW, &fuse_lookup_cache_enable, 0, ""); +static int fuse_reclaim_revoked = 1; +SYSCTL_INT(_vfs_fuse, OID_AUTO, reclaim_revoked, CTLFLAG_RW, + &fuse_reclaim_revoked, 0, ""); + int fuse_pbuf_freecnt = -1; #if __FreeBSD_version >= 900011 @@ -551,11 +555,12 @@ for (type = 0; type < FUFH_MAXTYPE; type++) { fufh = &(fvdat->fufh[type]); if (FUFH_IS_VALID(fufh)) { - if (need_flush) { + if (need_flush && vp->v_type == VREG) { if ((VTOFUD(vp)->flag & FN_SIZECHANGE) != 0) { fuse_vnode_savesize(vp, NULL); } - if (fuse_data_cache_invalidate) + if (fuse_data_cache_invalidate || + (fvdat->flag & FN_REVOKED) != 0) fuse_io_invalbuf(vp, td); else fuse_io_flushbuf(vp, MNT_WAIT, td); @@ -565,7 +570,7 @@ } } - if ((fvdat->flag & FN_REVOKED) != 0) { + if ((fvdat->flag & FN_REVOKED) != 0 && fuse_reclaim_revoked) { vrecycle(vp, td); } @@ -935,9 +940,7 @@ if (err) { goto out; } - if (vnode_vtype(vp) == VDIR) { - fuse_vnode_setparent(vp, dvp); - } + fuse_vnode_setparent(vp, dvp); *vpp = vp; } @@ -1349,6 +1352,7 @@ fvdat->nlookup); } + fuse_vnode_setparent(vp, NULL); cache_purge(vp); vfs_hash_remove(vp); vnode_destroy_vobject(vp); @@ -1415,6 +1419,7 @@ struct vnode *tdvp = ap->a_tdvp; struct vnode *tvp = ap->a_tvp; struct componentname *tcnp = ap->a_tcnp; + struct fuse_data *data; int err = 0; @@ -1442,17 +1447,21 @@ * under the source directory in the file system tree. * Linux performs this check at VFS level. */ + data = fuse_get_mpdata(vnode_mount(tdvp)); + sx_xlock(&data->rename_lock); err = fuse_internal_rename(fdvp, fcnp, tdvp, tcnp); - if (err == 0) { fuse_invalidate_attr(fdvp); if (tdvp != fdvp) { + fuse_vnode_setparent(fvp, tdvp); fuse_invalidate_attr(tdvp); } + if (tvp != NULL) + fuse_vnode_setparent(tvp, NULL); } + sx_unlock(&data->rename_lock); if (tvp != NULL && tvp != fvp) { - fuse_vnode_setparent(tvp, tdvp); cache_purge(tvp); } From owner-p4-projects@FreeBSD.ORG Mon Aug 1 21:39:46 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F878106566C; Mon, 1 Aug 2011 21:39: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 12410106564A for ; Mon, 1 Aug 2011 21:39:46 +0000 (UTC) (envelope-from ilya@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F3BE48FC08 for ; Mon, 1 Aug 2011 21:39:45 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p71LdjSj066594 for ; Mon, 1 Aug 2011 21:39:45 GMT (envelope-from ilya@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p71Ldjcb066591 for perforce@freebsd.org; Mon, 1 Aug 2011 21:39:45 GMT (envelope-from ilya@FreeBSD.org) Date: Mon, 1 Aug 2011 21:39:45 GMT Message-Id: <201108012139.p71Ldjcb066591@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ilya@FreeBSD.org using -f From: Ilya Putsikau To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 21:39:46 -0000 http://p4web.freebsd.org/@@197037?ac=10 Change 197037 by ilya@ilya_triton2011 on 2011/08/01 21:38:48 Fix file close-release race Make fuse_filehandle_close foreground only Change version to 0.4.3 Affected files ... .. //depot/projects/soc2011/ilya_fuse/fuse/fuse.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#3 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_version.h#2 edit .. //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#3 edit Differences ... ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse.h#2 (text+ko) ==== @@ -162,10 +162,5 @@ __STRING(mtx), __func__, __LINE__, curthread->td_proc->p_pid); \ } while (0) -typedef enum fuse_op_waitfor { - FUSE_OP_BACKGROUNDED = 0, - FUSE_OP_FOREGROUNDED = 1, -} fuse_op_waitfor_t; - void fuse_ipc_init(void); void fuse_ipc_destroy(void); ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.c#3 (text+ko) ==== @@ -101,8 +101,7 @@ fuse_filehandle_close(struct vnode *vp, fufh_type_t fufh_type, struct thread *td, - struct ucred *cred, - fuse_op_waitfor_t waitfor) + struct ucred *cred) { struct fuse_dispatcher fdi; struct fuse_release_in *fri; @@ -138,12 +137,7 @@ fri->fh = fufh->fh_id; fri->flags = fuse_filehandle_xlate_to_oflags(fufh_type); - if (waitfor == FUSE_OP_FOREGROUNDED) { - err = fdisp_wait_answ(&fdi); - } else { - fuse_insert_callback(fdi.tick, NULL); - fuse_insert_message(fdi.tick); - } + err = fdisp_wait_answ(&fdi); fdisp_destroy(&fdi); out: ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_file.h#2 (text+ko) ==== @@ -96,7 +96,6 @@ struct fuse_filehandle **fufhp, struct thread *td, struct ucred *cred); int fuse_filehandle_close(struct vnode *vp, fufh_type_t fufh_type, - struct thread *td, struct ucred *cred, - fuse_op_waitfor_t waitfor); + struct thread *td, struct ucred *cred); #endif /* _FUSE_FILE_H_ */ ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_version.h#2 (text+ko) ==== @@ -1,3 +1,3 @@ #ifndef FUSE_FREEBSD_VERSION -#define FUSE_FREEBSD_VERSION "0.4.2" +#define FUSE_FREEBSD_VERSION "0.4.3" #endif ==== //depot/projects/soc2011/ilya_fuse/fuse/fuse_vnops.c#3 (text+ko) ==== @@ -566,7 +566,7 @@ fuse_io_flushbuf(vp, MNT_WAIT, td); need_flush = 0; } - fuse_filehandle_close(vp, type, td, NULL, FUSE_OP_BACKGROUNDED); + fuse_filehandle_close(vp, type, td, NULL); } } @@ -1260,8 +1260,7 @@ fiov_teardown(&cookediov); if (freefufh) { - fuse_filehandle_close(vp, FUFH_RDONLY, NULL, cred, - FUSE_OP_FOREGROUNDED); + fuse_filehandle_close(vp, FUFH_RDONLY, NULL, cred); } return err; @@ -1343,7 +1342,7 @@ if (FUFH_IS_VALID(fufh)) { printf("FUSE: vnode being reclaimed but fufh (type=%d) is valid", type); - fuse_filehandle_close(vp, type, td, NULL, FUSE_OP_BACKGROUNDED); + fuse_filehandle_close(vp, type, td, NULL); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 2 11:56:23 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 944871065673; Tue, 2 Aug 2011 11: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 2EB91106566C for ; Tue, 2 Aug 2011 11:56:23 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1AE8D8FC08 for ; Tue, 2 Aug 2011 11:56:23 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p72BuMig045925 for ; Tue, 2 Aug 2011 11:56:22 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p72BuMSO045922 for perforce@freebsd.org; Tue, 2 Aug 2011 11:56:22 GMT (envelope-from cnicutar@freebsd.org) Date: Tue, 2 Aug 2011 11:56:22 GMT Message-Id: <201108021156.p72BuMSO045922@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 11:56:23 -0000 http://p4web.freebsd.org/@@197066?ac=10 Change 197066 by cnicutar@cnicutar_cronos on 2011/08/02 11:56:07 IF HEAD @197061 Submitted by: cnicutar Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/COPYRIGHT#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/LOCKS#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/MAINTAINERS#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/Makefile.inc1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/Makefile.mips#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/ObsoleteFiles.inc#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/README#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/UPDATING#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/config.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/csh/iconv_stub.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/date.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/date.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/vary.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/date/vary.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/args.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/position.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/df/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/df/df.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/df/df.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/README#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/io.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/main.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/re.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/README#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/print.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ls/util.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/options.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/options.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pkill/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pkill/pkill.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pkill/pkill.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/print.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwait/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwait/pwait.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwait/pwait.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/arith_yacc.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/arith_yacc.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/arith_yylex.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/error.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/error.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/init.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/input.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/input.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/main.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/main.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/options.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/options.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/output.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/output.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/show.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/show.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/var.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sh/var.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/key.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/print.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/stty/util.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/test/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/test/test.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/test/test.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/Makefile#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/Makefile.inc#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/sha2.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/thread_pool.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/dtracetoolkit/dtruss#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.lowfrequency.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.malformedoverflow.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.nonexistentevent.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart1.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart2.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackterminates.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.toomanyenablings.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.allcpus.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.genericevent.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.platformevent.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/soc2011/cnicutar_tcputo_9/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 2 18:34:57 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31E7E1065675; Tue, 2 Aug 2011 18:34: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 E7F6C1065673 for ; Tue, 2 Aug 2011 18:34:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D41E08FC14 for ; Tue, 2 Aug 2011 18:34:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p72IYuSf027517 for ; Tue, 2 Aug 2011 18:34:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p72IYuSn027514 for perforce@freebsd.org; Tue, 2 Aug 2011 18:34:56 GMT (envelope-from jhb@freebsd.org) Date: Tue, 2 Aug 2011 18:34:56 GMT Message-Id: <201108021834.p72IYuSn027514@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 18:34:57 -0000 http://p4web.freebsd.org/@@197083?ac=10 Change 197083 by jhb@jhb_jhbbsd on 2011/08/02 18:34:46 IFC @197082 Affected files ... .. //depot/projects/pci/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/pci/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/pci/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/pci/sys/cam/ata/ata_da.c#5 integrate .. //depot/projects/pci/sys/cam/cam_periph.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/pci/sys/conf/NOTES#7 integrate .. //depot/projects/pci/sys/conf/newvers.sh#3 integrate .. //depot/projects/pci/sys/conf/options#9 integrate .. //depot/projects/pci/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/pci/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/pci/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_dfs/null/dfs_null.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah.h#7 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_desc.h#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom.h#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_9287.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v14.h#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416.h#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#4 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#6 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#5 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#7 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280.c#3 integrate .. //depot/projects/pci/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#6 integrate .. //depot/projects/pci/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/pci/sys/dev/ath/if_ath_sysctl.c#6 integrate .. //depot/projects/pci/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/pci/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/pci/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/pci/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/pci/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/pci/sys/dev/re/if_re.c#3 integrate .. //depot/projects/pci/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/pci/sys/fs/cd9660/iso.h#2 integrate .. //depot/projects/pci/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clvnops.c#6 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfsnode.h#3 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdserv.c#5 integrate .. //depot/projects/pci/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/pci/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/pci/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/pci/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/pci/sys/kern/kern_conf.c#3 integrate .. //depot/projects/pci/sys/kern/kern_jail.c#5 integrate .. //depot/projects/pci/sys/kern/kern_linker.c#4 integrate .. //depot/projects/pci/sys/kern/kern_lock.c#2 integrate .. //depot/projects/pci/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/pci/sys/kern/subr_smp.c#6 integrate .. //depot/projects/pci/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/pci/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/pci/sys/mips/mips/exception.S#3 integrate .. //depot/projects/pci/sys/net/if_lagg.c#5 integrate .. //depot/projects/pci/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/pci/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/pci/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/pci/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/pci/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/pci/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/pci/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/pci/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/pci/sys/powerpc/aim/locore32.S#5 integrate .. //depot/projects/pci/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/pci/sys/powerpc/booke/platform_bare.c#3 integrate .. //depot/projects/pci/sys/powerpc/booke/pmap.c#4 integrate .. //depot/projects/pci/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/pci/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/pci/sys/powerpc/powermac/fcu.c#4 integrate .. //depot/projects/pci/sys/sys/mount.h#3 integrate .. //depot/projects/pci/sys/sys/systm.h#7 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/pci/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/pci/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/pci/sys/vm/device_pager.c#4 integrate .. //depot/projects/pci/sys/vm/swap_pager.c#4 integrate .. //depot/projects/pci/sys/vm/swap_pager.h#2 integrate Differences ... ==== //depot/projects/pci/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.751 2011/06/08 08:12:15 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.752 2011/07/30 13:33:05 bz Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1309,7 +1309,7 @@ { int i, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; - u_long physmem_tunable; + u_long physmem_tunable, memtest, tmpul; pt_entry_t *pte; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; @@ -1372,6 +1372,14 @@ Maxmem = atop(physmem_tunable); /* + * By default keep the memtest enabled. Use a general name so that + * one could eventually do more with the code than just disable it. + */ + memtest = 1; + if (TUNABLE_ULONG_FETCH("hw.memtest.tests", &tmpul)) + memtest = tmpul; + + /* * Don't allow MAXMEM or hw.physmem to extend the amount of memory * in the system. */ @@ -1433,6 +1441,8 @@ goto do_dump_avail; page_bad = FALSE; + if (memtest == 0) + goto skip_memtest; /* * map page into kernel: valid, read/write,non-cacheable @@ -1470,6 +1480,7 @@ */ *(int *)ptr = tmp; +skip_memtest: /* * Adjust array of valid/good pages. */ ==== //depot/projects/pci/sys/arm/arm/irq_dispatch.S#3 (text+ko) ==== @@ -72,7 +72,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.5 2011/07/18 15:19:40 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/irq_dispatch.S,v 1.6 2011/08/02 17:49:27 attilio Exp $"); /* * irq_entry: @@ -109,9 +109,9 @@ _C_LABEL(intrcnt): .space NIRQ * 4 _C_LABEL(sintrnames): - .word NIRQ * (MAXCOMLEN + 1) + .int NIRQ * (MAXCOMLEN + 1) _C_LABEL(sintrcnt): - .word NIRQ * 4 + .int NIRQ * 4 .global _C_LABEL(current_intr_depth) _C_LABEL(current_intr_depth): ==== //depot/projects/pci/sys/arm/sa11x0/sa11x0_irq.S#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.5 2011/07/18 15:19:40 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irq.S,v 1.6 2011/08/02 17:49:27 attilio Exp $"); Lcurrent_intr_depth: .word _C_LABEL(current_intr_depth) @@ -122,7 +122,7 @@ .global _C_LABEL(intrnames), _C_LABEL(sintrnames) _C_LABEL(intrnames): _C_LABEL(sintrnames): - .word 0 + .int 0 .globl _C_LABEL(intrcnt), _C_LABEL(sintrcnt) ==== //depot/projects/pci/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.157 2011/04/13 12:19:03 pluknet Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.158 2011/07/25 21:52:17 rodrigc Exp $ ############################################################## ### Basic configuration options ############################ @@ -55,6 +55,11 @@ #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem +#tftp.blksize="1428" # Set the RFC 2348 TFTP block size. + # If the TFTP server does not support RFC 2348, + # the block size is set to 512. If the value + # is out of range ( < 8 || > 9008 ) an error is + # returned. ############################################################## ==== //depot/projects/pci/sys/cam/ata/ata_da.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.35 2011/06/18 22:26:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.38 2011/07/30 21:42:53 mav Exp $"); #include "opt_ada.h" #include "opt_ata.h" @@ -69,6 +69,7 @@ #define ATA_MAX_28BIT_LBA 268435455UL typedef enum { + ADA_STATE_RAHEAD, ADA_STATE_WCACHE, ADA_STATE_NORMAL } ada_state; @@ -94,7 +95,8 @@ } ada_quirks; typedef enum { - ADA_CCB_WCACHE = 0x01, + ADA_CCB_RAHEAD = 0x01, + ADA_CCB_WCACHE = 0x02, ADA_CCB_BUFFER_IO = 0x03, ADA_CCB_WAITING = 0x04, ADA_CCB_DUMP = 0x05, @@ -132,6 +134,7 @@ int outstanding_cmds; int trim_max_ranges; int trim_running; + int read_ahead; int write_cache; #ifdef ADA_TEST_FAILURE int force_read_error; @@ -294,10 +297,19 @@ #define ADA_DEFAULT_SPINDOWN_SUSPEND 1 #endif +#ifndef ADA_DEFAULT_READ_AHEAD +#define ADA_DEFAULT_READ_AHEAD 1 +#endif + #ifndef ADA_DEFAULT_WRITE_CACHE #define ADA_DEFAULT_WRITE_CACHE 1 #endif +#define ADA_RA (softc->read_ahead >= 0 ? \ + softc->read_ahead : ada_read_ahead) +#define ADA_WC (softc->write_cache >= 0 ? \ + softc->write_cache : ada_write_cache) + /* * Most platforms map firmware geometry to actual, but some don't. If * not overridden, default to nothing. @@ -312,6 +324,7 @@ static int ada_send_ordered = ADA_DEFAULT_SEND_ORDERED; static int ada_spindown_shutdown = ADA_DEFAULT_SPINDOWN_SHUTDOWN; static int ada_spindown_suspend = ADA_DEFAULT_SPINDOWN_SUSPEND; +static int ada_read_ahead = ADA_DEFAULT_READ_AHEAD; static int ada_write_cache = ADA_DEFAULT_WRITE_CACHE; SYSCTL_NODE(_kern_cam, OID_AUTO, ada, CTLFLAG_RD, 0, @@ -334,6 +347,9 @@ SYSCTL_INT(_kern_cam_ada, OID_AUTO, spindown_suspend, CTLFLAG_RW, &ada_spindown_suspend, 0, "Spin down upon suspend"); TUNABLE_INT("kern.cam.ada.spindown_suspend", &ada_spindown_suspend); +SYSCTL_INT(_kern_cam_ada, OID_AUTO, read_ahead, CTLFLAG_RW, + &ada_read_ahead, 0, "Enable disk read-ahead"); +TUNABLE_INT("kern.cam.ada.read_ahead", &ada_read_ahead); SYSCTL_INT(_kern_cam_ada, OID_AUTO, write_cache, CTLFLAG_RW, &ada_write_cache, 0, "Enable disk write cache"); TUNABLE_INT("kern.cam.ada.write_cache", &ada_write_cache); @@ -425,7 +441,8 @@ softc = (struct ada_softc *)periph->softc; /* We only sync the cache if the drive is capable of it. */ - if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) { + if ((softc->flags & ADA_FLAG_CAN_FLUSHCACHE) != 0 && + (softc->flags & ADA_FLAG_PACK_INVALID) == 0) { ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); cam_fill_ataio(&ccb->ataio, @@ -467,12 +484,20 @@ adaschedule(struct cam_periph *periph) { struct ada_softc *softc = (struct ada_softc *)periph->softc; + uint32_t prio; + /* Check if cam_periph_getccb() was called. */ + prio = periph->immediate_priority; + + /* Check if we have more work to do. */ if (bioq_first(&softc->bio_queue) || (!softc->trim_running && bioq_first(&softc->trim_queue))) { - /* Have more work to do, so ensure we stay scheduled */ - xpt_schedule(periph, CAM_PRIORITY_NORMAL); + prio = CAM_PRIORITY_NORMAL; } + + /* Schedule CCB if any of above is true. */ + if (prio != CAM_PRIORITY_NONE) + xpt_schedule(periph, prio); } /* @@ -736,16 +761,19 @@ softc = (struct ada_softc *)periph->softc; cam_periph_async(periph, code, path, arg); - if (ada_write_cache < 0 && softc->write_cache < 0) - break; if (softc->state != ADA_STATE_NORMAL) break; xpt_setup_ccb(&cgd.ccb_h, periph->path, CAM_PRIORITY_NORMAL); cgd.ccb_h.func_code = XPT_GDEV_TYPE; xpt_action((union ccb *)&cgd); - if ((cgd.ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) == 0) - break; - softc->state = ADA_STATE_WCACHE; + if (ADA_RA >= 0 && + cgd.ident_data.support.command1 & ATA_SUPPORT_LOOKAHEAD) + softc->state = ADA_STATE_RAHEAD; + else if (ADA_WC >= 0 && + cgd.ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) + softc->state = ADA_STATE_WCACHE; + else + break; cam_periph_acquire(periph); cam_freeze_devq_arg(periph->path, RELSIM_RELEASE_RUNLEVEL, CAM_RL_DEV + 1); @@ -788,6 +816,9 @@ } SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "read_ahead", CTLFLAG_RW | CTLFLAG_MPSAFE, + &softc->read_ahead, 0, "Enable disk read ahead."); + SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "write_cache", CTLFLAG_RW | CTLFLAG_MPSAFE, &softc->write_cache, 0, "Enable disk write cache."); #ifdef ADA_TEST_FAILURE @@ -921,6 +952,10 @@ quirks = softc->quirks; TUNABLE_INT_FETCH(announce_buf, &quirks); softc->quirks = quirks; + softc->read_ahead = -1; + snprintf(announce_buf, sizeof(announce_buf), + "kern.cam.ada.%d.read_ahead", periph->unit_number); + TUNABLE_INT_FETCH(announce_buf, &softc->read_ahead); softc->write_cache = -1; snprintf(announce_buf, sizeof(announce_buf), "kern.cam.ada.%d.write_cache", periph->unit_number); @@ -1043,7 +1078,14 @@ (ADA_DEFAULT_TIMEOUT * hz) / ADA_ORDEREDTAG_INTERVAL, adasendorderedtag, softc); - if ((ada_write_cache >= 0 || softc->write_cache >= 0) && + if (ADA_RA >= 0 && + cgd->ident_data.support.command1 & ATA_SUPPORT_LOOKAHEAD) { + softc->state = ADA_STATE_RAHEAD; + cam_periph_acquire(periph); + cam_freeze_devq_arg(periph->path, + RELSIM_RELEASE_RUNLEVEL, CAM_RL_DEV + 1); + xpt_schedule(periph, CAM_PRIORITY_DEV); + } else if (ADA_WC >= 0 && cgd->ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) { softc->state = ADA_STATE_WCACHE; cam_periph_acquire(periph); @@ -1316,8 +1358,19 @@ adaschedule(periph); break; } + case ADA_STATE_RAHEAD: case ADA_STATE_WCACHE: { + if (softc->flags & ADA_FLAG_PACK_INVALID) { + softc->state = ADA_STATE_NORMAL; + xpt_release_ccb(start_ccb); + cam_release_devq(periph->path, + RELSIM_RELEASE_RUNLEVEL, 0, CAM_RL_DEV + 1, FALSE); + adaschedule(periph); + cam_periph_release_locked(periph); + return; + } + cam_fill_ataio(ataio, 1, adadone, @@ -1327,10 +1380,15 @@ 0, ada_default_timeout*1000); - ata_28bit_cmd(ataio, ATA_SETFEATURES, (softc->write_cache > 0 || - (softc->write_cache < 0 && ada_write_cache)) ? - ATA_SF_ENAB_WCACHE : ATA_SF_DIS_WCACHE, 0, 0); - start_ccb->ccb_h.ccb_state = ADA_CCB_WCACHE; + if (softc->state == ADA_STATE_RAHEAD) { + ata_28bit_cmd(ataio, ATA_SETFEATURES, ADA_RA ? + ATA_SF_ENAB_RCACHE : ATA_SF_DIS_RCACHE, 0, 0); + start_ccb->ccb_h.ccb_state = ADA_CCB_RAHEAD; + } else { + ata_28bit_cmd(ataio, ATA_SETFEATURES, ADA_WC ? + ATA_SF_ENAB_WCACHE : ATA_SF_DIS_WCACHE, 0, 0); + start_ccb->ccb_h.ccb_state = ADA_CCB_WCACHE; + } xpt_action(start_ccb); break; } @@ -1342,6 +1400,7 @@ { struct ada_softc *softc; struct ccb_ataio *ataio; + struct ccb_getdev *cgd; softc = (struct ada_softc *)periph->softc; ataio = &done_ccb->ataio; @@ -1361,7 +1420,8 @@ return; } if (error != 0) { - if (error == ENXIO) { + if (error == ENXIO && + (softc->flags & ADA_FLAG_PACK_INVALID) == 0) { /* * Catastrophic error. Mark our pack as * invalid. @@ -1421,6 +1481,47 @@ biodone(bp); break; } + case ADA_CCB_RAHEAD: + { + if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + if (adaerror(done_ccb, 0, 0) == ERESTART) { + return; + } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); + } + } + + /* + * Since our peripheral may be invalidated by an error + * above or an external event, we must release our CCB + * before releasing the reference on the peripheral. + * The peripheral will only go away once the last reference + * is removed, and we need it around for the CCB release + * operation. + */ + cgd = (struct ccb_getdev *)done_ccb; + xpt_setup_ccb(&cgd->ccb_h, periph->path, CAM_PRIORITY_NORMAL); + cgd->ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action((union ccb *)cgd); + if (ADA_WC >= 0 && + cgd->ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) { + softc->state = ADA_STATE_WCACHE; + xpt_release_ccb(done_ccb); + xpt_schedule(periph, CAM_PRIORITY_DEV); + return; + } + softc->state = ADA_STATE_NORMAL; + xpt_release_ccb(done_ccb); + cam_release_devq(periph->path, + RELSIM_RELEASE_RUNLEVEL, 0, CAM_RL_DEV + 1, FALSE); + adaschedule(periph); + cam_periph_release_locked(periph); + return; + } case ADA_CCB_WCACHE: { if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { ==== //depot/projects/pci/sys/cam/cam_periph.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.96 2011/06/14 14:53:17 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.97 2011/07/29 20:30:28 mav Exp $"); #include #include @@ -1550,7 +1550,8 @@ * make sure we actually have retries available. */ if ((err_action & SSQ_DECREMENT_COUNT) != 0) { - if (ccb->ccb_h.retry_count > 0) + if (ccb->ccb_h.retry_count > 0 && + (periph->flags & CAM_PERIPH_INVALID) == 0) ccb->ccb_h.retry_count--; else { *action_string = "Retries exhausted"; @@ -1718,6 +1719,7 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, union ccb *save_ccb) { + struct cam_periph *periph; const char *action_string; cam_status status; int frozen; @@ -1725,7 +1727,8 @@ int openings; u_int32_t relsim_flags; u_int32_t timeout = 0; - + + periph = xpt_path_periph(ccb->ccb_h.path); action_string = NULL; status = ccb->ccb_h.status; frozen = (status & CAM_DEV_QFRZN) != 0; @@ -1787,9 +1790,9 @@ xpt_print(ccb->ccb_h.path, "Data overrun\n"); printed++; } - error = EIO; /* we have to kill the command */ /* decrement the number of retries */ - if (ccb->ccb_h.retry_count > 0) { + if (ccb->ccb_h.retry_count > 0 && + (periph->flags & CAM_PERIPH_INVALID) == 0) { ccb->ccb_h.retry_count--; error = ERESTART; } else { @@ -1808,7 +1811,8 @@ struct cam_path *newpath; if ((camflags & CAM_RETRY_SELTO) != 0) { - if (ccb->ccb_h.retry_count > 0) { + if (ccb->ccb_h.retry_count > 0 && + (periph->flags & CAM_PERIPH_INVALID) == 0) { ccb->ccb_h.retry_count--; error = ERESTART; @@ -1826,10 +1830,11 @@ timeout = periph_selto_delay; break; } + action_string = "Retries exhausted"; } error = ENXIO; /* Should we do more if we can't create the path?? */ - if (xpt_create_path(&newpath, xpt_path_periph(ccb->ccb_h.path), + if (xpt_create_path(&newpath, periph, xpt_path_path_id(ccb->ccb_h.path), xpt_path_target_id(ccb->ccb_h.path), CAM_LUN_WILDCARD) != CAM_REQ_CMP) @@ -1874,11 +1879,16 @@ /* FALLTHROUGH */ case CAM_REQUEUE_REQ: /* Unconditional requeue */ - error = ERESTART; if (bootverbose && printed == 0) { xpt_print(ccb->ccb_h.path, "Request requeued\n"); printed++; } + if ((periph->flags & CAM_PERIPH_INVALID) == 0) + error = ERESTART; + else { + action_string = "Retries exhausted"; + error = EIO; + } break; case CAM_RESRC_UNAVAIL: /* Wait a bit for the resource shortage to abate. */ @@ -1893,7 +1903,8 @@ /* FALLTHROUGH */ default: /* decrement the number of retries */ - if (ccb->ccb_h.retry_count > 0) { + if (ccb->ccb_h.retry_count > 0 && + (periph->flags & CAM_PERIPH_INVALID) == 0) { ccb->ccb_h.retry_count--; error = ERESTART; if (bootverbose && printed == 0) { ==== //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 (text+ko) ==== @@ -488,7 +488,7 @@ txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks) { tx_state_t *tx = &dp->dp_tx; - int timeout = ddi_get_lbolt() + ticks; + clock_t timeout = ddi_get_lbolt() + ticks; /* don't delay if this txg could transition to quiesing immediately */ if (tx->tx_open_txg > txg || ==== //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 (text+ko) ==== @@ -612,7 +612,8 @@ /* * If we're in FRSYNC mode, sync out this znode before reading it. */ - if (ioflag & FRSYNC || zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS) + if (zfsvfs->z_log && + (ioflag & FRSYNC || zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)) zil_commit(zfsvfs->z_log, zp->z_id); /* @@ -6340,7 +6341,7 @@ if (error == 0) *ap->a_size = (size_t)va.va_size; } else if (ap->a_uio != NULL) - error = VOP_READ(vp, ap->a_uio, IO_UNIT | IO_SYNC, ap->a_cred); + error = VOP_READ(vp, ap->a_uio, IO_UNIT, ap->a_cred); VOP_UNLOCK(vp, 0); vn_close(vp, flags, ap->a_cred, td); ==== //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ @@ -567,7 +568,7 @@ if (!list_is_empty(&zilog->zl_lwb_list)) { ASSERT(zh->zh_claim_txg == 0); - ASSERT(!keep_first); + VERIFY(!keep_first); while ((lwb = list_head(&zilog->zl_lwb_list)) != NULL) { list_remove(&zilog->zl_lwb_list, lwb); if (lwb->lwb_buf != NULL) @@ -1668,20 +1669,9 @@ void zil_free(zilog_t *zilog) { - lwb_t *head_lwb; - zilog->zl_stop_sync = 1; - /* - * After zil_close() there should only be one lwb with a buffer. - */ - head_lwb = list_head(&zilog->zl_lwb_list); - if (head_lwb) { - ASSERT(head_lwb == list_tail(&zilog->zl_lwb_list)); - list_remove(&zilog->zl_lwb_list, head_lwb); - zio_buf_free(head_lwb->lwb_buf, head_lwb->lwb_sz); - kmem_cache_free(zil_lwb_cache, head_lwb); - } + ASSERT(list_is_empty(&zilog->zl_lwb_list)); list_destroy(&zilog->zl_lwb_list); avl_destroy(&zilog->zl_vdev_tree); @@ -1721,6 +1711,10 @@ { zilog_t *zilog = dmu_objset_zil(os); + ASSERT(zilog->zl_clean_taskq == NULL); + ASSERT(zilog->zl_get_data == NULL); + ASSERT(list_is_empty(&zilog->zl_lwb_list)); + zilog->zl_get_data = get_data; zilog->zl_clean_taskq = taskq_create("zil_clean", 1, minclsyspri, 2, 2, TASKQ_PREPOPULATE); @@ -1734,7 +1728,7 @@ void zil_close(zilog_t *zilog) { - lwb_t *tail_lwb; + lwb_t *lwb; uint64_t txg = 0; zil_commit(zilog, 0); /* commit all itx */ @@ -1746,9 +1740,9 @@ * destroy the zl_clean_taskq. */ mutex_enter(&zilog->zl_lock); - tail_lwb = list_tail(&zilog->zl_lwb_list); - if (tail_lwb != NULL) - txg = tail_lwb->lwb_max_txg; + lwb = list_tail(&zilog->zl_lwb_list); + if (lwb != NULL) + txg = lwb->lwb_max_txg; mutex_exit(&zilog->zl_lock); if (txg) txg_wait_synced(zilog->zl_dmu_pool, txg); @@ -1756,6 +1750,19 @@ taskq_destroy(zilog->zl_clean_taskq); zilog->zl_clean_taskq = NULL; zilog->zl_get_data = NULL; + + /* + * We should have only one LWB left on the list; remove it now. + */ + mutex_enter(&zilog->zl_lock); + lwb = list_head(&zilog->zl_lwb_list); + if (lwb != NULL) { + ASSERT(lwb == list_tail(&zilog->zl_lwb_list)); + list_remove(&zilog->zl_lwb_list, lwb); + zio_buf_free(lwb->lwb_buf, lwb->lwb_sz); + kmem_cache_free(zil_lwb_cache, lwb); + } + mutex_exit(&zilog->zl_lock); } /* ==== //depot/projects/pci/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.160 2011/06/17 07:30:56 pluknet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.161 2011/08/01 19:12:15 kib Exp $"); #include #include @@ -502,6 +502,33 @@ return (0); } +static int +linprocfs_doswaps(PFS_FILL_ARGS) +{ + struct xswdev xsw; + uintmax_t total, used; + int n; + char devname[SPECNAMELEN + 1]; + + sbuf_printf(sb, "Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); + mtx_lock(&Giant); + for (n = 0; ; n++) { + if (swap_dev_info(n, &xsw, devname, sizeof(devname)) != 0) + break; + total = (uintmax_t)xsw.xsw_nblks * PAGE_SIZE / 1024; + used = (uintmax_t)xsw.xsw_used * PAGE_SIZE / 1024; + + /* + * The space and not tab after the device name is on + * purpose. Linux does so. + */ + sbuf_printf(sb, "/dev/%-34s unknown\t\t%jd\t%jd\t-1\n", + devname, total, used); + } + mtx_unlock(&Giant); + return (0); +} + /* * Filler function for proc/uptime */ @@ -1490,6 +1517,8 @@ NULL, NULL, NULL, 0); pfs_create_file(root, "stat", &linprocfs_dostat, NULL, NULL, NULL, PFS_RD); + pfs_create_file(root, "swaps", &linprocfs_doswaps, + NULL, NULL, NULL, PFS_RD); pfs_create_file(root, "uptime", &linprocfs_douptime, NULL, NULL, NULL, PFS_RD); pfs_create_file(root, "version", &linprocfs_doversion, ==== //depot/projects/pci/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1617 2011/07/19 00:37:24 attilio Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1618 2011/07/25 09:12:48 avg Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -499,16 +499,6 @@ options REGRESSION # -# RESTARTABLE_PANICS allows one to continue from a panic as if it were -# a call to the debugger to continue from a panic as instead. It is only -# useful if a kernel debugger is present. To restart from a panic, reset -# the panicstr variable to NULL and continue execution. This option is -# for development use only and should NOT be used in production systems -# to "workaround" a panic. -# -#options RESTARTABLE_PANICS - -# # This option lets some drivers co-exist that can't co-exist in a running # system. This is used to be able to compile all kernel code in one go for # quality assurance purposes (like this file, which the option takes it name ==== //depot/projects/pci/sys/conf/newvers.sh#3 (text+ko) ==== @@ -28,11 +28,11 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.93 2011/05/23 19:57:12 ru Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.94 2011/07/26 04:00:00 kensmith Exp $ TYPE="FreeBSD" REVISION="9.0" -BRANCH="CURRENT" +BRANCH="BETA1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi ==== //depot/projects/pci/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.737 2011/07/19 00:37:24 attilio Exp $ +# $FreeBSD: src/sys/conf/options,v 1.738 2011/07/25 09:12:48 avg Exp $ # # On the handling of kernel options # @@ -579,7 +579,6 @@ LOCK_PROFILING_FAST opt_global.h MSIZE opt_global.h REGRESSION opt_global.h -RESTARTABLE_PANICS opt_global.h RWLOCK_NOINLINE opt_global.h SX_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h ==== //depot/projects/pci/sys/dev/ahci/ahci.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.71 2011/06/30 19:23:17 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.73 2011/08/02 11:07:47 mav Exp $"); #include #include @@ -264,7 +264,7 @@ {0x0abe10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, {0x0abf10de, 0x00, "NVIDIA MCP79", AHCI_Q_NOAA}, {0x0d8410de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, - {0x0d8510de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, + {0x0d8510de, 0x00, "NVIDIA MCP89", AHCI_Q_NOFORCE|AHCI_Q_NOAA}, {0x0d8610de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, {0x0d8710de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, {0x0d8810de, 0x00, "NVIDIA MCP89", AHCI_Q_NOAA}, @@ -1879,12 +1879,13 @@ device_printf(dev, "Poll timeout on slot %d port %d\n", slot->slot, port); device_printf(dev, "is %08x cs %08x ss %08x " - "rs %08x tfd %02x serr %08x\n", + "rs %08x tfd %02x serr %08x cmd %08x\n", ATA_INL(ch->r_mem, AHCI_P_IS), ATA_INL(ch->r_mem, AHCI_P_CI), ATA_INL(ch->r_mem, AHCI_P_SACT), ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD), - ATA_INL(ch->r_mem, AHCI_P_SERR)); + ATA_INL(ch->r_mem, AHCI_P_SERR), + ATA_INL(ch->r_mem, AHCI_P_CMD)); et = AHCI_ERR_TIMEOUT; } @@ -1960,8 +1961,12 @@ ccs = (ATA_INL(ch->r_mem, AHCI_P_CMD) & AHCI_P_CMD_CCS_MASK) >> AHCI_P_CMD_CCS_SHIFT; if ((sstatus & (1 << slot->slot)) != 0 || ccs == slot->slot || - ch->fbs_enabled) + ch->fbs_enabled || ch->wrongccs) + slot->state = AHCI_SLOT_EXECUTING; + else if ((ch->rslots & (1 << ccs)) == 0) { + ch->wrongccs = 1; slot->state = AHCI_SLOT_EXECUTING; + } callout_reset(&slot->timeout, (int)slot->ccb->ccb_h.timeout * hz / 2000, @@ -1971,10 +1976,12 @@ device_printf(dev, "Timeout on slot %d port %d\n", slot->slot, slot->ccb->ccb_h.target_id & 0x0f); - device_printf(dev, "is %08x cs %08x ss %08x rs %08x tfd %02x serr %08x\n", + device_printf(dev, "is %08x cs %08x ss %08x rs %08x tfd %02x " + "serr %08x cmd %08x\n", ATA_INL(ch->r_mem, AHCI_P_IS), ATA_INL(ch->r_mem, AHCI_P_CI), ATA_INL(ch->r_mem, AHCI_P_SACT), ch->rslots, - ATA_INL(ch->r_mem, AHCI_P_TFD), ATA_INL(ch->r_mem, AHCI_P_SERR)); + ATA_INL(ch->r_mem, AHCI_P_TFD), ATA_INL(ch->r_mem, AHCI_P_SERR), + ATA_INL(ch->r_mem, AHCI_P_CMD)); /* Handle frozen command. */ if (ch->frozen) { @@ -1987,7 +1994,7 @@ } xpt_done(fccb); } - if (!ch->fbs_enabled) { + if (!ch->fbs_enabled && !ch->wrongccs) { /* Without FBS we know real timeout source. */ ch->fatalerr = 1; /* Handle command with timeout. */ @@ -2585,6 +2592,7 @@ xpt_release_simq(ch->sim, TRUE); ch->eslots = 0; ch->toslots = 0; + ch->wrongccs = 0; ch->fatalerr = 0; /* Tell the XPT about the event */ xpt_async(AC_BUS_RESET, ch->path, NULL); ==== //depot/projects/pci/sys/dev/ahci/ahci.h#4 (text+ko) ==== @@ -24,7 +24,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/ahci/ahci.h,v 1.18 2011/05/17 22:07:45 mav Exp $ + * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.19 2011/07/29 20:35:23 mav Exp $ */ /* ATA register defines */ @@ -426,6 +426,7 @@ int resetting; /* Hard-reset in progress. */ int resetpolldiv; /* Hard-reset poll divider. */ int listening; /* SUD bit is cleared. */ + int wrongccs; /* CCS field in CMD was wrong */ union ccb *frozen; /* Frozen command */ struct callout pm_timer; /* Power management events */ struct callout reset_timer; /* Hard-reset timeout */ ==== //depot/projects/pci/sys/dev/ata/chipsets/ata-nvidia.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.14 2010/10/18 11:30:13 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.15 2011/08/02 11:07:47 mav Exp $"); #include "opt_ata.h" #include @@ -54,6 +54,7 @@ /* local prototypes */ static int ata_nvidia_chipinit(device_t dev); static int ata_nvidia_ch_attach(device_t dev); +static int ata_nvidia_ch_attach_dumb(device_t dev); static int ata_nvidia_status(device_t dev); static void ata_nvidia_reset(device_t dev); static int ata_nvidia_setmode(device_t dev, int target, int mode); @@ -62,6 +63,7 @@ #define NV4 0x01 #define NVQ 0x02 #define NVAHCI 0x04 +#define NVNOFORCE 0x08 /* @@ -158,7 +160,7 @@ { ATA_NFORCE_MCP79_AA, 0, NVAHCI, 0, ATA_SA300, "nForce MCP79" }, { ATA_NFORCE_MCP79_AB, 0, NVAHCI, 0, ATA_SA300, "nForce MCP79" }, { ATA_NFORCE_MCP89_A0, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, - { ATA_NFORCE_MCP89_A1, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, + { ATA_NFORCE_MCP89_A1, 0, NVAHCI|NVNOFORCE, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A2, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A3, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A4, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, @@ -178,7 +180,9 @@ return ENXIO; ata_set_desc(dev); - if (ctlr->chip->cfg1 & NVAHCI) + if ((ctlr->chip->cfg1 & NVAHCI) && + ((ctlr->chip->cfg1 & NVNOFORCE) == 0 || + pci_get_subclass(dev) != PCIS_STORAGE_IDE)) ctlr->chipinit = ata_ahci_chipinit; else ctlr->chipinit = ata_nvidia_chipinit; @@ -193,7 +197,10 @@ if (ata_setup_interrupt(dev, ata_generic_intr)) return ENXIO; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 2 20:21:36 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AEED10657F0; Tue, 2 Aug 2011 20:21: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 3B0C110657EA for ; Tue, 2 Aug 2011 20:21:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 21A788FC13 for ; Tue, 2 Aug 2011 20:21:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p72KLZW8049407 for ; Tue, 2 Aug 2011 20:21:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p72KLZRP049404 for perforce@freebsd.org; Tue, 2 Aug 2011 20:21:35 GMT (envelope-from jhb@freebsd.org) Date: Tue, 2 Aug 2011 20:21:35 GMT Message-Id: <201108022021.p72KLZRP049404@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 20:21:36 -0000 http://p4web.freebsd.org/@@197088?ac=10 Change 197088 by jhb@jhb_jhbbsd on 2011/08/02 20:20:47 Mismerge. Affected files ... .. //depot/projects/pci/sys/dev/pci/pcib_private.h#20 edit Differences ... ==== //depot/projects/pci/sys/dev/pci/pcib_private.h#20 (text+ko) ==== @@ -115,9 +115,6 @@ typedef uint32_t pci_read_config_fn(int b, int s, int f, int reg, int width); -#ifdef NEW_PCIB -const char *pcib_child_name(device_t child); -#endif int host_pcib_get_busno(pci_read_config_fn read_config, int bus, int slot, int func, uint8_t *busnum); int pcib_attach(device_t dev); From owner-p4-projects@FreeBSD.ORG Tue Aug 2 20:22:41 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B36D3106566C; Tue, 2 Aug 2011 20:22: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 5DC52106566B for ; Tue, 2 Aug 2011 20:22:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 421968FC0C for ; Tue, 2 Aug 2011 20:22:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p72KMfpU049451 for ; Tue, 2 Aug 2011 20:22:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p72KMfhK049448 for perforce@freebsd.org; Tue, 2 Aug 2011 20:22:41 GMT (envelope-from jhb@freebsd.org) Date: Tue, 2 Aug 2011 20:22:41 GMT Message-Id: <201108022022.p72KMfhK049448@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Aug 2011 20:22:42 -0000 http://p4web.freebsd.org/@@197089?ac=10 Change 197089 by jhb@jhb_jhbbsd on 2011/08/02 20:21:42 Allow ACPI Host-PCI bridges to permit specific allocations that aren't decoded if they are part of a system resource range. Affected files ... .. //depot/projects/pci/sys/dev/acpica/acpi.c#8 edit .. //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#28 edit .. //depot/projects/pci/sys/dev/acpica/acpivar.h#5 edit Differences ... ==== //depot/projects/pci/sys/dev/acpica/acpi.c#8 (text+ko) ==== @@ -1238,7 +1238,6 @@ struct resource_list_entry *rle; struct resource_list *rl; struct resource *res; - struct rman *rm; int isdefault = (start == 0UL && end == ~0UL); /* @@ -1291,15 +1290,29 @@ } else res = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, start, end, count, flags); - if (res != NULL || start + count - 1 != end) - return (res); /* * If the first attempt failed and this is an allocation of a * specific range, try to satisfy the request via a suballocation - * from our system resource regions. Note that we only handle - * memory and I/O port system resources. + * from our system resource regions. */ + if (res == NULL && start + count - 1 == end) + res = acpi_alloc_sysres(child, type, rid, start, end, count, flags); + return (res); +} + +/* + * Attempt to allocate a specific resource range from the system + * resource ranges. Note that we only handle memory and I/O port + * system resources. + */ +struct resource * +acpi_alloc_sysres(device_t child, int type, int *rid, u_long start, u_long end, + u_long count, u_int flags) +{ + struct rman *rm; + struct resource *res; + switch (type) { case SYS_RES_IOPORT: rm = &acpi_rman_io; @@ -1311,6 +1324,7 @@ return (NULL); } + KASSERT(start + count - 1 == end, ("wildcard resource range")); res = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, child); if (res == NULL) ==== //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c#28 (text+ko) ==== @@ -541,6 +541,7 @@ { #ifdef NEW_PCIB struct acpi_hpcib_softc *sc; + struct resource *res; #endif #if defined(__i386__) || defined(__amd64__) @@ -549,8 +550,11 @@ #ifdef NEW_PCIB sc = device_get_softc(dev); - return (pcib_host_res_alloc(&sc->ap_host_res, child, type, rid, start, end, - count, flags)); + res = pcib_host_res_alloc(&sc->ap_host_res, child, type, rid, start, end, + count, flags); + if (res == NULL && start + count - 1 == end) + res = acpi_alloc_sysres(child, type, rid, start, end, count, flags); + return (res); #else return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); ==== //depot/projects/pci/sys/dev/acpica/acpivar.h#5 (text+ko) ==== @@ -382,6 +382,8 @@ struct resource *res, ACPI_RESOURCE *acpi_res); ACPI_STATUS acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resource_set *set, void *arg); +struct resource *acpi_alloc_sysres(device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags); /* ACPI event handling */ UINT32 acpi_event_power_button_sleep(void *context); From owner-p4-projects@FreeBSD.ORG Wed Aug 3 10:52:13 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E6FA1065670; Wed, 3 Aug 2011 10:52: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 51032106566C for ; Wed, 3 Aug 2011 10:52:13 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3F0618FC1B for ; Wed, 3 Aug 2011 10:52:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p73AqDqI026653 for ; Wed, 3 Aug 2011 10:52:13 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p73AqDvq026650 for perforce@freebsd.org; Wed, 3 Aug 2011 10:52:13 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 3 Aug 2011 10:52:13 GMT Message-Id: <201108031052.p73AqDvq026650@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2011 10:52:13 -0000 http://p4web.freebsd.org/@@197123?ac=10 Change 197123 by syuu@kikurage on 2011/08/03 10:51:23 mq_bpf support for ixgbe Affected files ... .. //depot/projects/soc2011/mq_bpf/src/sys/dev/ixgbe/ixgbe.c#2 edit .. //depot/projects/soc2011/mq_bpf/src/sys/dev/ixgbe/ixgbe.h#2 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/ixgbe/ixgbe.c#2 (text+ko) ==== @@ -195,6 +195,12 @@ static void ixgbe_reinit_fdir(void *, int); #endif +static int ixgbe_get_rxqueue_len(struct ifnet *); +static int ixgbe_get_txqueue_len(struct ifnet *); +static int ixgbe_get_rxqueue_affinity(struct ifnet *, int); +static int ixgbe_get_txqueue_affinity(struct ifnet *, int); + + /********************************************************************* * FreeBSD Device Interface Entry Points *********************************************************************/ @@ -712,6 +718,10 @@ IFQ_DRV_PREPEND(&ifp->if_snd, m_head); break; } + + m_head->m_pkthdr.rxqueue = (uint32_t)-1; + m_head->m_pkthdr.txqueue = txr->me; + /* Send a copy of the frame to the BPF listener */ ETHER_BPF_MTAP(ifp, m_head); @@ -806,6 +816,10 @@ } enqueued++; drbr_stats_update(ifp, next->m_pkthdr.len, next->m_flags); + + next->m_pkthdr.rxqueue = (uint32_t)-1; + next->m_pkthdr.txqueue = txr->me; + /* Send a copy of the frame to the BPF listener */ ETHER_BPF_MTAP(ifp, next); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) @@ -2399,6 +2413,11 @@ ifp->if_transmit = ixgbe_mq_start; ifp->if_qflush = ixgbe_qflush; #endif + ifp->if_get_rxqueue_len = ixgbe_get_rxqueue_len; + ifp->if_get_txqueue_len = ixgbe_get_txqueue_len; + ifp->if_get_rxqueue_affinity = ixgbe_get_rxqueue_affinity; + ifp->if_get_txqueue_affinity = ixgbe_get_txqueue_affinity; + ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 2; ether_ifattach(ifp, adapter->hw.mac.addr); @@ -2414,6 +2433,7 @@ ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4 | IFCAP_VLAN_HWCSUM; ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; ifp->if_capabilities |= IFCAP_JUMBO_MTU; + ifp->if_capabilities |= IFCAP_MULTIQUEUE; ifp->if_capenable = ifp->if_capabilities; /* Don't enable LRO by default */ @@ -4123,6 +4143,8 @@ struct mbuf *sendmp, *mh, *mp; u32 rsc, ptype; u16 hlen, plen, hdr, vtag; + u32 rss; + u8 rsstype; bool eop; /* Sync the ring. */ @@ -4150,6 +4172,9 @@ ptype = le32toh(cur->wb.lower.lo_dword.data) & IXGBE_RXDADV_PKTTYPE_MASK; hdr = le16toh(cur->wb.lower.lo_dword.hs_rss.hdr_info); + rss = le32toh(cur->wb.lower.hi_dword.rss); + rsstype = le32toh(cur->wb.lower.lo_dword.data) & + IXGBE_RXDADV_RSSTYPE_MASK; vtag = le16toh(cur->wb.upper.vlan); eop = ((staterr & IXGBE_RXD_STAT_EOP) != 0); @@ -4304,9 +4329,29 @@ if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) ixgbe_rx_checksum(staterr, sendmp, ptype); #if __FreeBSD_version >= 800000 - sendmp->m_pkthdr.flowid = que->msix; + sendmp->m_pkthdr.flowid = rss; sendmp->m_flags |= M_FLOWID; + switch (rsstype) { + case IXGBE_HASH_TCP_IPV4: + M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV4); + break; + case IXGBE_HASH_IPV4: + case IXGBE_HASH_UDP_IPV4: + M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_IPV4); + break; + case IXGBE_HASH_TCP_IPV6: + M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV6); + break; + case IXGBE_HASH_IPV6: + case IXGBE_HASH_UDP_IPV6: + M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_IPV6); + break; + default: + M_HASHTYPE_SET(sendmp, M_HASHTYPE_NONE); + } #endif + sendmp->m_pkthdr.rxqueue = que->msix; + sendmp->m_pkthdr.txqueue = (uint32_t)-1; } next_desc: bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, @@ -5365,3 +5410,29 @@ return (error); } + +static int +ixgbe_get_rxqueue_len(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + return (adapter->num_queues); +} + +static int +ixgbe_get_txqueue_len(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + return (adapter->num_queues); +} + +static int +ixgbe_get_rxqueue_affinity(struct ifnet *ifp, int queid) +{ + return (queid); +} + +static int +ixgbe_get_txqueue_affinity(struct ifnet *ifp, int queid) +{ + return (queid); +} ==== //depot/projects/soc2011/mq_bpf/src/sys/dev/ixgbe/ixgbe.h#2 (text+ko) ==== @@ -366,10 +366,12 @@ struct ifmedia media; struct callout timer; + struct callout timer2; int msix; int if_flags; struct mtx core_mtx; + struct mtx core_mtx2; eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; @@ -517,4 +519,12 @@ rxr->next_to_refresh - 1); } +#define IXGBE_HASH_NONE 0x0 +#define IXGBE_HASH_TCP_IPV4 0x1 +#define IXGBE_HASH_IPV4 0x2 +#define IXGBE_HASH_TCP_IPV6 0x3 +#define IXGBE_HASH_IPV6 0x5 +#define IXGBE_HASH_UDP_IPV4 0x7 +#define IXGBE_HASH_UDP_IPV6 0x8 + #endif /* _IXGBE_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Aug 3 14:00:57 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA8911065675; Wed, 3 Aug 2011 14:00: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 7D08F1065673 for ; Wed, 3 Aug 2011 14:00:57 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 69BCC8FC14 for ; Wed, 3 Aug 2011 14:00:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p73E0vQa072467 for ; Wed, 3 Aug 2011 14:00:57 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p73E0vDY072462 for perforce@freebsd.org; Wed, 3 Aug 2011 14:00:57 GMT (envelope-from syuu@FreeBSD.org) Date: Wed, 3 Aug 2011 14:00:57 GMT Message-Id: <201108031400.p73E0vDY072462@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2011 14:00:58 -0000 http://p4web.freebsd.org/@@197135?ac=10 Change 197135 by syuu@kikurage on 2011/08/03 14:00:09 test_mqbpf, test_sqbpf replaced with 'bpfnull' based code, from zcopybpf repository. Affected files ... .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/test_mqbpf.c#2 edit .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/Makefile#2 edit .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/test_sqbpf.c#2 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/test_mqbpf.c#2 (text+ko) ==== @@ -1,183 +1,459 @@ -/* $OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $ */ - -/* BPF socket interface code, originally contributed by Archie Cobbs. */ - -/* - * Copyright (c) 1995, 1996, 1998, 1999 - * The Internet Software Consortium. All rights reserved. +/*- + * Copyright (c) 2007 Seccuris Inc. + * Copyright (c) 2007 Christian S.J. Peron + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The Internet Software Consortium nor the names - * of its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM 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 INTERNET SOFTWARE CONSORTIUM 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 + * 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. * - * This software has been written for the Internet Software Consortium - * by Ted Lemon in cooperation with Vixie - * Enterprises. To learn more about the Internet Software Consortium, - * see ``http://www.vix.com/isc''. To learn more about Vixie - * Enterprises, see ``http://www.vix.com''. */ - #include -#include +#include #include -#include +#include #include -#include +#include #include #include -#include + #include -#include #include #include #include -#include -#include +#include +#include #include +#include +#include +#include #include #include -#include -#include -#include +#include #include +#include #include -#include - -#define CAP_FORMAT "cap.dat.%d" -#define BPF_FORMAT "/dev/bpf%d" - -#define QUEUE_TYPE_RX 0 -#define QUEUE_TYPE_TX 1 -#define QUEUE_TYPE_OTHER 2 struct bpf_thread_instance { - pthread_t thread; - int rxqueue; - int txqueue; - int other; - int cpu; - cpuset_t cpuset; - int fd; - uint32_t wrote; + pthread_t thread; + int rxqueue; + int txqueue; + int other; + int cpu; + cpuset_t cpuset; + int bpffd; + u_int64_t sum; /* cycles spent processing packet data */ + u_int64_t rsum; /* cycles spent in syscalls after wakeup */ + u_int64_t ssum; /* cycles spent not sleep in event loop */ + u_int64_t psum; /* cycles spent before buffer can be reclaimed */ + u_char *bufa, *bufb; + unsigned long count; + unsigned long wrote; }; static char *ifname = NULL; static struct bpf_thread_instance *instances; static int rxqlen, txqlen; -static struct timeval start; + +int bpf_open(void); +void usage(void); + +static struct ifreq ifr; +static int Iflag; +static char *iflag; +static int bflag = 32768; +static int vflag; +static int zflag; +static int Tflag; +static int pflag; +static int Pflag; + +#ifndef BPF_BUFMODE_ZBUF +/* + * bpfnull uses certain constructs that depend on zero-copy definitions being + * present in bpf.h even when running in normal buffer mode. If the system + * doesn't have these constructs, define them locally. + */ +struct bpf_zbuf { + void *bz_bufa; + void *bz_bufb; + size_t bz_buflen; +}; +#warning "BPF_BUFMODE_ZBUF not present, building without zero-copy support" +#endif + +static int +handle_int(int sig __unused) +{ + int i; + struct bpf_stat bs; + double wrote = 0, throughput; + u_int64_t sum = 0; /* cycles spent processing packet data */ + u_int64_t rsum = 0; /* cycles spent in syscalls after wakeup */ + u_int64_t ssum = 0; /* cycles spent not sleep in event loop */ + u_int64_t psum = 0; /* cycles spent before buffer can be reclaimed */ + unsigned long count = 0; +#if 0 + u_int recv = 0; + u_int drop = 0; +#endif + + for (i = 0; i < (rxqlen + txqlen + 1); i++) { + pthread_cancel(instances[i].thread); + pthread_join(instances[i].thread, NULL); + wrote += (double)instances[i].wrote / (double)(1024 * 1024); + sum += instances[i].sum; + rsum += instances[i].rsum; + ssum += instances[i].ssum; + psum += instances[i].psum; + count += instances[i].count; +#if 0 + if (ioctl(instances[i].bpffd, BIOCGSTATS, &bs) < 0) + err(-1, "BIOCGSTATS"); + recv += bs.bs_recv; + drop += bs.bs_drop; +#endif + } + + putchar('\n'); + printf("%lu cycles spent processing packets\n", sum); + printf("%lu cycles spent in a syscall after wakeup\n", rsum); + printf("%lu cycles spent not sleeping\n", ssum); + printf("%lu cycles spent before buffer reclaims\n", psum); + printf("%lu packets processed\n", count); + throughput = (wrote * 8) / 60; + printf("wrote:%f MB throughput:%f Mbps\n", + wrote, throughput); + +#if 0 + printf("%u packets received (BPF)\n", recv); + printf("%u packets dropped (BPF)\n", drop); +#endif + + exit(0); +} -int bpf_thread(struct bpf_thread_instance *instance) +u_int64_t +rdtsc(void) { - char filename[50]; - int bpf, b; - int flag = 1, sz; - char *rbuf; - int rbuf_offset = 0; - int rbuf_len = 0; - int length = 0; - struct bpf_hdr *hdr; - struct ifreq ifr; + u_int32_t high, low; + + __asm __volatile("rdtsc" : "=a" (low), "=d" (high)); + return (low | ((u_int64_t) high << 32)); +} - ifr.ifr_addr.sa_family = AF_LOCAL; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); +/* +#define CACHE_LINE_SIZE 32 +*/ - CPU_ZERO(&instance->cpuset); - CPU_SET(instance->cpu, &instance->cpuset); - cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, - sizeof(cpuset_t), &instance->cpuset); +static void +bpf_process_packets(struct bpf_thread_instance *instance, struct bpf_zbuf *bz, char *bufname) +{ + int clen, hlen, i; + u_char *b,*bp, *ep, *p, by; +#define bhp ((struct bpf_hdr *)bp) - snprintf(filename, sizeof(filename), CAP_FORMAT, instance->cpu); - instance->fd = open(filename, O_RDWR | O_CREAT); - if (instance->fd < 0) { - perror("open"); - return instance->fd; + b = bp = bz->bz_bufa; + ep = bp + bz->bz_buflen; + while (bp < ep) { + instance->count++; + if (pflag) { + /* + * XXXCSJP this prefetch method needs to be + * re-visted + */ + __builtin_prefetch(bp + bhp->bh_datalen, 0, 3); + } + clen = bhp->bh_caplen; + hlen = bhp->bh_hdrlen; + if (Tflag) { + for (i = 0; i < bhp->bh_datalen; i++) + by = p[i]; + bp += BPF_WORDALIGN(clen + hlen); + continue; + } + instance->wrote += bhp->bh_caplen; + bp += BPF_WORDALIGN(clen + hlen); } - /* Open a BPF device */ - for (b = 0; 1; b++) { - snprintf(filename, sizeof(filename), BPF_FORMAT, b); - bpf = open(filename, O_RDWR, 0); - if (bpf < 0) { - if (errno == EBUSY) - continue; - else { - perror("open"); - return bpf; +} + +static void +bpf_wait_for_fullbuf(struct bpf_thread_instance *instance) +{ + fd_set s_set, r_set; + struct bpf_zbuf bz; + char *pbuf; + int n; + struct bpf_zbuf_header *bzha, *bzhb; + struct timeval tv; + void *prev2, *prev; + u_int64_t b, a, c, d, e, f; + + prev2 = prev = NULL; + pbuf = malloc(bflag + 1); + if (pbuf == NULL) + err(1, "malloc"); + tv.tv_sec = 1; + tv.tv_usec = 0; + FD_SET(instance->bpffd, &s_set); + for (;;) { + r_set = s_set; + n = select(instance->bpffd + 1, &r_set, NULL, NULL, &tv); + e = rdtsc(); + if (n < 0) { + fprintf(stderr,"owned by select\n"); + err(1, "select failed"); + } + if (vflag) + (void) fprintf(stderr, "select wakeup\n"); + if (n != 0 && !FD_ISSET(instance->bpffd, &r_set) && vflag) + printf("No timeout and fd is not ready!\n"); +#ifdef BPF_BUFMODE_ZBUF + if (zflag == 0) { +#endif + c = rdtsc(); + n = read(instance->bpffd, pbuf, bflag); + d = rdtsc(); + if (n < 0) +// err(1, "read failed"); + fprintf(stderr, "read failed"); + instance->psum += d - e; + instance->rsum += d - c; + bz.bz_bufa = pbuf; + bz.bz_buflen = n; + b = rdtsc(); + bpf_process_packets(instance, &bz, "W"); + a = rdtsc(); + instance->sum += a - b; +#ifdef BPF_BUFMODE_ZBUF + } else { + bzha = (struct bpf_zbuf_header *)instance->bufa; + bzhb = (struct bpf_zbuf_header *)instance->bufb; + if (n == 0) { + c = rdtsc(); + if (ioctl(instance->bpffd, BIOCROTZBUF, &bz) < 0) + err(1, "ioctl"); + d = rdtsc(); + instance->rsum += d - c; + if (bz.bz_bufa == NULL) { + if (vflag) + printf("timeout no data\n"); + continue; + } + } + assert(bzha->bzh_kernel_gen > bzha->bzh_user_gen || + bzhb->bzh_kernel_gen > bzhb->bzh_user_gen); + if (bzha->bzh_kernel_gen > bzha->bzh_user_gen) { + bz.bz_bufa = instance->bufa; + bz.bz_bufa += sizeof(struct bpf_zbuf_header); + bz.bz_buflen = bzha->bzh_kernel_len; + b = rdtsc(); + bpf_process_packets(instance, &bz, "A"); + a = rdtsc(); + instance->sum += a - b; + instance->psum += a - e; + bzha->bzh_user_gen++; + } else if (bzhb->bzh_kernel_gen > bzhb->bzh_user_gen) { + bz.bz_bufa = instance->bufb; + bz.bz_bufa += sizeof(struct bpf_zbuf_header); + bz.bz_buflen = bzhb->bzh_kernel_len; + b = rdtsc(); + bpf_process_packets(instance, &bz, "B"); + a = rdtsc(); + instance->sum += a - b; + instance->psum += a - e; + bzhb->bzh_user_gen++; } - } else + } +#endif + f = rdtsc(); + instance->ssum += f - e; + } +} + +int +bpf_open(void) +{ + char buf[32]; + int i, ret; + + for (i = 0; i < 8; i++) { + snprintf(buf, sizeof(buf), "/dev/bpf%d", i); + ret = open(buf, O_RDWR); + if (ret != -1) break; + else if (errno != EBUSY) + (void) fprintf(stderr, "open %s: %s\n", + buf, strerror(errno)); } + return (ret); +} + +void +usage() +{ + + (void) fprintf(stderr, "usage: bpfnull [-ipPTwvz] [-b bufsize] " + "[-c limit] [-f file] -i interface\n"); + exit(0); +} + +#ifdef BPF_BUFMODE_ZBUF +static int +bpf_zbuf_init(struct bpf_thread_instance *instance, struct bpf_zbuf *bz) +{ + int bmode; + u_int zbufmax; - /* Set the BPF device to point at this interface. */ - if (ioctl(bpf, BIOCSETIF, &ifr) < 0) { - perror("SETIF"); - return -1; + if ((bflag % getpagesize()) != 0) + errx(1, "-b must be multiple of system page size"); + bz->bz_buflen = bflag; + instance->bufa = mmap(NULL, bz->bz_buflen, PROT_READ | PROT_WRITE, + MAP_ANON, -1, 0); + if (instance->bufa == MAP_FAILED) + err(1, "mmap(bufa)"); + instance->bufb = mmap(NULL, bz->bz_buflen, PROT_READ | PROT_WRITE, + MAP_ANON, -1, 0); + if (instance->bufb == MAP_FAILED) + err(1, "mmap(bufb)"); + bz->bz_bufa = instance->bufa; + bz->bz_bufb = instance->bufb; + bmode = BPF_BUFMODE_ZBUF; + if (ioctl(instance->bpffd, BIOCSETBUFMODE, &bmode) < 0) + err(1, "ioctl(BIOCGSETBUFMODE)"); + if (ioctl(instance->bpffd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) { + err(1, "ioctl(BIOCGETZMAX)"); + } + if (bz->bz_buflen > zbufmax) { + printf("zbufmax is smaller than buflen:%d\n", zbufmax); } + if (ioctl(instance->bpffd, BIOCSETZBUF, bz) < 0) + err(1, "ioctl(BIOCSETZBUF)"); + if (vflag) + (void) fprintf(stderr, + "DEBUG: bufa=%p bufb=%p\n", instance->bufa, instance->bufb); + return (0); +} +#endif + +static int +bpf_rbuf_init(struct bpf_thread_instance *instance) +{ + int v, bmode; - /* - * Set immediate mode so that reads return as soon as a packet - * comes in, rather than waiting for the input buffer to fill - * with packets. - */ - if (ioctl(bpf, BIOCIMMEDIATE, &flag) < 0) { - perror("IMMEDIATE"); - return -1; +#ifdef BPF_BUFMODE_ZBUF + bmode = BPF_BUFMODE_BUFFER; + + if (ioctl(instance->bpffd, BIOCGETBUFMODE, &bmode) < 0) + err(1, "ioctl(BIOCGETBUFMODE)"); +#endif + for (v = bflag; v != 0; v >>= 1) { + (void) ioctl(instance->bpffd, BIOCSBLEN, &v); + if (ioctl(instance->bpffd, BIOCSETIF, &ifr) == 0) + break; } + if (ioctl(instance->bpffd, BIOCFLUSH, NULL) < 0) + err(1, "ioctl(BIOCFLUSH)"); + return (0); +} - /* Get the required BPF buffer length from the kernel. */ - if (ioctl(bpf, BIOCGBLEN, &sz) < 0) { - perror("BLEN"); - return -1; +int bpf_thread(struct bpf_thread_instance *instance) +{ + struct bpf_zbuf bz; + struct ifreq ifr; + int opt; + + CPU_ZERO(&instance->cpuset); + CPU_SET(instance->cpu, &instance->cpuset); + cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, + sizeof(cpuset_t), &instance->cpuset); + + bzero(&ifr, sizeof(ifr)); + strlcpy(ifr.ifr_name, iflag, sizeof(ifr.ifr_name)); + instance->bpffd = bpf_open(); + if (instance->bpffd == -1) { + (void) fprintf(stderr, "bpfnull: no bpf device available\n"); + exit(1); + } + if (vflag) + (void) fprintf(stderr, + "DEBUG: obtained bpf fd=%d\n", instance->bpffd); +#ifdef BPF_BUFMODE_ZBUF + if (zflag) { + if (vflag) + (void) fprintf(stderr, + "DEBUG: bufmode=zerocopy\n"); + bzero(&bz, sizeof(bz)); + bpf_zbuf_init(instance, &bz); + if (ioctl(instance->bpffd, BIOCSETIF, &ifr) < 0) + err(1, "ioctl(BIOCSETIF)"); + } else { +#endif + if (vflag) + (void) fprintf(stderr, + "DEBUG: bufmode=buffer\n"); + bpf_rbuf_init(instance); +#ifdef BPF_BUFMODE_ZBUF + } +#endif + if (Iflag) { + if (vflag) + (void) fprintf(stderr, + "DEBUG: setting BIOCIMMEDIATE\n"); + opt = 1; + if (ioctl(instance->bpffd, BIOCIMMEDIATE, &opt) < 0) + err(1, "BIOCIMMEDIATE"); } - rbuf = malloc(sz); - if (!rbuf) { - perror("malloc"); - return -1; + if (Pflag) { + if (vflag) + (void) fprintf(stderr, + "DEBUG: putting card into promiscuous " + "mode\n"); + if (ioctl(instance->bpffd, BIOCPROMISC, NULL) < 0) + err(1, "BIOCPROMISC"); } + if (vflag) + (void) fprintf(stderr, + "DEBUG: attaching to %s\n", iflag); - if (ioctl(bpf, BIOCENAQMASK, NULL) < 0) { + if (ioctl(instance->bpffd, BIOCENAQMASK, NULL) < 0) { perror("enable qmask"); return -1; } if (instance->rxqueue > -1) { - if (ioctl(bpf, BIOCSTRXQMASK, &instance->rxqueue) < 0) { + if (ioctl(instance->bpffd, BIOCSTRXQMASK, &instance->rxqueue) < 0) { perror("rx qmask"); return -1; } } if (instance->txqueue > -1) { - if (ioctl(bpf, BIOCSTTXQMASK, &instance->txqueue) < 0) { + if (ioctl(instance->bpffd, BIOCSTTXQMASK, &instance->txqueue) < 0) { perror("tx qmask"); return -1; } } if (instance->other > -1) { - if (ioctl(bpf, BIOCSTOTHERMASK, &instance->other) < 0) { + if (ioctl(instance->bpffd, BIOCSTOTHERMASK, &instance->other) < 0) { perror("other qmask"); return -1; } @@ -185,96 +461,18 @@ instance->wrote = 0; - while(1) { - /* If the buffer is empty, fill it. */ - if (rbuf_offset >= rbuf_len) { - length = read(bpf, rbuf, - sz); - if (length < 0) { - perror("read"); - return length; - } - rbuf_offset = 0; - rbuf_len = length; - } - /* - * If there isn't room for a whole bpf header, something - * went wrong, but we'll ignore it and hope it goes - * away... XXX - */ - if (rbuf_len - rbuf_offset < - sizeof(struct bpf_hdr)) { - rbuf_offset = rbuf_len; - printf("rbuf_len - rbuf_offset < sizeof(struct bpf_hdr)\n"); - continue; - } - - hdr = (struct bpf_hdr *)&rbuf[rbuf_offset]; - - /* - * If the bpf header plus data doesn't fit in what's - * left of the buffer, stick head in sand yet again... - */ - if (rbuf_offset + hdr->bh_hdrlen + hdr->bh_caplen > - rbuf_len) { - rbuf_offset = rbuf_len; - printf("rbuf_offset + hdr->bh_hdrlen + hdr->bh_caplen > rbuf_len\n"); - continue; - } - - /* Skip over the BPF header... */ - rbuf_offset += hdr->bh_hdrlen; - - /* - * If the captured data wasn't the whole packet, or if - * the packet won't fit in the input buffer, all we can - * do is drop it. - */ - if (hdr->bh_caplen != hdr->bh_datalen) { - rbuf_offset = - BPF_WORDALIGN(rbuf_offset + - hdr->bh_caplen); - printf("hdr->bh_caplen != hdr->bh_datalen\n"); - continue; - } - - /* Copy out the data in the packet... */ - write(instance->fd, rbuf + rbuf_offset, hdr->bh_caplen); - instance->wrote += hdr->bh_caplen; - rbuf_offset = - BPF_WORDALIGN(rbuf_offset + - hdr->bh_caplen); - } + bpf_wait_for_fullbuf(instance); return 0; } -static void timer_handler(int arg) +int +main(int argc, char *argv[]) { - struct timeval curr; - time_t sec; - int i, ret; - uint32_t wrote = 0; - - for (i = 0; i < (rxqlen + txqlen + 1); i++) { - pthread_cancel(instances[i].thread); - pthread_join(instances[i].thread, (void **)&ret); - wrote += instances[i].wrote; - } - gettimeofday(&curr, NULL); - sec = curr.tv_sec - start.tv_sec; - wrote /= (1024 * 1024); - printf("sec:%ld wrote:%d MB thoughput:%f MB/s\n", - sec, wrote, (double)wrote / (double)sec); - exit(0); -} - -int main(int argc, char **argv) -{ - struct ifreq ifr; - int i, s, ret, maxcpus; + char ch; + int i, s, maxcpus; struct sigaction action = { - .sa_handler = timer_handler, + .sa_handler = (void (*)(int))handle_int, .sa_flags = 0 }; struct itimerval timer = { @@ -288,14 +486,53 @@ } }; - if (argc < 2) { - printf("usage: %s [ifname]\n", argv[0]); + sigemptyset(&action.sa_mask); + if (sigaction(SIGALRM, &action, NULL) < 0) { + perror("sigaction"); + return -1; + } + if (setitimer(ITIMER_REAL, &timer, NULL) < 0) { + perror("setitimer"); return -1; } - - ifname = argv[1]; + signal(SIGINT, (void *)handle_int); + while ((ch = getopt(argc, argv, "b:c:f:hIi:pPTwvz")) != -1) { + switch (ch) { + case 'b': + bflag = atoi(optarg); + break; + case 'i': + iflag = optarg; + break; + case 'I': + Iflag = 1; + break; + case 'p': + pflag = 1; + break; + case 'P': + Pflag = 1; + break; + case 'T': + Tflag = 1; + break; + case 'v': + vflag++; + break; +#ifdef BPF_BUFMODE_ZBUF + case 'z': + zflag++; + break; +#endif + default: + usage(); + } + } + if (iflag == NULL) + usage(); + ifr.ifr_addr.sa_family = AF_LOCAL; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, iflag, sizeof(ifr.ifr_name)); s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0); if (s < 0) { perror("socket"); @@ -314,18 +551,6 @@ instances = (struct bpf_thread_instance *) calloc(maxcpus, sizeof(struct bpf_thread_instance)); - sigemptyset(&action.sa_mask); - if (sigaction(SIGALRM, &action, NULL) < 0) { - perror("sigaction"); - return -1; - } - if (setitimer(ITIMER_REAL, &timer, NULL) < 0) { - perror("setitimer"); - return -1; - } - - gettimeofday(&start, NULL); - for (i = 0; i < maxcpus; i++) { instances[i].cpu = i; instances[i].rxqueue = -1; @@ -358,7 +583,7 @@ (void *(*)(void *))bpf_thread, &instances[i]); for (i = 0; i < maxcpus; i++) - pthread_join(instances[i].thread, (void **)&ret); + pthread_join(instances[i].thread, NULL); - return 0; + return (0); } ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/Makefile#2 (text+ko) ==== @@ -1,5 +1,7 @@ PROG= test_sqbpf SRCS+= test_sqbpf.c +DPADD= ${LIBPCAP} +LDADD= -lpcap NO_MAN= .include ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/test_sqbpf.c#2 (text+ko) ==== @@ -1,101 +1,377 @@ -/* $OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $ */ - -/* BPF socket interface code, originally contributed by Archie Cobbs. */ - -/* - * Copyright (c) 1995, 1996, 1998, 1999 - * The Internet Software Consortium. All rights reserved. +/*- + * Copyright (c) 2007 Seccuris Inc. + * Copyright (c) 2007 Christian S.J. Peron + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The Internet Software Consortium nor the names - * of its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM 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 INTERNET SOFTWARE CONSORTIUM 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 + * 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. * - * This software has been written for the Internet Software Consortium - * by Ted Lemon in cooperation with Vixie - * Enterprises. To learn more about the Internet Software Consortium, - * see ``http://www.vix.com/isc''. To learn more about Vixie - * Enterprises, see ``http://www.vix.com''. */ - #include -#include +#include #include -#include +#include #include -#include +#include + #include -#include #include #include #include -#include -#include +#include +#include #include +#include +#include +#include #include #include -#include -#include -#include +#include #include -#include +#include +#include + +int bpf_open(void); +void usage(void); +u_int64_t sum; /* cycles spent processing packet data */ +u_int64_t rsum; /* cycles spent in syscalls after wakeup */ +u_int64_t ssum; /* cycles spent not sleep in event loop */ +u_int64_t psum; /* cycles spent before buffer can be reclaimed */ + +static struct ifreq ifr; +static pcap_dumper_t *dp; +static pcap_t *p; +static int bpffd = -1; +static char *fflag = "-"; +static unsigned long cflag; +static int Iflag; +static char *iflag; +static int bflag = 32768; +static int wflag; +static int vflag; +static int zflag; +static int Tflag; +static int pflag; +static int Pflag; + +static u_char *bufa, *bufb; +static unsigned long packet_count; +static unsigned long packet_wrote; + +#ifndef BPF_BUFMODE_ZBUF +/* + * bpfnull uses certain constructs that depend on zero-copy definitions being + * present in bpf.h even when running in normal buffer mode. If the system + * doesn't have these constructs, define them locally. + */ +struct bpf_zbuf { + void *bz_bufa; + void *bz_bufb; + size_t bz_buflen; +}; +#warning "BPF_BUFMODE_ZBUF not present, building without zero-copy support" +#endif + +static int +handle_int(int sig __unused) +{ + struct bpf_stat bs; + double wrote, throughput; + + putchar('\n'); + printf("%lu cycles spent processing packets\n", sum); + printf("%lu cycles spent in a syscall after wakeup\n", rsum); + printf("%lu cycles spent not sleeping\n", ssum); + printf("%lu cycles spent before buffer reclaims\n", psum); + printf("%lu packets processed\n", packet_count); + wrote = (double)packet_wrote / (double)(1024 * 1024); + throughput = (wrote * 8) / 60; + printf("wrote:%f MB throughput:%f Mbps\n", + wrote, throughput); + if (ioctl(bpffd, BIOCGSTATS, &bs) < 0) + err(-1, "BIOCGSTATS"); + + printf("%u packets received (BPF)\n", bs.bs_recv); + printf("%u packets dropped (BPF)\n", bs.bs_drop); + + exit(0); +} + +u_int64_t +rdtsc(void) +{ + u_int32_t high, low; + + __asm __volatile("rdtsc" : "=a" (low), "=d" (high)); + return (low | ((u_int64_t) high << 32)); +} + +static void +bpf_init_dumpfile(void) +{ + + if (wflag == 0) + return; + p = pcap_open_dead(DLT_EN10MB, 0xffffU); + dp = pcap_dump_open(p, fflag); + if (dp == NULL) { + pcap_perror(p, fflag); + exit(1); + } +} + +#define CACHE_LINE_SIZE 32 + +static void +bpf_process_packets(struct bpf_zbuf *bz, char *bufname) +{ + struct pcap_pkthdr phd; + int clen, hlen, i; + u_char *b,*bp, *ep, *p, by; +#define bhp ((struct bpf_hdr *)bp) + + b = bp = bz->bz_bufa; + ep = bp + bz->bz_buflen; + while (bp < ep) { + packet_count++; + if (cflag > 0 && packet_count > cflag) + exit(0); + if (pflag) { + /* + * XXXCSJP this prefetch method needs to be + * re-visted + */ + __builtin_prefetch(bp + bhp->bh_datalen, 0, 3); + } + clen = bhp->bh_caplen; + hlen = bhp->bh_hdrlen; + p = (u_char *)bp + hlen; + phd.ts.tv_sec = bhp->bh_tstamp.tv_sec; + phd.ts.tv_usec = bhp->bh_tstamp.tv_usec; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 4 00:44:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78D3B1065675; Thu, 4 Aug 2011 00:44: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 36FC91065670 for ; Thu, 4 Aug 2011 00:44:10 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 238558FC0A for ; Thu, 4 Aug 2011 00:44:10 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p740iAW4000859 for ; Thu, 4 Aug 2011 00:44:10 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p740hnLY000839 for perforce@freebsd.org; Thu, 4 Aug 2011 00:43:49 GMT (envelope-from jceel@freebsd.org) Date: Thu, 4 Aug 2011 00:43:49 GMT Message-Id: <201108040043.p740hnLY000839@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 00:44:10 -0000 http://p4web.freebsd.org/@@197162?ac=10 Change 197162 by jceel@jceel_cyclone on 2011/08/04 00:43:21 IFC @197161 Affected files ... .. //depot/projects/soc2011/jceel_lpc/Makefile#2 integrate .. //depot/projects/soc2011/jceel_lpc/Makefile.inc1#2 integrate .. //depot/projects/soc2011/jceel_lpc/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2011/jceel_lpc/UPDATING#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/expr/expr.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/expr/expr.y#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/ps/extern.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/ps/print.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/ps/ps.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/rcp/rcp.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/realpath/realpath.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/realpath/realpath.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/alias.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/alias.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/arith.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/arith_yacc.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/cd.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/cd.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/eval.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/eval.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/exec.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/expand.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/expand.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/input.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/jobs.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/jobs.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/main.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/main.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/mkbuiltins#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/mkinit.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/mktokens#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/nodetypes#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/options.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/options.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/parser.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/parser.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/sh.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/trap.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/trap.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/var.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/bin/sh/var.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/compat/opensolaris/include/assert.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/CHANGES#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/HISTORY#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/KNOWN-DEFECTS#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/NSEC3-NOTES#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/README#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/README.idnkit#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/README.pkcs11#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.html#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.pdf#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/RELEASE-NOTES-BIND-9.6.3.txt#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/ddns-confgen.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/ddns-confgen.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/ddns-confgen.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/ddns-confgen.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/include/confgen/os.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/keygen.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/keygen.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/rndc-confgen.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/rndc-confgen.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/rndc-confgen.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/rndc-confgen.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/unix/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/unix/os.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/util.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/confgen/util.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-revoke.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-revoke.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-revoke.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-revoke.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-settime.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-settime.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-settime.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-settime.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/bind.keys.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/bind9.xsl#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/bind9.xsl.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/convertxsl.pl#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/statschannel.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/statschannel.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc-confgen.8#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc-confgen.c#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc-confgen.html#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/unix/Makefile.in#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/unix/os.c#2 delete .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/arpaname.1#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/arpaname.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/arpaname.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/arpaname.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/genrandom.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/genrandom.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/genrandom.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/genrandom.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/isc-hmac-fixup.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/isc-hmac-fixup.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/isc-hmac-fixup.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/isc-hmac-fixup.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/named-journalprint.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/named-journalprint.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/named-journalprint.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/named-journalprint.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/nsec3hash.8#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/nsec3hash.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/nsec3hash.docbook#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/bin/tools/nsec3hash.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/config.guess#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/config.h.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/configure.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/dnssec.xml#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/libdns.xml#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.arpaname.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.ddns-confgen.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-revoke.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-settime.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.genrandom.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.isc-hmac-fixup.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.named-journalprint.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.nsec3hash.html#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/managed-keys.xml#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/arm/pkcs11.xml#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/client.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dns64.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ecdb.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/client.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dns64.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/ecdb.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/iptable.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/keydata.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/private.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rpz.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/rriterator.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/tsec.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/iptable.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/keydata.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/nsec3.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/opensslgost_link.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/private.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/hip_55.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/hip_55.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/keydata_65533.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rpz.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/rriterator.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/spnego.asn1#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/spnego.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/spnego.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/spnego_asn1.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/spnego_asn1.pl#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ssu_external.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/tsec.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/dns/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/dns/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/dns/include/dns/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/dns/include/dst/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/irs/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/irs/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/irs/include/irs/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/include/isc/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/include/isc/bind9.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/nls/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/nothreads/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/nothreads/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/nothreads/include/isc/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/pthreads/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/pthreads/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/pthreads/include/isc/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/unix/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/unix/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isc/unix/include/isc/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isccfg/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isccfg/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/isccfg/include/isccfg/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/Makefile-postinstall.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/nsprobe.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/sample-async.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/sample-gai.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/sample-request.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/sample-update.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/export/samples/sample.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/api#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/context.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/dnsconf.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/gai_strerror.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/getnameinfo.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/Makefile.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/context.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/dnsconf.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/netdb.h.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/platform.h.in#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/resconf.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/types.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/include/irs/version.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/resconf.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/irs/version.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/app_api.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/backtrace-emptytbl.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/backtrace.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/base32.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/httpd.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/backtrace.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/base32.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/bind9.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/httpd.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/iterated_hash.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/namespace.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/radix.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/stats.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/include/isc/xml.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/iterated_hash.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mem_api.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/noatomic/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/noatomic/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/portset.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/powerpc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/powerpc/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/radix.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/refcount.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sha2.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/socket_api.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sparc64/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sparc64/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/stats.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/task_api.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/timer_api.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_32/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_32/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_64/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_64/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/aclconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/dnsconf.c#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/dnsconf.h#1 branch .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/soc2011/jceel_lpc/contrib/bind9/lib/lwres/man/lwres.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 4 14:06:33 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4987A1065673; Thu, 4 Aug 2011 14:06: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 E7BA6106564A for ; Thu, 4 Aug 2011 14:06:32 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D49278FC0C for ; Thu, 4 Aug 2011 14:06:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74E6WH5062030 for ; Thu, 4 Aug 2011 14:06:32 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74E6WIe062027 for perforce@freebsd.org; Thu, 4 Aug 2011 14:06:32 GMT (envelope-from jceel@freebsd.org) Date: Thu, 4 Aug 2011 14:06:32 GMT Message-Id: <201108041406.p74E6WIe062027@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 14:06:33 -0000 http://p4web.freebsd.org/@@197184?ac=10 Change 197184 by jceel@jceel_cyclone on 2011/08/04 14:05:30 Remove unneeded files from previous commit. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#9 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#8 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_dmac.c#2 delete .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_mmc.c#4 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#8 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#6 edit .. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#9 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#9 (text+ko) ==== @@ -97,9 +97,6 @@ device lpcfb -# DMAC -device dmac - # Flattened Device Tree options FDT options FDT_DTB_STATIC ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#8 (text+ko) ==== @@ -15,7 +15,6 @@ arm/lpc/lpc_fb.c optional lpcfb arm/lpc/lpc_gpio.c optional lpcgpio arm/lpc/lpc_spi.c optional lpcspi -arm/lpc/lpc_dmac.c optional dmac arm/lpc/ssd1289.c optional ssd1289 dev/uart/uart_dev_ns8250.c optional uart kern/kern_clocksource.c standard ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_mmc.c#4 (text+ko) ==== @@ -69,12 +69,10 @@ device_t lm_dev; struct mtx lm_mtx; struct resource * lm_mem_res; - struct resource * lm_cmd_irq_res; - struct resource * lm_data_irq_res; + struct resource * lm_irq_res; bus_space_tag_t lm_bst; bus_space_handle_t lm_bsh; - void * lm_cmd_intrhand; - void * lm_data_intrhand; + void * lm_intrhand; struct mmc_host lm_host; struct mmc_request * lm_req; struct mmc_data * lm_data; @@ -89,26 +87,10 @@ #define LPC_SD_BLOCKSIZE 512 -#define LPC_SD_CMD_MASK \ - (LPC_SD_STATUS_CMDSENT | LPC_SD_STATUS_CMDRESPEND | \ - LPC_SD_STATUS_CMDTIMEOUT | LPC_SD_STATUS_CMDCRCFAIL | \ - LPC_SD_STATUS_STARTBITERR) - -#define LPC_SD_DATA_MASK \ - (LPC_SD_STATUS_RXDATAAVLBL | LPC_SD_STATUS_TXDATAAVLBL | \ - LPC_SD_STATUS_RXFIFOEMPTY | LPC_SD_STATUS_TXFIFOEMPTY | \ - LPC_SD_STATUS_RXFIFOFULL | LPC_SD_STATUS_TXFIFOFULL | \ - LPC_SD_STATUS_RXFIFOHALFFULL | LPC_SD_STATUS_TXFIFOHALFEMPTY | \ - LPC_SD_STATUS_RXACTIVE | LPC_SD_STATUS_TXACTIVE | \ - LPC_SD_STATUS_DATABLOCKEND | LPC_SD_STATUS_DATAEND | \ - LPC_SD_STATUS_RXOVERRUN | LPC_SD_STATUS_TXUNDERRUN | \ - LPC_SD_STATUS_DATATIMEOUT | LPC_SD_STATUS_DATACRCFAIL) - static int lpc_mmc_probe(device_t); static int lpc_mmc_attach(device_t); static int lpc_mmc_detach(device_t); -static void lpc_mmc_cmd_intr(void *); -static void lpc_mmc_data_intr(void *); +static void lpc_mmc_intr(void *); static void lpc_mmc_cmd(struct lpc_mmc_softc *, struct mmc_command *); static void lpc_mmc_setup_xfer(struct lpc_mmc_softc *, struct mmc_data *); @@ -166,50 +148,28 @@ device_printf(dev, "virtual register space: 0x%08lx\n", sc->lm_bsh); rid = 0; - sc->lm_cmd_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + sc->lm_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (!sc->lm_cmd_irq_res) { - device_printf(dev, "cannot allocate cmd interrupt\n"); + if (!sc->lm_irq_res) { + device_printf(dev, "cannot allocate interrupt\n"); bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->lm_mem_res); return (ENXIO); } - rid = 1; - sc->lm_data_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_ACTIVE); - if (!sc->lm_data_irq_res) { - device_printf(dev, "cannot allocate data interrupt\n"); - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->lm_mem_res); - return (ENXIO); - } - - - if (bus_setup_intr(dev, sc->lm_cmd_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - NULL, lpc_mmc_cmd_intr, sc, &sc->lm_cmd_intrhand)) + if (bus_setup_intr(dev, sc->lm_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + NULL, lpc_mmc_intr, sc, &sc->lm_intrhand)) { bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->lm_mem_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_cmd_irq_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_irq_res); device_printf(dev, "cannot setup interrupt handler\n"); return (ENXIO); } - if (bus_setup_intr(dev, sc->lm_data_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - NULL, lpc_mmc_data_intr, sc, &sc->lm_data_intrhand)) - { - bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->lm_mem_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_cmd_irq_res); - device_printf(dev, "cannot setup interrupt handler\n"); - return (ENXIO); - } - sc->lm_host.f_min = 312500; - sc->lm_host.f_max = 3125000;//25000000; + sc->lm_host.f_max = 25000000; sc->lm_host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340; sc->lm_host.caps = MMC_CAP_4_BIT_DATA; - bus_space_write_4(sc->lm_bst, 0xd0028000, 0x70, (1 << 15)); - bus_space_write_4(sc->lm_bst, 0xd0028000, 0x64, (1 << 15)); - lpc_pwr_write(dev, LPC_CLKPWR_MS_CTRL, LPC_CLKPWR_MS_CTRL_CLOCK_EN | LPC_CLKPWR_MS_CTRL_SD_CLOCK | 1); lpc_mmc_write_4(sc, LPC_SD_POWER, LPC_SD_POWER_CTRL_ON); @@ -219,11 +179,9 @@ child = device_add_child(dev, "mmc", -1); if (!child) { device_printf(dev, "attaching MMC bus failed!\n"); - bus_teardown_intr(dev, sc->lm_cmd_irq_res, sc->lm_cmd_intrhand); - bus_teardown_intr(dev, sc->lm_data_irq_res, sc->lm_data_intrhand); + bus_teardown_intr(dev, sc->lm_irq_res, sc->lm_intrhand); bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->lm_mem_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_cmd_irq_res); - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_data_irq_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lm_irq_res); return (ENXIO); } @@ -242,7 +200,7 @@ } static void -lpc_mmc_cmd_intr(void *arg) +lpc_mmc_intr(void *arg) { struct lpc_mmc_softc *sc = (struct lpc_mmc_softc *)arg; struct mmc_command *cmd; @@ -250,7 +208,17 @@ status = lpc_mmc_read_4(sc, LPC_SD_STATUS); - device_printf(sc->lm_dev, "cmd interrupt: 0x%08x\n", status); + device_printf(sc->lm_dev, "interrupt: 0x%08x\n", status); + + if (status & LPC_SD_STATUS_TXACTIVE) { + device_printf(sc->lm_dev, "TX active\n"); + lpc_mmc_fifo_write(sc); + } + + if (status & LPC_SD_STATUS_RXACTIVE) { + device_printf(sc->lm_dev, "RX active\n"); + lpc_mmc_fifo_read(sc); + } if (status & LPC_SD_STATUS_CMDCRCFAIL) { device_printf(sc->lm_dev, "command CRC error\n"); @@ -275,6 +243,10 @@ sc->lm_req = NULL; } + if (status & LPC_SD_STATUS_DATATIMEOUT) { + device_printf(sc->lm_dev, "data timeout\n"); + lpc_mmc_write_4(sc, LPC_SD_CLEAR, LPC_SD_STATUS_DATATIMEOUT); + } #if 0 if (status & LPC_SD_STATUS_TXUNDERRUN) { @@ -346,48 +318,12 @@ device_printf(sc->lm_dev, "isr done\n"); } -static void -lpc_mmc_data_intr(void *arg) -{ - struct lpc_mmc_softc *sc = (struct lpc_mmc_softc *)arg; - uint32_t status; - - status = lpc_mmc_read_4(sc, LPC_SD_STATUS); - - //device_printf(sc->lm_dev, "data interrupt: 0x%08x\n", status); - - if (status & LPC_SD_STATUS_TXACTIVE) { - device_printf(sc->lm_dev, "TX active\n"); - lpc_mmc_fifo_write(sc); - } - - if (status & LPC_SD_STATUS_RXACTIVE) { - //device_printf(sc->lm_dev, "RX active\n"); - lpc_mmc_fifo_read(sc); - } - - if (status & LPC_SD_STATUS_DATATIMEOUT) { - device_printf(sc->lm_dev, "data timeout\n"); - lpc_mmc_write_4(sc, LPC_SD_CLEAR, LPC_SD_STATUS_DATATIMEOUT); - } - - if (status & LPC_SD_STATUS_DATAEND) { - device_printf(sc->lm_dev, "data end, transffered %d bytes\n", - sc->lm_xfer_done); - lpc_mmc_write_4(sc, LPC_SD_CLEAR, LPC_SD_STATUS_DATAEND); - lpc_mmc_write_4(sc, LPC_SD_CLEAR, LPC_SD_STATUS_DATABLOCKEND); - } - - - //lpc_mmc_write_4(sc, LPC_SD_MASK1, 0); -} - static int lpc_mmc_request(device_t bus, device_t child, struct mmc_request *req) { struct lpc_mmc_softc *sc = device_get_softc(bus); - //device_printf(bus, "lpc_mmc_request: %p\n", req); + device_printf(bus, "lpc_mmc_request: %p\n", req); lpc_mmc_lock(sc); if (sc->lm_req) @@ -411,7 +347,7 @@ //struct mmc_data *data = cmd->data; uint32_t cmdreg = 0; - //device_printf(sc->lm_dev, "cmd: %d arg: 0x%08x\n", cmd->opcode, cmd->arg); + device_printf(sc->lm_dev, "cmd: %d arg: 0x%08x\n", cmd->opcode, cmd->arg); if (cmd->flags & MMC_RSP_PRESENT) cmdreg |= LPC_SD_COMMAND_RESPONSE; @@ -425,12 +361,12 @@ cmdreg |= LPC_SD_COMMAND_ENABLE; cmdreg |= (cmd->opcode & LPC_SD_COMMAND_CMDINDEXMASK); - lpc_mmc_write_4(sc, LPC_SD_MASK0, LPC_SD_CMD_MASK); - lpc_mmc_write_4(sc, LPC_SD_MASK1, LPC_SD_DATA_MASK); + lpc_mmc_write_4(sc, LPC_SD_MASK0, 0xffffffff); + lpc_mmc_write_4(sc, LPC_SD_MASK1, 0xffffffff); lpc_mmc_write_4(sc, LPC_SD_ARGUMENT, cmd->arg); lpc_mmc_write_4(sc, LPC_SD_COMMAND, cmdreg); - //device_printf(sc->lm_dev, "cmdarg: 0x%08x, cmdreg: 0x%08x\n", cmd->arg, cmdreg); + device_printf(sc->lm_dev, "cmdarg: 0x%08x, cmdreg: 0x%08x\n", cmd->arg, cmdreg); } static void @@ -441,7 +377,7 @@ sc->lm_data = data; sc->lm_xfer_done = 0; - //device_printf(sc->lm_dev, "setup_xfer data: %p\n", data); + device_printf(sc->lm_dev, "setup_xfer data: %p\n", data); if (data->flags & MMC_DATA_READ) sc->lm_xfer_direction = DIRECTION_READ; @@ -453,14 +389,14 @@ ? LPC_SD_DATACTRL_WRITE : LPC_SD_DATACTRL_READ); - datactrl |= LPC_SD_DATACTRL_ENABLE | LPC_SD_DATACTRL_MODE; + datactrl |= LPC_SD_DATACTRL_ENABLE; - //if (data->len > LPC_SD_BLOCKSIZE) - datactrl |= 0x20; + if (data->len > LPC_SD_BLOCKSIZE) + datactrl |= 0x90; - //device_printf(sc->lm_dev, "setup_xfer: datactrl=0x%08x\n", datactrl); + device_printf(sc->lm_dev, "setup_xfer: datactrl=0x%08x\n", datactrl); - lpc_mmc_write_4(sc, LPC_SD_DATATIMER, 0xFFFF0000); + lpc_mmc_write_4(sc, LPC_SD_DATATIMER, 0x100000); lpc_mmc_write_4(sc, LPC_SD_DATALENGTH, data->len); lpc_mmc_write_4(sc, LPC_SD_DATACTRL, datactrl); @@ -473,12 +409,12 @@ { do { uint32_t *data = sc->lm_data->data; - // int todo = sc->lm_data->len > 16 ? 16 : (sc->lm_data->len / 4) - sc->lm_xfer_done; - //device_printf(sc->lm_dev, "reading from fifo %d words [%d of %d words done]\n", - //todo, sc->lm_xfer_done, (sc->lm_data->len / 4)); - - while ((lpc_mmc_read_4(sc, LPC_SD_STATUS) & LPC_SD_STATUS_RXDATAAVLBL)) { - + int i; + int todo = sc->lm_data->len > 16 ? 16 : (sc->lm_data->len / 4) - sc->lm_xfer_done; + device_printf(sc->lm_dev, "reading from fifo %d words [%d of %d words done]\n", + todo, sc->lm_xfer_done, (sc->lm_data->len / 4)); + + for (i = 0; i < 16; i++) { data[sc->lm_xfer_done] = lpc_mmc_read_4(sc, LPC_SD_FIFO); sc->lm_xfer_done++; @@ -492,12 +428,11 @@ */ //sc->lm_xfer_done += 16; - } while (sc->lm_xfer_done < (sc->lm_data->len / 4)); + device_printf(sc->lm_dev, "currently done %d\n", sc->lm_xfer_done); + kdb_enter("data read", "data read"); + } while (lpc_mmc_read_4(sc, LPC_SD_STATUS) & LPC_SD_STATUS_RXDATAAVLBL); - device_printf(sc->lm_dev, "read done, read %d bytes, status: 0x%08x\n", - sc->lm_xfer_done, lpc_mmc_read_4(sc, LPC_SD_STATUS)); - - lpc_mmc_write_4(sc, LPC_SD_CLEAR, LPC_SD_STATUS_DATACRCFAIL); + device_printf(sc->lm_dev, "partial read done\n"); } static void @@ -625,7 +560,7 @@ if ((LPC_SD_CLK / (2 * (clkdiv + 1))) > ios->clock) clkdiv++; - //device_printf(bus, "clock: %dHz, clkdiv: %d\n", ios->clock, clkdiv); + device_printf(bus, "clock: %dHz, clkdiv: %d\n", ios->clock, clkdiv); lpc_mmc_write_4(sc, LPC_SD_CLOCK, clkdiv | LPC_SD_CLOCK_ENABLE); return (0); ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#8 (text+ko) ==== @@ -141,7 +141,6 @@ #define LPC_CLKPWR_MS_CTRL_SD_CLOCK (1 << 5) #define LPC_CLKPWR_MS_CTRL_CLKDIV_MASK 0xf #define LPC_CLKPWR_DMACLK_CTRL 0xe8 -#define LPC_CLKPWR_DMACLK_CTRL_EN (1 << 0) #define LPC_CLKPWR_FLASHCLK_CTRL 0xc8 #define LPC_CLKPWR_MACCLK_CTRL 0x90 #define LPC_CLKPWR_LCDCLK_CTRL 0x54 @@ -561,8 +560,6 @@ #define LPC_DMAC_SOFTLSREQ 0x2c #define LPC_DMAC_CONFIG 0x30 #define LPC_DMAC_CHADDR(_n) (0x100 + (_n * 0x20)) -#define LPC_DMAC_CHNUM 8 -#define LPC_DMAC_CHSIZE 0x20 #define LPC_DMAC_CH_SRCADDR 0x00 #define LPC_DMAC_CH_DSTADDR 0x04 #define LPC_DMAC_CH_LLI 0x08 @@ -585,10 +582,6 @@ #define LPC_DMAC_CH_CONFIG_ITC (1 << 15) #define LPC_DMAC_CH_CONFIG_IE (1 << 14) #define LPC_DMAC_CH_CONFIG_FLOWCNTL(_n) ((_n & 0x7) << 11) -#define LPC_DMAC_CH_FCNTL_MEM_TO_MEM 0 -#define LPC_DMAC_CH_FCNTL_MEM_TO_DEV 1 -#define LPC_DMAC_CH_FCNTL_DEV_TO_MEM 2 -#define LPC_DMAC_CH_FCNTL_DEV_TO_DEV 3 #define LPC_DMAC_CH_CONFIG_DESTP(_n) ((_n & 0x1f) << 6) #define LPC_DMAC_CH_CONFIG_SRCP(_n) ((_n & 0x1f) << 1) #define LPC_DMAC_CH_CONFIG_E (1 << 0) ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#6 (text+ko) ==== @@ -44,13 +44,10 @@ /* DMA */ struct lpc_dmac_channel_config { - int ldc_fcntl; int ldc_src_periph; + int ldc_dst_periph; int ldc_src_width; - int ldc_src_incr; - int ldc_dst_periph; int ldc_dst_width; - int ldc_dst_incr; void (*ldc_success_handler)(void); void (*ldc_error_handler)(void); }; ==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#9 (text+ko) ==== @@ -179,13 +179,6 @@ compatible = "simple-bus"; ranges = <0x0 0x30000000 0x10000000>; - dmac@100000 { - compatible = "lpc,dmac"; - reg = <0x100000 0x20000>; - interrupts = <28>; - interrupt-parent = <&PIC>; - }; - usb@1020000 { compatible = "lpc,usb-ohci", "usb-ohci"; reg = <0x1020000 0x20000>; From owner-p4-projects@FreeBSD.ORG Thu Aug 4 14:07:39 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 575B11065675; Thu, 4 Aug 2011 14:07: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 01978106566C for ; Thu, 4 Aug 2011 14:07:39 +0000 (UTC) (envelope-from jceel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DB8D78FC0C for ; Thu, 4 Aug 2011 14:07:38 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74E7cJe062061 for ; Thu, 4 Aug 2011 14:07:38 GMT (envelope-from jceel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74E7coB062058 for perforce@freebsd.org; Thu, 4 Aug 2011 14:07:38 GMT (envelope-from jceel@freebsd.org) Date: Thu, 4 Aug 2011 14:07:38 GMT Message-Id: <201108041407.p74E7coB062058@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jceel@freebsd.org using -f From: Jakub Wojciech Klama To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 14:07:39 -0000 http://p4web.freebsd.org/@@197185?ac=10 Change 197185 by jceel@jceel_cyclone on 2011/08/04 14:07:17 Add early version of DMA controller driver. Affected files ... .. //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#10 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#9 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpc_dmac.c#3 add .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#9 edit .. //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#7 edit .. //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#10 edit Differences ... ==== //depot/projects/soc2011/jceel_lpc/sys/arm/conf/EA3250#10 (text+ko) ==== @@ -97,6 +97,9 @@ device lpcfb +# DMAC +device dmac + # Flattened Device Tree options FDT options FDT_DTB_STATIC ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/files.lpc#9 (text+ko) ==== @@ -15,6 +15,7 @@ arm/lpc/lpc_fb.c optional lpcfb arm/lpc/lpc_gpio.c optional lpcgpio arm/lpc/lpc_spi.c optional lpcspi +arm/lpc/lpc_dmac.c optional dmac arm/lpc/ssd1289.c optional ssd1289 dev/uart/uart_dev_ns8250.c optional uart kern/kern_clocksource.c standard ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcreg.h#9 (text+ko) ==== @@ -141,6 +141,7 @@ #define LPC_CLKPWR_MS_CTRL_SD_CLOCK (1 << 5) #define LPC_CLKPWR_MS_CTRL_CLKDIV_MASK 0xf #define LPC_CLKPWR_DMACLK_CTRL 0xe8 +#define LPC_CLKPWR_DMACLK_CTRL_EN (1 << 0) #define LPC_CLKPWR_FLASHCLK_CTRL 0xc8 #define LPC_CLKPWR_MACCLK_CTRL 0x90 #define LPC_CLKPWR_LCDCLK_CTRL 0x54 @@ -560,6 +561,8 @@ #define LPC_DMAC_SOFTLSREQ 0x2c #define LPC_DMAC_CONFIG 0x30 #define LPC_DMAC_CHADDR(_n) (0x100 + (_n * 0x20)) +#define LPC_DMAC_CHNUM 8 +#define LPC_DMAC_CHSIZE 0x20 #define LPC_DMAC_CH_SRCADDR 0x00 #define LPC_DMAC_CH_DSTADDR 0x04 #define LPC_DMAC_CH_LLI 0x08 @@ -582,6 +585,10 @@ #define LPC_DMAC_CH_CONFIG_ITC (1 << 15) #define LPC_DMAC_CH_CONFIG_IE (1 << 14) #define LPC_DMAC_CH_CONFIG_FLOWCNTL(_n) ((_n & 0x7) << 11) +#define LPC_DMAC_CH_FCNTL_MEM_TO_MEM 0 +#define LPC_DMAC_CH_FCNTL_MEM_TO_DEV 1 +#define LPC_DMAC_CH_FCNTL_DEV_TO_MEM 2 +#define LPC_DMAC_CH_FCNTL_DEV_TO_DEV 3 #define LPC_DMAC_CH_CONFIG_DESTP(_n) ((_n & 0x1f) << 6) #define LPC_DMAC_CH_CONFIG_SRCP(_n) ((_n & 0x1f) << 1) #define LPC_DMAC_CH_CONFIG_E (1 << 0) ==== //depot/projects/soc2011/jceel_lpc/sys/arm/lpc/lpcvar.h#7 (text+ko) ==== @@ -44,10 +44,13 @@ /* DMA */ struct lpc_dmac_channel_config { + int ldc_fcntl; int ldc_src_periph; + int ldc_src_width; + int ldc_src_incr; int ldc_dst_periph; - int ldc_src_width; int ldc_dst_width; + int ldc_dst_incr; void (*ldc_success_handler)(void); void (*ldc_error_handler)(void); }; ==== //depot/projects/soc2011/jceel_lpc/sys/boot/fdt/dts/ea3250.dts#10 (text+ko) ==== @@ -179,6 +179,13 @@ compatible = "simple-bus"; ranges = <0x0 0x30000000 0x10000000>; + dmac@100000 { + compatible = "lpc,dmac"; + reg = <0x100000 0x20000>; + interrupts = <28>; + interrupt-parent = <&PIC>; + }; + usb@1020000 { compatible = "lpc,usb-ohci", "usb-ohci"; reg = <0x1020000 0x20000>; From owner-p4-projects@FreeBSD.ORG Thu Aug 4 16:43:28 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFA5A106567D; Thu, 4 Aug 2011 16:43: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 B21CA106567A for ; Thu, 4 Aug 2011 16:43:27 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A04258FC14 for ; Thu, 4 Aug 2011 16:43:27 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74GhRxr094501 for ; Thu, 4 Aug 2011 16:43:27 GMT (envelope-from syuu@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74GhRP2094498 for perforce@freebsd.org; Thu, 4 Aug 2011 16:43:27 GMT (envelope-from syuu@FreeBSD.org) Date: Thu, 4 Aug 2011 16:43:27 GMT Message-Id: <201108041643.p74GhRP2094498@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to syuu@FreeBSD.org using -f From: Takuya ASADA To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 16:43:28 -0000 http://p4web.freebsd.org/@@197191?ac=10 Change 197191 by syuu@kikurage on 2011/08/04 16:43:15 Bugfix Affected files ... .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/Makefile#2 edit .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/test_mqbpf.c#3 edit .. //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/test_sqbpf.c#3 edit Differences ... ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ PROG= test_mqbpf SRCS+= test_mqbpf.c +DPADD= ${LIBPCAP} ${LIBPTHREAD} +LDADD= -lpcap -lpthread NO_MAN= -CFLAGS= -lpthread .include ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_mqbpf/test_mqbpf.c#3 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -67,19 +68,26 @@ u_char *bufa, *bufb; unsigned long count; unsigned long wrote; + pcap_dumper_t *dp; + pcap_t *p; }; static char *ifname = NULL; static struct bpf_thread_instance *instances; -static int rxqlen, txqlen; +static int rxqlen, txqlen, maxcpus; int bpf_open(void); void usage(void); static struct ifreq ifr; +static char *fflag; +#if 0 +static unsigned long cflag; +#endif static int Iflag; static char *iflag; static int bflag = 32768; +static int wflag; static int vflag; static int zflag; static int Tflag; @@ -111,26 +119,28 @@ u_int64_t ssum = 0; /* cycles spent not sleep in event loop */ u_int64_t psum = 0; /* cycles spent before buffer can be reclaimed */ unsigned long count = 0; -#if 0 u_int recv = 0; u_int drop = 0; -#endif - for (i = 0; i < (rxqlen + txqlen + 1); i++) { - pthread_cancel(instances[i].thread); - pthread_join(instances[i].thread, NULL); - wrote += (double)instances[i].wrote / (double)(1024 * 1024); + for (i = 0; i < maxcpus; i++) { + if (pthread_cancel(instances[i].thread) < 0) { + perror("pthread_cancel"); + exit(-1); + } + if (pthread_join(instances[i].thread, NULL) < 0) { + perror("pthread_join"); + exit(-1); + } + wrote += instances[i].wrote; sum += instances[i].sum; rsum += instances[i].rsum; ssum += instances[i].ssum; psum += instances[i].psum; count += instances[i].count; -#if 0 if (ioctl(instances[i].bpffd, BIOCGSTATS, &bs) < 0) err(-1, "BIOCGSTATS"); recv += bs.bs_recv; drop += bs.bs_drop; -#endif } putchar('\n'); @@ -139,14 +149,12 @@ printf("%lu cycles spent not sleeping\n", ssum); printf("%lu cycles spent before buffer reclaims\n", psum); printf("%lu packets processed\n", count); + wrote /= (double)(1024 * 1024); throughput = (wrote * 8) / 60; printf("wrote:%f MB throughput:%f Mbps\n", wrote, throughput); - -#if 0 printf("%u packets received (BPF)\n", recv); printf("%u packets dropped (BPF)\n", drop); -#endif exit(0); } @@ -160,13 +168,27 @@ return (low | ((u_int64_t) high << 32)); } -/* -#define CACHE_LINE_SIZE 32 -*/ +static void +bpf_init_dumpfile(struct bpf_thread_instance *instance) +{ + char filename[strlen(fflag) + 4]; + + if (wflag == 0) + return; + + snprintf(filename, strlen(fflag) + 4, "%s.%x", fflag, instance->cpu); + instance->p = pcap_open_dead(DLT_EN10MB, 0xffffU); + instance->dp = pcap_dump_open(instance->p, filename); + if (instance->dp == NULL) { + pcap_perror(instance->p, filename); + exit(-1); + } +} static void bpf_process_packets(struct bpf_thread_instance *instance, struct bpf_zbuf *bz, char *bufname) { + struct pcap_pkthdr phd; int clen, hlen, i; u_char *b,*bp, *ep, *p, by; #define bhp ((struct bpf_hdr *)bp) @@ -175,6 +197,10 @@ ep = bp + bz->bz_buflen; while (bp < ep) { instance->count++; +#if 0 + if (cflag > 0 && packet_count > cflag) + exit(0); +#endif if (pflag) { /* * XXXCSJP this prefetch method needs to be @@ -184,12 +210,24 @@ } clen = bhp->bh_caplen; hlen = bhp->bh_hdrlen; + p = (u_char *)bp + hlen; + phd.ts.tv_sec = bhp->bh_tstamp.tv_sec; + phd.ts.tv_usec = bhp->bh_tstamp.tv_usec; + phd.caplen = phd.len = bhp->bh_datalen; if (Tflag) { for (i = 0; i < bhp->bh_datalen; i++) by = p[i]; bp += BPF_WORDALIGN(clen + hlen); continue; } + if (wflag) { + pcap_dump((u_char *)instance->dp, &phd, p); + if (ferror((FILE *)instance->dp)) { + perror("dump.pcap"); + exit(-1); + } + fflush((FILE *)instance->dp); + } instance->wrote += bhp->bh_caplen; bp += BPF_WORDALIGN(clen + hlen); } @@ -233,8 +271,7 @@ n = read(instance->bpffd, pbuf, bflag); d = rdtsc(); if (n < 0) -// err(1, "read failed"); - fprintf(stderr, "read failed"); + err(1, "read failed"); instance->psum += d - e; instance->rsum += d - c; bz.bz_bufa = pbuf; @@ -383,19 +420,24 @@ CPU_ZERO(&instance->cpuset); CPU_SET(instance->cpu, &instance->cpuset); - cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, - sizeof(cpuset_t), &instance->cpuset); + if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, + sizeof(cpuset_t), &instance->cpuset) < 0) { + perror("cpuset_setaffinity"); + exit(-1); + } bzero(&ifr, sizeof(ifr)); strlcpy(ifr.ifr_name, iflag, sizeof(ifr.ifr_name)); instance->bpffd = bpf_open(); - if (instance->bpffd == -1) { + if (instance->bpffd < 0) { (void) fprintf(stderr, "bpfnull: no bpf device available\n"); - exit(1); + exit(-1); } if (vflag) (void) fprintf(stderr, "DEBUG: obtained bpf fd=%d\n", instance->bpffd); + if (fflag) + bpf_init_dumpfile(instance); #ifdef BPF_BUFMODE_ZBUF if (zflag) { if (vflag) @@ -470,7 +512,7 @@ main(int argc, char *argv[]) { char ch; - int i, s, maxcpus; + int i, s; struct sigaction action = { .sa_handler = (void (*)(int))handle_int, .sa_flags = 0 @@ -501,6 +543,18 @@ case 'b': bflag = atoi(optarg); break; +#if 0 + case 'c': + { + char *r; + cflag = strtoul(optarg, &r, 10); + } + break; +#endif + case 'f': + fflag = optarg; + wflag = 1; + break;; case 'i': iflag = optarg; break; @@ -516,6 +570,9 @@ case 'T': Tflag = 1; break; + case 'w': + wflag = 1; + break; case 'v': vflag++; break; @@ -578,12 +635,20 @@ instances[0].other = 1; - for (i = 0; i < maxcpus; i++) - pthread_create(&instances[i].thread, NULL, - (void *(*)(void *))bpf_thread, &instances[i]); + for (i = 0; i < maxcpus; i++) { + if (pthread_create(&instances[i].thread, NULL, + (void *(*)(void *))bpf_thread, &instances[i]) < 0) { + perror("pthread_create"); + return -1; + } + } - for (i = 0; i < maxcpus; i++) - pthread_join(instances[i].thread, NULL); + for (i = 0; i < maxcpus; i++) { + if (pthread_join(instances[i].thread, NULL) < 0) { + perror("pthread_join"); + return -1; + } + } return (0); } ==== //depot/projects/soc2011/mq_bpf/src/tools/regression/bpf/mq_bpf/test_sqbpf/test_sqbpf.c#3 (text+ko) ==== @@ -329,11 +329,6 @@ bmode = BPF_BUFMODE_ZBUF; if (ioctl(bpffd, BIOCSETBUFMODE, &bmode) < 0) err(1, "ioctl(BIOCGSETBUFMODE)"); - u_int zbufmax; - if (ioctl(bpffd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) { - err(1, "ioctl(BIOCGETZMAX)"); - } - printf("zbufmax:%d\n", zbufmax); if (ioctl(bpffd, BIOCSETZBUF, bz) < 0) err(1, "ioctl(BIOCSETZBUF)"); if (vflag) From owner-p4-projects@FreeBSD.ORG Thu Aug 4 20:13:03 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 604BE1065670; Thu, 4 Aug 2011 20:13: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 22823106566B for ; Thu, 4 Aug 2011 20:13:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0F13D8FC0C for ; Thu, 4 Aug 2011 20:13:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74KD2t9035611 for ; Thu, 4 Aug 2011 20:13:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74KD2BM035608 for perforce@freebsd.org; Thu, 4 Aug 2011 20:13:02 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 4 Aug 2011 20:13:02 GMT Message-Id: <201108042013.p74KD2BM035608@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 20:13:03 -0000 http://p4web.freebsd.org/@@197197?ac=10 Change 197197 by rene@rene_acer on 2011/08/04 20:12:49 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#99 integrate .. //depot/projects/docproj_nl/www/en/cgi/GnatsPR.pm#3 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#42 integrate .. //depot/projects/docproj_nl/www/en/internal/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/internal/data.sgml#1 branch .. //depot/projects/docproj_nl/www/en/internal/policies.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/internal/resources.sgml#1 branch .. //depot/projects/docproj_nl/www/en/ipv6/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/platforms/pc98.sgml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/common.ent#3 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#41 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#99 (text+ko) ==== @@ -1,4 +1,4 @@ - + - + %developers; @@ -55,6 +55,10 @@

    Latest news

      +
    • August 3, 2011: 9.0-BETA1 IPv6-only snapshots available. + For more details and download links see + IPv6Only wiki page. +
    • June 9, 2011: Thanks to everyone having joined us for World IPv6 Day. We have some (unspectacular) statistics of www.freebsd.org starting 12 hours before and running ==== //depot/projects/docproj_nl/www/en/platforms/pc98.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -10,21 +10,22 @@ &header;

      Introduction

      -

      FreeBSD/pc98 is a port of FreeBSD which aims to run +

      &os;/&arch.pc98; is a port of &os; which aims to run on the NEC PC-98x1 (pc98) architecture. - The project's goal is to make FreeBSD/pc98 work - the same as FreeBSD on other architectures. + The project's goal is to make &os;/&arch.pc98; work + the same as FreeBSD on other architectures. Most of the kernel source is already included in the FreeBSD source tree and most of the userland utilities built from the source work fine.

      Status

      -

      FreeBSD/pc98 is a &os;/&arch.pc98; is a - Tier 1 architecture, and as such is fully supported by the - FreeBSD project.

      + Tier 2 architecture at the time of 9.0-RELEASE. Although + this was a Tier 1 for a long time since 5.0-RELEASE, it was + downgraded because of some technical reason.

      -

      FreeBSD/pc98 Hardware Notes

      +

      &os;/&arch.pc98; Hardware Notes

      &rel.head;-CURRENT Hardware Notes @@ -45,7 +46,7 @@
    • Rewrite boot[12] to support the ELF binary format.
    -

    FreeBSD/pc98 Related Links

    +

    &os;/&arch.pc98; Related Links

    • FreeBSD(98) Project
      • ==== //depot/projects/docproj_nl/www/share/sgml/common.ent#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -61,6 +61,18 @@ + + + + + + + + + + + + ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#41 (text+ko) ==== @@ -10,7 +10,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 4 20:21:49 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55C68106566B; Thu, 4 Aug 2011 20:21: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 185F01065670 for ; Thu, 4 Aug 2011 20:21:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 056F48FC13 for ; Thu, 4 Aug 2011 20:21:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p74KLmuL038377 for ; Thu, 4 Aug 2011 20:21:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p74KLmim038374 for perforce@freebsd.org; Thu, 4 Aug 2011 20:21:48 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 4 Aug 2011 20:21:48 GMT Message-Id: <201108042021.p74KLmim038374@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2011 20:21:49 -0000 http://p4web.freebsd.org/@@197198?ac=10 Change 197198 by rene@rene_acer on 2011/08/04 20:20:47 handbook/desktop: Remove the instructions to install Firefox 3.5 now that it has been removed from the Ports Collection. Also remove the instructions to install the JDK 1.6 plugin since these were specific to Firefox 3.5. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#23 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#23 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -187,11 +187,6 @@ &prompt.root; pkg_add -r firefox36 - If you want to run Firefox 3.5, - use instead: - - &prompt.root; pkg_add -r firefox35 - You can also use the Ports Collection if you prefer to compile from source code: @@ -200,8 +195,7 @@ For Firefox 3.6, in the previous command replace firefox with - firefox36. For Firefox - 3.5 use firefox35 instead. + firefox36. @@ -212,76 +206,6 @@ already installed Firefox. - According to the version of Firefox - you run various steps are required: - - - - For Firefox 3.5 - - The &os; Foundation has a license with Sun Microsystems to - distribute &os; binaries for the Java Runtime Environment - (&jre;) and Java Development Kit (&jdk;). Binary packages for - &os; are available on the &os; - Foundation web site. - - To add &java; support to - Firefox, you first have to install - the java/javavmwrapper port. Then, - download the Diablo &jre; package - from , - and install it with &man.pkg.add.1;. - - - The above site does not provide binary packages for - &os; 8.X. It is however possible - to use the packages for &os; 7.X - on an 8.X system. Simply install the - misc/compat7x port before - installing the package. - Alternatively, Diablo &jre; - (as well as Diablo &jdk;) may be - installed using the Ports Collection (the relevant ports are - java/diablo-jre16 and - java/diablo-jdk16). - Installing from the Ports Collection requires the source files - (distfiles) to be downloaded manually due to licensing issues. - Specific download instructions are provided when the - make install command - is invoked. - - - Start your browser, enter - about:plugins in the location bar and press - Enter. A page listing the installed plugins - will be displayed; the &java; - plugin should be listed there now. If it is not, each user - will have to run the following command: - - &prompt.user; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \ - $HOME/.mozilla/plugins/ - - or, if you installed the Diablo - &jdk; package: - - &prompt.user; ln -s /usr/local/diablo-jdk1.6.0/jre/plugin/i386/ns7/libjavaplugin_oji.so \ - $HOME/.mozilla/plugins/ - - Then relaunch your browser. - - - The commands above assume you are running the - &arch.i386; architecture, &arch.amd64; packages are also - available. - - - - - For Firefox 3.6 and 5.0<anchor id="moz-java-plugin-5"> - Install OpenJDK 6 through the Ports Collection by typing: @@ -297,18 +221,18 @@ Make sure you have kept the default configuration options for both ports. - Each user will have to run the following command: - - &prompt.user; ln -s /usr/local/lib/IcedTeaPlugin.so \ - $HOME/.mozilla/plugins/ - Start your browser, enter about:plugins in the location bar and press Enter. A page listing the installed plugins will be displayed; the &java; plugin should be listed there now. - - + + If the browser is unable to find the plugin, each user + will have to run the following command and relaunch the + browser: + + &prompt.user; ln -s /usr/local/lib/IcedTeaPlugin.so \ + $HOME/.mozilla/plugins/ @@ -476,7 +400,7 @@ appear with all the currently available plugins. To add the &java; plugin, - follow the instructions for + follow the instructions for Firefox. From owner-p4-projects@FreeBSD.ORG Fri Aug 5 16:09:10 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97CC91065672; Fri, 5 Aug 2011 16:09: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 5A053106566B for ; Fri, 5 Aug 2011 16:09:09 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 479308FC13 for ; Fri, 5 Aug 2011 16:09:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75G99TF076737 for ; Fri, 5 Aug 2011 16:09:09 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75G99g0076734 for perforce@freebsd.org; Fri, 5 Aug 2011 16:09:09 GMT (envelope-from cnicutar@freebsd.org) Date: Fri, 5 Aug 2011 16:09:09 GMT Message-Id: <201108051609.p75G99g0076734@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 16:09:10 -0000 http://p4web.freebsd.org/@@197225?ac=10 Change 197225 by cnicutar@cnicutar_cronos on 2011/08/05 16:08:46 Forward-port UTO kernel changes from 8 to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_input.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_output.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_subr.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_timer.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_usrreq.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_var.h#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp.h#2 (text+ko) ==== @@ -96,6 +96,8 @@ #define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ #define TCPOLEN_SIGNATURE 18 +#define TCPOPT_UTO 28 +#define TCPOLEN_UTO 4 /* Miscellaneous constants */ #define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */ @@ -103,6 +105,14 @@ /* + * The timeout ranges for TCP UTO have security implications; in particular, + * long timeouts might allow for denial-of-service attacks. + */ +#define TCP_UTOMIN 100 /* Minimum acceptable timeout. */ +#define TCP_UTOMAX 600 /* Maximum advertised timeout. */ + + +/* * The default maximum segment size (MSS) to be used for new TCP connections * when path MTU discovery is not enabled. * @@ -158,6 +168,8 @@ #define TCP_MD5SIG 0x10 /* use MD5 digests (RFC2385) */ #define TCP_INFO 0x20 /* retrieve tcp_info structure */ #define TCP_CONGESTION 0x40 /* get/set congestion control algorithm */ +#define TCP_SNDUTO_TIMEOUT 0x80 /* get/set sent UTO value */ +#define TCP_RCVUTO_TIMEOUT 0x100 /* accept UTO suggestion */ #define TCP_CA_NAME_MAX 16 /* max congestion control name length */ ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_input.c#2 (text+ko) ==== @@ -1324,6 +1324,21 @@ (void *)tcp_saveipgen, &tcp_savetcp, 0); #endif tcp_dooptions(&to, optp, optlen, TO_SYN); + + if (to.to_flags & TOF_UTO) { + /* + * Storing the value even if the user might not + * accept it. Also, not clamping it just yet. + */ + tp->rcv_uto = (to.to_uto & UTO_MINS) ? + (to.to_uto & ~(UTO_MINS)) * 60 : to.to_uto; + /* + * XXX-CN Using option both for send and receive. + * Clear it for syncache. + */ + to.to_flags &= ~TOF_UTO; + } + syncache_add(&inc, &to, th, inp, &so, m); /* * Entry added to syncache and mbuf consumed. @@ -1511,6 +1526,18 @@ (thflags & TH_SYN) ? TO_SYN : 0); /* + * Processing received UTO even if the user doesn't accept it + * yet. The user might want to accept it later (perhaps after + * authentication) but the peer need not send it again. + * The value is converter to seconds and not clamped (the user + * needs to know the real value received). + */ + if (to.to_flags & TOF_UTO) { + tp->rcv_uto = (to.to_uto & UTO_MINS) ? + (to.to_uto & ~(UTO_MINS)) * 60 : to.to_uto; + } + + /* * If echoed timestamp is later than the current time, * fall back to non RFC1323 RTT calculation. Normalize * timestamp if syncookies were used when this connection @@ -3169,6 +3196,17 @@ to->to_sacks = cp + 2; TCPSTAT_INC(tcps_sack_rcv_blocks); break; + case TCPOPT_UTO: + if (optlen != TCPOLEN_UTO) + continue; + if (!V_uto_enable) + continue; + to->to_flags |= TOF_UTO; + bcopy((char *)cp + 2, + (char *)&to->to_uto, sizeof(to->to_uto)); + to->to_uto = htons(to->to_uto); + /* Avoid converting to seconds: it might overflow. */ + break; default: continue; } ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_output.c#2 (text+ko) ==== @@ -705,6 +705,18 @@ to.to_sacks = (u_char *)tp->sackblks; } } + /* UTO */ + if (tp->t_flags & TF_SND_UTO) { + to.to_uto = tp->snd_uto; + to.to_flags |= TOF_UTO; + /* + * The option is sent with the SYN and with the first + * non-SYN segment. + */ + if (!(flags & TH_SYN)) + tp->t_flags &= ~TF_SND_UTO; + + } #ifdef TCP_SIGNATURE /* TCP-MD5 (RFC2385). */ if (tp->t_flags & TF_SIGNATURE) @@ -1491,6 +1503,39 @@ TCPSTAT_INC(tcps_sack_send_blocks); break; } + case TOF_UTO: + while (optlen % 4) { + optlen += TCPOLEN_NOP; + *optp++ = TCPOPT_NOP; + } + if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) + continue; + optlen += TCPOLEN_UTO; + *optp++ = TCPOPT_UTO; + *optp++ = TCPOLEN_UTO; + + if (to->to_uto > UTO_MINS_TH) { + /* + * If the timeout is larger than UTO_MINS + * we'll specify minutes. + * XXX-CN UTO_MINS is arbitrary. + */ + to->to_uto /= 60; + to->to_uto |= UTO_MINS; + } + + /* + * XXX-CN to_uto is 32b because the user is allowed + * to specify more than 16b of seconds (dividing the + * value by 60 will make it fit). + */ + { + uint16_t uto = to->to_uto; + uto = htons(uto); + bcopy((u_char *)&uto, optp, sizeof(uto)); + optp += sizeof(uto); + } + break; default: panic("%s: unknown TCP option type", __func__); break; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_subr.c#2 (text+ko) ==== @@ -161,6 +161,24 @@ "Default TCP Maximum Segment Size for IPv6"); #endif /* INET6 */ +SYSCTL_NODE(_net_inet_tcp, OID_AUTO, uto, CTLFLAG_RW, 0, "TCP UTO"); + +VNET_DEFINE(int, uto_enable) = 1; +SYSCTL_VNET_INT(_net_inet_tcp_uto, OID_AUTO, enable, CTLFLAG_RW, + &VNET_NAME(uto_enable), 0, + "Enable TCP UTO for all connections"); + +VNET_DEFINE(int, uto_min_timeout) = TCP_UTOMIN; +SYSCTL_VNET_INT(_net_inet_tcp_uto, OID_AUTO, min_timeout, CTLFLAG_RW, + &VNET_NAME(uto_min_timeout), 0, + "Minimum accepted timeout for a connection"); + +VNET_DEFINE(int, uto_max_timeout) = 600; +SYSCTL_VNET_INT(_net_inet_tcp_uto, OID_AUTO, max_timeout, CTLFLAG_RW, + &VNET_NAME(uto_max_timeout), 0, + "Maximum accepted timeout for a connection"); + + /* * Minimum MSS we accept and use. This prevents DoS attacks where * we are forced to a ridiculous low MSS like 20 and send hundreds ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -827,6 +827,14 @@ #endif if (sc->sc_flags & SCF_SACK) tp->t_flags |= TF_SACK_PERMIT; + if (sc->sc_flags & SCF_SND_UTO) { + tp->t_flags |= TF_SND_UTO; + tp->snd_uto = sc->sc_snd_uto; + } + if (sc->sc_flags & SCF_RCV_UTO) { + tp->t_flags |= TF_RCV_UTO; + tp->rcv_uto = sc->sc_rcv_uto; + } } if (sc->sc_flags & SCF_ECN) @@ -1039,6 +1047,14 @@ struct syncache scs; struct ucred *cred; + /* + * The client may have sent us an UTO suggestion; even if it hasn't, + * we need to inherit the current disposition (i.e. will the resulting + * socket accept suggestions?). + */ + uint8_t rcv_uto_tf = 0; + uint32_t rcv_uto = 0; + INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); /* listen socket */ KASSERT((th->th_flags & (TH_RST|TH_ACK|TH_SYN)) == TH_SYN, @@ -1063,6 +1079,19 @@ sb_hiwat = so->so_rcv.sb_hiwat; ltflags = (tp->t_flags & (TF_NOOPT | TF_SIGNATURE)); + /* Set User Timeout to send in SYN-ACK. */ + if (tp->t_flags & TF_SND_UTO) { + /* Also inherited after connection is established. */ + to->to_uto = tp->snd_uto; + to->to_flags |= TOF_UTO; + } + + if (tp->t_flags & TF_RCV_UTO) { + /* Remember received timeout to pass on. */ + rcv_uto_tf = 1; + rcv_uto = tp->rcv_uto; + } + /* By the time we drop the lock these should no longer be used. */ so = NULL; tp = NULL; @@ -1271,7 +1300,17 @@ sc->sc_flags |= SCF_NOOPT; if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn) sc->sc_flags |= SCF_ECN; + if (to->to_flags & TOF_UTO) { + sc->sc_snd_uto = to->to_uto; + sc->sc_flags |= SCF_SND_UTO; + } + /* Inherit received UTO. */ + if (rcv_uto_tf) { + sc->sc_rcv_uto = rcv_uto; + sc->sc_flags |= SCF_RCV_UTO; + } + if (V_tcp_syncookies) { syncookie_generate(sch, sc, &flowtmp); #ifdef INET6 @@ -1438,6 +1477,10 @@ } if (sc->sc_flags & SCF_SACK) to.to_flags |= TOF_SACKPERM; + if (sc->sc_flags & SCF_SND_UTO) { + to.to_uto = sc->sc_snd_uto; + to.to_flags |= TOF_UTO; + } #ifdef TCP_SIGNATURE if (sc->sc_flags & SCF_SIGNATURE) to.to_flags |= TOF_SIGNATURE; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_syncache.h#2 (text+ko) ==== @@ -82,7 +82,8 @@ struct label *sc_label; /* MAC label reference */ struct ucred *sc_cred; /* cred cache for jail checks */ - u_int32_t sc_spare[2]; /* UTO */ + u_int32_t sc_snd_uto; /* user timeout to send */ + u_int32_t sc_rcv_uto; /* user timeout received */ }; /* @@ -96,6 +97,8 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #define SCF_ECN 0x100 /* send ECN setup packet */ +#define SCF_SND_UTO 0x200 /* send UTO */ +#define SCF_RCV_UTO 0x400 /* receive UTO suggestions */ #define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ #define SYNCOOKIE_LIFETIME 16 /* seconds */ ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_timer.c#2 (text+ko) ==== @@ -67,6 +67,9 @@ #include #endif +/* XXX-CN this will have to move */ +#define ticks_to_secs(t) ((t) / hz) + int tcp_keepinit; SYSCTL_PROC(_net_inet_tcp, TCPCTL_KEEPINIT, keepinit, CTLTYPE_INT|CTLFLAG_RW, &tcp_keepinit, 0, sysctl_msec_to_ticks, "I", "time to establish connection"); @@ -309,6 +312,18 @@ return; } callout_deactivate(&tp->t_timers->tt_keep); + if ((tp->snd_uto) || ((tp->t_flags & TF_RCV_UTO) && tp->rcv_uto)) { + /* + * This connection is using UTO (either sending or has + * received a value). We need to stop sending keepalives + * (RFC 5482 4.2). + * Returning without resetting the timer. + */ + INP_WUNLOCK(inp); + INP_INFO_WUNLOCK(&V_tcbinfo); + CURVNET_RESTORE(); + return; + } /* * Keep-alive timer went off; send something * or drop connection if idle for too long. @@ -447,6 +462,7 @@ int rexmt; int headlocked; struct inpcb *inp; + int uto_left = 0; #ifdef TCPDEBUG int ostate; @@ -477,12 +493,45 @@ } callout_deactivate(&tp->t_timers->tt_rexmt); tcp_free_sackholes(tp); + + if (tp->t_rxtshift == 0) + /* UTO starting again since it's the first retransmit. */ + tp->t_suto = 0; + + if (tp->snd_uto || ((tp->t_flags & TF_RCV_UTO) && tp->rcv_uto)) { + /* + * Since we're using UTO for this connection we need to + * compute how much time we've got left. + */ + uto_left = 0; + if (tp->t_flags & TF_RCV_UTO) + /* Clamping the received value. */ + uto_left = min(V_uto_max_timeout, + max(V_uto_min_timeout, tp->rcv_uto)); + + /* Taking the longer timeout. */ + uto_left = max(tp->snd_uto, uto_left); + + /* Subtract time that has passed since the first retransmit. */ + if (tp->t_suto) + uto_left -= ticks_to_secs(ticks - tp->t_suto); + + /* + * The user may choose a value that's less than TCP_MAXRXTSHIFT + * retransmits. + */ + if (uto_left <= 0) + /* Before or after the retransmits, UTO was exceeded. */ + goto timeoutdrop; + } + /* * Retransmission timer went off. Message has not * been acked within retransmit interval. Back off * to a longer retransmit interval and retransmit one segment. */ - if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) { + if (++tp->t_rxtshift > TCP_MAXRXTSHIFT && uto_left <= 0) { +timeoutdrop: tp->t_rxtshift = TCP_MAXRXTSHIFT; TCPSTAT_INC(tcps_timeoutdrop); in_pcbref(inp); @@ -525,13 +574,22 @@ tp->t_flags &= ~TF_WASCRECOVERY; tp->t_badrxtwin = ticks + (tp->t_srtt >> (TCP_RTT_SHIFT + 1)); tp->t_flags |= TF_PREVVALID; + tp->t_suto = ticks; /* Keep track of UTO start. */ } else tp->t_flags &= ~TF_PREVVALID; TCPSTAT_INC(tcps_rexmttimeo); if (tp->t_state == TCPS_SYN_SENT) rexmt = TCP_REXMTVAL(tp) * tcp_syn_backoff[tp->t_rxtshift]; - else - rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; + else { + if (tp->t_rxtshift <= TCP_MAXRXTSHIFT) + rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift]; + else + rexmt = TCPTV_REXMTMAX; + } + /* We might want to wait less than an entire backoff. */ + if (uto_left) + rexmt = min(rexmt, uto_left * hz); + TCPT_RANGESET(tp->t_rxtcur, rexmt, tp->t_rttmin, TCPTV_REXMTMAX); /* ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_usrreq.c#2 (text+ko) ==== @@ -1322,6 +1322,44 @@ INP_WUNLOCK(inp); break; #endif /* TCP_SIGNATURE */ + case TCP_SNDUTO_TIMEOUT: + INP_WUNLOCK(inp); + error = sooptcopyin(sopt, &optval, sizeof optval, + sizeof optval); + if (error) + return (error); + + INP_WLOCK_RECHECK(inp); + if (optval == 0) { + /* Disable sending the option. */ + tp->t_flags &= ~TF_SND_UTO; + tp->snd_uto = 0; + } else if (optval >= V_uto_min_timeout && + optval <= V_uto_max_timeout) { + /* The timeout is acceptable. */ + tp->snd_uto = optval; + tp->t_flags |= TF_SND_UTO; + } else + error = EINVAL; + + INP_WUNLOCK(inp); + break; + + case TCP_RCVUTO_TIMEOUT: + INP_WUNLOCK(inp); + error = sooptcopyin(sopt, &optval, sizeof optval, + sizeof optval); + if (error) + return (error); + + INP_WLOCK_RECHECK(inp); + if (optval <= 0) + /* This connection will ignore suggestions. */ + tp->t_flags &= ~TF_RCV_UTO; + else + tp->t_flags |= TF_RCV_UTO; + INP_WUNLOCK(inp); + break; case TCP_NODELAY: case TCP_NOOPT: INP_WUNLOCK(inp); @@ -1454,7 +1492,16 @@ error = sooptcopyout(sopt, &optval, sizeof optval); break; #endif - + case TCP_SNDUTO_TIMEOUT: + optval = tp->snd_uto; + INP_WUNLOCK(inp); + error = sooptcopyout(sopt, &optval, sizeof optval); + break; + case TCP_RCVUTO_TIMEOUT: + optval = tp->rcv_uto; + INP_WUNLOCK(inp); + error = sooptcopyout(sopt, &optval, sizeof optval); + break; case TCP_NODELAY: optval = tp->t_flags & TF_NODELAY; INP_WUNLOCK(inp); ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/sys/netinet/tcp_var.h#2 (text+ko) ==== @@ -203,9 +203,13 @@ struct cc_var *ccv; /* congestion control specific vars */ struct osd *osd; /* storage for Khelp module data */ - uint32_t t_ispare[12]; /* 4 keep timers, 5 UTO, 3 TBD */ + uint32_t t_ispare[9]; /* 4 keep timers, 2 UTO, 3 TBD */ void *t_pspare2[4]; /* 4 TBD */ uint64_t _pad[6]; /* 6 TBD (1-2 CC/RTT?) */ + + uint32_t snd_uto; /* sent timeout */ + uint32_t rcv_uto; /* received suggestion from peer */ + int t_suto; /* uto starting time */ }; /* @@ -225,6 +229,8 @@ #define TF_NEEDFIN 0x000800 /* send FIN (implicit state) */ #define TF_NOPUSH 0x001000 /* don't push */ #define TF_PREVVALID 0x002000 /* saved values for bad rxmit valid */ +#define TF_SND_UTO 0x004000 /* send UTO option */ +#define TF_RCV_UTO 0x008000 /* accept UTO suggestions */ #define TF_MORETOCOME 0x010000 /* More data to be appended to sock */ #define TF_LQ_OVERFLOW 0x020000 /* listen queue overflow */ #define TF_LASTIDLE 0x040000 /* connection was previously idle */ @@ -292,7 +298,8 @@ #define TOF_TS 0x0010 /* timestamp */ #define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ -#define TOF_MAXOPT 0x0100 +#define TOF_UTO 0x0100 /* user timeout option */ +#define TOF_MAXOPT 0x0200 u_int32_t to_tsval; /* new timestamp */ u_int32_t to_tsecr; /* reflected timestamp */ u_char *to_sacks; /* pointer to the first SACK blocks */ @@ -300,7 +307,7 @@ u_int16_t to_mss; /* maximum segment size */ u_int8_t to_wscale; /* window scaling */ u_int8_t to_nsacks; /* number of SACK blocks */ - u_int32_t to_spare; /* UTO */ + u_int32_t to_uto; /* UTO */ }; /* @@ -308,6 +315,12 @@ */ #define TO_SYN 0x01 /* parse SYN-only options */ +/* + * Values for TCP UTO. + */ +#define UTO_MINS 0x8000 /* Highest bit set means "minutes". */ +#define UTO_MINS_TH 3600 /* Send minutes if >= one hour. */ + struct hc_metrics_lite { /* must stay in sync with hc_metrics */ u_long rmx_mtu; /* MTU for this path */ u_long rmx_ssthresh; /* outbound gateway buffer limit */ @@ -611,6 +624,10 @@ VNET_DECLARE(int, ss_fltsz_local); VNET_DECLARE(int, tcp_do_rfc3465); VNET_DECLARE(int, tcp_abc_l_var); +VNET_DECLARE(int, uto_enable); +VNET_DECLARE(int, uto_min_timeout); +VNET_DECLARE(int, uto_max_timeout); + #define V_tcb VNET(tcb) #define V_tcbinfo VNET(tcbinfo) #define V_tcpstat VNET(tcpstat) @@ -623,6 +640,9 @@ #define V_ss_fltsz_local VNET(ss_fltsz_local) #define V_tcp_do_rfc3465 VNET(tcp_do_rfc3465) #define V_tcp_abc_l_var VNET(tcp_abc_l_var) +#define V_uto_enable VNET(uto_enable) +#define V_uto_min_timeout VNET(uto_min_timeout) +#define V_uto_max_timeout VNET(uto_max_timeout) VNET_DECLARE(int, tcp_do_sack); /* SACK enabled/disabled */ VNET_DECLARE(int, tcp_sc_rst_sock_fail); /* RST on sock alloc failure */ From owner-p4-projects@FreeBSD.ORG Fri Aug 5 16:39:33 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BC8D1065677; Fri, 5 Aug 2011 16:39: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 BA4CD1065675 for ; Fri, 5 Aug 2011 16:39:32 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A0AF08FC0A for ; Fri, 5 Aug 2011 16:39:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75GdW7Q083078 for ; Fri, 5 Aug 2011 16:39:32 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75GdWrB083075 for perforce@freebsd.org; Fri, 5 Aug 2011 16:39:32 GMT (envelope-from cnicutar@freebsd.org) Date: Fri, 5 Aug 2011 16:39:32 GMT Message-Id: <201108051639.p75GdWrB083075@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 16:39:33 -0000 http://p4web.freebsd.org/@@197228?ac=10 Change 197228 by cnicutar@cnicutar_cronos on 2011/08/05 16:38:30 Forward-port UTO tcp.4 changes to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/share/man/man4/tcp.4#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/share/man/man4/tcp.4#2 (text+ko) ==== @@ -38,7 +38,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD: src/share/man/man4/tcp.4,v 1.63 2011/02/21 11:56:11 lstewart Exp $ .\" -.Dd February 15, 2011 +.Dd August 05, 2011 .Dt TCP 4 .Os .Sh NAME @@ -122,7 +122,7 @@ .Xr setsockopt 2 and tested with .Xr getsockopt 2 : -.Bl -tag -width ".Dv TCP_CONGESTION" +.Bl -tag -width ".Dv TCP_SNDUTO_TIMEOUT" .It Dv TCP_INFO Information about a socket's underlying TCP session may be retrieved by passing the read-only option @@ -222,6 +222,46 @@ will have an invalid digest option prepended, and the following error message will be visible on the system console: .Em "tcp_signature_compute: SADB lookup failed for %d.%d.%d.%d" . +.It Dv TCP_SNDUTO_TIMEOUT +By setting this option the user controls the exact time (in seconds) TCP will +wait for an ACK before tearing the connection. +.Pp +Traditionally, a fixed number of retransmits +.Dv TCP_MAXRXTSHIFT +are performed before giving up. +Using UTO completely overrides this and allows connections with stringent or +relaxed timeouts. +.Pp +After setting the option the first subsequent segment will carry the specified +value. +This option is silently left out if (due to other options) not enough space +is available. +.It Dv TCP_RCVUTO_TIMEOUT +By setting this option to a value larger than 1 the user allows a TCP to +accept the timeout suggestion sent by the peer. +The default value is 0. +By getting this option the user can determine the actual timeout (in seconds) +as advertised by the peer. +.Pp +When using both +.Dv TCP_RCVUTO_TIMEOUT +and +.Dv TCP_SNDUTO_TIMEOUT, +the larger value is chosen as User Timeout for the connection. +.Pp +The peer is allowed to send this option any number of times. +Each time the user calls +.Xr getsockopt 2 +the most recent value received is returned. +.Pp +A possible use of this option is allowing a user to request a large timeout +(several hours) for a connection. +Even if the user is offline for long periods of time the connection will be +maintained. +.Pp +This option has security implications. +An application must *not* enable this option before the peer has +authenticated in order to prevent DoS attacks. .El .Pp The option level for the @@ -431,6 +471,13 @@ .It Va sack.globalmaxholes Maximum number of SACK holes per system, across all connections. Defaults to 65536. +.It Va uto.enable +Globally permit or deny using UTO. +.It Va uto.max_timeout +Maximum value for TCP_SNDUTO_TIMEOUT for any connection. Setting this to a +large value has security implications. +.It Va uto.min_timeout +Minimum value for TCP_RCVUTO_TIMEOUT for any connection. .It Va maxtcptw When a TCP connection enters the .Dv TIME_WAIT From owner-p4-projects@FreeBSD.ORG Fri Aug 5 17:14:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 280EE1065675; Fri, 5 Aug 2011 17:14: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 DDDDE106564A for ; Fri, 5 Aug 2011 17:14:36 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CAD648FC1D for ; Fri, 5 Aug 2011 17:14:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75HEa6U090998 for ; Fri, 5 Aug 2011 17:14:36 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75HEaDP090995 for perforce@freebsd.org; Fri, 5 Aug 2011 17:14:36 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 5 Aug 2011 17:14:36 GMT Message-Id: <201108051714.p75HEaDP090995@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 17:14:37 -0000 http://p4web.freebsd.org/@@197230?ac=10 Change 197230 by mjacob@mjacob-sandbox on 2011/08/05 17:14:17 IFC Affected files ... .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/ztest/ztest.c#4 integrate .. //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate .. //depot/projects/mjacob-dev/contrib/bsnmp/snmp_usm/snmp_usm.3#2 integrate .. //depot/projects/mjacob-dev/contrib/gcc/cp/ChangeLog#3 integrate .. //depot/projects/mjacob-dev/contrib/gcc/cp/decl.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/README.hpn#1 branch .. //depot/projects/mjacob-dev/crypto/openssh/buffer.c#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/buffer.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/channels.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/channels.h#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/cipher.c#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/compat.c#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/compat.h#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/kex.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/kex.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/misc.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/misc.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/packet.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/packet.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/readconf.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/readconf.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/servconf.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/servconf.h#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/session.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sftp.1#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sftp.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/ssh.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sshd.c#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/sshd_config#3 integrate .. //depot/projects/mjacob-dev/crypto/openssh/version.c#2 integrate .. //depot/projects/mjacob-dev/crypto/openssh/version.h#3 integrate .. //depot/projects/mjacob-dev/etc/rc.d/kld#3 integrate .. //depot/projects/mjacob-dev/lib/libc/amd64/string/Makefile.inc#2 integrate .. //depot/projects/mjacob-dev/lib/libc/amd64/string/stpcpy.S#1 branch .. //depot/projects/mjacob-dev/lib/libc/amd64/string/strcpy.S#3 delete .. //depot/projects/mjacob-dev/lib/libc/amd64/string/strcpy.c#1 branch .. //depot/projects/mjacob-dev/lib/libc/net/sctp_sys_calls.c#4 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/libmemstat.3#2 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/memstat.c#2 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/memstat.h#2 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/memstat_internal.h#2 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/memstat_malloc.c#2 integrate .. //depot/projects/mjacob-dev/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/mjacob-dev/lib/libproc/proc_create.c#3 integrate .. //depot/projects/mjacob-dev/lib/libusbhid/parse.c#2 integrate .. //depot/projects/mjacob-dev/libexec/tftpd/tftp-transfer.c#2 integrate .. //depot/projects/mjacob-dev/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/mjacob-dev/release/Makefile.sysinstall#3 integrate .. //depot/projects/mjacob-dev/release/amd64/make-memstick.sh#2 integrate .. //depot/projects/mjacob-dev/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/mjacob-dev/release/i386/make-memstick.sh#2 integrate .. //depot/projects/mjacob-dev/release/powerpc/make-memstick.sh#2 integrate .. //depot/projects/mjacob-dev/sbin/mount/mount.c#4 integrate .. //depot/projects/mjacob-dev/share/man/man4/dc.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/gif.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/hptiop.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/lmc.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/mpt.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/pcm.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/rue.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/smp.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/stf.4#2 integrate .. //depot/projects/mjacob-dev/share/man/man4/wi.4#3 integrate .. //depot/projects/mjacob-dev/share/man/man5/reiserfs.5#3 integrate .. //depot/projects/mjacob-dev/share/man/man8/crash.8#2 integrate .. //depot/projects/mjacob-dev/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/mjacob-dev/share/man/man9/vfs_getopt.9#2 integrate .. //depot/projects/mjacob-dev/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/mjacob-dev/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/mjacob-dev/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/mjacob-dev/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/mjacob-dev/sys/cam/ata/ata_da.c#7 integrate .. //depot/projects/mjacob-dev/sys/cam/cam_periph.c#6 integrate .. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate .. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/mjacob-dev/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/mjacob-dev/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/mjacob-dev/sys/conf/NOTES#9 integrate .. //depot/projects/mjacob-dev/sys/conf/newvers.sh#3 integrate .. //depot/projects/mjacob-dev/sys/conf/options#9 integrate .. //depot/projects/mjacob-dev/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_dfs/null/dfs_null.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah.h#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_desc.h#4 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_eeprom.h#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_eeprom_9287.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_eeprom_v14.c#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_eeprom_v14.h#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416.h#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#7 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#7 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar9002/ar9280.c#4 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c#8 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c#9 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#4 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_ath_sysctl.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_athioctl.h#6 integrate .. //depot/projects/mjacob-dev/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/mjacob-dev/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_raid.h#2 integrate .. //depot/projects/mjacob-dev/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/mjacob-dev/sys/dev/pci/pci.c#7 integrate .. //depot/projects/mjacob-dev/sys/dev/re/if_re.c#5 integrate .. //depot/projects/mjacob-dev/sys/dev/usb/input/ums.c#6 integrate .. //depot/projects/mjacob-dev/sys/fs/cd9660/iso.h#2 integrate .. //depot/projects/mjacob-dev/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsclient/nfsnode.h#3 integrate .. //depot/projects/mjacob-dev/sys/fs/nfsserver/nfs_nfsdserv.c#6 integrate .. //depot/projects/mjacob-dev/sys/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/mjacob-dev/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/mjacob-dev/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/mjacob-dev/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/mjacob-dev/sys/kern/kern_conf.c#6 integrate .. //depot/projects/mjacob-dev/sys/kern/kern_jail.c#7 integrate .. //depot/projects/mjacob-dev/sys/kern/kern_linker.c#5 integrate .. //depot/projects/mjacob-dev/sys/kern/kern_lock.c#4 integrate .. //depot/projects/mjacob-dev/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/mjacob-dev/sys/kern/subr_smp.c#7 integrate .. //depot/projects/mjacob-dev/sys/kern/sys_capability.c#5 integrate .. //depot/projects/mjacob-dev/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/mjacob-dev/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/mjacob-dev/sys/mips/mips/exception.S#4 integrate .. //depot/projects/mjacob-dev/sys/net/if_lagg.c#5 integrate .. //depot/projects/mjacob-dev/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/mjacob-dev/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/mjacob-dev/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/mjacob-dev/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp.h#7 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_cc_functions.c#7 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_sysctl.c#7 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/mjacob-dev/sys/netinet/sctputil.c#8 integrate .. //depot/projects/mjacob-dev/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/mjacob-dev/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/mjacob-dev/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/mjacob-dev/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/mjacob-dev/sys/powerpc/aim/locore32.S#5 integrate .. //depot/projects/mjacob-dev/sys/powerpc/booke/locore.S#4 integrate .. //depot/projects/mjacob-dev/sys/powerpc/booke/platform_bare.c#5 integrate .. //depot/projects/mjacob-dev/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/mjacob-dev/sys/powerpc/conf/MPC85XX#3 integrate .. //depot/projects/mjacob-dev/sys/powerpc/mpc85xx/atpic.c#3 integrate .. //depot/projects/mjacob-dev/sys/powerpc/powermac/fcu.c#5 integrate .. //depot/projects/mjacob-dev/sys/sys/capability.h#3 integrate .. //depot/projects/mjacob-dev/sys/sys/mount.h#4 integrate .. //depot/projects/mjacob-dev/sys/sys/systm.h#6 integrate .. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_alloc.c#9 integrate .. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/mjacob-dev/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/mjacob-dev/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/mjacob-dev/sys/vm/device_pager.c#5 integrate .. //depot/projects/mjacob-dev/sys/vm/swap_pager.c#8 integrate .. //depot/projects/mjacob-dev/sys/vm/swap_pager.h#2 integrate .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/Makefile#2 integrate .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test.c#2 integrate .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test.h#2 integrate .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test.t#1 branch .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_capabilities.c#1 branch .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_capmode.c#2 integrate .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_fcntl.c#1 branch .. //depot/projects/mjacob-dev/tools/regression/security/cap_test/cap_test_sysctl.c#2 integrate .. //depot/projects/mjacob-dev/tools/tools/ath/Makefile#5 integrate .. //depot/projects/mjacob-dev/tools/tools/ath/athradar/Makefile#1 branch .. //depot/projects/mjacob-dev/tools/tools/ath/athradar/athradar.c#1 branch .. //depot/projects/mjacob-dev/tools/tools/sysdoc/tunables.mdoc#2 integrate .. //depot/projects/mjacob-dev/usr.bin/ar/write.c#3 integrate .. //depot/projects/mjacob-dev/usr.bin/catman/catman.c#2 integrate .. //depot/projects/mjacob-dev/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/mjacob-dev/usr.bin/man/man.1#3 integrate .. //depot/projects/mjacob-dev/usr.bin/netstat/sctp.c#3 integrate .. //depot/projects/mjacob-dev/usr.bin/tar/Makefile#3 integrate .. //depot/projects/mjacob-dev/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/mjacob-dev/usr.bin/usbhidaction/usbhidaction.c#2 integrate .. //depot/projects/mjacob-dev/usr.bin/usbhidctl/usbhid.c#2 integrate .. //depot/projects/mjacob-dev/usr.sbin/bsdinstall/scripts/mirrorselect#2 integrate .. //depot/projects/mjacob-dev/usr.sbin/bsdinstall/scripts/netconfig_ipv4#2 integrate .. //depot/projects/mjacob-dev/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1#2 integrate .. //depot/projects/mjacob-dev/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/mjacob-dev/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/mjacob-dev/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/mjacob-dev/usr.sbin/mfiutil/mfi_show.c#5 integrate .. //depot/projects/mjacob-dev/usr.sbin/pw/pw_user.c#5 integrate Differences ... ==== //depot/projects/mjacob-dev/cddl/contrib/opensolaris/cmd/ztest/ztest.c#4 (text+ko) ==== @@ -205,6 +205,7 @@ */ typedef struct ztest_ds { objset_t *zd_os; + rwlock_t zd_zilog_lock; zilog_t *zd_zilog; uint64_t zd_seq; ztest_od_t *zd_od; /* debugging aid */ @@ -238,6 +239,7 @@ ztest_func_t ztest_zap; ztest_func_t ztest_zap_parallel; ztest_func_t ztest_zil_commit; +ztest_func_t ztest_zil_remount; ztest_func_t ztest_dmu_read_write_zcopy; ztest_func_t ztest_dmu_objset_create_destroy; ztest_func_t ztest_dmu_prealloc; @@ -273,6 +275,7 @@ { ztest_zap_parallel, 100, &zopt_always }, { ztest_split_pool, 1, &zopt_always }, { ztest_zil_commit, 1, &zopt_incessant }, + { ztest_zil_remount, 1, &zopt_sometimes }, { ztest_dmu_read_write_zcopy, 1, &zopt_often }, { ztest_dmu_objset_create_destroy, 1, &zopt_often }, { ztest_dsl_prop_get_set, 1, &zopt_often }, @@ -986,6 +989,7 @@ zd->zd_seq = 0; dmu_objset_name(os, zd->zd_name); + VERIFY(rwlock_init(&zd->zd_zilog_lock, USYNC_THREAD, NULL) == 0); VERIFY(_mutex_init(&zd->zd_dirobj_lock, USYNC_THREAD, NULL) == 0); for (int l = 0; l < ZTEST_OBJECT_LOCKS; l++) @@ -1965,6 +1969,8 @@ if (ztest_random(2) == 0) io_type = ZTEST_IO_WRITE_TAG; + (void) rw_rdlock(&zd->zd_zilog_lock); + switch (io_type) { case ZTEST_IO_WRITE_TAG: @@ -2000,6 +2006,8 @@ break; } + (void) rw_unlock(&zd->zd_zilog_lock); + umem_free(data, blocksize); } @@ -2054,6 +2062,8 @@ { zilog_t *zilog = zd->zd_zilog; + (void) rw_rdlock(&zd->zd_zilog_lock); + zil_commit(zilog, ztest_random(ZTEST_OBJECTS)); /* @@ -2065,6 +2075,31 @@ ASSERT(zd->zd_seq <= zilog->zl_commit_lr_seq); zd->zd_seq = zilog->zl_commit_lr_seq; mutex_exit(&zilog->zl_lock); + + (void) rw_unlock(&zd->zd_zilog_lock); +} + +/* + * This function is designed to simulate the operations that occur during a + * mount/unmount operation. We hold the dataset across these operations in an + * attempt to expose any implicit assumptions about ZIL management. + */ +/* ARGSUSED */ +void +ztest_zil_remount(ztest_ds_t *zd, uint64_t id) +{ + objset_t *os = zd->zd_os; + + (void) rw_wrlock(&zd->zd_zilog_lock); + + /* zfsvfs_teardown() */ + zil_close(zd->zd_zilog); + + /* zfsvfs_setup() */ + VERIFY(zil_open(os, ztest_get_data) == zd->zd_zilog); + zil_replay(os, zd, ztest_replay_vector); + + (void) rw_unlock(&zd->zd_zilog_lock); } /* ==== //depot/projects/mjacob-dev/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 (text+ko) ==== @@ -4289,7 +4289,8 @@ libzfs_handle_t *hdl = zhp->zfs_hdl; zfs_cmd_t zc = { 0 }; char errbuf[1024]; - int cmd, ret; + unsigned long cmd; + int ret; if (attach) { (void) snprintf(errbuf, sizeof (errbuf), ==== //depot/projects/mjacob-dev/contrib/bsnmp/snmp_usm/snmp_usm.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/bsnmp/snmp_usm/snmp_usm.3,v 1.2 2010/12/20 17:13:14 syrinx Exp $ +.\" $FreeBSD: src/contrib/bsnmp/snmp_usm/snmp_usm.3,v 1.3 2011/08/01 22:21:18 uqs Exp $ .\" .Dd September 9, 2010 .Dt SNMP_USM 3 @@ -115,7 +115,7 @@ This column is used to create new USM user entries or delete existing ones from the table. .El -.EL +.El .Sh FILES .Bl -tag -width "XXXXXXXXX" .It Pa /usr/share/snmp/defs/usm_tree.def ==== //depot/projects/mjacob-dev/contrib/gcc/cp/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,9 @@ +2007-09-29 Jason Merrill + + PR c++/33094 + * decl.c (make_rtl_for_nonlocal_decl): It's ok for a member + constant to not have DECL_EXTERNAL if it's file-local. + 2007-08-24 Jakub Jelinek PR c++/31941 ==== //depot/projects/mjacob-dev/contrib/gcc/cp/decl.c#3 (text+ko) ==== @@ -4968,7 +4968,7 @@ /* An in-class declaration of a static data member should be external; it is only a declaration, and not a definition. */ if (init == NULL_TREE) - gcc_assert (DECL_EXTERNAL (decl)); + gcc_assert (DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl)); } /* We don't create any RTL for local variables. */ ==== //depot/projects/mjacob-dev/crypto/openssh/buffer.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/buffer.c,v 1.3 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -25,7 +26,7 @@ #include "log.h" #define BUFFER_MAX_CHUNK 0x100000 -#define BUFFER_MAX_LEN 0xa00000 +#define BUFFER_MAX_LEN 0x4000000 /* 64MB */ #define BUFFER_ALLOCSZ 0x008000 /* Initializes the buffer structure. */ @@ -165,6 +166,13 @@ return buffer->end - buffer->offset; } +/* Returns the maximum number of bytes of data that may be in the buffer. */ +u_int +buffer_get_max_len(void) +{ + return (BUFFER_MAX_LEN); +} + /* Gets data from the beginning of the buffer. */ int ==== //depot/projects/mjacob-dev/crypto/openssh/buffer.h#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: buffer.h,v 1.21 2010/08/31 11:54:45 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/buffer.h,v 1.5 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen @@ -46,6 +47,8 @@ int buffer_consume_ret(Buffer *, u_int); int buffer_consume_end_ret(Buffer *, u_int); +u_int buffer_get_max_len(void); + #include void buffer_put_bignum(Buffer *, const BIGNUM *); ==== //depot/projects/mjacob-dev/crypto/openssh/channels.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/channels.c,v 1.31 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -170,6 +171,11 @@ static int connect_next(struct channel_connect *); static void channel_connect_ctx_free(struct channel_connect *); +/* -- HPN */ + +static int hpn_disabled = 0; +static u_int buffer_size = CHAN_HPN_MIN_WINDOW_DEFAULT; + /* -- channel core */ Channel * @@ -309,6 +315,7 @@ c->self = found; c->type = type; c->ctype = ctype; + c->dynamic_window = 0; c->local_window = window; c->local_window_max = window; c->local_consumed = 0; @@ -808,11 +815,46 @@ FD_SET(c->sock, writeset); } +static u_int +channel_tcpwinsz(void) +{ + u_int32_t tcpwinsz; + socklen_t optsz; + int ret, sd; + u_int maxlen; + + /* If we are not on a socket return 128KB. */ + if (!packet_connection_is_on_socket()) + return (128 * 1024); + + tcpwinsz = 0; + optsz = sizeof(tcpwinsz); + sd = packet_get_connection_in(); + ret = getsockopt(sd, SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz); + + /* Return no more than the maximum buffer size. */ + maxlen = buffer_get_max_len(); + if ((ret == 0) && tcpwinsz > maxlen) + tcpwinsz = maxlen; + /* In case getsockopt() failed return a minimum. */ + if (tcpwinsz == 0) + tcpwinsz = CHAN_TCP_WINDOW_DEFAULT; + debug2("tcpwinsz: %d for connection: %d", tcpwinsz, sd); + return (tcpwinsz); +} + static void channel_pre_open(Channel *c, fd_set *readset, fd_set *writeset) { - u_int limit = compat20 ? c->remote_window : packet_get_maxsize(); + u_int limit; + + /* Check buffer limits. */ + if (!c->tcpwinsz || c->dynamic_window > 0) + c->tcpwinsz = channel_tcpwinsz(); + limit = MIN(compat20 ? c->remote_window : packet_get_maxsize(), + 2 * c->tcpwinsz); + if (c->istate == CHAN_INPUT_OPEN && limit > 0 && buffer_len(&c->input) < limit && @@ -1789,14 +1831,25 @@ c->local_maxpacket*3) || c->local_window < c->local_window_max/2) && c->local_consumed > 0) { + u_int addition = 0; + + /* Adjust max window size if we are in a dynamic environment. */ + if (c->dynamic_window && c->tcpwinsz > c->local_window_max) { + /* + * Grow the window somewhat aggressively to maintain + * pressure. + */ + addition = 1.5 * (c->tcpwinsz - c->local_window_max); + c->local_window_max += addition; + } packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST); packet_put_int(c->remote_id); - packet_put_int(c->local_consumed); + packet_put_int(c->local_consumed + addition); packet_send(); debug2("channel %d: window %d sent adjust %d", c->self, c->local_window, c->local_consumed); - c->local_window += c->local_consumed; + c->local_window += c->local_consumed + addition; c->local_consumed = 0; } return 1; @@ -2634,6 +2687,15 @@ IPv4or6 = af; } +void +channel_set_hpn(int disabled, u_int buf_size) +{ + hpn_disabled = disabled; + buffer_size = buf_size; + debug("HPN Disabled: %d, HPN Buffer Size: %d", + hpn_disabled, buffer_size); +} + static int channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_port, int *allocated_listen_port, @@ -2786,10 +2848,18 @@ *allocated_listen_port); } - /* Allocate a channel number for the socket. */ - c = channel_new("port listener", type, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); + /* + * Allocate a channel number for the socket. Explicitly test + * for hpn disabled option. If true use smaller window size. + */ + if (hpn_disabled) + c = channel_new("port listener", type, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, + 0, "port listener", 1); + else + c = channel_new("port listener", type, sock, sock, -1, + buffer_size, CHAN_TCP_PACKET_DEFAULT, + 0, "port listener", 1); c->path = xstrdup(host); c->host_port = port_to_connect; c->listening_port = listen_port; @@ -3334,10 +3404,16 @@ *chanids = xcalloc(num_socks + 1, sizeof(**chanids)); for (n = 0; n < num_socks; n++) { sock = socks[n]; - nc = channel_new("x11 listener", - SSH_CHANNEL_X11_LISTENER, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, - 0, "X11 inet listener", 1); + if (hpn_disabled) + nc = channel_new("x11 listener", + SSH_CHANNEL_X11_LISTENER, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, + 0, "X11 inet listener", 1); + else + nc = channel_new("x11 listener", + SSH_CHANNEL_X11_LISTENER, sock, sock, -1, + buffer_size, CHAN_X11_PACKET_DEFAULT, + 0, "X11 inet listener", 1); nc->single_connection = single_connection; (*chanids)[n] = nc->self; } ==== //depot/projects/mjacob-dev/crypto/openssh/channels.h#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: channels.h,v 1.104 2010/05/14 23:29:23 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/channels.h,v 1.21 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen @@ -125,6 +126,8 @@ u_int local_window_max; u_int local_consumed; u_int local_maxpacket; + u_int tcpwinsz; + int dynamic_window; int extended_usage; int single_connection; @@ -162,11 +165,15 @@ /* default window/packet sizes for tcp/x11-fwd-channel */ #define CHAN_SES_PACKET_DEFAULT (32*1024) #define CHAN_SES_WINDOW_DEFAULT (64*CHAN_SES_PACKET_DEFAULT) + #define CHAN_TCP_PACKET_DEFAULT (32*1024) #define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT) + #define CHAN_X11_PACKET_DEFAULT (16*1024) #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) +#define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024) + /* possible input states */ #define CHAN_INPUT_OPEN 0 #define CHAN_INPUT_WAIT_DRAIN 1 @@ -294,4 +301,7 @@ void chan_write_failed(Channel *); void chan_obuf_empty(Channel *); +/* hpn handler */ +void channel_set_hpn(int, u_int); + #endif ==== //depot/projects/mjacob-dev/crypto/openssh/cipher.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: cipher.c,v 1.82 2009/01/26 09:58:15 markus Exp $ */ +/* $FreeBSD: src/crypto/openssh/cipher.c,v 1.25 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -163,7 +164,12 @@ for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); - if (c == NULL || c->number != SSH_CIPHER_SSH2) { +#ifdef NONE_CIPHER_ENABLED + if (c == NULL || (c->number != SSH_CIPHER_SSH2 && + c->number != SSH_CIPHER_NONE)) { +#else + if (c == NULL || (c->number != SSH_CIPHER_SSH2)) { +#endif debug("bad cipher %s [%s]", p, names); xfree(cipher_list); return 0; @@ -337,6 +343,9 @@ int evplen; switch (c->number) { +#ifdef NONE_CIPHER_ENABLED + case SSH_CIPHER_NONE: +#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: @@ -371,6 +380,9 @@ int evplen = 0; switch (c->number) { +#ifdef NONE_CIPHER_ENABLED + case SSH_CIPHER_NONE: +#endif case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: ==== //depot/projects/mjacob-dev/crypto/openssh/clientloop.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: clientloop.c,v 1.231 2011/01/16 12:05:59 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/clientloop.c,v 1.9 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1768,9 +1769,14 @@ sock = x11_connect_display(); if (sock < 0) return NULL; - c = channel_new("x11", - SSH_CHANNEL_X11_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); + if (options.hpn_disabled) + c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, + 0, "x11", 1); + else + c = channel_new("x11", SSH_CHANNEL_X11_OPEN, sock, sock, -1, + options.hpn_buffer_size, CHAN_X11_PACKET_DEFAULT, + 0, "x11", 1); c->force_drain = 1; return c; } @@ -1790,10 +1796,16 @@ sock = ssh_get_authentication_socket(); if (sock < 0) return NULL; - c = channel_new("authentication agent connection", - SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, - "authentication agent connection", 1); + if (options.hpn_disabled) + c = channel_new("authentication agent connection", + SSH_CHANNEL_OPEN, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, + "authentication agent connection", 1); + else + c = channel_new("authentication agent connection", + SSH_CHANNEL_OPEN, sock, sock, -1, + options.hpn_buffer_size, options.hpn_buffer_size, 0, + "authentication agent connection", 1); c->force_drain = 1; return c; } @@ -1820,8 +1832,14 @@ return -1; } - c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); + if (options.hpn_disabled) + c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, + 0, "tun", 1); + else + c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, + options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, + 0, "tun", 1); c->datagram = 1; #if defined(SSH_TUN_FILTER) ==== //depot/projects/mjacob-dev/crypto/openssh/compat.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */ +/* $FreeBSD: src/crypto/openssh/compat.c,v 1.18 2011/08/03 19:14:22 brooks Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -170,6 +171,16 @@ strlen(check[i].pat), 0) == 1) { debug("match: %s pat %s", version, check[i].pat); datafellows = check[i].bugs; + /* + * Check to see if the remote side is OpenSSH and not + * HPN. It is utterly strange to check it from the + * version string and expose the option that way. + */ + if (strstr(version,"OpenSSH") != NULL && + strstr(version,"hpn") == NULL) { + datafellows |= SSH_BUG_LARGEWINDOW; + debug("Remote is not HPN-aware"); + } return; } } ==== //depot/projects/mjacob-dev/crypto/openssh/compat.h#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: compat.h,v 1.42 2008/09/11 14:22:37 markus Exp $ */ +/* $FreeBSD: src/crypto/openssh/compat.h,v 1.18 2011/08/03 20:21:52 brooks Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -58,6 +59,7 @@ #define SSH_OLD_FORWARD_ADDR 0x01000000 #define SSH_BUG_RFWD_ADDR 0x02000000 #define SSH_NEW_OPENSSH 0x04000000 +#define SSH_BUG_LARGEWINDOW 0x08000000 void enable_compat13(void); void enable_compat20(void); ==== //depot/projects/mjacob-dev/crypto/openssh/kex.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: kex.c,v 1.86 2010/09/22 05:01:29 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/kex.c,v 1.7 2011/08/03 19:14:22 brooks Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -90,8 +91,13 @@ return 1; } -/* put algorithm proposal into buffer */ +/* Put algorithm proposal into buffer. */ +#ifndef NONE_CIPHER_ENABLED static void +#else +/* Also used in sshconnect2.c. */ +void +#endif kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX]) { u_int i; @@ -407,6 +413,9 @@ int nenc, nmac, ncomp; u_int mode, ctos, need; int first_kex_follows, type; +#ifdef NONE_CIPHER_ENABLED + int auth_flag; +#endif my = kex_buf2prop(&kex->my, NULL); peer = kex_buf2prop(&kex->peer, &first_kex_follows); @@ -430,6 +439,10 @@ } /* Algorithm Negotiation */ +#ifdef NONE_CIPHER_ENABLED + auth_flag = packet_get_authentication_state(); + debug ("AUTH STATE is %d", auth_flag); +#endif for (mode = 0; mode < MODE_MAX; mode++) { newkeys = xcalloc(1, sizeof(*newkeys)); kex->newkeys[mode] = newkeys; @@ -441,6 +454,17 @@ choose_enc (&newkeys->enc, cprop[nenc], sprop[nenc]); choose_mac (&newkeys->mac, cprop[nmac], sprop[nmac]); choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]); +#ifdef NONE_CIPHER_ENABLED + debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); + if (strcmp(newkeys->enc.name, "none") == 0) { + debug("Requesting NONE. Authflag is %d", auth_flag); + if (auth_flag == 1) + debug("None requested post authentication."); + else + fatal("Pre-authentication none cipher requests " + "are not allowed."); + } +#endif debug("kex: %s %s %s %s", ctos ? "client->server" : "server->client", newkeys->enc.name, ==== //depot/projects/mjacob-dev/crypto/openssh/kex.h#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: kex.h,v 1.52 2010/09/22 05:01:29 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/kex.h,v 1.6 2011/08/03 19:14:22 brooks Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -140,6 +141,10 @@ int kex_names_valid(const char *); +#ifdef NONE_CIPHER_ENABLED +void kex_prop2buf(Buffer *, char *[PROPOSAL_MAX]); +#endif + Kex *kex_setup(char *[PROPOSAL_MAX]); void kex_finish(Kex *); ==== //depot/projects/mjacob-dev/crypto/openssh/misc.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: misc.c,v 1.84 2010/11/21 01:01:13 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/misc.c,v 1.7 2011/08/03 19:14:22 brooks Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -996,3 +997,34 @@ error("setsockopt IPV6_V6ONLY: %s", strerror(errno)); #endif } + +void +sock_get_rcvbuf(int *size, int rcvbuf) +{ + int sock, socksize; + socklen_t socksizelen = sizeof(socksize); + + /* + * Create a socket but do not connect it. We use it + * only to get the rcv socket size. + */ + sock = socket(AF_INET6, SOCK_STREAM, 0); + if (sock < 0) + sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock < 0) + return; + + /* + * If the tcp_rcv_buf option is set and passed in, attempt to set the + * buffer size to its value. + */ + if (rcvbuf) + setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *)&rcvbuf, + sizeof(rcvbuf)); + + if (getsockopt(sock, SOL_SOCKET, SO_RCVBUF, + &socksize, &socksizelen) == 0) + if (size != NULL) + *size = socksize; + close(sock); +} ==== //depot/projects/mjacob-dev/crypto/openssh/misc.h#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: misc.h,v 1.47 2010/11/21 01:01:13 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/misc.h,v 1.6 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen @@ -36,6 +37,7 @@ void ms_subtract_diff(struct timeval *, int *); void ms_to_timeval(struct timeval *, int); void sock_set_v6only(int); +void sock_get_rcvbuf(int *, int); struct passwd *pwcopy(struct passwd *); const char *ssh_gai_strerror(int); ==== //depot/projects/mjacob-dev/crypto/openssh/myproposal.h#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: myproposal.h,v 1.27 2010/09/01 22:42:13 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/myproposal.h,v 1.15 2011/08/03 19:14:22 brooks Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -75,6 +76,10 @@ "arcfour256,arcfour128," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" +#ifdef NONE_CIPHER_ENABLED +#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \ + ",none" +#endif #define KEX_DEFAULT_MAC \ "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ ==== //depot/projects/mjacob-dev/crypto/openssh/packet.c#3 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: packet.c,v 1.172 2010/11/13 23:27:50 djm Exp $ */ +/* $FreeBSD: src/crypto/openssh/packet.c,v 1.7 2011/08/03 19:14:22 brooks Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -195,6 +196,9 @@ }; static struct session_state *active_state, *backup_state; +#ifdef NONE_CIPHER_ENABLED +static int rekey_requested = 0; +#endif static struct session_state * alloc_session_state(void) @@ -1861,12 +1865,26 @@ } } +#ifdef NONE_CIPHER_ENABLED +void +packet_request_rekeying(void) +{ + rekey_requested = 1; +} +#endif + #define MAX_PACKETS (1U<<31) int packet_need_rekeying(void) { if (datafellows & SSH_BUG_NOREKEY) return 0; +#ifdef NONE_CIPHER_ENABLED >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 5 22:32:50 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C1BB1065676; Fri, 5 Aug 2011 22:32: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 C9E77106564A for ; Fri, 5 Aug 2011 22:32:49 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B5CA68FC12 for ; Fri, 5 Aug 2011 22:32:49 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75MWn1K053738 for ; Fri, 5 Aug 2011 22:32:49 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75MWnO5053735 for perforce@freebsd.org; Fri, 5 Aug 2011 22:32:49 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 5 Aug 2011 22:32:49 GMT Message-Id: <201108052232.p75MWnO5053735@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 22:32:50 -0000 http://p4web.freebsd.org/@@197237?ac=10 Change 197237 by mjacob@mjacob-sandbox on 2011/08/05 22:32:09 Merge changes from Panasas for isp. Mostly in implementing taskqueues for loop down and gone device events. Affected files ... .. //depot/projects/mjacob-dev/sys/dev/isp/isp.c#5 edit .. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#6 edit .. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#6 edit .. //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#5 edit Differences ... ==== //depot/projects/mjacob-dev/sys/dev/isp/isp.c#5 (text+ko) ==== @@ -102,7 +102,6 @@ /* * Local function prototypes. */ -static void isp_prt_endcmd(ispsoftc_t *, XS_T *); static int isp_parse_async(ispsoftc_t *, uint16_t); static int isp_parse_async_fc(ispsoftc_t *, uint16_t); static int isp_handle_other_response(ispsoftc_t *, int, isphdr_t *, uint32_t *); @@ -5391,7 +5390,7 @@ * Support routines. */ -static void +void isp_prt_endcmd(ispsoftc_t *isp, XS_T *xs) { char cdbstr[16 * 5 + 1]; ==== //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#6 (text+ko) ==== @@ -67,7 +67,10 @@ static void isp_cam_async(void *, uint32_t, struct cam_path *, void *); static void isp_poll(struct cam_sim *); static timeout_t isp_watchdog; +static timeout_t isp_gdt; +static task_fn_t isp_gdt_task; static timeout_t isp_ldt; +static task_fn_t isp_ldt_task; static void isp_kthread(void *); static void isp_action(struct cam_sim *, union ccb *); #ifdef ISP_INTERNAL_TARGET @@ -141,8 +144,11 @@ fc->path = path; fc->isp = isp; fc->ready = 1; + callout_init_mtx(&fc->ldt, &isp->isp_osinfo.lock, 0); callout_init_mtx(&fc->gdt, &isp->isp_osinfo.lock, 0); + TASK_INIT(&fc->ltask, 1, isp_ldt_task, fc); + TASK_INIT(&fc->gtask, 1, isp_gdt_task, fc); /* * We start by being "loop down" if we have an initiator role @@ -303,6 +309,20 @@ } } +static void +isp_unfreeze_loopdown(ispsoftc_t *isp, int chan) +{ + if (IS_FC(isp)) { + struct isp_fc *fc = ISP_FC_PC(isp, chan); + int wasfrozen = fc->simqfrozen & SIMQFRZ_LOOPDOWN; + fc->simqfrozen &= ~SIMQFRZ_LOOPDOWN; + if (wasfrozen && fc->simqfrozen == 0) { + isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d releasing simq", __func__, chan); + xpt_release_simq(fc->sim, 1); + } + } +} + static int ispioctl(struct cdev *dev, u_long c, caddr_t addr, int flags, struct thread *td) @@ -3837,12 +3857,33 @@ { struct ccb_scsiio *xs = arg; ispsoftc_t *isp; - uint32_t handle; + uint32_t ohandle = ISP_HANDLE_FREE, handle; isp = XS_ISP(xs); handle = isp_find_handle(isp, xs); + + if (handle != ISP_HANDLE_FREE && !XS_CMD_WPEND_P(xs)) { + isp_xs_prt(isp, xs, ISP_LOGWARN, "first watchdog (handle 0x%x) timed out- deferring for grace period", handle); + callout_reset(&PISP_PCMD(xs)->wdog, 2 * hz, isp_watchdog, xs); + XS_CMD_S_WPEND(xs); + return; + } + XS_C_TACTIVE(xs); + + /* + * Hand crank the interrupt code just to be sure the command isn't stuck somewhere. + */ if (handle != ISP_HANDLE_FREE) { + uint32_t isr; + uint16_t sema, mbox; + if (ISP_READ_ISR(isp, &isr, &sema, &mbox) != 0) { + isp_intr(isp, isr, sema, mbox); + } + ohandle = handle; + handle = isp_find_handle(isp, xs); + } + if (handle != ISP_HANDLE_FREE) { /* * Try and make sure the command is really dead before * we release the handle (and DMA resources) for reuse. @@ -3878,7 +3919,14 @@ isp_destroy_handle(isp, handle); isp_prt(isp, ISP_LOGERR, "%s: timeout for handle 0x%x", __func__, handle); XS_SETERR(xs, CAM_CMD_TIMEOUT); + isp_prt_endcmd(isp, xs); isp_done(xs); + } else { + if (ohandle != ISP_HANDLE_FREE) { + isp_prt(isp, ISP_LOGWARN, "%s: timeout for handle 0x%x, recovered during interrupt", __func__, ohandle); + } else { + isp_prt(isp, ISP_LOGWARN, "%s: timeout for handle already free", __func__); + } } } @@ -3937,12 +3985,20 @@ isp_gdt(void *arg) { struct isp_fc *fc = arg; + taskqueue_enqueue_fast(taskqueue_fast, &fc->gtask); +} + +static void +isp_gdt_task(void *arg, int pending) +{ + struct isp_fc *fc = arg; ispsoftc_t *isp = fc->isp; int chan = fc - isp->isp_osinfo.pc.fc; fcportdb_t *lp; int dbidx, tgt, more_to_do = 0; - isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d GDT timer expired @ %lu", chan, (unsigned long) time_uptime); + ISP_LOCK(isp); + isp_prt(isp, ISP_LOGDEBUG0, "Chan %d GDT timer expired", chan); for (dbidx = 0; dbidx < MAX_FC_TARG; dbidx++) { lp = &FCPARAM(isp, chan)->portdb[dbidx]; @@ -3971,6 +4027,7 @@ isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d Stopping Gone Device Timer", chan); } } + ISP_UNLOCK(isp); } /* @@ -3986,11 +4043,19 @@ isp_ldt(void *arg) { struct isp_fc *fc = arg; + taskqueue_enqueue_fast(taskqueue_fast, &fc->ltask); +} + +static void +isp_ldt_task(void *arg, int pending) +{ + struct isp_fc *fc = arg; ispsoftc_t *isp = fc->isp; int chan = fc - isp->isp_osinfo.pc.fc; fcportdb_t *lp; - int dbidx, tgt; + int dbidx, tgt, i; + ISP_LOCK(isp); isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d Loop Down Timer expired @ %lu", chan, (unsigned long) time_uptime); /* @@ -4009,7 +4074,24 @@ /* * XXX: CLEAN UP AND COMPLETE ANY PENDING COMMANDS FIRST! */ + + + for (i = 0; i < isp->isp_maxcmds; i++) { + struct ccb_scsiio *xs; + if (!ISP_VALID_HANDLE(isp, isp->isp_xflist[i].handle)) { + continue; + } + if ((xs = isp->isp_xflist[i].cmd) == NULL) { + continue; + } + if (dbidx != (FCPARAM(isp, chan)->isp_dev_map[XS_TGT(xs)] - 1)) { + continue; + } + isp_prt(isp, ISP_LOGWARN, "command handle 0x%08x for %d.%d.%d orphaned by loop down timeout", + isp->isp_xflist[i].handle, chan, XS_TGT(xs), XS_LUN(xs)); + } + /* * Mark that we've announced that this device is gone.... */ @@ -4030,6 +4112,10 @@ isp_make_gone(isp, chan, tgt); } + if (FCPARAM(isp, chan)->role & ISP_ROLE_INITIATOR) { + isp_unfreeze_loopdown(isp, chan); + } + /* * The loop down timer has expired. Wake up the kthread * to notice that fact (or make it false). @@ -4037,6 +4123,7 @@ fc->loop_dead = 1; fc->loop_down_time = fc->loop_down_limit+1; wakeup(fc); + ISP_UNLOCK(isp); } static void @@ -4050,7 +4137,7 @@ mtx_lock(&isp->isp_osinfo.lock); for (;;) { - int wasfrozen, lb, lim; + int lb, lim; isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d checking FC state", __func__, chan); lb = isp_fc_runstate(isp, chan, 250000); @@ -4121,12 +4208,7 @@ */ if (FCPARAM(isp, chan)->loop_seen_once || fc->loop_dead) { - wasfrozen = fc->simqfrozen & SIMQFRZ_LOOPDOWN; - fc->simqfrozen &= ~SIMQFRZ_LOOPDOWN; - if (wasfrozen && fc->simqfrozen == 0) { - isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d releasing simq", __func__, chan); - xpt_release_simq(fc->sim, 1); - } + isp_unfreeze_loopdown(isp, chan); } isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "%s: Chan %d sleep time %d", __func__, chan, slp); @@ -4225,6 +4307,7 @@ ts = 60*1000; } ts = isp_mstohz(ts); + XS_S_TACTIVE(ccb); callout_reset(&PISP_PCMD(ccb)->wdog, ts, isp_watchdog, ccb); break; case CMD_RQLATER: @@ -4751,7 +4834,9 @@ /* * Set base transfer capabilities for Fibre Channel, for this HBA. */ - if (IS_24XX(isp)) { + if (IS_25XX(isp)) { + cpi->base_transfer_speed = 8000000; + } else if (IS_24XX(isp)) { cpi->base_transfer_speed = 4000000; } else if (IS_23XX(isp)) { cpi->base_transfer_speed = 2000000; @@ -4797,6 +4882,7 @@ isp_done(XS_T *sccb) { ispsoftc_t *isp = XS_ISP(sccb); + uint32_t status; if (XS_NOERR(sccb)) XS_SETERR(sccb, CAM_REQ_CMP); @@ -4811,8 +4897,10 @@ } sccb->ccb_h.status &= ~CAM_SIM_QUEUED; - if ((sccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - isp_prt(isp, ISP_LOGDEBUG0, "target %d lun %d CAM status 0x%x SCSI status 0x%x", XS_TGT(sccb), XS_LUN(sccb), sccb->ccb_h.status, sccb->scsi_status); + status = sccb->ccb_h.status & CAM_STATUS_MASK; + if (status != CAM_REQ_CMP) { + if (status != CAM_SEL_TIMEOUT) + isp_prt(isp, ISP_LOGDEBUG0, "target %d lun %d CAM status 0x%x SCSI status 0x%x", XS_TGT(sccb), XS_LUN(sccb), sccb->ccb_h.status, sccb->scsi_status); if ((sccb->ccb_h.status & CAM_DEV_QFRZN) == 0) { sccb->ccb_h.status |= CAM_DEV_QFRZN; xpt_freeze_devq(sccb->ccb_h.path, 1); @@ -4824,7 +4912,8 @@ } XS_CMD_S_DONE(sccb); - callout_stop(&PISP_PCMD(sccb)->wdog); + if (XS_TACTIVE_P(sccb)) + callout_stop(&PISP_PCMD(sccb)->wdog); XS_CMD_S_CLEAR(sccb); isp_free_pcmd(isp, (union ccb *) sccb); xpt_done((union ccb *) sccb); @@ -4974,7 +5063,6 @@ va_end(ap); fc = ISP_FC_PC(isp, bus); lp->reserved = 0; - lp->gone_timer = 0; if ((FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) && (lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) { int dbidx = lp - FCPARAM(isp, bus)->portdb; int i; @@ -5010,7 +5098,6 @@ va_end(ap); fc = ISP_FC_PC(isp, bus); lp->reserved = 0; - lp->gone_timer = 0; if (isp_change_is_bad) { lp->state = FC_PORTDB_STATE_NIL; if (lp->dev_map_idx) { ==== //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#6 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -182,6 +183,8 @@ ready : 1; struct callout ldt; /* loop down timer */ struct callout gdt; /* gone device timer */ + struct task ltask; + struct task gtask; #ifdef ISP_TARGET_MODE struct tslist lun_hash[LUN_HASH_SIZE]; #ifdef ISP_INTERNAL_TARGET @@ -597,12 +600,23 @@ * Platform private flags */ #define ISP_SPRIV_ERRSET 0x1 +#define ISP_SPRIV_TACTIVE 0x2 #define ISP_SPRIV_DONE 0x8 +#define ISP_SPRIV_WPEND 0x10 + +#define XS_S_TACTIVE(sccb) (sccb)->ccb_h.spriv_field0 |= ISP_SPRIV_TACTIVE +#define XS_C_TACTIVE(sccb) (sccb)->ccb_h.spriv_field0 &= ~ISP_SPRIV_TACTIVE +#define XS_TACTIVE_P(sccb) ((sccb)->ccb_h.spriv_field0 & ISP_SPRIV_TACTIVE) #define XS_CMD_S_DONE(sccb) (sccb)->ccb_h.spriv_field0 |= ISP_SPRIV_DONE #define XS_CMD_C_DONE(sccb) (sccb)->ccb_h.spriv_field0 &= ~ISP_SPRIV_DONE #define XS_CMD_DONE_P(sccb) ((sccb)->ccb_h.spriv_field0 & ISP_SPRIV_DONE) +#define XS_CMD_S_WPEND(sccb) (sccb)->ccb_h.spriv_field0 |= ISP_SPRIV_WPEND +#define XS_CMD_C_WPEND(sccb) (sccb)->ccb_h.spriv_field0 &= ~ISP_SPRIV_WPEND +#define XS_CMD_WPEND_P(sccb) ((sccb)->ccb_h.spriv_field0 & ISP_SPRIV_WPEND) + + #define XS_CMD_S_CLEAR(sccb) (sccb)->ccb_h.spriv_field0 = 0 /* ==== //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#5 (text+ko) ==== @@ -953,6 +953,11 @@ #define ISPASYNC_CHANGE_OTHER 2 /* + * Platform Independent Error Prinout + */ +void isp_prt_endcmd(ispsoftc_t *, XS_T *); + +/* * Platform Dependent Error and Debug Printout * * Two required functions for each platform must be provided: From owner-p4-projects@FreeBSD.ORG Fri Aug 5 22:39:23 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1154106566C; Fri, 5 Aug 2011 22:39: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 8341D106564A for ; Fri, 5 Aug 2011 22:39:23 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6F0E18FC15 for ; Fri, 5 Aug 2011 22:39:23 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75MdNAk053918 for ; Fri, 5 Aug 2011 22:39:23 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75MdNDi053915 for perforce@freebsd.org; Fri, 5 Aug 2011 22:39:23 GMT (envelope-from cnicutar@freebsd.org) Date: Fri, 5 Aug 2011 22:39:23 GMT Message-Id: <201108052239.p75MdNDi053915@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 22:39:24 -0000 http://p4web.freebsd.org/@@197240?ac=10 Change 197240 by cnicutar@cnicutar_cronos on 2011/08/05 22:38:23 Forward-port ssh and sshd UTO support to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh_config.5#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshconnect.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshd.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshd_config.5#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.c#2 (text+ko) ==== @@ -138,7 +138,7 @@ oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, oKexAlgorithms, oIPQoS, - oVersionAddendum, + oVersionAddendum, oUserTimeout, oDeprecated, oUnsupported } OpCodes; @@ -227,6 +227,7 @@ { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, { "rekeylimit", oRekeyLimit }, { "connecttimeout", oConnectTimeout }, + { "usertimeout", oUserTimeout }, { "addressfamily", oAddressFamily }, { "serveraliveinterval", oServerAliveInterval }, { "serveralivecountmax", oServerAliveCountMax }, @@ -415,6 +416,10 @@ *intptr = value; break; + case oUserTimeout: + intptr = &options->user_timeout; + goto parse_time; + case oForwardAgent: intptr = &options->forward_agent; parse_flag: @@ -1132,6 +1137,7 @@ options->address_family = -1; options->connection_attempts = -1; options->connection_timeout = -1; + options->user_timeout = -1; options->number_of_password_prompts = -1; options->cipher = -1; options->ciphers = NULL; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/readconf.h#2 (text+ko) ==== @@ -69,6 +69,7 @@ * giving up */ int connection_timeout; /* Max time (seconds) before * aborting connection attempt */ + int user_timeout; /* Timeout value (seconds) sent to server. */ int number_of_password_prompts; /* Max number of password * prompts. */ int cipher; /* Cipher to use. */ ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.c#2 (text+ko) ==== @@ -109,6 +109,7 @@ options->compression = -1; options->allow_tcp_forwarding = -1; options->allow_agent_forwarding = -1; + options->allow_user_timeout = -1; options->num_allow_users = 0; options->num_deny_users = 0; options->num_allow_groups = 0; @@ -326,7 +327,7 @@ sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, sMatch, sPermitOpen, sForceCommand, sChrootDirectory, - sUsePrivilegeSeparation, sAllowAgentForwarding, + sUsePrivilegeSeparation, sAllowAgentForwarding, sAllowUserTimeout, sZeroKnowledgePasswordAuthentication, sHostCertificate, sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, sKexAlgorithms, sIPQoS, @@ -422,6 +423,7 @@ { "keepalive", sTCPKeepAlive, SSHCFG_GLOBAL }, /* obsolete alias */ { "allowtcpforwarding", sAllowTcpForwarding, SSHCFG_ALL }, { "allowagentforwarding", sAllowAgentForwarding, SSHCFG_ALL }, + { "allowusertimeout", sAllowUserTimeout, SSHCFG_ALL }, { "allowusers", sAllowUsers, SSHCFG_GLOBAL }, { "denyusers", sDenyUsers, SSHCFG_GLOBAL }, { "allowgroups", sAllowGroups, SSHCFG_GLOBAL }, @@ -1085,6 +1087,10 @@ case sAllowAgentForwarding: intptr = &options->allow_agent_forwarding; goto parse_flag; + + case sAllowUserTimeout: + intptr = &options->allow_user_timeout; + goto parse_flag; case sUsePrivilegeSeparation: intptr = &use_privsep; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/servconf.h#2 (text+ko) ==== @@ -111,6 +111,7 @@ int compression; /* If true, compression is allowed */ int allow_tcp_forwarding; int allow_agent_forwarding; + int allow_user_timeout; /* Accept the client timeout if true. */ u_int num_allow_users; char *allow_users[MAX_ALLOW_USERS]; u_int num_deny_users; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.1#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: ssh.1,v 1.316 2010/11/18 15:01:00 jmc Exp $ .\" $FreeBSD: src/crypto/openssh/ssh.1,v 1.44 2011/05/04 07:34:44 des Exp $ -.Dd November 18, 2010 +.Dd August 05, 2011 .Dt SSH 1 .Os .Sh NAME @@ -60,6 +60,7 @@ .Op Fl p Ar port .Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport .Op Fl S Ar ctl_path +.Op Fl u Ar timeout .Op Fl W Ar host : Ns Ar port .Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun .Oo Ar user Ns @ Oc Ns Ar hostname @@ -466,6 +467,7 @@ .It TunnelDevice .It UsePrivilegedPort .It User +.It UserTimeout .It UserKnownHostsFile .It VerifyHostKeyDNS .It VersionAddendum @@ -557,6 +559,14 @@ options force tty allocation, even if .Nm has no local tty. +.It Fl u Ar timeout +Sets the requested timeout (UTO) for the connection. +If the option is accepted by the server, the connection will be kept for +the specified time in the absence of network connectivity. +.Pp +This option can also be enabled using the UserTimeout directive as described +in +.Xr ssh_config 5 . .It Fl V Display the version number and exit. .It Fl v ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh.c#2 (text+ko) ==== @@ -70,6 +70,7 @@ #include #include +#include #include #include @@ -200,7 +201,7 @@ " [-L [bind_address:]port:host:hostport]\n" " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" " [-R [bind_address:]port:host:hostport] [-S ctl_path]\n" -" [-W host:port] [-w local_tun[:remote_tun]]\n" +" [-u timeout] [-W host:port] [-w local_tun[:remote_tun]]\n" " [user@]hostname [command]\n" ); exit(255); @@ -297,7 +298,7 @@ argv0 = av[0]; again: - while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" + while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstu:vx" "ACD:F:I:KL:MNO:PR:S:TVw:W:XYy")) != -1) { switch (opt) { case '1': @@ -392,6 +393,11 @@ force_tty_flag = 1; tty_flag = 1; break; + case 'u': + options.user_timeout = convtime(optarg); + if (options.user_timeout == -1) + fatal("Invalid User Timeout value"); + break; case 'v': if (debug_flag == 0) { debug_flag = 1; @@ -905,6 +911,15 @@ } else { verbose("Authenticated to %s (via proxy).", host); } + + /* + * Attempt to send the option after authenticating. If the server + * didn't record it at SYN, it should now. + */ + if (options.user_timeout && setsockopt(packet_get_connection_in(), + IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, &options.user_timeout, + sizeof(options.user_timeout))) + error("setsockopt TCP_SNDUTO_TIMEOUT: %.100s", strerror(errno)); /* We no longer need the private host keys. Clear them now. */ if (sensitive_data.nkeys != 0) { ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/ssh_config.5#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: ssh_config.5,v 1.146 2010/12/08 04:02:47 djm Exp $ .\" $FreeBSD: src/crypto/openssh/ssh_config.5,v 1.32 2011/05/04 07:34:44 des Exp $ -.Dd December 8, 2010 +.Dd July 19, 2011 .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1137,6 +1137,20 @@ This can be useful when a different user name is used on different machines. This saves the trouble of having to remember to give the user name on the command line. +.It Cm UserTimeout +Specifies the UserTimeout (TCP UTO) for this connection. +If the server accepts this option, the connection will be kept for the +specified time in the absence of network connectivity. +.Pp +Usually a server will only allow certain users to use this option, due to +the security risks involved. +.Pp +The values that can be specified are subject to +.Dv net.inet.tcp.uto.min_timeout +and +.Dv net.inet.tcp.uto.max_timeout . +.Pp +By default no timeout is used. .It Cm UserKnownHostsFile Specifies a file to use for the user host key database instead of ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshconnect.c#2 (text+ko) ==== @@ -25,6 +25,7 @@ #endif #include +#include #include #include @@ -389,6 +390,17 @@ /* Any error is already output */ continue; + /* + * Attempt to set the UTO value before connecting. + * Some hosts might not accept it if we send it later. + */ + if (options.user_timeout > 0 && + setsockopt(sock, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &options.user_timeout, + sizeof(options.user_timeout)) < 0) + error("setsockopt TCP_SNDUTO_TIMEOUT: %.100s", + strerror(errno)); + if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen, timeout_ms) >= 0) { /* Successful connection. */ ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshd.c#2 (text+ko) ==== @@ -59,6 +59,8 @@ #include "openbsd-compat/sys-queue.h" #include +#include + #include #include #include @@ -2027,6 +2029,17 @@ startup_pipe = -1; } + /* + * After authentication it's safe to enable User Timeout. The + * connection will not be dropped for this period of time even if + * the client stays silent (doesn't ACK our data). + */ + if (options.allow_user_timeout && packet_connection_is_on_socket() && + setsockopt(sock_in, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, &on, + sizeof(on)) < 0) + error("setsockopt TCP_RCVUTO_TIMEOUT: %.100s", strerror(errno)); + + #ifdef SSH_AUDIT_EVENTS audit_event(SSH_AUTH_SUCCESS); #endif ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/crypto/openssh/sshd_config.5#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" $OpenBSD: sshd_config.5,v 1.131 2010/12/08 04:02:47 djm Exp $ .\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.38 2011/05/04 07:34:44 des Exp $ -.Dd December 8, 2010 +.Dd July 19, 2011 .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -152,6 +152,22 @@ in .Xr ssh_config 5 for more information on patterns. +.It Cm AllowUserTimeout +This directive specifies that the UserTimeout requested by the client will +be accepted after authentication. +When a UserTimeout is accepted TCP will not drop the connection for the +specified time even if the client remains silent (doesn't ACK data). +.Pp +The values that can be accepted are subject to the system-wide +.Dv net.inet.tcp.uto.min_timeout +and +.Dv net.inet.tcp.uto.max_timeout . +.Pp +A server should only allow trusted users to use this option, due to +the security risks involved. +.Pp +The default value is +.Dq no . .It Cm AuthorizedKeysFile Specifies the file that contains the public keys that can be used for user authentication. From owner-p4-projects@FreeBSD.ORG Fri Aug 5 23:02:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88F3F1065672; Fri, 5 Aug 2011 23:02: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 33528106564A for ; Fri, 5 Aug 2011 23:02:02 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 203268FC0C for ; Fri, 5 Aug 2011 23:02:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75N22Y0059135 for ; Fri, 5 Aug 2011 23:02:02 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75N214J059132 for perforce@freebsd.org; Fri, 5 Aug 2011 23:02:02 GMT (envelope-from cnicutar@freebsd.org) Date: Fri, 5 Aug 2011 23:02:02 GMT Message-Id: <201108052302.p75N214J059132@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 23:02:02 -0000 http://p4web.freebsd.org/@@197243?ac=10 Change 197243 by cnicutar@cnicutar_cronos on 2011/08/05 23:01:13 Forward-port netcat UTO support to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/netcat/nc.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/netcat/netcat.c#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/netcat/nc.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/contrib/netcat/nc.1,v 1.21 2011/05/11 21:52:26 delphij Exp $ .\" -.Dd January 8, 2011 +.Dd July 19, 2011 .Dt NC 1 .Os .Sh NAME @@ -175,6 +175,9 @@ Specifies that source and/or destination ports should be chosen randomly instead of sequentially within a range or in the order that the system assigns them. +.It Fl -rcv-uto +Specifies that the UTO value sent by the peer should be accepted when TCP +computes the local User Timeout. .It Fl S Enables the RFC 2385 TCP MD5 signature option. .It Fl s Ar source @@ -240,6 +243,9 @@ .Fl w flag. The default is no timeout. +.Tf +This timeout also controls the User Timeout advertised to the peer by +TCP. .It Fl X Ar proxy_protocol Requests that .Nm ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/netcat/netcat.c#2 (text+ko) ==== @@ -83,6 +83,7 @@ char *Pflag; /* Proxy username */ char *pflag; /* Localport flag */ int rflag; /* Random ports flag */ +int utoflag; /* Accept peer UTO. */ char *sflag; /* Source Address */ int tflag; /* Telnet Emulation */ int uflag; /* UDP - Default to TCP */ @@ -140,6 +141,7 @@ char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE]; struct option longopts[] = { { "no-tcpopt", no_argument, &FreeBSD_Oflag, 1 }, + { "rcv-uto", no_argument, &utoflag, 1 }, { NULL, 0, NULL, 0 } }; @@ -250,7 +252,6 @@ timeout = strtonum(optarg, 0, INT_MAX / 1000, &errstr); if (errstr) errx(1, "timeout %s: %s", errstr, optarg); - timeout *= 1000; break; case 'x': xflag = 1; @@ -283,6 +284,9 @@ case 'T': Tflag = parse_iptos(optarg); break; + case 0: + /* getopt_long returns 0 for --long-options. */ + break; default: usage(1); } @@ -742,7 +746,7 @@ if (iflag) sleep(iflag); - if ((n = poll(pfd, 2 - dflag, timeout)) < 0) { + if ((n = poll(pfd, 2 - dflag, timeout * 1000)) < 0) { close(nfd); err(1, "Polling Error"); } @@ -938,6 +942,19 @@ &FreeBSD_Oflag, sizeof(FreeBSD_Oflag)) == -1) err(1, "disable TCP options"); } + /* + * Try to set the sent timeout but don't die on error. The timeout + * option was here before UTO so this would break existing + * applications on systems where UTO is disabled. + */ + if (timeout > 0 && setsockopt(s, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &timeout, sizeof(timeout))) + perror("setsokopt send TCP UTO"); + + /* Set the disposition to accept the timeout of the peer. */ + if (utoflag && setsockopt(s, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, + &utoflag, sizeof(utoflag))) + err(1, "setsokopt receive TCP UTO"); } int @@ -983,6 +1000,7 @@ \t-P proxyuser\tUsername for proxy authentication\n\ \t-p port\t Specify local port for remote connects\n\ \t-r Randomize remote ports\n\ + \t--rcv-uto Accept peer User Timeout\n\ \t-S Enable the TCP MD5 signature option\n\ \t-s addr\t Local source address\n\ \t-T ToS\t Set IP Type of Service\n\ From owner-p4-projects@FreeBSD.ORG Fri Aug 5 23:43:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E5191065672; Fri, 5 Aug 2011 23:43: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 30AA1106566C for ; Fri, 5 Aug 2011 23:43:29 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1C9FF8FC14 for ; Fri, 5 Aug 2011 23:43:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p75NhSYd067612 for ; Fri, 5 Aug 2011 23:43:28 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p75NhSAn067609 for perforce@freebsd.org; Fri, 5 Aug 2011 23:43:28 GMT (envelope-from cnicutar@freebsd.org) Date: Fri, 5 Aug 2011 23:43:28 GMT Message-Id: <201108052343.p75NhSAn067609@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2011 23:43:29 -0000 http://p4web.freebsd.org/@@197249?ac=10 Change 197249 by cnicutar@cnicutar_cronos on 2011/08/05 23:43:09 Forward-port telnet and telnetd UTO support to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/commands.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/externs.h#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/main.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/telnet.1#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/telnet.c#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.8#2 edit .. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.c#2 edit Differences ... ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/commands.c#2 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 @@ -877,6 +878,7 @@ { "escape", "character to escape back to telnet command mode", NULL, &escape }, { "rlogin", "rlogin escape character", 0, &rlogin }, { "tracefile", "file to write trace information to", SetNetTrace, (cc_t *)NetTraceFile}, + { "timeout", "tcp timeout for this connection", set_timeout, NULL}, { " ", "", NULL, NULL }, { " ", "The following need 'localchars' to be toggled true", NULL, NULL }, { "flushoutput", "character to cause an Abort Output", NULL, termFlushCharp }, @@ -919,6 +921,21 @@ } } +void +set_timeout(char *s) +{ + if (s == NULL) { + uto = 0; + /* There is not way to "take it back". */ + return; + } + /* Setting the timeout if net is a valid descriptor. */ + uto = strtonum(s, 0, INT_MAX, NULL); + if (uto && net > 0 && setsockopt(net, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, + &uto, sizeof(uto))) + perror("setsockopt UTO"); +} + static int setcmd(int argc, char *argv[]) { @@ -976,7 +993,8 @@ return 0; } else if (ct->handler) { (*ct->handler)(argv[2]); - printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp); + if (ct->charp) + printf("%s set to \"%s\".\n", ct->name, (char *)ct->charp); } else { if (strcmp("off", argv[2])) { value = special(argv[2]); @@ -1042,7 +1060,8 @@ return 0; } else if (ct->handler) { (*ct->handler)(0); - printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp); + if (ct->charp) + printf("%s reset to \"%s\".\n", ct->name, (char *)ct->charp); } else { *(ct->charp) = _POSIX_VDISABLE; printf("%s character is '%s'.\n", ct->name, control(*(ct->charp))); @@ -2442,6 +2461,9 @@ goto fail; } #endif + if (uto && setsockopt(net, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT, &uto, + sizeof(uto))) + perror("setsockopt UTO"); if (connect(net, res->ai_addr, res->ai_addrlen) < 0) { struct addrinfo *next; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/externs.h#2 (text+ko) ==== @@ -129,6 +129,7 @@ termdata, /* Print out terminal data flow */ telnet_debug, /* Debug level */ doaddrlookup, /* do a reverse lookup? */ + uto, /* Request User Timeout. */ clienteof; /* Client received EOF */ extern cc_t escape; /* Escape to command mode */ @@ -260,6 +261,7 @@ setcommandmode(void), set_escape_char(char *s), setneturg(void), + set_timeout(char *s), sys_telnet_init(void), telnet(char *), tel_enter_binary(int), ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/main.c#2 (text+ko) ==== @@ -97,7 +97,7 @@ "[-4] [-6] [-8] [-E] [-L] [-N] [-S tos] [-c] [-d]", "\n\t[-e char] [-l user] [-n tracefile] ", #endif - "[-r] [-s src_addr] [-u] ", + "[-r] [-s src_addr] [-t timeout] [-u] ", #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) "[-P policy] " #endif @@ -154,7 +154,7 @@ #define IPSECOPT #endif while ((ch = getopt(argc, argv, - "468EKLNS:X:acde:fFk:l:n:rs:uxy" IPSECOPT)) != -1) + "468EKLNS:X:acde:fFk:l:n:rs:ut:xy" IPSECOPT)) != -1) #undef IPSECOPT { switch(ch) { @@ -303,6 +303,12 @@ case 's': src_addr = optarg; break; + case 't': + set_timeout(optarg); + if (!uto) + fprintf(stderr, "Warning: timeout `%s'" + " ignored\n", optarg); + break; case 'u': family = AF_UNIX; break; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/telnet.1#2 (text+ko) ==== @@ -50,6 +50,7 @@ .Op Fl l Ar user .Op Fl n Ar tracefile .Op Fl s Ar src_addr +.Op Fl t Ar timeout .Oo .Ar host .Op Ar port @@ -203,6 +204,14 @@ connection to .Ar src_addr , which can be an IP address or a host name. +.It Fl t Ar timeout +Sets the requested timeout (UTO) for the connection. +If the server accepts this value, the connection will be kept for +.Ar timeout +seconds in the absence of network connectivity. +.Pp +This is server-dependent, but usually it only works with authentication, +for security reasons. .It Fl u Forces .Nm ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -112,6 +112,7 @@ dontlecho, /* do we suppress local echoing right now? */ globalmode, doaddrlookup = 1, /* do a reverse address lookup? */ + uto = 0, /* Request User Timeout. */ clienteof = 0; char *prompt = 0; ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.8#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" @(#)telnetd.8 8.4 (Berkeley) 6/1/94 .\" $FreeBSD: src/contrib/telnet/telnetd/telnetd.8,v 1.22 2008/08/29 00:04:37 trhodes Exp $ .\" -.Dd August 28, 2008 +.Dd August 05, 2011 .Dt TELNETD 8 .Os .Sh NAME @@ -42,7 +42,7 @@ protocol server .Sh SYNOPSIS .Nm /usr/libexec/telnetd -.Op Fl 46BUhlkn +.Op Fl 46BUhlknt .Op Fl D Ar debugmode .Op Fl S Ar tos .Op Fl X Ar authtype @@ -263,6 +263,14 @@ TOS name found in the .Pa /etc/iptos file. +.It Fl t +Accepts UTO (User Timeout) suggestion from client. +Normally a TCP connection is dropped if data is not acknowledged for a period +of time. +A client may influnce this period by advertising a timeout value. +.Pp +The value sent by the client is only accepted after successful authentication, +for security reasons. .It Fl u Ar len This option is used to specify the size of the field in the ==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include +#include /* For UTO. */ #ifdef AUTHENTICATION #include @@ -80,6 +81,7 @@ static int debug = 0; int keepalive = 1; const char *altlogin; +int uto = 0; /* Accept advertised timeout. */ void doit(struct sockaddr *); int terminaltypeok(char *); @@ -93,7 +95,7 @@ * passed off to getopt(). */ char valid_opts[] = { - 'd', ':', 'h', 'k', 'n', 'p', ':', 'S', ':', 'u', ':', 'U', + 'd', ':', 'h', 'k', 'n', 'p', ':', 'S', ':', 't', 'u', ':', 'U', '4', '6', #ifdef AUTHENTICATION 'a', ':', 'X', ':', @@ -285,6 +287,11 @@ #endif break; + case 't': + /* Enable TCP_RCVUTO_TIMEOUT after authentication.*/ + uto = 1; + break; + case 'u': utmp_len = (size_t)atoi(optarg); if (utmp_len >= sizeof(remote_hostname)) @@ -445,6 +452,7 @@ #ifdef HAS_GETTOS fprintf(stderr, " [-S tos]"); #endif + fprintf(stderr, " [-t]"); #ifdef AUTHENTICATION fprintf(stderr, " [-X auth-type]"); #endif @@ -931,6 +939,11 @@ DIAG(TD_REPORT, output_data("td: Entering processing loop\r\n")); + /* If authenticated we'll accept the received UTO. */ + if (uto && level && setsockopt(net, IPPROTO_TCP, TCP_RCVUTO_TIMEOUT, &uto, + sizeof(uto))) + perror("setsockopt UTO"); + /* * Startup the login process on the slave side of the terminal * now. We delay this until here to insure option negotiation From owner-p4-projects@FreeBSD.ORG Sat Aug 6 08:45:37 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF8F11065670; Sat, 6 Aug 2011 08:45: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 60F62106564A for ; Sat, 6 Aug 2011 08:45:36 +0000 (UTC) (envelope-from goda@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 4DF668FC12 for ; Sat, 6 Aug 2011 08:45:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p768jag2074828 for ; Sat, 6 Aug 2011 08:45:36 GMT (envelope-from goda@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p768jaGO074824 for perforce@freebsd.org; Sat, 6 Aug 2011 08:45:36 GMT (envelope-from goda@FreeBSD.org) Date: Sat, 6 Aug 2011 08:45:36 GMT Message-Id: <201108060845.p768jaGO074824@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to goda@FreeBSD.org using -f From: Kazuya Goda To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2011 08:45:37 -0000 http://p4web.freebsd.org/@@197267?ac=10 Change 197267 by goda@kaffierlime on 2011/08/06 08:44:31 implement SOFT RSS Affected files ... .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/conf/options#4 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/dev/e1000/if_em.h#2 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/kern/uipc_socket.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#4 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_pcb.h#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_pcbgroup.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_rss.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_rss.h#2 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/tcp_input.c#3 edit .. //depot/projects/soc2011/kgoda_rpsrfs/src/sys/sys/sockbuf.h#2 edit Differences ... ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/conf/options#4 (text+ko) ==== @@ -425,6 +425,7 @@ ROUTETABLES opt_route.h RSS opt_rss.h RPS opt_rps.h +SOFT_RSS opt_soft_rss.h SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/dev/e1000/if_em.h#2 (text+ko) ==== ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -107,6 +107,7 @@ #include "opt_inet6.h" #include "opt_zero.h" #include "opt_compat.h" +#include "opt_soft_rss.h" #include #include @@ -142,6 +143,10 @@ #include +#ifdef SOFT_RSS +#include +#endif + #ifdef COMPAT_FREEBSD32 #include #include @@ -2302,6 +2307,9 @@ { int error; +#ifdef SOFT_RSS + soft_rss_record_curcpu(&so->so_rcv); +#endif CURVNET_SET(so->so_vnet); error = (so->so_proto->pr_usrreqs->pru_soreceive(so, psa, uio, mp0, controlp, flagsp)); ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/net/netisr.c#4 (text+ko) ==== @@ -65,6 +65,8 @@ #include "opt_ddb.h" #include "opt_device_polling.h" +#include "opt_rps.h" +#include "opt_soft_rss.h" #include #include @@ -94,6 +96,10 @@ #include #include +#ifdef SOFT_RSS +#include +#endif + /* * Locking strategy: three types of locks protect netisr processing: * @@ -860,6 +866,10 @@ VNET_ASSERT(m->m_pkthdr.rcvif != NULL, ("%s:%d rcvif == NULL: m=%p", __func__, __LINE__, m)); CURVNET_SET(m->m_pkthdr.rcvif->if_vnet); +#ifdef SOFT_RSS + if (m->m_pkthdr.flowid) + soft_rss_dec_flow_qlen(m->m_pkthdr.flowid); +#endif netisr_proto[proto].np_handler(m); CURVNET_RESTORE(); } @@ -1109,6 +1119,10 @@ */ nwsp->nws_flags |= NWS_DISPATCHING; NWS_UNLOCK(nwsp); +#ifdef SOFT_RSS + if (m->m_pkthdr.flowid) + soft_rss_dec_flow_qlen(m->m_pkthdr.flowid); +#endif netisr_proto[proto].np_handler(m); NWS_LOCK(nwsp); nwsp->nws_flags &= ~NWS_DISPATCHING; @@ -1302,6 +1316,12 @@ } #endif +#ifdef RPS + netisr_defaultthreads = mp_ncpus; + netisr_maxthreads = mp_ncpus; + netisr_bindthreads = 1; +#endif + if (TUNABLE_STR_FETCH("net.isr.dispatch", tmp, sizeof(tmp))) { error = netisr_dispatch_policy_from_str(tmp, &dispatch_policy); ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_pcb.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include #ifdef _KERNEL +#include #include #include #include ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_pcbgroup.c#3 (text+ko) ==== ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_rss.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_inet6.h" #include "opt_pcbgroup.h" +#include "opt_soft_rss.h" #ifndef PCBGROUP #error "options RSS depends on options PCBGROUP" @@ -171,6 +172,16 @@ }; static struct rss_table_entry rss_table[RSS_TABLE_MAXLEN]; +#ifdef SOFT_RSS +struct netisr_flow{ + uint16_t cpu; + unsigned qlen; +}; + +static struct netisr_flow *netisr_flow_table; +static unsigned *socket_flow_table; +#endif + static void rss_init(__unused void *arg) { @@ -502,3 +513,137 @@ SYSCTL_PROC(_net_inet_rss, OID_AUTO, key, CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_rss_key, "", "RSS keying material"); + +#ifdef SOFT_RSS +MALLOC_DEFINE(M_SOFTRSS_FLOWS, "softrss", "soft rss flow entrys"); + +SYSCTL_NODE(_net_inet, OID_AUTO, softrss, CTLFLAG_RW, 0, + "Software emulate receive-side steering"); + +/* + * + */ +static int softrss_maxflows = 128; +TUNABLE_INT("net.inet.softrss.maxflows", &softrss_maxflows); +SYSCTL_INT(_net_inet_softrss, OID_AUTO, maxflows, CTLFLAG_RDTUN, + &softrss_maxflows, 0, "Flow entrys using soft RSS."); + + +static void +socket_flow_table_init(void) +{ + int i; + + socket_flow_table = (unsigned *)malloc(sizeof(unsigned) * softrss_maxflows, + M_SOFTRSS_FLOWS, M_NOWAIT); + + if (socket_flow_table == NULL) + panic("not allocate memory for soft rss"); + + for (i = 0; i < softrss_maxflows; i++) + socket_flow_table[i] = NO_CURR_CPU; +} +SYSINIT(scoket_flow_table_init, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, + socket_flow_table_init, NULL); + +static void +netisr_flow_table_init(void) +{ + int i; + + netisr_flow_table = (struct netisr_flow *) + malloc(sizeof(struct netisr_flow) * softrss_maxflows, + M_SOFTRSS_FLOWS, M_NOWAIT); + + if (netisr_flow_table == NULL) + panic("not allocate memory for soft rss"); + + for (i = 0; i < softrss_maxflows; i++) { + netisr_flow_table[i].cpu = 0; + netisr_flow_table[i].qlen = 0; + } +} +SYSINIT(netisr_flow_table_init, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, + netisr_flow_table_init, NULL); + +void +soft_rss_record_curcpu(struct sockbuf *sb) +{ + if (sb->flowid) + atomic_store_rel_int(&socket_flow_table[sb->flowid % softrss_maxflows], + curcpu); +} + +static inline int +soft_rss_get_curcpu(int index) +{ + return(atomic_load_acq_int(&socket_flow_table[index])); +} + +static inline void +soft_rss_record_dstcpu(int index, uint16_t cpu) +{ + atomic_store_rel_16(&netisr_flow_table[index].cpu, cpu); +} + +static inline uint16_t +soft_rss_get_dstcpu(int index) +{ + return(atomic_load_acq_16(&netisr_flow_table[index].cpu)); +} + + +static inline void +soft_rss_inc_flow_qlen(int index) +{ + atomic_add_acq_int(&netisr_flow_table[index].qlen, 1); +} + +void +soft_rss_dec_flow_qlen(unsigned flowid) +{ + atomic_subtract_acq_int(&netisr_flow_table[flowid % softrss_maxflows].qlen, 1); +} + +static inline int +soft_rss_get_flow_qlen(int index) +{ + return(atomic_load_acq_int(&netisr_flow_table[index].qlen)); +} + +static u_int +soft_rss_getcpu(u_int flowid) +{ + int index; + u_int cur, dst, qlen; + + index = flowid % softrss_maxflows; + cur = soft_rss_get_curcpu(index); + dst = soft_rss_get_dstcpu(index); + qlen = soft_rss_get_flow_qlen(index); + + if (cur == NO_CURR_CPU){ + cur = netisr_default_flow2cpu(flowid); + soft_rss_record_dstcpu(index, (uint16_t)cur); + } + else if (cur != dst){ + if (qlen == 0) + soft_rss_record_dstcpu(index, (uint16_t)cur); + else + cur = dst; + } + soft_rss_inc_flow_qlen(index); + return ((u_int)cur); +} + +/* + * netisr CPU affinity lookup routine for use by flowid. + */ +struct mbuf * +soft_rss_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid) +{ + *cpuid = soft_rss_getcpu(m->m_pkthdr.flowid); + return (m); +} + +#endif /* SOFT_RSS */ ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/in_rss.h#2 (text+ko) ==== @@ -31,6 +31,9 @@ #define _NETINET_IN_RSS_H_ #include /* in_addr_t */ +#ifdef SOFT_RSS +#include /* struct sockbuf */ +#endif /* * Supported RSS hash functions. @@ -89,4 +92,16 @@ */ struct mbuf *rss_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid); +#ifdef SOFT_RSS +#define NO_CURR_CPU 0xffffffff + +#ifdef MALLOC_DECLARE +MALLOC_DECLARE(M_SOFTRSS_FLOWS); +#endif + +void soft_rss_record_curcpu(struct sockbuf *sb); +void soft_rss_dec_flow_qlen(u_int flowid); +struct mbuf *soft_rss_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid); +#endif /* SOFT_RSS */ + #endif /* !_NETINET_IN_RSS_H_ */ ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_ipsec.h" #include "opt_route.h" #include "opt_rps.h" +#include "opt_soft_rss.h" #include #include @@ -77,6 +78,9 @@ #ifdef IPSEC #include #endif /* IPSEC */ +#ifdef SOFT_RSS +#include +#endif #include @@ -145,8 +149,14 @@ .nh_handler = ip_input, .nh_proto = NETISR_IP, .nh_policy = NETISR_POLICY_FLOW, -#ifdef RPS +#if defined SOFT_RSS + .nh_policy = NETISR_POLICY_CPU, .nh_dispatch = NETISR_DISPATCH_HYBRID, + .nh_m2cpuid = soft_rss_m2cpuid, +#elif defined RPS + .nh_dispatch = NETISR_DISPATCH_DEFERRED, +#else + .nh_dispatch = NETISR_DISPATCH_DIRECT, #endif }; ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -55,6 +55,7 @@ #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_tcpdebug.h" +#include "opt_soft_rss.h" #include #include @@ -857,6 +858,9 @@ rstreason = BANDLIM_RST_CLOSEDPORT; goto dropwithreset; } +#ifdef SOFT_RSS + inp->inp_socket->so_rcv.flowid = m->m_pkthdr.flowid; +#endif INP_WLOCK_ASSERT(inp); if (!(inp->inp_flags & INP_HW_FLOWID) && (m->m_flags & M_FLOWID) ==== //depot/projects/soc2011/kgoda_rpsrfs/src/sys/sys/sockbuf.h#2 (text+ko) ==== @@ -32,6 +32,11 @@ */ #ifndef _SYS_SOCKBUF_H_ #define _SYS_SOCKBUF_H_ + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_soft_rss.h" +#endif + #include /* for struct selinfo */ #include #include @@ -101,6 +106,9 @@ short sb_flags; /* (c/d) flags, see below */ int (*sb_upcall)(struct socket *, void *, int); /* (c/d) */ void *sb_upcallarg; /* (c/d) */ +#ifdef SOFT_RSS + uint32_t flowid; +#endif }; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Sat Aug 6 10:13:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53B64106566C; Sat, 6 Aug 2011 10:13: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 0AEB0106566B for ; Sat, 6 Aug 2011 10:13:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EB5F98FC14 for ; Sat, 6 Aug 2011 10:13:28 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p76ADS96092122 for ; Sat, 6 Aug 2011 10:13:28 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p76ADSMH092105 for perforce@freebsd.org; Sat, 6 Aug 2011 10:13:28 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 6 Aug 2011 10:13:28 GMT Message-Id: <201108061013.p76ADSMH092105@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2011 10:13:29 -0000 http://p4web.freebsd.org/@@197269?ac=10 Change 197269 by rene@rene_acer on 2011/08/06 10:12:59 IFC Affected files ... .. //depot/projects/docproj_nl/www/en/administration.sgml#22 integrate .. //depot/projects/docproj_nl/www/en/releases/9.0R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#44 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#11 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#26 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#42 integrate .. //depot/projects/docproj_nl/www/share/sgml/events2003.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2004.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2005.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2006.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2007.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2008.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2009.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2010.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2011.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2012.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/events2013.xml#1 branch .. //depot/projects/docproj_nl/www/share/sgml/news.xml#112 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#35 integrate Differences ... ==== //depot/projects/docproj_nl/www/en/administration.sgml#22 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -501,6 +501,7 @@ ==== //depot/projects/docproj_nl/www/en/releases/9.0R/schedule.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -53,7 +53,7 @@ Code freeze begins 17 July 2011 - - + 18 July 2011 Release Engineers announce that all further commits to the head branch will require explicit approval. Certain blanket approvals will be granted for narrow areas of @@ -63,7 +63,7 @@ BETA1 20 July 2011 - - + 1 August 2011 First beta test snapshot. ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#44 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ September 2011 &os; 9.0 - In "Code Slush" (feature freeze) now. In "Code Freeze" now. The release schedule is available. @@ -87,12 +87,12 @@ HEAD - Slush + Frozen committers - Active development branch for 9-CURRENT. No approval from - RE is required in "Code Slush" period though major ongoing - work such as new features must be notified to RE. + Active development branch for 9-CURRENT and now in a + preparation stage for 9.0-RELEASE. All commits to this branch + requires RE's approval. ==== //depot/projects/docproj_nl/www/en/where.sgml#11 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -119,30 +119,14 @@ [Distribution] [ISO] - pc98 [Distribution] [ISO] - - - sparc64 [Distribution] [ISO] @@ -186,10 +170,7 @@ FreeBSD &betarel.current;-&betarel.vers; - - [View] + [View] @@ -211,28 +192,26 @@ - pc98 - [Distribution] - [ISO] - - - powerpc [Distribution] [ISO] + powerpc64 + [Distribution] + [ISO] + + sparc64 [Distribution] [ISO] - + @@ -243,13 +222,13 @@ ---> + FreeBSD &betarel2.current;-&betarel2.vers; - + [View] @@ -267,8 +246,8 @@ ia64 - [Distribution] - [ISO] + [Distribution] + [ISO] @@ -279,8 +258,8 @@ powerpc - [Distribution] - [ISO] + [Distribution] + [ISO] @@ -290,6 +269,7 @@ + ]]> ]]> ==== //depot/projects/docproj_nl/www/nl/where.sgml#26 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -166,11 +166,11 @@ -

      Help met de volgende &os;-uitgave

      +

      Help met de volgende &os;-uitgave

      Ontwikkelaars en uitgavebeheerders werken aan de volgende - uitgave van &os;. Als u mee wilt helpen met - testen, download dan de laatste build. Let + uitgave van &os;. Als u mee wilt helpen met + testen, download dan de laatste build. Let wel dat deze beelden bedoeld zijn voor testen en niet gebruikt horen te worden in productie-omgevingen.

      @@ -212,12 +212,6 @@ - pc98 - [Distributie] - [ISO] - - - powerpc [Distributie] [ISO] @@ -228,12 +222,10 @@ [Distributie] [ISO] - + @@ -244,7 +236,6 @@ ---> &os; &betarel2.current;-&betarel2.vers; ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#42 (text+ko) ==== @@ -7,3904 +7,54 @@ Please sort the events by start date, with recent events earlier in the file. --> - + - $FreeBSD: www/share/sgml/events.xml,v 1.99 2011/08/04 14:14:40 jkois Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.100 2011/08/05 16:55:23 hrs Exp $ - - BSDCan 2013 - http://www.bsdcan.org/ - - 2013 - 5 - 13 - - - 2013 - 5 - 17 - - - Canada - Ottawa - University of Ottawa - - BSDCan is a developers conference with a strong focus - on emerging technologies, research projects, and works in - progress. It also features Userland infrastructure projects and - invites contributions from both free software developers and those - from commercial vendors. - + - - BSDCan 2012 - http://www.bsdcan.org/ - - 2012 - 5 - 15 - - - 2012 - 5 - 18 - - - Canada - Ottawa - University of Ottawa - - BSDCan is a developers conference with a strong focus - on emerging technologies, research projects, and works in - progress. It also features Userland infrastructure projects and - invites contributions from both free software developers and those - from commercial vendors. - + - - bsd_day(2011) - http://bsdday.eu/2011 - - 2011 - 11 - 5 - - - 2011 - 11 - 5 - - - Slovakia - Bratislava - Slovak University of Technology - + - A new BSD-Day is approaching again to gather Central - European BSD people to meet. The event features developers so - they can popularize their work and communicate with users and - potential future partners. There are no formalities, papers, - registration or participation fee, however the invited developers - are encouraged to give a brief talk about their favorite BSD-related - topic. The goal is to motivate everybody, especially university - students to work with BSD systems. - + - - EuroBSDCon 2011 - http://2011.eurobsdcon.org/ - - 2011 - 10 - 6 - - - 2011 - 10 - 9 - - - The Netherlands - - EuroBSDCon is the annual European technical conference - for users and developers on BSD based systems. The 10th European - BSD Conference will take place in the Netherlands in October, - 2011 and include a technical track, tutorials, and FreeBSD - developer summit. Topics of interest to the conference include, - but are not limited to applications, architecture, implementation, - performance and security of BSD based operating systems, as well - as topics concerning the economic or organizational aspects of BSD - use. - + - - World IPv6 Day - http://www.worldipv6day.org/ - - 2011 - 6 - 8 - - - 2011 - 6 - 8 - - World IPv6 Day is a 24-hour IPv6 test-flight organized by - The Internet Society on 8 June 2011 0:00 UTC to 23:259 UTC. &os; is - planning to contribute by helping to promote IPv6 and help our users in - case of immediate IPv6 problems. See our dedicated &os; and World IPv6 Day page for - more information and how you can help as well. - + - - BSDCan 2011 - http://www.bsdcan.org/ - - 2011 - 5 - 10 - - - 2011 - 5 - 13 - - - Canada - Ottawa - University of Ottawa - - BSDCan is a developers conference with a strong focus - on emerging technologies, research projects, and works in - progress. It also features Userland infrastructure projects and - invites contributions from both free software developers and those - from commercial vendors. - + - - Grazer Linuxtag 2011 - http://www.linuxtage.at/ - - 2011 - 04 - 09 - - - 2011 - 04 - 09 - - - Austria - Graz - FH Joanneum Graz - - The Grazer Linuxtag is a one day event on Linux and free - software in general. Besides a FreeBSD booth and the possibility - to take the BSDA certification exam there will also be a - BSD Bootcamp with live workshops covering - different FreeBSD topics. More information can be found here. - + - - Indiana LinuxFest 2011 - http://www.indianalinux.org/cms/ - - 2011 - 3 - 25 - - - 2011 - 3 - 27 - - - USA - Indianapolis - Wyndam Indianapolis West Hotel - - - The Indiana LinuxFest is a community F/OSS conference, which is - showcasing the best the community has to offer in the way of - Free and Open Source Software, Open Hardware, and Free Culture. - We are also highlighting the best and brightest from all of - these communities from the hobbyist to professional level. - During the LinuxFest The BSD Certification Group will offer the - possibility to take their BSDA certification exam. - + - - AsiaBSDCon 2011 - http://2011.asiabsdcon.org/ - - 2011 - 3 - 17 - - - 2011 - 3 - 20 - - - Japan - Tokyo - Tokyo University of Science - - - AsiaBSDCon is a conference for users and developers on BSD - based systems. The conference is for anyone developing, deploying and - using systems based on FreeBSD, NetBSD, OpenBSD, DragonFlyBSD, Darwin - and MacOS X. AsiaBSDCon is a technical conference and aims to collect - the best technical papers and presentations available to ensure that - the latest developments in our open source community are shared with - the widest possible audience. - + - - NLLGG gathering - http://www.nllgg.nl/bijeenkomst_20101211 - - 2010 - 12 - 11 - - - 2010 - 12 - 11 - - - the Netherlands - Utrecht - Utrecht - Trajectum College - - - The "Nederlandse Linux Gebruikers Groep" (NLLGG) - organisation is arranging its third national community day in Utrecht - focusing on BSD. Like the last two years, there will be a - general and a BSD-specific track. Presentations are - yet to be announced. - - - - BSD-Day@2010 - http://wiki.freebsd.org/BSDDay_2010 - - 2010 - 11 - 20 - - - 2010 - 11 - 20 - - - Hungary - Budapest - Eötvös Loránd University - - This one-day event is to gather Central European - developers of today's open-source BSD systems, popularize their - work, and provide a real-life communication interface between - developers and users. There are no formalities, no papers, and no - registration or participation fee, however the invited developers - are encouraged to give a talk on their favorite BSD-related topic. - The goal is to motivate potential future developers and users, - especially undergraduate university students to work with BSD - systems. - - - - NYCBSDCon 2010 - http://www.nycbsdcon.org/ - - 2010 - 11 - 12 - - - 2010 - 11 - 14 - - - USA - New York City - Cooper Union - - The New York City *BSD Conference (NYCBSDCon) 2010 - will be held at Manhattan's prestigious Cooper Union. NYCBSDCon is - the main technical conference on the East Coast for the BSD - community to get together to share and gain knowledge, to - network with like-minded people, and to have fun. This event is - organized by members of the New York City *BSD Users Group - (NYC*BUG). - - - - BSDday Argentina 2010 - http://www.bsdday.org.ar/ - - 2010 - 11 - 5 - - - 2010 - 11 - 6 - - - Argentina - Buenos Aires - University of Buenos Aires - - BSDday Argentina is a conference for users, system - administrators, and developers of BSD software and BSD-based - systems. The conference is for anyone who is developing, - deploying, and using systems based on &os;, NetBSD, OpenBSD, - DragonFlyBSD, and other BSDs. BSDday Argentina is a technical - conference and it aims to collect the best technical papers and - presentations available to ensure that the latest developments in - our open source community are shared with the widest possible - audience. - - - - MeetBSD California 2010 - http://meetbsd.com/ - - 2010 - 11 - 5 - - - 2010 - 11 - 6 - - - USA - California - Mountain View - Hacker Dojo - - meetBSD was started in Krakow, Poland in 2004 and - strong turnout and highly regarded technical presentations have - allowed it to continue each year since then. meetBSD is a - conference devoted to the BSD operating systems with a strong - emphasis towards FreeBSD. - - - - EuroBSDCon 2010 - http://2010.eurobsdcon.org/ - - 2010 - 10 - 8 - - - 2010 - 10 - 10 - - - Germany - Karlsruhe - - The ninth annual European BSD Conference will take place - in Karlsruhe, Germany in October, 2010, and include a technical - track, tutorials, and FreeBSD developer summit. - - - - KyivBSD 2010 - http://ru.kyivbsd.org.ua/ - - 2010 - 9 - 25 - - - 2010 - 9 - 25 - - - Ukraine - Kiev - - The second KyivBSD conference will take place in Kiev, - Ukraine. - - - - FrOSCamp 2010 - http://www.froscamp.org/ - - 2010 - 9 - 17 - - - 2010 - 9 - 18 - - - Switzerland - Zurich - ETH Zurich - - FrOSCamp is an open source event organized for the first - time in 2010. There will be a FreeBSD booth as well as several - committers attending the event. - - - - Bugathon #7: PRs containing patches - http://wiki.freebsd.org/Bugathons/2010August - - 2010 - 8 - 6 - - - 2010 - 8 - 9 - - - A bugathon is an event coordinated by the &os; - bugbusting team. Bugathons are held on IRC (in the - #freebsd-bugbusters channel of EFnet), and are attended by any - interested &os; developers and contributors during a week-end. - They focus on closing as many problem reports and fixing as many - bugs as possible. The plan for the seventh bugathon is to work - through many of the problem reports in &os;'s GNATS database - containing patches, with a view to either committing them, - getting them into a committable shape, or explaining to the - submitters the issues with the supplied patches. - - - - meetBSD 2010 - http://www.meetBSD.org/ - - 2010 - 7 - 2 - - - 2010 - 7 - 3 - - - Poland - Krakow - Jagiellonian University - - meetBSD is an annual event gathering users and developers of - the BSD operating systems family, mostly &os;, NetBSD and OpenBSD. - After the special California edition for the 10th FreeBSD anniversary, - meetBSD Wintercamp in Livigno, this year we are back to Krakow, - Poland. - - - - 11th Libre Software Meeting - http://2010.rmll.info/ - - 2010 - 7 - 6 - - - 2010 - 7 - 11 - - - France - Bordeaux - - The Libre Software Meeting has occurred each year - since July 2000. This year there will again be a &os; boot - camp to introduce new users to the Operating System. - - - - BSDCan 2010 - http://www.bsdcan.org/2010/ - - 2010 - 5 - 11 - - - 2010 - 5 - 14 - - - Canada - Ottawa - University of Ottawa - - BSDCan is a developers conference with a strong focus - on emerging technologies, research projects, and works in - progress. It also features Userland infrastructure projects and - invites contributions from both free software developers and those - from commercial vendors. - - - - it 360° 2010 - http://www.it360.ca/ - - 2010 - 4 - 7 - - - 2010 - 4 - 7 - - - Canada - Toronto - - IT360° Conference & Expo 2010 is an interactive experience - for IT professionals and business executives to expand their mind and - their bottom line. The BSD Certification Group will offer their BSDA - certification exam. - - - - OpenExpo 2010 - http://www.openexpo.ch/ - - 2010 - 3 - 24 - - - 2010 - 3 - 25 - - - Switzerland - Bern - - The goal of OpenExpo is the promotion of Open Source - software in the business environment. Among many others, there - will be a FreeBSD booth. - - - - Solutions Linux 2010 - http://www.solutionslinux.fr/ - - 2010 - 3 - 16 - - - 2010 - 3 - 18 - - - France - Paris - Paris Expo -
      Porte de Versailles
      -       - A 3 days event to promote GNU/Linux and Open Source - Software to companies. As usual, a French &os; User Group will - be there to promote &os;. The access to the event is free of - charge. -       - - - Chemnitzer Linux-Tage 2010 - http://chemnitzer.linux-tage.de/2010/ - - 2010 - 3 - 13 - - - 2010 - 3 - 14 - - - Germany - Chemnitz - Technical University Chemnitz - - Chemnitzer Linux-Tage is a two day event on Linux and Free - Software in general. There will be workshops, talks and room for various - projects to present themselves. FreeBSD will be present with a booth. - - - - - AsiaBSDCon 2010 - http://2010.asiabsdcon.org/ - - 2010 - 3 - 11 - - - 2010 - 3 - 14 - - - Japan - Tokyo >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 6 16:26:52 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A8BC1065673; Sat, 6 Aug 2011 16:26: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 E16B0106564A for ; Sat, 6 Aug 2011 16:26:51 +0000 (UTC) (envelope-from cnicutar@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CF9088FC16 for ; Sat, 6 Aug 2011 16:26:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p76GQpFF067354 for ; Sat, 6 Aug 2011 16:26:51 GMT (envelope-from cnicutar@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p76GQpcc067351 for perforce@freebsd.org; Sat, 6 Aug 2011 16:26:51 GMT (envelope-from cnicutar@freebsd.org) Date: Sat, 6 Aug 2011 16:26:51 GMT Message-Id: <201108061626.p76GQpcc067351@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to cnicutar@freebsd.org using -f From: Catalin Nicutar To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 197279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2011 16:26:52 -0000 http://p4web.freebsd.org/@@197279?ac=10 Change 197279 by cnicutar@cnicutar_cronos on 2011/08/06 16:25:49 Add TCP UTO tests to HEAD. Affected files ... .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/Makefile.long_uto#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/Makefile.send_uto#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/Makefile.short_uto#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/long_uto.c#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/runtest.sh#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/send_uto.c#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/short_uto.c#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/test_utils.c#1 add .. //depot/projects/soc2011/cnicutar_tcputo_9/src/tools/regression/netinet/tcputo/test_utils.h#1 add Differences ...