PERFORCE change 142273 for review
John Birrell
jb at FreeBSD.org
Sun May 25 20:29:21 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142273
Change 142273 by jb at freebsd3 on 2008/05/25 20:29:05
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#3 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#17 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#2 integrate
.. //depot/projects/dtrace/ports/MOVED#90 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/chopindex#3 integrate
.. //depot/projects/dtrace/src/Makefile#23 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/exception.s#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lock.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#38 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#36 integrate
.. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#30 integrate
.. //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#10 integrate
.. //depot/projects/dtrace/src/sys/sys/file.h#10 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#6 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#15 integrate
.. //depot/projects/dtrace/www/de/developers.sgml#12 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#23 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64.sgml#6 integrate
.. //depot/projects/dtrace/www/en/platforms/pc98.sgml#5 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#3 (text+ko) ====
@@ -19,7 +19,7 @@
<holder>The FreeBSD Documentation Project</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.2 2008/04/14 13:08:18 jkois Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.5 2008/05/25 15:19:42 gabor Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -64,7 +64,7 @@
shells are available in &os;'s <ulink
url="article.html#SOFTWARE">Packages and Ports Collection</ulink>.</para>
- <para>If you do install other shells you can use &man.chsh.1 to set
+ <para>If you do install other shells you can use &man.chsh.1; to set
a user's default shell. It is, however, recommended that the
<username>root</username>'s default shell remain unchanged. The
reason for this is that shells not included in the base distribution
@@ -153,7 +153,7 @@
process. If the Ports Collection has not been installed it can be
added from the installation discs using &man.sysinstall.8;, or pulled
from the &os; servers using &man.csup.1; or &man.portsnap.8;.
- Detailed instructions for installaing the Ports Collection can be
+ Detailed instructions for installing the Ports Collection can be
found in <ulink
url="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 4.5.1</ulink>
of the handbook.</para>
@@ -511,14 +511,14 @@
<tbody>
<row>
- <entry><command>yum install <package></command> / <command>apt-get install <package></command></entry>
- <entry><command>pkg_add -r <package></command></entry>
- <entry>Install <package> from remote repository</entry>
+ <entry><command>yum install <replaceable>package</replaceable></command> / <command>apt-get install <replaceable>package</replaceable></command></entry>
+ <entry><command>pkg_add -r <replaceable>package</replaceable></command></entry>
+ <entry>Install <replaceable>package</replaceable> from remote repository</entry>
</row>
<row>
- <entry><command>rpm -ivh <package></command> / <command>dpkg -i <package></command></entry>
- <entry><command>pkg_add -v <package></command></entry>
+ <entry><command>rpm -ivh <replaceable>package</replaceable></command> / <command>dpkg -i <replaceable>package</replaceable></command></entry>
+ <entry><command>pkg_add -v <replaceable>package</replaceable></command></entry>
<entry>Install package</entry>
</row>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#17 (text+ko) ====
@@ -10,7 +10,7 @@
<corpauthor>The FreeBSD Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.811 2008/04/12 20:13:12 keramida Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.822 2008/05/25 14:49:12 gabor Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -26,6 +26,7 @@
<year>2005</year>
<year>2006</year>
<year>2007</year>
+ <year>2008</year>
<holder>The FreeBSD Documentation Project</holder>
</copyright>
@@ -97,8 +98,8 @@
<answer>
<para>Briefly, FreeBSD is a &unix; like operating system for
- the Alpha/AXP, AMD64 and &intel; EM64T, &i386; IA-64,
- PC-98, and &ultrasparc; platforms
+ AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;, &powerpc;
+ and &ultrasparc; platforms
based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
release, with some <quote>4.4BSD-Lite2</quote>
enhancements. It is also based indirectly on William
@@ -290,7 +291,7 @@
parallel development branches; releases are being made from
both branches. The 5.X series of releases
is being made from the <emphasis>5-STABLE</emphasis> branch
- and the 6.X series of releases from <emphasis>6-STABLE</emphasis>.
+ and the 6.X series of releases from <emphasis>6-STABLE</emphasis>.</para>
<para>Up until the release of 5.3, the 4.X series was the
one known as <emphasis>-STABLE</emphasis>. However,
@@ -300,7 +301,7 @@
fixes. There will be more releases made from the
<emphasis>5-STABLE</emphasis> branch, but it is considered
a <quote>legacy</quote> branch and most current work will
- only become a part of <emphasis>6-STABLE</emphasis>.
+ only become a part of <emphasis>6-STABLE</emphasis>.</para>
<para>Version <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
@@ -683,6 +684,12 @@
</row>
<row>
+ <entry><literal>el_GR.ISO8859-7</literal></entry>
+
+ <entry>Greek (Greece)</entry>
+ </row>
+
+ <row>
<entry><literal>es_ES.ISO8859-1</literal></entry>
<entry>Spanish</entry>
@@ -725,6 +732,12 @@
</row>
<row>
+ <entry><literal>no_NO.ISO8859-1</literal></entry>
+
+ <entry>Norwegian (Norway)</entry>
+ </row>
+
+ <row>
<entry><literal>pl_PL.ISO8859-2</literal></entry>
<entry>Polish (Poland)</entry>
@@ -874,8 +887,8 @@
<listitem>
<para>All the other formats generate one file,
called
- <filename>book.<replaceable>format</replaceable></filename>
- (i.e., <filename>book.pdb</filename>,
+ <filename><replaceable>type</replaceable>.<replaceable>format</replaceable></filename>
+ (i.e., <filename>article.pdf</filename>,
<filename>book.html</filename>, and so on).</para>
<para>These files are then compressed using two
@@ -931,7 +944,7 @@
<para>The advantage of downloading and installing the package is
that the documentation can then be managed using the normal
- FreeBSD package management comments, such as &man.pkg.add.1; and
+ FreeBSD package management commands, such as &man.pkg.add.1; and
&man.pkg.delete.1;.</para>
<para>If you decide to download and install the package then
@@ -1058,7 +1071,7 @@
English speaking channel, though we have users from all over
the world. If you would like to speak in your native language,
try to ask the question in English and then relocate to another
- channel ##freebsd-<replaceable>lang</replaceable> as
+ channel <literal>##freebsd-<replaceable>lang</replaceable></literal> as
appropriate.</para>
</listitem>
@@ -1557,7 +1570,7 @@
<answer>
<para>If you are seeing things like the machine grinding to a halt
or spontaneously rebooting when you try to boot the install
- floppy, here are three questions to ask yourself:-</para>
+ floppy, here are three questions to ask yourself:</para>
<orderedlist>
<listitem>
@@ -1677,9 +1690,9 @@
<para>If it <emphasis>is</emphasis> turned on (it is often
supplied this way to get around certain limitations in
- &ms-dos;) and the disk capacity is more than 1GB, use M
+ &ms-dos;) and the disk capacity is more than 1GB, use <replaceable>M</replaceable>
cylinders, 63 sectors per track (<emphasis>not</emphasis>
- 64), and 255 heads, where <literal>M</literal> is the disk capacity in MB
+ 64), and 255 heads, where <replaceable>M</replaceable> is the disk capacity in MB
divided by 7.844238 (!). So our example 2GB drive would
have 261 cylinders, 63 sectors per track and 255
heads.</para>
@@ -1888,11 +1901,11 @@
systems, with the hard disks arranged as the master or
single device on separate IDE controllers, with FreeBSD
installed on the secondary IDE controller. The boot blocks
- think the system is installed on ad0 (the second BIOS
+ think the system is installed on <devicename>ad0</devicename> (the second BIOS
disk) while the kernel assigns the first disk on the
- secondary controller device, ad2. After the device
+ secondary controller device, <devicename>ad2</devicename>. After the device
probing, the kernel tries to mount what the boot blocks
- think is the boot disk, ad0, while it is really ad2, and
+ think is the boot disk, <devicename>ad0</devicename>, while it is really <devicename>ad2</devicename>, and
fails.</para>
<para>To fix the problem, do one of the following:</para>
@@ -1905,10 +1918,10 @@
drop you into the boot loader.</para>
<para>Then type
- <literal>
+ <userinput>
set
root_disk_unit="<replaceable>disk_number</replaceable>"
- </literal>. <replaceable>disk_number</replaceable>
+ </userinput>. <replaceable>disk_number</replaceable>
will be <literal>0</literal> if FreeBSD is installed
on the master drive on the first IDE controller,
<literal>1</literal> if it is installed on the slave
@@ -1918,13 +1931,13 @@
installed on the slave of the second IDE
controller.</para>
- <para>Then type <literal>boot</literal>, and your
+ <para>Then type <userinput>boot</userinput>, and your
system should boot correctly.</para>
<para>To make this change permanent (i.e, so you do not
have to do this every time you reboot or turn on
- your FreeBSD machine), put the line <literal>
- root_disk_unit="<replaceable>disk_number</replaceable>"</literal>
+ your FreeBSD machine), put the line <userinput>
+ root_disk_unit="<replaceable>disk_number</replaceable>"</userinput>
in <filename>/boot/loader.conf.local
</filename>.</para>
</listitem>
@@ -1952,9 +1965,7 @@
<programlisting>options PAE</programlisting>
<para>&os;/pc98 has a limit of 4 GB memory, and PAE can not
- be used with it. On &os;/alpha, the limit on memory depends
- on the type of hardware in use - consult the Alpha Hardware
- Release Notes for details. Other architectures
+ be used with it. Other architectures
supported by &os; have much higher theoretical limits on
maximum memory (many terabytes).</para>
</answer>
@@ -2077,9 +2088,17 @@
<answer>
<para>Try disabling ACPI support. When the bootloader loads, press
- the space key. The system displays <screen>OK</screen>. Type
- <screen><userinput>unset acpi_load</userinput></screen> and then
- <screen><userinput>boot</userinput></screen>.</para>
+ the space key. The system will display the following:</para>
+
+ <screen>OK</screen>
+
+ <para>Type:</para>
+
+ <screen><userinput>unset acpi_load</userinput></screen>
+
+ <para>And then type:</para>
+
+ <screen><userinput>boot</userinput></screen>
</answer>
</qandaentry>
@@ -2116,8 +2135,8 @@
week.</para>
<para>If you are looking for a laptop, check the
- FreeBSD-mobile mailing list archives. Otherwise, you
- probably want the archives for FreeBSD-questions, or
+ &a.mobile; archives. Otherwise, you
+ probably want the archives for the &a.questions;, or
possibly a specific mailing list for a particular hardware
type.</para>
</answer>
@@ -2137,14 +2156,12 @@
<answer>
- <para>Yes. FreeBSD currently runs on the Intel x86 and DEC
- (now Compaq) Alpha architectures. As of FreeBSD 5.0, the
- AMD64 and Intel EM64T, IA-64, and &sparc64; architectures
- are also supported. Upcoming platforms are &mips; and
- &powerpc;, join the &a.ppc; or the &a.mips; respectively
- for more information about ongoing work on these
- platforms. For general discussion on new architectures,
- join the &a.platforms;.</para>
+ <para>Yes. FreeBSD currently runs on the Intel x86 and the AMD64
+ architectures. The Intel EM64T, IA-64, &arm;, &powerpc;, sun4v and
+ &sparc64; architectures are also supported. Upcoming platforms are
+ &mips; and &s390;, join the &a.mips; for more information about
+ ongoing work on the &mips; platform. For general discussion on
+ new architectures, join the &a.platforms;.</para>
<para>If your machine has a different architecture and you
need something right now, we suggest you look at <ulink
@@ -2939,7 +2956,7 @@
<screen>&prompt.root; <userinput>camcontrol modepage sd0 -m 1 -e -P 3</userinput></screen>
- <para>and changing the values of AWRE and ARRE from 0 to 1:-</para>
+ <para>and changing the values of AWRE and ARRE from 0 to 1:</para>
<programlisting>AWRE (Auto Write Reallocation Enbld): 1
ARRE (Auto Read Reallocation Enbld): 1</programlisting>
@@ -3447,7 +3464,7 @@
</question>
<answer>
- <para>This is answered in the sendmail FAQ as follows:-</para>
+ <para>This is answered in the sendmail FAQ as follows:</para>
<literallayout> * I'm getting "Local configuration error" messages, such as:
@@ -4179,7 +4196,7 @@
license allows them to be used in closed-source software.
Contact <link linkend="apps2go">Apps2go</link> for the
least expensive ELF &motif; 2.1.20 distribution for FreeBSD
- (either &i386; or Alpha).<anchor id="apps2go"></para>
+ (&i386;).<anchor id="apps2go"></para>
<para>There are two distributions, the <quote>development
edition</quote> and the <quote>runtime edition</quote> (for
==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#2 (text+ko) ====
@@ -1,12 +1,12 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml,v 1.1 2008/05/14 16:54:15 pgj Exp $
+ $FreeBSD: doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml,v 1.2 2008/05/25 16:15:06 pgj Exp $
-->
<!-- The FreeBSD Hungarian Documentation Project
Translated by: PALI, Gabor <pgj at FreeBSD.org>
- Original Revision: 1.229 -->
+ Original Revision: 1.230 -->
<chapter id="config-tuning" lang="hu">
<chapterinfo>
@@ -569,7 +569,7 @@
<para>Manuálisan így tudjuk elindítani:</para>
- <screen>&prompt.root; <userinput><filename>/usr/local/etc/rc.d/utility.sh</filename> start</userinput></screen>
+ <screen>&prompt.root; <userinput><filename>/usr/local/etc/rc.d/utility</filename> start</userinput></screen>
<para>Habár nem mindegyik külsõ szoftvert kell
külön megadni az <filename>rc.conf</filename>
==== //depot/projects/dtrace/ports/MOVED#90 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1598 2008/05/21 09:10:34 rafan Exp $
+# $FreeBSD: ports/MOVED,v 1.1600 2008/05/25 10:21:11 hrs Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3479,3 +3479,5 @@
multimedia/smplayer-qt4||2008-05-17|Functionality is now included in smplayer.
devel/php-Net_Gearman|devel/pear-Net_Gearman|2008-05-19|Now it is a pear module
devel/swig11||2008-05-21|Has expired: use devel/swig13 instead, last release of 1.1 was 8 years ago
+japanese/truetypefonts||2008-05-25|Removed due to copyright problem
+japanese/kochi-cidfonts||2008-05-25|Removed due to copyright problem
==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/chopindex#3 (text+ko) ====
@@ -1,39 +1,55 @@
-#!/bin/sh
-if [ $# != 2 ]; then
- echo "usage: chopindex <indexfile> <pkgdir>"
- return 1
-fi
-index=$1
-pkgdir=$2
-tmpindex=/tmp/index.$$
+#!/usr/bin/env python
+
+import os, sys
+
+if len(sys.argv) != 3:
+ print "%s: <index> <pkgdir>" % sys.argv[0]
+ sys.exit()
+
+indexfile = sys.argv[1]
+pkgdir = sys.argv[2]
+
+if not pkgdir.endswith("/All"):
+ pkgdir = pkgdir + "/All"
-# make a list of all pkgnames that don't have corresponding packages
-missing=$(/usr/bin/awk -v FS="|" -v pkgdir=$pkgdir '{
- if (system(sprintf("test -e %s/All/%s.t[bg]z\n", pkgdir, $1)))
- print $1 ;
-}' $index)
+packages = [pkg for (pkg, ext) in map(os.path.splitext, os.listdir(pkgdir)) if ext == ".tbz"]
-# make an index for only the ports that have packages
-/usr/bin/awk -v FS="|" -v pkgdir=$pkgdir '{
- if (system(sprintf("test ! -e %s/All/%s.t[bg]z\n", pkgdir, $1)))
- print $0 ;
-}' $index > $tmpindex
+index=[]
+pkgs=[]
+for i in file(indexfile):
+ out = i.rstrip().split("|")
+ out[7] = out[7].split(" ") # build dep
+ out[8] = out[8].split(" ") # run dep
+ index.append(out)
-# find missing ports still in the index as a dependency
-delete=""
-sed=""
-for i in $missing; do
- if grep -q "[ |]$i[ |]" $tmpindex; then
- delete="$delete $i"
- sed="$sed -e s/$(echo $i | sed -e 's/\./\\./g')//g"
- fi
-done
+ # Keep track of all the packages we have seen in the index. In
+ # principle there is no need to track the build/run deps since
+ # they will also be listed in field 0. We could add a sanity
+ # check for this.
+ pkgs.append(out[0])
+ pkgs.extend(out[7])
+ pkgs.extend(out[8])
-# delete them
-if [ "$delete" != "" ]; then
- echo "chopindex: deleting" $delete 1>&2
-fi
+used=set(pkgs)
+notfound=used.difference(set(packages))
-sed $sed -e 's/ */ /g' -e 's/| /|/g' -e 's/ |/|/g' $tmpindex
+# Write out the new index, stripping out the entries for missing
+# packages as well as dependencies from existing packages on the
+# missing ones.
+#
+# This is slightly dubious since it will intentionally list packages
+# that are present but missing dependencies on non-redistributable
+# things like jdk that were successfully built but removed already, so
+# the dependency lists will not be complete. It matches the old
+# chopindex.sh behaviour though.
+#
+# I think it would be better to just prune those incomplete packages
+# from the INDEX altogether, but I don't know if anyone is relying on
+# this historical behaviour.
-/bin/rm -f $tmpindex
+for data in index:
+ if data[0] not in notfound:
+ print "%s|%s|%s|%s" % ("|".join(data[:7]),
+ " ".join([j for j in data[7] if j not in notfound]),
+ " ".join([j for j in data[8] if j not in notfound]),
+ "|".join(data[9:]))
==== //depot/projects/dtrace/src/Makefile#23 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.349 2008/05/23 04:20:59 jb Exp $
+# $FreeBSD: src/Makefile,v 1.350 2008/05/25 02:48:57 jb Exp $
#
# The user-driven targets are:
#
@@ -275,7 +275,7 @@
# existing system is.
#
.if make(universe)
-TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64
universe: universe_prologue
universe_prologue:
==== //depot/projects/dtrace/src/sys/i386/i386/exception.s#16 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/i386/exception.s,v 1.120 2008/05/24 19:29:02 bz Exp $
+ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.121 2008/05/25 14:50:47 attilio Exp $
*/
#include "opt_apic.h"
@@ -46,7 +46,7 @@
#include "assym.s"
#define SEL_RPL_MASK 0x0003
-#define GSEL_KPL 0x0020 /* GSEL(GCODE_SEL, SEL_KPL) */
+#define GSEL_KPL 0x0020 /* GSEL(GCODE_SEL, SEL_KPL) */
#ifdef KDTRACE_HOOKS
.bss
==== //depot/projects/dtrace/src/sys/kern/kern_descrip.c#29 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.332 2008/05/21 09:31:44 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.333 2008/05/25 14:57:43 attilio Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -1449,9 +1449,9 @@
* descriptor to the list of open files at that point, otherwise
* put it at the front of the list of open files.
*/
- fp->f_count = 1;
+ refcount_init(&fp->f_count, 1);
if (resultfp)
- fp->f_count++;
+ fhold(fp);
fp->f_cred = crhold(td->td_ucred);
fp->f_ops = &badfileops;
fp->f_data = NULL;
==== //depot/projects/dtrace/src/sys/kern/kern_lock.c#26 (text+ko) ====
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.132 2008/04/13 01:21:56 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.133 2008/05/25 16:11:27 attilio Exp $");
#include <sys/param.h>
#include <sys/ktr.h>
@@ -163,7 +163,7 @@
int catch, error;
class = (flags & LK_INTERLOCK) ? LOCK_CLASS(ilk) : NULL;
- catch = (pri) ? (pri & PCATCH) : 0;
+ catch = pri & PCATCH;
pri &= PRIMASK;
error = 0;
==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#38 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.125 2008/04/25 05:18:49 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.126 2008/05/25 01:44:58 jb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_sched.h"
==== //depot/projects/dtrace/src/sys/kern/sched_ule.c#36 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.244 2008/04/25 05:18:49 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.245 2008/05/25 01:44:58 jb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#30 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.2 2008/05/24 04:36:07 jb Exp $
+# $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.3 2008/05/24 19:52:19 bz Exp $
.include <bsd.own.mk>
.include "Makefile.inc"
@@ -12,8 +12,7 @@
systrace
.if ${MACHINE_ARCH} == "amd64"
-SUBDIR+= fasttrap \
- fbt
+SUBDIR+= fbt
.elif ${MACHINE_ARCH} == "i386"
SUBDIR+= fbt
.endif
==== //depot/projects/dtrace/src/sys/modules/dtrace/dtraceall/dtraceall.c#10 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/modules/dtrace/dtraceall/dtraceall.c,v 1.1 2008/05/17 02:31:17 jb Exp $
+ * $FreeBSD: src/sys/modules/dtrace/dtraceall/dtraceall.c,v 1.2 2008/05/25 02:04:18 jb Exp $
*/
#include <sys/cdefs.h>
@@ -68,7 +68,6 @@
#if defined(__amd64__) || defined(__i386__)
MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
#endif
-MODULE_DEPEND(dtraceall, lockstat, 1, 1, 1);
MODULE_DEPEND(dtraceall, sdt, 1, 1, 1);
MODULE_DEPEND(dtraceall, systrace, 1, 1, 1);
MODULE_DEPEND(dtraceall, profile, 1, 1, 1);
==== //depot/projects/dtrace/src/sys/sys/file.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)file.h 8.3 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/file.h,v 1.77 2008/05/21 09:31:44 kib Exp $
+ * $FreeBSD: src/sys/sys/file.h,v 1.78 2008/05/25 14:57:43 attilio Exp $
*/
#ifndef _SYS_FILE_H_
@@ -39,6 +39,7 @@
#include <sys/unistd.h>
#else
#include <sys/queue.h>
+#include <sys/refcount.h>
#include <sys/_lock.h>
#include <sys/_mutex.h>
@@ -116,7 +117,7 @@
short f_type; /* descriptor type */
short f_vnread_flags; /* (f) Sleep lock for f_offset */
volatile u_int f_flag; /* see fcntl.h */
- volatile int f_count; /* reference count */
+ volatile u_int f_count; /* reference count */
/*
* DTYPE_VNODE specific fields.
*/
@@ -196,9 +197,10 @@
int fgetsock(struct thread *td, int fd, struct socket **spp, u_int *fflagp);
void fputsock(struct socket *sp);
-#define fhold(fp) atomic_add_int(&(fp)->f_count, 1)
+#define fhold(fp) \
+ (refcount_acquire(&(fp)->f_count))
#define fdrop(fp, td) \
- (atomic_fetchadd_int(&(fp)->f_count, -1) <= 1 ? _fdrop((fp), (td)) : 0)
+ (refcount_release(&(fp)->f_count) ? _fdrop((fp), (td)) : 0)
static __inline fo_rdwr_t fo_read;
static __inline fo_rdwr_t fo_write;
==== //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#6 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)fs.h 8.13 (Berkeley) 3/21/95
- * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.49 2006/10/31 21:48:53 pjd Exp $
+ * $FreeBSD: src/sys/ufs/ffs/fs.h,v 1.50 2008/05/24 20:44:14 rodrigc Exp $
*/
#ifndef _UFS_FFS_FS_H_
@@ -103,8 +103,8 @@
* 2^32 with only two levels of indirection, MINBSIZE is set to 4096.
* MINBSIZE must be big enough to hold a cylinder group block,
* thus changes to (struct cg) must keep its size within MINBSIZE.
- * Note that super blocks are always of size SBSIZE,
- * and that both SBSIZE and MAXBSIZE must be >= MINBSIZE.
+ * Note that super blocks are always of size SBLOCKSIZE,
+ * and that both SBLOCKSIZE and MAXBSIZE must be >= MINBSIZE.
*/
#define MINBSIZE 4096
==== //depot/projects/dtrace/src/sys/vm/vm_mmap.c#15 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.220 2008/05/17 19:32:48 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.221 2008/05/24 21:57:16 alc Exp $");
#include "opt_compat.h"
#include "opt_hwpmc_hooks.h"
@@ -573,13 +573,6 @@
if (addr < vm_map_min(map) || addr + size > vm_map_max(map))
return (EINVAL);
vm_map_lock(map);
- /*
- * Make sure entire range is allocated.
- */
- if (!vm_map_check_protection(map, addr, addr + size, VM_PROT_NONE)) {
- vm_map_unlock(map);
- return (EINVAL);
- }
#ifdef HWPMC_HOOKS
/*
* Inform hwpmc if the address range being unmapped contains
==== //depot/projects/dtrace/www/de/developers.sgml#12 (text+ko) ====
@@ -6,9 +6,9 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/de/developers.sgml,v 1.24 2008/04/27 21:52:42 jkois Exp $
-$FreeBSDde: de-www/developers.sgml,v 1.29 2008/04/27 21:46:28 jkois Exp $
-basiert auf: 1.192
+$FreeBSD: www/de/developers.sgml,v 1.25 2008/05/25 08:53:34 jkois Exp $
+$FreeBSDde: de-www/developers.sgml,v 1.30 2008/05/25 08:39:27 jkois Exp $
+basiert auf: 1.194
-->
@@ -150,6 +150,7 @@
<!ENTITY a.dwcjr "David W. Chapman Jr.">
<!ENTITY a.dwhite "Doug White">
<!ENTITY a.dwmalone "David Malone">
+<!ENTITY a.ed "Ed Schouten">
<!ENTITY a.edwin "Edwin Groothuis">
<!ENTITY a.ehaupt "Emanuel Haupt">
<!ENTITY a.eik "Oliver Eikemeier">
@@ -316,6 +317,7 @@
<!ENTITY a.lwhsu "Li-Wen Hsu">
<!ENTITY a.lx "David Thiel">
<!ENTITY a.maho "Maho Nakata">
+<!ENTITY a.manolis "Manolis Kiagias">
<!ENTITY a.marcel "Marcel Moolenaar">
<!ENTITY a.marck "Dmitry Morozovsky">
<!ENTITY a.marcus "Joe Marcus Clarke">
==== //depot/projects/dtrace/www/de/share/sgml/news.xml#23 (text+ko) ====
@@ -2,9 +2,9 @@
<!DOCTYPE news PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for News//EN"
"http://www.FreeBSD.org/XML/www/share/sgml/news.dtd">
<!--
- $FreeBSD: www/de/share/sgml/news.xml,v 1.49 2008/05/19 18:26:17 jkois Exp $
- $FreeBSDde: de-www/share/sgml/news.xml,v 1.112 2008/05/19 17:31:49 jkois Exp $
- basiert auf: 1.161
+ $FreeBSD: www/de/share/sgml/news.xml,v 1.50 2008/05/25 08:53:34 jkois Exp $
+ $FreeBSDde: de-www/share/sgml/news.xml,v 1.113 2008/05/25 08:39:28 jkois Exp $
+ basiert auf: 1.163
-->
<!-- Simple schema for FreeBSD Project news.
@@ -28,7 +28,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/de/share/sgml/news.xml,v 1.49 2008/05/19 18:26:17 jkois Exp $
+ $FreeBSD: www/de/share/sgml/news.xml,v 1.50 2008/05/25 08:53:34 jkois Exp $
</cvs:keyword>
</cvs:keywords>
@@ -39,6 +39,24 @@
<name>5</name>
<day>
+ <name>24</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:manolis at FreeBSD.org">Manolis Kiagias</a> (doc/www)</p>
+ </event>
+ </day>
+
+ <day>
+ <name>22</name>
+
+ <event>
+ <p>Neuer Committer: <a
+ href="mailto:ed at FreeBSD.org">Ed Schouten</a> (src)</p>
+ </event>
+ </day>
+
+ <day>
<name>14</name>
<event>
==== //depot/projects/dtrace/www/en/platforms/amd64.sgml#6 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/platforms/amd64.sgml,v 1.21 2007/12/08 12:13:25 chinsan Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/amd64.sgml,v 1.22 2008/05/25 09:20:03 jkois Exp $">
<!ENTITY title "FreeBSD/amd64 Project">
<!ENTITY email 'freebsd-amd64'>
<!ENTITY % navinclude.developers "INCLUDE">
@@ -30,9 +30,9 @@
Intel Core™2 Duo, Intel Xeon (3000-sequence, 5000-sequence, and
7000-sequence) processors use the Intel®64 architecture.</p>
- <h3>Status:</h3>
+ <h3>Status</h3>
- <p>Currently FreeBSD/amd64 runs in 64-bit multiuser mode, in both
+ <p>FreeBSD/amd64 runs in 64-bit multiuser mode, in both
Uniprocessor and Multiprocessor mode.</p>
<p>The AMD64 platform is currently a <a
==== //depot/projects/dtrace/www/en/platforms/pc98.sgml#5 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/platforms/pc98.sgml,v 1.16 2006/08/19 21:20:40 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/platforms/pc98.sgml,v 1.17 2008/05/25 09:50:19 jkois Exp $">
<!ENTITY title "FreeBSD/pc98 Project">
<!ENTITY email 're-pc98'>
<!ENTITY % navinclude.developers "INCLUDE">
@@ -8,7 +8,8 @@
<html>
&header;
-
+ <h3>Introduction</h3>
+
<p>FreeBSD/pc98 is a port of FreeBSD which aims to run
on the NEC PC-98x1 (pc98) architecture.
The project's goal is to make FreeBSD/pc98 work
@@ -16,9 +17,16 @@
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.</p>
+ <h3>Status</h3>
+
+ <p>FreeBSD/pc98 is a <a
+ href="&base;/doc/en_US.ISO8859-1/articles/committers-guide/archs.html">
+ Tier 1</a> architecture, and as such is fully supported by the
+ <a href="&base;">FreeBSD</a> project.</p>
+
<h3>FreeBSD/pc98 Hardware Notes</h3>
- <a href="&base;/relnotes/CURRENT/hardware/pc98/index.html">&rel.head;-CURRENT
+ <a href="&base;/relnotes/CURRENT/hardware/index.html">&rel.head;-CURRENT
Hardware Notes</a>
<h3>What Needs To Be Done</h3>
More information about the p4-projects
mailing list