Date: Wed, 26 Dec 2007 21:18:27 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 131724 for review Message-ID: <200712262118.lBQLIRUR056430@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=131724 Change 131724 by jb@jb_freebsd1 on 2007/12/26 21:17:58 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#34 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#26 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#3 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/Makefile#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-5.3.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-dev-model.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-linux-license.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-organization.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-recent-releases.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-release-process.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/freebsd-users.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/common/what-is-freebsd.xml#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/freebsd-general/Makefile#1 branch .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/slides/freebsd-general/slides.xml#1 branch .. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/dtrace/src/bin/cp/cp.c#9 integrate .. //depot/projects/dtrace/src/sbin/Makefile#10 integrate .. //depot/projects/dtrace/src/sbin/ddb/Makefile#1 branch .. //depot/projects/dtrace/src/sbin/ddb/ddb.8#1 branch .. //depot/projects/dtrace/src/sbin/ddb/ddb.c#1 branch .. //depot/projects/dtrace/src/sbin/ddb/ddb.h#1 branch .. //depot/projects/dtrace/src/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/dtrace/src/sbin/savecore/savecore.8#4 integrate .. //depot/projects/dtrace/src/sbin/savecore/savecore.c#5 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#25 integrate .. //depot/projects/dtrace/src/share/man/man4/ddb.4#13 integrate .. //depot/projects/dtrace/src/share/man/man4/textdump.4#1 branch .. //depot/projects/dtrace/src/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/conf/files#60 integrate .. //depot/projects/dtrace/src/sys/ddb/db_capture.c#2 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.c#12 integrate .. //depot/projects/dtrace/src/sys/ddb/db_command.h#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_lex.c#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_lex.h#4 integrate .. //depot/projects/dtrace/src/sys/ddb/db_main.c#6 integrate .. //depot/projects/dtrace/src/sys/ddb/db_script.c#1 branch .. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#1 branch .. //depot/projects/dtrace/src/sys/ddb/ddb.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ums.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/dtrace/src/sys/net/if_enc.c#10 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/copyright.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/kerneldump.h#5 integrate .. //depot/projects/dtrace/www/en/developers.sgml#24 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#29 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#34 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.212 2007/11/01 17:29:05 brix Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.213 2007/12/26 18:46:52 raj Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -511,6 +511,10 @@ </listitem> <listitem> + <para>&a.raj;</para> + </listitem> + + <listitem> <para>&a.gj;</para> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v 1.74 2007/01/23 17:52:10 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml,v 1.75 2007/12/26 12:56:46 rwatson Exp $ --> <chapter id="kerneldebug"> @@ -53,14 +53,16 @@ <quote>swap device</quote> is synonymous with a <quote>swap partition.</quote></para></note> - <para>To be able to extract a usable core, it is required that at - least one swap partition be large enough to hold all of the bits - in physical memory. When a kernel panics, before the system - reboots, the kernel is smart enough to check to see if a swap - device has been configured as a dump device. If there is a - valid dump device, the kernel dumps the contents of what is in - physical memory to the swap device.</para> - + <para>Several types of kernel crash dumps are available: full memory + dumps, which hold the complete contents of physical memory, + minidumps, which hold only memory pages in use by the kernel + (&os; 6.2 and higher), and textdumps, which hold captured + scripted or interactive debugger output (&os; 8.0 and higher). + Minidumps are the default dump type as of &os; 7.0, and in most + cases will capture all necessary information present in a full + memory dump, as most problems can be isolated only using kernel + state.</para> + <sect2 id="config-dumpdev"> <title>Configuring the Dump Device</title> @@ -72,7 +74,10 @@ has been configured with &man.swapon.8;. This is normally handled by setting the <varname>dumpdev</varname> variable in &man.rc.conf.5; to the path of the swap device (the - recommended way to extract a kernel dump).</para> + recommended way to extract a kernel dump) or + <filename>AUTO</filename> to use the first configured swap + device. <filename>AUTO</filename> is the default as of + &os; 6.0.</para> <para>Alternatively, the dump device can be hard-coded via the <literal>dump</literal> clause in the &man.config.5; line of @@ -140,10 +145,6 @@ space for the dump. Also, do not forget to specify the correct path to your swap device as it is likely different than <filename>/dev/ad0s1b</filename>!</para></tip> - - <para>The recommended, and certainly the easiest way to automate - obtaining crash dumps is to use the <varname>dumpdev</varname> - variable in &man.rc.conf.5;.</para> </sect2> </sect1> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#26 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.433 2007/11/01 17:24:39 brix Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.434 2007/12/26 18:46:52 raj Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -824,6 +824,8 @@ <!ENTITY a.rafan "Rong-En Fan <email>rafan@FreeBSD.org</email>"> +<!ENTITY a.raj "Rafal Jaworowski <email>raj@FreeBSD.org</email>"> + <!ENTITY a.rees "Jim Rees <email>rees@FreeBSD.org</email>"> <!ENTITY a.reg "Jeremy Lea <email>reg@FreeBSD.org</email>"> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#4 (text+ko) ==== @@ -1,12 +1,10 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml,v 1.2 2006/11/27 22:44:09 keramida Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml,v 1.4 2007/12/26 20:32:00 gabor Exp $ --> <foilgroup id="freebsd-dev-model"> - <foil id="freebsd-dev-model-general"> - <title>FreeBSD Development Model</title> + <title>FreeBSD Development Model - Overview</title> <itemizedlist> - <listitem>FreeBSD development continues along two parallel branches; FreeBSD-CURRENT and FreeBSD-STABLE.</listitem> @@ -21,16 +19,17 @@ </itemizedlist> </foil> +<!-- FIXME: past the chart here <foil id="freebsd-dev-model-release-diagram"> <title>FreeBSD Release Diagram</title> <para>Chart from releng paper goes here.</para> </foil> +--> - <foil id="freebsd-dev-model-organization"> - <title>FreeBSD Development Model</title> + <title>FreeBSD Development Model - The Team</title> <itemizedlist> <listitem>Thousands of developers around the world contribute @@ -39,29 +38,27 @@ <listitem>Only the <quote>committers</quote> have write access to the CVS repository.</listitem> - <listitem>324 total committers in FreeBSD (includes source, + <listitem>488 total committers in FreeBSD (includes source, documentation, and ports committers).</listitem> - <listitem>212 active committers to src/ in the last 12 + <listitem>203 active committers to src/ (exlucind sys) in the last 12 months.</listitem> - <listitem>165 active committers to src/sys in the last 12 + <listitem>144 active committers to src/sys in the last 12 months.</listitem> </itemizedlist> - </foil> <foil id="freebsd-dev-model-bugs"> - <title>FreeBSD Development Model</title> + <title>FreeBSD Development Model - Handling Bugs</title> <itemizedlist> - <listitem>Users and external developers should submit bug fixes, - enhancements, or problem reports with GNATS.</listitem> + <listitem>Users and external developers do not have CVS access, they + can submit bug fixes, enhancements, or problem reports using the + GNATS database.</listitem> - <listitem>Online submission forms, send-pr command installed by - default on FreeBSD systems, etc.</listitem> + <listitem>Online submission forms, <command>send-pr</command> command + installed by default on FreeBSD systems, etc.</listitem> </itemizedlist> - </foil> - </foilgroup> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#3 (text+ko) ==== @@ -1,9 +1,10 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml,v 1.1 2004/09/08 15:43:23 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml,v 1.2 2007/12/26 20:32:57 gabor Exp $ --> <foilgroup id="freebsd-linux"> <title>Differences from Linux</title> - <foil id="freebsd-linux-bsdl"><title>FreeBSD Licensing Model</title> + <foil id="freebsd-linux-bsdl"> + <title>FreeBSD Licensing Model</title> <itemizedlist> <listitem>FreeBSD distributed under "2 clause" BSD license</listitem> @@ -23,19 +24,20 @@ with the distribution.</para> </foil> - <foil id="freebsd-linux-bsdl-explained"><title>FreeBSD Licensing Model</title> + <foil id="freebsd-linux-bsdl-explained"> + <title>FreeBSD Licensing Model</title> <itemizedlist> <listitem>Don't claim that you wrote the code</listitem> <listitem>Don't blame us if the code doesn't work</listitem> <listitem>Apart from that, do anything you want with the code</listitem> </itemizedlist> + </foil> - </foil> + <foil id="freebsd-linux-gpl-explained"> + <title>The GPL and BSD Licenses</title> - <foil id="freebsd-linux-gpl-explained"><title>The GPL and BSD Licenses</title> <itemizedlist> - <listitem>The GPL mandates that source code be disclosed</listitem> <listitem>The BSD License allows source code changes to be kept @@ -50,7 +52,6 @@ <listitem>Donating changes back is purely at the discretion of the party making the changes.</listitem> - </itemizedlist> </foil> </foilgroup> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#3 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml,v 1.1 2004/09/07 12:15:12 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml,v 1.2 2007/12/26 20:34:37 gabor Exp $ --> <foil id="freebsd-organization"> <title>FreeBSD Organization</title> @@ -13,8 +13,25 @@ of 9 developers elected by the committers for 2 year terms.</listitem> + <listitem>The FreeBSD <emphasis>Ports Management Team</emphasis> + is responsible for ensuring that the FreeBSD Ports Collection + is stable, up-to-date and full-deatured. Its secondary responsibility + is to coordinate among the committers and developers working on + it.</listitem> + + <listitem>The FreeBSD <emphasis>Documentation Engineering Team</emphasis> + is responsible for defining and following up documentation goals for + the committers in the Documentation Project.</listitem> + <listitem>The FreeBSD <emphasis>Release Engineering Team</emphasis> is a small group of developers responsible for managing the release process.</listitem> + + <listitem>The FreeBSD <emphasis>Security Team</emphasis> is responsible + for keeping the community aware of bugs, exploits and security risks + affecting the FreeBSD src and ports trees, and to promote and + distribute information needed to safely run FreeBSD systems. + Furthermore, it is responsible for resolving software bugs affecting + the security of FreeBSD and issuing security advisories.</listitem> </itemizedlist> </foil> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#3 (text+ko) ==== @@ -1,24 +1,24 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml,v 1.1 2004/09/07 12:15:12 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml,v 1.3 2007/12/26 20:36:37 gabor Exp $ --> + +<foil> + <title>Recent Releases</title> -<foil><title>Recent Releases</title> <itemizedlist> - - <listitem>FreeBSD 4.X-STABLE continues incremental feature, + <listitem>FreeBSD 6.X-STABLE continues incremental feature, performance, stability development. <itemizedlist> - <listitem>FreeBSD 4.9 (October, 2003)</listitem> - <listitem>FreeBSD 4.10 (May, 2004)</listitem> + <listitem>FreeBSD 6.1 (May, 2006)</listitem> + <listitem>FreeBSD 6.2 (January, 2007)</listitem> </itemizedlist> </listitem> - <listitem>FreeBSD 5.X-CURRENT continues higher risk development, - approaches -STABLE. + <listitem>FreeBSD 7.X-STABLE is the newest stable branch with lots of + interesting experimental features. <itemizedlist> - <listitem>FreeBSD 5.0 (January, 2003)</listitem> - <listitem>FreeBSD 5.1 (June, 2003)</listitem> - <listitem>FreeBSD 5.2 (January, 2004)</listitem> - <listitem>FreeBSD 5.2.1 (February, 2004)</listitem> + <listitem>FreeBSD 7.0 (January, 2008)</listitem> </itemizedlist> </listitem> + + <listitem>FreeBSD 8.X-CURRENT continues high risk development.</listitem> </itemizedlist> </foil> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#3 (text+ko) ==== @@ -1,30 +1,18 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml,v 1.1 2004/09/07 12:15:12 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml,v 1.2 2007/12/26 20:37:13 gabor Exp $ --> <foil id="freebsd-release-process-general"> <title>FreeBSD Release Process</title> <itemizedlist> - <listitem><quote>Stable</quote> releases are made from the - -STABLE development branch at approximately 4 month - intervals.</listitem> + -STABLE development branch every 4 months.</listitem> - <listitem>Major new versions (3.0, 4.0, 5.0, etc..) are released - at much longer intervals when the main goals for that release - have been realized. - - <itemizedlist> - <listitem>3.0 - October 1998</listitem> - <listitem>4.0 - March 2000</listitem> - <listitem>5.0 - January 2003</listitem> - </itemizedlist> + <listitem>Major new versions (6.0, 7.0, etc.) are released + every 18 months.</listitem> - </listitem> - <listitem>In periods of transition, point releases from the previous branch are still released while the next major release branch stabilizes. (e.g., 4.8, 4.9, and 4.10 were released after 5.0)</listitem> - </itemizedlist> </foil> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#3 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml,v 1.1 2004/09/07 12:15:12 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml,v 1.2 2007/12/26 20:37:44 gabor Exp $ --> <foil><title>What is FreeBSD?</title> <itemizedlist> @@ -16,7 +16,7 @@ <listitem>Berkeley permits broad commercial re-use in open and closed source products.</listitem> - <listitem>i386, ia64, amd64, sparc64, alpha</listitem> + <listitem>amd64, i386, ia64, pc98, powerpc, sparc64</listitem> </itemizedlist> </listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#3 (text+ko) ==== @@ -1,6 +1,6 @@ -<?xml version='1.0'?> +<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml,v 1.3 2005/08/29 02:18:06 murray Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml,v 1.4 2007/12/26 20:40:58 gabor Exp $ --> <!DOCTYPE slides SYSTEM "/usr/local/share/xsl/slides/schema/dtd/slides.dtd" [ @@ -15,7 +15,8 @@ "../common/freebsd-recent-releases.xml"> <!ENTITY slides.freebsd-organization SYSTEM "../common/freebsd-organization.xml"> -<!ENTITY slides.freebsd-5.3 SYSTEM "../common/freebsd-5.3.xml"> +<!ENTITY slides.freebsd-more-information SYSTEM + "../common/freebsd-more-information.xml"> ]> <?dbhtml graphics-dir="/usr/local/share/xsl/slides/graphics" css-stylesheet-dir="/usr/local/share/xsl/slides/browser"?> @@ -31,19 +32,27 @@ <!-- Speaker's name goes here. --> - <author><firstname>Murray</firstname><surname>Stokely</surname><email>murray@FreeBSD.org</email></author> - <pubdate>Thursday, 9 Sep 2004</pubdate> - <copyright><year>2004</year> <holder>FreeBSD Mall, Inc.</holder></copyright> + <author> + <firstname>Murray</firstname> + <surname>Stokely</surname> + <email>murray@FreeBSD.org</email> + </author> + <pubdate>Thursday, 3 Jan 2008</pubdate> + <copyright> + <year>2004-2008</year> + <holder>FreeBSD Mall, Inc.</holder> + </copyright> </slidesinfo> -<foil id="intro-outline"><title>Outline</title> +<foil id="intro-outline"> + <title>Outline</title> + <itemizedlist> <listitem>What is FreeBSD?</listitem> <listitem>Who uses FreeBSD?</listitem> <listitem>FreeBSD Development Model</listitem> <listitem>FreeBSD Release / Branch Terminology</listitem> <listitem>Recent FreeBSD Releases</listitem> - <listitem>FreeBSD 5.3</listitem> <!-- XXX To Add : Gallery of FreeBSD users, comparisons with Linux, --> <!-- much more. --> @@ -51,7 +60,7 @@ </itemizedlist> </foil> -<!-- Include the 'What is FreeBSD' slides. --> +<!-- Include the slides --> &slides.what-is-freebsd; @@ -59,26 +68,12 @@ &slides.freebsd-dev-model; +&slides.freebsd-organization; + &slides.freebsd-release-process; -<!-- Include the 'Recent Releases' slides. --> - &slides.freebsd-recent-releases; -<!-- XXX this should be right after dev model. --> - -&slides.freebsd-organization; - -<!-- Slides about 'FreeBSD 5.3' --> - -&slides.freebsd-5.3; - -<foil id="More information"><title>More Information</title> - <itemizedlist> - <listitem><ulink url="http://www.FreeBSD.org"></ulink></listitem>; - <listitem><ulink url="http://www.FreeBSD.org/handbook">FreeBSD Handbook</ulink></listitem> - <listitem><ulink url="http://www.FreeBSDMall.com">FreeBSD Mall, Inc.</ulink></listitem> - </itemizedlist> -</foil> +&slides.freebsd-more-information; </slides> ==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.8 2007/12/25 23:37:42 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.9 2007/12/26 10:17:53 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.35 2006/01/05 21:21:23 siebrand Exp $ Gebaseerd op: 1.279 --> @@ -4494,6 +4494,8 @@ <surname>Brüffer</surname> <contrib>Geschreven door </contrib> </author> + </authorgroup> + <authorgroup> <author> <firstname>Remko</firstname> <surname>Lodder</surname> ==== //depot/projects/dtrace/src/bin/cp/cp.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.58 2007/12/25 00:40:32 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); /* * Cp copies source files to target files. @@ -210,10 +210,9 @@ /* * Case (1). Target is not a directory. */ - if (argc > 1) { - warnx("Target is not a directory"); - exit(1); - } + if (argc > 1) + errx(1, "%s is not a directory", to.p_path); + /* * Need to detect the case: * cp -R dir foo ==== //depot/projects/dtrace/src/sbin/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.168 2007/07/24 15:35:00 scottl Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.169 2007/12/26 09:38:21 rwatson Exp $ .include <bsd.own.mk> @@ -15,6 +15,7 @@ clri \ comcontrol \ conscontrol \ + ddb \ ${_devd} \ devfs \ dhclient \ ==== //depot/projects/dtrace/src/sbin/savecore/savecore.8#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.25 2005/06/14 11:24:56 ru Exp $ +.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.26 2007/12/26 11:42:10 rwatson Exp $ .\" .Dd February 24, 2005 .Dt SAVECORE 8 @@ -102,6 +102,12 @@ .Ar directory Ns Pa /vmcore.# and information about the core in .Ar directory Ns Pa /info.# +For kernel textdumps generated with the +.Xr textdump 4 +facility, output will be stored in the +.Xr tar 5 +format and named +.Ar director Ns Pa /textdump.tar.# The ``#'' is the number from the first line of the file .Ar directory Ns Pa /bounds , and it is incremented and stored back into the file each time @@ -137,6 +143,8 @@ .Sh SEE ALSO .Xr gzip 1 , .Xr getbootfile 3 , +.Xr textdump 4 , +.Xr tar 4 , .Xr dumpon 8 , .Xr syslogd 8 .Sh HISTORY @@ -144,5 +152,8 @@ .Nm utility appeared in .Bx 4.1 . +.Pp +Support for kernel textdumps appeared in +.Fx 8.0 . .Sh BUGS The minfree code does not consider the effect of compression or sparse files. ==== //depot/projects/dtrace/src/sbin/savecore/savecore.c#5 (text+ko) ==== @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.78 2007/05/28 09:48:25 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.79 2007/12/26 11:42:10 rwatson Exp $"); #include <sys/param.h> #include <sys/disk.h> @@ -226,21 +226,155 @@ #define BLOCKSIZE (1<<12) #define BLOCKMASK (~(BLOCKSIZE-1)) +static int +DoRegularFile(int fd, off_t dumpsize, char *buf, const char *device, + const char *filename, FILE *fp) +{ + int he, hs, nr, nw, wl; + off_t dmpcnt; + + dmpcnt = 0; + he = 0; + while (dumpsize > 0) { + wl = BUFFERSIZE; + if (wl > dumpsize) + wl = dumpsize; + nr = read(fd, buf, wl); + if (nr != wl) { + if (nr == 0) + syslog(LOG_WARNING, + "WARNING: EOF on dump device"); + else + syslog(LOG_ERR, "read error on %s: %m", device); + nerr++; + return (-1); + } + if (compress) { + nw = fwrite(buf, 1, wl, fp); + } else { + for (nw = 0; nw < nr; nw = he) { + /* find a contiguous block of zeroes */ + for (hs = nw; hs < nr; hs += BLOCKSIZE) { + for (he = hs; he < nr && buf[he] == 0; + ++he) + /* nothing */ ; + /* is the hole long enough to matter? */ + if (he >= hs + BLOCKSIZE) + break; + } + + /* back down to a block boundary */ + he &= BLOCKMASK; + + /* + * 1) Don't go beyond the end of the buffer. + * 2) If the end of the buffer is less than + * BLOCKSIZE bytes away, we're at the end + * of the file, so just grab what's left. + */ + if (hs + BLOCKSIZE > nr) + hs = he = nr; + + /* + * At this point, we have a partial ordering: + * nw <= hs <= he <= nr + * If hs > nw, buf[nw..hs] contains non-zero data. + * If he > hs, buf[hs..he] is all zeroes. + */ + if (hs > nw) + if (fwrite(buf + nw, hs - nw, 1, fp) + != 1) + break; + if (he > hs) + if (fseeko(fp, he - hs, SEEK_CUR) == -1) + break; + } + } + if (nw != wl) { + syslog(LOG_ERR, + "write error on %s file: %m", filename); + syslog(LOG_WARNING, + "WARNING: vmcore may be incomplete"); + nerr++; + return (-1); + } + if (verbose) { + dmpcnt += wl; + printf("%llu\r", (unsigned long long)dmpcnt); + fflush(stdout); + } + dumpsize -= wl; + } + return (0); +} + +/* + * Specialized version of dump-reading logic for use with textdumps, which + * are written backwards from the end of the partition, and must be reversed + * before being written to the file. Textdumps are small, so do a bit less + * work to optimize/sparsify. + */ +static int +DoTextdumpFile(int fd, off_t dumpsize, off_t lasthd, char *buf, + const char *device, const char *filename, FILE *fp) +{ + int nr, nw, wl; + off_t dmpcnt, totsize; + + totsize = dumpsize; + dmpcnt = 0; + wl = 512; + if ((dumpsize % wl) != 0) { + syslog(LOG_ERR, "textdump uneven multiple of 512 on %s", + device); + nerr++; + return (-1); + } + while (dumpsize > 0) { + nr = pread(fd, buf, wl, lasthd - (totsize - dumpsize) - wl); + if (nr != wl) { + if (nr == 0) + syslog(LOG_WARNING, + "WARNING: EOF on dump device"); + else + syslog(LOG_ERR, "read error on %s: %m", device); + nerr++; + return (-1); + } + nw = fwrite(buf, 1, wl, fp); + if (nw != wl) { + syslog(LOG_ERR, + "write error on %s file: %m", filename); + syslog(LOG_WARNING, + "WARNING: textdump may be incomplete"); + nerr++; + return (-1); + } + if (verbose) { + dmpcnt += wl; + printf("%llu\r", (unsigned long long)dmpcnt); + fflush(stdout); + } + dumpsize -= wl; + } + return (0); +} + static void DoFile(const char *savedir, const char *device) { + static char filename[PATH_MAX]; static char *buf = NULL; struct kerneldumpheader kdhf, kdhl; - off_t mediasize, dumpsize, firsthd, lasthd, dmpcnt; + off_t mediasize, dumpsize, firsthd, lasthd; FILE *info, *fp; mode_t oumask; - int fd, fdinfo, error, wl; - int nr, nw, hs, he = 0; + int fd, fdinfo, error; int bounds, status; u_int sectorsize; + int istextdump; bounds = getbounds(); - dmpcnt = 0; mediasize = 0; status = STATUS_UNKNOWN; @@ -284,7 +418,13 @@ (long long)lasthd, device); goto closefd; } - if (memcmp(kdhl.magic, KERNELDUMPMAGIC, sizeof kdhl.magic)) { + istextdump = 0; + if (memcmp(kdhl.magic, TEXTDUMPMAGIC, sizeof kdhl.magic)) { + if (verbose) + printf("textdump magic on last dump header on %s\n", + device); + istextdump = 1; + } else if (memcmp(kdhl.magic, KERNELDUMPMAGIC, sizeof kdhl.magic)) { if (verbose) printf("magic mismatch on last dump header on %s\n", device); @@ -391,14 +531,16 @@ } oumask = umask(S_IRWXG|S_IRWXO); /* Restrict access to the core file.*/ if (compress) { - sprintf(buf, "vmcore.%d.gz", bounds); - fp = zopen(buf, "w"); + sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" : + "vmcore", bounds); + fp = zopen(filename, "w"); } else { - sprintf(buf, "vmcore.%d", bounds); - fp = fopen(buf, "w"); + sprintf(filename, "%s.%d", istextdump ? "textdump.tar" : + "vmcore", bounds); + fp = fopen(filename, "w"); } if (fp == NULL) { - syslog(LOG_ERR, "%s: %m", buf); + syslog(LOG_ERR, "%s: %m", filename); close(fdinfo); nerr++; goto closefd; @@ -420,83 +562,22 @@ fclose(info); syslog(LOG_NOTICE, "writing %score to %s", - compress ? "compressed " : "", buf); + compress ? "compressed " : "", filename); - while (dumpsize > 0) { - wl = BUFFERSIZE; - if (wl > dumpsize) - wl = dumpsize; - nr = read(fd, buf, wl); - if (nr != wl) { - if (nr == 0) - syslog(LOG_WARNING, - "WARNING: EOF on dump device"); - else - syslog(LOG_ERR, "read error on %s: %m", device); - nerr++; + if (istextdump) { + if (DoTextdumpFile(fd, dumpsize, lasthd, buf, device, + filename, fp) < 0) goto closeall; - } - if (compress) { - nw = fwrite(buf, 1, wl, fp); - } else { - for (nw = 0; nw < nr; nw = he) { - /* find a contiguous block of zeroes */ - for (hs = nw; hs < nr; hs += BLOCKSIZE) { - for (he = hs; he < nr && buf[he] == 0; - ++he) - /* nothing */ ; - /* is the hole long enough to matter? */ - if (he >= hs + BLOCKSIZE) - break; - } - - /* back down to a block boundary */ - he &= BLOCKMASK; - - /* - * 1) Don't go beyond the end of the buffer. - * 2) If the end of the buffer is less than - * BLOCKSIZE bytes away, we're at the end - * of the file, so just grab what's left. - */ - if (hs + BLOCKSIZE > nr) - hs = he = nr; - - /* - * At this point, we have a partial ordering: - * nw <= hs <= he <= nr - * If hs > nw, buf[nw..hs] contains non-zero data. - * If he > hs, buf[hs..he] is all zeroes. - */ - if (hs > nw) - if (fwrite(buf + nw, hs - nw, 1, fp) - != 1) - break; - if (he > hs) - if (fseeko(fp, he - hs, SEEK_CUR) == -1) - break; - } - } - if (nw != wl) { - syslog(LOG_ERR, - "write error on vmcore.%d file: %m", bounds); - syslog(LOG_WARNING, - "WARNING: vmcore may be incomplete"); - nerr++; + } else { + if (DoRegularFile(fd, dumpsize, buf, device, filename, fp) + < 0) goto closeall; - } - if (verbose) { - dmpcnt += wl; - printf("%llu\r", (unsigned long long)dmpcnt); - fflush(stdout); - } - dumpsize -= wl; } if (verbose) printf("\n"); if (fclose(fp) < 0) { - syslog(LOG_ERR, "error on vmcore.%d: %m", bounds); + syslog(LOG_ERR, "error on %s: %m", filename); nerr++; goto closeall; } ==== //depot/projects/dtrace/src/share/man/man4/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.400 2007/12/15 00:56:15 scottl Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.401 2007/12/26 11:35:06 rwatson Exp $ MAN= aac.4 \ acpi.4 \ @@ -355,6 +355,7 @@ tcp.4 \ tdfx.4 \ termios.4 \ + textdump.4 \ ti.4 \ tl.4 \ trm.4 \ ==== //depot/projects/dtrace/src/share/man/man4/ddb.4#13 (text+ko) ==== @@ -1,6 +1,7 @@ .\" .\" Mach Operating System .\" Copyright (c) 1991,1990 Carnegie Mellon University +.\" Copyright (c) 2007 Robert N. M. Watson .\" All Rights Reserved. .\" .\" Permission to use, copy, modify and distribute this software and its @@ -57,9 +58,9 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.43 2007/12/25 23:25:04 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.47 2007/12/26 12:18:21 rwatson Exp $ .\" -.Dd December 25, 2007 +.Dd December 26, 2007 .Dt DDB 4 .Os .Sh NAME @@ -626,6 +627,41 @@ .Dv debug.ddb.capture.bytes may be used to query the number of bytes of output currently in the capture buffer. +.Pp +.Dv debug.ddb.capture.data +returns the contents of the buffer as a string to an appropriately privileged +process. +.Pp +This facility is particularly useful in concert with the scripting and +.Xr textdump 4 +facilities, allowing scripted debugging output to be captured and +committed to disk as part of a textdump for later analysis. +The contents of the capture buffer may also be inspected in a kernel core dump +using +.Xr kgdb 1 . +.Pp +.It Ic run +.It Ic script +.It Ic scripts +.It Ic unscript +Run, define, list, and delete scripts. +See the +.Sx SCRIPTING +section for more information on the scripting facility. +.Pp +.It Ic textdump set +.It Ic textdump status +.It Ic textdump unset +The +.Ic textdump set +command may be used to force the next kernel core dump to be a textdump +rather than a traditional memory dump or minidump. +.Ic textdump status +reports whether a textdump has been scheduled. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712262118.lBQLIRUR056430>