PERFORCE change 170114 for review
Alexander Motin
mav at FreeBSD.org
Tue Nov 3 12:33:17 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=170114
Change 170114 by mav at mav_mavbook on 2009/11/03 12:32:27
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/bin/ps/keyword.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#3 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#9 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/europe#5 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#39 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#50 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#74 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/leave/leave.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/zic/zic.8#4 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/bin/ps/keyword.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -70,7 +70,7 @@
/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
static VAR var[] = {
- {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+ {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
"x", 0},
@@ -159,7 +159,7 @@
UINT, UIDFMT, 0},
{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
USERLEN, 0, CHAR, NULL, 0},
- {"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0},
+ {"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
NULL, 0},
{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -207,7 +207,7 @@
NULL, 0},
{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
- {"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+ {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
"x", 0},
==== //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.2 2009/10/29 13:44:58 jhb Exp $");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.3 2009/11/02 20:18:50 jhb Exp $");
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -204,6 +204,7 @@
mflag = NULL;
nflag = NULL;
+ kvm = NULL;
while ((ch = getopt(argc, argv, "M:N:")) != -1) {
switch (ch) {
case 'M':
==== //depot/projects/scottl-camlock/src/share/zoneinfo/asia#9 (text+ko) ====
@@ -1,5 +1,4 @@
-# <pre>
-# @(#)asia 8.42
+# @(#)asia 8.44
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -369,14 +368,84 @@
5:00 - KAST 1980 May
8:00 PRC C%sT
+
+# From Lee Yiu Chung (2009-10-24):
+# I found there are some mistakes for the historial DST rule for Hong
+# Kong. Accoring to the DST record from Hong Kong Observatory (actually,
+# it is not [an] observatory, but the official meteorological agency of HK,
+# and also serves as the official timing agency), there are some missing
+# and incorrect rules. Although the exact switch over time is missing, I
+# think 3:30 is correct. The official DST record for Hong Kong can be
+# obtained from
+# <a href="http://www.hko.gov.hk/gts/time/Summertime.htm">
+# http://www.hko.gov.hk/gts/time/Summertime.htm
+# </a>.
+
+# From Arthur David Olson (2009-10-28):
+# Here are the dates given at
+# <a href="http://www.hko.gov.hk/gts/time/Summertime.htm">
+# http://www.hko.gov.hk/gts/time/Summertime.htm
+# </a>
+# as of 2009-10-28:
+# Year Period
+# 1941 1 Apr to 30 Sep
+# 1942 Whole year
+# 1943 Whole year
+# 1944 Whole year
+# 1945 Whole year
+# 1946 20 Apr to 1 Dec
+# 1947 13 Apr to 30 Dec
+# 1948 2 May to 31 Oct
+# 1949 3 Apr to 30 Oct
+# 1950 2 Apr to 29 Oct
+# 1951 1 Apr to 28 Oct
+# 1952 6 Apr to 25 Oct
+# 1953 5 Apr to 1 Nov
+# 1954 21 Mar to 31 Oct
+# 1955 20 Mar to 6 Nov
+# 1956 18 Mar to 4 Nov
+# 1957 24 Mar to 3 Nov
+# 1958 23 Mar to 2 Nov
+# 1959 22 Mar to 1 Nov
+# 1960 20 Mar to 6 Nov
+# 1961 19 Mar to 5 Nov
+# 1962 18 Mar to 4 Nov
+# 1963 24 Mar to 3 Nov
+# 1964 22 Mar to 1 Nov
+# 1965 18 Apr to 17 Oct
+# 1966 17 Apr to 16 Oct
+# 1967 16 Apr to 22 Oct
+# 1968 21 Apr to 20 Oct
+# 1969 20 Apr to 19 Oct
+# 1970 19 Apr to 18 Oct
+# 1971 18 Apr to 17 Oct
+# 1972 16 Apr to 22 Oct
+# 1973 22 Apr to 21 Oct
+# 1973/74 30 Dec 73 to 20 Oct 74
+# 1975 20 Apr to 19 Oct
+# 1976 18 Apr to 17 Oct
+# 1977 Nil
+# 1978 Nil
+# 1979 13 May to 21 Oct
+# 1980 to Now Nil
+# The page does not give start or end times of day.
+# The page does not give a start date for 1942.
+# The page does not givw an end date for 1945.
+# The Japanese occupation of Hong Kong began on 1941-12-25.
+# The Japanese surrender of Hong Kong was signed 1945-09-15.
+# For lack of anything better, use start of those days as the transition times.
+
# Hong Kong (Xianggang)
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule HK 1941 only - Apr 1 3:30 1:00 S
+Rule HK 1941 only - Sep 30 3:30 0 -
Rule HK 1946 only - Apr 20 3:30 1:00 S
Rule HK 1946 only - Dec 1 3:30 0 -
Rule HK 1947 only - Apr 13 3:30 1:00 S
Rule HK 1947 only - Dec 30 3:30 0 -
Rule HK 1948 only - May 2 3:30 1:00 S
-Rule HK 1948 1952 - Oct lastSun 3:30 0 -
+Rule HK 1948 1951 - Oct lastSun 3:30 0 -
+Rule HK 1952 only - Oct 25 3:30 0 -
Rule HK 1949 1953 - Apr Sun>=1 3:30 1:00 S
Rule HK 1953 only - Nov 1 3:30 0 -
Rule HK 1954 1964 - Mar Sun>=18 3:30 1:00 S
@@ -384,13 +453,15 @@
Rule HK 1955 1964 - Nov Sun>=1 3:30 0 -
Rule HK 1965 1977 - Apr Sun>=16 3:30 1:00 S
Rule HK 1965 1977 - Oct Sun>=16 3:30 0 -
-Rule HK 1979 1980 - May Sun>=8 3:30 1:00 S
-Rule HK 1979 1980 - Oct Sun>=16 3:30 0 -
+Rule HK 1973 only - Dec 30 3:30 1:00 S
+Rule HK 1979 only - May Sun>=8 3:30 1:00 S
+Rule HK 1979 only - Oct Sun>=16 3:30 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Hong_Kong 7:36:36 - LMT 1904 Oct 30
+ 8:00 HK HK%sT 1941 Dec 25
+ 9:00 - JST 1945 Sep 15
8:00 HK HK%sT
-
###############################################################################
# Taiwan
@@ -2236,9 +2307,23 @@
# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
# </a>
+# From Steffen Thorsen (2009-10-27):
+# The Syrian Arab News Network on 2009-09-29 reported that Syria will
+# revert back to winter (standard) time on midnight between Thursday
+# 2009-10-29 and Friday 2009-10-30:
+# <a href="http://www.sana.sy/ara/2/2009/09/29/247012.htm">
+# http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic)
+# </a>
+
+# From Arthur David Olson (2009-10-28):
+# We'll see if future DST switching times turn out to be end of the last
+# Thursday of the month or the start of the last Friday of the month or
+# something else. For now, use the start of the last Friday.
+
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
-Rule Syria 2008 max - Nov 1 0:00 0 -
+Rule Syria 2008 only - Nov 1 0:00 0 -
Rule Syria 2009 max - Mar lastFri 0:00 1:00 S
+Rule Syria 2009 max - Oct lastFri 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
==== //depot/projects/scottl-camlock/src/share/zoneinfo/europe#5 (text+ko) ====
@@ -1,5 +1,5 @@
# <pre>
-# @(#)europe 8.22
+# @(#)europe 8.24
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -2072,9 +2072,43 @@
6:00 Russia NOV%sT 1992 Jan 19 2:00s
7:00 Russia NOV%sT 1993 May 23 # say Shanks & P.
6:00 Russia NOV%sT
+
+# From Alexander Krivenyshev (2009-10-13):
+# Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
+# March 28, 2010:
+# from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
+# to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
+#
+# This is according to Government of Russia decree # 740, on September
+# 14, 2009 "Application in the territory of the Kemerovo region the Fifth
+# time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+#
+# Russian Government web site (Russian language)
+# <a href="http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archiv">
+# http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archive/2009/09/14/991633.htm
+# </a>
+# or Russian-English translation by WorldTimeZone.com with reference
+# map to local region and new Russia Time Zone map after March 28, 2010
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_russia03.html">
+# http://www.worldtimezone.com/dst_news/dst_news_russia03.html
+# </a>
+#
+# Thus, when Russia will switch to DST on the night of March 28, 2010
+# Kemerovo region (Kemerovo oblast') will not change the clock.
#
+# As a result, Kemerovo oblast' will be in the same time zone as
+# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+
+Zone Asia/Novokuznetsk 5:48:48 - NMT 1920 Jan 6
+ 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time
+ 7:00 Russia KRA%sT 1991 Mar 31 2:00s
+ 6:00 Russia KRA%sT 1992 Jan 19 2:00s
+ 7:00 Russia KRA%sT 2010 Mar 28 2:00s
+ 6:00 Russia NOV%sT # Novosibirsk/Novokuznetsk Time
+
+#
# From Oscar van Vlijmen (2001-08-25): [This region consists of]
-# Kemerovskaya oblast', Krasnoyarskij kraj,
+# Krasnoyarskij kraj,
# Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug,
# Respublika Tuva, Respublika Khakasiya, Evenkijskij avtonomnyj okrug.
Zone Asia/Krasnoyarsk 6:11:20 - LMT 1920 Jan 6
==== //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#4 (text+ko) ====
@@ -1,5 +1,5 @@
# <pre>
-# @(#)zone.tab 8.28
+# @(#)zone.tab 8.29
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
@@ -330,6 +330,7 @@
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
+RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk
RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River
RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal
RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.3 2009/09/27 20:50:54 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.4 2009/11/03 11:19:05 mav Exp $");
#include <sys/param.h>
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#17 (text+ko) ====
@@ -23,7 +23,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/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.3 2009/11/03 11:19:05 mav Exp $
*/
#ifndef CAM_ATA_ALL_H
==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.13 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.14 2009/11/03 11:19:05 mav Exp $");
#include <sys/param.h>
#ifdef _KERNEL
==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#11 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cam/cam.h,v 1.15 2009/10/31 10:43:38 mav Exp $
+ * $FreeBSD: src/sys/cam/cam.h,v 1.16 2009/11/03 11:19:05 mav Exp $
*/
#ifndef _CAM_CAM_H
==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#39 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.83 2009/10/23 13:39:30 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.84 2009/11/03 11:19:05 mav Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#50 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.241 2009/10/31 10:43:38 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.242 2009/11/02 23:30:15 thompsa Exp $");
#include <sys/param.h>
@@ -1948,8 +1948,15 @@
done:
- if (error == 0)
- dasetgeom(periph, block_len, maxsector);
+ if (error == 0) {
+ if (block_len >= MAXPHYS || block_len == 0) {
+ xpt_print(periph->path,
+ "unsupportable block size %ju\n",
+ (uintmax_t) block_len);
+ error = EINVAL;
+ } else
+ dasetgeom(periph, block_len, maxsector);
+ }
xpt_release_ccb(ccb);
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#74 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.10 2009/10/23 13:07:22 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.11 2009/11/03 11:47:07 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#26 (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.3 2009/10/21 12:42:25 mav Exp $
+ * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.4 2009/11/03 11:47:07 mav Exp $
*/
/* ATA register defines */
==== //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#16 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.37 2009/08/01 01:04:26 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.38 2009/11/02 21:22:30 mjacob Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -193,6 +193,8 @@
isp->isp_param = &sbs->sbus_param;
isp->isp_osinfo.pc.ptr = &sbs->sbus_spi;
isp->isp_revision = 0; /* XXX */
+ isp->isp_dev = dev;
+ isp->isp_nchan = 1;
ISP_SET_PC(isp, 0, role, role);
/*
@@ -316,18 +318,16 @@
goto bad;
}
isp_init(isp);
- if (role != ISP_ROLE_NONE && isp->isp_state != ISP_INITSTATE) {
- isp_uninit(isp);
- ISP_UNLOCK(isp);
- goto bad;
+ if (isp->isp_state == ISP_INITSTATE) {
+ isp->isp_state = ISP_RUNSTATE;
}
- isp_attach(isp);
- if (role != ISP_ROLE_NONE && isp->isp_state != ISP_RUNSTATE) {
+ ISP_UNLOCK(isp);
+ if (isp_attach(isp)) {
+ ISP_LOCK(isp);
isp_uninit(isp);
ISP_UNLOCK(isp);
goto bad;
}
- ISP_UNLOCK(isp);
return (0);
bad:
@@ -345,13 +345,10 @@
}
if (regs) {
- (void) bus_release_resource(dev, 0, 0, regs);
+ (void) bus_release_resource(dev, SYS_RES_MEMORY, 0, regs);
}
if (sbs) {
- if (sbs->sbus_isp.isp_param) {
- free(sbs->sbus_isp.isp_param, M_DEVBUF);
- }
free(sbs, M_DEVBUF);
}
return (ENXIO);
@@ -584,13 +581,6 @@
isp = mp->isp;
rq = mp->rq;
if (nseg) {
- if (sizeof (bus_addr_t) > 4) {
- if (rq->req_header.rqs_entry_type == RQSTYPE_T2RQS) {
- rq->req_header.rqs_entry_type = RQSTYPE_T3RQS;
- } else if (rq->req_header.rqs_entry_type == RQSTYPE_REQUEST) {
- rq->req_header.rqs_entry_type = RQSTYPE_A64;
- }
- }
if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
bus_dmamap_sync(isp->isp_osinfo.dmat, PISP_PCMD(csio)->dmap, BUS_DMASYNC_PREREAD);
ddir = ISP_FROM_DEVICE;
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.6 2009/10/23 21:33:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.7 2009/11/03 12:03:13 mav Exp $");
#include <sys/param.h>
#include <sys/module.h>
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#3 (text+ko) ====
@@ -23,7 +23,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/siis/siis.h,v 1.1 2009/07/21 12:32:46 mav Exp $
+ * $FreeBSD: src/sys/dev/siis/siis.h,v 1.2 2009/11/03 12:03:13 mav Exp $
*/
/* ATA register defines */
==== //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.5 2009/06/24 22:57:07 oleg Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.6 2009/11/03 08:41:14 oleg Exp $");
#define DUMMYNET_DEBUG
@@ -244,6 +244,17 @@
static int dummynet_io(struct mbuf **, int , struct ip_fw_args *);
/*
+ * Flow queue is idle if:
+ * 1) it's empty for at least 1 tick
+ * 2) it has invalid timestamp (WF2Q case)
+ * 3) parent pipe has no 'exhausted' burst.
+ */
+#define QUEUE_IS_IDLE(q) ((q)->head == NULL && (q)->S == (q)->F + 1 && \
+ curr_time > (q)->idle_time + 1 && \
+ ((q)->numbytes + (curr_time - (q)->idle_time - 1) * \
+ (q)->fs->pipe->bandwidth >= q->fs->pipe->burst))
+
+/*
* Heap management functions.
*
* In the heap, first node is element 0. Children of i are 2i+1 and 2i+2.
@@ -1004,7 +1015,7 @@
fs->last_expired = time_uptime ;
for (i = 0 ; i <= fs->rq_size ; i++) /* last one is overflow */
for (prev=NULL, q = fs->rq[i] ; q != NULL ; )
- if (q->head != NULL || q->S != q->F+1) {
+ if (!QUEUE_IS_IDLE(q)) {
prev = q ;
q = q->next ;
} else { /* entry is idle, expire it */
@@ -1134,7 +1145,7 @@
break ; /* found */
/* No match. Check if we can expire the entry */
- if (pipe_expire && q->head == NULL && q->S == q->F+1 ) {
+ if (pipe_expire && QUEUE_IS_IDLE(q)) {
/* entry is idle and not in any heap, expire it */
struct dn_flow_queue *old_q = q ;
@@ -1408,7 +1419,7 @@
if (q->idle_time < curr_time) {
/* Calculate available burst size. */
q->numbytes +=
- (curr_time - q->idle_time) * pipe->bandwidth;
+ (curr_time - q->idle_time - 1) * pipe->bandwidth;
if (q->numbytes > pipe->burst)
q->numbytes = pipe->burst;
if (io_fast)
@@ -1418,8 +1429,8 @@
if (pipe->idle_time < curr_time) {
/* Calculate available burst size. */
pipe->numbytes +=
- (curr_time - pipe->idle_time) * pipe->bandwidth;
- if (pipe->numbytes > pipe->burst)
+ (curr_time - pipe->idle_time - 1) * pipe->bandwidth;
+ if (pipe->numbytes > 0 && pipe->numbytes > pipe->burst)
pipe->numbytes = pipe->burst;
if (io_fast)
pipe->numbytes += pipe->bandwidth;
==== //depot/projects/scottl-camlock/src/usr.bin/leave/leave.c#2 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.12 2002/09/04 23:29:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.13 2009/11/03 09:25:08 delphij Exp $");
#include <err.h>
#include <ctype.h>
@@ -53,7 +53,7 @@
#include <time.h>
#include <unistd.h>
-void doalarm(u_int);
+static void doalarm(u_int);
static void usage(void);
/*
==== //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#3 (text+ko) ====
@@ -27,7 +27,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.2 2009/10/29 13:45:33 jhb Exp $
+# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.3 2009/11/03 09:17:23 delphij Exp $
usage()
{
@@ -147,6 +147,8 @@
echo "Writing crash summary to $FILE."
+umask 077
+
# Simulate uname
ostype=$(echo -e printf '"%s", ostype' | gdb -x /dev/stdin -batch $KERNEL)
osrelease=$(echo -e printf '"%s", osrelease' | gdb -x /dev/stdin -batch $KERNEL)
==== //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.4 2009/02/27 17:27:16 thompsa Exp $ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.5 2009/11/02 23:50:12 thompsa Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
@@ -100,21 +100,66 @@
printf("%s%s = 0x%04x ", plevel, field, value);
- if ((field[0] != 'i') || (field[1] == 'd')) {
- printf("\n");
- return;
+ if (strlen(plevel) == 8) {
+ /* Endpoint Descriptor */
+
+ if (strcmp(field, "bEndpointAddress") == 0) {
+ if (value & 0x80)
+ printf(" <IN>\n");
+ else
+ printf(" <OUT>\n");
+ return;
+ }
+
+ if (strcmp(field, "bmAttributes") == 0) {
+ switch (value & 0x03) {
+ case 0:
+ printf(" <CONTROL>\n");
+ break;
+ case 1:
+ switch (value & 0x0C) {
+ case 0x00:
+ printf(" <ISOCHRONOUS>\n");
+ break;
+ case 0x04:
+ printf(" <ASYNC-ISOCHRONOUS>\n");
+ break;
+ case 0x08:
+ printf(" <ADAPT-ISOCHRONOUS>\n");
+ break;
+ default:
+ printf(" <SYNC-ISOCHRONOUS>\n");
+ break;
+ }
+ break;
+ case 2:
+ printf(" <BULK>\n");
+ break;
+ default:
+ printf(" <INTERRUPT>\n");
+ break;
+ }
+ return;
+ }
}
- if (value == 0) {
- printf(" <no string>\n");
+
+ if ((field[0] == 'i') && (field[1] != 'd')) {
+ /* Indirect String Descriptor */
+ if (value == 0) {
+ printf(" <no string>\n");
+ return;
+ }
+ if (libusb20_dev_req_string_simple_sync(pdev, value,
+ temp_string, sizeof(temp_string))) {
+ printf(" <retrieving string failed>\n");
+ return;
+ }
+ printf(" <%s>\n", temp_string);
return;
}
- if (libusb20_dev_req_string_simple_sync(pdev, value,
- temp_string, sizeof(temp_string))) {
- printf(" <retrieving string failed>\n");
- return;
- }
- printf(" <%s>\n", temp_string);
- return;
+
+ /* No additional information */
+ printf("\n");
}
static void
==== //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump.c#4 (text+ko) ====
@@ -5,8 +5,8 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.12 2009/05/27 12:18:39 edwin Exp $";
-static char elsieid[] = "@(#)zdump.c 8.9";
+ "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.13 2009/11/02 23:02:11 edwin Exp $";
+static char elsieid[] = "@(#)zdump.c 8.10";
#endif /* not lint */
/*
@@ -152,7 +152,7 @@
static char * progname;
static int warned;
-static void usage(const char *progname, FILE *stream, int status);
+static void usage(FILE *stream, int status);
static char * abbr(struct tm * tmp);
static void abbrok(const char * abbrp, const char * zone);
static long delta(struct tm * newp, struct tm * oldp);
@@ -273,7 +273,7 @@
if (strcmp(argv[i], "--version") == 0) {
errx(EXIT_SUCCESS, "%s", elsieid);
} else if (strcmp(argv[i], "--help") == 0) {
- usage(progname, stdout, EXIT_SUCCESS);
+ usage(stdout, EXIT_SUCCESS);
}
vflag = 0;
cutarg = NULL;
@@ -283,7 +283,7 @@
else cutarg = optarg;
if ((c != -1) ||
(optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
- usage(progname, stderr, EXIT_FAILURE);
+ usage(stderr, EXIT_FAILURE);
}
if (vflag) {
if (cutarg != NULL) {
@@ -468,7 +468,7 @@
}
static void
-usage(const char *progname, FILE *stream, int status)
+usage(FILE *stream, int status)
{
fprintf(stream,
_("usage: %s [--version] [-v] [--help] [-c [loyear,]hiyear] zonename ...\n\
==== //depot/projects/scottl-camlock/src/usr.sbin/zic/zic.8#4 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.23 2009/05/27 12:18:39 edwin Exp $
+.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.24 2009/11/02 23:02:11 edwin Exp $
.Dd June 20, 2004
.Dt ZIC 8
.Os
@@ -260,7 +260,7 @@
.El
.Pp
A zone line has the form:
-.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]]
+.Dl "Zone NAME GMTOFF RULES/SAVE FORMAT [UNTILYEAR [MONTH [DAY [TIME]]]]"
For example:
.Dl "Zone Australia/Adelaide 9:30 Aus CST 1971 Oct 31 2:00
The fields that make up a zone line are:
More information about the p4-projects
mailing list