PERFORCE change 134115 for review
John Birrell
jb at FreeBSD.org
Fri Jan 25 17:38:27 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134115
Change 134115 by jb at jb_freebsd1 on 2008/01/26 01:38:23
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#7 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/dtrace/ports/UPDATING#48 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#27 integrate
.. //depot/projects/dtrace/src/etc/rc.d/kerberos#6 integrate
.. //depot/projects/dtrace/src/etc/rc.subr#15 integrate
.. //depot/projects/dtrace/src/lib/msun/src/k_cos.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uftdi.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uftdireg.h#4 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw.h#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#25 integrate
.. //depot/projects/dtrace/src/tools/sched/schedgraph.py#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/pw/pw.8#6 integrate
.. //depot/projects/dtrace/www/en/administration.sgml#5 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#11 integrate
.. //depot/projects/dtrace/www/en/releases/7.0R/todo.sgml#4 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#36 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#20 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#11 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.54 2008/01/24 21:58:49 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml,v 1.55 2008/01/25 17:08:04 philip Exp $ -->
<sect2>
<title>The &os; Documentation Engineering Team</title>
@@ -208,7 +208,7 @@
<itemizedlist>
<listitem>
- <para>None</para>
+ <para>&a.philip;</para>
</listitem>
</itemizedlist>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#7 (text+ko) ====
@@ -15,7 +15,7 @@
<articleinfo>
<title>Problem Report Handling Guidelines</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.28 2007/04/14 13:18:37 blackend Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.29 2008/01/25 22:15:03 linimon Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -335,6 +335,12 @@
</row>
<row>
+ <entry>&man.jail.8; subsystem</entry>
+ <entry>jail</entry>
+ <entry>freebsd-jail</entry>
+ </row>
+
+ <row>
<entry>&java.virtual.machine; problems</entry>
<entry>java</entry>
<entry>freebsd-java</entry>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#2 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.176
+ Original revision 1.177
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.6 2007/09/13 17:16:54 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.7 2008/01/25 03:27:06 keramida Exp $
-->
<chapter id="kernelconfig">
@@ -126,6 +126,95 @@
</itemizedlist>
</sect1>
+ <sect1 id="kernelconfig-devices">
+ <sect1info>
+ <authorgroup>
+ <author>
+ <firstname>Том</firstname>
+ <surname>РөүдÑ</surname>
+ <contrib>БичÑÑн </contrib>
+ </author>
+ </authorgroup>
+ </sect1info>
+ <title>СиÑтемийн тоног төхөөрөмж хайж олох нь</title>
+
+ <para>Цөмийн тохиргоо уруу орж үзÑÑд алдахааÑаа өмнө машиныхаа
+ тоног төхөөрөмжийн бүртгÑлийг олж авах нь ухаалаг Ñвдал юм.
+ &os; нь үндÑÑн үйлдлийн ÑиÑтем биш тохиолдолд байгаа үйлдлийн
+ ÑиÑтемийн тохиргоог харан бүртгÑлийн жагÑаалтыг Ñ…Ñлбархан
+ Ò¯Ò¯ÑгÑж болно. ЖишÑÑ Ð½ÑŒ µsoft;-ийн
+ <application>Device Manager</application> буюу төхөөрөмжийн
+ менежер нь ÑуулгагдÑан төхөөрөмжүүдийн талаарх чухал
+ мÑдÑÑллийг ихÑвчлÑн агуулдаг.
+ <application>Device Manager</application> нь control panel
+ буюу Ñ…Ñналтын Ñамбарт байрладаг.</para>
+
+ <note>
+ <para>µsoft.windows;-ийн зарим хувилбаруудад
+ <application>System</application> гÑÑÑн Ð´Ò¯Ñ€Ñ Ð±Ð°Ð¹Ð´Ð°Ð³ бөгөөд
+ ÑÐ½Ñ Ð½ÑŒ <application>Device Manager</application> уруу хандах
+ боломжтой дÑлгÑцийг харуулдаг.</para>
+ </note>
+
+ <para>Ð¥ÑÑ€Ñв Ó©Ó©Ñ€ үйлдлийн ÑиÑтем машин дÑÑÑ€ байхгүй бол
+ админиÑтратор ÑÐ½Ñ Ð¼ÑдÑÑллийг Ó©Ó©Ñ€Ó©Ó© олох Ñ…ÑÑ€ÑгтÑй болно.
+ ÐÑг арга нь &man.dmesg.8; Ñ…ÑÑ€ÑгÑÑл болон &man.man.1;
+ тушаалуудыг ашиглах Ñвдал юм. &os; дÑÑÑ€ ихÑнх төхөөрөмжийн
+ драйверууд нь дÑмжигдÑÑн тоног төхөөрөмжүүдийн жагÑаалтыг
+ харуулÑан гарын авлагын хуудаÑтай байдаг бөгөөд ачаалах үед
+ шалгаж байх Ñвцад олдÑон тоног төхөөрөмжийг харуулдаг.
+ ЖишÑÑ Ð½ÑŒ дараах мөрүүд нь <devicename>psm</devicename>
+ драйвер хулгана олÑон гÑдгийг харуулж байна:</para>
+
+ <programlisting>psm0: <PS/2 Mouse> irq 12 on atkbdc0
+psm0: [GIANT-LOCKED]
+psm0: [ITHREAD]
+psm0: model Generic PS/2 mouse, device ID 0</programlisting>
+
+ <para>ÐÐ½Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€ нь өөрчлөн тохируулах цөмийн тохиргооны
+ файлд орÑон байх ÑÑвÑл &man.loader.conf.5; ашиглан ачаалагдÑан
+ байх Ñ…ÑÑ€ÑгтÑй болно.<para>
+
+ <para>Зарим тохиолдолд <command>dmesg</command>-ÑÑÑ Ð³Ð°Ñ€Ñ‡
+ байгаа өгөгдөл нь ачаалалтын шалгалт, илрүүлÑлтийн гаралтыг
+ биш зөвхөн ÑиÑтемийн мÑдÑгдлүүдийг үзүүлдÑг. ÐдгÑÑÑ€ тохиолдлуудад
+ <filename>/var/log/dmesg.today</filename> болон
+ <filename>/var/log/dmesg.yesterday</filename> файлуудыг
+ үзÑн гаралтыг олж авч болно.</para>
+
+ <para>Тоног төхөөрөмжийг олох Ó©Ó©Ñ€ нÑг арга бол илүү дÑлгÑÑ€Ñнгүй
+ гаралтыг үзүүлдÑг &man.pciconf.8; Ñ…ÑÑ€ÑгÑлийг ашиглах Ñвдал юм.
+ ЖишÑÑ Ð½ÑŒ:</para>
+
+ <programlisting>ath0 at pci0:3:0:0: class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+ vendor = 'Atheros Communications Inc.'
+ device = 'AR5212 Atheros AR5212 802.11abg wireless'
+ class = network
+ subclass = ethernet</programlisting>
+
+ <para><command>pciconf <option>-lv</option></command> ашиглан
+ олж авÑан ÑÐ½Ñ Ð±Ñцхан мÑдÑÑлÑл нь <devicename>ath</devicename>
+ драйвер утаÑгүй Ethernet төхөөрөмжийг олÑныг харуулж байна.
+ <command>man <replaceable>ath</replaceable></command> тушаалыг
+ ашиглавал &man.ath.4; гарын авлагын хуудÑыг харуулах
+ болно.</para>
+
+ <para>Ðшигтай мÑлÑÑлÑл олж авахын тулд &man.man.1; уруу
+ <option>-k</option> тугийг өгөн ашиглаж болно. ДÑÑрхÑÑÑ
+ ингÑж өгч болно:</para>
+
+ <screen>&prompt.root; man -k <replaceable>Atheros</replaceable></screen>
+
+ <para>Тухайн нÑг үг агуулÑан гарын авлагын хуудÑын жагÑаалтыг
+ олж авахын тулд:</para>
+
+ <programlisting>ath(4) - Atheros IEEE 802.11 wireless network driver
+ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting>
+
+ <para>Тоног төхөөрөмжийн жагÑаалтаар зÑвÑÑглÑÑнÑÑÑ€
+ цөмийг өөрчлөн тохируулж бүтÑÑÑ… процеÑÑ Ð½ÑŒ арай Ñ…Ñлбар болно.</para>
+ </sect1>
+
<sect1 id="kernelconfig-building">
<title>Өөрчлөн тохируулÑан цөмийг бүтÑÑÑ… ба Ñуулгах нь</title>
<indexterm>
==== //depot/projects/dtrace/ports/UPDATING#48 (text+ko) ====
@@ -6,6 +6,16 @@
time you update your ports collection, before attempting any port
upgrades.
+20080125:
+ AFFECTS: users of www/mod_security2
+ AUTHOR: araujo at FreeBSD.org
+
+ Update of mod_security2 is a dramatic change, because there is a need
+ to completely rewrite their obsolete rules and migrate for capacity
+ to use new syntax.
+ You need to make a complete backup of your conf files before to do an
+ update.
+
20080120:
AFFECTS: users of www/apache20
AUTHOR: clement at FreeBSD.org
@@ -6005,4 +6015,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.578 2008/01/20 15:00:32 clement Exp $
+$FreeBSD: ports/UPDATING,v 1.579 2008/01/25 11:31:31 araujo Exp $
==== //depot/projects/dtrace/src/etc/defaults/rc.conf#27 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.323 2008/01/21 04:41:18 rafan Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.324 2008/01/25 05:23:01 mtm Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -239,7 +239,7 @@
#
kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO).
kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC
-kerberos5_server_flags="" # Additional flags to the kerberos 5 server
+kerberos5_server_flags="--detach" # Additional flags to the kerberos 5 server
kadmind5_server_enable="NO" # Run kadmind (or NO)
kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon
kpasswdd_server_enable="NO" # Run kpasswdd (or NO)
==== //depot/projects/dtrace/src/etc/rc.d/kerberos#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/kerberos,v 1.7 2007/10/19 08:59:59 mtm Exp $
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.8 2008/01/25 05:23:01 mtm Exp $
#
# PROVIDE: kerberos
@@ -10,7 +10,6 @@
name="kerberos5"
rcvar="kerberos5_server_enable"
-command_args="--detach"
load_rc_config $name
command="${kerberos5_server}"
==== //depot/projects/dtrace/src/etc/rc.subr#15 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.77 2007/10/09 07:20:44 dougb Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.79 2008/01/25 16:44:34 mtm Exp $
#
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
# All rights reserved.
==== //depot/projects/dtrace/src/lib/msun/src/k_cos.c#4 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.10 2005/10/26 12:36:18 bde Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_cos.c,v 1.11 2008/01/25 21:09:21 bde Exp $";
#endif
/*
@@ -73,7 +73,7 @@
z = x*x;
r = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))));
- hz = (float)0.5*z;
+ hz = 0.5*z;
w = one-hz;
return w + (((one-w)-hz) + (z*r-x*y));
}
==== //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#16 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.112 2008/01/20 08:31:35 maxim Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.113 2008/01/25 14:38:26 rwatson Exp $
*/
#include <sys/param.h>
@@ -47,6 +47,8 @@
#include <unistd.h>
#include <fcntl.h>
+#define IPFW_INTERNAL /* Access to protected structures in ip_fw.h. */
+
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_dl.h>
==== //depot/projects/dtrace/src/sys/dev/usb/uftdi.c#6 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.37 2007/06/22 05:53:05 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.38 2008/01/25 02:41:44 emaste Exp $");
/*
* FTDI FT8U100AX serial adapter driver
@@ -121,6 +121,7 @@
static void uftdi_write(void *sc, int portno, u_char *to, u_char *from,
u_int32_t *count);
static void uftdi_break(void *sc, int portno, int onoff);
+static int uftdi_8u232am_getrate(speed_t speed, int *rate);
struct ucom_callback uftdi_callback = {
uftdi_get_status,
@@ -569,25 +570,8 @@
break;
case UFTDI_TYPE_8U232AM:
- switch(t->c_ospeed) {
- case 300: rate = ftdi_8u232am_b300; break;
- case 600: rate = ftdi_8u232am_b600; break;
- case 1200: rate = ftdi_8u232am_b1200; break;
- case 2400: rate = ftdi_8u232am_b2400; break;
- case 4800: rate = ftdi_8u232am_b4800; break;
- case 9600: rate = ftdi_8u232am_b9600; break;
- case 19200: rate = ftdi_8u232am_b19200; break;
- case 38400: rate = ftdi_8u232am_b38400; break;
- case 57600: rate = ftdi_8u232am_b57600; break;
- case 115200: rate = ftdi_8u232am_b115200; break;
- case 230400: rate = ftdi_8u232am_b230400; break;
- case 460800: rate = ftdi_8u232am_b460800; break;
- case 921600: rate = ftdi_8u232am_b921600; break;
- case 2000000: rate = ftdi_8u232am_b2000000; break;
- case 3000000: rate = ftdi_8u232am_b3000000; break;
- default:
+ if (uftdi_8u232am_getrate(t->c_ospeed, &rate) == -1)
return (EINVAL);
- }
break;
}
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -702,6 +686,70 @@
(void)usbd_do_request(ucom->sc_udev, &req, NULL);
}
+static int
+uftdi_8u232am_getrate(speed_t speed, int *rate)
+{
+ /* Table of the nearest even powers-of-2 for values 0..15. */
+ static const unsigned char roundoff[16] = {
+ 0, 2, 2, 4, 4, 4, 8, 8,
+ 8, 8, 8, 8, 16, 16, 16, 16,
+ };
+
+ unsigned int d, freq;
+ int result;
+
+ if (speed <= 0)
+ return (-1);
+
+ /* Special cases for 2M and 3M. */
+ if (speed >= 3000000 * 100 / 103 &&
+ speed <= 3000000 * 100 / 97) {
+ result = 0;
+ goto done;
+ }
+ if (speed >= 2000000 * 100 / 103 &&
+ speed <= 2000000 * 100 / 97) {
+ result = 1;
+ goto done;
+ }
+
+ d = (FTDI_8U232AM_FREQ << 4) / speed;
+ d = (d & ~15) + roundoff[d & 15];
+
+ if (d < FTDI_8U232AM_MIN_DIV)
+ d = FTDI_8U232AM_MIN_DIV;
+ else if (d > FTDI_8U232AM_MAX_DIV)
+ d = FTDI_8U232AM_MAX_DIV;
+
+ /*
+ * Calculate the frequency needed for d to exactly divide down
+ * to our target speed, and check that the actual frequency is
+ * within 3% of this.
+ */
+ freq = speed * d;
+ if (freq < (quad_t)(FTDI_8U232AM_FREQ << 4) * 100 / 103 ||
+ freq > (quad_t)(FTDI_8U232AM_FREQ << 4) * 100 / 97)
+ return (-1);
+
+ /*
+ * Pack the divisor into the resultant value. The lower
+ * 14-bits hold the integral part, while the upper 2 bits
+ * encode the fractional component: either 0, 0.5, 0.25, or
+ * 0.125.
+ */
+ result = d >> 4;
+ if (d & 8)
+ result |= 0x4000;
+ else if (d & 4)
+ result |= 0x8000;
+ else if (d & 2)
+ result |= 0xc000;
+
+done:
+ *rate = result;
+ return (0);
+}
+
static device_method_t uftdi_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, uftdi_match),
==== //depot/projects/dtrace/src/sys/dev/usb/uftdireg.h#4 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/* $FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.2 2004/07/01 17:16:20 brooks Exp $ */
+/* $FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.3 2008/01/25 02:41:44 emaste Exp $ */
/*
* Definitions for the FTDI USB Single Port Serial Converter -
@@ -91,23 +91,11 @@
ftdi_sio_b115200 = 9
};
-enum {
- ftdi_8u232am_b300 = 0x2710,
- ftdi_8u232am_b600 = 0x1388,
- ftdi_8u232am_b1200 = 0x09c4,
- ftdi_8u232am_b2400 = 0x04e2,
- ftdi_8u232am_b4800 = 0x0271,
- ftdi_8u232am_b9600 = 0x4138,
- ftdi_8u232am_b19200 = 0x809c,
- ftdi_8u232am_b38400 = 0xc04e,
- ftdi_8u232am_b57600 = 0x0034,
- ftdi_8u232am_b115200 = 0x001a,
- ftdi_8u232am_b230400 = 0x000d,
- ftdi_8u232am_b460800 = 0x4006,
- ftdi_8u232am_b921600 = 0x8003,
- ftdi_8u232am_b2000000 = 0x0001, /* special case for 2M baud */
- ftdi_8u232am_b3000000 = 0x0000, /* special case for 3M baud */
-};
+#define FTDI_8U232AM_FREQ 3000000
+
+/* Bounds for normal divisors as 4-bit fixed precision ints. */
+#define FTDI_8U232AM_MIN_DIV 0x20
+#define FTDI_8U232AM_MAX_DIV 0x3fff8
/*
* BmRequestType: 0100 0000B
==== //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#10 (text+ko) ====
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.41 2007/11/14 06:51:33 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.43 2008/01/25 19:44:46 jhb Exp $");
#include "opt_sleepqueue_profiling.h"
#include "opt_ddb.h"
@@ -439,17 +439,36 @@
sleepq_switch(void *wchan)
{
struct sleepqueue_chain *sc;
+ struct sleepqueue *sq;
struct thread *td;
td = curthread;
sc = SC_LOOKUP(wchan);
mtx_assert(&sc->sc_lock, MA_OWNED);
THREAD_LOCK_ASSERT(td, MA_OWNED);
- /* We were removed */
+
+ /*
+ * If we have a sleep queue, then we've already been woken up, so
+ * just return.
+ */
if (td->td_sleepqueue != NULL) {
mtx_unlock_spin(&sc->sc_lock);
return;
}
+
+ /*
+ * If TDF_TIMEOUT is set, then our sleep has been timed out
+ * already but we are still on the sleep queue, so dequeue the
+ * thread and return.
+ */
+ if (td->td_flags & TDF_TIMEOUT) {
+ MPASS(TD_ON_SLEEPQ(td));
+ sq = sleepq_lookup(wchan);
+ sleepq_resume_thread(sq, td, -1);
+ mtx_unlock_spin(&sc->sc_lock);
+ return;
+ }
+
thread_lock_set(td, &sc->sc_lock);
MPASS(td->td_sleepqueue == NULL);
@@ -790,14 +809,15 @@
thread_unlock(td);
return;
}
+
/*
- * If the thread is on the SLEEPQ but not sleeping and we have it
- * locked it must be in sleepq_catch_signals(). Let it know we've
- * timedout here so it can remove itself.
+ * If the thread is on the SLEEPQ but isn't sleeping yet, it
+ * can either be on another CPU in between sleepq_add() and
+ * one of the sleepq_*wait*() routines or it can be in
+ * sleepq_catch_signals().
*/
if (TD_ON_SLEEPQ(td)) {
- td->td_flags |= TDF_TIMEOUT | TDF_INTERRUPT;
- td->td_intrval = EWOULDBLOCK;
+ td->td_flags |= TDF_TIMEOUT;
thread_unlock(td);
return;
}
==== //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/cxgb/cxgb/Makefile,v 1.4 2008/01/13 22:31:59 kmacy Exp $
+# $FreeBSD: src/sys/modules/cxgb/cxgb/Makefile,v 1.5 2008/01/26 01:00:56 kmacy Exp $
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
@@ -7,7 +7,7 @@
SRCS= cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c
SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c
SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
+SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h opt_global.h
SRCS+= uipc_mvec.c cxgb_support.c
SRCS+= cxgb_multiq.c
==== //depot/projects/dtrace/src/sys/netinet/ip_fw.h#8 (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/netinet/ip_fw.h,v 1.110 2007/05/04 11:15:41 bz Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.111 2008/01/25 14:38:27 rwatson Exp $
*/
#ifndef _IPFW2_H
@@ -310,18 +310,25 @@
u_int32_t log_left; /* how many left to log */
} ipfw_insn_log;
+/*
+ * Data structures required by both ipfw(8) and ipfw(4) but not part of the
+ * management API are protcted by IPFW_INTERNAL.
+ */
+#ifdef IPFW_INTERNAL
/* Server pool support (LSNAT). */
struct cfg_spool {
LIST_ENTRY(cfg_spool) _next; /* chain of spool instances */
struct in_addr addr;
u_short port;
};
+#endif
/* Redirect modes id. */
#define REDIR_ADDR 0x01
#define REDIR_PORT 0x02
#define REDIR_PROTO 0x04
+#ifdef IPFW_INTERNAL
/* Nat redirect configuration. */
struct cfg_redir {
LIST_ENTRY(cfg_redir) _next; /* chain of redir instances */
@@ -341,8 +348,11 @@
/* chain of spool instances */
LIST_HEAD(spool_chain, cfg_spool) spool_chain;
};
+#endif
#define NAT_BUF_LEN 1024
+
+#ifdef IPFW_INTERNAL
/* Nat configuration data struct. */
struct cfg_nat {
/* chain of nat instances */
@@ -357,6 +367,7 @@
/* chain of redir instances */
LIST_HEAD(redir_chain, cfg_redir) redir_chain;
};
+#endif
#define SOF_NAT sizeof(struct cfg_nat)
#define SOF_REDIR sizeof(struct cfg_redir)
==== //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#25 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.179 2007/12/09 15:35:09 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.180 2008/01/25 14:38:27 rwatson Exp $");
#define DEB(x)
#define DDB(x) x
@@ -68,6 +68,9 @@
#include <net/radix.h>
#include <net/route.h>
#include <net/pf_mtag.h>
+
+#define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */
+
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
==== //depot/projects/dtrace/src/tools/sched/schedgraph.py#9 (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/tools/sched/schedgraph.py,v 1.15 2008/01/13 22:46:24 kris Exp $
+# $FreeBSD: src/tools/sched/schedgraph.py,v 1.16 2008/01/25 19:24:12 jhb Exp $
import sys
import re
@@ -978,7 +978,7 @@
def synchstamp(self, lines):
status.startup("Rationalizing Timestamps")
- tstamp_re = re.compile("\s+\d+\s+(\d+)\s+(\d+)\s+.*")
+ tstamp_re = re.compile("\s*\d+\s+(\d+)\s+(\d+)\s+.*")
for line in lines:
m = tstamp_re.match(line)
if (m != None):
@@ -989,7 +989,7 @@
def monostamp(self, lines):
laststamp = None
- tstamp_re = re.compile("\s+\d+\s+(\d+)\s+(\d+)\s+.*")
+ tstamp_re = re.compile("\s*\d+\s+(\d+)\s+(\d+)\s+.*")
for line in lines:
m = tstamp_re.match(line)
if (m == None):
==== //depot/projects/dtrace/src/usr.sbin/pw/pw.8#6 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.41 2007/03/30 11:23:10 le Exp $
+.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.42 2008/01/25 15:54:14 mtm Exp $
.\"
.Dd March 30, 2007
.Dt PW 8
@@ -402,7 +402,7 @@
.It Fl G Ar grouplist
Set additional group memberships for an account.
.Ar grouplist
-is a comma-separated list of group names or group numbers.
+is a comma, space or tab-separated list of group names or group numbers.
The user's name is added to the group lists in
.Pa /etc/group ,
and
==== //depot/projects/dtrace/www/en/administration.sgml#5 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.14 2008/01/24 21:50:25 joel Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.15 2008/01/25 17:08:04 philip Exp $">
<!ENTITY title "FreeBSD Project Administration and Management">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -350,7 +350,7 @@
actions.</p>
<ul>
- <li>None</li>
+ <li>&a.philip; <<a href="mailto:philip at FreeBSD.org">philip at FreeBSD.org</a>></li>
</ul>
<h3><a name="t-portmgr-secretary">Port Management Team Secretary</a>
==== //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#11 (text+ko) ====
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "../..">
<!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.0R/schedule.sgml,v 1.12 2008/01/12 15:14:25 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.0R/schedule.sgml,v 1.13 2008/01/25 17:05:13 rwatson Exp $">
<!ENTITY local.rel "7.0">
<!ENTITY local.rel.tag "7_0">
<!ENTITY title "FreeBSD &local.rel; Release Process">
@@ -158,7 +158,7 @@
<tr>
<td><tt>RC2</tt> builds</td>
- <td>26 Dec 2007</td>
+ <td>28 Jan 2008</td>
<td>--</td>
<td>Begin RC2 builds.</td>
</tr>
@@ -193,14 +193,14 @@
<tr>
<td><tt>RELEASE</tt> builds</td>
- <td>9 Jan 2008</td>
+ <td>11 Feb 2008</td>
<td>--</td>
<td>Begin RELEASE builds.</td>
</tr>
<tr>
<td>Announcement</td>
- <td>14 Jan 2008</td>
+ <td>16 Feb 2008</td>
<td>--</td>
<td>Announcement sent out after a majority of the mirrors have
received the bits.</td>
==== //depot/projects/dtrace/www/en/releases/7.0R/todo.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "../..">
<!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/7.0R/todo.sgml,v 1.4 2007/11/30 15:12:04 kensmith Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/7.0R/todo.sgml,v 1.5 2008/01/25 14:22:28 rwatson Exp $">
<!ENTITY local.rel "7.0">
<!ENTITY title "FreeBSD 7.0 Open Issues">
<!ENTITY % navinclude.download "INCLUDE">
@@ -64,6 +64,37 @@
underlying network infrastructure. The old interface was added
back in but marked as depreciated.</td>
</tr>
+
+ <tr>
+ <td>TCP accept race condition</td>
+ <td>&status.wip;</td>
+ <td>&a.glebius;, &a.rwatson;</td>
+ <td>A race in TCP will lead to very occasional returning of 0.0.0.0:0
+ rather than the correct IP address via the socket address returned by
+ accept(). A patch is in HEAD and RELENG_7, and will shortly be
+ merged to RELENG_7_0 for inclusion in 7.0RC2.</td>
+ </tr>
+
+ <tr>
+ <td>sleepq race condition</td>
+ <td>&status.wip;</td>
+ <td>&a.jhb;</td>
+ <td>Races in the sleepq implementation will occasionally result in
+ sleeps with timeouts failing to wake up. A patch is in HEAD and will
+ shortly be merged to RELENG_7 and RELENG_7_0 for inclusion in 7.0RC2.
+ The sleepq code is being reviewed for other possibly related bugs
+ and further fixes may be forthcoming.</td>
+ </tr>
+
+ <tr>
+ <td>pty race condition</td>
+ <td>&status.wip;</td>
+ <td>&a.kib;</td>
+ <td>Multiple race conditions in the tty/pty code have lead to
+ occasional panics. One set of problems has been fixed, but others
+ are still being explored It is aniticipated that the remaining
+ problems will be fixed for 7.0RC2.</td>
+ </tr>
</table>
<h3>Minor issues for &local.rel;-RELEASE</h3>
==== //depot/projects/dtrace/www/share/sgml/news.xml#36 (text+ko) ====
@@ -20,7 +20,7 @@
<news>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/news.xml,v 1.138 2008/01/19 20:20:00 jkois Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.139 2008/01/25 10:46:05 jkoshy Exp $
</cvs:keyword>
</cvs:keywords>
@@ -80,6 +80,14 @@
</day>
<day>
+ <name>9</name>
+ <event>
+ <p>DesktopBSD 1.6 is <a
+ href="http://www.desktopbsd.net/index.php?id=43&tx_ttnews[tt_news]=33&tx_ttnews[backPid]=55&cHash=46bfdce5e4">released</a>.</p>
+ </event>
+ </day>
+
+ <day>
<name>4</name>
<event>
<p>New committer: <a href="mailto:wxs at FreeBSD.org">Wesley Shields</a>
==== //depot/projects/dtrace/www/share/sgml/press.xml#20 (text+ko) ====
@@ -9,11 +9,31 @@
<press>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $FreeBSD: www/share/sgml/press.xml,v 1.56 2008/01/04 21:16:27 jkois Exp $
+ $FreeBSD: www/share/sgml/press.xml,v 1.57 2008/01/25 04:07:30 jkoshy Exp $
</cvs:keyword>
</cvs:keywords>
<year>
+ <name>2008</name>
+
+ <month>
+ <name>1</name>
+
+ <story>
+ <name>DesktopBSD 1.6 Released</name>
+ <url>http://www.osnews.com/story/19134/DesktopBSD_1.6_Released</url>
+ <site-name>OSNews</site-name>
+ <site-url>http://www.osnews.com/</site-url>
+ <date>9 January 2008</date>
+ <author>Thom Holwerda</author>
+ <p>Version 1.6 of DesktopBSD has been released. <a
+ href="http://www.desktopbsd.net/">DesktopBSD</a> is a
+ desktop operating system based on FreeBSD.</p>
+ </story>
+ </month>
+ </year>
+
+ <year>
<name>2007</name>
<month>
More information about the p4-projects
mailing list