From owner-p4-projects@FreeBSD.ORG Sun Jun 27 00:52:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9AB016A4D0; Sun, 27 Jun 2004 00:52:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5503816A4CE for ; Sun, 27 Jun 2004 00:52:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A9D943D39 for ; Sun, 27 Jun 2004 00:52:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R0pnYN082335 for ; Sun, 27 Jun 2004 00:51:50 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R0pnwK082324 for perforce@freebsd.org; Sun, 27 Jun 2004 00:51:49 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 00:51:49 GMT Message-Id: <200406270051.i5R0pnwK082324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 00:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=55871 Change 55871 by davidxu@davidxu_alona on 2004/06/27 00:48:27 branch for KSE threading debugger. Affected files ... .. //depot/projects/davidxu_ksedbg/doc/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/README#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng/branches.ascii#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng/branches.pic#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/articles/releng/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/el_GR.ISO8859-7/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/portbuild/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/dma/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/policies/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/policies/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/secure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/arch-handbook/x86/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/dev-model/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/dev-model/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pam/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pam/converse.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pam/su.c#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/flyer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/flyer/flyer.tex#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/builtin.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/chkey.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/echo.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man1/intro.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/agp.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/amd.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/ncr.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/sd.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/sn.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/spic.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/st.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man5/intro.5#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man5/publickey.5#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man6/intro.6#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man7/ascii.7#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/man/man7/intro.7#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#1 branch .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/euro/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/euro/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/flyer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/flyer/flyer.tex#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fonts/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/problem-reports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/faq/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/faq/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/advanced-networking/isdn-bus.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/advanced-networking/natd.eps#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/appendix.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/authors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/backups/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/backups/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/basics/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/boot/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/chapter.decl#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/chapters.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/colophon.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/config/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/contrib/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/disks/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/eresources/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/hw/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/install/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/internals/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/introduction/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/jauthors.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kerneldebug/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kernelopts/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/l10n/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/mail/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/newsgroups.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/policies/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/ports/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/printing/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/security/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/staff/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/txtfiles.ent#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/users/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/x11/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/porters-handbook/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/porters-handbook/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/ppp-primer/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/books/ppp-primer/book.sgml#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/Makefile.inc#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/addftinfo.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/addr2line.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/afmtodit.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/apply.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/apropos.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/ar.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/as.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/asa.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/at.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/basename.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/bc.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/bdes.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/biff.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/brandelf.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/builtin.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/bzip2.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/c89.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/c99.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/calendar.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/cap_mkdb.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/cat.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/catman.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/cdcontrol.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/checknr.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/chflags.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/chgrp.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/chio.1#1 branch .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/chkey.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 27 01:59:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 873C016A4D1; Sun, 27 Jun 2004 01:59:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2985E16A4CE for ; Sun, 27 Jun 2004 01:59:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B9C043D3F for ; Sun, 27 Jun 2004 01:59:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R1xBbj084085 for ; Sun, 27 Jun 2004 01:59:11 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R1xBOL084082 for perforce@freebsd.org; Sun, 27 Jun 2004 01:59:11 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 01:59:11 GMT Message-Id: <200406270159.i5R1xBOL084082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 01:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=55873 Change 55873 by davidxu@davidxu_alona on 2004/06/27 01:59:06 Add fields to support debug. Change kse_switchin to accept mailbox pointer. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/sys/kse.h#2 (text+ko) ==== @@ -54,13 +54,15 @@ */ struct kse_thr_mailbox { ucontext_t tm_context; /* User and machine context */ - unsigned int tm_flags; /* Thread flags */ + uint32_t tm_flags; /* Thread flags */ struct kse_thr_mailbox *tm_next; /* Next thread in list */ void *tm_udata; /* For use by the UTS */ - uint32_t tm_uticks; - uint32_t tm_sticks; + uint32_t tm_uticks; /* Time in userland */ + uint32_t tm_sticks; /* Time in kernel */ siginfo_t tm_syncsig; - int tm_spare[8]; + uint32_t tm_dflags; /* Debug flags */ + lwpid_t tm_lwp; /* kernel thread UTS runs on */ + uint32_t __spare__[8]; }; /* @@ -70,37 +72,44 @@ * a single KSE. */ struct kse_mailbox { - int km_version; /* Mailbox version */ + uint32_t km_version; /* Mailbox version */ struct kse_thr_mailbox *km_curthread; /* Currently running thread */ struct kse_thr_mailbox *km_completed; /* Threads back from kernel */ sigset_t km_sigscaught; /* Caught signals */ - uint32_t km_flags; /* KSE flags */ + uint32_t km_flags; /* Mailbox flags */ kse_func_t *km_func; /* UTS function */ - stack_t km_stack; /* UTS context */ + stack_t km_stack; /* UTS stack */ void *km_udata; /* For use by the UTS */ struct timespec km_timeofday; /* Time of day */ - int km_quantum; /* Upcall quantum in msecs */ - int km_spare[8]; + uint32_t km_quantum; /* Upcall quantum in msecs */ + lwpid_t km_lwp; /* kernel thread UTS runs on */ + uint32_t __spare2__[8]; }; -#define KSE_VER_0 0 -#define KSE_VERSION KSE_VER_0 +#define KSE_VER_0 0 +#define KSE_VERSION KSE_VER_0 /* These flags are kept in km_flags */ -#define KMF_NOUPCALL 0x01 -#define KMF_NOCOMPLETED 0x02 -#define KMF_DONE 0x04 -#define KMF_BOUND 0x08 -#define KMF_WAITSIGEVENT 0x10 +#define KMF_NOUPCALL 0x01 +#define KMF_NOCOMPLETED 0x02 +#define KMF_DONE 0x04 +#define KMF_BOUND 0x08 +#define KMF_WAITSIGEVENT 0x10 /* These flags are kept in tm_flags */ -#define TMF_NOUPCALL 0x01 +#define TMF_NOUPCALL 0x01 + +/* These flags are kept in tm_dlfags */ +#define TMDF_SSTEP 0x01 + +/* Flags for kse_switchin */ +#define KSE_SWITCHIN_SETTMBX 0x01 /* Commands for kse_thr_interrupt */ -#define KSE_INTR_INTERRUPT 0x01 -#define KSE_INTR_RESTART 0x02 -#define KSE_INTR_SENDSIG 0x03 -#define KSE_INTR_SIGEXIT 0x04 +#define KSE_INTR_INTERRUPT 0x01 +#define KSE_INTR_RESTART 0x02 +#define KSE_INTR_SENDSIG 0x03 +#define KSE_INTR_SIGEXIT 0x04 #ifndef _KERNEL int kse_create(struct kse_mailbox *, int); @@ -108,7 +117,7 @@ int kse_release(struct timespec *); int kse_thr_interrupt(struct kse_thr_mailbox *, int, long); int kse_wakeup(struct kse_mailbox *); -int kse_switchin(mcontext_t *, long, long *); +int kse_switchin(struct kse_thr_mailbox *, int flags); #endif /* !_KERNEL */ #endif /* !_SYS_KSE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jun 27 02:08:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE1B916A4D0; Sun, 27 Jun 2004 02:08:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A306C16A4CE for ; Sun, 27 Jun 2004 02:08:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BEB643D1D for ; Sun, 27 Jun 2004 02:08:29 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R28NmF084367 for ; Sun, 27 Jun 2004 02:08:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R28Nq2084364 for perforce@freebsd.org; Sun, 27 Jun 2004 02:08:23 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 02:08:23 GMT Message-Id: <200406270208.i5R28Nq2084364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 02:08:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=55875 Change 55875 by davidxu@davidxu_alona on 2004/06/27 02:08:21 Change kse_switchin interface. Add syscall ttrace. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.172 2004/06/22 04:36:24 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -472,4 +472,5 @@ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ + { AS(ttrace_args), (sy_call_t *)ttrace }, /* 444 = ttrace */ }; ==== //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.158 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -451,4 +451,5 @@ "ksem_timedwait", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ + "ttrace", /* 444 = ttrace */ }; ==== //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#2 (text+ko) ==== @@ -626,10 +626,12 @@ int attrnamespace, void *data, size_t nbytes); } 439 STD { ssize_t extattr_list_link(const char *path, \ int attrnamespace, void *data, size_t nbytes); } -440 MSTD { int kse_switchin(const struct __mcontext *mcp, \ - long val, long *loc); } +440 MSTD { int kse_switchin(struct kse_thr_mailbox *tmbx, \ + int flags); } 441 MNOSTD { int ksem_timedwait(semid_t id, struct timespec *abstime); } 442 MSTD { int thr_suspend(const struct timespec *timeout); } 443 MSTD { int thr_wake(thr_id_t id); } +444 STD { int ttrace(int req, pid_t pid, lwpid_t tid, \ + caddr_t addr, int data); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.156 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -356,4 +356,5 @@ #define SYS_ksem_timedwait 441 #define SYS_thr_suspend 442 #define SYS_thr_wake 443 -#define SYS_MAXSYSCALL 444 +#define SYS_ttrace 444 +#define SYS_MAXSYSCALL 445 ==== //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.111 2004/06/22 04:36:25 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp MIASM = \ syscall.o \ @@ -297,4 +297,5 @@ kse_switchin.o \ ksem_timedwait.o \ thr_suspend.o \ - thr_wake.o + thr_wake.o \ + ttrace.o ==== //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.155 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -1289,9 +1289,8 @@ char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)]; }; struct kse_switchin_args { - char mcp_l_[PADL_(const struct __mcontext *)]; const struct __mcontext * mcp; char mcp_r_[PADR_(const struct __mcontext *)]; - char val_l_[PADL_(long)]; long val; char val_r_[PADR_(long)]; - char loc_l_[PADL_(long *)]; long * loc; char loc_r_[PADR_(long *)]; + char tmbx_l_[PADL_(struct kse_thr_mailbox *)]; struct kse_thr_mailbox * tmbx; char tmbx_r_[PADR_(struct kse_thr_mailbox *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; struct ksem_timedwait_args { char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)]; @@ -1303,6 +1302,13 @@ struct thr_wake_args { char id_l_[PADL_(thr_id_t)]; thr_id_t id; char id_r_[PADR_(thr_id_t)]; }; +struct ttrace_args { + char req_l_[PADL_(int)]; int req; char req_r_[PADR_(int)]; + char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; + char tid_l_[PADL_(lwpid_t)]; lwpid_t tid; char tid_r_[PADR_(lwpid_t)]; + char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char data_l_[PADL_(int)]; int data; char data_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1597,6 +1603,7 @@ int ksem_timedwait(struct thread *, struct ksem_timedwait_args *); int thr_suspend(struct thread *, struct thr_suspend_args *); int thr_wake(struct thread *, struct thr_wake_args *); +int ttrace(struct thread *, struct ttrace_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Sun Jun 27 02:26:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 637DF16A548; Sun, 27 Jun 2004 02:26:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3478B16A4D1 for ; Sun, 27 Jun 2004 02:26:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A7EF43D1F for ; Sun, 27 Jun 2004 02:26:38 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R2PjWV084865 for ; Sun, 27 Jun 2004 02:25:45 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R2Pic4084862 for perforce@freebsd.org; Sun, 27 Jun 2004 02:25:44 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 02:25:44 GMT Message-Id: <200406270225.i5R2Pic4084862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 02:26:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=55876 Change 55876 by davidxu@davidxu_alona on 2004/06/27 02:24:55 Implement MI ttrace. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include @@ -54,6 +55,9 @@ #include #include +static int kern_ttrace(struct thread *td, int req, pid_t pid, lwpid_t tid, + void *addr, int data); + /* * Functions implemented using PROC_ACTION(): * @@ -359,16 +363,97 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct ttrace_args { + int req; + pid_t pid; + lwpid_t tid; + caddr_t addr; + int data; +}; +#endif + int +ttrace(struct thread *td, struct ttrace_args * uap) +{ + /* + * XXX this obfuscation is to reduce stack usage, but the register + * structs may be too large to put on the stack anyway. + */ + union { + struct ptrace_io_desc piod; + struct dbreg dbreg; + struct fpreg fpreg; + struct reg reg; + } r; + void *addr; + int error = 0; + + addr = &r; + switch (uap->req) { + case PT_GETREGS: + case PT_GETFPREGS: + case PT_GETDBREGS: + break; + case PT_SETREGS: + error = copyin(uap->addr, &r.reg, sizeof r.reg); + break; + case PT_SETFPREGS: + error = copyin(uap->addr, &r.fpreg, sizeof r.fpreg); + break; + case PT_SETDBREGS: + error = copyin(uap->addr, &r.dbreg, sizeof r.dbreg); + break; + case PT_IO: + error = copyin(uap->addr, &r.piod, sizeof r.piod); + break; + default: + addr = uap->addr; + break; + } + if (error) + return (error); + + error = kern_ttrace(td, uap->req, uap->pid, uap->tid, addr, uap->data); + if (error) + return (error); + + switch (uap->req) { + case PT_IO: + (void)copyout(&r.piod, uap->addr, sizeof r.piod); + break; + case PT_GETREGS: + error = copyout(&r.reg, uap->addr, sizeof r.reg); + break; + case PT_GETFPREGS: + error = copyout(&r.fpreg, uap->addr, sizeof r.fpreg); + break; + case PT_GETDBREGS: + error = copyout(&r.dbreg, uap->addr, sizeof r.dbreg); + break; + } + + return (error); +} + +int kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) { + return kern_ttrace(td, req, pid, 0, addr, data); +} + +int +kern_ttrace(struct thread *td, int req, pid_t pid, lwpid_t tid, void *addr, + int data) +{ struct iovec iov; struct uio uio; struct proc *curp, *p, *pp; struct thread *td2; struct ptrace_io_desc *piod; - int error, write, tmp; + int error, write, tmp, num; int proctree_locked = 0; + lwpid_t *buf, tid2; curp = td->td_proc; @@ -448,6 +533,12 @@ /* OK */ break; + case PT_CLEARSTEP: + /* Allow thread to clear single step for itself */ + if (td->td_tid == tid) + break; + + /* FALLTHROUGH */ default: /* not being traced... */ if ((p->p_flag & P_TRACED) == 0) { @@ -462,7 +553,8 @@ } /* not currently stopped */ - if (!P_SHOULDSTOP(p) || (p->p_flag & P_WAITED) == 0) { + if (!P_SHOULDSTOP(p) || p->p_suspcount != p->p_numthreads || + (p->p_flag & P_WAITED) == 0) { error = EBUSY; goto fail; } @@ -471,7 +563,19 @@ break; } - td2 = FIRST_THREAD_IN_PROC(p); + if (tid == 0) + td2 = FIRST_THREAD_IN_PROC(p); + else { + FOREACH_THREAD_IN_PROC(p, td2) { + if (td2->td_tid == tid) + break; + } + if (td2 == NULL) { + error = ESRCH; + goto fail; + } + } + #ifdef FIX_SSTEP /* * Single step fixup ala procfs @@ -503,6 +607,23 @@ data = SIGSTOP; goto sendsig; /* in PT_CONTINUE below */ + case PT_CLEARSTEP: + _PHOLD(p); + error = ptrace_clear_single_step(td2); + _PRELE(p); + if (error) + goto fail; + PROC_UNLOCK(p); + return (0); + + case PT_SETSTEP: + _PHOLD(p); + error = ptrace_single_step(td2); + _PRELE(p); + if (error) + goto fail; + PROC_UNLOCK(p); + return (0); case PT_STEP: case PT_CONTINUE: case PT_TO_SCE: @@ -578,12 +699,13 @@ p->p_xstat = data; p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SIG); mtx_lock_spin(&sched_lock); - thread_unsuspend(p); - setrunnable(td2); /* XXXKSE */ - /* Need foreach kse in proc, ... make_kse_queued(). */ + thread_unsuspend_one(p->p_xthread); mtx_unlock_spin(&sched_lock); - } else if (data) + p->p_xthread = NULL; + } else if (data) { + p->p_xthread = NULL; psignal(p, data); + } PROC_UNLOCK(p); return (0); @@ -697,6 +819,44 @@ PROC_UNLOCK(p); return (error); + case PT_GETNUMTHRS: + td->td_retval[0] = p->p_numthreads; + PROC_UNLOCK(p); + return (0); + + case PT_GETXTHREAD: /* Get trigger thread */ + if (p->p_xthread) + tid2 = p->p_xthread->td_tid; + else + tid2 = td2->td_tid; + PROC_UNLOCK(p); + error = copyout(&tid2, addr, sizeof(lwpid_t)); + return (error); + + case PT_GETTHRLIST: + if (data <= 0) { + PROC_UNLOCK(p); + return (EINVAL); + } + num = imin(p->p_numthreads, data); + PROC_UNLOCK(p); + buf = malloc(num * sizeof(lwpid_t), M_TEMP, M_WAITOK); + tmp = 0; + PROC_LOCK(p); + mtx_lock_spin(&sched_lock); + FOREACH_THREAD_IN_PROC(p, td2) { + if (tmp >= num) + break; + buf[tmp++] = td2->td_tid; + } + mtx_unlock_spin(&sched_lock); + PROC_UNLOCK(p); + error = copyout(buf, addr, tmp * sizeof(lwpid_t)); + free(buf, M_TEMP); + if (!error) + td->td_retval[0] = num; + return (error); + default: #ifdef __HAVE_PTRACE_MACHDEP if (req >= PT_FIRSTMACH) { ==== //depot/projects/davidxu_ksedbg/src/sys/sys/proc.h#2 (text+ko) ==== @@ -585,6 +585,7 @@ void *p_aioinfo; /* (?) ASYNC I/O info. */ struct thread *p_singlethread;/* (c + j) If single threading this is it */ int p_suspcount; /* (c) # threads in suspended mode */ + struct thread *p_xthread; /* (c) Trap thread */ /* End area that is zeroed on creation. */ #define p_endzero p_magic ==== //depot/projects/davidxu_ksedbg/src/sys/sys/ptrace.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ #define PT_ATTACH 10 /* trace some running process */ #define PT_DETACH 11 /* stop tracing a process */ -#define PT_IO 12 /* do I/O to/from stopped process. */ +#define PT_IO 12 /* do I/O to/from stopped process. */ #define PT_TO_SCE 20 #define PT_TO_SCX 21 @@ -58,8 +58,12 @@ #define PT_SETFPREGS 36 /* set floating-point registers */ #define PT_GETDBREGS 37 /* get debugging registers */ #define PT_SETDBREGS 38 /* set debugging registers */ - -#define PT_FIRSTMACH 64 /* for machine-specific requests */ +#define PT_GETNUMTHRS 39 /* get total number of threads */ +#define PT_GETXTHREAD 40 /* get signal trigger thread */ +#define PT_GETTHRLIST 41 /* get thread list */ +#define PT_CLEARSTEP 42 /* turn off single step */ +#define PT_SETSTEP 43 /* turn on single step */ +#define PT_FIRSTMACH 64 /* for machine-specific requests */ #include /* machine-specific requests, if any */ struct ptrace_io_desc { @@ -93,6 +97,7 @@ int ptrace_set_pc(struct thread *_td, unsigned long _addr); int ptrace_single_step(struct thread *_td); +int ptrace_clear_single_step(struct thread *_td); #ifdef __HAVE_PTRACE_MACHDEP int cpu_ptrace(struct thread *_td, int _req, void *_addr, int _data); @@ -122,6 +127,8 @@ __BEGIN_DECLS int ptrace(int _request, pid_t _pid, caddr_t _addr, int _data); +int ttrace(int _request, pid_t _pid, lwpid_t _tid, caddr_t _addr, + int _data); __END_DECLS #endif /* !_KERNEL */ From owner-p4-projects@FreeBSD.ORG Sun Jun 27 02:40:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32AFA16A4D0; Sun, 27 Jun 2004 02:40:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C0CC16A4CE for ; Sun, 27 Jun 2004 02:40:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E295C43D3F for ; Sun, 27 Jun 2004 02:40:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R2e5ko085316 for ; Sun, 27 Jun 2004 02:40:05 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R2e5p1085313 for perforce@freebsd.org; Sun, 27 Jun 2004 02:40:05 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 02:40:05 GMT Message-Id: <200406270240.i5R2e5p1085313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 02:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=55883 Change 55883 by davidxu@davidxu_alona on 2004/06/27 02:40:05 Add ptrace_clear_single_step to every arch, alpha already had one. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/machdep.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/pc98/i386/machdep.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/machdep.c#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -1296,6 +1296,13 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + td->td_frame->tf_rflags &= ~PSL_T; + return (0); +} + +int fill_regs(struct thread *td, struct reg *regs) { struct pcb *pcb; ==== //depot/projects/davidxu_ksedbg/src/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -2222,6 +2222,13 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + td->td_frame->tf_eflags &= ~PSL_T; + return (0); +} + +int fill_regs(struct thread *td, struct reg *regs) { struct pcb *pcb; ==== //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/machdep.c#2 (text+ko) ==== @@ -1238,6 +1238,14 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + + td->td_frame->tf_special.psr &= ~IA64_PSR_SS; + return (0); +} + +int fill_regs(struct thread *td, struct reg *regs) { struct trapframe *tf; ==== //depot/projects/davidxu_ksedbg/src/sys/pc98/i386/machdep.c#2 (text+ko) ==== @@ -2279,6 +2279,13 @@ } int +ptrace_clear_single_step(struct thread *td) +{ + td->td_frame->tf_eflags &= ~PSL_T; + return (0); +} + +int fill_regs(struct thread *td, struct reg *regs) { struct pcb *pcb; ==== //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/machdep.c#2 (text+ko) ==== @@ -809,6 +809,14 @@ return (ENOSYS); } +int +ptrace_clear_single_step(struct thread *td) +{ + + /* XXX: coming soon... */ + return (ENOSYS); +} + /* * Initialise a struct pcpu. */ ==== //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/machdep.c#2 (text+ko) ==== @@ -693,6 +693,13 @@ return (0); } +int +ptrace_clear_single_step(struct thread *td) +{ + /* TODO; */ + return (0); +} + void exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { From owner-p4-projects@FreeBSD.ORG Sun Jun 27 03:04:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E60C16A4D0; Sun, 27 Jun 2004 03:04:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C0BD16A4CE for ; Sun, 27 Jun 2004 03:04:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 547E243D41 for ; Sun, 27 Jun 2004 03:04:30 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R33ax6086219 for ; Sun, 27 Jun 2004 03:03:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R33arb086216 for perforce@freebsd.org; Sun, 27 Jun 2004 03:03:36 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 03:03:36 GMT Message-Id: <200406270303.i5R33arb086216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 03:04:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=55888 Change 55888 by davidxu@davidxu_alona on 2004/06/27 03:03:35 Simplify code in trapsignal. Add code to allow signal to be exchanged for trapped thread with debugger. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_sig.c#2 (text+ko) ==== @@ -1489,23 +1489,16 @@ if (td->td_mailbox == NULL) thread_user_enter(p, td); PROC_LOCK(p); - if (td->td_mailbox) { - SIGDELSET(td->td_sigmask, sig); - mtx_lock_spin(&sched_lock); - /* - * Force scheduling an upcall, so UTS has chance to - * process the signal before thread runs again in - * userland. - */ - if (td->td_upcall) - td->td_upcall->ku_flags |= KUF_DOUPCALL; - mtx_unlock_spin(&sched_lock); - } else { - /* UTS caused a sync signal */ - p->p_code = code; /* XXX for core dump/debugger */ - p->p_sig = sig; /* XXX to verify code */ - sigexit(td, sig); - } + SIGDELSET(td->td_sigmask, sig); + mtx_lock_spin(&sched_lock); + /* + * Force scheduling an upcall, so UTS has chance to + * process the signal before thread runs again in + * userland. + */ + if (td->td_upcall) + td->td_upcall->ku_flags |= KUF_DOUPCALL; + mtx_unlock_spin(&sched_lock); } else { PROC_LOCK(p); } @@ -1523,17 +1516,23 @@ (*p->p_sysent->sv_sendsig)( ps->ps_sigact[_SIG_IDX(sig)], sig, &td->td_sigmask, code); - else { + else if (td->td_mailbox == NULL) { + mtx_unlock(&ps->ps_mtx); + /* UTS caused a sync signal */ + p->p_code = code; /* XXX for core dump/debugger */ + p->p_sig = sig; /* XXX to verify code */ + sigexit(td, sig); + } else { cpu_thread_siginfo(sig, code, &siginfo); mtx_unlock(&ps->ps_mtx); + SIGADDSET(td->td_sigmask, sig); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); PROC_LOCK(p); /* UTS memory corrupted */ if (error) - sigexit(td, SIGILL); - SIGADDSET(td->td_sigmask, sig); + sigexit(td, SIGSEGV); mtx_lock(&ps->ps_mtx); } SIGSETOR(td->td_sigmask, ps->ps_catchmask[_SIG_IDX(sig)]); @@ -2001,27 +2000,57 @@ } } -void +int ptracestop(struct thread *td, int sig) { struct proc *p = td->td_proc; + struct thread *td0; + int newsig; PROC_LOCK_ASSERT(p, MA_OWNED); WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, "Stopping for traced signal"); + while (P_SHOULDSTOP(p)) { + if (p->p_flag & P_SINGLE_EXIT) + return (sig); + mtx_lock_spin(&sched_lock); + thread_stopped(p); + thread_suspend_one(td); + PROC_UNLOCK(p); + DROP_GIANT(); + mi_switch(SW_INVOL); + mtx_unlock_spin(&sched_lock); + PICKUP_GIANT(); + PROC_LOCK(p); + } p->p_xstat = sig; - PROC_LOCK(p->p_pptr); - psignal(p->p_pptr, SIGCHLD); - PROC_UNLOCK(p->p_pptr); - stop(p); + p->p_xthread = td; + p->p_flag |= (P_STOPPED_SIG|P_STOPPED_TRACE); mtx_lock_spin(&sched_lock); + FOREACH_THREAD_IN_PROC(p, td0) { + if (TD_IS_SLEEPING(td0) && + (td0->td_flags & TDF_SINTR) && + !TD_IS_SUSPENDED(td0)) { + thread_suspend_one(td0); + } else if (td != td0) { + td0->td_flags |= TDF_ASTPENDING; + } + } + thread_stopped(p); thread_suspend_one(td); PROC_UNLOCK(p); DROP_GIANT(); mi_switch(SW_INVOL); mtx_unlock_spin(&sched_lock); PICKUP_GIANT(); + PROC_LOCK(p); + newsig = p->p_xstat; + p->p_xstat = newsig; + mtx_lock_spin(&sched_lock); + thread_unsuspend(p); + mtx_unlock_spin(&sched_lock); + return (newsig); } /* @@ -2043,7 +2072,7 @@ struct proc *p; struct sigacts *ps; sigset_t sigpending; - int sig, prop; + int sig, prop, newsig; struct thread *td0; p = td->td_proc; @@ -2074,6 +2103,8 @@ */ if (SIGISMEMBER(ps->ps_sigignore, sig) && (traced == 0)) { SIGDELSET(td->td_siglist, sig); + if (td->td_pflags & TDP_SA) + SIGADDSET(td->td_sigmask, sig); continue; } if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) { @@ -2081,8 +2112,7 @@ * If traced, always stop. */ mtx_unlock(&ps->ps_mtx); - ptracestop(td, sig); - PROC_LOCK(p); + newsig = ptracestop(td, sig); mtx_lock(&ps->ps_mtx); /* @@ -2091,10 +2121,11 @@ * otherwise we just look for signals again. */ SIGDELSET(td->td_siglist, sig); /* clear old signal */ - sig = p->p_xstat; - if (sig == 0) + if (td->td_pflags & TDP_SA) + SIGADDSET(td->td_sigmask, sig); + if (newsig == 0) continue; - + sig = newsig; /* * If the traced bit got turned off, go back up * to the top to rescan signals. This ensures @@ -2108,6 +2139,8 @@ * signal is being masked, look for other signals. */ SIGADDSET(td->td_siglist, sig); + if (td->td_pflags & TDP_SA) + SIGDELSET(td->td_sigmask, sig); if (SIGISMEMBER(td->td_sigmask, sig)) continue; signotify(td); @@ -2286,8 +2319,7 @@ mtx_lock(&ps->ps_mtx); } - if (!(td->td_pflags & TDP_SA && td->td_mailbox) && - action == SIG_DFL) { + if (!(td->td_pflags & TDP_SA) && action == SIG_DFL) { /* * Default action, where the default is to kill * the process. (Other cases were ignored above.) @@ -2296,7 +2328,7 @@ sigexit(td, sig); /* NOTREACHED */ } else { - if (td->td_pflags & TDP_SA && td->td_mailbox) { + if (td->td_pflags & TDP_SA) { if (sig == SIGKILL) { mtx_unlock(&ps->ps_mtx); sigexit(td, sig); @@ -2345,7 +2377,7 @@ p->p_code = 0; p->p_sig = 0; } - if (td->td_pflags & TDP_SA && td->td_mailbox) + if (td->td_pflags & TDP_SA) thread_signal_add(curthread, sig); else (*p->p_sysent->sv_sendsig)(action, sig, From owner-p4-projects@FreeBSD.ORG Sun Jun 27 04:23:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C3E416A4D7; Sun, 27 Jun 2004 04:23:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C40A216A4D3 for ; Sun, 27 Jun 2004 04:23:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6DB943D49 for ; Sun, 27 Jun 2004 04:23:15 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R4NEKY088501 for ; Sun, 27 Jun 2004 04:23:14 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R4NEnU088498 for perforce@freebsd.org; Sun, 27 Jun 2004 04:23:14 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 04:23:14 GMT Message-Id: <200406270423.i5R4NEnU088498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 04:23:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=55894 Change 55894 by davidxu@davidxu_alona on 2004/06/27 04:22:54 Adjust kse_switchin code to accept mailbox pointer. Add code to export lwpid to mailbox, so debugger can map kernel lwp to user thread. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/kern_kse.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -123,28 +124,45 @@ } } - #ifndef _SYS_SYSPROTO_H_ struct kse_switchin_args { - const struct __mcontext *mcp; - long val; - long *loc; + struct kse_thr_mailbox *tmbx; + int flags; }; #endif int kse_switchin(struct thread *td, struct kse_switchin_args *uap) { - mcontext_t mc; + struct kse_thr_mailbox tmbx; + struct kse_upcall *ku; int error; - error = (uap->mcp == NULL) ? EINVAL : 0; + if ((ku = td->td_upcall) == NULL || TD_CAN_UNBIND(td)) + return (EINVAL); + error = (uap->tmbx == NULL) ? EINVAL : 0; if (!error) - error = copyin(uap->mcp, &mc, sizeof(mc)); - if (!error && uap->loc != NULL) - error = (suword(uap->loc, uap->val) != 0) ? EINVAL : 0; + error = copyin(uap->tmbx, &tmbx, sizeof(tmbx)); + if (!error && (uap->flags & KSE_SWITCHIN_SETTMBX)) + error = (suword(&ku->ku_mailbox->km_curthread, + (long)uap->tmbx) != 0 ? EINVAL : 0); if (!error) - error = set_mcontext(td, &mc); + error = set_mcontext(td, &tmbx.tm_context.uc_mcontext); + if (!error) { + suword32(&uap->tmbx->tm_lwp, td->td_tid); + if (uap->flags & KSE_SWITCHIN_SETTMBX) { + td->td_mailbox = uap->tmbx; + mtx_lock_spin(&sched_lock); + td->td_flags |= TDF_CAN_UNBIND; + mtx_unlock_spin(&sched_lock); + } + if (td->td_proc->p_flag & P_TRACED) { + if (tmbx.tm_dflags & TMDF_SSTEP) + ptrace_single_step(td); + else + ptrace_clear_single_step(td); + } + } return ((error == 0) ? EJUSTRETURN : error); } @@ -271,7 +289,7 @@ * If that fails then just go for a segfault. * XXX need to check it that can be deliverred without a mailbox. */ - error = suword(&ku->ku_mailbox->km_flags, ku->ku_mflags|KMF_DONE); + error = suword32(&ku->ku_mailbox->km_flags, ku->ku_mflags|KMF_DONE); PROC_LOCK(p); if (error) psignal(p, SIGSEGV); @@ -327,7 +345,7 @@ if (td->td_pflags & TDP_SA) td->td_pflags |= TDP_UPCALLING; else { - ku->ku_mflags = fuword(&ku->ku_mailbox->km_flags); + ku->ku_mflags = fuword32(&ku->ku_mailbox->km_flags); if (ku->ku_mflags == -1) { PROC_LOCK(p); sigexit(td, SIGSEGV); @@ -459,8 +477,12 @@ ncpus = virtual_cpu; if (!(mbx.km_flags & KMF_BOUND)) sa = TDP_SA; - else + else { + if (mbx.km_curthread == NULL) + return (EINVAL); ncpus = 1; + } + PROC_LOCK(p); if (!(p->p_flag & P_SA)) { first = 1; @@ -599,20 +621,26 @@ newtd = thread_schedule_upcall(td, newku); } } + mtx_unlock_spin(&sched_lock); + suword32(&newku->ku_mailbox->km_lwp, newtd->td_tid); + if (mbx.km_curthread) + suword32(&mbx.km_curthread->tm_lwp, newtd->td_tid); if (!sa) { newtd->td_mailbox = mbx.km_curthread; newtd->td_pflags &= ~TDP_SA; if (newtd != td) { - mtx_unlock_spin(&sched_lock); cpu_set_upcall_kse(newtd, newku); - mtx_lock_spin(&sched_lock); + if (p->p_flag & P_TRACED) + ptrace_clear_single_step(newtd); } } else { newtd->td_pflags |= TDP_SA; } - if (newtd != td) + if (newtd != td) { + mtx_lock_spin(&sched_lock); setrunqueue(newtd); - mtx_unlock_spin(&sched_lock); + mtx_unlock_spin(&sched_lock); + } return (0); } @@ -683,21 +711,6 @@ p = td->td_proc; kg = td->td_ksegrp; - /* Export the user/machine context. */ - get_mcontext(td, &mc, 0); - addr = (void *)(&td->td_mailbox->tm_context.uc_mcontext); - error = copyout(&mc, addr, sizeof(mcontext_t)); - if (error) - goto bad; - - /* Exports clock ticks in kernel mode */ - addr = (caddr_t)(&td->td_mailbox->tm_sticks); - temp = fuword32(addr) + td->td_usticks; - if (suword32(addr, temp)) { - error = EFAULT; - goto bad; - } - /* * Post sync signal, or process SIGKILL and SIGSTOP. * For sync signal, it is only possible when the signal is not @@ -717,6 +730,27 @@ SIGFILLSET(td->td_sigmask); PROC_UNLOCK(p); + /* Export the user/machine context. */ + get_mcontext(td, &mc, 0); + addr = (void *)(&td->td_mailbox->tm_context.uc_mcontext); + error = copyout(&mc, addr, sizeof(mcontext_t)); + if (error) + goto bad; + + /* Exports clock ticks in kernel mode */ + addr = (caddr_t)(&td->td_mailbox->tm_sticks); + temp = fuword32(addr) + td->td_usticks; + if (suword32(addr, temp)) { + error = EFAULT; + goto bad; + } + + addr = (caddr_t)(&td->td_mailbox->tm_lwp); + if (suword32(addr, 0)) { + error = EFAULT; + goto bad; + } + /* Get address in latest mbox of list pointer */ addr = (void *)(&td->td_mailbox->tm_next); /* @@ -944,14 +978,14 @@ cpu_thread_siginfo(sig, 0, &siginfo); mtx_unlock(&ps->ps_mtx); + SIGADDSET(td->td_sigmask, sig); PROC_UNLOCK(p); error = copyout(&siginfo, &td->td_mailbox->tm_syncsig, sizeof(siginfo)); if (error) { PROC_LOCK(p); - sigexit(td, SIGILL); + sigexit(td, SIGSEGV); } PROC_LOCK(p); - SIGADDSET(td->td_sigmask, sig); mtx_lock(&ps->ps_mtx); } @@ -991,7 +1025,6 @@ /* * Setup done on the thread when it enters the kernel. - * XXXKSE Presently only for syscalls but eventually all kernel entries. */ void thread_user_enter(struct proc *p, struct thread *td) @@ -1203,6 +1236,12 @@ */ if (!(ku->ku_mflags & KMF_NOUPCALL)) { cpu_set_upcall_kse(td, ku); + if (p->p_flag & P_TRACED) + ptrace_clear_single_step(td); + error = suword32(&ku->ku_mailbox->km_lwp, + td->td_tid); + if (error) + goto out; error = suword(&ku->ku_mailbox->km_curthread, 0); if (error) goto out; From owner-p4-projects@FreeBSD.ORG Sun Jun 27 04:38:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBFF016A4D1; Sun, 27 Jun 2004 04:38:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD70116A4CF for ; Sun, 27 Jun 2004 04:38:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A712643D39 for ; Sun, 27 Jun 2004 04:38:49 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R4cX6W088871 for ; Sun, 27 Jun 2004 04:38:33 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R4cXrN088868 for perforce@freebsd.org; Sun, 27 Jun 2004 04:38:33 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 04:38:33 GMT Message-Id: <200406270438.i5R4cXrN088868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 04:38:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=55895 Change 55895 by davidxu@davidxu_alona on 2004/06/27 04:38:14 Add variable _libkse_debug, debugger should write it a nonzero value to tell libpthread it is being debugged. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_init.c#2 (text+ko) ==== @@ -310,6 +310,12 @@ _thr_signal_init(); _kse_critical_leave(&_thr_initial->tcb->tcb_tmbx); + /* + * activate threaded mode as soon as possible if we are + * being debugged + */ + if (_libkse_debug) + _kse_setthreaded(1); } /* ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#2 (text+ko) ==== @@ -980,6 +980,8 @@ SCLASS void *_usrstack SCLASS_PRESET(NULL); SCLASS struct kse *_kse_initial SCLASS_PRESET(NULL); SCLASS struct pthread *_thr_initial SCLASS_PRESET(NULL); +/* For debugger */ +SCLASS int _libkse_debug SCLASS_PRESET(0); /* List of all threads: */ SCLASS TAILQ_HEAD(, pthread) _thread_list From owner-p4-projects@FreeBSD.ORG Sun Jun 27 04:50:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E916716A4D0; Sun, 27 Jun 2004 04:50:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC5A516A4CE for ; Sun, 27 Jun 2004 04:50:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9194A43D2D for ; Sun, 27 Jun 2004 04:50:55 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R4onkF089214 for ; Sun, 27 Jun 2004 04:50:49 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R4on4j089211 for perforce@freebsd.org; Sun, 27 Jun 2004 04:50:49 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 04:50:49 GMT Message-Id: <200406270450.i5R4on4j089211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 04:50:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=55897 Change 55897 by davidxu@davidxu_alona on 2004/06/27 04:49:52 Add code to hand off lwpid from kernel to thread, clear single step status when entering scheduler to let scheduler run in full speed. rename _thr_active_threads to _thread_active_threads to be consistent with other exported names. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_kern.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -222,7 +223,7 @@ * dump core. */ sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - _thr_active_threads = 1; + _thread_active_threads = 1; /* * Enter a loop to remove and free all threads other than @@ -355,7 +356,7 @@ * dump core. */ sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - _thr_active_threads = 1; + _thread_active_threads = 1; #endif } @@ -435,6 +436,9 @@ PANIC("kse_create() failed\n"); return (-1); } + _thr_initial->tcb->tcb_tmbx.tm_lwp = + _kse_initial->k_kcb->kcb_kmbx.km_lwp; + _thread_activated = 1; #ifndef SYSTEM_SCOPE_ONLY /* Set current thread to initial thread */ @@ -630,6 +634,20 @@ if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM) kse_sched_single(&curkse->k_kcb->kcb_kmbx); else { + if (__predict_false(_libkse_debug != 0)) { + /* + * Because debugger saves single step status in thread + * mailbox's tm_dflags, we can safely clear single + * step status here. the single step status will be + * restored by kse_switchin when the thread is + * switched in again. This also lets uts run in full + * speed. + */ + ttrace(PT_CLEARSTEP, getpid(), + curkse->k_kcb->kcb_kmbx.km_lwp, + (caddr_t) 1, 0); + } + KSE_SET_SWITCH(curkse); _thread_enter_uts(curthread->tcb, curkse->k_kcb); } @@ -697,7 +715,7 @@ curkse->k_flags |= KF_INITIALIZED; first = 1; curthread->active = 1; - + /* Setup kernel signal masks for new thread. */ __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); /* @@ -992,8 +1010,10 @@ if (ret != 0) PANIC("Can't resume thread in critical region\n"); } - else if ((curthread->flags & THR_FLAGS_IN_RUNQ) == 0) + else if ((curthread->flags & THR_FLAGS_IN_RUNQ) == 0) { + curthread->tcb->tcb_tmbx.tm_lwp = 0; kse_switchout_thread(curkse, curthread); + } curkse->k_curthread = NULL; #ifdef DEBUG_THREAD_KERN @@ -2447,7 +2467,7 @@ */ thread->uniqueid = next_uniqueid++; THR_LIST_ADD(thread); - _thr_active_threads++; + _thread_active_threads++; KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); } @@ -2465,7 +2485,7 @@ curkse = _get_curkse(); KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); THR_LIST_REMOVE(thread); - _thr_active_threads--; + _thread_active_threads--; KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); } @@ -2498,4 +2518,3 @@ } return (NULL); } - ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#3 (text+ko) ==== @@ -582,15 +582,12 @@ int seqno; }; - #define MAX_THR_LOCKLEVEL 5 /* * Thread structure. */ struct pthread { - /* - * Thread mailbox is first so it cal be aligned properly. - */ + /* Thread control block */ struct tcb *tcb; /* @@ -982,6 +979,7 @@ SCLASS struct pthread *_thr_initial SCLASS_PRESET(NULL); /* For debugger */ SCLASS int _libkse_debug SCLASS_PRESET(0); +SCLASS int _thread_activated SCLASS_PRESET(0); /* List of all threads: */ SCLASS TAILQ_HEAD(, pthread) _thread_list @@ -991,7 +989,7 @@ SCLASS TAILQ_HEAD(, pthread) _thread_gc_list SCLASS_PRESET(TAILQ_HEAD_INITIALIZER(_thread_gc_list)); -SCLASS int _thr_active_threads SCLASS_PRESET(1); +SCLASS int _thread_active_threads SCLASS_PRESET(1); SCLASS TAILQ_HEAD(atfork_head, pthread_atfork) _thr_atfork_list; SCLASS pthread_mutex_t _thr_atfork_mutex; From owner-p4-projects@FreeBSD.ORG Sun Jun 27 05:02:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49F8316A4D0; Sun, 27 Jun 2004 05:02:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1011416A4CE for ; Sun, 27 Jun 2004 05:02:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8AB343D2F for ; Sun, 27 Jun 2004 05:02:49 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R524aw089504 for ; Sun, 27 Jun 2004 05:02:04 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R523VU089501 for perforce@freebsd.org; Sun, 27 Jun 2004 05:02:03 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 05:02:03 GMT Message-Id: <200406270502.i5R523VU089501@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 05:02:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=55899 Change 55899 by davidxu@davidxu_alona on 2004/06/27 05:01:23 Hand off lwpid to thread at context switching time. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/include/pthread_md.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/amd64/include/pthread_md.h#2 (text+ko) ==== @@ -235,17 +235,31 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + mcontext_t *mc; + if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - if (setmbox != 0) - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, - 0, NULL); - /* We should not reach here. */ + mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; + + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + /* We should not reach here. */ + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + return (-1); } #endif ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/i386/include/pthread_md.h#2 (text+ko) ==== @@ -237,16 +237,30 @@ static __inline int _thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox) { + extern int _libkse_debug; + mcontext_t *mc; + if ((kcb == NULL) || (tcb == NULL)) return (-1); kcb->kcb_curtcb = tcb; - if (setmbox != 0) - _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, - (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); - else - _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); - /* We should not reach here. */ + mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; + if (_libkse_debug == 0) { + tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; + if (setmbox != 0) + _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, + (intptr_t)&tcb->tcb_tmbx, + (intptr_t *)&kcb->kcb_kmbx.km_curthread); + else + _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, + 0, NULL); + /* We should not reach here. */ + } else { + if (setmbox) + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); + else + kse_switchin(&tcb->tcb_tmbx, 0); + } + return (-1); } ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -234,10 +234,9 @@ _ia64_break_setcontext(mc); } else if (mc->mc_flags & _MC_FLAGS_SYSCALL_CONTEXT) { if (setmbox) - kse_switchin(mc, (long)&tcb->tcb_tmbx, - (long *)&kcb->kcb_kmbx.km_curthread); + kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX); else - kse_switchin(mc, 0L, NULL); + kse_switchin(&tcb->tcb_tmbx, 0); } else { if (setmbox) _ia64_restore_context(mc, (intptr_t)&tcb->tcb_tmbx, From owner-p4-projects@FreeBSD.ORG Sun Jun 27 05:15:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EFB716A4D4; Sun, 27 Jun 2004 05:15:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B17DC16A4D0 for ; Sun, 27 Jun 2004 05:15:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AACB443D4C for ; Sun, 27 Jun 2004 05:15:10 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R5DIci089784 for ; Sun, 27 Jun 2004 05:13:18 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R5DI2L089781 for perforce@freebsd.org; Sun, 27 Jun 2004 05:13:18 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 05:13:18 GMT Message-Id: <200406270513.i5R5DI2L089781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 05:15:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=55901 Change 55901 by davidxu@davidxu_alona on 2004/06/27 05:13:02 Export following symbols to debugger: _libkse_debug _thread_activated _thread_list _thread_keytable _thread_active_threads Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#2 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#4 edit .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/pthread.map#2 (text+ko) ==== @@ -329,14 +329,11 @@ writev; # Debugger needs these. + _libkse_debug; + _thread_activated; _thread_list; - _thread_next_offset; - _thread_uniqueid_offset; - _thread_state_offset; - _thread_name_offset; - _thread_ctx_offset; - _thread_PS_RUNNING_value; - _thread_PS_DEAD_value; + _thread_keytable; + _thread_active_threads; local: *; ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_create.c#2 (text+ko) ==== @@ -44,20 +44,6 @@ #include "thr_private.h" #include "libc_private.h" -#define OFF(f) offsetof(struct pthread, f) -int _thread_next_offset = OFF(tle.tqe_next); -int _thread_uniqueid_offset = OFF(uniqueid); -int _thread_state_offset = OFF(state); -int _thread_name_offset = OFF(name); -void *_thread_tcb_offset = OFF(tcb); -#undef OFF -#define OFF(f) offsetof(struct tcb, f) -int _thread_ctx_offset = OFF(tcb_tmbx.tm_context); -#undef OFF - -int _thread_PS_RUNNING_value = PS_RUNNING; -int _thread_PS_DEAD_value = PS_DEAD; - static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); static void free_stack(struct pthread_attr *pattr); ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_exit.c#2 (text+ko) ==== @@ -125,11 +125,11 @@ curkse = _get_curkse(); KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); /* Use thread_list_lock */ - _thr_active_threads--; + _thread_active_threads--; #ifdef SYSTEM_SCOPE_ONLY - if (_thr_active_threads == 0) { + if (_thread_active_threads == 0) { #else - if (_thr_active_threads == 1) { + if (_thread_active_threads == 1) { #endif KSE_LOCK_RELEASE(curkse, &_thread_list_lock); _kse_critical_leave(crit); ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_private.h#4 (text+ko) ==== @@ -582,6 +582,13 @@ int seqno; }; +struct pthread_key { + volatile int allocated; + volatile int count; + int seqno; + void (*destructor) (void *); +}; + #define MAX_THR_LOCKLEVEL 5 /* * Thread structure. ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_spec.c#2 (text+ko) ==== @@ -38,15 +38,8 @@ #include #include "thr_private.h" -struct pthread_key { - volatile int allocated; - volatile int count; - int seqno; - void (*destructor) (); -}; - /* Static variables: */ -static struct pthread_key key_table[PTHREAD_KEYS_MAX]; +struct pthread_key _thread_keytable[PTHREAD_KEYS_MAX]; __weak_reference(_pthread_key_create, pthread_key_create); __weak_reference(_pthread_key_delete, pthread_key_delete); @@ -64,10 +57,10 @@ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); for (i = 0; i < PTHREAD_KEYS_MAX; i++) { - if (key_table[i].allocated == 0) { - key_table[i].allocated = 1; - key_table[i].destructor = destructor; - key_table[i].seqno++; + if (_thread_keytable[i].allocated == 0) { + _thread_keytable[i].allocated = 1; + _thread_keytable[i].destructor = destructor; + _thread_keytable[i].seqno++; /* Unlock the key table: */ THR_LOCK_RELEASE(curthread, &_keytable_lock); @@ -91,8 +84,8 @@ /* Lock the key table: */ THR_LOCK_ACQUIRE(curthread, &_keytable_lock); - if (key_table[key].allocated) - key_table[key].allocated = 0; + if (_thread_keytable[key].allocated) + _thread_keytable[key].allocated = 0; else ret = EINVAL; @@ -123,13 +116,13 @@ (curthread->specific_data_count > 0); key++) { destructor = NULL; - if (key_table[key].allocated && + if (_thread_keytable[key].allocated && (curthread->specific[key].data != NULL)) { if (curthread->specific[key].seqno == - key_table[key].seqno) { + _thread_keytable[key].seqno) { data = (void *) curthread->specific[key].data; - destructor = key_table[key].destructor; + destructor = _thread_keytable[key].destructor; } curthread->specific[key].data = NULL; curthread->specific_data_count--; @@ -185,7 +178,7 @@ if ((pthread->specific) || (pthread->specific = pthread_key_allocate_data())) { if ((unsigned int)key < PTHREAD_KEYS_MAX) { - if (key_table[key].allocated) { + if (_thread_keytable[key].allocated) { if (pthread->specific[key].data == NULL) { if (value != NULL) pthread->specific_data_count++; @@ -193,7 +186,7 @@ pthread->specific_data_count--; pthread->specific[key].data = value; pthread->specific[key].seqno = - key_table[key].seqno; + _thread_keytable[key].seqno; ret = 0; } else ret = EINVAL; @@ -216,8 +209,8 @@ /* Check if there is specific data: */ if (pthread->specific != NULL && (unsigned int)key < PTHREAD_KEYS_MAX) { /* Check if this key has been used before: */ - if (key_table[key].allocated && - (pthread->specific[key].seqno == key_table[key].seqno)) { + if (_thread_keytable[key].allocated && + (pthread->specific[key].seqno == _thread_keytable[key].seqno)) { /* Return the value: */ data = (void *) pthread->specific[key].data; } else { From owner-p4-projects@FreeBSD.ORG Sun Jun 27 05:40:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF6AD16A4D0; Sun, 27 Jun 2004 05:40:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA80B16A4CE for ; Sun, 27 Jun 2004 05:40:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACA7A43D1F for ; Sun, 27 Jun 2004 05:40:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R5dpPY090408 for ; Sun, 27 Jun 2004 05:39:51 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R5dpOx090405 for perforce@freebsd.org; Sun, 27 Jun 2004 05:39:51 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 05:39:51 GMT Message-Id: <200406270539.i5R5dpOx090405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 05:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=55903 Change 55903 by davidxu@davidxu_alona on 2004/06/27 05:39:46 Give debugger a chance to check signal. SIGINFO should work to dump thread info. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libpthread/thread/thr_sig.c#2 (text+ko) ==== @@ -347,6 +347,11 @@ err_save = errno; timeout_save = curthread->timeout; intr_save = curthread->interrupted; + /* Check if the signal requires a dump of thread information: */ + if (sig == SIGINFO) { + /* Dump thread information to file: */ + _thread_dump_info(); + } _kse_critical_enter(); /* Get a fresh copy of signal mask */ __sys_sigprocmask(SIG_BLOCK, NULL, &curthread->sigmask); @@ -505,6 +510,12 @@ { _kse_critical_leave(&curthread->tcb->tcb_tmbx); + /* Check if the signal requires a dump of thread information: */ + if (shi->sig == SIGINFO) { + /* Dump thread information to file: */ + _thread_dump_info(); + } + if (((__sighandler_t *)shi->sigfunc != SIG_DFL) && ((__sighandler_t *)shi->sigfunc != SIG_IGN)) { if ((shi->sa_flags & SA_SIGINFO) != 0 || shi->info == NULL) @@ -695,12 +706,18 @@ kse_wakeup(kmbx); return (NULL); } else if (!SIGISMEMBER(pthread->sigmask, sig)) { - sigfunc = _thread_sigact[sig - 1].sa_sigaction; - if ((__sighandler_t *)sigfunc == SIG_DFL) { - if (sigprop(sig) & SA_KILL) { - kse_thr_interrupt(NULL, - KSE_INTR_SIGEXIT, sig); - /* Never reach */ + /* + * If debugger is running, we don't quick exit, + * and give it a chance to check the signal. + */ + if (_libkse_debug == 0) { + sigfunc = _thread_sigact[sig - 1].sa_sigaction; + if ((__sighandler_t *)sigfunc == SIG_DFL) { + if (sigprop(sig) & SA_KILL) { + kse_thr_interrupt(NULL, + KSE_INTR_SIGEXIT, sig); + /* Never reach */ + } } } if (pthread->state == PS_SIGSUSPEND) { @@ -1198,13 +1215,8 @@ __sys_sigprocmask(SIG_SETMASK, &sigset, &_thr_initial->sigmask); /* Enter a loop to get the existing signal status: */ for (i = 1; i <= _SIG_MAXSIG; i++) { - /* Check for signals which cannot be trapped: */ - if (i == SIGKILL || i == SIGSTOP) { - } - /* Get the signal handler details: */ - else if (__sys_sigaction(i, NULL, - &_thread_sigact[i - 1]) != 0) { + if (__sys_sigaction(i, NULL, &_thread_sigact[i - 1]) != 0) { /* * Abort this process if signal * initialisation fails: From owner-p4-projects@FreeBSD.ORG Sun Jun 27 07:53:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFBA316A4D0; Sun, 27 Jun 2004 07:53:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C90AB16A4CE for ; Sun, 27 Jun 2004 07:53:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD5B443D39 for ; Sun, 27 Jun 2004 07:53:33 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R7rW2q094428 for ; Sun, 27 Jun 2004 07:53:32 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R7rWcf094425 for perforce@freebsd.org; Sun, 27 Jun 2004 07:53:32 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 07:53:32 GMT Message-Id: <200406270753.i5R7rWcf094425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 07:53:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=55906 Change 55906 by davidxu@davidxu_alona on 2004/06/27 07:52:32 It seems prgregset_t should be defined as an array. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/sys/procfs.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/sys/procfs.h#2 (text+ko) ==== @@ -65,7 +65,7 @@ gregset_t pr_reg; /* General purpose registers (1) */ } prstatus_t; -typedef gregset_t prgregset_t; +typedef gregset_t prgregset_t[1]; typedef fpregset_t prfpregset_t; #define PRFNAMESZ 16 /* Maximum command length saved */ From owner-p4-projects@FreeBSD.ORG Sun Jun 27 07:54:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E93616A4D0; Sun, 27 Jun 2004 07:54:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BFD216A4CE for ; Sun, 27 Jun 2004 07:54:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6079743D45 for ; Sun, 27 Jun 2004 07:54:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R7sYqa094446 for ; Sun, 27 Jun 2004 07:54:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R7sYfk094443 for perforce@freebsd.org; Sun, 27 Jun 2004 07:54:34 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 07:54:34 GMT Message-Id: <200406270754.i5R7sYfk094443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 07:54:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=55907 Change 55907 by davidxu@davidxu_alona on 2004/06/27 07:54:20 Add my initial version of thread_db.h Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/thread_db.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 27 08:13:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E43316A4D0; Sun, 27 Jun 2004 08:13:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79A9F16A4CE for ; Sun, 27 Jun 2004 08:13:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7435B43D2D for ; Sun, 27 Jun 2004 08:13:26 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5R8Cuti094903 for ; Sun, 27 Jun 2004 08:12:56 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5R8Cu1l094900 for perforce@freebsd.org; Sun, 27 Jun 2004 08:12:56 GMT (envelope-from davidxu@freebsd.org) Date: Sun, 27 Jun 2004 08:12:56 GMT Message-Id: <200406270812.i5R8Cu1l094900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 08:13:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=55908 Change 55908 by davidxu@davidxu_alona on 2004/06/27 08:12:09 Initial version of libthread_db Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/Makefile#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/include/thread_db_int.h#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/Makefile#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.h#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db_i386.c#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/Makefile#1 add .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/src/thread_db.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jun 27 16:40:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECA1816A4D0; Sun, 27 Jun 2004 16:40:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C18CF16A4CE for ; Sun, 27 Jun 2004 16:40:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8A6643D41 for ; Sun, 27 Jun 2004 16:40:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5RGeGRL010405 for ; Sun, 27 Jun 2004 16:40:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5RGeGdX010402 for perforce@freebsd.org; Sun, 27 Jun 2004 16:40:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 27 Jun 2004 16:40:16 GMT Message-Id: <200406271640.i5RGeGdX010402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 55930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2004 16:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55930 Change 55930 by rwatson@rwatson_tislabs on 2004/06/27 16:39:18 Integrate netperf_socket. Netperf-related changes include: - Loop back accept_mtx description. - Loop back so_global_mtx and description. - Loop back socket buffer lock over unp_scan() in unp_gc(). Affected files ... .. //depot/projects/netperf_socket/sys/conf/NOTES#24 integrate .. //depot/projects/netperf_socket/sys/conf/files#32 integrate .. //depot/projects/netperf_socket/sys/conf/options#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umct.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ums.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/urio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/netperf_socket/sys/modules/aue/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/axe/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/cue/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ep/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/kue/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/rue/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/udav/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/umass/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/umct/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ums/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/urio/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/usb/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/uvscom/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sample.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tee.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#20 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/NOTES#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1234 2004/06/26 17:19:44 mpp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1236 2004/06/27 02:36:33 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -434,7 +434,9 @@ options NETGRAPH_BRIDGE options NETGRAPH_CISCO options NETGRAPH_ECHO +options NETGRAPH_EIFACE options NETGRAPH_ETHER +options NETGRAPH_FEC options NETGRAPH_FRAME_RELAY options NETGRAPH_GIF options NETGRAPH_GIF_DEMUX ==== //depot/projects/netperf_socket/sys/conf/files#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.910 2004/06/26 05:58:43 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.912 2004/06/27 02:36:33 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1413,7 +1413,9 @@ netgraph/ng_cisco.c optional netgraph_cisco netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo +netgraph/ng_eiface.c optional netgraph_eiface netgraph/ng_ether.c optional netgraph_ether +netgraph/ng_fec.c optional netgraph_fec netgraph/ng_frame_relay.c optional netgraph_frame_relay netgraph/ng_gif.c optional netgraph_gif netgraph/ng_gif_demux.c optional netgraph_gif_demux ==== //depot/projects/netperf_socket/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.454 2004/06/23 21:04:37 ps Exp $ +# $FreeBSD: src/sys/conf/options,v 1.456 2004/06/27 02:36:33 rwatson Exp $ # # On the handling of kernel options # @@ -378,7 +378,9 @@ NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h NETGRAPH_ECHO opt_netgraph.h +NETGRAPH_EIFACE opt_netgraph.h NETGRAPH_ETHER opt_netgraph.h +NETGRAPH_FEC opt_netgraph.h NETGRAPH_FRAME_RELAY opt_netgraph.h NETGRAPH_GIF opt_netgraph.h NETGRAPH_GIF_DEMUX opt_netgraph.h ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.165 2004/06/24 00:48:45 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.166 2004/06/27 13:04:19 imp Exp $ */ #include "opt_acpi.h" @@ -891,10 +891,9 @@ if (res == NULL) return (NULL); - /* Copy the bus tag from the pre-allocated resource. */ + /* Copy the bus tag and handle from the pre-allocated resource. */ rman_set_bustag(res, rman_get_bustag(rle->res)); - if (type == SYS_RES_IOPORT) - rman_set_bushandle(res, res->r_start); + rman_set_bushandle(res, rman_get_bushandle(res)); /* If requested, activate the resource using the parent's method. */ if (flags & RF_ACTIVE) ==== //depot/projects/netperf_socket/sys/dev/bktr/bktr_tuner.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.12 2003/12/08 07:59:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.13 2004/06/27 09:59:02 schweikh Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -698,7 +698,9 @@ #undef TBL_CHNL -#define TBL_IF freqTable[ bktr->tuner.chnlset ].ptr[ 1 ] +#define TBL_IF (bktr->format_params == BT848_IFORM_F_NTSCJ || \ + bktr->format_params == BT848_IFORM_F_NTSCM ? \ + nabcst[1] : weurope[1]) /* Initialise the tuner structures in the bktr_softc */ ==== //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.43 2004/05/30 17:57:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.44 2004/06/27 13:07:02 imp Exp $"); #include #include @@ -155,25 +155,11 @@ { device_t brdev = device_get_parent(cbdev); int cardattached = 0; - static int curr_bus_number = 2; /* XXX EVILE BAD (see below) */ int bus, slot, func; cardbus_detach_card(cbdev); /* detach existing cards */ - POWER_ENABLE_SOCKET(brdev, cbdev); bus = pcib_get_bus(cbdev); - if (bus == 0) { - /* - * XXX EVILE BAD XXX - * Not all BIOSes initialize the secondary bus number properly, - * so if the default is bad, we just put one in and hope it - * works. - */ - bus = curr_bus_number; - pci_write_config(brdev, PCIR_SECBUS_2, curr_bus_number, 1); - pci_write_config(brdev, PCIR_SUBBUS_2, curr_bus_number + 2, 1); - curr_bus_number += 3; - } /* For each function, set it up and try to attach a driver to it */ for (slot = 0; slot <= CARDBUS_SLOTMAX; slot++) { int cardbusfunchigh = 0; ==== //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.51 2004/05/23 16:11:47 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.52 2004/06/27 13:10:20 imp Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver @@ -78,7 +78,6 @@ # define Sent_Pkts 4 # define Status 8 static int debug_mask = 0; -static int exintr_count = 0; # define DODEBUG(level, action) if (level & debug_mask) action #else # define DODEBUG(level, action) @@ -97,53 +96,35 @@ { 3, 4, 5, 7, 9, 10, 11, 12 }; /* Network Interface Functions */ -static void ex_init (void *); -static void ex_start (struct ifnet *); -static int ex_ioctl (struct ifnet *, u_long, caddr_t); -static void ex_watchdog (struct ifnet *); +static void ex_init(void *); +static void ex_start(struct ifnet *); +static int ex_ioctl(struct ifnet *, u_long, caddr_t); +static void ex_watchdog(struct ifnet *); /* ifmedia Functions */ -static int ex_ifmedia_upd (struct ifnet *); -static void ex_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static int ex_ifmedia_upd(struct ifnet *); +static void ex_ifmedia_sts(struct ifnet *, struct ifmediareq *); -static int ex_get_media (u_int32_t iobase); +static int ex_get_media(struct ex_softc *); -static void ex_reset (struct ex_softc *); -static void ex_setmulti (struct ex_softc *); +static void ex_reset(struct ex_softc *); +static void ex_setmulti(struct ex_softc *); -static void ex_tx_intr (struct ex_softc *); -static void ex_rx_intr (struct ex_softc *); - -int -look_for_card (u_int32_t iobase) -{ - int count1, count2; - - /* - * Check for the i82595 signature, and check that the round robin - * counter actually advances. - */ - if (((count1 = inb(iobase + ID_REG)) & Id_Mask) != Id_Sig) - return(0); - count2 = inb(iobase + ID_REG); - count2 = inb(iobase + ID_REG); - count2 = inb(iobase + ID_REG); +static void ex_tx_intr(struct ex_softc *); +static void ex_rx_intr(struct ex_softc *); - return((count2 & Counter_bits) == ((count1 + 0xc0) & Counter_bits)); -} - void -ex_get_address (u_int32_t iobase, u_char *enaddr) +ex_get_address(struct ex_softc *sc, u_char *enaddr) { - u_int16_t eaddr_tmp; + uint16_t eaddr_tmp; - eaddr_tmp = eeprom_read(iobase, EE_Eth_Addr_Lo); + eaddr_tmp = ex_eeprom_read(sc, EE_Eth_Addr_Lo); enaddr[5] = eaddr_tmp & 0xff; enaddr[4] = eaddr_tmp >> 8; - eaddr_tmp = eeprom_read(iobase, EE_Eth_Addr_Mid); + eaddr_tmp = ex_eeprom_read(sc, EE_Eth_Addr_Mid); enaddr[3] = eaddr_tmp & 0xff; enaddr[2] = eaddr_tmp >> 8; - eaddr_tmp = eeprom_read(iobase, EE_Eth_Addr_Hi); + eaddr_tmp = ex_eeprom_read(sc, EE_Eth_Addr_Hi); enaddr[1] = eaddr_tmp & 0xff; enaddr[0] = eaddr_tmp >> 8; @@ -151,7 +132,7 @@ } int -ex_card_type (u_char *enaddr) +ex_card_type(u_char *enaddr) { if ((enaddr[0] == 0x00) && (enaddr[1] == 0xA0) && (enaddr[2] == 0xC9)) return (CARD_TYPE_EX_10_PLUS); @@ -164,7 +145,7 @@ * ex_release_resources() on failure. */ int -ex_alloc_resources (device_t dev) +ex_alloc_resources(device_t dev) { struct ex_softc * sc = device_get_softc(dev); int error = 0; @@ -176,6 +157,8 @@ error = ENOMEM; goto bad; } + sc->bst = rman_get_bustag(sc->ioport); + sc->bsh = rman_get_bushandle(sc->ioport); sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, RF_ACTIVE); @@ -191,7 +174,7 @@ } void -ex_release_resources (device_t dev) +ex_release_resources(device_t dev) { struct ex_softc * sc = device_get_softc(dev); @@ -221,7 +204,7 @@ struct ex_softc * sc = device_get_softc(dev); struct ifnet * ifp = &sc->arpcom.ac_if; struct ifmedia * ifm; - u_int16_t temp; + uint16_t temp; /* work out which set of irq <-> internal tables to use */ if (ex_card_type(sc->arpcom.ac_enaddr) == CARD_TYPE_EX_10_PLUS) { @@ -249,7 +232,7 @@ ifmedia_init(&sc->ifmedia, 0, ex_ifmedia_upd, ex_ifmedia_sts); - temp = eeprom_read(sc->iobase, EE_W5); + temp = ex_eeprom_read(sc, EE_W5); if (temp & EE_W5_PORT_TPE) ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T, 0, NULL); if (temp & EE_W5_PORT_BNC) @@ -259,7 +242,7 @@ ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_AUTO, 0, NULL); ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_NONE, 0, NULL); - ifmedia_set(&sc->ifmedia, ex_get_media(sc->iobase)); + ifmedia_set(&sc->ifmedia, ex_get_media(sc)); ifm = &sc->ifmedia; ifm->ifm_media = ifm->ifm_cur->ifm_media; @@ -274,7 +257,7 @@ } int -ex_detach (device_t dev) +ex_detach(device_t dev) { struct ex_softc *sc; struct ifnet *ifp; @@ -299,7 +282,6 @@ struct ifnet * ifp = &sc->arpcom.ac_if; int s; int i; - register int iobase = sc->iobase; unsigned short temp_reg; DODEBUG(Start_End, printf("%s: ex_init: start\n", ifp->if_xname);); @@ -310,13 +292,13 @@ /* * Load the ethernet address into the card. */ - outb(iobase + CMD_REG, Bank2_Sel); - temp_reg = inb(iobase + EEPROM_REG); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + temp_reg = CSR_READ_1(sc, EEPROM_REG); if (temp_reg & Trnoff_Enable) { - outb(iobase + EEPROM_REG, temp_reg & ~Trnoff_Enable); + CSR_WRITE_1(sc, EEPROM_REG, temp_reg & ~Trnoff_Enable); } for (i = 0; i < ETHER_ADDR_LEN; i++) { - outb(iobase + I_ADDR_REG0 + i, sc->arpcom.ac_enaddr[i]); + CSR_WRITE_1(sc, I_ADDR_REG0 + i, sc->arpcom.ac_enaddr[i]); } /* * - Setup transmit chaining and discard bad received frames. @@ -325,11 +307,11 @@ * - Set receiving mode. * - Set IRQ number. */ - outb(iobase + REG1, inb(iobase + REG1) | Tx_Chn_Int_Md | Tx_Chn_ErStp | Disc_Bad_Fr); - outb(iobase + REG2, inb(iobase + REG2) | No_SA_Ins | RX_CRC_InMem); - outb(iobase + REG3, inb(iobase + REG3) & 0x3f /* XXX constants. */ ); - outb(iobase + CMD_REG, Bank1_Sel); - outb(iobase + INT_NO_REG, (inb(iobase + INT_NO_REG) & 0xf8) | sc->irq2ee[sc->irq_no]); + CSR_WRITE_1(sc, REG1, CSR_READ_1(sc, REG1) | Tx_Chn_Int_Md | Tx_Chn_ErStp | Disc_Bad_Fr); + CSR_WRITE_1(sc, REG2, CSR_READ_1(sc, REG2) | No_SA_Ins | RX_CRC_InMem); + CSR_WRITE_1(sc, REG3, CSR_READ_1(sc, REG3) & 0x3f /* XXX constants. */ ); + CSR_WRITE_1(sc, CMD_REG, Bank1_Sel); + CSR_WRITE_1(sc, INT_NO_REG, (CSR_READ_1(sc, INT_NO_REG) & 0xf8) | sc->irq2ee[sc->irq_no]); /* * Divide the available memory in the card into rcv and xmt buffers. @@ -342,26 +324,26 @@ sc->rx_upper_limit = sc->rx_mem_size - 2; sc->tx_lower_limit = sc->rx_mem_size; sc->tx_upper_limit = sc->mem_size - 2; - outb(iobase + RCV_LOWER_LIMIT_REG, sc->rx_lower_limit >> 8); - outb(iobase + RCV_UPPER_LIMIT_REG, sc->rx_upper_limit >> 8); - outb(iobase + XMT_LOWER_LIMIT_REG, sc->tx_lower_limit >> 8); - outb(iobase + XMT_UPPER_LIMIT_REG, sc->tx_upper_limit >> 8); + CSR_WRITE_1(sc, RCV_LOWER_LIMIT_REG, sc->rx_lower_limit >> 8); + CSR_WRITE_1(sc, RCV_UPPER_LIMIT_REG, sc->rx_upper_limit >> 8); + CSR_WRITE_1(sc, XMT_LOWER_LIMIT_REG, sc->tx_lower_limit >> 8); + CSR_WRITE_1(sc, XMT_UPPER_LIMIT_REG, sc->tx_upper_limit >> 8); /* * Enable receive and transmit interrupts, and clear any pending int. */ - outb(iobase + REG1, inb(iobase + REG1) | TriST_INT); - outb(iobase + CMD_REG, Bank0_Sel); - outb(iobase + MASK_REG, All_Int & ~(Rx_Int | Tx_Int)); - outb(iobase + STATUS_REG, All_Int); + CSR_WRITE_1(sc, REG1, CSR_READ_1(sc, REG1) | TriST_INT); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, MASK_REG, All_Int & ~(Rx_Int | Tx_Int)); + CSR_WRITE_1(sc, STATUS_REG, All_Int); /* * Initialize receive and transmit ring buffers. */ - outw(iobase + RCV_BAR, sc->rx_lower_limit); + CSR_WRITE_2(sc, RCV_BAR, sc->rx_lower_limit); sc->rx_head = sc->rx_lower_limit; - outw(iobase + RCV_STOP_REG, sc->rx_upper_limit | 0xfe); - outw(iobase + XMT_BAR, sc->tx_lower_limit); + CSR_WRITE_2(sc, RCV_STOP_REG, sc->rx_upper_limit | 0xfe); + CSR_WRITE_2(sc, XMT_BAR, sc->tx_lower_limit); sc->tx_head = sc->tx_tail = sc->tx_lower_limit; ifp->if_flags |= IFF_RUNNING; @@ -373,9 +355,9 @@ /* * Final reset of the board, and enable operation. */ - outb(iobase + CMD_REG, Sel_Reset_CMD); + CSR_WRITE_1(sc, CMD_REG, Sel_Reset_CMD); DELAY(2); - outb(iobase + CMD_REG, Rcv_Enable_CMD); + CSR_WRITE_1(sc, CMD_REG, Rcv_Enable_CMD); ex_start(ifp); splx(s); @@ -388,7 +370,6 @@ ex_start(struct ifnet *ifp) { struct ex_softc * sc = ifp->if_softc; - int iobase = sc->iobase; int i, s, len, data_len, avail, dest, next; unsigned char tmp16[2]; struct mbuf * opkt; @@ -445,7 +426,7 @@ * routines. * XXX Is this necessary with splimp() enabled? */ - outb(iobase + MASK_REG, All_Int); + CSR_WRITE_1(sc, MASK_REG, All_Int); #endif /* @@ -471,52 +452,51 @@ */ DODEBUG(Sent_Pkts, printf("2. dest=%d, next=%d. ", dest, next);); - outw(iobase + HOST_ADDR_REG, dest); - outw(iobase + IO_PORT_REG, Transmit_CMD); - outw(iobase + IO_PORT_REG, 0); - outw(iobase + IO_PORT_REG, next); - outw(iobase + IO_PORT_REG, data_len); + CSR_WRITE_2(sc, HOST_ADDR_REG, dest); + CSR_WRITE_2(sc, IO_PORT_REG, Transmit_CMD); + CSR_WRITE_2(sc, IO_PORT_REG, 0); + CSR_WRITE_2(sc, IO_PORT_REG, next); + CSR_WRITE_2(sc, IO_PORT_REG, data_len); /* * Output the packet data to the card. Ensure all * transfers are 16-bit wide, even if individual * mbufs have odd length. */ - for (m = opkt, i = 0; m != NULL; m = m->m_next) { DODEBUG(Sent_Pkts, printf("[%d]", m->m_len);); if (i) { tmp16[1] = *(mtod(m, caddr_t)); - outsw(iobase + IO_PORT_REG, tmp16, 1); + CSR_WRITE_MULTI_2(sc, IO_PORT_REG, + (uint16_t *) tmp16, 1); } - outsw(iobase + IO_PORT_REG, - mtod(m, caddr_t) + i, (m->m_len - i) / 2); - + CSR_WRITE_MULTI_2(sc, IO_PORT_REG, + (uint16_t *) (mtod(m, caddr_t) + i), + (m->m_len - i) / 2); if ((i = (m->m_len - i) & 1) != 0) { tmp16[0] = *(mtod(m, caddr_t) + m->m_len - 1); } } - if (i) { - outsw(iobase + IO_PORT_REG, tmp16, 1); - } - + if (i) + CSR_WRITE_MULTI_2(sc, IO_PORT_REG, + (uint16_t *) tmp16, 1); /* * If there were other frames chained, update the * chain in the last one. */ if (sc->tx_head != sc->tx_tail) { if (sc->tx_tail != dest) { - outw(iobase + HOST_ADDR_REG, + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_last + XMT_Chain_Point); - outw(iobase + IO_PORT_REG, dest); + CSR_WRITE_2(sc, IO_PORT_REG, dest); } - outw(iobase + HOST_ADDR_REG, + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_last + XMT_Byte_Count); - i = inw(iobase + IO_PORT_REG); - outw(iobase + HOST_ADDR_REG, + i = CSR_READ_2(sc, IO_PORT_REG); + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_last + XMT_Byte_Count); - outw(iobase + IO_PORT_REG, i | Ch_bit); + CSR_WRITE_2(sc, IO_PORT_REG, i | Ch_bit); } /* @@ -527,17 +507,17 @@ * - Send Transmit or Resume_XMT command, as * appropriate. */ - inw(iobase + IO_PORT_REG); + CSR_READ_2(sc, IO_PORT_REG); #ifdef EX_PSA_INTR - outb(iobase + MASK_REG, All_Int & ~(Rx_Int | Tx_Int)); + CSR_WRITE_1(sc, MASK_REG, All_Int & ~(Rx_Int | Tx_Int)); #endif if (sc->tx_head == sc->tx_tail) { - outw(iobase + XMT_BAR, dest); - outb(iobase + CMD_REG, Transmit_CMD); + CSR_WRITE_2(sc, XMT_BAR, dest); + CSR_WRITE_1(sc, CMD_REG, Transmit_CMD); sc->tx_head = dest; DODEBUG(Sent_Pkts, printf("Transmit\n");); } else { - outb(iobase + CMD_REG, Resume_XMT_List_CMD); + CSR_WRITE_1(sc, CMD_REG, Resume_XMT_List_CMD); DODEBUG(Sent_Pkts, printf("Resume\n");); } @@ -563,8 +543,7 @@ void ex_stop(struct ex_softc *sc) { - int iobase = sc->iobase; - + DODEBUG(Start_End, printf("ex_stop%d: start\n", unit);); /* @@ -574,15 +553,15 @@ * - Mask and clear all interrupts. * - Reset the 82595. */ - outb(iobase + CMD_REG, Bank1_Sel); - outb(iobase + REG1, inb(iobase + REG1) & ~TriST_INT); - outb(iobase + CMD_REG, Bank0_Sel); - outb(iobase + CMD_REG, Rcv_Stop); + CSR_WRITE_1(sc, CMD_REG, Bank1_Sel); + CSR_WRITE_1(sc, REG1, CSR_READ_1(sc, REG1) & ~TriST_INT); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, CMD_REG, Rcv_Stop); sc->tx_head = sc->tx_tail = sc->tx_lower_limit; sc->tx_last = 0; /* XXX I think these two lines are not necessary, because ex_init will always be called again to reinit the interface. */ - outb(iobase + MASK_REG, All_Int); - outb(iobase + STATUS_REG, All_Int); - outb(iobase + CMD_REG, Reset_CMD); + CSR_WRITE_1(sc, MASK_REG, All_Int); + CSR_WRITE_1(sc, STATUS_REG, All_Int); + CSR_WRITE_1(sc, CMD_REG, Reset_CMD); DELAY(200); DODEBUG(Start_End, printf("ex_stop%d: finish\n", unit);); @@ -593,44 +572,37 @@ void ex_intr(void *arg) { - struct ex_softc * sc = (struct ex_softc *)arg; - struct ifnet * ifp = &sc->arpcom.ac_if; - int iobase = sc->iobase; - int int_status, send_pkts; + struct ex_softc *sc = (struct ex_softc *)arg; + struct ifnet *ifp = &sc->arpcom.ac_if; + int int_status, send_pkts; + int loops = 100; DODEBUG(Start_End, printf("ex_intr%d: start\n", unit);); -#ifdef EXDEBUG - if (++exintr_count != 1) - printf("WARNING: nested interrupt (%d). Mail the author.\n", exintr_count); -#endif - send_pkts = 0; - while ((int_status = inb(iobase + STATUS_REG)) & (Tx_Int | Rx_Int)) { + while (loops-- > 0 && + (int_status = CSR_READ_1(sc, STATUS_REG)) & (Tx_Int | Rx_Int)) { + /* don't loop forever */ + if (int_status == 0xff) + break; if (int_status & Rx_Int) { - outb(iobase + STATUS_REG, Rx_Int); - + CSR_WRITE_1(sc, STATUS_REG, Rx_Int); ex_rx_intr(sc); } else if (int_status & Tx_Int) { - outb(iobase + STATUS_REG, Tx_Int); - + CSR_WRITE_1(sc, STATUS_REG, Tx_Int); ex_tx_intr(sc); send_pkts = 1; } } + if (loops == 0) + printf("100 loops are not enough\n"); /* * If any packet has been transmitted, and there are queued packets to * be sent, attempt to send more packets to the network card. */ - - if (send_pkts && (ifp->if_snd.ifq_head != NULL)) { + if (send_pkts && (ifp->if_snd.ifq_head != NULL)) ex_start(ifp); - } - -#ifdef EXDEBUG - exintr_count--; -#endif DODEBUG(Start_End, printf("ex_intr%d: finish\n", unit);); @@ -641,7 +613,6 @@ ex_tx_intr(struct ex_softc *sc) { struct ifnet * ifp = &sc->arpcom.ac_if; - int iobase = sc->iobase; int tx_status; DODEBUG(Start_End, printf("ex_tx_intr%d: start\n", unit);); @@ -656,13 +627,13 @@ ifp->if_timer = 0; while (sc->tx_head != sc->tx_tail) { - outw(iobase + HOST_ADDR_REG, sc->tx_head); + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_head); - if (! inw(iobase + IO_PORT_REG) & Done_bit) + if (! CSR_READ_2(sc, IO_PORT_REG) & Done_bit) break; - tx_status = inw(iobase + IO_PORT_REG); - sc->tx_head = inw(iobase + IO_PORT_REG); + tx_status = CSR_READ_2(sc, IO_PORT_REG); + sc->tx_head = CSR_READ_2(sc, IO_PORT_REG); if (tx_status & TX_OK_bit) { ifp->if_opackets++; @@ -689,7 +660,6 @@ ex_rx_intr(struct ex_softc *sc) { struct ifnet * ifp = &sc->arpcom.ac_if; - int iobase = sc->iobase; int rx_status; int pkt_len; int QQQ; @@ -707,13 +677,13 @@ * Finally, advance receive stop limit in card's memory to new location. */ - outw(iobase + HOST_ADDR_REG, sc->rx_head); + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->rx_head); - while (inw(iobase + IO_PORT_REG) == RCV_Done) { + while (CSR_READ_2(sc, IO_PORT_REG) == RCV_Done) { - rx_status = inw(iobase + IO_PORT_REG); - sc->rx_head = inw(iobase + IO_PORT_REG); - QQQ = pkt_len = inw(iobase + IO_PORT_REG); + rx_status = CSR_READ_2(sc, IO_PORT_REG); + sc->rx_head = CSR_READ_2(sc, IO_PORT_REG); + QQQ = pkt_len = CSR_READ_2(sc, IO_PORT_REG); if (rx_status & RCV_OK_bit) { MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -743,11 +713,11 @@ * except for the last one in an odd-length packet. */ - insw(iobase + IO_PORT_REG, - mtod(m, caddr_t), m->m_len / 2); + CSR_READ_MULTI_2(sc, IO_PORT_REG, + mtod(m, uint16_t *), m->m_len / 2); if (m->m_len & 1) { - *(mtod(m, caddr_t) + m->m_len - 1) = inb(iobase + IO_PORT_REG); + *(mtod(m, caddr_t) + m->m_len - 1) = CSR_READ_1(sc, IO_PORT_REG); } pkt_len -= m->m_len; @@ -777,14 +747,14 @@ } else { ifp->if_ierrors++; } - outw(iobase + HOST_ADDR_REG, sc->rx_head); + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->rx_head); rx_another: ; } if (sc->rx_head < sc->rx_lower_limit + 2) - outw(iobase + RCV_STOP_REG, sc->rx_upper_limit); + CSR_WRITE_2(sc, RCV_STOP_REG, sc->rx_upper_limit); else - outw(iobase + RCV_STOP_REG, sc->rx_head - 2); + CSR_WRITE_2(sc, RCV_STOP_REG, sc->rx_head - 2); DODEBUG(Start_End, printf("ex_rx_intr%d: finish\n", unit);); @@ -855,8 +825,7 @@ { struct ifnet *ifp; struct ifmultiaddr *maddr; - u_int16_t *addr; - int iobase = sc->iobase; + uint16_t *addr; int count; int timeout, status; @@ -873,61 +842,61 @@ || count > 63) { /* Interface is in promiscuous mode or there are too many * multicast addresses for the card to handle */ - outb(iobase + CMD_REG, Bank2_Sel); - outb(iobase + REG2, inb(iobase + REG2) | Promisc_Mode); - outb(iobase + REG3, inb(iobase + REG3)); - outb(iobase + CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + CSR_WRITE_1(sc, REG2, CSR_READ_1(sc, REG2) | Promisc_Mode); + CSR_WRITE_1(sc, REG3, CSR_READ_1(sc, REG3)); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); } else if ((ifp->if_flags & IFF_MULTICAST) && (count > 0)) { /* Program multicast addresses plus our MAC address * into the filter */ - outb(iobase + CMD_REG, Bank2_Sel); - outb(iobase + REG2, inb(iobase + REG2) | Multi_IA); - outb(iobase + REG3, inb(iobase + REG3)); - outb(iobase + CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + CSR_WRITE_1(sc, REG2, CSR_READ_1(sc, REG2) | Multi_IA); + CSR_WRITE_1(sc, REG3, CSR_READ_1(sc, REG3)); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); /* Borrow space from TX buffer; this should be safe * as this is only called from ex_init */ - outw(iobase + HOST_ADDR_REG, sc->tx_lower_limit); - outw(iobase + IO_PORT_REG, MC_Setup_CMD); - outw(iobase + IO_PORT_REG, 0); - outw(iobase + IO_PORT_REG, 0); - outw(iobase + IO_PORT_REG, (count + 1) * 6); + CSR_WRITE_2(sc, HOST_ADDR_REG, sc->tx_lower_limit); + CSR_WRITE_2(sc, IO_PORT_REG, MC_Setup_CMD); + CSR_WRITE_2(sc, IO_PORT_REG, 0); + CSR_WRITE_2(sc, IO_PORT_REG, 0); + CSR_WRITE_2(sc, IO_PORT_REG, (count + 1) * 6); TAILQ_FOREACH(maddr, &ifp->if_multiaddrs, ifma_link) { if (maddr->ifma_addr->sa_family != AF_LINK) continue; - addr = (u_int16_t*)LLADDR((struct sockaddr_dl *) + addr = (uint16_t*)LLADDR((struct sockaddr_dl *) maddr->ifma_addr); - outw(iobase + IO_PORT_REG, *addr++); - outw(iobase + IO_PORT_REG, *addr++); - outw(iobase + IO_PORT_REG, *addr++); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); } /* Program our MAC address as well */ /* XXX: Is this necessary? The Linux driver does this * but the NetBSD driver does not */ - addr = (u_int16_t*)(&sc->arpcom.ac_enaddr); - outw(iobase + IO_PORT_REG, *addr++); - outw(iobase + IO_PORT_REG, *addr++); - outw(iobase + IO_PORT_REG, *addr++); + addr = (uint16_t*)(&sc->arpcom.ac_enaddr); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); + CSR_WRITE_2(sc, IO_PORT_REG, *addr++); - inw(iobase + IO_PORT_REG); - outw(iobase + XMT_BAR, sc->tx_lower_limit); - outb(iobase + CMD_REG, MC_Setup_CMD); + CSR_READ_2(sc, IO_PORT_REG); + CSR_WRITE_2(sc, XMT_BAR, sc->tx_lower_limit); + CSR_WRITE_1(sc, CMD_REG, MC_Setup_CMD); sc->tx_head = sc->tx_lower_limit; sc->tx_tail = sc->tx_head + XMT_HEADER_LEN + (count + 1) * 6; for (timeout=0; timeout<100; timeout++) { DELAY(2); - if ((inb(iobase + STATUS_REG) & Exec_Int) == 0) + if ((CSR_READ_1(sc, STATUS_REG) & Exec_Int) == 0) continue; - status = inb(iobase + CMD_REG); - outb(iobase + STATUS_REG, Exec_Int); + status = CSR_READ_1(sc, CMD_REG); + CSR_WRITE_1(sc, STATUS_REG, Exec_Int); break; } @@ -936,11 +905,11 @@ else { /* No multicast or promiscuous mode */ - outb(iobase + CMD_REG, Bank2_Sel); - outb(iobase + REG2, inb(iobase + REG2) & 0xDE); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + CSR_WRITE_1(sc, REG2, CSR_READ_1(sc, REG2) & 0xDE); /* ~(Multi_IA | Promisc_Mode) */ - outb(iobase + REG3, inb(iobase + REG3)); - outb(iobase + CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, REG3, CSR_READ_1(sc, REG3)); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); } } @@ -984,16 +953,16 @@ } static int -ex_get_media (u_int32_t iobase) +ex_get_media(struct ex_softc *sc) { int current; int media; - media = eeprom_read(iobase, EE_W5); + media = ex_eeprom_read(sc, EE_W5); - outb(iobase + CMD_REG, Bank2_Sel); - current = inb(iobase + REG3); - outb(iobase + CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + current = CSR_READ_1(sc, REG3); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); if ((current & TPE_bit) && (media & EE_W5_PORT_TPE)) return(IFM_ETHER|IFM_10_T); @@ -1007,7 +976,7 @@ } static int -ex_ifmedia_upd (ifp) +ex_ifmedia_upd(ifp) struct ifnet * ifp; { struct ex_softc * sc = ifp->if_softc; @@ -1025,47 +994,46 @@ { struct ex_softc * sc = ifp->if_softc; - ifmr->ifm_active = ex_get_media(sc->iobase); + ifmr->ifm_active = ex_get_media(sc); ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE; return; } u_short -eeprom_read(u_int32_t iobase, int location) +ex_eeprom_read(struct ex_softc *sc, int location) { int i; u_short data = 0; - int ee_addr; int read_cmd = location | EE_READ_CMD; short ctrl_val = EECS; - ee_addr = iobase + EEPROM_REG; - outb(iobase + CMD_REG, Bank2_Sel); - outb(ee_addr, EECS); + CSR_WRITE_1(sc, CMD_REG, Bank2_Sel); + CSR_WRITE_1(sc, EEPROM_REG, EECS); for (i = 8; i >= 0; i--) { short outval = (read_cmd & (1 << i)) ? ctrl_val | EEDI : ctrl_val; - outb(ee_addr, outval); - outb(ee_addr, outval | EESK); + CSR_WRITE_1(sc, EEPROM_REG, outval); + CSR_WRITE_1(sc, EEPROM_REG, outval | EESK); DELAY(3); - outb(ee_addr, outval); + CSR_WRITE_1(sc, EEPROM_REG, outval); DELAY(2); } - outb(ee_addr, ctrl_val); + CSR_WRITE_1(sc, EEPROM_REG, ctrl_val); for (i = 16; i > 0; i--) { - outb(ee_addr, ctrl_val | EESK); + CSR_WRITE_1(sc, EEPROM_REG, ctrl_val | EESK); DELAY(3); - data = (data << 1) | ((inb(ee_addr) & EEDO) ? 1 : 0); - outb(ee_addr, ctrl_val); + data = (data << 1) | + ((CSR_READ_1(sc, EEPROM_REG) & EEDO) ? 1 : 0); + CSR_WRITE_1(sc, EEPROM_REG, ctrl_val); DELAY(2); } ctrl_val &= ~EECS; - outb(ee_addr, ctrl_val | EESK); + CSR_WRITE_1(sc, EEPROM_REG, ctrl_val | EESK); DELAY(3); - outb(ee_addr, ctrl_val); + CSR_WRITE_1(sc, EEPROM_REG, ctrl_val); DELAY(2); - outb(iobase + CMD_REG, Bank0_Sel); + CSR_WRITE_1(sc, CMD_REG, Bank0_Sel); return(data); } ==== //depot/projects/netperf_socket/sys/dev/ex/if_ex_isa.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:04:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A051416A4D1; Mon, 28 Jun 2004 04:04:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73CD016A4DE for ; Mon, 28 Jun 2004 04:04:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C6B443D1F for ; Mon, 28 Jun 2004 04:04:15 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S44Fm7033524 for ; Mon, 28 Jun 2004 04:04:15 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S44F8M033520 for perforce@freebsd.org; Mon, 28 Jun 2004 04:04:15 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:04:15 GMT Message-Id: <200406280404.i5S44F8M033520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:04:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=55966 Change 55966 by marcel@marcel_nfs on 2004/06/28 04:03:26 We don't need ps_p{d|t}read() and ps_p{d|t}write(). They exist on Solaris only for backward compatibility. Even on Solaris it's documented that they are equivalent to ps_pread() and ps_pwrite()i, which we didn't even had... Affected files ... .. //depot/projects/gdb/include/proc_service.h#3 edit Differences ... ==== //depot/projects/gdb/include/proc_service.h#3 (text+ko) ==== @@ -53,14 +53,12 @@ ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t); ps_err_e ps_pcontinue(struct ps_prochandle *); ps_err_e ps_pdmodel(struct ps_prochandle *, int *); -ps_err_e ps_pdread(struct ps_prochandle *, psaddr_t, void *, size_t); -ps_err_e ps_pdwrite(struct ps_prochandle *, psaddr_t, const void *, size_t); ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *, psaddr_t *); void ps_plog(const char *, ...); +ps_err_e ps_pread(struct ps_prochandle *, psaddr_t, void *, size_t); ps_err_e ps_pstop(struct ps_prochandle *); -ps_err_e ps_ptread(struct ps_prochandle *, psaddr_t, void *, size_t); -ps_err_e ps_ptwrite(struct ps_prochandle *, psaddr_t, const void *, size_t); +ps_err_e ps_pwrite(struct ps_prochandle *, psaddr_t, const void *, size_t); __END_DECLS #endif /* _PROC_SERVICE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:05:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8986E16A4D0; Mon, 28 Jun 2004 04:05:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B3F416A4CE for ; Mon, 28 Jun 2004 04:05:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C8DC43D31 for ; Mon, 28 Jun 2004 04:05:17 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S45HEV033599 for ; Mon, 28 Jun 2004 04:05:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S45G0t033596 for perforce@freebsd.org; Mon, 28 Jun 2004 04:05:16 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:05:16 GMT Message-Id: <200406280405.i5S45G0t033596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:05:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55967 Change 55967 by marcel@marcel_nfs on 2004/06/28 04:05:05 Follow davidxu@ and add _libc_r_debug. Affected files ... .. //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#3 edit Differences ... ==== //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#3 (text+ko) ==== @@ -1180,6 +1180,15 @@ #endif ; +/* + * libthread_db.so support. + */ +SCLASS int _libc_r_debug +#ifdef GLOBAL_PTHREAD_PRIVATE += 0 +#endif +; + /* Undefine the storage class specifier: */ #undef SCLASS From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:06:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8180716A4D0; Mon, 28 Jun 2004 04:06:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D1C816A4CE for ; Mon, 28 Jun 2004 04:06:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 405D643D3F for ; Mon, 28 Jun 2004 04:06:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S46JTC033727 for ; Mon, 28 Jun 2004 04:06:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S46Ilg033723 for perforce@freebsd.org; Mon, 28 Jun 2004 04:06:18 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:06:18 GMT Message-Id: <200406280406.i5S46Ilg033723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:06:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=55969 Change 55969 by marcel@marcel_nfs on 2004/06/28 04:05:58 Add _libthr_debug. Affected files ... .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#6 edit Differences ... ==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#6 (text+ko) ==== @@ -732,6 +732,15 @@ #endif ; +/* + * libthread_db.so support. + */ +SCLASS int _libthr_debug +#ifdef GLOBAL_PTHREAD_PRIVATE += 0 +#endif +; + /* Undefine the storage class specifier: */ #undef SCLASS From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:13:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99AD416A4D0; Mon, 28 Jun 2004 04:13:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7424216A4CE for ; Mon, 28 Jun 2004 04:13:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AD9643D41 for ; Mon, 28 Jun 2004 04:13:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S4DSPS033870 for ; Mon, 28 Jun 2004 04:13:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S4DS0D033867 for perforce@freebsd.org; Mon, 28 Jun 2004 04:13:28 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:13:28 GMT Message-Id: <200406280413.i5S4DS0D033867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:13:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=55970 Change 55970 by marcel@marcel_nfs on 2004/06/28 04:12:48 Submit the result of me fucking around a bit: o Add td_ta_delete() o Make this WARNS 4 clean. This basicly means adding __unused to most of the argument of the functions I haven't implemented yet. o Detect libc_r and libthr. I don't worry about libkse, because davidxu@ is playing with that. We probably need to combine our efforts... o Implement some of the functions that GDB already needs. In particular I see td_ta_thr_iter() play a pivoting role... Affected files ... .. //depot/projects/gdb/lib/libthread_db/Makefile#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_delete.c#1 add .. //depot/projects/gdb/lib/libthread_db/td_ta_event_addr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_event_getmsg.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_map_id2thr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_map_lwp2thr.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_new.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_set_event.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_event_enable.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_getfpregs.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_getgregs.c#2 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_setfpregs.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_setgregs.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_validate.c#2 edit .. //depot/projects/gdb/lib/libthread_db/thread_db.h#4 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/Makefile#2 (text+ko) ==== @@ -2,11 +2,13 @@ LIB= thread_db SHLIB_MAJOR= 1 -SRCS= td_init.c td_ta_event_addr.c td_ta_event_getmsg.c td_ta_map_id2thr.c \ - td_ta_map_lwp2thr.c td_ta_new.c td_ta_set_event.c td_ta_thr_iter.c \ - td_thr_event_enable.c td_thr_get_info.c td_thr_getfpregs.c \ - td_thr_getgregs.c td_thr_setfpregs.c td_thr_setgregs.c \ - td_thr_validate.c +SRCS= td_init.c td_ta_delete.c td_ta_event_addr.c td_ta_event_getmsg.c \ + td_ta_map_id2thr.c td_ta_map_lwp2thr.c td_ta_new.c td_ta_set_event.c \ + td_ta_thr_iter.c td_thr_event_enable.c td_thr_get_info.c \ + td_thr_getfpregs.c td_thr_getgregs.c td_thr_setfpregs.c \ + td_thr_setgregs.c td_thr_validate.c INCS= thread_db.h +WARNS?= 4 + .include ==== //depot/projects/gdb/lib/libthread_db/td_ta_event_addr.c#2 (text+ko) ==== @@ -31,8 +31,8 @@ #include td_err_e -td_ta_event_addr(const td_thragent_t *ta, td_thr_events_e event, - td_notify_t *n) +td_ta_event_addr(const td_thragent_t *ta __unused, + td_thr_events_e event __unused, td_notify_t *n __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_event_getmsg.c#2 (text+ko) ==== @@ -31,7 +31,8 @@ #include td_err_e -td_ta_event_getmsg(const td_thragent_t *ta, td_event_msg_t *msg) +td_ta_event_getmsg(const td_thragent_t *ta __unused, + td_event_msg_t *msg __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_map_id2thr.c#2 (text+ko) ==== @@ -31,7 +31,8 @@ #include td_err_e -td_ta_map_id2thr(const td_thragent_t *ta, thread_t tid, td_thrhandle_t *th) +td_ta_map_id2thr(const td_thragent_t *ta __unused, thread_t tid __unused, + td_thrhandle_t *th __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_map_lwp2thr.c#2 (text+ko) ==== @@ -30,8 +30,25 @@ #include #include +#include "thread_db_int.h" + td_err_e -td_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t pid, td_thrhandle_t *th) +td_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwp, td_thrhandle_t *th) { - return (TD_OK); + ps_err_e err; + + th->th_ta = ta; + + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_run, + &th->th_thread, sizeof(psaddr_t)); + return (err == PS_OK) ? TD_OK : TD_ERR; + case PTHREAD_LIBKSE: + lwp = 0; + return (TD_NOTHR); + case PTHREAD_LIBTHR: + return (TD_NOTHR); + } + return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_new.c#2 (text+ko) ==== @@ -28,10 +28,98 @@ __FBSDID("$FreeBSD$"); #include +#include #include +#include "thread_db_int.h" + +static td_err_e +td_ta_new_libc_r(td_thragent_t *ta) +{ + psaddr_t addr; + ps_err_e err; + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_list", + &ta->ta.libc_r.thread_list); + if (err != PS_OK) + return (TD_ERR); + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_run", + &ta->ta.libc_r.thread_run); + if (err != PS_OK) + return (TD_ERR); + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_next_offset", + &addr); + if (err != PS_OK) + return (TD_ERR); + err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.offset_next, + sizeof(int)); + if (err != PS_OK) + return (TD_ERR); + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_uniqueid_offset", + &addr); + if (err != PS_OK) + return (TD_ERR); + err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.offset_uniqueid, + sizeof(int)); + if (err != PS_OK) + return (TD_ERR); + + return (TD_OK); +} + +static td_err_e +td_ta_new_libkse(td_thragent_t *ta __unused) +{ + return (TD_OK); +} + +static td_err_e +td_ta_new_libthr(td_thragent_t *ta __unused) +{ + return (TD_OK); +} + td_err_e td_ta_new(struct ps_prochandle *ph, td_thragent_t **ta_p) { - return (TD_OK); + ps_err_e ps_err; + td_err_e td_err; + + *ta_p = malloc(sizeof(td_thragent_t)); + if (*ta_p == NULL) + return (TD_MALLOC); + + (*ta_p)->ta_ph = ph; + + ps_err = ps_pglobal_lookup(ph, NULL, "_libkse_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBKSE; + td_err = td_ta_new_libkse(*ta_p); + goto out; + } + + ps_err = ps_pglobal_lookup(ph, NULL, "_libthr_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBTHR; + td_err = td_ta_new_libthr(*ta_p); + goto out; + } + + ps_err = ps_pglobal_lookup(ph, NULL, "_libc_r_debug", + &(*ta_p)->ta_debug); + if (ps_err == PS_OK) { + (*ta_p)->ta_lib = PTHREAD_LIBC_R; + td_err = td_ta_new_libc_r(*ta_p); + goto out; + } + td_err = TD_NOLIBTHREAD; + + out: + if (td_err != TD_OK) + free(*ta_p); + return (td_err); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_set_event.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include td_err_e -td_ta_set_event(const td_thragent_t *ta, td_thr_events_t *ev) +td_ta_set_event(const td_thragent_t *ta __unused, td_thr_events_t *ev __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#2 (text+ko) ==== @@ -30,9 +30,38 @@ #include #include +#include "thread_db_int.h" + td_err_e td_ta_thr_iter(const td_thragent_t *ta, td_thr_iter_f *cb, void *data, td_thr_state_e state, int pri, sigset_t *mask, unsigned int flags) { - return (TD_OK); + td_thrhandle_t th; + psaddr_t addr; + ps_err_e err; + + th.th_ta = ta; + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_list, + &th.th_thread, sizeof(th.th_thread)); + if (err != PS_OK) + return (TD_ERR); + while (th.th_thread != NULL) { + if (cb(&th, data) != 0) + return (TD_OK); + addr = th.th_thread + ta->ta.libc_r.offset_next; + err = ps_pread(ta->ta_ph, addr, &th.th_thread, + sizeof(th.th_thread)); + if (err != PS_OK) + return (TD_ERR); + } + return (TD_OK); + case PTHREAD_LIBKSE: + err = (state || pri || mask || flags) ? TD_OK : TD_ERR; + return (TD_NOTHR); + case PTHREAD_LIBTHR: + return (TD_NOTHR); + } + return (TD_ERR); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_event_enable.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include td_err_e -td_thr_event_enable(const td_thrhandle_t *th, int oo) +td_thr_event_enable(const td_thrhandle_t *th __unused, int oo __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#2 (text+ko) ==== @@ -30,8 +30,26 @@ #include #include +#include "thread_db_int.h" + td_err_e td_thr_get_info(const td_thrhandle_t *th, td_thrinfo_t *ti) { + const td_thragent_t *ta; + psaddr_t addr; + ps_err_e err; + + ta = th->th_ta; + ti->ti_ta = ta; + switch (ta->ta_lib) { + case PTHREAD_LIBC_R: + addr = th->th_thread + ta->ta.libc_r.offset_uniqueid; + err = ps_pread(ta->ta_ph, addr, &ti->ti_tid, + sizeof(thread_t)); + ti->ti_tid++; + return (err == PS_OK) ? TD_OK : TD_ERR; + default: + break; + } return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_getfpregs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include td_err_e -td_thr_getfpregs(const td_thrhandle_t *th, prfpregset_t *r) +td_thr_getfpregs(const td_thrhandle_t *th __unused, prfpregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_getgregs.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include td_err_e -td_thr_getgregs(const td_thrhandle_t *th, prgregset_t *r) +td_thr_getgregs(const td_thrhandle_t *th __unused, prgregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_setfpregs.c#3 (text+ko) ==== @@ -31,7 +31,8 @@ #include td_err_e -td_thr_setfpregs(const td_thrhandle_t *th, const prfpregset_t *r) +td_thr_setfpregs(const td_thrhandle_t *th __unused, + const prfpregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_setgregs.c#3 (text+ko) ==== @@ -31,7 +31,8 @@ #include td_err_e -td_thr_setgregs(const td_thrhandle_t *th, const prgregset_t *r) +td_thr_setgregs(const td_thrhandle_t *th __unused, + const prgregset_t *r __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/td_thr_validate.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #include td_err_e -td_thr_validate(const td_thrhandle_t *th) +td_thr_validate(const td_thrhandle_t *th __unused) { return (TD_OK); } ==== //depot/projects/gdb/lib/libthread_db/thread_db.h#4 (text+ko) ==== @@ -74,10 +74,14 @@ } td_thr_state_e; typedef intptr_t thread_t; /* Must be an integral type. */ -typedef intptr_t td_thrhandle_t; /* Used non-opaguely. */ + +typedef struct { + const td_thragent_t *th_ta; + psaddr_t th_thread; +} td_thrhandle_t; /* Used non-opaguely. */ typedef struct { - td_thragent_t *ti_ta_p; + const td_thragent_t *ti_ta; thread_t ti_tid; td_thr_state_e ti_state; lwpid_t ti_lid; @@ -161,6 +165,7 @@ __BEGIN_DECLS td_err_e td_init(void); +td_err_e td_ta_delete(td_thragent_t *); td_err_e td_ta_event_addr(const td_thragent_t *, td_thr_events_e, td_notify_t *); td_err_e td_ta_event_getmsg(const td_thragent_t *, td_event_msg_t *); From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:13:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9994116A4DA; Mon, 28 Jun 2004 04:13:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A35416A4F8 for ; Mon, 28 Jun 2004 04:13:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8E1B43D2F for ; Mon, 28 Jun 2004 04:13:28 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S4DSdi033877 for ; Mon, 28 Jun 2004 04:13:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S4DSdg033873 for perforce@freebsd.org; Mon, 28 Jun 2004 04:13:28 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:13:28 GMT Message-Id: <200406280413.i5S4DSdg033873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:13:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=55971 Change 55971 by marcel@marcel_nfs on 2004/06/28 04:13:20 Forgot to add the internal header. Affected files ... .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:23:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F8016A4D2; Mon, 28 Jun 2004 04:23:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8B0116A4CF for ; Mon, 28 Jun 2004 04:23:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4B0F43D4C for ; Mon, 28 Jun 2004 04:23:41 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S4NfCr034112 for ; Mon, 28 Jun 2004 04:23:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S4NfaF034109 for perforce@freebsd.org; Mon, 28 Jun 2004 04:23:41 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:23:41 GMT Message-Id: <200406280423.i5S4NfaF034109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=55972 Change 55972 by marcel@marcel_nfs on 2004/06/28 04:22:49 Add the getlwpid(2) syscall. The syscall return the TID of the thread that executes the syscall. The primary purpose of this syscall is to allow threading libraries to obtain the TID so that the debugger has a chance to associate threads with the NT_PRSTATUS notes in coredumps. For libc_r this mostly serves the purpose of being able to fill in the td_thrinfo_t structure correctly and to be able to pass the correct lwpid to the proc services provider when asking for the register context. For libthr this is more important in that it's the only way to associate the internal thread structures with the register context in the core file. davidxu@ has been using the mailbox to pass this information to libkse, so he may find the syscall useful as well. Affected files ... .. //depot/projects/gdb/include/unistd.h#3 edit .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#7 edit .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#7 edit .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#7 edit .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#7 edit .. //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#6 edit .. //depot/projects/gdb/sys/kern/init_sysent.c#7 edit .. //depot/projects/gdb/sys/kern/kern_prot.c#6 edit .. //depot/projects/gdb/sys/kern/syscalls.c#7 edit .. //depot/projects/gdb/sys/kern/syscalls.master#7 edit .. //depot/projects/gdb/sys/sys/syscall.h#7 edit .. //depot/projects/gdb/sys/sys/syscall.mk#7 edit .. //depot/projects/gdb/sys/sys/sysproto.h#7 edit Differences ... ==== //depot/projects/gdb/include/unistd.h#3 (text+ko) ==== @@ -48,6 +48,11 @@ #define _GID_T_DECLARED #endif +#ifndef _LWPID_T_DECLARED +typedef __lwpid_t lwpid_t; +#define _LWPID_T_DECLARED +#endif + #ifndef _OFF_T_DECLARED typedef __off_t off_t; #define _OFF_T_DECLARED @@ -340,6 +345,7 @@ gid_t getgid(void); int getgroups(int, gid_t []); char *getlogin(void); +lwpid_t getlwpid(void); pid_t getpgrp(void); pid_t getpid(void); pid_t getppid(void); ==== //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp */ ==== //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp */ @@ -301,4 +301,5 @@ #define FREEBSD32_SYS_jail_attach 436 #define FREEBSD32_SYS_thr_suspend 442 #define FREEBSD32_SYS_thr_wake 443 -#define FREEBSD32_SYS_MAXSYSCALL 444 +#define FREEBSD32_SYS_getlwpid 444 +#define FREEBSD32_SYS_MAXSYSCALL 445 ==== //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp */ @@ -451,4 +451,5 @@ "#441", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ + "getlwpid", /* 444 = getlwpid */ }; ==== //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp */ @@ -469,4 +469,5 @@ { 0, (sy_call_t *)nosys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ + { SYF_MPSAFE | 0, (sy_call_t *)getlwpid }, /* 444 = getlwpid */ }; ==== //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -609,3 +609,4 @@ 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } 443 MNOPROTO { int thr_wake(thr_id_t id); } +444 MNOPROTO { lwpid_t getlwpid(void); } ==== //depot/projects/gdb/sys/kern/init_sysent.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.172 2004/06/22 04:36:24 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -472,4 +472,5 @@ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ + { SYF_MPSAFE | 0, (sy_call_t *)getlwpid }, /* 444 = getlwpid */ }; ==== //depot/projects/gdb/sys/kern/kern_prot.c#6 (text+ko) ==== @@ -70,6 +70,23 @@ "BSD security policy"); #ifndef _SYS_SYSPROTO_H_ +struct getlwpid_args { + int dummy; +}; +#endif +/* + * MPSAFE + */ +/* ARGSUSED */ +int +getlwpid(struct thread *td, struct getlwpid_args *uap) +{ + + td->td_retval[0] = td->td_tid; + return (0); +} + +#ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; }; ==== //depot/projects/gdb/sys/kern/syscalls.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.158 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -451,4 +451,5 @@ "ksem_timedwait", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ + "getlwpid", /* 444 = getlwpid */ }; ==== //depot/projects/gdb/sys/kern/syscalls.master#7 (text+ko) ==== @@ -631,5 +631,6 @@ 441 MNOSTD { int ksem_timedwait(semid_t id, struct timespec *abstime); } 442 MSTD { int thr_suspend(const struct timespec *timeout); } 443 MSTD { int thr_wake(thr_id_t id); } +444 MSTD { lwpid_t getlwpid(void); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/gdb/sys/sys/syscall.h#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.156 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -356,4 +356,5 @@ #define SYS_ksem_timedwait 441 #define SYS_thr_suspend 442 #define SYS_thr_wake 443 -#define SYS_MAXSYSCALL 444 +#define SYS_getlwpid 444 +#define SYS_MAXSYSCALL 445 ==== //depot/projects/gdb/sys/sys/syscall.mk#7 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.111 2004/06/22 04:36:25 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp MIASM = \ syscall.o \ @@ -297,4 +297,5 @@ kse_switchin.o \ ksem_timedwait.o \ thr_suspend.o \ - thr_wake.o + thr_wake.o \ + getlwpid.o ==== //depot/projects/gdb/sys/sys/sysproto.h#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.155 2004/06/22 04:36:25 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ @@ -1303,6 +1303,9 @@ struct thr_wake_args { char id_l_[PADL_(thr_id_t)]; thr_id_t id; char id_r_[PADR_(thr_id_t)]; }; +struct getlwpid_args { + register_t dummy; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1597,6 +1600,7 @@ int ksem_timedwait(struct thread *, struct ksem_timedwait_args *); int thr_suspend(struct thread *, struct thr_suspend_args *); int thr_wake(struct thread *, struct thr_wake_args *); +int getlwpid(struct thread *, struct getlwpid_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:34:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F35AA16A4D1; Mon, 28 Jun 2004 04:34:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9F4A16A4CE for ; Mon, 28 Jun 2004 04:34:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DA4F43D1D for ; Mon, 28 Jun 2004 04:34:55 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S4Yt2Y034417 for ; Mon, 28 Jun 2004 04:34:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S4Ytpg034414 for perforce@freebsd.org; Mon, 28 Jun 2004 04:34:55 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:34:55 GMT Message-Id: <200406280434.i5S4Ytpg034414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=55973 Change 55973 by marcel@marcel_nfs on 2004/06/28 04:34:18 Have libthr() call getlwpid() and save the LWP in the thread structure. Rename uniqueid to lwpid. The use of uniqueid was simply copied from libc_r. Note that libthr uses a thread id (thr_id_t) that is the address of the kernel thread structure. This can be replaced in its entirety by using the lwpid. There is not performance loss. However, changing that would change the thr_* syscalls as well as the umtx_* functions and syscalls. This is a major ABI breakage and thus is not done. Affected files ... .. //depot/projects/gdb/lib/libthr/thread/thr_cond.c#5 edit .. //depot/projects/gdb/lib/libthr/thread/thr_create.c#5 edit .. //depot/projects/gdb/lib/libthr/thread/thr_init.c#5 edit .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#6 edit .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#7 edit Differences ... ==== //depot/projects/gdb/lib/libthr/thread/thr_cond.c#5 (text+ko) ==== @@ -440,10 +440,10 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->uniqueid); + pthread->name, pthread->lwpid); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->uniqueid); + pthread->name, pthread->lwpid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* ==== //depot/projects/gdb/lib/libthr/thread/thr_create.c#5 (text+ko) ==== @@ -43,11 +43,9 @@ #include "thr_private.h" #include "libc_private.h" -static u_int64_t next_uniqueid = 1; - #define OFF(f) offsetof(struct pthread, f) int _thread_next_offset = OFF(tle.tqe_next); -int _thread_uniqueid_offset = OFF(uniqueid); +int _thread_lwpid_offset = OFF(lwpid); int _thread_name_offset = OFF(name); int _thread_ctx_offset = OFF(ctx); #undef OFF @@ -137,12 +135,6 @@ } new_thread->active_priority = new_thread->base_priority; - /* - * Initialise the unique id which GDB uses to - * track threads. - */ - new_thread->uniqueid = next_uniqueid++; - THREAD_LIST_LOCK; /* Add the thread to the linked list of all threads: */ @@ -178,6 +170,9 @@ _thread_start(void) { + /* Initialise the unique id which GDB uses to track threads. */ + curthread->lwpid = getlwpid(); + /* Run the current thread's start routine with argument: */ pthread_exit(curthread->start_routine(curthread->arg)); ==== //depot/projects/gdb/lib/libthr/thread/thr_init.c#5 (text+ko) ==== @@ -304,6 +304,7 @@ /* Get our thread id. */ thr_self(&pthread->thr_id); + pthread->lwpid = getlwpid(); /* Find the stack top */ mib[0] = CTL_KERN; ==== //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#6 (text+ko) ==== @@ -800,10 +800,10 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->uniqueid); + pthread->name, pthread->lwpid); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->uniqueid); + pthread->name, pthread->lwpid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* * For the common case of all threads having equal priority, ==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#7 (text+ko) ==== @@ -470,8 +470,8 @@ */ #define PTHREAD_MAGIC ((u_int32_t) 0xd09ba115) u_int32_t magic; + lwpid_t lwpid; /* for gdb */ char *name; - u_int64_t uniqueid; /* for gdb */ thr_id_t thr_id; sigset_t savedsig; int signest; /* blocked signal netsting level */ From owner-p4-projects@FreeBSD.ORG Mon Jun 28 04:48:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1867C16A4D0; Mon, 28 Jun 2004 04:48:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF49B16A4CE for ; Mon, 28 Jun 2004 04:48:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C64B143D1F for ; Mon, 28 Jun 2004 04:48:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S4mERP034775 for ; Mon, 28 Jun 2004 04:48:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S4mDZB034772 for perforce@freebsd.org; Mon, 28 Jun 2004 04:48:13 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 04:48:13 GMT Message-Id: <200406280448.i5S4mDZB034772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55975 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 04:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=55975 Change 55975 by marcel@marcel_nfs on 2004/06/28 04:47:57 IFC @55968 Affected files ... .. //depot/projects/gdb/UPDATING#17 integrate .. //depot/projects/gdb/bin/ps/print.c#7 integrate .. //depot/projects/gdb/bin/ps/ps.c#15 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#5 integrate .. //depot/projects/gdb/contrib/isc-dhcp/CHANGES#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/COPYRIGHT#2 delete .. //depot/projects/gdb/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate .. //depot/projects/gdb/contrib/isc-dhcp/LICENSE#1 branch .. //depot/projects/gdb/contrib/isc-dhcp/Makefile#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/Makefile.conf#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/README#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/RELNOTES#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/clparse.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient-script.8#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient.8#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient.c#3 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient.conf.5#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/dhclient.leases.5#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/client/scripts/freebsd#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/alloc.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/bpf.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/comapi.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/conflex.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/ctrace.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/dhcp-eval.5#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/dhcp-options.5#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/discover.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/dispatch.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/dlpi.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/dns.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/ethernet.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/execute.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/fddi.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/icmp.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/inet.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/iscprint.c#1 branch .. //depot/projects/gdb/contrib/isc-dhcp/common/lpf.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/memory.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/nit.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/options.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/packet.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/parse.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/print.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/raw.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/resolv.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/socket.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/tables.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/tr.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/tree.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/common/upf.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/callback.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/cltest.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/dhcpctl.3#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/dhcpctl.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/dhcpctl.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/omshell.1#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/omshell.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dhcpctl/remote.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/base64.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/dst_api.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/dst_support.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/hmac_link.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/md5_dgst.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/md5_locl.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/dst/prandom.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/arpa/nameser.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/cdefs.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/cf/freebsd.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/ctrace.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/dhcp.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/dhcpd.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/dhctoken.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/failover.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/inet.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/int.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/lang.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/list.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/result.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/isc-dhcp/types.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/minires/minires.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/minires/res_update.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/minires/resolv.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/netinet/udp.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/alloc.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/buffer.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/convert.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/hash.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/omapip.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/omapip_p.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/omapip/trace.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/osdep.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/statement.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/tree.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/includes/version.h#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_date.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_name.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_parse.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_samedomain.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_sign.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/ns_verify.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_comp.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_findzonecut.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_init.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_mkquery.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_mkupdate.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_query.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_send.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_sendsigned.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/minires/res_update.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/Makefile.dist#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/alloc.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/array.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/auth.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/buffer.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/connection.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/convert.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/dispatch.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/errwarn.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/generic.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/handle.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/hash.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/listener.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/message.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/mrtrace.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/omapi.3#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/protocol.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/result.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/support.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/test.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/toisc.c#2 integrate .. //depot/projects/gdb/contrib/isc-dhcp/omapip/trace.c#2 integrate .. //depot/projects/gdb/etc/rc.shutdown#3 integrate .. //depot/projects/gdb/etc/rc.subr#7 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/doc/inc-hist.diff#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#5 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/doc/inc-hist.diff#1 branch .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#18 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#10 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.3#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#16 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_buffer.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_data_into_fd.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#17 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#15 integrate .. //depot/projects/gdb/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_open_file.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/gdb/lib/libthr/thread/Makefile.inc#5 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_atfork.c#1 branch .. //depot/projects/gdb/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_syscalls.c#4 integrate .. //depot/projects/gdb/share/examples/scsi_target/scsi_target.8#2 integrate .. //depot/projects/gdb/share/man/man4/pty.4#2 integrate .. //depot/projects/gdb/share/man/man9/style.9#4 integrate .. //depot/projects/gdb/sys/conf/NOTES#26 integrate .. //depot/projects/gdb/sys/conf/files#32 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#6 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/gdb/sys/conf/options#24 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/gdb/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/gdb/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#10 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#9 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#10 integrate .. //depot/projects/gdb/sys/dev/si/si.c#8 integrate .. //depot/projects/gdb/sys/dev/si/si.h#2 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#17 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#7 integrate .. //depot/projects/gdb/sys/dev/sx/sx.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/gdb/sys/dev/usb/devlist2h.awk#3 delete .. //depot/projects/gdb/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/if_udav.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ubser.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/gdb/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/umass.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/umct.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/ums.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/urio.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#15 delete .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#15 delete .. //depot/projects/gdb/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#6 integrate .. //depot/projects/gdb/sys/dev/zs/zs.c#8 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.c#7 integrate .. //depot/projects/gdb/sys/geom/geom_disk.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_io.c#5 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#8 integrate .. //depot/projects/gdb/sys/i386/i386/mem.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/gdb/sys/i386/include/float.h#4 integrate .. //depot/projects/gdb/sys/i386/include/proc.h#3 integrate .. //depot/projects/gdb/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_fork.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_jail.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_kse.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#18 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#11 integrate .. //depot/projects/gdb/sys/kern/tty.c#12 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#12 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#11 integrate .. //depot/projects/gdb/sys/modules/aue/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/axe/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/cue/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ep/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/kue/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/rue/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/udav/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/umass/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/umct/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ums/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/urio/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/usb/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uvscom/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_loop.c#6 integrate .. //depot/projects/gdb/sys/net/if_sl.c#8 integrate .. //depot/projects/gdb/sys/net/ppp_tty.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.h#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_sample.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_tee.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/gdb/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/gdb/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/gdb/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#14 integrate .. //depot/projects/gdb/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/gdb/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/iommu.c#5 integrate .. //depot/projects/gdb/sys/sys/linedisc.h#4 integrate .. //depot/projects/gdb/sys/sys/proc.h#19 integrate .. //depot/projects/gdb/sys/sys/procfs.h#4 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#9 integrate .. //depot/projects/gdb/sys/sys/tty.h#10 integrate .. //depot/projects/gdb/sys/sys/ttycom.h#7 integrate .. //depot/projects/gdb/sys/vm/vm_glue.c#9 integrate .. //depot/projects/gdb/sys/vm/vm_map.h#5 integrate .. //depot/projects/gdb/usr.bin/cut/cut.1#2 integrate .. //depot/projects/gdb/usr.bin/cut/cut.c#2 integrate .. //depot/projects/gdb/usr.bin/indent/args.c#4 integrate .. //depot/projects/gdb/usr.bin/indent/indent.c#3 integrate .. //depot/projects/gdb/usr.bin/indent/indent_globs.h#3 integrate .. //depot/projects/gdb/usr.bin/indent/io.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#8 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#18 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#10 integrate .. //depot/projects/gdb/usr.bin/tar/matching.c#6 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#9 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#6 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#13 integrate .. //depot/projects/gdb/usr.sbin/bluetooth/bcmfw/bcmfw.c#2 integrate .. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#3 integrate .. //depot/projects/gdb/usr.sbin/bluetooth/hccontrol/link_control.c#3 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.c#3 integrate .. //depot/projects/gdb/usr.sbin/ppp/radius.c#3 integrate Differences ... ==== //depot/projects/gdb/UPDATING#17 (text+ko) ==== @@ -1530,16 +1530,16 @@ [7] make buildworld [9] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - cp src/sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] + cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - cd src/sys/boot ; make install [6] + cd sys/boot ; make STRIP="" install [6] [1] [3] - /etc/rc.d/preseedrandom [10] + /usr/src/etc/rc.d/preseedrandom [10] mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] + mergemaster -i [4] Make sure that you've read the UPDATING file to understand the @@ -1609,7 +1609,13 @@ that is hard to boot to recover. [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. + cvs prune empty directories. Also, if CPUTYPE is defined in your + /etc/make.conf, make sure to use the "?=" instead of the "=" assignment + operator, so that buildworld can override the CPUTYPE if it needs to. + In case you would like to avoid installing new packages of everything, + you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x + compatibility libraries are build which should allow you to continue + using your existing software for a while. [10] In order to create temporary files, /dev/random must be initialized by feeding data into it. /etc/rc.d/preseedrandom @@ -1647,4 +1653,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.317 2004/06/23 01:32:28 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $ ==== //depot/projects/gdb/bin/ps/print.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); #include #include @@ -668,6 +668,9 @@ class = lpri->pri_class; level = lpri->pri_level; switch (class) { + case PRI_ITHD: + snprintf(str, sizeof(str), "intr:%u", level); + break; case PRI_REALTIME: snprintf(str, sizeof(str), "real:%u", level); break; ==== //depot/projects/gdb/bin/ps/ps.c#15 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $"); #include #include @@ -715,9 +715,10 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; ttypath = NULL; + pathbuf2[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -732,28 +733,35 @@ strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); ttypath = pathbuf; - if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; - if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* Check to see if /dev/tty${elem} exists */ + strlcpy(pathbuf2, _PATH_TTY, sizeof(pathbuf2)); + strlcat(pathbuf2, elem, sizeof(pathbuf2)); + if (stat(pathbuf2, &sb) == 0 && S_ISCHR(sb.st_mode)) { /* No need to repeat stat() && S_ISCHR() checks */ ttypath = NULL; break; } - /* /dev/${elem} does not exist, so try /dev/tty${elem} */ - strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); - strlcat(pathbuf, elem, sizeof(pathbuf)); break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); + if (pathbuf2[0] != '\0') + warn("%s and %s", pathbuf2, ttypath); + else + warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); + if (pathbuf2[0] != '\0') + warnx("%s and %s: Not a terminal", pathbuf2, + ttypath); + else + warnx("%s: Not a terminal", ttypath); optfatal = 1; return (0); } ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#5 (text+ko) ==== ==== //depot/projects/gdb/contrib/isc-dhcp/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=8 -$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.19 2004/01/19 22:07:59 mbr Exp $ +$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.21 2004/06/26 23:19:40 mbr Exp $ -ISC DHCP client 3.0.1rc12 +ISC DHCP client 3.0.1rc14 originals can be found at: ftp://ftp.isc.org/isc/dhcp/ @@ -27,8 +27,8 @@ Imported by: - cvs import -m 'Import ISC DHCP 3.0.1 RC11 client.' \ - src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc12 + cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \ + src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14 To make local changes to isc-dhcp, simply patch and commit to the main @@ -65,6 +65,8 @@ - Remove dhcpd from SEE ALSO section. common/dispatch.c r1.2 - interface polling + common/parse.c + r1.2 - 64bit time_t fix includes/dhcpd.h r1.5 - interface polling r1.4 - interface polling ==== //depot/projects/gdb/contrib/isc-dhcp/Makefile#2 (text+ko) ==== @@ -1,42 +1,32 @@ # Makefile # -# Copyright (c) 2002 Internet Software Consortium. -# All rights reserved. +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of Internet Software Consortium nor the names -# of its contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ # -# This software has been written for the Internet Software Consortium +# This software has been written for Internet Systems Consortium # by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -# To learn more about the Internet Software Consortium, see +# To learn more about Internet Systems Consortium, see # ``http://www.isc.org/''. To learn more about Vixie Enterprises, # see ``http://www.vix.com''. To learn more about Nominum, Inc., see # ``http://www.nominum.com''. -# all: @sysname=`./configure --print-sysname`; \ ==== //depot/projects/gdb/contrib/isc-dhcp/Makefile.conf#2 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.conf # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ ## Defaults... SCRIPT = none ==== //depot/projects/gdb/contrib/isc-dhcp/Makefile.dist#2 (text+ko) ==== @@ -1,21 +1,26 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ + SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl ==== //depot/projects/gdb/contrib/isc-dhcp/README#2 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - April 28, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 README FILE @@ -97,18 +96,16 @@ RELEASE STATUS -This is the twelfth release candidate of version 3.0.1 of the ISC DHCP -Distribution. Development of this release is approaching the point at -which it will be frozen, and no significant new features will be -added. +This is fourteenth release candidate of version 3.0.1 of the ISC DHCP +Distribution. In this release, the server and relay agent are currently fully functional on NetBSD, Linux systems with kernel version 2.2 or later, -FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The -software will also run on HP-UX, but only supports a single network -interface. Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but -are not in wide use, with all that implies. We are not aware of an -easy way to get this software running on HP-UX. +FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The software +will also run on HP-UX, but only supports a single network interface. +Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but are not in +wide use, with all that implies. We are not aware of an easy way to +get this software running on HP-UX. The DHCP client currently only knows how to configure the network on NetBSD, FreeBSD, OpenBSD, BSD/os, Linux, Solaris and NextStep. The @@ -143,14 +140,14 @@ To build the DHCP Distribution, unpack the compressed tar file using the tar utility and the gzip command - type something like: - zcat dhcp-3.0.1rc11.tar.gz |tar xvf - + zcat dhcp-3.0.1rc14.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. CONFIGURING IT -Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just +Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just created and configure the source tree by typing: ./configure @@ -466,14 +463,14 @@ client is different (not necessarily better or worse) than that of the ISC client, but in most cases it will be a lot easier for you to just use that. Please do not ask for help in using the Solaris DHCP client -on Internet Software Consortium mailing lists - that's why you're +on Internet Systems Consortium mailing lists - that's why you're paying Sun the big bucks. If you're having a problem with the Solaris client interoperating with the ISC dhcp server, that's another matter, but please check with Sun first. SUPPORT -The Internet Software Consortium DHCP server is not a commercial +The Internet Systems Consortium DHCP server is not a commercial product, and is not supported by the ISC. However, it has attracted a fairly sizable following on the Internet, which means that there are a lot of knowledgable users who may be able to help you if you get @@ -508,8 +505,8 @@ release and see if the bug is still in that version of the software, and if it's not, _then_ report it. It's okay to report bugs in the latest patchlevel of a major version that's not the most recent major -version, though - for example, if you're running 2.0, you don't have -to upgrade to 3.0 before you can report bugs. +version, though - for example, if you're running 3.0pl2, you don't have +to upgrade to a 3.0.1rc (release candidate) before you can report bugs. PLEASE DO NOT REPORT BUGS IF YOU ARE RUNNING A VERSION OF THE ISC DHCP DISTRIBUTION THAT YOU DIDN'T GET FROM THE ISC! Free operating @@ -639,7 +636,7 @@ dhcpcd, this is _not_ the ISC DHCP client, and we probably can't help you with it. -Please see http://www.isc.org/services/public/lists/dhcp-lists.html -for details on how to subscribe to the ISC DHCP mailing lists. +Please see http://www.isc.org/sw/dhcp/ for details on how to subscribe +to the ISC DHCP mailing lists. ==== //depot/projects/gdb/contrib/isc-dhcp/RELNOTES#2 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - June, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 Release Notes @@ -23,11 +22,9 @@ - Many bug fixes, performance enhancements, and minor new DHCP protocol features. -This is a release candidate for a minor bug fix release to follow ISC -DHCP 3.0. The main bug fixed here is a bug in the subclass allocation -code that could result in a memory smash. Any users of the ISC DHCP server -who are using subclasses should seriously consider upgrading to 3.0.1 -either now or when the final 3.0.1 release comes out. +The main bug fixed here is a bug in the subclass allocation code that +could result in a memory smash. Any users of the ISC DHCP server who +are using subclasses should seriously consider upgrading to 3.0.1. If you are running 3.0 beta 1 and are doing dynamic DNS updates, the lease file is no longer forward-compatible to 3.0 final. A script @@ -46,6 +43,55 @@ thanks to all of these good people here, both for working on the code and for prodding me into improving it. + Changes since 3.0.1rc13 + +! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed + in logging messages with excessively long hostnames provided by the + clients. It is highly probable that these could have been used by + attackers to gain arbitrary root access on systems using ISC DHCP 3.0.1 + release candidates 12 or 13. Special thanks to Gregory Duchemin for + both finding and solving the problem. + +! CAN-2004-0461 - CERT VU#654390: Once the above was closed, an opening + in log_*() functions was evidented, on some specific platforms where + vsnprintf() was not believed to be available and calls were wrapped to + sprintf() instead. Again, credit goes to Gregory Duchemin for finding + the problem. Calls to snprintf() are now linked to a distribution-local + snprintf implementation, only in those cases where the architecture is + not known to provide one (see includes/cf/[arch].h). If you experience + linking problems with snprintf/vsnprintf or 'isc_print_' functions, this + is where to look. This vulnerability did not exist in any previously + published version of ISC DHCP. + +- Compilation on hpux 11.11 was repaired. + +- 'The cross-compile bug fix' was backed out. + + Changes since 3.0.1rc12 + +- Fixed a bug in omapi lease lookup function, to form the hardware + address for the hash lookup correctly, thanks to a patch from + Richard Hirst. + +- Fixed a bug where dhcrelay was sending relayed responses back to the + broadcast address, but with the source's unicast mac address. Should + now conform to rfc2131 section 4.1. + +- Cross-compile bug fix; use $(AR) instead of ar. Thanks to Morten Brorup. + +- Fixed a crash bug in dhclient where dhcpd servers that do not provide + renewal times results in an FPE. As a side effect, dhclient can now + properly handle 0xFFFFFFFF (-1) expiry times supplied by servers. Thanks + to a patch from Burt Silverman. + +- The 'ping timeout' debugs from rc12 were removed to -DDEBUG only, + and reformatted to correct a compilation error on solaris platforms. + +- A patch was applied which fixes a case where leases read from the + leases database do not properly over-ride previously read leases. + +- dhcpctl.3 manpage was tweaked. + Changes since 3.0.1rc11 - A patch from Steve Campbell was applied with minor modifications to @@ -93,6 +139,9 @@ appear in a lease file. An option that might have been named "#144" is now "unknown-144". +- Another patch from Bill Stephens which allows the ping-check timeout to + be configured as 'ping-timeout'. Defaults to 1. + Changes since 3.0.1rc10 - Potential buffer overflows in minires repaired. ==== //depot/projects/gdb/contrib/isc-dhcp/client/Makefile.dist#2 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1996-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ CATMANPAGES = dhclient.cat8 dhclient.conf.cat5 dhclient-script.cat8 \ dhclient.leases.cat5 ==== //depot/projects/gdb/contrib/isc-dhcp/client/clparse.c#2 (text+ko) ==== @@ -3,39 +3,30 @@ Parser for dhclient config and lease files... */ /* - * Copyright (c) 1996-2002 Internet Software Consortium. - * All rights reserved. + * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 1996-2003 by Internet Software Consortium * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The Internet Software Consortium nor the names - * of its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Internet Systems Consortium, Inc. + * 950 Charter Street + * Redwood City, CA 94063 + * + * http://www.isc.org/ * - * This software has been written for the Internet Software Consortium + * This software has been written for Internet Systems Consortium * by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. - * To learn more about the Internet Software Consortium, see + * To learn more about Internet Systems Consortium, see * ``http://www.isc.org/''. To learn more about Vixie Enterprises, * see ``http://www.vix.com''. To learn more about Nominum, Inc., see * ``http://www.nominum.com''. @@ -43,8 +34,8 @@ #ifndef lint static char copyright[] = -"$Id: clparse.c,v 1.62.2.4 2003/02/10 00:39:57 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.11 2003/09/02 11:13:20 mbr Exp $\n"; +"$Id: clparse.c,v 1.62.2.6 2004/06/10 17:59:11 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n" +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.12 2004/06/26 10:37:41 mbr Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -842,7 +833,7 @@ struct parse *cfile; int is_static; { - struct client_lease *lease, *lp, *pl; + struct client_lease *lease, *lp, *pl, *next; struct interface_info *ip = (struct interface_info *)0; int token; const char *val; @@ -902,17 +893,19 @@ lease list looking for a lease with the same address, and if we find it, toss it. */ pl = (struct client_lease *)0; - for (lp = client -> leases; lp; lp = lp -> next) { + for (lp = client -> leases; lp; lp = next) { + next = lp -> next; if (lp -> address.len == lease -> address.len && !memcmp (lp -> address.iabuf, lease -> address.iabuf, lease -> address.len)) { if (pl) - pl -> next = lp -> next; + pl -> next = next; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 28 05:09:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FCD916A4D0; Mon, 28 Jun 2004 05:09:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B44A16A4CE for ; Mon, 28 Jun 2004 05:09:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BFF543D5A for ; Mon, 28 Jun 2004 05:09:42 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S59g1h035389 for ; Mon, 28 Jun 2004 05:09:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S59gTL035386 for perforce@freebsd.org; Mon, 28 Jun 2004 05:09:42 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 05:09:42 GMT Message-Id: <200406280509.i5S59gTL035386@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55977 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 05:09:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=55977 Change 55977 by marcel@marcel_nfs on 2004/06/28 05:09:21 Drop the backward compatibility logic that I added on HEAD. The problem is simple: For one of the LWPs in the core file we won't have the lwpid and thus have a mismatch between what thread_db.so knows and what the debugger knows. This breaks getting the registers from a core file for one of the LWPs. Yes, if we also save the pid then we can also try that if we are unable to fetch register state for one of the lwpids. This is ugly and does more harm to the future than not having the true PID of the process in the core file. The pid is not important enough and the interface is too specific to debuggers to do much harm, if any. Also note that it's possible, at least in theory, to use different notes and so preserve the original meaning of the NT_PRSTATUS note. For this to work, one needs to dig into BFD (binutils) and find a way to add a note and then have the various ids (pid & lwpid) passed up to GDB. An impossible task, because BFD is severily broken in that respect. I tried and admit defeat... If I come up with another way, this change may not be needed. From the looks of it, I pretty much exchausted all the options. Affected files ... .. //depot/projects/gdb/sys/kern/imgact_elf.c#11 edit Differences ... ==== //depot/projects/gdb/sys/kern/imgact_elf.c#11 (text+ko) ==== @@ -1171,13 +1171,10 @@ sizeof *psinfo); /* - * For backward compatibility, we dump the registers of the current - * thread (as passed to us in td) first and set pr_pid to the PID of - * the process. We then dump the other threads, but with pr_pid set - * to the TID of the thread itself. This has two advantages: - * 1) We preserve the meaning of pr_pid for as much as is possible. - * 2) The debugger will select the current thread as its initial - * "thread", which is likely what we want. + * To have the debugger select the right thread (LWP) as the initial + * thread, we dump the state of the thread passed to us in td first. + * This is the thread that causes the core dump and thus likely to + * be the right thread one wants to have selected in the debugger. */ thr = td; while (thr != NULL) { @@ -1188,7 +1185,7 @@ status->pr_fpregsetsz = sizeof(fpregset_t); status->pr_osreldate = osreldate; status->pr_cursig = p->p_sig; - status->pr_pid = (thr == td) ? p->p_pid : thr->td_tid; + status->pr_pid = thr->td_tid; fill_regs(thr, &status->pr_reg); fill_fpregs(thr, fpregset); } From owner-p4-projects@FreeBSD.ORG Mon Jun 28 05:26:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E15716A4D0; Mon, 28 Jun 2004 05:26:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A07F16A4CE for ; Mon, 28 Jun 2004 05:26:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6382E43D4C for ; Mon, 28 Jun 2004 05:26:02 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S5Q2E7035806 for ; Mon, 28 Jun 2004 05:26:02 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S5Q2uK035803 for perforce@freebsd.org; Mon, 28 Jun 2004 05:26:02 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 05:26:02 GMT Message-Id: <200406280526.i5S5Q2uK035803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 05:26:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=55978 Change 55978 by marcel@marcel_nfs on 2004/06/28 05:25:04 Change next_uniqueid to last_uniqueid and use a pre-inc instead of a post-inc. The net effect is that ids start with 2 instead of one, leaving 1 for use by the initial thread. Previously the initial thread had id 0, but that's a particularly bad id to use for GDB. Affected files ... .. //depot/projects/gdb/lib/libc_r/uthread/uthread_create.c#2 edit Differences ... ==== //depot/projects/gdb/lib/libc_r/uthread/uthread_create.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include "pthread_private.h" #include "libc_private.h" -static u_int64_t next_uniqueid = 1; +static u_int64_t last_uniqueid = 1; #define OFF(f) offsetof(struct pthread, f) int _thread_next_offset = OFF(tle.tqe_next); @@ -212,7 +212,7 @@ * Initialise the unique id which GDB uses to * track threads. */ - new_thread->uniqueid = next_uniqueid++; + new_thread->uniqueid = ++last_uniqueid; /* * Check if the garbage collector thread From owner-p4-projects@FreeBSD.ORG Mon Jun 28 05:38:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF45716A4D0; Mon, 28 Jun 2004 05:38:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A381716A4CE for ; Mon, 28 Jun 2004 05:38:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A92C43D1D for ; Mon, 28 Jun 2004 05:38:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S5cHbt036206 for ; Mon, 28 Jun 2004 05:38:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S5cHjK036203 for perforce@freebsd.org; Mon, 28 Jun 2004 05:38:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Jun 2004 05:38:17 GMT Message-Id: <200406280538.i5S5cHjK036203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 55979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 05:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=55979 Change 55979 by rwatson@rwatson_tislabs on 2004/06/28 05:37:27 Integrate netperf_socket. Includes ip_divert fix from phk. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files#33 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#8 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/netperf_socket/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/netperf_socket/sys/dev/usb/devlist2h.awk#3 delete .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#15 delete .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#15 delete .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/float.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/proc.h#3 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.912 2004/06/27 02:36:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.913 2004/06/27 20:16:56 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -40,17 +40,17 @@ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" -miidevs.h standard \ +miidevs.h optional mii \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ clean "miidevs.h" -pccarddevs.h standard \ +pccarddevs.h optional pccard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" -usbdevs.h standard \ +usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ no-obj no-implicit-rule before-depend \ ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.67 2004/06/26 06:02:06 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.68 2004/06/27 23:03:43 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -130,17 +130,14 @@ if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend -# XXX this belongs elsewhere (inside GEN_CFILES if possible). -GEN_M_CFILES= ${MFILES:T:S/.m$/.c/} - # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s vnode_if.h \ - ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ - ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} +_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ + ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ + ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep - ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \ + ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS} ${MAKE} -V SFILES | \ MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS} ==== //depot/projects/netperf_socket/sys/conf/kern.pre.mk#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.53 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.54 2004/06/27 23:03:43 imp Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -117,7 +117,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} -GEN_CFILES= $S/$M/$M/genassym.c +GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} SYSTEM_CFILES= config.c env.c hints.c majors.c vnode_if.c SYSTEM_DEP= Makefile ${SYSTEM_OBJS} SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.166 2004/06/27 13:04:19 imp Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.167 2004/06/28 03:36:37 imp Exp $ */ #include "opt_acpi.h" @@ -893,7 +893,7 @@ /* Copy the bus tag and handle from the pre-allocated resource. */ rman_set_bustag(res, rman_get_bustag(rle->res)); - rman_set_bushandle(res, rman_get_bushandle(res)); + rman_set_bushandle(res, rman_get_start(res)); /* If requested, activate the resource using the parent's method. */ if (flags & RF_ACTIVE) ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.184 2004/06/27 17:27:04 alex Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -600,7 +600,8 @@ product DALLAS J6502 0x4201 J-6502 speakers /* Dell products */ -product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter +product DELL PORT 0x0058 Port Replicator +product DELL BC02 0x8000 BC02 Bluetooth USB Adapter /* Delorme Paublishing products */ product DELORME EARTHMATE 0x0100 Earthmate GPS ==== //depot/projects/netperf_socket/sys/geom/geom_disk.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.87 2004/05/30 18:04:06 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.88 2004/06/27 20:53:20 phk Exp $"); #include "opt_geom.h" @@ -404,7 +404,9 @@ g_cancel_event(dp); dp->d_destroyed = 1; - g_post_event(g_disk_destroy, dp, M_WAITOK, NULL); + if (dp->d_devstat != NULL) + devstat_remove_entry(dp->d_devstat); + g_post_event(g_disk_destroy, dp, M_WAITOK, NULL, NULL); } static void ==== //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.22 2004/06/16 09:47:06 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.23 2004/06/28 02:38:20 imp Exp $"); #include #include @@ -80,7 +80,7 @@ { int state; - state = 0xff; /* XXX unknown */ + state = APM_UNKNOWN; if (battp->state & ACPI_BATT_STAT_DISCHARG) { if (battp->cap >= 50) @@ -94,7 +94,7 @@ state = 3; /* charging */ /* If still unknown, determine it based on the battery capacity. */ - if (state == 0xff) { + if (state == APM_UNKNOWN) { if (battp->cap >= 50) state = 0; /* high */ else @@ -137,18 +137,18 @@ aip->ai_major = 1; aip->ai_minor = 2; aip->ai_status = apm_softc.active; - aip->ai_capabilities= 0xff00; /* XXX unknown */ + aip->ai_capabilities= 0xff00; /* unknown */ if (acpi_acad_get_acline(&acline)) - aip->ai_acline = 0xff; /* unknown */ + aip->ai_acline = APM_UNKNOWN; /* unknown */ else aip->ai_acline = acline; /* on/off */ if (acpi_battery_get_battinfo(-1, &batt)) { - aip->ai_batt_stat = 0xff; /* unknown */ - aip->ai_batt_life = 0xff; /* unknown */ - aip->ai_batt_time = -1; /* unknown */ - aip->ai_batteries = 0; + aip->ai_batt_stat = APM_UNKNOWN; + aip->ai_batt_life = APM_UNKNOWN; + aip->ai_batt_time = -1; /* unknown */ + aip->ai_batteries = ~0U; /* unknown */ } else { aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); aip->ai_batt_life = batt.cap; @@ -184,7 +184,7 @@ app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; if (acpi_acad_get_acline(&acline)) - app->ap_acline = 0xff; /* unknown */ + app->ap_acline = APM_UNKNOWN; else app->ap_acline = acline; /* on/off */ ==== //depot/projects/netperf_socket/sys/i386/i386/mem.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.111 2004/06/16 09:47:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.112 2004/06/28 03:16:32 imp Exp $"); /* * Memory special file @@ -98,6 +98,7 @@ { switch (minor(dev)) { case 14: + td->td_proc->p_md.md_iopl = 0; td->td_frame->tf_eflags &= ~PSL_IOPL; } return (0); @@ -125,6 +126,7 @@ if (error != 0) return (error); td->td_frame->tf_eflags |= PSL_IOPL; + td->td_proc->p_md.md_iopl = PSL_IOPL; break; } return (0); ==== //depot/projects/netperf_socket/sys/i386/include/float.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ + * $FreeBSD: src/sys/i386/include/float.h,v 1.13 2004/06/28 03:08:17 imp Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -62,7 +62,6 @@ #define DBL_MAX 1.7976931348623157E+308 #define DBL_MAX_10_EXP 308 - #define LDBL_MANT_DIG 64 #define LDBL_EPSILON 1.0842021724855044340E-19L #define LDBL_DIG 18 ==== //depot/projects/netperf_socket/sys/i386/include/proc.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/i386/include/proc.h,v 1.21 2004/04/07 20:46:05 imp Exp $ + * $FreeBSD: src/sys/i386/include/proc.h,v 1.22 2004/06/28 03:16:32 imp Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -52,6 +52,7 @@ struct mdproc { struct proc_ldt *md_ldt; /* (j) per-process ldt */ + uint32_t md_iopl; /* process' iopl level */ }; #ifdef _KERNEL ==== //depot/projects/netperf_socket/sys/kern/subr_bus.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.150 2004/06/16 09:47:12 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.152 2004/06/28 03:40:23 imp Exp $"); #include "opt_bus.h" ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.18 2004/06/26 13:24:29 le Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.19 2004/06/27 16:51:01 imp Exp $ */ #include @@ -48,7 +48,6 @@ #include #include #include -#include #include #include @@ -58,6 +57,8 @@ #include #include +#include "usbdevs.h" + /* * USB methods */ ==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.8 2004/06/17 17:16:51 phk Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.9 2004/06/27 16:51:01 imp Exp $ */ #include @@ -45,7 +45,8 @@ #include #include #include -#include + +#include "usbdevs.h" /* * Download firmware to BCM2033. ==== //depot/projects/netperf_socket/sys/netinet/ip_divert.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.93 2004/06/26 19:10:38 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.94 2004/06/27 21:54:34 phk Exp $ */ #include "opt_inet.h" @@ -232,8 +232,8 @@ if (sbappendaddr_locked(&sa->so_rcv, (struct sockaddr *)&divsrc, m, (struct mbuf *)0) == 0) { + SOCKBUF_UNLOCK(&sa->so_rcv); sa = NULL; /* force mbuf reclaim below */ - SOCKBUF_UNLOCK(&sa->so_rcv); } else sorwakeup_locked(sa); INP_UNLOCK(inp); ==== //depot/projects/netperf_socket/sys/sparc64/include/bus.h#2 (text+ko) ==== @@ -69,7 +69,7 @@ * and * from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09 * - * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.32 2003/09/23 08:22:34 nyan Exp $ + * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.33 2004/06/28 03:49:13 scottl Exp $ */ #ifndef _MACHINE_BUS_H_ @@ -1020,6 +1020,7 @@ int dt_map_count; bus_dma_lock_t *dt_lockfunc; void * *dt_lockfuncarg; + bus_dma_segment_t *dt_segments; struct bus_dma_methods *dt_mt; }; ==== //depot/projects/netperf_socket/sys/sparc64/include/bus_private.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.25 2002/01/05 * - * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.6 2003/07/10 23:27:35 tmm Exp $ + * $FreeBSD: src/sys/sparc64/include/bus_private.h,v 1.7 2004/06/28 04:04:43 scottl Exp $ */ #ifndef _MACHINE_BUS_PRIVATE_H_ @@ -41,13 +41,6 @@ int sparc64_bus_mem_unmap(void *, bus_size_t); bus_space_handle_t sparc64_fake_bustag(int, bus_addr_t, struct bus_space_tag *); -/* - * This is more or less arbitrary, except for the stack space consumed by - * the segments array. Choose more than ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1), - * since in practice we could be map pages more than once. - */ -#define BUS_DMAMAP_NSEGS 64 - struct bus_dmamap_res { struct resource *dr_res; bus_size_t dr_used; ==== //depot/projects/netperf_socket/sys/sparc64/sparc64/bus_machdep.c#4 (text+ko) ==== @@ -97,7 +97,7 @@ * and * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15 * - * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.38 2004/04/07 05:00:01 imp Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.39 2004/06/28 03:49:13 scottl Exp $ */ #include @@ -246,7 +246,9 @@ newtag->dt_lockfunc = dflt_lock; newtag->dt_lockfuncarg = NULL; } - + + newtag->dt_segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->dt_lowaddr = ulmin(parent->dt_lowaddr, @@ -278,6 +280,8 @@ parent = dmat->dt_parent; atomic_subtract_int(&dmat->dt_ref_count, 1); if (dmat->dt_ref_count == 0) { + if (dmat->dt_segments != NULL) + free(dmat->dt_segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -297,6 +301,13 @@ sparc64_dma_alloc_map(bus_dma_tag_t dmat, bus_dmamap_t *mapp) { + if (dmat->dt_segments == NULL) { + dmat->dt_segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->dt_nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->dt_segments == NULL) + return (ENOMEM); + } *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO); if (*mapp == NULL) return (ENOMEM); @@ -336,16 +347,18 @@ * first indicates if this is the first invocation of this function. */ static int -_nexus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dma_segment_t segs[], - void *buf, bus_size_t buflen, struct thread *td, int flags, - bus_addr_t *lastaddrp, int *segp, int first) +_nexus_dmamap_load_buffer(bus_dma_tag_t dmat, void *buf, bus_size_t buflen, + struct thread *td, int flags, bus_addr_t *lastaddrp, int *segp, int first) { + bus_dma_segment_t *segs; bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; pmap_t pmap; + segs = dmat->dt_segments; + if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else @@ -430,19 +443,14 @@ bus_size_t buflen, bus_dmamap_callback_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->dt_nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_addr_t lastaddr; int error, nsegs; - error = _nexus_dmamap_load_buffer(dmat, dm_segments, buf, buflen, - NULL, flags, &lastaddr, &nsegs, 1); + error = _nexus_dmamap_load_buffer(dmat, buf, buflen, NULL, flags, + &lastaddr, &nsegs, 1); if (error == 0) { - (*callback)(callback_arg, dm_segments, nsegs + 1, 0); + (*callback)(callback_arg, dmat->dt_segments, nsegs + 1, 0); map->dm_flags |= DMF_LOADED; } else (*callback)(callback_arg, NULL, 0, error); @@ -457,11 +465,6 @@ nexus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0, bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->dt_nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error; M_ASSERTPKTHDR(m0); @@ -476,8 +479,8 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len > 0) { error = _nexus_dmamap_load_buffer(dmat, - dm_segments, m->m_data, m->m_len, NULL, - flags, &lastaddr, &nsegs, first); + m->m_data, m->m_len,NULL, flags, &lastaddr, + &nsegs, first); first = 0; } } @@ -487,10 +490,10 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->dt_segments, 0, 0, error); } else { map->dm_flags |= DMF_LOADED; - (*callback)(callback_arg, dm_segments, nsegs + 1, + (*callback)(callback_arg, dmat->dt_segments, nsegs + 1, m0->m_pkthdr.len, error); } return (error); @@ -504,11 +507,6 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { bus_addr_t lastaddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->dt_nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; @@ -536,8 +534,8 @@ caddr_t addr = (caddr_t) iov[i].iov_base; if (minlen > 0) { - error = _nexus_dmamap_load_buffer(dmat, dm_segments, - addr, minlen, td, flags, &lastaddr, &nsegs, first); + error = _nexus_dmamap_load_buffer(dmat, addr, minlen, + td, flags, &lastaddr, &nsegs, first); first = 0; resid -= minlen; @@ -546,10 +544,10 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->dt_segments, 0, 0, error); } else { map->dm_flags |= DMF_LOADED; - (*callback)(callback_arg, dm_segments, nsegs + 1, + (*callback)(callback_arg, dmat->dt_segments, nsegs + 1, uio->uio_resid, error); } return (error); @@ -677,6 +675,7 @@ 0, NULL, NULL, + NULL, &nexus_dma_methods, }; ==== //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#5 (text+ko) ==== @@ -97,7 +97,7 @@ * from: @(#)sbus.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp * - * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.36 2004/04/25 00:08:15 tmm Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.38 2004/06/28 04:04:43 scottl Exp $ */ /* @@ -889,8 +889,8 @@ */ static int iommu_dvmamap_load_buffer(bus_dma_tag_t dt, struct iommu_state *is, - bus_dmamap_t map, bus_dma_segment_t sgs[], void *buf, - bus_size_t buflen, struct thread *td, int flags, int *segp, int align) + bus_dmamap_t map, void *buf, bus_size_t buflen, struct thread *td, + int flags, int *segp, int align) { bus_addr_t amask, dvmaddr; bus_size_t sgsize, esize; @@ -947,15 +947,14 @@ */ if (!firstpg) { esize = ulmin(sgsize, - dt->dt_maxsegsz - sgs[sgcnt].ds_len); - sgs[sgcnt].ds_len += esize; + dt->dt_maxsegsz - dt->dt_segments[sgcnt].ds_len); + dt->dt_segments[sgcnt].ds_len += esize; sgsize -= esize; dvmaddr += esize; } while (sgsize > 0) { sgcnt++; - if (sgcnt >= dt->dt_nsegments || - sgcnt >= BUS_DMAMAP_NSEGS) + if (sgcnt >= dt->dt_nsegments) return (EFBIG); /* * No extra alignment here - the common practice in the @@ -965,8 +964,8 @@ * that such tags have maxsegsize >= maxsize. */ esize = ulmin(sgsize, dt->dt_maxsegsz); - sgs[sgcnt].ds_addr = dvmaddr; - sgs[sgcnt].ds_len = esize; + dt->dt_segments[sgcnt].ds_addr = dvmaddr; + dt->dt_segments[sgcnt].ds_len = esize; sgsize -= esize; dvmaddr += esize; } @@ -983,11 +982,6 @@ int flags) { struct iommu_state *is = dt->dt_cookie; -#ifdef __GNUC__ - bus_dma_segment_t sgs[dt->dt_nsegments]; -#else - bus_dma_segment_t sgs[BUS_DMAMAP_NSEGS]; -#endif int error, seg = -1; if ((map->dm_flags & DMF_LOADED) != 0) { @@ -1006,7 +1000,7 @@ iommu_map_remq(is, map); IS_UNLOCK(is); - error = iommu_dvmamap_load_buffer(dt, is, map, sgs, buf, buflen, NULL, + error = iommu_dvmamap_load_buffer(dt, is, map, buf, buflen, NULL, flags, &seg, 1); IS_LOCK(is); @@ -1014,11 +1008,11 @@ if (error != 0) { iommu_dvmamap_vunload(is, map); IS_UNLOCK(is); - (*cb)(cba, sgs, 0, error); + (*cb)(cba, dt->dt_segments, 0, error); } else { IS_UNLOCK(is); map->dm_flags |= DMF_LOADED; - (*cb)(cba, sgs, seg + 1, 0); + (*cb)(cba, dt->dt_segments, seg + 1, 0); } return (error); @@ -1029,11 +1023,6 @@ bus_dmamap_callback2_t *cb, void *cba, int flags) { struct iommu_state *is = dt->dt_cookie; -#ifdef __GNUC__ - bus_dma_segment_t sgs[dt->dt_nsegments]; -#else - bus_dma_segment_t sgs[BUS_DMAMAP_NSEGS]; -#endif struct mbuf *m; int error = 0, first = 1, nsegs = -1; @@ -1054,7 +1043,7 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len == 0) continue; - error = iommu_dvmamap_load_buffer(dt, is, map, sgs, + error = iommu_dvmamap_load_buffer(dt, is, map, m->m_data, m->m_len, NULL, flags, &nsegs, first); first = 0; } @@ -1067,11 +1056,11 @@ iommu_dvmamap_vunload(is, map); IS_UNLOCK(is); /* force "no valid mappings" in callback */ - (*cb)(cba, sgs, 0, 0, error); + (*cb)(cba, dt->dt_segments, 0, 0, error); } else { IS_UNLOCK(is); map->dm_flags |= DMF_LOADED; - (*cb)(cba, sgs, nsegs + 1, m0->m_pkthdr.len, 0); + (*cb)(cba, dt->dt_segments, nsegs + 1, m0->m_pkthdr.len, 0); } return (error); } @@ -1081,11 +1070,6 @@ bus_dmamap_callback2_t *cb, void *cba, int flags) { struct iommu_state *is = dt->dt_cookie; -#ifdef __GNUC__ - bus_dma_segment_t sgs[dt->dt_nsegments]; -#else - bus_dma_segment_t sgs[BUS_DMAMAP_NSEGS]; -#endif struct iovec *iov; struct thread *td = NULL; bus_size_t minlen, resid; @@ -1120,7 +1104,7 @@ if (minlen == 0) continue; - error = iommu_dvmamap_load_buffer(dt, is, map, sgs, + error = iommu_dvmamap_load_buffer(dt, is, map, iov[i].iov_base, minlen, td, flags, &nsegs, first); first = 0; @@ -1133,11 +1117,11 @@ iommu_dvmamap_vunload(is, map); IS_UNLOCK(is); /* force "no valid mappings" in callback */ - (*cb)(cba, sgs, 0, 0, error); + (*cb)(cba, dt->dt_segments, 0, 0, error); } else { IS_UNLOCK(is); map->dm_flags |= DMF_LOADED; - (*cb)(cba, sgs, nsegs + 1, uio->uio_resid, 0); + (*cb)(cba, dt->dt_segments, nsegs + 1, uio->uio_resid, 0); } return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jun 28 05:49:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A692616A4D0; Mon, 28 Jun 2004 05:49:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83C4716A4CE for ; Mon, 28 Jun 2004 05:49:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CE6443D2F for ; Mon, 28 Jun 2004 05:49:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S5nWWu036474 for ; Mon, 28 Jun 2004 05:49:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S5nWMI036471 for perforce@freebsd.org; Mon, 28 Jun 2004 05:49:32 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 05:49:32 GMT Message-Id: <200406280549.i5S5nWMI036471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 05:49:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=55982 Change 55982 by marcel@marcel_nfs on 2004/06/28 05:48:53 Give the initial thread uniqueid 1 and save the lwpid of the process for consumption by thread_db.so. Note that we probably want to support RELENG_4 when we're ready with all this and have support contributed back to GDB. For this we cannot change libc_r, so we need to find a way (eventually) to make this work on 4.x. I'm not going to worry about this now. Affected files ... .. //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#4 edit .. //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#2 edit Differences ... ==== //depot/projects/gdb/lib/libc_r/uthread/pthread_private.h#4 (text+ko) ==== @@ -1189,6 +1189,12 @@ #endif ; +SCLASS int _libc_r_lwpid +#ifdef GLOBAL_PTHREAD_PRIVATE += 0 +#endif +; + /* Undefine the storage class specifier: */ #undef SCLASS ==== //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#2 (text+ko) ==== @@ -337,6 +337,7 @@ memset(&_thread_kern_thread, 0, sizeof(struct pthread)); _thread_kern_thread.flags = PTHREAD_FLAGS_PRIVATE; memset(_thread_initial, 0, sizeof(struct pthread)); + _thread_initial->uniqueid = 1; /* Initialize the waiting and work queues: */ TAILQ_INIT(&_waitingq); @@ -345,6 +346,9 @@ /* Initialize the scheduling switch hook routine: */ _sched_switch_hook = NULL; + /* Save the lwpid of the one LWP this process has. */ + _libc_r_lwpid = getlwpid(); + /* Give this thread default attributes: */ memcpy((void *) &_thread_initial->attr, &_pthread_attr_default, sizeof(struct pthread_attr)); From owner-p4-projects@FreeBSD.ORG Mon Jun 28 05:51:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A914816A4D0; Mon, 28 Jun 2004 05:51:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 861D816A4CE for ; Mon, 28 Jun 2004 05:51:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F5BD43D48 for ; Mon, 28 Jun 2004 05:51:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S5pZsU036582 for ; Mon, 28 Jun 2004 05:51:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S5pZaM036579 for perforce@freebsd.org; Mon, 28 Jun 2004 05:51:35 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 05:51:35 GMT Message-Id: <200406280551.i5S5pZaM036579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 05:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=55983 Change 55983 by marcel@marcel_nfs on 2004/06/28 05:50:40 Don't do arithmetic on void *. I manually tweaked locally, so missed the breakage. Affected files ... .. //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#3 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/td_ta_thr_iter.c#3 (text+ko) ==== @@ -50,7 +50,8 @@ while (th.th_thread != NULL) { if (cb(&th, data) != 0) return (TD_OK); - addr = th.th_thread + ta->ta.libc_r.offset_next; + addr = (psaddr_t)((uintptr_t)th.th_thread + + ta->ta.libc_r.offset_next); err = ps_pread(ta->ta_ph, addr, &th.th_thread, sizeof(th.th_thread)); if (err != PS_OK) ==== //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#3 (text+ko) ==== @@ -43,7 +43,8 @@ ti->ti_ta = ta; switch (ta->ta_lib) { case PTHREAD_LIBC_R: - addr = th->th_thread + ta->ta.libc_r.offset_uniqueid; + addr = (psaddr_t)((uintptr_t)th->th_thread + + ta->ta.libc_r.offset_uniqueid); err = ps_pread(ta->ta_ph, addr, &ti->ti_tid, sizeof(thread_t)); ti->ti_tid++; From owner-p4-projects@FreeBSD.ORG Mon Jun 28 06:47:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDA4416A4D0; Mon, 28 Jun 2004 06:47:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98C8F16A4CE for ; Mon, 28 Jun 2004 06:47:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7978143D31 for ; Mon, 28 Jun 2004 06:47:45 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5S6liQv038346 for ; Mon, 28 Jun 2004 06:47:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5S6liux038343 for perforce@freebsd.org; Mon, 28 Jun 2004 06:47:44 GMT (envelope-from marcel@freebsd.org) Date: Mon, 28 Jun 2004 06:47:44 GMT Message-Id: <200406280647.i5S6liux038343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 55986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 06:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=55986 Change 55986 by marcel@marcel_nfs on 2004/06/28 06:46:43 Pass the lwpid in the thread info structure. This allows GDB to construct the thread list and select the right thread as the current thread. For libc_r only... Affected files ... .. //depot/projects/gdb/lib/libthread_db/td_ta_new.c#3 edit .. //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#4 edit .. //depot/projects/gdb/lib/libthread_db/thread_db_int.h#2 edit Differences ... ==== //depot/projects/gdb/lib/libthread_db/td_ta_new.c#3 (text+ko) ==== @@ -48,8 +48,14 @@ if (err != PS_OK) return (TD_ERR); - err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_next_offset", - &addr); + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_libc_r_lwpid", &addr); + if (err != PS_OK) + return (TD_ERR); + err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.lwpid, sizeof(lwpid_t)); + if (err != PS_OK) + return (TD_ERR); + + err = ps_pglobal_lookup(ta->ta_ph, NULL, "_thread_next_offset", &addr); if (err != PS_OK) return (TD_ERR); err = ps_pread(ta->ta_ph, addr, &ta->ta.libc_r.offset_next, ==== //depot/projects/gdb/lib/libthread_db/td_thr_get_info.c#4 (text+ko) ==== @@ -36,18 +36,23 @@ td_thr_get_info(const td_thrhandle_t *th, td_thrinfo_t *ti) { const td_thragent_t *ta; - psaddr_t addr; + psaddr_t addr, current; ps_err_e err; ta = th->th_ta; ti->ti_ta = ta; switch (ta->ta_lib) { case PTHREAD_LIBC_R: + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_run, ¤t, + sizeof(psaddr_t)); addr = (psaddr_t)((uintptr_t)th->th_thread + ta->ta.libc_r.offset_uniqueid); err = ps_pread(ta->ta_ph, addr, &ti->ti_tid, sizeof(thread_t)); - ti->ti_tid++; + if (current == th->th_thread) + ti->ti_lid = ta->ta.libc_r.lwpid; + else + ti->ti_lid = 0; return (err == PS_OK) ? TD_OK : TD_ERR; default: break; ==== //depot/projects/gdb/lib/libthread_db/thread_db_int.h#2 (text+ko) ==== @@ -44,6 +44,7 @@ struct { psaddr_t thread_list; psaddr_t thread_run; + lwpid_t lwpid; int offset_next; int offset_uniqueid; } libc_r; From owner-p4-projects@FreeBSD.ORG Mon Jun 28 11:16:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F279216A4D0; Mon, 28 Jun 2004 11:16:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CC4616A4CE for ; Mon, 28 Jun 2004 11:16:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9627343D41 for ; Mon, 28 Jun 2004 11:16:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SBF7Op045766 for ; Mon, 28 Jun 2004 11:15:07 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SBF6uh045763 for perforce@freebsd.org; Mon, 28 Jun 2004 11:15:06 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 28 Jun 2004 11:15:06 GMT Message-Id: <200406281115.i5SBF6uh045763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 11:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=55991 Change 55991 by davidxu@davidxu_alona on 2004/06/28 11:15:02 IFC Affected files ... .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/doscmd.1#2 delete .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/sasc.1#2 delete .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man1/sgsc.1#2 delete .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man2/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man8/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man8/stlload.8#2 delete .. //depot/projects/davidxu_ksedbg/doc/ja_JP.eucJP/man/man8/stlstats.8#2 delete .. //depot/projects/davidxu_ksedbg/src/bin/ps/print.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/bin/ps/ps.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/FREEBSD-upgrade#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/isc-dhcp/common/parse.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/binutils/doc/inc-hist.diff#2 delete .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/doc/inc-hist.diff#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_atfork.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/devlist2h.awk#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs.h#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs_data.h#2 delete .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/float.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/aue/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/axe/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/cue/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ep/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/kue/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/rue/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ubsa/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ucom/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/udav/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ufm/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uftdi/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ukbd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/umass/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/umct/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ums/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uplcom/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/urio/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uscanner/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uvisor/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/uvscom/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_loop.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/include/bus_private.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/cut/cut.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/cut/cut.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/args.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/indent.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/indent_globs.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/io.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/matching.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/util.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tr/tr.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/bluetooth/hccontrol/link_control.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/jail/jail.c#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/Makefile#2 (text+ko) ==== @@ -4,12 +4,12 @@ # # Build the FreeBSD FAQ in the German translation # -# $FreeBSD: doc/de_DE.ISO8859-1/books/faq/Makefile,v 1.5 2003/04/27 20:43:37 mheinen Exp $ -# $FreeBSDde: de-docproj/books/faq/Makefile,v 1.9 2003/04/23 22:36:36 mheinen Exp $ -# basiert auf: 1.10 +# $FreeBSD: doc/de_DE.ISO8859-1/books/faq/Makefile,v 1.6 2004/06/27 22:21:14 mheinen Exp $ +# $FreeBSDde: de-docproj/books/faq/Makefile,v 1.10 2004/06/06 18:21:21 mheinen Exp $ +# basiert auf: 1.11 # -MAINTAINER=de-bsd-translators@DE.FreeBSD.org +MAINTAINER=de-bsd-translators@de.FreeBSD.org DOC?= book ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.47 2004/05/17 23:08:48 mheinen Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.475 2004/04/28 22:27:50 mheinen Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.48 2004/06/27 22:21:14 mheinen Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.478 2004/06/06 18:23:02 mheinen Exp $ - basiert auf: 1.617 + basiert auf: 1.620 --> @@ -23,6 +23,8 @@ %bookinfo; %mailing-lists; + +%urls; ]> @@ -45,7 +47,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.475 2004/04/28 22:27:50 mheinen Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.478 2004/06/06 18:23:02 mheinen Exp $ 1995 @@ -619,10 +621,10 @@ Code zum Quellbaum hinzuzufügen, werden innerhalb eines Core - Team von etwa 9 Personen geführt. Es gibt - ein weitaus größeres Team von über 200 + Team von 8 Personen geführt. Es gibt + ein weitaus größeres Team von über 300 Committers, + url="http://www.de.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/article.html#STAFF-COMMITTERS">Committern, die dazu autorisiert sind, Änderungen am FreeBSD Quellbaum durchzuführen. @@ -9216,7 +9218,7 @@ Ja. Genaue Informationen zu diesem Thema finden Sie im Kapitel Advanced Networking, im Abschnitt + url="../handbook/network-routing.html"> Gateways und Routen. @@ -9756,7 +9758,7 @@ linkend="service-redirect">FAQ-Eintrag über die Umleitung von Diensten oder die Online-Hilfe zu &man.natd.8; durchlesen. Auch in der Ports Sammlung sind diverse + url="&url.main;/ports/index.html">Ports Sammlung sind diverse Hilfsprogramme für diesen Zweck enthalten. ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # -# $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/Makefile,v 1.2 2004/06/03 06:31:50 trhodes Exp $ -# $FreeBSDde: de-docproj/books/fdp-primer/Makefile,v 1.2 2003/11/26 01:11:56 mheinen Exp $ -# basiert auf: 1.12 +# $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/Makefile,v 1.3 2004/06/27 22:21:14 mheinen Exp $ +# $FreeBSDde: de-docproj/books/fdp-primer/Makefile,v 1.3 2004/06/06 18:21:21 mheinen Exp $ +# basiert auf: 1.13 # # Build the FreeBSD Documentation Project Primer. # -MAINTAINER=doc@FreeBSD.org +MAINTAINER=de-bsd-translators@de.FreeBSD.org DOC?= book ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 (text+ko) ==== @@ -27,9 +27,9 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.3 2004/01/11 00:10:39 mheinen Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/book.sgml,v 1.8 2004/01/10 01:32:36 mheinen Exp $ - basiert auf: 1.21 + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.4 2004/06/27 22:21:14 mheinen Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/book.sgml,v 1.9 2004/06/06 15:06:38 mheinen Exp $ + basiert auf: 1.22 --> %man; + +%urls; + %chapters; @@ -77,9 +80,9 @@ Nik Clayton - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.3 2004/01/11 00:10:39 mheinen Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.4 2004/06/27 22:21:14 mheinen Exp $ - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.3 2004/01/11 00:10:39 mheinen Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml,v 1.4 2004/06/27 22:21:14 mheinen Exp $ Redistribution and use in source (SGML DocBook) and 'compiled' ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ==== @@ -27,9 +27,9 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.1 2003/12/23 01:04:34 mheinen Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/overview/chapter.sgml,v 1.7 2003/12/05 00:03:08 mheinen Exp $ - basiert auf: 1.19 + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.2 2004/06/27 22:21:14 mheinen Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/overview/chapter.sgml,v 1.8 2004/06/06 15:06:38 mheinen Exp $ + basiert auf: 1.20 --> @@ -132,7 +132,7 @@ Die Webseite http://www.FreeBSD.org + url="&url.main;/index.html">http://www.FreeBSD.org und ihre vielen Spiegel auf der ganzen Welt vertreten das FreeBSD-Projekt im WWW. Für viele Menschen ist sie der erste Kontakt mit FreeBSD. ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 (text+ko) ==== @@ -27,10 +27,10 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v 1.2 2004/01/03 13:11:33 mheinen Exp $ - $FreeBSDde: de-docproj/books/fdp-primer/see-also/chapter.sgml,v 1.7 2003/12/23 01:41:02 mheinen Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml,v 1.3 2004/06/27 22:21:14 mheinen Exp $ + $FreeBSDde: de-docproj/books/fdp-primer/see-also/chapter.sgml,v 1.8 2004/06/06 15:06:38 mheinen Exp $ - basiert auf: 1.10 + basiert auf: 1.11 --> @@ -46,7 +46,7 @@ - Die + Die Webseiten des FreeBSD-Dokumentationsprojektes ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 (text+ko) ==== @@ -1,12 +1,12 @@ # -# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.25 2004/05/23 18:30:04 mheinen Exp $ -# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.34 2004/05/09 19:49:44 mheinen Exp $ -# basiert auf: 1.79 +# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.26 2004/06/27 22:26:25 mheinen Exp $ +# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.36 2004/06/06 18:21:21 mheinen Exp $ +# basiert auf: 1.81 # # Build the FreeBSD Handbook in its German translation. # -MAINTAINER=alex@FreeBSD.org +MAINTAINER=de-bsd-translators@de.FreeBSD.org DOC?= book ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.19 2004/05/23 18:30:05 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.100 2004/05/10 00:32:45 mheinen Exp $ - basiert auf: 1.293 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.20 2004/06/27 22:26:25 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/advanced-networking/chapter.sgml,v 1.101 2004/06/27 21:01:28 mheinen Exp $ + basiert auf: 1.309 --> @@ -1607,10 +1607,10 @@ In &os; 5.X wurde portmap - durch rpcbind ersetzt. Benutzer von - &os; 5.X müssen daher in den folgenden Beispielen - portmap durch - rpcbind ersetzen. + durch rpcbind ersetzt. Benutzer + von &os; 5.X müssen daher in den folgenden + Beispielen portmap durch + rpcbind ersetzen. Der Server benötigt folgende Daemonen: @@ -1644,14 +1644,14 @@ - nfsd + nfsd Der NFS-Daemon. Er bearbeitet Anfragen der NFS-Clients. - mountd + mountd Der NFS-Mount-Daemon. Er bearbeitet die Anfragen, die &man.nfsd.8; an ihn @@ -1659,7 +1659,7 @@ - portmap + portmap Der Portmapper-Daemon. Durch ihn erkennen die NFS-Clients, welchen Port der @@ -1699,8 +1699,8 @@ nfs_server_enable="YES" mountd_flags="-r" - mountd läuft automatisch, wenn der - NFS-Server aktiviert ist. + mountd läuft automatisch, + wenn der NFS-Server aktiviert ist. Auf dem Client muss in /etc/rc.conf folgende Option gesetzt sein: @@ -1811,7 +1811,7 @@ /exports -alldirs -maproot=root client01 client02 /exports/obj -ro - Sie müssen mountd nach jeder + Sie müssen mountd nach jeder Änderung von /etc/exports neu starten, damit die Änderungen wirksam werden. Dies kann durch das Senden des HUP-Signals an den @@ -1836,8 +1836,8 @@ Nun sollte alles bereit sein, um ein entferntes Dateisystem einhängen zu können. In unseren Beispielen nennen wir - den Server server, den Client - client. Wenn Sie ein entferntes Dateisystem + den Server server, den Client + client. Wenn Sie ein entferntes Dateisystem nur zeitweise einhängen wollen, oder nur Ihre Konfiguration testen möchten, führen Sie auf dem Client als root einen Befehl ähnlich dem @@ -2059,7 +2059,7 @@ /etc/fstab festgelegt werden, damit die Dateisysteme automatisch eingehängt werden. Um die Dateisysteme manuell einzuhängen, verwendet man bei - mount zusätzlich die Option + &man.mount.8; zusätzlich die Option . Es gibt ein anderes Problem, das oft mit diesem verwechselt @@ -3511,30 +3511,30 @@ - portmap + portmap Muss laufen, damit RPC (Remote Procedure Call, ein von NIS verwendetes Netzwerkprotokoll) funktioniert. NIS-Server sowie Clients funktionieren ohne - portmap nicht. + portmap nicht. - ypbind + ypbind Bindet einen NIS-Client an seinen NIS-Server. Der Client bezieht den NIS-Domänennamen vom System und stellt über das RPC-Protokoll eine Verbindung zum NIS-Server her. - ypbind ist der zentrale Bestandteil - der Client-Server-Kommunikation in einer NIS-Umgebung. - Wird ypbind auf einem Client beendet, - ist dieser nicht mehr in der Lage, auf den NIS-Server - zuzugreifen. + ypbind ist der zentrale + Bestandteil der Client-Server-Kommunikation in einer + NIS-Umgebung. Wird >ypbind + auf einem Client beendet, ist dieser nicht mehr in der + Lage, auf den NIS-Server zuzugreifen. - ypserv + ypserv Sollte nur auf dem NIS-Server laufen, da es sich um den Serverprozess selbst handelt. Wenn &man.ypserv.8; @@ -3547,12 +3547,12 @@ verwendete Server nicht mehr reagiert. Die einzige Lösung dieses Problems besteht dann darin, den Serverprozess (oder gar den Server selbst) oder den - ypbind-Prozess auf dem Client neu - zu starten. + ypbind-Prozess auf dem + Client neu zu starten. - rpc.yppasswdd + rpc.yppasswdd Ein weiterer Prozess, der nur auf dem NIS-Masterserver laufen sollte. Es handelt sich um einen @@ -3744,7 +3744,7 @@ hätte daher die NIS-Domäne acme-art. Für unser Beispiel verwenden wir den NIS-Domänennamen - test-domain. + test-domain. SunOS @@ -3825,7 +3825,7 @@ nisdomainname="test-domain" Diese Zeile setzt den NIS-Domänennamen auf - test-domain, wenn Sie das Netzwerk + test-domain, wenn Sie das Netzwerk initialisieren (beispielsweise nach einem Systemstart). @@ -3940,7 +3940,7 @@ Durch diese Datei wird festgelegt, dass Sie in einer NIS-Umgebung mit nur einem Server arbeiten und dass alle Clients unter FreeBSD laufen. Da - test-domain aber auch über einen + test-domain aber auch über einen Slaveserver verfügt, müssen Sie /var/yp/Makefile entsprechend anpassen: @@ -4170,7 +4170,7 @@ &man.ypserv.8; schicken, um den Inhalt Ihrer NIS-Maps abzurufen, falls er Ihren NIS-Domänennamen kennt. Um solche unautorisierten Transaktionen zu verhindern, unterstützt - &man.ypserv.8; securenets, durch die man den + &man.ypserv.8; securenets, durch die man den Zugriff auf bestimmte Rechner beschränken kann. &man.ypserv.8; versucht, beim Systemstart die Informationen über securenets aus der Datei @@ -4274,7 +4274,7 @@ Anmeldung an einem bestimmten Rechner zu hindern, selbst wenn diese in der NIS-Datenbank vorhanden sind. Dazu müssen Sie lediglich an diesem Rechner den Eintrag - -Benutzername an + -Benutzername an das Ende von /etc/master.passwd setzen, wobei Benutzername der zu blockierende Benutzername ist. Diese Änderung sollte @@ -4283,7 +4283,7 @@ /etc/master.passwd auf Plausibilität überprüft und nach erfolgter Änderung die Passwortdatenbank automatisch aktualisiert. Um also den - Benutzer bill an der Anmeldung am Rechner + Benutzer bill an der Anmeldung am Rechner basie zu hindern, gehen wir wie folgt vor: @@ -4374,22 +4374,27 @@ - alpha, beta + alpha, + beta Beschäftigte der IT-Abteilung - charlie, delta + charlie, + delta Die neuen Lehrlinge der IT-Abteilung - echo, foxtrott, golf, ... + echo, + foxtrott, + golf, ... Normale Mitarbeiter - able, baker, ... + able, + baker, ... Externe Mitarbeiter @@ -4409,28 +4414,32 @@ - war, death, famine, pollution + war, death, + famine, pollution Ihre wichtigsten Server. Nur IT-Fachleute dürfen sich an diesen Rechnern anmelden. - pride, greed, envy, wrath, lust, sloth + pride, greed, + envy, wrath, + lust, sloth Weniger wichtige Server. Alle Mitarbeiter der IT-Abteilung dürfen sich auf diesen Rechnern anmelden. - one, two, three, four, ... + one, two, + three, four, ... Gewöhnliche Arbeitsrechner. Nur die wirklichen Mitarbeiter dürfen diese Rechner verwenden. - trashcan + trashcan Ein sehr alter Rechner ohne kritische Daten. Sogar externe Mitarbeiter dürfen diesen Rechner verwenden. @@ -4441,7 +4450,7 @@ Wollten Sie diese Einschränkungen umsetzen, indem Sie jeden Benutzer einzeln blockieren, müssten Sie auf jedem - System für jeden Benutzer eine Zeile in + System für jeden Benutzer eine entsprechende Zeile in passwd einfügen. Wenn Sie nur einen Eintrag vergessen, haben Sie ein Problem. Es mag noch angehen, dies während der ersten Installation zu erledigen, im @@ -4570,7 +4579,7 @@ Netzgruppen nach Benutzern sortiert aus. Die Einrichtung der Clients ist einfach. Sie müssen - lediglich auf dem Server war + lediglich auf dem Server war &man.vipw.8; aufrufen und die Zeile +::::::::: @@ -4582,14 +4591,14 @@ ersetzen. Ab sofort werden nur noch die Daten der in der Netzgruppe - IT_EMP vorhandenen Benutzer in die - Passwortdatenbank von war importiert. + IT_EMP vorhandenen Benutzer in die + Passwortdatenbank von war importiert. Nur diese Benutzer dürfen sich am Server anmelden. Unglücklicherweise gilt diese Einschränkung auch - für die ~-Funktion der Shell und für alle Routinen, - die auf Benutzernamen und numerische Benutzer-IDs zugreifen. - Oder anders formuliert, + für die ~-Funktion der Shell und + für alle Routinen, die auf Benutzernamen und numerische + Benutzer-IDs zugreifen. Oder anders formuliert, cd ~user ist nicht möglich, ls -l zeigt die numerische Benutzer-ID statt dem Benutzernamen und @@ -4645,22 +4654,22 @@ dürfen sich an normalen Arbeitsplätzen sowie an den weniger wichtigen Servern anmelden. Die IT-Lehrlinge dürfen sich nun auch an den Hauptservern anmelden. Sie - legen also die neue Netzgruppe IT_INTERN an, weisen Ihr die - neuen IT-Externen als Benutzer zu und beginnen damit, - die Konfiguration auf jedem einzelnen Rechner zu ändern ... - Halt. Sie haben gerade die alte Regel Fehler in der - zentralisierten Planung führen zu globaler - Verwirrung. bestätigt. + legen also die neue Netzgruppe IT_INTERN an, + weisen Ihr die neuen IT-Externen als Benutzer zu und beginnen + damit, die Konfiguration auf jedem einzelnen Rechner zu + ändern ... Halt. Sie haben gerade die alte Regel + Fehler in der zentralisierten Planung führen zu + globaler Verwirrung. bestätigt. Da NIS in der Lage ist, Netzgruppen aus anderen Netzgruppen zu bilden, lassen sich solche Situationen leicht vermeiden. Eine Möglichkeit ist die Erzeugung rollenbasierter Netzgruppen. Sie könnten eine Netzgruppe - BIGSRV erzeugen, um den Zugang zu + BIGSRV erzeugen, um den Zugang zu den wichtigsten Servern zu beschränken, eine weitere - Gruppe SMALLSRV für die weniger + Gruppe SMALLSRV für die weniger wichtigen Server und eine dritte Netzgruppe - USERBOX für die normalen + USERBOX für die normalen Arbeitsplatzrechner. Jede dieser Netzgruppen enthält die Netzgruppen, die sich auf diesen Rechnern anmelden dürfen. Die Einträge der Netzgruppen in der NIS-Map sollten @@ -4764,8 +4773,8 @@ NIS-Maps neu erzeugen. Wenn Sie diesen Punkt vergessen, kann sich der neue Benutzer nur am NIS-Masterserver anmelden. Wenn Sie also den neuen Benutzer - jsmith anlegen, gehen Sie folgerndermassen - vor: + jsmith anlegen, gehen Sie + folgerndermassen vor: &prompt.root; pw useradd jsmith &prompt.root; cd /var/yp @@ -4827,18 +4836,18 @@ NIS-Server, die auch als NIS-Clients arbeiten - Wenn Sie ypserv in einer Multi-Serverdomäne verwenden, - in der NIS-Server gleichzeitig als NIS-Clients arbeiten, ist es - eine gute Idee, diese Server zu zwingen, sich an sich selbst zu - binden. Damit wird verhindert, dass Bindeanforderungen gesendet - werden und sich die Server gegenseitig binden. Sonst - könnten seltsame Fehler auftreten, wenn ein Server - ausfällt, auf den andere Server angewiesen sind. Letztlich - werden alle Clients einen Timeout melden, und versuchen, sich an - andere Server zu binden. Die dadurch entstehende - Verzögerung kann beträchtlich sein. Außerdem - kann der Fehler erneut auftreten, da sich die Server wiederum - aneinander binden könnten. + Wenn Sie ypserv in einer + Multi-Serverdomäne verwenden, in der NIS-Server + gleichzeitig als NIS-Clients arbeiten, ist es eine gute Idee, + diese Server zu zwingen, sich an sich selbst zu binden. Damit + wird verhindert, dass Bindeanforderungen gesendet werden und + sich die Server gegenseitig binden. Sonst könnten seltsame + Fehler auftreten, wenn ein Server ausfällt, auf den andere + Server angewiesen sind. Letztlich werden alle Clients einen + Timeout melden, und versuchen, sich an andere Server zu binden. + Die dadurch entstehende Verzögerung kann beträchtlich + sein. Außerdem kann der Fehler erneut auftreten, da sich + die Server wiederum aneinander binden könnten. Sie können einen Rechner durch die Verwendung von ypbind sowie der Option @@ -5025,9 +5034,10 @@ Stellen Sie sicher, dass bpf in Ihren Kernel kompiliert ist. Dazu fügen Sie die Zeile - pseudo-device bpf in Ihre - Kernelkonfigurationsdatei ein und erzeugen einen neuen - Kernel. Weitere Informationen zur Kernelkonfiguration + device bpf + (pseudo-device bpf unter &os; 4.X) + in Ihre Kernelkonfigurationsdatei ein und erzeugen einen + neuen Kernel. Weitere Informationen zur Kernelkonfiguration finden Sie in des Handbuchs. @@ -5079,8 +5089,9 @@ Server - Der DHCP-Server dhcpd ist als Teil des - Ports net/isc-dhcp3-server + Der DHCP-Server dhcpd ist als + Teil des Ports + net/isc-dhcp3-server verfügbar. Dieser Port enthält die komplette ISC-DHCP-Distribution, inklusive der Dokumentation. @@ -5170,10 +5181,11 @@ installieren - Stellen Sie sicher, dass bpf in - Ihren Kernel kompiliert ist. Dazu fügen Sie die Zeile - pseudo-device bpf in Ihre - Kernelkonfigurationsdatei ein und erzeugen einen neuen + Stellen Sie sicher, dass &man.bpf.4; in Ihren Kernel + kompiliert ist. Dazu fügen Sie die Zeile + device bpf + (pseudo-device bpf unter &os; 4.X)in + Ihre Kernelkonfigurationsdatei ein und erzeugen einen neuen Kernel. Die Kernelkonfiguration wird in beschrieben. @@ -7285,9 +7297,10 @@ role="ip6addr">FEBC:A574:382B:23C1:AA49:4592:4EFE:9982. Eine IPv6-Adresse enthält oft Teilzeichenfolgen aus lauter - Nullen. Ein solcher Zeichenfolge kann zu :: - verkürzt werden. fe80::1 - entspricht also der Adresse + Nullen. Eine solche Zeichenfolge kann zu :: + verkürzt werden. Bis zu drei führende Nullen eines + Hexquads können ebenfalls weggelassen werden. + fe80::1 entspricht also der Adresse fe80:0000:0000:0000:0000:0000:0000:0001. @@ -7315,8 +7328,8 @@ fe80::200:21ff:fe03:8e1%rl0 handelt es sich um eine automatisch konfigurierte link-local-Adresse. Sie - enthält die (kodierte) Ethernet-MAC-Adresse als - Folge der automatischen Konfiguration. + wird im Rahmen der automatischen Konfiguration aus der + MAC-Adresse erzeugt. Weitere Informationen zum Aufbau von IPv6-Adressen finden Sie im @@ -7341,7 +7354,9 @@ - Die Verwendung eines 6-nach-4-Tunnels. + Die Verwendung eines 6-nach-4-Tunnels + (RFC3068). @@ -7410,27 +7425,22 @@ www.kame.net erreichen und die tanzende Schildkröte sehen können – vorausgesetzt, Sie haben einen IPv6-fähigen Browser wie - www/mozilla installiert. + www/mozilla, + Konqueror (als Teil des Pakets + x11/kdebase3) oder + www/epiphany + installiert. DNS in der IPv6-Welt - Mit IPv6 werden zwei neue DNS-Einträge - eingeführt: + Ursprünglich gab es zwei verschiedene DNS-Einträge + für IPv6. Da A6-Einträge von der IETF für + obsolet erklärt wurden, sind AAAA-Einträge nun + Standard. - - - AAAA-Einträge, - - - - A6-Einträge - - - - Empfohlen wird die Verwendung von AAAA-Einträgen. - Weisen Sie die erhaltene IPv6-Adresse Ihrem Rechnernamen zu, + Weisen Sie die erhaltene IPv6-Adresse Ihrem Rechnernamen zu, indem Sie den Eintrag MYHOSTNAME AAAA MYIPv6ADDR @@ -7440,7 +7450,9 @@ verantwortlich sind, bitten Sie den dafür Zuständigen, diese Änderung durchzuführen. Die aktuellen Versionen von bind - (Version 8.3 oder 9) unterstützen AAAA-Einträge. + (Version 8.3 oder 9) sowie + dns/djbdns (bei Verwendung + des IPv6-Patches) unterstützen AAAA-Einträge. ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.24 2004/05/23 18:30:05 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/bibliography/chapter.sgml,v 1.31 2004/05/09 17:22:32 mheinen Exp $ - basiert auf: 1.62 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.25 2004/06/27 22:26:25 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/bibliography/chapter.sgml,v 1.32 2004/06/06 18:26:08 mheinen Exp $ + basiert auf: 1.63 --> @@ -541,7 +541,7 @@ Raymond, Eric S. The New Hacker's Dictionary, 3rd edition. MIT Press, 1996. ISBN 0-262-68092-0. Auch bekannt als das Jargon + url="http://www.catb.org/~esr/jargon/html/index.html">Jargon File ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.39 2004/05/23 18:30:04 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.60 2004/04/27 23:01:22 mheinen Exp $ - basiert auf: 1.146 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/book.sgml,v 1.40 2004/06/27 22:26:25 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/book.sgml,v 1.61 2004/06/06 15:06:38 mheinen Exp $ + basiert auf: 1.147 --> %trademarks; %txtfiles; + +%urls; ==== //depot/projects/davidxu_ksedbg/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.29 2004/05/23 18:30:05 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.81 2004/05/09 17:22:33 mheinen Exp $ - basiert auf: 1.144 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.30 2004/06/27 22:26:25 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.89 2004/06/27 20:56:00 mheinen Exp $ + basiert auf: 1.156 --> @@ -316,7 +316,7 @@ Als Beispiel sei /usr/local/etc/apache gezeigt: --rw-r--r-- 1 root wheel 2184 May 20 1998 access.conf + -rw-r--r-- 1 root wheel 2184 May 20 1998 access.conf -rw-r--r-- 1 root wheel 2184 May 20 1998 access.conf.default -rw-r--r-- 1 root wheel 9555 May 20 1998 httpd.conf -rw-r--r-- 1 root wheel 9555 May 20 1998 httpd.conf.default @@ -455,8 +455,42 @@ crontab-Dateien wird festgelegt, welche Programme zu welchem Zeitpunkt laufen sollen. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 28 12:20:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4226D16A62F; Mon, 28 Jun 2004 12:20:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 041D816A628; Mon, 28 Jun 2004 12:20:27 +0000 (GMT) Received: from exchhz01.viatech.com.cn (ip-40-162-97-218.anlai.com [218.97.162.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EFD243D49; Mon, 28 Jun 2004 12:20:08 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from freebsd.org (DAVIDWNT [10.4.1.99]) by exchhz01.viatech.com.cn with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id NVXA6KMS; Mon, 28 Jun 2004 14:24:24 +0800 Message-ID: <40DFBA3C.7040806@freebsd.org> Date: Mon, 28 Jun 2004 14:27:08 +0800 From: David Xu User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5b) Gecko/20030723 Thunderbird/0.1 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Marcel Moolenaar References: <200406280413.i5S4DS0D033867@repoman.freebsd.org> In-Reply-To: <200406280413.i5S4DS0D033867@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Daniel Eischen cc: Perforce Change Reviews Subject: Re: PERFORCE change 55970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 12:20:28 -0000 OK, I am glad to see you are working on libthread_db, but I have already a libthread_db tree in ksedbg branch. I am current making libthread_db.so in two levels: the first level is a umbrella, the second level is a driver, every thread library will have a driver, I found you were trying to mix three thread libraries code into in same functions, things like following code looks strange for me, how can you include three different thr_pirvate.h in same .c, and compile them ? +td_ta_map_lwp2thr(const td_thragent_t *ta, lwpid_t lwp, td_thrhandle_t *th) > { > - return (TD_OK); > + ps_err_e err; > + > + th->th_ta = ta; > + > + switch (ta->ta_lib) { > + case PTHREAD_LIBC_R: > + err = ps_pread(ta->ta_ph, ta->ta.libc_r.thread_run, > + &th->th_thread, sizeof(psaddr_t)); > + return (err == PS_OK) ? TD_OK : TD_ERR; > + case PTHREAD_LIBKSE: > + lwp = 0; > + return (TD_NOTHR); > + case PTHREAD_LIBTHR: > + return (TD_NOTHR); > + } > + return (TD_ERR); > } Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=55970 > > Change 55970 by marcel@marcel_nfs on 2004/06/28 04:12:48 > > Submit the result of me fucking around a bit: > o Add td_ta_delete() > o Make this WARNS 4 clean. This basicly means adding __unused > to most of the argument of the functions I haven't implemented > yet. > o Detect libc_r and libthr. I don't worry about libkse, because > davidxu@ is playing with that. We probably need to combine our > efforts... > o Implement some of the functions that GDB already needs. In > particular I see td_ta_thr_iter() play a pivoting role... > > Affected files ... From owner-p4-projects@FreeBSD.ORG Mon Jun 28 13:55:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 663AA16A4D0; Mon, 28 Jun 2004 13:55:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2602416A4CE for ; Mon, 28 Jun 2004 13:55:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2231E43D31 for ; Mon, 28 Jun 2004 13:55:40 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SDtMl6050715 for ; Mon, 28 Jun 2004 13:55:22 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SDtMG2050712 for perforce@freebsd.org; Mon, 28 Jun 2004 13:55:22 GMT (envelope-from davidxu@freebsd.org) Date: Mon, 28 Jun 2004 13:55:22 GMT Message-Id: <200406281355.i5SDtMG2050712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 55998 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 13:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=55998 Change 55998 by davidxu@davidxu_alona on 2004/06/28 13:55:15 Add KSE thread debug code. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/init.c#2 edit .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#2 edit .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/freebsd-threads.c#1 add Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/init.c#2 (text+ko) ==== @@ -108,6 +108,7 @@ extern initialize_file_ftype _initialize_mi_cmd_env; extern initialize_file_ftype _initialize_mi_interp; extern initialize_file_ftype _initialize_mi_main; +extern initialize_file_ftype _initialize_thread_db; extern initialize_file_ftype _initialize_tui_hooks; extern initialize_file_ftype _initialize_tui_interp; extern initialize_file_ftype _initialize_tui_layout; @@ -115,6 +116,7 @@ extern initialize_file_ftype _initialize_tui_regs; extern initialize_file_ftype _initialize_tui_stack; extern initialize_file_ftype _initialize_tui_win; + void initialize_all_files (void) { @@ -136,6 +138,7 @@ _initialize_i386fbsd_nat (); _initialize_gcore (); _initialize_fbsd_proc (); + _initialize_thread_db (); _initialize_remote (); _initialize_dcache (); _initialize_sr_support (); ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jun 28 16:30:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 403B016A4D0; Mon, 28 Jun 2004 16:30:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1913916A4CE for ; Mon, 28 Jun 2004 16:30:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 130DB43D39 for ; Mon, 28 Jun 2004 16:30:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SGUVFR055172 for ; Mon, 28 Jun 2004 16:30:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SGUVV3055169 for perforce@freebsd.org; Mon, 28 Jun 2004 16:30:31 GMT (envelope-from jhb@freebsd.org) Date: Mon, 28 Jun 2004 16:30:31 GMT Message-Id: <200406281630.i5SGUVV3055169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 16:30:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=56005 Change 56005 by jhb@jhb_slimer on 2004/06/28 16:29:55 Update based on things that are now committed. Affected files ... .. //depot/projects/smpng/sys/notes#16 edit Differences ... ==== //depot/projects/smpng/sys/notes#16 (text+ko) ==== @@ -1,14 +1,6 @@ This file serves as a sort of todo list for this branch as well as documenting what patches currently live in this branch. -- SWI Priorities - + SWI_CLOCK - + SWI_TQ* - + Fix tty hacks on clock to use SWI_CLOCK - + sio - + cy - + cx - - Untested - Consolidate linux module version and dependencies into MI location. - Untested - Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead @@ -37,9 +29,6 @@ - Fixup td_ucred of thread doing execve() to re-sync with process ucred after single threading during an exec. - Untested -- Remove sched_lock from lockmgr TDF_DEADLKTREAT flag check. Perhaps we - can move this flag to TDP_DEADLKTREAT even. - - Mostly untested - Use panic_thread pointer instead of panic_cpu to allow for migration of the panic'ing thread - Untested @@ -49,8 +38,6 @@ - Cleanup the SMP rendezvous code to properly use membar's to ensure function pointers are up to date before deferencing them. - Untested -- Further fixes to taskqueue including killing the draining hack. - - Untested - Don't allow kthreads to get signalled and do bad things - Untested - Add a kproc API that does what kthread does right now From owner-p4-projects@FreeBSD.ORG Mon Jun 28 17:42:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BC1316A4D0; Mon, 28 Jun 2004 17:42:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2757E16A4CF; Mon, 28 Jun 2004 17:42:15 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FAF143D5E; Mon, 28 Jun 2004 17:42:14 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i5SHgE3T019417; Mon, 28 Jun 2004 10:42:14 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i5SHgDLS051135; Mon, 28 Jun 2004 10:42:13 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i5SHgDbV051134; Mon, 28 Jun 2004 10:42:13 -0700 (PDT) (envelope-from marcel) Date: Mon, 28 Jun 2004 10:42:13 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040628174213.GA51072@dhcp50.pn.xcllnt.net> References: <200406280413.i5S4DS0D033867@repoman.freebsd.org> <40DFBA3C.7040806@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <40DFBA3C.7040806@freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Daniel Eischen cc: Perforce Change Reviews Subject: Re: PERFORCE change 55970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 17:42:16 -0000 On Mon, Jun 28, 2004 at 02:27:08PM +0800, David Xu wrote: > > OK, I am glad to see you are working on libthread_db, but > I have already a libthread_db tree in ksedbg branch. I know. My focus is different. I don't care so much about libthread_db itself at the moment. My focus is on finding the best possible way to make it all work with the debugger. This includes core dumps, the proc services, ptrace and libthread_db. I need to play around with it all to understand what we need to do where and what it is that's being provided. Then I know how and what we need to add where. We may not need a ttrace(2) syscall for example. We can have ptrace(2) accept lwpids as well as pids and have it do the right thing. Also, as I've told you before, ttrace(2) is not standard, but it's something that already exists. We need to decide whether we want to be compatible with the HP-UX implementation and to what extend. I also found ways to preserve compatibility with RELENG_4, so that we can use gdb 6.1.1 with libthread_db on 4.x core files. This only needs to apply to libc_r of course. > I am current making libthread_db.so in two levels: > the first level is a umbrella, the second level is a driver, > every thread library will have a driver, I found you were trying > to mix three thread libraries code into in same functions, > things like following code looks strange for me, how can you > include three different thr_pirvate.h in same .c, and compile > them ? I don't include any private headers. I'm merely taking advantage of how the libc_r support was written. See src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c Note that although cross-debugging is not something I'm focussed on, I try to avoid depending too much on native (private) headers. This at least keeps the option open for as much as possible. Anyway: I don't care about which libthread_db is eventually going to be used. I just need the stuff the play around with. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Mon Jun 28 19:40:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C141816A4D0; Mon, 28 Jun 2004 19:40:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9765016A4CE for ; Mon, 28 Jun 2004 19:40:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87C2F43D3F for ; Mon, 28 Jun 2004 19:40:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SJdvtq060898 for ; Mon, 28 Jun 2004 19:39:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SJdvFt060894 for perforce@freebsd.org; Mon, 28 Jun 2004 19:39:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 28 Jun 2004 19:39:57 GMT Message-Id: <200406281939.i5SJdvFt060894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 56016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 19:40:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=56016 Change 56016 by rwatson@rwatson_tislabs on 2004/06/28 19:39:39 Integrate netperf_socket. Attempt to recover from warner. Affected files ... .. //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/files#34 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#15 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/include/proc.h#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_idle.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#8 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/netperf_socket/sys/sys/interrupt.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#10 integrate Differences ... ==== //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -34,21 +34,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); - -#include "opt_kstack_pages.h" -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.2 2004/06/28 11:35:05 cognet Exp $"); #include #include -#include -#include -#include -#include #include -#include #include -#include #include #include ==== //depot/projects/netperf_socket/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.913 2004/06/27 20:16:56 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -40,7 +40,7 @@ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" -miidevs.h optional mii \ +miidevs.h optional miibus \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ ==== //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.24 2004/06/25 19:22:04 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.25 2004/06/28 16:17:10 jhb Exp $"); #include @@ -2873,7 +2873,7 @@ #if __FreeBSD_version < 500000 register_swi (SWI_TTY, cx_softintr); #else - swi_add(&tty_ithd, "tty:cx", cx_softintr, NULL, SWI_TTY, 0, + swi_add(&tty_ithd, "cx", cx_softintr, NULL, SWI_TTY, 0, &cx_fast_ih); #endif break; ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.156 2004/06/26 09:20:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.157 2004/06/28 16:17:10 jhb Exp $"); #include "opt_compat.h" @@ -554,9 +554,9 @@ splx(s); if (sio_fast_ih == NULL) { - swi_add(&tty_ithd, "tty:cy", siopoll, NULL, SWI_TTY, 0, + swi_add(&tty_ithd, "cy", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "tty:cy", siopoll, NULL, SWI_TTY, 0, + swi_add(&clk_ithd, "cy", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } minorbase = UNIT_TO_MINOR(unit); ==== //depot/projects/netperf_socket/sys/dev/ex/if_ex_isa.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.8 2004/06/27 13:10:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.10 2004/06/28 16:38:53 imp Exp $"); #include #include @@ -148,7 +148,7 @@ } if (bootverbose) - printf("ex: Found card at 0x%03x!\n", ioport); + printf("ex: Found card at 0x%03lx!\n", (unsigned long)ioport); /* Board in PnP mode */ if (ex_eeprom_read(&sc, EE_W0) & EE_W0_PNP) { @@ -156,7 +156,7 @@ CSR_WRITE_1(&sc, CMD_REG, Reset_CMD); DELAY(500); if (bootverbose) - printf("ex: card at 0x%03x in PnP mode!\n", ioport); + printf("ex: card at 0x%03lx in PnP mode!\n", (unsigned long)ioport); bus_release_resource(parent, SYS_RES_IOPORT, rid, res); continue; } @@ -186,7 +186,8 @@ bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1); bus_set_resource(child, SYS_RES_IOPORT, 0, ioport, EX_IOSIZE); if (bootverbose) - printf("ex: Adding board at 0x%03x, irq %d\n", ioport, irq); + printf("ex: Adding board at 0x%03lx, irq %d\n", + (unsigned long)ioport, irq); } return; @@ -221,12 +222,12 @@ iobase = bus_get_resource_start(dev, SYS_RES_IOPORT, 0); if (!ex_look_for_card(sc)) { if (bootverbose) - printf("ex: no card found at 0x%3x.\n", iobase); + printf("ex: no card found at 0x%03lx.\n", (unsigned long)iobase); error = ENXIO; goto bad; } if (bootverbose) - printf("ex: ex_isa_probe() found card at 0x%03x\n", iobase); + printf("ex: ex_isa_probe() found card at 0x%03lx\n", (unsigned long)iobase); /* * Reset the card. ==== //depot/projects/netperf_socket/sys/dev/sio/sio.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.444 2004/06/27 11:29:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.445 2004/06/28 16:17:10 jhb Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -1132,9 +1132,9 @@ printf("\n"); if (sio_fast_ih == NULL) { - swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } minorbase = UNIT_TO_MINOR(unit); ==== //depot/projects/netperf_socket/sys/i386/i386/mem.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.112 2004/06/28 03:16:32 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mem.c,v 1.113 2004/06/28 05:37:22 imp Exp $"); /* * Memory special file @@ -98,7 +98,6 @@ { switch (minor(dev)) { case 14: - td->td_proc->p_md.md_iopl = 0; td->td_frame->tf_eflags &= ~PSL_IOPL; } return (0); @@ -126,7 +125,6 @@ if (error != 0) return (error); td->td_frame->tf_eflags |= PSL_IOPL; - td->td_proc->p_md.md_iopl = PSL_IOPL; break; } return (0); ==== //depot/projects/netperf_socket/sys/i386/include/proc.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/i386/include/proc.h,v 1.22 2004/06/28 03:16:32 imp Exp $ + * $FreeBSD: src/sys/i386/include/proc.h,v 1.23 2004/06/28 05:37:22 imp Exp $ */ #ifndef _MACHINE_PROC_H_ @@ -52,7 +52,6 @@ struct mdproc { struct proc_ldt *md_ldt; /* (j) per-process ldt */ - uint32_t md_iopl; /* process' iopl level */ }; #ifdef _KERNEL ==== //depot/projects/netperf_socket/sys/kern/kern_condvar.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.48 2004/04/06 19:17:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.49 2004/06/28 18:57:06 jhb Exp $"); #include "opt_ktrace.h" @@ -250,7 +250,7 @@ sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); sleepq_set_timeout(cvp, timo); - rval = sleepq_timedwait(cvp, 0); + rval = sleepq_timedwait(cvp); #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) ==== //depot/projects/netperf_socket/sys/kern/kern_idle.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.37 2004/02/05 21:01:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.38 2004/06/28 16:19:50 jhb Exp $"); #include #include @@ -60,6 +60,7 @@ td = FIRST_THREAD_IN_PROC(p); td->td_state = TDS_CAN_RUN; td->td_flags |= TDF_IDLETD; + td->td_priority = PRI_MAX_IDLE; mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); #ifdef SMP ==== //depot/projects/netperf_socket/sys/kern/kern_synch.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.249 2004/06/07 09:35:00 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.250 2004/06/28 18:57:06 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -236,7 +236,7 @@ if (timo && catch) rval = sleepq_timedwait_sig(ident, sig != 0); else if (timo) - rval = sleepq_timedwait(ident, sig != 0); + rval = sleepq_timedwait(ident); else if (catch) rval = sleepq_wait_sig(ident); else { ==== //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#7 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.7 2004/05/14 20:51:42 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.8 2004/06/28 18:57:06 jhb Exp $"); #include #include @@ -499,17 +499,14 @@ * or it times out while waiting. */ int -sleepq_timedwait(void *wchan, int signal_caught) +sleepq_timedwait(void *wchan) { int rval; sleepq_switch(wchan); rval = sleepq_check_timeout(); mtx_unlock_spin(&sched_lock); - if (signal_caught) - return (0); - else - return (rval); + return (rval); } /* ==== //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.22 2004/02/19 22:03:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.23 2004/06/28 16:28:23 jhb Exp $"); #include #include @@ -52,7 +52,6 @@ const char *tq_name; taskqueue_enqueue_fn tq_enqueue; void *tq_context; - int tq_draining; struct mtx tq_mutex; }; @@ -82,7 +81,6 @@ queue->tq_name = name; queue->tq_enqueue = enqueue; queue->tq_context = context; - queue->tq_draining = 0; mtx_init(&queue->tq_mutex, "taskqueue", NULL, MTX_DEF); mtx_lock(&taskqueue_queues_mutex); @@ -96,17 +94,12 @@ taskqueue_free(struct taskqueue *queue) { - mtx_lock(&queue->tq_mutex); - KASSERT(queue->tq_draining == 0, ("free'ing a draining taskqueue")); - queue->tq_draining = 1; - mtx_unlock(&queue->tq_mutex); - - taskqueue_run(queue); - mtx_lock(&taskqueue_queues_mutex); STAILQ_REMOVE(&taskqueue_queues, queue, taskqueue, tq_link); mtx_unlock(&taskqueue_queues_mutex); + mtx_lock(&queue->tq_mutex); + taskqueue_run(queue); mtx_destroy(&queue->tq_mutex); free(queue, M_TASKQUEUE); } @@ -121,12 +114,11 @@ mtx_lock(&taskqueue_queues_mutex); STAILQ_FOREACH(queue, &taskqueue_queues, tq_link) { - mtx_lock(&queue->tq_mutex); if (strcmp(queue->tq_name, name) == 0) { + mtx_lock(&queue->tq_mutex); mtx_unlock(&taskqueue_queues_mutex); return queue; } - mtx_unlock(&queue->tq_mutex); } mtx_unlock(&taskqueue_queues_mutex); return NULL; @@ -141,14 +133,6 @@ mtx_lock(&queue->tq_mutex); /* - * Don't allow new tasks on a queue which is being freed. - */ - if (queue->tq_draining) { - mtx_unlock(&queue->tq_mutex); - return EPIPE; - } - - /* * Count multiple enqueues. */ if (task->ta_pending) { @@ -189,9 +173,11 @@ taskqueue_run(struct taskqueue *queue) { struct task *task; - int pending; + int owned, pending; - mtx_lock(&queue->tq_mutex); + owned = mtx_owned(&queue->tq_mutex); + if (!owned) + mtx_lock(&queue->tq_mutex); while (STAILQ_FIRST(&queue->tq_queue)) { /* * Carefully remove the first task from the queue and @@ -207,7 +193,13 @@ mtx_lock(&queue->tq_mutex); } - mtx_unlock(&queue->tq_mutex); + + /* + * For compatibility, unlock on return if the queue was not locked + * on entry, although this opens a race window. + */ + if (!owned) + mtx_unlock(&queue->tq_mutex); } static void @@ -235,21 +227,21 @@ } static void -taskqueue_thread_loop(void *arg) +taskqueue_thread_loop(void *dummy) { + + mtx_lock(&taskqueue_thread->tq_mutex); for (;;) { - mtx_lock(&taskqueue_thread->tq_mutex); - while (STAILQ_EMPTY(&taskqueue_thread->tq_queue)) - msleep(taskqueue_thread, &taskqueue_thread->tq_mutex, - PWAIT, "-", 0); - mtx_unlock(&taskqueue_thread->tq_mutex); taskqueue_run(taskqueue_thread); + msleep(taskqueue_thread, &taskqueue_thread->tq_mutex, PWAIT, + "-", 0); } } static void taskqueue_thread_enqueue(void *context) { + mtx_assert(&taskqueue_thread->tq_mutex, MA_OWNED); wakeup(taskqueue_thread); } @@ -275,14 +267,6 @@ mtx_lock_spin(&queue->tq_mutex); /* - * Don't allow new tasks on a queue which is being freed. - */ - if (queue->tq_draining) { - mtx_unlock_spin(&queue->tq_mutex); - return EPIPE; - } - - /* * Count multiple enqueues. */ if (task->ta_pending) { @@ -362,8 +346,9 @@ static void taskqueue_define_fast(void *arg) { - taskqueue_fast = malloc(sizeof(struct taskqueue), - M_TASKQUEUE, M_NOWAIT | M_ZERO); + + taskqueue_fast = malloc(sizeof(struct taskqueue), M_TASKQUEUE, + M_NOWAIT | M_ZERO); if (!taskqueue_fast) { printf("%s: Unable to allocate fast task queue!\n", __func__); return; @@ -382,4 +367,4 @@ NULL, SWI_TQ_FAST, 0, &taskqueue_fast_ih); } SYSINIT(taskqueue_fast, SI_SUB_CONFIGURE, SI_ORDER_SECOND, - taskqueue_define_fast, NULL); + taskqueue_define_fast, NULL); ==== //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubt/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $ -# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubt/Makefile,v 1.5 2004/01/13 11:28:49 ru Exp $ +# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubt/Makefile,v 1.6 2004/06/28 19:06:30 imp Exp $ .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt @@ -7,7 +7,7 @@ -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt KMOD= ng_ubt -SRCS= ng_ubt.c bus_if.h device_if.h vnode_if.h opt_usb.h +SRCS= ng_ubt.c bus_if.h device_if.h vnode_if.h opt_usb.h usbdevs.h .include ==== //depot/projects/netperf_socket/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $ -# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile,v 1.3 2004/01/13 11:28:49 ru Exp $ +# $FreeBSD: src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile,v 1.4 2004/06/28 19:06:30 imp Exp $ .PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw @@ -7,7 +7,7 @@ -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw KMOD= ubtbcmfw -SRCS= ubtbcmfw.c bus_if.h device_if.h vnode_if.h opt_usb.h +SRCS= ubtbcmfw.c bus_if.h device_if.h vnode_if.h opt_usb.h usbdevs.h .include ==== //depot/projects/netperf_socket/sys/net/if_spppsubr.c#8 (text+ko) ==== @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.111 2004/06/25 10:25:33 rik Exp $ + * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.112 2004/06/28 15:32:24 rik Exp $ */ #include @@ -720,7 +720,7 @@ if (debug) log(LOG_DEBUG, SPP_FMT "protocol queue overflow\n", SPP_ARGS(ifp)); - goto drop; + goto drop2; } if (do_account) /* ==== //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.220 2004/06/26 09:20:07 phk Exp $ + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.222 2004/06/28 16:17:11 jhb Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -1801,9 +1801,9 @@ printf("\n"); if (sio_fast_ih == NULL) { - swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } minorbase = UNIT_TO_MINOR(unit); @@ -2754,7 +2754,8 @@ recv_data = 0; } ++com->bytes_in; - if (com->tp->t_hotchar != 0 && recv_data == com->tp->t_hotchar) + if (com->tp != NULL && + com->tp->t_hotchar != 0 && recv_data == com->tp->t_hotchar) swi_sched(sio_fast_ih, 0); ioptr = com->iptr; if (ioptr >= com->ibufend) ==== //depot/projects/netperf_socket/sys/sys/interrupt.h#2 (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/sys/interrupt.h,v 1.26 2003/11/17 06:08:10 peter Exp $ + * $FreeBSD: src/sys/sys/interrupt.h,v 1.27 2004/06/28 16:21:51 jhb Exp $ */ #ifndef _SYS_INTERRUPT_H_ @@ -85,19 +85,18 @@ #define SWI_DELAY 0x2 /* - * Software interrupt bit numbers in priority order. The priority only - * determines which swi will be dispatched next; a higher priority swi - * may be dispatched when a nested h/w interrupt handler returns. + * Software interrupt numbers in priority order. The priority determines + * the priority of the corresponding interrupt thread. */ #define SWI_TTY 0 #define SWI_NET 1 #define SWI_CAMNET 2 #define SWI_CAMBIO 3 #define SWI_VM 4 -#define SWI_TQ_FAST 5 +#define SWI_CLOCK 5 +#define SWI_TQ_FAST 6 +#define SWI_TQ 6 #define SWI_TQ_GIANT 6 -#define SWI_TQ 7 -#define SWI_CLOCK 8 extern struct ithd *tty_ithd; extern struct ithd *clk_ithd; ==== //depot/projects/netperf_socket/sys/sys/sleepqueue.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sleepqueue.h,v 1.2 2004/03/12 19:06:18 jhb Exp $ + * $FreeBSD: src/sys/sys/sleepqueue.h,v 1.3 2004/06/28 18:57:06 jhb Exp $ */ #ifndef _SYS_SLEEPQUEUE_H_ @@ -98,7 +98,7 @@ void sleepq_remove(struct thread *, void *); void sleepq_signal(void *, int, int); void sleepq_set_timeout(void *wchan, int timo); -int sleepq_timedwait(void *wchan, int signal_caught); +int sleepq_timedwait(void *wchan); int sleepq_timedwait_sig(void *wchan, int signal_caught); void sleepq_wait(void *); int sleepq_wait_sig(void *wchan); ==== //depot/projects/netperf_socket/sys/vm/vm_map.c#10 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.339 2004/06/24 22:43:46 green Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.340 2004/06/28 19:15:40 gallatin Exp $"); #include #include @@ -2360,12 +2360,12 @@ vm2->vm_ssize += btoc(entrysize); } else if (entry->start >= (vm_offset_t)vm1->vm_daddr && entry->start < (vm_offset_t)vm1->vm_daddr + ctob(vm1->vm_dsize)) { - newend = min(entry->end, + newend = ulmin(entry->end, (vm_offset_t)vm1->vm_daddr + ctob(vm1->vm_dsize)); - vm2->vm_dsize += btoc(newend - entry->start); + vm2->vm_dsize += btoc(newend - entry->start); } else if (entry->start >= (vm_offset_t)vm1->vm_taddr && entry->start < (vm_offset_t)vm1->vm_taddr + ctob(vm1->vm_tsize)) { - newend = min(entry->end, + newend = ulmin(entry->end, (vm_offset_t)vm1->vm_taddr + ctob(vm1->vm_tsize)); vm2->vm_tsize += btoc(newend - entry->start); } From owner-p4-projects@FreeBSD.ORG Mon Jun 28 21:18:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37CF116A4D0; Mon, 28 Jun 2004 21:18:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0AC7D16A4CE for ; Mon, 28 Jun 2004 21:18:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0186443D46 for ; Mon, 28 Jun 2004 21:18:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SLI04M064323 for ; Mon, 28 Jun 2004 21:18:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SLHx9o064314 for perforce@freebsd.org; Mon, 28 Jun 2004 21:17:59 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Jun 2004 21:17:59 GMT Message-Id: <200406282117.i5SLHx9o064314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 56024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 21:18:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=56024 Change 56024 by peter@peter_overcee on 2004/06/28 21:17:55 IFC @56022 Affected files ... .. //depot/projects/hammer/UPDATING#42 integrate .. //depot/projects/hammer/bin/ps/print.c#13 integrate .. //depot/projects/hammer/bin/ps/ps.c#17 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mh#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/CHANGES#2 delete .. //depot/projects/hammer/contrib/isc-dhcp/COPYRIGHT#3 delete .. //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/LICENSE#1 branch .. //depot/projects/hammer/contrib/isc-dhcp/Makefile#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/Makefile.conf#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/README#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient-script.8#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.8#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#8 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.conf.5#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.leases.5#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/scripts/freebsd#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/alloc.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/bpf.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/comapi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/conflex.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/ctrace.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dhcp-eval.5#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dhcp-options.5#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/discover.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dispatch.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dlpi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/dns.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/ethernet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/execute.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/fddi.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/icmp.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/inet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/iscprint.c#1 branch .. //depot/projects/hammer/contrib/isc-dhcp/common/lpf.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/memory.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/nit.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/options.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/packet.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/parse.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/print.c#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/raw.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/resolv.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/socket.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tables.c#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tr.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/tree.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/common/upf.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/callback.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/cltest.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.3#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/dhcpctl.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/omshell.1#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/omshell.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dhcpctl/remote.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/Makefile.dist#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/base64.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/dst_api.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/dst_support.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/hmac_link.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/md5_dgst.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/md5_locl.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/dst/prandom.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/arpa/nameser.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/cdefs.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/cf/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/ctrace.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhcp.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhcpd.h#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/dhctoken.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/failover.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/inet.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/int.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/lang.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/list.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/result.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/isc-dhcp/types.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/minires.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/res_update.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/minires/resolv.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/netinet/udp.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/alloc.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/buffer.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/convert.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/hash.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/omapip.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/omapip_p.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/omapip/trace.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/osdep.h#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/statement.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/tree.h#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/includes/version.h#5 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_date.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_name.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_parse.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_samedomain.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_sign.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/ns_verify.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_comp.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_findzonecut.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_init.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_mkquery.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_mkupdate.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_query.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_send.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_sendsigned.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/minires/res_update.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/Makefile.dist#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/alloc.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/array.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/auth.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/buffer.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/connection.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/convert.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/dispatch.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/errwarn.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/generic.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/handle.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/hash.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/listener.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/message.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/mrtrace.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/omapi.3#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/protocol.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/result.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/support.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/test.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/toisc.c#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/omapip/trace.c#2 integrate .. //depot/projects/hammer/etc/rc.shutdown#5 integrate .. //depot/projects/hammer/etc/rc.subr#17 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/doc/inc-hist.diff#2 delete .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/doc/inc-hist.diff#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#10 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_buffer.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_data_into_fd.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#9 integrate .. //depot/projects/hammer/lib/libpthread_dbg/Makefile#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.c#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg.h#2 delete .. //depot/projects/hammer/lib/libpthread_dbg/pthread_dbg_int.h#2 delete .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_atfork.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#6 integrate .. //depot/projects/hammer/libexec/getty/subr.c#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#10 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.8#3 integrate .. //depot/projects/hammer/share/man/man4/ng_ksocket.4#3 integrate .. //depot/projects/hammer/share/man/man4/pty.4#3 integrate .. //depot/projects/hammer/share/man/man9/style.9#15 integrate .. //depot/projects/hammer/share/misc/pci_vendors#10 integrate .. //depot/projects/hammer/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#49 integrate .. //depot/projects/hammer/sys/conf/files#67 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#23 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#26 integrate .. //depot/projects/hammer/sys/conf/options#42 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#39 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#22 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#9 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#12 integrate .. //depot/projects/hammer/sys/dev/cy/cy.c#9 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#13 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#11 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#24 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#33 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#17 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#19 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_disk.c#9 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#10 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#15 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#15 integrate .. //depot/projects/hammer/sys/dev/si/si.c#11 integrate .. //depot/projects/hammer/sys/dev/si/si.h#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#36 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#11 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#12 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#7 integrate .. //depot/projects/hammer/sys/dev/sx/sx.h#2 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#12 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/hammer/sys/dev/usb/devlist2h.awk#3 delete .. //depot/projects/hammer/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/udbp.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/umct.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/urio.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#37 delete .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#37 delete .. //depot/projects/hammer/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#10 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#10 integrate .. //depot/projects/hammer/sys/dev/zs/zs_macio.c#4 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#25 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#23 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/hammer/sys/i386/include/float.h#6 integrate .. //depot/projects/hammer/sys/i386/include/proc.h#6 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#55 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#21 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/hammer/sys/kern/tty.c#20 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/hammer/sys/modules/ar/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/aue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/axe/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/cue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/kue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/rue/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sr/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ubsa/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ucom/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/udav/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/udbp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ufm/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uftdi/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ugen/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uhid/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ukbd/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/ulpt/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umass/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umct/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/umodem/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ums/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/uplcom/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/urio/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/uscanner/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uvisor/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/uvscom/Makefile#4 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/hammer/sys/net/if_loop.c#19 integrate .. //depot/projects/hammer/sys/net/if_sl.c#13 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#14 integrate .. //depot/projects/hammer/sys/net/ppp_tty.c#7 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#13 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#7 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_UI.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_lmi.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_rfc1490.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_sample.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_tee.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#22 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#25 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#35 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#20 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#35 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#21 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#28 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#28 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#27 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#22 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#20 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#38 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/hammer/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/nexus.c#6 integrate .. //depot/projects/hammer/sys/powerpc/psim/iobus.c#4 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#15 integrate .. //depot/projects/hammer/sys/sparc64/include/bus_private.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#15 integrate .. //depot/projects/hammer/sys/sys/interrupt.h#8 integrate .. //depot/projects/hammer/sys/sys/linedisc.h#3 integrate .. //depot/projects/hammer/sys/sys/proc.h#54 integrate .. //depot/projects/hammer/sys/sys/procfs.h#2 integrate .. //depot/projects/hammer/sys/sys/serial.h#2 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#20 integrate .. //depot/projects/hammer/sys/sys/tty.h#11 integrate .. //depot/projects/hammer/sys/sys/ttycom.h#7 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#29 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#14 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#39 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/hammer/tools/tools/pciid/mk_pci_vendors.pl#3 integrate .. //depot/projects/hammer/usr.bin/cut/cut.1#4 integrate .. //depot/projects/hammer/usr.bin/cut/cut.c#3 integrate .. //depot/projects/hammer/usr.bin/indent/args.c#5 integrate .. //depot/projects/hammer/usr.bin/indent/indent.c#6 integrate .. //depot/projects/hammer/usr.bin/indent/indent_globs.h#5 integrate .. //depot/projects/hammer/usr.bin/indent/io.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#8 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#13 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/hammer/usr.bin/tar/matching.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#7 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#6 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#9 integrate .. //depot/projects/hammer/usr.bin/tr/tr.1#5 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bcmfw/bcmfw.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#6 integrate Differences ... ==== //depot/projects/hammer/UPDATING#42 (text+ko) ==== @@ -1530,16 +1530,16 @@ [7] make buildworld [9] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - cp src/sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] + cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - cd src/sys/boot ; make install [6] + cd sys/boot ; make STRIP="" install [6] [1] [3] - /etc/rc.d/preseedrandom [10] + /usr/src/etc/rc.d/preseedrandom [10] mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] + mergemaster -i [4] Make sure that you've read the UPDATING file to understand the @@ -1609,7 +1609,13 @@ that is hard to boot to recover. [9] When checking out sources, you must include the -P flag to have - cvs prune empty directories. + cvs prune empty directories. Also, if CPUTYPE is defined in your + /etc/make.conf, make sure to use the "?=" instead of the "=" assignment + operator, so that buildworld can override the CPUTYPE if it needs to. + In case you would like to avoid installing new packages of everything, + you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x + compatibility libraries are build which should allow you to continue + using your existing software for a while. [10] In order to create temporary files, /dev/random must be initialized by feeding data into it. /etc/rc.d/preseedrandom @@ -1647,4 +1653,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.317 2004/06/23 01:32:28 mlaier Exp $ +$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $ ==== //depot/projects/hammer/bin/ps/print.c#13 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.92 2004/06/27 23:59:38 gad Exp $"); #include #include @@ -668,6 +668,9 @@ class = lpri->pri_class; level = lpri->pri_level; switch (class) { + case PRI_ITHD: + snprintf(str, sizeof(str), "intr:%u", level); + break; case PRI_REALTIME: snprintf(str, sizeof(str), "real:%u", level); break; ==== //depot/projects/hammer/bin/ps/ps.c#17 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.106 2004/06/27 22:56:58 gad Exp $"); #include #include @@ -715,9 +715,10 @@ { const char *ttypath; struct stat sb; - char pathbuf[PATH_MAX]; + char pathbuf[PATH_MAX], pathbuf2[PATH_MAX]; ttypath = NULL; + pathbuf2[0] = '\0'; switch (*elem) { case '/': ttypath = elem; @@ -732,28 +733,35 @@ strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); ttypath = pathbuf; - if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0) break; if (strcmp(pathbuf, _PATH_CONSOLE) == 0) break; - if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* Check to see if /dev/tty${elem} exists */ + strlcpy(pathbuf2, _PATH_TTY, sizeof(pathbuf2)); + strlcat(pathbuf2, elem, sizeof(pathbuf2)); + if (stat(pathbuf2, &sb) == 0 && S_ISCHR(sb.st_mode)) { /* No need to repeat stat() && S_ISCHR() checks */ ttypath = NULL; break; } - /* /dev/${elem} does not exist, so try /dev/tty${elem} */ - strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); - strlcat(pathbuf, elem, sizeof(pathbuf)); break; } if (ttypath) { if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); + if (pathbuf2[0] != '\0') + warn("%s and %s", pathbuf2, ttypath); + else + warn("%s", ttypath); optfatal = 1; return (0); } if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); + if (pathbuf2[0] != '\0') + warnx("%s and %s: Not a terminal", pathbuf2, + ttypath); + else + warnx("%s: Not a terminal", ttypath); optfatal = 1; return (0); } ==== //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mh#2 (text+ko) ==== @@ -1,3 +1,3 @@ -NATDEPFILES= fbsd-proc.o fbsd-thread.o fork-child.o gcore.o \ +NATDEPFILES= fbsd-proc.o fork-child.o gcore.o \ ia64-fbsd-nat.o infptrace.o inftarg.o NAT_FILE= nm-fbsd.h ==== //depot/projects/hammer/contrib/isc-dhcp/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=8 -$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.19 2004/01/19 22:07:59 mbr Exp $ +$FreeBSD: src/contrib/isc-dhcp/FREEBSD-upgrade,v 1.21 2004/06/26 23:19:40 mbr Exp $ -ISC DHCP client 3.0.1rc12 +ISC DHCP client 3.0.1rc14 originals can be found at: ftp://ftp.isc.org/isc/dhcp/ @@ -27,8 +27,8 @@ Imported by: - cvs import -m 'Import ISC DHCP 3.0.1 RC11 client.' \ - src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc12 + cvs import -m 'Import ISC DHCP 3.0.1 RC14 client.' \ + src/contrib/isc-dhcp ISC isc_dhcp_3_0_1_rc14 To make local changes to isc-dhcp, simply patch and commit to the main @@ -65,6 +65,8 @@ - Remove dhcpd from SEE ALSO section. common/dispatch.c r1.2 - interface polling + common/parse.c + r1.2 - 64bit time_t fix includes/dhcpd.h r1.5 - interface polling r1.4 - interface polling ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile#3 (text+ko) ==== @@ -1,42 +1,32 @@ # Makefile # -# Copyright (c) 2002 Internet Software Consortium. -# All rights reserved. +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of Internet Software Consortium nor the names -# of its contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ # -# This software has been written for the Internet Software Consortium +# This software has been written for Internet Systems Consortium # by Ted Lemon in cooperation with Vixie Enterprises and Nominum, Inc. -# To learn more about the Internet Software Consortium, see +# To learn more about Internet Systems Consortium, see # ``http://www.isc.org/''. To learn more about Vixie Enterprises, # see ``http://www.vix.com''. To learn more about Nominum, Inc., see # ``http://www.nominum.com''. -# all: @sysname=`./configure --print-sysname`; \ ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile.conf#3 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.conf # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ ## Defaults... SCRIPT = none ==== //depot/projects/hammer/contrib/isc-dhcp/Makefile.dist#3 (text+ko) ==== @@ -1,21 +1,26 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1995-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ + SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl ==== //depot/projects/hammer/contrib/isc-dhcp/README#5 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - April 28, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 README FILE @@ -97,18 +96,16 @@ RELEASE STATUS -This is the twelfth release candidate of version 3.0.1 of the ISC DHCP -Distribution. Development of this release is approaching the point at -which it will be frozen, and no significant new features will be -added. +This is fourteenth release candidate of version 3.0.1 of the ISC DHCP +Distribution. In this release, the server and relay agent are currently fully functional on NetBSD, Linux systems with kernel version 2.2 or later, -FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The -software will also run on HP-UX, but only supports a single network -interface. Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but -are not in wide use, with all that implies. We are not aware of an -easy way to get this software running on HP-UX. +FreeBSD, OpenBSD, BSD/OS, Digital Tru64 Unix and Solaris. The software +will also run on HP-UX, but only supports a single network interface. +Ports also exist for QNX, SCO, NeXTStep, and MacOS X, but are not in +wide use, with all that implies. We are not aware of an easy way to +get this software running on HP-UX. The DHCP client currently only knows how to configure the network on NetBSD, FreeBSD, OpenBSD, BSD/os, Linux, Solaris and NextStep. The @@ -143,14 +140,14 @@ To build the DHCP Distribution, unpack the compressed tar file using the tar utility and the gzip command - type something like: - zcat dhcp-3.0.1rc11.tar.gz |tar xvf - + zcat dhcp-3.0.1rc14.tar.gz |tar xvf - On BSD/OS, you have to type gzcat, not zcat, and you may run into similar problems on other operating systems. CONFIGURING IT -Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just +Now, cd to the dhcp-3.0.1rc14 subdirectory that you've just created and configure the source tree by typing: ./configure @@ -466,14 +463,14 @@ client is different (not necessarily better or worse) than that of the ISC client, but in most cases it will be a lot easier for you to just use that. Please do not ask for help in using the Solaris DHCP client -on Internet Software Consortium mailing lists - that's why you're +on Internet Systems Consortium mailing lists - that's why you're paying Sun the big bucks. If you're having a problem with the Solaris client interoperating with the ISC dhcp server, that's another matter, but please check with Sun first. SUPPORT -The Internet Software Consortium DHCP server is not a commercial +The Internet Systems Consortium DHCP server is not a commercial product, and is not supported by the ISC. However, it has attracted a fairly sizable following on the Internet, which means that there are a lot of knowledgable users who may be able to help you if you get @@ -508,8 +505,8 @@ release and see if the bug is still in that version of the software, and if it's not, _then_ report it. It's okay to report bugs in the latest patchlevel of a major version that's not the most recent major -version, though - for example, if you're running 2.0, you don't have -to upgrade to 3.0 before you can report bugs. +version, though - for example, if you're running 3.0pl2, you don't have +to upgrade to a 3.0.1rc (release candidate) before you can report bugs. PLEASE DO NOT REPORT BUGS IF YOU ARE RUNNING A VERSION OF THE ISC DHCP DISTRIBUTION THAT YOU DIDN'T GET FROM THE ISC! Free operating @@ -639,7 +636,7 @@ dhcpcd, this is _not_ the ISC DHCP client, and we probably can't help you with it. -Please see http://www.isc.org/services/public/lists/dhcp-lists.html -for details on how to subscribe to the ISC DHCP mailing lists. +Please see http://www.isc.org/sw/dhcp/ for details on how to subscribe +to the ISC DHCP mailing lists. ==== //depot/projects/hammer/contrib/isc-dhcp/RELNOTES#5 (text+ko) ==== @@ -1,7 +1,6 @@ - Internet Software Consortium DHCP Distribution - Version 3.0.1 - Release Candidate 12 - June, 2002 + Internet Systems Consortium DHCP Distribution + Version 3.0.1rc14 + June 09, 2004 Release Notes @@ -23,11 +22,9 @@ - Many bug fixes, performance enhancements, and minor new DHCP protocol features. -This is a release candidate for a minor bug fix release to follow ISC -DHCP 3.0. The main bug fixed here is a bug in the subclass allocation -code that could result in a memory smash. Any users of the ISC DHCP server -who are using subclasses should seriously consider upgrading to 3.0.1 -either now or when the final 3.0.1 release comes out. +The main bug fixed here is a bug in the subclass allocation code that +could result in a memory smash. Any users of the ISC DHCP server who +are using subclasses should seriously consider upgrading to 3.0.1. If you are running 3.0 beta 1 and are doing dynamic DNS updates, the lease file is no longer forward-compatible to 3.0 final. A script @@ -46,6 +43,55 @@ thanks to all of these good people here, both for working on the code and for prodding me into improving it. + Changes since 3.0.1rc13 + +! CAN-2004-0460 - CERT VU#317350: Five stack overflow exploits were closed + in logging messages with excessively long hostnames provided by the + clients. It is highly probable that these could have been used by + attackers to gain arbitrary root access on systems using ISC DHCP 3.0.1 + release candidates 12 or 13. Special thanks to Gregory Duchemin for + both finding and solving the problem. + +! CAN-2004-0461 - CERT VU#654390: Once the above was closed, an opening + in log_*() functions was evidented, on some specific platforms where + vsnprintf() was not believed to be available and calls were wrapped to + sprintf() instead. Again, credit goes to Gregory Duchemin for finding + the problem. Calls to snprintf() are now linked to a distribution-local + snprintf implementation, only in those cases where the architecture is + not known to provide one (see includes/cf/[arch].h). If you experience + linking problems with snprintf/vsnprintf or 'isc_print_' functions, this + is where to look. This vulnerability did not exist in any previously + published version of ISC DHCP. + +- Compilation on hpux 11.11 was repaired. + +- 'The cross-compile bug fix' was backed out. + + Changes since 3.0.1rc12 + +- Fixed a bug in omapi lease lookup function, to form the hardware + address for the hash lookup correctly, thanks to a patch from + Richard Hirst. + +- Fixed a bug where dhcrelay was sending relayed responses back to the + broadcast address, but with the source's unicast mac address. Should + now conform to rfc2131 section 4.1. + +- Cross-compile bug fix; use $(AR) instead of ar. Thanks to Morten Brorup. + +- Fixed a crash bug in dhclient where dhcpd servers that do not provide + renewal times results in an FPE. As a side effect, dhclient can now + properly handle 0xFFFFFFFF (-1) expiry times supplied by servers. Thanks + to a patch from Burt Silverman. + +- The 'ping timeout' debugs from rc12 were removed to -DDEBUG only, + and reformatted to correct a compilation error on solaris platforms. + +- A patch was applied which fixes a case where leases read from the + leases database do not properly over-ride previously read leases. + +- dhcpctl.3 manpage was tweaked. + Changes since 3.0.1rc11 - A patch from Steve Campbell was applied with minor modifications to @@ -93,6 +139,9 @@ appear in a lease file. An option that might have been named "#144" is now "unknown-144". +- Another patch from Bill Stephens which allows the ping-check timeout to + be configured as 'ping-timeout'. Defaults to 1. + Changes since 3.0.1rc10 - Potential buffer overflows in minires repaired. ==== //depot/projects/hammer/contrib/isc-dhcp/client/Makefile.dist#3 (text+ko) ==== @@ -1,21 +1,25 @@ # Makefile.dist # -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: +# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 1996-2003 by Internet Software Consortium # -# http://www.isc.org/isc-license-1.0.html. +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# +# Internet Systems Consortium, Inc. +# 950 Charter Street +# Redwood City, CA 94063 +# +# http://www.isc.org/ CATMANPAGES = dhclient.cat8 dhclient.conf.cat5 dhclient-script.cat8 \ dhclient.leases.cat5 ==== //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#5 (text+ko) ==== @@ -3,39 +3,30 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 28 21:56:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A90A016A4D0; Mon, 28 Jun 2004 21:56:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B68116A4CE for ; Mon, 28 Jun 2004 21:56:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 72C4343D1F for ; Mon, 28 Jun 2004 21:56:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SLulNQ065520 for ; Mon, 28 Jun 2004 21:56:47 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SLulpO065517 for perforce@freebsd.org; Mon, 28 Jun 2004 21:56:47 GMT (envelope-from peter@freebsd.org) Date: Mon, 28 Jun 2004 21:56:47 GMT Message-Id: <200406282156.i5SLulpO065517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 56025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 21:56:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=56025 Change 56025 by peter@peter_overcee on 2004/06/28 21:56:39 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#92 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#63 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#28 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#86 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#34 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#24 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#40 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#12 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#28 (text+ko) ==== @@ -100,6 +100,7 @@ u_int io_edgetrigger:1; u_int io_masked:1; int io_dest:5; + int io_bus:4; }; struct ioapic { @@ -115,6 +116,8 @@ static u_int ioapic_read(volatile ioapic_t *apic, int reg); static void ioapic_write(volatile ioapic_t *apic, int reg, u_int val); +static const char *ioapic_bus_string(int bus_type); +static void ioapic_print_vector(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); static void ioapic_disable_source(struct intsrc *isrc); static void ioapic_eoi_source(struct intsrc *isrc); @@ -163,7 +166,46 @@ apic->iowin = val; } +static const char * +ioapic_bus_string(int bus_type) +{ + + switch (bus_type) { + case APIC_BUS_ISA: + return ("ISA"); + case APIC_BUS_EISA: + return ("EISA"); + case APIC_BUS_PCI: + return ("PCI"); + default: + return ("unknown"); + } +} + static void +ioapic_print_vector(struct ioapic_intsrc *intpin) +{ + + switch (intpin->io_vector) { + case VECTOR_DISABLED: + printf("disabled"); + break; + case VECTOR_EXTINT: + printf("ExtINT"); + break; + case VECTOR_NMI: + printf("NMI"); + break; + case VECTOR_SMI: + printf("SMI"); + break; + default: + printf("%s IRQ %u", ioapic_bus_string(intpin->io_bus), + intpin->io_vector); + } +} + +static void ioapic_enable_source(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; @@ -299,10 +341,7 @@ if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); - if (intpin->io_vector == VECTOR_EXTINT) - printf("ExtINT"); - else - printf("IRQ %u", intpin->io_vector); + ioapic_print_vector(intpin); printf(") to cluster %u\n", intpin->io_dest); } ioapic_program_intpin(intpin); @@ -365,32 +404,39 @@ { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; struct ioapic *io = (struct ioapic *)isrc->is_pic; + int changed; KASSERT(!(trig == INTR_TRIGGER_CONFORM || pol == INTR_POLARITY_CONFORM), ("%s: Conforming trigger or polarity\n", __func__)); /* - * For now we ignore any requests but do output any changes that - * would be made to the console it bootverbose is enabled. The only - * known causes of these messages so far is a bug in acpi(4) that - * causes the ISA IRQs used for PCI interrupts in PIC mode to be - * set to level/low when they aren't being used. There are possibly - * legitimate requests, so at some point when the acpi(4) driver is - * fixed this code can be changed to actually change the intpin as - * requested. + * EISA interrupts always use active high polarity, so don't allow + * them to be set to active low. + * + * XXX: Should we write to the ELCR if the trigger mode changes for + * an EISA IRQ? */ - if (!bootverbose) - return (0); - if (intpin->io_edgetrigger != (trig == INTR_TRIGGER_EDGE)) - printf( - "ioapic%u: Request to change trigger for pin %u to %s ignored\n", - io->io_id, intpin->io_intpin, trig == INTR_TRIGGER_EDGE ? - "edge" : "level"); - if (intpin->io_activehi != (pol == INTR_POLARITY_HIGH)) - printf( - "ioapic%u: Request to change polarity for pin %u to %s ignored\n", - io->io_id, intpin->io_intpin, pol == INTR_POLARITY_HIGH ? - "high" : "low"); + if (intpin->io_bus == APIC_BUS_EISA) + pol = INTR_POLARITY_HIGH; + changed = 0; + if (intpin->io_edgetrigger != (trig == INTR_TRIGGER_EDGE)) { + if (bootverbose) + printf("ioapic%u: Changing trigger for pin %u to %s\n", + io->io_id, intpin->io_intpin, + trig == INTR_TRIGGER_EDGE ? "edge" : "level"); + intpin->io_edgetrigger = (trig == INTR_TRIGGER_EDGE); + changed++; + } + if (intpin->io_activehi != (pol == INTR_POLARITY_HIGH)) { + if (bootverbose) + printf("ioapic%u: Changing polarity for pin %u to %s\n", + io->io_id, intpin->io_intpin, + pol == INTR_POLARITY_HIGH ? "high" : "low"); + intpin->io_activehi = (pol == INTR_POLARITY_HIGH); + changed++; + } + if (changed) + ioapic_program_intpin(intpin); return (0); } @@ -491,44 +537,36 @@ intpin->io_vector = intbase + i; /* - * Assume that pin 0 on the first IO APIC is an ExtINT pin by - * default. Assume that intpins 1-15 are ISA interrupts and - * use suitable defaults for those. Assume that all other - * intpins are PCI interrupts. Enable the ExtINT pin if - * mixed mode is available and active but mask all other pins. + * Assume that pin 0 on the first I/O APIC is an ExtINT pin + * and that pins 1-15 are ISA interrupts. Assume that all + * other pins are PCI interrupts. */ - if (intpin->io_vector == 0) { + if (intpin->io_vector == 0) + ioapic_set_extint(io, i); + else if (intpin->io_vector < IOAPIC_ISA_INTS) { + intpin->io_bus = APIC_BUS_ISA; intpin->io_activehi = 1; intpin->io_edgetrigger = 1; - intpin->io_vector = VECTOR_EXTINT; - if (mixed_mode_enabled && mixed_mode_active) - intpin->io_masked = 0; - else - intpin->io_masked = 1; - } else if (intpin->io_vector < IOAPIC_ISA_INTS) { - intpin->io_activehi = 1; - intpin->io_edgetrigger = 1; intpin->io_masked = 1; } else { + intpin->io_bus = APIC_BUS_PCI; intpin->io_activehi = 0; intpin->io_edgetrigger = 0; intpin->io_masked = 1; } /* - * Start off without a logical cluster destination until - * the pin is enabled. + * Route interrupts to the BSP by default using physical + * addressing. Vectored interrupts get readdressed using + * logical IDs to CPU clusters when they are enabled. */ intpin->io_dest = DEST_NONE; - if (bootverbose) { + if (bootverbose && intpin->io_vector != VECTOR_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); - if (intpin->io_vector == VECTOR_EXTINT) - printf("ExtINT"); - else - printf("irq %u", intpin->io_vector); - printf(" (%s, active%s)\n", intpin->io_edgetrigger ? - "edge" : "level", intpin->io_activehi ? "hi" : - "lo"); + ioapic_print_vector(intpin); + printf(" (%s, %s)\n", intpin->io_edgetrigger ? + "edge" : "level", intpin->io_activehi ? "high" : + "low"); } value = ioapic_read(apic, IOAPIC_REDTBL_LO(i)); ioapic_write(apic, IOAPIC_REDTBL_LO(i), value | IOART_INTMSET); @@ -583,6 +621,25 @@ } int +ioapic_set_bus(void *cookie, u_int pin, int bus_type) +{ + struct ioapic *io; + + if (bus_type < 0 || bus_type > APIC_BUS_MAX) + return (EINVAL); + io = (struct ioapic *)cookie; + if (pin >= io->io_numintr) + return (EINVAL); + if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + return (EINVAL); + io->io_pins[pin].io_bus = bus_type; + if (bootverbose) + printf("ioapic%u: intpin %d bus %s\n", io->io_id, pin, + ioapic_bus_string(bus_type)); + return (0); +} + +int ioapic_set_nmi(void *cookie, u_int pin) { struct ioapic *io; @@ -590,8 +647,11 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); + if (io->io_pins[pin].io_vector == VECTOR_NMI) + return (0); if (io->io_pins[pin].io_vector >= NUM_IO_INTS) return (EINVAL); + io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_vector = VECTOR_NMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; @@ -610,8 +670,11 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); + if (io->io_pins[pin].io_vector == VECTOR_SMI) + return (0); if (io->io_pins[pin].io_vector >= NUM_IO_INTS) return (EINVAL); + io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_vector = VECTOR_SMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; @@ -630,10 +693,18 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); + if (io->io_pins[pin].io_vector == VECTOR_EXTINT) + return (0); if (io->io_pins[pin].io_vector >= NUM_IO_INTS) return (EINVAL); + io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; io->io_pins[pin].io_vector = VECTOR_EXTINT; - io->io_pins[pin].io_masked = 0; + + /* Enable this pin if mixed mode is available and active. */ + if (mixed_mode_enabled && mixed_mode_active) + io->io_pins[pin].io_masked = 0; + else + io->io_pins[pin].io_masked = 1; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; if (bootverbose) ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#92 (text+ko) ==== @@ -558,27 +558,8 @@ } /* - * Arrange to trap the next fpu or `fwait' instruction (see fpu.c - * for why fwait must be trapped at least if there is an fpu or an - * emulator). This is mainly to handle the case where npx0 is not - * configured, since the fpu routines normally set up the trap - * otherwise. It should be done only at boot time, but doing it - * here allows modifying `fpu_exists' for testing the emulator on - * systems with an fpu. - */ - load_cr0(rcr0() | CR0_MP | CR0_TS); - - /* Initialize the fpu (if any) for the current process. */ - /* - * XXX the above load_cr0() also initializes it and is a layering - * violation. It drops the fpu state partially - * and this would be fatal if we were interrupted now, and decided - * to force the state to the pcb, and checked the invariant - * (CR0_TS clear) if and only if PCPU_GET(fpcurthread) != NULL). - * ALL of this can happen except the check. The check used to - * happen and be fatal later when we didn't complete the drop - * before returning to user mode. This should be fixed properly - * soon. + * Drop the FP state if we hold it, so that the process gets a + * clean FP state if it uses the FPU again. */ fpstate_drop(td); } @@ -589,8 +570,11 @@ register_t cr0; cr0 = rcr0(); - cr0 |= CR0_NE; /* Done by fpuinit() */ - cr0 |= CR0_MP | CR0_TS; /* Done at every execve() too. */ + /* + * CR0_MP, CR0_NE and CR0_TS are also set by npx_probe() for the + * BSP. See the comments there about why we set them. + */ + cr0 |= CR0_MP | CR0_NE | CR0_TS; cr0 |= CR0_WP | CR0_AM; load_cr0(cr0); } ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#63 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#28 (text+ko) ==== @@ -639,14 +639,28 @@ pin = intr->dst_apic_int; switch (intr->int_type) { case INTENTRY_TYPE_INT: - if (busses[intr->src_bus_id].bus_type == NOBUS) + switch (busses[intr->src_bus_id].bus_type) { + case NOBUS: panic("interrupt from missing bus"); - if (busses[intr->src_bus_id].bus_type == ISA && - intr->src_bus_irq != pin) { + case ISA: + case EISA: + if (busses[intr->src_bus_id].bus_type == ISA) + ioapic_set_bus(ioapic, pin, APIC_BUS_ISA); + else + ioapic_set_bus(ioapic, pin, APIC_BUS_EISA); + if (intr->src_bus_irq == pin) + break; ioapic_remap_vector(ioapic, pin, intr->src_bus_irq); if (ioapic_get_vector(ioapic, intr->src_bus_irq) == intr->src_bus_irq) ioapic_disable_pin(ioapic, intr->src_bus_irq); + break; + case PCI: + ioapic_set_bus(ioapic, pin, APIC_BUS_PCI); + break; + default: + ioapic_set_bus(ioapic, pin, APIC_BUS_UNKNOWN); + break; } break; case INTENTRY_TYPE_NMI: ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#86 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#34 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1161) +# (XXX from i386:NOTES,v 1.1162) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.14 2004/05/17 22:13:14 peter Exp $ # ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#24 (text+ko) ==== @@ -114,6 +114,12 @@ #define APIC_IPI_DEST_ALL -2 #define APIC_IPI_DEST_OTHERS -3 +#define APIC_BUS_UNKNOWN -1 +#define APIC_BUS_ISA 0 +#define APIC_BUS_EISA 1 +#define APIC_BUS_PCI 2 +#define APIC_BUS_MAX APIC_BUS_PCI + /* * An APIC enumerator is a psuedo bus driver that enumerates APIC's including * CPU's and I/O APIC's. @@ -142,6 +148,7 @@ int ioapic_next_logical_cluster(void); void ioapic_register(void *cookie); int ioapic_remap_vector(void *cookie, u_int pin, int vector); +int ioapic_set_bus(void *cookie, u_int pin, int bus_type); int ioapic_set_extint(void *cookie, u_int pin); int ioapic_set_nmi(void *cookie, u_int pin); int ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol); ==== //depot/projects/hammer/sys/amd64/include/cpu.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#9 (text+ko) ==== @@ -62,7 +62,6 @@ #define DBL_MAX 1.7976931348623157E+308 #define DBL_MAX_10_EXP 308 - #define LDBL_MANT_DIG 64 #define LDBL_EPSILON 1.0842021724855044340E-19L #define LDBL_DIG 18 ==== //depot/projects/hammer/sys/amd64/include/pmap.h#40 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/proc.h#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jun 28 23:06:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71B5C16A4D0; Mon, 28 Jun 2004 23:06:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 328EF16A4CE; Mon, 28 Jun 2004 23:06:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 109BD43D39; Mon, 28 Jun 2004 23:06:27 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from freebsd.org (davidxu@localhost [127.0.0.1]) i5SN6PvU099857; Mon, 28 Jun 2004 23:06:26 GMT (envelope-from davidxu@freebsd.org) Message-ID: <40E0A3FD.1000804@freebsd.org> Date: Tue, 29 Jun 2004 07:04:29 +0800 From: David Xu User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6) Gecko/20040624 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Marcel Moolenaar References: <200406280413.i5S4DS0D033867@repoman.freebsd.org> <40DFBA3C.7040806@freebsd.org> <20040628174213.GA51072@dhcp50.pn.xcllnt.net> In-Reply-To: <20040628174213.GA51072@dhcp50.pn.xcllnt.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Daniel Eischen cc: Perforce Change Reviews Subject: Re: PERFORCE change 55970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 23:06:28 -0000 Marcel Moolenaar wrote: >On Mon, Jun 28, 2004 at 02:27:08PM +0800, David Xu wrote: > > >>OK, I am glad to see you are working on libthread_db, but >>I have already a libthread_db tree in ksedbg branch. >> >> > >I know. My focus is different. I don't care so much about libthread_db >itself at the moment. My focus is on finding the best possible way >to make it all work with the debugger. This includes core dumps, the >proc services, ptrace and libthread_db. I need to play around with it >all to understand what we need to do where and what it is that's being >provided. Then I know how and what we need to add where. > >We may not need a ttrace(2) syscall for example. We can have ptrace(2) >accept lwpids as well as pids and have it do the right thing. Also, as >I've told you before, ttrace(2) is not standard, but it's something >that already exists. We need to decide whether we want to be compatible >with the HP-UX implementation and to what extend. > > > OK, ttrace was existing before lwpid_t was introduced, I will check if I can reuse ptrace interface. >I also found ways to preserve compatibility with RELENG_4, so that >we can use gdb 6.1.1 with libthread_db on 4.x core files. This only >needs to apply to libc_r of course. > > > >>I am current making libthread_db.so in two levels: >>the first level is a umbrella, the second level is a driver, >>every thread library will have a driver, I found you were trying >>to mix three thread libraries code into in same functions, >>things like following code looks strange for me, how can you >>include three different thr_pirvate.h in same .c, and compile >>them ? >> >> > >I don't include any private headers. I'm merely taking advantage of >how the libc_r support was written. See >src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c > >Note that although cross-debugging is not something I'm focussed on, >I try to avoid depending too much on native (private) headers. This >at least keeps the option open for as much as possible. > >Anyway: I don't care about which libthread_db is eventually going to >be used. I just need the stuff the play around with. > > > From owner-p4-projects@FreeBSD.ORG Mon Jun 28 23:22:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F8916A4D0; Mon, 28 Jun 2004 23:22:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E53616A4CE for ; Mon, 28 Jun 2004 23:22:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F10AD43D45 for ; Mon, 28 Jun 2004 23:22:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5SNMYK5067958 for ; Mon, 28 Jun 2004 23:22:34 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5SNMYsR067955 for perforce@freebsd.org; Mon, 28 Jun 2004 23:22:34 GMT (envelope-from wsalamon@computer.org) Date: Mon, 28 Jun 2004 23:22:34 GMT Message-Id: <200406282322.i5SNMYsR067955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 56034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 23:22:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=56034 Change 56034 by wsalamon@wsalamon_epi on 2004/06/28 23:21:44 Hook the audit files into the build system. Modify proc.h to add the audit record to the thread and proc struct. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#2 edit .. //depot/projects/trustedbsd/audit3/sys/conf/files#2 edit .. //depot/projects/trustedbsd/audit3/sys/conf/options#2 edit .. //depot/projects/trustedbsd/audit3/sys/i386/conf/AUDIT#1 add .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/NOTES#2 (text+ko) ==== @@ -828,6 +828,9 @@ ##################################################################### # SECURITY POLICY PARAMETERS +# Support for BSM audit +options AUDIT + # Support for Mandatory Access Control (MAC): options MAC options MAC_BIBA ==== //depot/projects/trustedbsd/audit3/sys/conf/files#2 (text+ko) ==== @@ -1613,6 +1613,10 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/audit/kern_audit.c standard +security/audit/kern_bsm_audit.c optional audit +security/audit/kern_bsm_klib.c optional audit +security/audit/kern_bsm_token.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac ==== //depot/projects/trustedbsd/audit3/sys/conf/options#2 (text+ko) ==== @@ -49,6 +49,7 @@ # Miscellaneous options. ADAPTIVE_MUTEXES ALQ +AUDIT opt_global.h CODA_COMPAT_5 opt_coda.h COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h ==== //depot/projects/trustedbsd/audit3/sys/sys/proc.h#2 (text+ko) ==== @@ -148,8 +148,10 @@ * either lock is sufficient for read access, but both locks must be held * for write access. */ +struct auditinfo; struct ithd; struct ke_sched; +struct kaudit_record; struct kg_sched; struct nlminfo; struct p_sched; @@ -303,6 +305,7 @@ volatile u_int td_generation; /* (k) Enable detection of preemption */ stack_t td_sigstk; /* (k) Stack ptr and on-stack flag. */ int td_kflags; /* (c) Flags for KSE threading. */ + struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ #define td_endzero td_base_pri @@ -613,6 +616,7 @@ void *p_emuldata; /* (c) Emulator state data. */ struct label *p_label; /* (*) Proc (not subject) MAC label. */ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ + struct auditinfo *p_au; /* (c) Process audit properties. */ }; #define p_session p_pgrp->pg_session From owner-p4-projects@FreeBSD.ORG Mon Jun 28 23:22:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E831016A4D0; Mon, 28 Jun 2004 23:22:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A568D16A4CE; Mon, 28 Jun 2004 23:22:49 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1249843D45; Mon, 28 Jun 2004 23:22:49 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i5SNMmJ0020745; Mon, 28 Jun 2004 16:22:48 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i5SNMmxm051939; Mon, 28 Jun 2004 16:22:48 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i5SNMm8q051938; Mon, 28 Jun 2004 16:22:48 -0700 (PDT) (envelope-from marcel) Date: Mon, 28 Jun 2004 16:22:48 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040628232248.GB51785@dhcp50.pn.xcllnt.net> References: <200406280413.i5S4DS0D033867@repoman.freebsd.org> <40DFBA3C.7040806@freebsd.org> <20040628174213.GA51072@dhcp50.pn.xcllnt.net> <40E0A3FD.1000804@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <40E0A3FD.1000804@freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Daniel Eischen cc: Perforce Change Reviews Subject: Re: PERFORCE change 55970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2004 23:22:50 -0000 On Tue, Jun 29, 2004 at 07:04:29AM +0800, David Xu wrote: > > > OK, ttrace was existing before lwpid_t was introduced, I will > check if I can reuse ptrace interface. Thanks! I haven't worried about the ability to resume single threads and also wait for single threads. I think we can safely ignore that for now. So, if ptrace(2) only gives us limited support, but it's enough for now than I think modifying ptrace(2) is a good option. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Tue Jun 29 00:55:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 839FB16A4D0; Tue, 29 Jun 2004 00:55:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B88716A4CE for ; Tue, 29 Jun 2004 00:55:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3948843D39 for ; Tue, 29 Jun 2004 00:55:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T0tRhA070207 for ; Tue, 29 Jun 2004 00:55:27 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T0tQ0d070204 for perforce@freebsd.org; Tue, 29 Jun 2004 00:55:26 GMT (envelope-from wsalamon@computer.org) Date: Tue, 29 Jun 2004 00:55:26 GMT Message-Id: <200406290055.i5T0tQ0d070204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 56036 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 00:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=56036 Change 56036 by wsalamon@wsalamon_epi on 2004/06/29 00:54:33 Remove Darwin specific includes (mach, etc.), change include path for audit_klib.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#2 (text+ko) ==== @@ -48,21 +48,9 @@ #include #include -#include +#include #include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - #ifdef AUDIT /* @@ -78,6 +66,7 @@ #define AUDIT_PRINTF(X) #endif +#if 0 #if DIAGNOSTIC #if defined(assert) #undef assert() @@ -87,6 +76,8 @@ #else #include #endif /* DIAGNOSTIC */ +#endif +#define assert(x) KASSERT(x, x) /* * Define the audit control flags. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#2 (text+ko) ==== @@ -34,14 +34,12 @@ #include #include #include -#include +#include #include #include #include -#include - /* The number of BSM records allocated. */ static int bsm_rec_count = 0; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include #include -#include +#include /* * Initialize the system call to audit event mapping table. This table ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#2 (text+ko) ==== @@ -26,10 +26,8 @@ #include #include -#include #include - -#include +#include #define GET_TOKEN_AREA(tok, dptr, length) \ do {\ From owner-p4-projects@FreeBSD.ORG Tue Jun 29 02:54:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CDD716A4D0; Tue, 29 Jun 2004 02:54:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 21EFF16A4CE for ; Tue, 29 Jun 2004 02:54:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1970A43D54 for ; Tue, 29 Jun 2004 02:54:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T2suBL073365 for ; Tue, 29 Jun 2004 02:54:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T2stlU073362 for perforce@freebsd.org; Tue, 29 Jun 2004 02:54:55 GMT (envelope-from jhb@freebsd.org) Date: Tue, 29 Jun 2004 02:54:55 GMT Message-Id: <200406290254.i5T2stlU073362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 02:54:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=56040 Change 56040 by jhb@jhb_slimer on 2004/06/29 02:54:29 IFC @56038. Affected files ... .. //depot/projects/smpng/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#25 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#11 integrate .. //depot/projects/smpng/sys/conf/NOTES#70 integrate .. //depot/projects/smpng/sys/conf/files#111 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#37 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#36 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#31 integrate .. //depot/projects/smpng/sys/conf/options#78 integrate .. //depot/projects/smpng/sys/conf/options.powerpc#9 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#66 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/smpng/sys/dev/ar/if_ar.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#16 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#20 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#8 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#4 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#22 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#12 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/ex/if_exvar.h#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#28 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#52 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#22 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#33 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#17 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#11 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#11 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#11 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#18 integrate .. //depot/projects/smpng/sys/dev/si/si.c#14 integrate .. //depot/projects/smpng/sys/dev/si/si.h#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#45 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#16 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#15 integrate .. //depot/projects/smpng/sys/dev/sx/sx.c#3 integrate .. //depot/projects/smpng/sys/dev/sx/sx.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#21 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_sab82532.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_z8530.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/Makefile.usbdevs#2 delete .. //depot/projects/smpng/sys/dev/usb/devlist2h.awk#4 delete .. //depot/projects/smpng/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#38 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#53 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#53 delete .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#53 delete .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#14 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#15 integrate .. //depot/projects/smpng/sys/dev/zs/zs_macio.c#4 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#19 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#37 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#30 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#26 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#61 integrate .. //depot/projects/smpng/sys/i386/include/float.h#6 integrate .. //depot/projects/smpng/sys/i386/include/proc.h#13 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#15 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#58 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/smpng/sys/kern/tty.c#44 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#31 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#51 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#35 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#54 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#75 integrate .. //depot/projects/smpng/sys/modules/ar/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/aue/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/axe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cue/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ep/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/kue/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/rue/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sr/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ubsa/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ucom/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/udav/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/udbp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ufm/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uftdi/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ugen/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uhid/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ukbd/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ulpt/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/umass/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/umct/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/umodem/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ums/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uplcom/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/urio/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/uscanner/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/uvisor/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uvscom/Makefile#4 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#49 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/smpng/sys/net/if_loop.c#30 integrate .. //depot/projects/smpng/sys/net/if_sl.c#21 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#19 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#27 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#13 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#7 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_UI.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_etf.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.h#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_lmi.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_rfc1490.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_sample.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#10 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#29 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#34 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#32 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#59 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#40 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#55 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/smpng/sys/netinet/tcp_seq.h#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#26 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#44 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#13 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#19 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#25 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#43 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#56 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#26 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#49 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#17 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#28 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#42 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#34 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#31 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#27 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#25 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#45 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#8 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobus.c#4 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#12 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#27 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#22 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#26 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#23 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_private.h#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#24 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#12 integrate .. //depot/projects/smpng/sys/sys/linedisc.h#2 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#25 integrate .. //depot/projects/smpng/sys/sys/proc.h#116 integrate .. //depot/projects/smpng/sys/sys/procfs.h#3 integrate .. //depot/projects/smpng/sys/sys/serial.h#1 branch .. //depot/projects/smpng/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#38 integrate .. //depot/projects/smpng/sys/sys/tty.h#13 integrate .. //depot/projects/smpng/sys/sys/ttycom.h#6 integrate .. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#28 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#44 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#44 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#28 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#54 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#47 integrate Differences ... ==== //depot/projects/smpng/sys/arm/arm/sys_machdep.c#2 (text+ko) ==== @@ -34,21 +34,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); - -#include "opt_kstack_pages.h" -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/arm/arm/sys_machdep.c,v 1.2 2004/06/28 11:35:05 cognet Exp $"); #include #include -#include -#include -#include -#include #include -#include #include -#include #include #include ==== //depot/projects/smpng/sys/boot/forth/loader.conf#25 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,7 +278,6 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers -#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $"); #include #include @@ -90,7 +90,7 @@ } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -193,7 +193,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr, - a_out->a_text + a_out->a_data); + (u_long)a_out->a_text + a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/smpng/sys/conf/NOTES#70 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1237 2004/06/29 02:30:11 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -95,7 +95,7 @@ # # BLKDEV_IOSIZE sets the default block size used in user block -# device I/O. Note that this value will be overriden by the label +# device I/O. Note that this value will be overridden by the label # when specifying a block device from a label with a non-0 # partition blocksize. The default is PAGE_SIZE. # @@ -181,10 +181,14 @@ # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. +# SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table +# used to hold active sleep queues. +# TURNSTILE_PROFILING enables rudimentary profiling of the hash table +# used to hold active lock queues. # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. # WITNESS_DDB causes the witness code to drop into the kernel debugger if -# a lock heirarchy violation occurs or if locks are held when going to +# a lock hierarchy violation occurs or if locks are held when going to # sleep. # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options MUTEX_DEBUG @@ -196,6 +200,10 @@ # MUTEX_PROFILING(9) for details. options MUTEX_PROFILING +# Profiling for internal hash tables. +options SLEEPQUEUE_PROFILING +options TURNSTILE_PROFILING + ##################################################################### # COMPATIBILITY OPTIONS @@ -328,7 +336,7 @@ # # REGRESSION causes optional kernel interfaces necessary only for regression -# testing to be enabled. These interfaces may consitute security risks +# testing to be enabled. These interfaces may constitute security risks # when enabled, as they permit processes to easily modify aspects of the # run-time environment to reproduce unlikely or unusual (possibly normally # impossible) scenarios. @@ -408,7 +416,7 @@ options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler options ALTQ_CDNR # Traffic conditioner -options ALTQ_PRIQ # Prioirity Queueing +options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required for SMP build options ALTQ_DEBUG @@ -434,7 +442,9 @@ options NETGRAPH_BRIDGE options NETGRAPH_CISCO options NETGRAPH_ECHO +options NETGRAPH_EIFACE options NETGRAPH_ETHER +options NETGRAPH_FEC options NETGRAPH_FRAME_RELAY options NETGRAPH_GIF options NETGRAPH_GIF_DEMUX @@ -589,7 +599,7 @@ # packets without touching the ttl). This can be useful to hide firewalls # from traceroute and similar tools. # -# PFIL_HOOKS enables an abtraction layer which is meant to be used in +# PFIL_HOOKS enables an abstraction layer which is meant to be used in # network code where filtering is required. See pfil(9). This option is # required by the IPFILTER option and the PF device. # @@ -657,7 +667,7 @@ options BRIDGE # Zero copy sockets support. This enables "zero copy" for sending and -# receving data via a socket. The send side works for any type of NIC, +# receiving data via a socket. The send side works for any type of NIC, # the receive side only works for NICs that support MTUs greater than the # page size of your architecture and that support header splitting. See # zero_copy(9) for more details. @@ -932,8 +942,8 @@ # # The cd driver drives SCSI Read Only Direct Access ("cd") devices. # -# The ses driver drives SCSI Envinronment Services ("ses") and -# SAF-TE ("SCSI Accessable Fault-Tolerant Enclosure") devices. +# The ses driver drives SCSI Environment Services ("ses") and +# SAF-TE ("SCSI Accessible Fault-Tolerant Enclosure") devices. # # The pt driver drives SCSI Processor devices. # @@ -1554,7 +1564,7 @@ # # MII bus support is required for some PCI 10/100 ethernet NICs, # namely those which use MII-compliant transceivers or implement -# tranceiver control interfaces that operate like an MII. Adding +# transceiver control interfaces that operate like an MII. Adding # "device miibus0" to the kernel config pulls in support for # the generic miibus API and all of the PHY drivers, including a # generic one for PHYs that aren't specifically handled by an @@ -1644,7 +1654,7 @@ # Compaq Netelligent 10/100 cards and the built-in ethernet controllers # in several Compaq Prosignia, Proliant and Deskpro systems. It also # supports several Olicom 10Mbps and 10/100 boards. -# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II serie) +# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series) # txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset # vr: Support for various fast ethernet adapters based on the VIA # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, @@ -1800,7 +1810,7 @@ # Gravis UltraSound ISA PnP/non-PnP # Crystal Semiconductor CS461x/428x PCI # Neomagic 256AV (ac97) -# Most of the more common ISA/PnP sb/mss/ess compatable cards. +# Most of the more common ISA/PnP sb/mss/ess compatible cards. device pcm @@ -1919,7 +1929,7 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_PAL # or # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC -# Specifes the default video capture mode. +# Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used # to prevent hangs during initialisation. eg VideoLogic Captivator PCI. # @@ -2224,12 +2234,12 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso # options for uplcom: -options UPLCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UPLCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds # options for uvscom: options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size -options UVSCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UVSCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds ##################################################################### ==== //depot/projects/smpng/sys/conf/files#111 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +acpi_quirks.h standard \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule \ + clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ @@ -35,20 +40,20 @@ compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \ no-obj no-implicit-rule before-depend \ clean "emu10k1-alsa%diked.h" -miidevs.h standard \ +miidevs.h optional miibus \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "miidevs.h" -pccarddevs.h standard \ +pccarddevs.h optional pccard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" -usbdevs.h standard \ +usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard @@ -1408,7 +1413,9 @@ netgraph/ng_cisco.c optional netgraph_cisco netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo +netgraph/ng_eiface.c optional netgraph_eiface netgraph/ng_ether.c optional netgraph_ether +netgraph/ng_fec.c optional netgraph_fec netgraph/ng_frame_relay.c optional netgraph_frame_relay netgraph/ng_gif.c optional netgraph_gif netgraph/ng_gif_demux.c optional netgraph_gif_demux @@ -1465,6 +1472,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet ==== //depot/projects/smpng/sys/conf/kern.post.mk#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.68 2004/06/27 23:03:43 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -77,8 +77,7 @@ ${SYSTEM_LD_TAIL} .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \ - ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -131,17 +130,14 @@ if [ -f .depend ]; then mv .depend .olddep; fi ${MAKE} _kernel-depend -# XXX this belongs elsewhere (inside GEN_CFILES if possible). -GEN_M_CFILES= ${MFILES:T:S/.m$/.c/} - # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \ - ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ - ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} +_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ + ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ + ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep - ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \ + ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \ MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS} ${MAKE} -V SFILES | \ MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS} ==== //depot/projects/smpng/sys/conf/kern.pre.mk#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.53 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.54 2004/06/27 23:03:43 imp Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -117,7 +117,7 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC} -GEN_CFILES= $S/$M/$M/genassym.c +GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/} SYSTEM_CFILES= config.c env.c hints.c majors.c vnode_if.c SYSTEM_DEP= Makefile ${SYSTEM_OBJS} SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} ==== //depot/projects/smpng/sys/conf/kmod.mk#31 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -343,6 +343,17 @@ .endif .endfor # _i +.if ${SRCS:Macpi_quirks.h} != "" +CLEANFILES+= acpi_quirks.h +.if !exists(@) +acpi_quirks.h: @ +.endif +.if exists(@) +acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + regress: lint: ${SRCS} ==== //depot/projects/smpng/sys/conf/options#78 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.457 2004/06/29 02:30:12 jhb Exp $ # # On the handling of kernel options # @@ -110,6 +110,7 @@ SCHED_4BSD opt_sched.h SCHED_ULE opt_sched.h SHOW_BUSYBUFS +SLEEPQUEUE_PROFILING SPX_HACK SUIDDIR opt_suiddir.h MSGMNB opt_sysvipc.h @@ -134,6 +135,7 @@ SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h SW_WATCHDOG opt_watchdog.h +TURNSTILE_PROFILING TTYHOG opt_tty.h VFS_AIO WLCACHE opt_wavelan.h @@ -354,6 +356,7 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h +TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK @@ -377,7 +380,9 @@ NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h NETGRAPH_ECHO opt_netgraph.h +NETGRAPH_EIFACE opt_netgraph.h NETGRAPH_ETHER opt_netgraph.h +NETGRAPH_FEC opt_netgraph.h NETGRAPH_FRAME_RELAY opt_netgraph.h NETGRAPH_GIF opt_netgraph.h NETGRAPH_GIF_DEMUX opt_netgraph.h ==== //depot/projects/smpng/sys/conf/options.powerpc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.powerpc,v 1.8 2004/01/21 05:20:58 grehan Exp $ +# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $ # Options specific to the powerpc platform kernels OEA opt_global.h @@ -12,3 +12,5 @@ PSIM SC_OFWFB opt_ofwfb.h + +OFWCONS_POLL_HZ opt_ofw.h ==== //depot/projects/smpng/sys/conf/options.sparc64#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $ SUN4U opt_global.h @@ -9,6 +9,7 @@ PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h +OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#66 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.164 2004/06/23 17:21:02 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.168 2004/06/29 01:33:35 njl Exp $ */ #include "opt_acpi.h" @@ -52,6 +52,7 @@ #include #include #include +#include #include "acpi.h" #include @@ -129,7 +130,6 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static void acpi_shutdown_final(void *arg, int howto); -static void acpi_shutdown_poweroff(void *arg); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, @@ -892,10 +892,9 @@ if (res == NULL) return (NULL); - /* Copy the bus tag from the pre-allocated resource. */ + /* Copy the bus tag and handle from the pre-allocated resource. */ rman_set_bustag(res, rman_get_bustag(rle->res)); - if (type == SYS_RES_IOPORT) - rman_set_bushandle(res, res->r_start); + rman_set_bushandle(res, rman_get_start(res)); /* If requested, activate the resource using the parent's method. */ if (flags & RF_ACTIVE) @@ -971,19 +970,7 @@ return (bus_alloc_resource_any(dev, type, rid, RF_ACTIVE)); } -/* - * Handle ISA-like devices probing for a PnP ID to match. - */ -#define PNP_EISAID(s) \ - ((((s[0] - '@') & 0x1f) << 2) \ - | (((s[1] - '@') & 0x18) >> 3) \ - | (((s[1] - '@') & 0x07) << 13) \ - | (((s[2] - '@') & 0x1f) << 8) \ - | (PNP_HEXTONUM(s[4]) << 16) \ - | (PNP_HEXTONUM(s[3]) << 20) \ - | (PNP_HEXTONUM(s[6]) << 24) \ - | (PNP_HEXTONUM(s[5]) << 28)) - +/* Probe _HID and _CID for compatible ISA PNP ids. */ static uint32_t acpi_isa_get_logicalid(device_t dev) { @@ -1282,9 +1269,9 @@ ACPI_STATUS status; /* - * If powering off, run the actual shutdown code on each processor. - * It will only perform the shutdown on the BSP. Some chipsets do - * not power off the system correctly if called from an AP. + * XXX Shutdown code should only run on the BSP (cpuid 0). + * Some chipsets do not power off the system correctly if called from + * an AP. */ if ((howto & RB_POWEROFF) != 0) { status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); @@ -1294,36 +1281,20 @@ return; } printf("Powering system off using ACPI\n"); - smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL); + ACPI_DISABLE_IRQS(); + status = AcpiEnterSleepState(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); + } else { + DELAY(1000000); + printf("ACPI power-off failed - timeout\n"); + } } else { printf("Shutting down ACPI\n"); AcpiTerminate(); } } -/* - * Since this function may be called with locks held or in an unknown - * context, it cannot allocate memory, acquire locks, sleep, etc. - */ -static void -acpi_shutdown_poweroff(void *arg) -{ - ACPI_STATUS status; - - /* Only attempt to power off if this is the BSP (cpuid 0). */ - if (PCPU_GET(cpuid) != 0) - return; - - ACPI_DISABLE_IRQS(); - status = AcpiEnterSleepState(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); - } else { - DELAY(1000000); - printf("ACPI power-off failed - timeout\n"); - } -} - static void acpi_enable_fixed_events(struct acpi_softc *sc) { ==== //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#26 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.40 2004/06/19 02:27:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $"); #include "opt_acpi.h" #include @@ -1046,7 +1046,7 @@ struct sbuf sb; char buf[128]; int i; - uint64_t fract, sum, whole; + uintmax_t fract, sum, whole; sum = 0; for (i = 0; i < cpu_cx_count; i++) @@ -1054,7 +1054,7 @@ sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); for (i = 0; i < cpu_cx_count; i++) { if (sum > 0) { - whole = cpu_cx_stats[i] * 100; + whole = (uintmax_t)cpu_cx_stats[i] * 100; fract = (whole % sum) * 100; sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum), (u_int)(fract / sum)); ==== //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#29 (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/dev/acpica/acpi_ec.c,v 1.52 2004/06/13 22:52:30 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.53 2004/06/28 20:41:30 njl Exp $ */ /****************************************************************************** * @@ -137,7 +137,7 @@ *****************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.52 2004/06/13 22:52:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.53 2004/06/28 20:41:30 njl Exp $"); #include "opt_acpi.h" #include @@ -822,11 +822,18 @@ AcpiOsStall(1); /* + * If we're up and running, wait up to 1 ms. Otherwise, burn the entire + * timeout value with delays since msleep() is a no-op. + */ + period = 1000 / sc->ec_polldelay; + if (cold) + period *= ec_poll_timeout; + + /* * Poll the EC status register to detect completion of the last - * command. First, wait up to 1 ms in chunks of sc->ec_polldelay - * microseconds. + * command in chunks of ec_polldelay. */ - for (i = 0; i < 1000 / sc->ec_polldelay; i++) { + for (i = 0; i < period; i++) { EcStatus = EC_GET_CSR(sc); if (EVENT_READY(Event, EcStatus)) { Status = AE_OK; @@ -847,10 +854,10 @@ sc->ec_polldelay = 100; /* - * If we still don't have a response, wait up to ec_poll_timeout ms - * for completion, sleeping for chunks of 10 ms. + * If we still don't have a response and we're up and running, wait up + * to ec_poll_timeout ms for completion, sleeping for chunks of 10 ms. */ - if (Status != AE_OK) { + if (!cold && Status != AE_OK) { retval = -1; for (i = 0; i < ec_poll_timeout / 10; i++) { if (retval != 0) ==== //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.20 2004/06/24 01:57:31 njl Exp $"); #include #include @@ -232,7 +232,7 @@ if (ACPI_FAILURE(status)) printf("WARNING: Unable to detach object data from %s - %s\n", acpi_name(handle), AcpiFormatException(status)); - status = AcpiAttachData(handle, acpi_fake_objhandler, child); + status = AcpiAttachData(handle, acpi_fake_objhandler, pci_child); if (ACPI_FAILURE(status)) printf("WARNING: Unable to attach object data to %s - %s\n", acpi_name(handle), AcpiFormatException(status)); @@ -261,8 +261,7 @@ dinfo->ap_dinfo.cfg.slot == slot) { dinfo->ap_handle = handle; acpi_pci_update_device(handle, devlist[i]); - free(devlist, M_TEMP); - return_ACPI_STATUS (AE_OK); + break; } } free(devlist, M_TEMP); ==== //depot/projects/smpng/sys/dev/ar/if_ar.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.63 2004/05/29 00:51:08 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.64 2004/06/25 19:22:04 julian Exp $"); /* * Programming assumptions and other issues. @@ -2228,10 +2228,9 @@ struct ar_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); struct ifqueue *xmitq_p; struct mbuf *m; - meta_p meta; + struct ng_tag_prio *ptag; NGI_GET_M(item, m); - NGI_GET_META(item, meta); NG_FREE_ITEM(item); /* * data doesn't come in from just anywhere (e.g control hook) @@ -2244,11 +2243,12 @@ /* * Now queue the data for when it can be sent >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 29 02:56:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 527E816A4D0; Tue, 29 Jun 2004 02:56:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DB9316A4CE for ; Tue, 29 Jun 2004 02:56:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2703143D49 for ; Tue, 29 Jun 2004 02:56:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T2uxHh073458 for ; Tue, 29 Jun 2004 02:56:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T2uw0X073455 for perforce@freebsd.org; Tue, 29 Jun 2004 02:56:58 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jun 2004 02:56:58 GMT Message-Id: <200406290256.i5T2uw0X073455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 56041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 02:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=56041 Change 56041 by scottl@scottl-junior-camlock on 2004/06/29 02:56:12 Start implementing the da driver work thread. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#2 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#2 (text+ko) ==== @@ -128,6 +128,21 @@ struct buf *bp[CAM_PERIPH_MAXMAPS]; }; +typedef enum { + WORK_EXECUTE_CCB, + WORK_XPT_SCHED, + WORK_PERIPH_SCHED +} cam_periph_workflags; + +struct cam_periph_workitem { + TAILQ_ENTRY(cam_periph_workitem) work_link; + cam_periph_workflags command; + void *data1; + void *data2; + void (*cbfcnp)(void *); + void *cbdata; +}; + cam_status cam_periph_alloc(periph_ctor_t *periph_ctor, periph_oninv_t *periph_oninvalidate, periph_dtor_t *periph_dtor, ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -49,6 +49,9 @@ #include #include #include +#include +#include +#include #include @@ -453,6 +456,13 @@ static SLIST_HEAD(,da_softc) softc_list; +static struct proc *da_proc; +static struct mtx da_workmtx; +static int da_workflags; +static TAILQ_HEAD(, cam_periph_workitem) da_worklist; + +#define DA_FLAG_EXIT 0x1 + static int daopen(struct disk *dp) { @@ -745,13 +755,64 @@ } static void +dawork(void *dummy) +{ + struct cam_periph_workitem *work; + + mtx_lock(&da_workmtx); + while ((da_workflags & DA_FLAG_EXIT) == 0) { + if ((work = TAILQ_FIRST(&da_worklist)) == NULL) { + msleep(&da_worklist, &da_workmtx, PRIBIO, "dawork", 0); + continue; + } + TAILQ_REMOVE(&da_worklist, work, work_link); + mtx_unlock(&da_workmtx); + + switch(work->command) { + case WORK_EXECUTE_CCB: + mtx_lock(&Giant); + xpt_action((union ccb *)work->data1); + mtx_unlock(&Giant); + break; + case WORK_XPT_SCHED: + mtx_lock(&Giant); + xpt_schedule((struct cam_periph *)work->data1, + (uint32_t)(uintptr_t)(work->data2)); + mtx_unlock(&Giant); + break; +#if 0 + case WORK_PERIPH_SCHED: + mtx_lock(&Giant); + daschedule((struct cam_periph *)work-data1); + mtx_unlock(&Giant); + break; +#endif + default: + panic("Unknown CAM work item %d\n", work->command); + } + + if (work->cbfcnp != NULL) + work->cbfcnp(work->cbdata); + mtx_unlock(&da_workmtx); + } + mtx_unlock(&da_workmtx); + + kthread_exit(0); +} + +static void dainit(void) { cam_status status; struct cam_path *path; SLIST_INIT(&softc_list); - + + mtx_init(&da_workmtx, "DA Mutex", NULL, MTX_DEF); + TAILQ_INIT(&da_worklist); + if (kthread_create(dawork, NULL, &da_proc, 0, 0, "da_work")) + printf("Warning: cannot DA kthread\n"); + /* * Install a global async callback. This callback will * receive async callbacks like "new device found". ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#2 (text+ko) ==== @@ -81,21 +81,6 @@ PERIPHDRIVER_DECLARE(probe, probe_driver); typedef enum { - WORK_EXECUTE_CCB, - WORK_XPT_SCHED, - WORK_PROBE_SCHED -} cam_workflags; - -struct cam_workitem { - TAILQ_ENTRY(cam_workitem) work_link; - cam_workflags command; - void *data1; - void *data2; - void (*cbfcnp)(void *); - void *cbdata; -}; - -typedef enum { PROBE_TUR, PROBE_INQUIRY, PROBE_FULL_INQUIRY, @@ -118,18 +103,18 @@ probe_flags flags; MD5_CTX context; u_int8_t digest[16]; - struct cam_workitem *work; + struct cam_periph_workitem *work; } probe_softc; static struct proc *probe_proc; static struct mtx probe_workmtx; static int probe_workflags; -static TAILQ_HEAD(,cam_workitem) probe_worklist; +static TAILQ_HEAD(,cam_periph_workitem) probe_worklist; #define PROBE_FLAG_EXIT 0x1 static void -probe_queue_work(struct cam_workitem *work) +probe_queue_work(struct cam_periph_workitem *work) { mtx_lock(&probe_workmtx); TAILQ_INSERT_TAIL(&probe_worklist, work, work_link); @@ -157,7 +142,7 @@ probe_softc *softc; softc = (probe_softc *)periph->softc; - softc->work->command = WORK_PROBE_SCHED; + softc->work->command = WORK_PERIPH_SCHED; softc->work->data1 = periph; softc->work->cbfcnp = NULL; probe_queue_work(softc->work); @@ -166,7 +151,7 @@ static void probe_work(void *dummy) { - struct cam_workitem *work; + struct cam_periph_workitem *work; mtx_lock(&probe_workmtx); while ((probe_workflags & PROBE_FLAG_EXIT) == 0) { @@ -190,7 +175,7 @@ (uint32_t)(uintptr_t)(work->data2)); mtx_unlock(&Giant); break; - case WORK_PROBE_SCHED: + case WORK_PERIPH_SCHED: mtx_lock(&Giant); probeschedule((struct cam_periph *)work->data1); mtx_unlock(&Giant); @@ -224,7 +209,7 @@ { union ccb *request_ccb; /* CCB representing the probe request */ probe_softc *softc; - struct cam_workitem *work; + struct cam_periph_workitem *work; request_ccb = (union ccb *)arg; if (periph == NULL) { @@ -246,7 +231,8 @@ return(CAM_REQ_CMP_ERR); } - work = malloc(sizeof(struct cam_workitem), M_TEMP, M_NOWAIT | M_ZERO); + work = malloc(sizeof(struct cam_periph_workitem), M_TEMP, + M_NOWAIT | M_ZERO); if (work == NULL) { printf("proberegister: Unable to probe new device. " "Unable to allocate workitem\n"); From owner-p4-projects@FreeBSD.ORG Tue Jun 29 04:05:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D9E16A4D0; Tue, 29 Jun 2004 04:05:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 504C516A4CE for ; Tue, 29 Jun 2004 04:05:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 391F343D60 for ; Tue, 29 Jun 2004 04:05:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T45S60075923 for ; Tue, 29 Jun 2004 04:05:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T45SSB075920 for perforce@freebsd.org; Tue, 29 Jun 2004 04:05:28 GMT (envelope-from jhb@freebsd.org) Date: Tue, 29 Jun 2004 04:05:28 GMT Message-Id: <200406290405.i5T45SSB075920@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 04:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=56055 Change 56055 by jhb@jhb_slimer on 2004/06/29 04:04:41 IFC @56054. Affected files ... .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#13 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#13 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.39 2004/06/29 03:39:06 darrenr Exp $"; #endif #ifndef _KERNEL @@ -2155,9 +2155,6 @@ ip_natsync(ifp); ip_statesync(ifp); } -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) - IFNET_RUNLOCK(); -# endif ip_natsync((struct ifnet *)-1); # if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) IFNET_RUNLOCK(); ==== //depot/projects/smpng/sys/kern/link_elf_obj.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.84 2004/06/15 23:57:02 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.85 2004/06/29 03:13:54 peter Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -562,7 +562,9 @@ if (ra != ef->nrela) panic("lost rela"); if (mapbase != (vm_offset_t)ef->address + mapsize) - panic("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n", mapbase, ef->address, mapsize, (vm_offset_t)ef->address + mapsize); + panic("mapbase 0x%lx != address %p + mapsize 0x%lx (0x%lx)\n", + mapbase, ef->address, mapsize, + (vm_offset_t)ef->address + mapsize); /* Local intra-module relocations */ link_elf_reloc_local(lf); ==== //depot/projects/smpng/sys/kern/subr_turnstile.c#12 (text+ko) ==== @@ -59,7 +59,7 @@ #include "opt_turnstile_profiling.h" #include -__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.143 2004/06/29 02:30:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.144 2004/06/29 03:48:49 jhb Exp $"); #include #include @@ -142,6 +142,9 @@ * Prototypes for non-exported routines. */ static void init_turnstile0(void *dummy); +#ifdef TURNSTILE_PROFILING +static void init_turnstile_profiling(void *arg); +#endif static void propagate_priority(struct thread *); static void turnstile_setowner(struct turnstile *ts, struct thread *owner); @@ -307,17 +310,26 @@ void init_turnstiles(void) { -#ifdef TURNSTILE_PROFILING - struct sysctl_oid *chain_oid; - char chain_name[10]; -#endif int i; for (i = 0; i < TC_TABLESIZE; i++) { LIST_INIT(&turnstile_chains[i].tc_turnstiles); mtx_init(&turnstile_chains[i].tc_lock, "turnstile chain", NULL, MTX_SPIN); + } + mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN); + thread0.td_turnstile = NULL; +} + #ifdef TURNSTILE_PROFILING +static void +init_turnstile_profiling(void *arg) +{ + struct sysctl_oid *chain_oid; + char chain_name[10]; + int i; + + for (i = 0; i < TC_TABLESIZE; i++) { snprintf(chain_name, sizeof(chain_name), "%d", i); chain_oid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_debug_turnstile_chains), OID_AUTO, @@ -328,11 +340,11 @@ SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(chain_oid), OID_AUTO, "max_depth", CTLFLAG_RD, &turnstile_chains[i].tc_max_depth, 0, NULL); -#endif } - mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN); - thread0.td_turnstile = NULL; } +SYSINIT(turnstile_profiling, SI_SUB_LOCK, SI_ORDER_ANY, + init_turnstile_profiling, NULL); +#endif static void init_turnstile0(void *dummy) From owner-p4-projects@FreeBSD.ORG Tue Jun 29 04:30:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC5C216A4D0; Tue, 29 Jun 2004 04:30:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9034516A4CE for ; Tue, 29 Jun 2004 04:30:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC37943D48 for ; Tue, 29 Jun 2004 04:30:14 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T4U7Cv076472 for ; Tue, 29 Jun 2004 04:30:07 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T4U0NP076461 for perforce@freebsd.org; Tue, 29 Jun 2004 04:30:00 GMT (envelope-from scottl@freebsd.org) Date: Tue, 29 Jun 2004 04:30:00 GMT Message-Id: <200406290430.i5T4U0NP076461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 56058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 04:30:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=56058 Change 56058 by scottl@scottl-junior-camlock on 2004/06/29 04:29:35 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/timerreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/float.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/profile.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/sf_buf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/scottl-camlock/src/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/exec.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/float.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/psl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/signal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/trap.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/tss.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/nmi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/critical.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/support.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/_limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/asm.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/bus.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/clock.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/critical.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/endian.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/float.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/fp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/frame.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/intr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/limits.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/param.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/proc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/profile.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/psl.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/pte.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/resource.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/runq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/signal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/smp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/swi.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/trap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0.s#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0/boot0sio.s#2 delete .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/cnode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_psdev.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_venus.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.alpha#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.mk#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.arm#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/majors#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.arm#1 branch .. //depot/projects/scottl-camlock/src/sys/conf/options.pc98#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/systags.sh#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/des/des_ecb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/des/des_enc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/crypto/des/des_setkey.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_elf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ddb/db_ps.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/awi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_core.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cy/cyvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_fops.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_state.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/tdfx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/gallant12x22.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/splash.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/tga.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/iec68113.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwip.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/firewire/if_fwipvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hfa/fore_load.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_ioctl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/README#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/joy/joyvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/led/led.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/led/led.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/matcd/matcd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/matcd/matcd_data.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/md/md.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/bmtphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mlyvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/null/null.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/owi/if_owi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/pccard/files.pccard#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccarddevs.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/hash.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/hash.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/nehemiah.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/nehemiah.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/probe.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/randomdev_soft.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/random/yarrow.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sab/sab.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scd/scd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/scd/scdvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_eisa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio_ebus.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sio/siovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/emu8000.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/gusmidi.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mpu.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/opl.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/uartsio.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midibuf.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midibuf.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midisynth.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midisynth.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/miditypes.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/timer.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csamidi.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stg/tmc18c30_pccard.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sx/cd1865.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 29 23:33:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D48316A4D0; Tue, 29 Jun 2004 23:33:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28A0816A4CE for ; Tue, 29 Jun 2004 23:33:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A19D43D46 for ; Tue, 29 Jun 2004 23:33:05 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5TNWLnZ011646 for ; Tue, 29 Jun 2004 23:32:21 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5TNWLrs011643 for perforce@freebsd.org; Tue, 29 Jun 2004 23:32:21 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 29 Jun 2004 23:32:21 GMT Message-Id: <200406292332.i5TNWLrs011643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 23:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=56099 Change 56099 by davidxu@davidxu_alona on 2004/06/29 23:31:53 Add missing proc_service.h Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/proc_service.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 29 23:33:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93F1316A4D0; Tue, 29 Jun 2004 23:33:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F34116A4CE for ; Tue, 29 Jun 2004 23:33:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 684E843D2F for ; Tue, 29 Jun 2004 23:33:54 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5TNXNQr011666 for ; Tue, 29 Jun 2004 23:33:23 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5TNXNU5011663 for perforce@freebsd.org; Tue, 29 Jun 2004 23:33:23 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 29 Jun 2004 23:33:23 GMT Message-Id: <200406292333.i5TNXNU5011663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 23:33:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=56100 Change 56100 by davidxu@davidxu_alona on 2004/06/29 23:32:49 Some tweaks. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#2 (text+ko) ==== @@ -315,7 +315,7 @@ #define HAVE_POLL_H 1 /* Define if you have the header file. */ -/* #undef HAVE_PROC_SERVICE_H */ +#define HAVE_PROC_SERVICE_ /* Define if you have the header file. */ /* #undef HAVE_PTRACE_H */ @@ -502,7 +502,7 @@ #define HAVE_FPREGSET_T 1 /* Define if has prgregset_t. */ -/* #undef HAVE_PRGREGSET_T */ +#define HAVE_PRGREGSET_T 1 /* Define if has prfpregset_t. */ #define HAVE_PRFPREGSET_T 1 From owner-p4-projects@FreeBSD.ORG Tue Jun 29 23:35:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 941F716A4D1; Tue, 29 Jun 2004 23:35:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F61016A4CF for ; Tue, 29 Jun 2004 23:35:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6866F43D3F for ; Tue, 29 Jun 2004 23:35:46 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5TNZQ3u011768 for ; Tue, 29 Jun 2004 23:35:26 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5TNZQi9011748 for perforce@freebsd.org; Tue, 29 Jun 2004 23:35:26 GMT (envelope-from davidxu@freebsd.org) Date: Tue, 29 Jun 2004 23:35:26 GMT Message-Id: <200406292335.i5TNZQi9011748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2004 23:35:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=56101 Change 56101 by davidxu@davidxu_alona on 2004/06/29 23:35:14 Include path /usr/src/include. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#3 (text+ko) ==== @@ -37,9 +37,10 @@ tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ utils.c valarith.c valops.c valprint.c values.c varobj.c \ - wrapper.c ${LIBSRCS} + wrapper.c proc-service.c freebsd-threads.c ${LIBSRCS} GENSRCS= version.c +CFLAGS+= -I${.CURDIR}/../../../../include version.c: echo '#include "version.h"' > ${.TARGET} From owner-p4-projects@FreeBSD.ORG Wed Jun 30 15:17:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A874A16A4D0; Wed, 30 Jun 2004 15:17:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85C8416A4CE for ; Wed, 30 Jun 2004 15:17:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67BCD43D48 for ; Wed, 30 Jun 2004 15:17:46 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UFGar4040478 for ; Wed, 30 Jun 2004 15:16:36 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UFGa6B040475 for perforce@freebsd.org; Wed, 30 Jun 2004 15:16:36 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 30 Jun 2004 15:16:36 GMT Message-Id: <200406301516.i5UFGa6B040475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 15:17:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=56145 Change 56145 by davidxu@davidxu_alona on 2004/06/30 15:16:35 Revert previous change Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#3 (text+ko) ==== @@ -315,7 +315,7 @@ #define HAVE_POLL_H 1 /* Define if you have the header file. */ -#define HAVE_PROC_SERVICE_ +/* #undef HAVE_PROC_SERVICE_H */ /* Define if you have the header file. */ /* #undef HAVE_PTRACE_H */ From owner-p4-projects@FreeBSD.ORG Wed Jun 30 15:19:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD5A16A4D0; Wed, 30 Jun 2004 15:19:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C75D416A4CE for ; Wed, 30 Jun 2004 15:19:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA4EF43D1F for ; Wed, 30 Jun 2004 15:19:34 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UFIdlN040515 for ; Wed, 30 Jun 2004 15:18:39 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UFIdxk040512 for perforce@freebsd.org; Wed, 30 Jun 2004 15:18:39 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 30 Jun 2004 15:18:39 GMT Message-Id: <200406301518.i5UFIdxk040512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 15:19:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=56146 Change 56146 by davidxu@davidxu_alona on 2004/06/30 15:17:49 We have psaddr_t in procfs.h Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/arch/i386/config.h#4 (text+ko) ==== @@ -517,7 +517,7 @@ #define HAVE_LWPID_T 1 /* Define if has psaddr_t. */ -/* #undef HAVE_PSADDR_T */ +#define HAVE_PSADDR_T 1 /* Define if has prsysent_t. */ /* #undef HAVE_PRSYSENT_T */ From owner-p4-projects@FreeBSD.ORG Wed Jun 30 17:34:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A89F516A4D0; Wed, 30 Jun 2004 17:34:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A50016A4CE for ; Wed, 30 Jun 2004 17:34:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6363E43D1D for ; Wed, 30 Jun 2004 17:34:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UHYRrv045192 for ; Wed, 30 Jun 2004 17:34:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UHYRih045189 for perforce@freebsd.org; Wed, 30 Jun 2004 17:34:27 GMT (envelope-from peter@freebsd.org) Date: Wed, 30 Jun 2004 17:34:27 GMT Message-Id: <200406301734.i5UHYRih045189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 56156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 17:34:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=56156 Change 56156 by peter@peter_work on 2004/06/30 17:34:03 check off a few more items. gdb6 isn't finished for amd64, but its the same level as the other platforms (no kgdb). I think marcel is doing it. Affected files ... .. //depot/projects/hammer/TODO.txt#16 edit Differences ... ==== //depot/projects/hammer/TODO.txt#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/hammer/TODO.txt#15 $ +$P4: //depot/projects/hammer/TODO.txt#16 $ reread the logs etc and check out the "XXX worry about this later" stuff @@ -12,16 +12,10 @@ read the modmetadata section directly, apply the relocs for that section, and use that to find the pointers to the other sections. -gdb6.0 import (FSF build works) - ddb (needs a dwarf2 based unwinder to get stack traces and a disassembler) (peter: basic functionality, uses -fno-omit-frame-pointer.. disassembler still expects 32 bit code but compiles) -crashdumps? - -teach libkvm about crashdumps. (need to lookup KPML4, 4 level page tree etc) - SSE/SSE2 support in libc (the fpget/set*() functions need to adjust the SSE MXCSR register as well as the x87 control word - netbsd have already done this, we can look at theirs) @@ -101,3 +95,9 @@ see if openssl can use the assembler x86-64 routines. (easy) add userland access to hardware debug registers via ptrace/procfs. + +gdb6.0 import (FSF build works) + +crashdumps + +teach libkvm about crashdumps. (need to lookup KPML4, 4 level page tree etc) From owner-p4-projects@FreeBSD.ORG Wed Jun 30 17:48:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5910916A4D0; Wed, 30 Jun 2004 17:48:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16FA816A4CE; Wed, 30 Jun 2004 17:48:20 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE22843D3F; Wed, 30 Jun 2004 17:48:19 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from ns1.xcllnt.net (localhost [127.0.0.1]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i5UHm8So029966; Wed, 30 Jun 2004 10:48:08 -0700 (PDT) (envelope-from marcel@ns1.xcllnt.net) Received: (from marcel@localhost) by ns1.xcllnt.net (8.12.11/8.12.11/Submit) id i5UHm8uA029965; Wed, 30 Jun 2004 10:48:08 -0700 (PDT) (envelope-from marcel) Date: Wed, 30 Jun 2004 10:48:08 -0700 From: Marcel Moolenaar To: Peter Wemm Message-ID: <20040630174808.GA29830@ns1.xcllnt.net> References: <200406301734.i5UHYRih045189@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200406301734.i5UHYRih045189@repoman.freebsd.org> User-Agent: Mutt/1.5.5.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 56156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 17:48:21 -0000 On Wed, Jun 30, 2004 at 05:34:27PM +0000, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=56156 > > Change 56156 by peter@peter_work on 2004/06/30 17:34:03 > > check off a few more items. gdb6 isn't finished for amd64, but > its the same level as the other platforms (no kgdb). I think marcel > is doing it. Yup. The threading support is first though... > +crashdumps > + > +teach libkvm about crashdumps. (need to lookup KPML4, 4 level page tree etc) I'll touch bases with you about the relocatable kernel modules. If we want GDB to use them as symbol files and for debug information, we need to find a way for them to be loaded in GDB. I think this will affect how we want to solve kernel debugging in general. I already prepared for some contingencies, like building libgdb explicitly so that we can link against it and abuse whatever hooks there are, but that may not be enough. If you already have some thoughts about this, feel free to pitch them my way. Otherwise I'll get back to it myself. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Wed Jun 30 21:34:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B3BC16A4D0; Wed, 30 Jun 2004 21:34:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3714216A4CE for ; Wed, 30 Jun 2004 21:34:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A9D343D3F for ; Wed, 30 Jun 2004 21:34:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5ULYNYv052593 for ; Wed, 30 Jun 2004 21:34:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5ULYMn7052590 for perforce@freebsd.org; Wed, 30 Jun 2004 21:34:22 GMT (envelope-from jhb@freebsd.org) Date: Wed, 30 Jun 2004 21:34:22 GMT Message-Id: <200406302134.i5ULYMn7052590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 21:34:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=56168 Change 56168 by jhb@jhb_slimer on 2004/06/30 21:34:20 Add a notes file for the new-bus multipass project, very barebones. Affected files ... .. //depot/projects/multipass/notes#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 30 23:05:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E970A16A4D0; Wed, 30 Jun 2004 23:05:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE48C16A4CE for ; Wed, 30 Jun 2004 23:05:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A77D043D31 for ; Wed, 30 Jun 2004 23:05:48 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UN5EJQ055379 for ; Wed, 30 Jun 2004 23:05:14 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UN5Dtj055376 for perforce@freebsd.org; Wed, 30 Jun 2004 23:05:13 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 30 Jun 2004 23:05:13 GMT Message-Id: <200406302305.i5UN5Dtj055376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 23:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=56172 Change 56172 by davidxu@davidxu_alona on 2004/06/30 23:04:22 Let ptrace deal with lwpid as pid. remove ttrace. Affected files ... .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/signalvar.h#2 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#3 edit .. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#3 (text+ko) ==== @@ -472,5 +472,4 @@ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ - { AS(ttrace_args), (sy_call_t *)ttrace }, /* 444 = ttrace */ }; ==== //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#3 (text+ko) ==== @@ -55,9 +55,6 @@ #include #include -static int kern_ttrace(struct thread *td, int req, pid_t pid, lwpid_t tid, - void *addr, int data); - /* * Functions implemented using PROC_ACTION(): * @@ -363,97 +360,17 @@ return (error); } -#ifndef _SYS_SYSPROTO_H_ -struct ttrace_args { - int req; - pid_t pid; - lwpid_t tid; - caddr_t addr; - int data; -}; -#endif - -int -ttrace(struct thread *td, struct ttrace_args * uap) -{ - /* - * XXX this obfuscation is to reduce stack usage, but the register - * structs may be too large to put on the stack anyway. - */ - union { - struct ptrace_io_desc piod; - struct dbreg dbreg; - struct fpreg fpreg; - struct reg reg; - } r; - void *addr; - int error = 0; - - addr = &r; - switch (uap->req) { - case PT_GETREGS: - case PT_GETFPREGS: - case PT_GETDBREGS: - break; - case PT_SETREGS: - error = copyin(uap->addr, &r.reg, sizeof r.reg); - break; - case PT_SETFPREGS: - error = copyin(uap->addr, &r.fpreg, sizeof r.fpreg); - break; - case PT_SETDBREGS: - error = copyin(uap->addr, &r.dbreg, sizeof r.dbreg); - break; - case PT_IO: - error = copyin(uap->addr, &r.piod, sizeof r.piod); - break; - default: - addr = uap->addr; - break; - } - if (error) - return (error); - - error = kern_ttrace(td, uap->req, uap->pid, uap->tid, addr, uap->data); - if (error) - return (error); - - switch (uap->req) { - case PT_IO: - (void)copyout(&r.piod, uap->addr, sizeof r.piod); - break; - case PT_GETREGS: - error = copyout(&r.reg, uap->addr, sizeof r.reg); - break; - case PT_GETFPREGS: - error = copyout(&r.fpreg, uap->addr, sizeof r.fpreg); - break; - case PT_GETDBREGS: - error = copyout(&r.dbreg, uap->addr, sizeof r.dbreg); - break; - } - - return (error); -} - int kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) { - return kern_ttrace(td, req, pid, 0, addr, data); -} - -int -kern_ttrace(struct thread *td, int req, pid_t pid, lwpid_t tid, void *addr, - int data) -{ struct iovec iov; struct uio uio; struct proc *curp, *p, *pp; - struct thread *td2; struct ptrace_io_desc *piod; int error, write, tmp, num; int proctree_locked = 0; - lwpid_t *buf, tid2; + struct thread *td2 = NULL; + lwpid_t tid = 0, tid2, *buf; curp = td->td_proc; @@ -478,10 +395,35 @@ p = td->td_proc; PROC_LOCK(p); } else { - if ((p = pfind(pid)) == NULL) { - if (proctree_locked) - sx_xunlock(&proctree_lock); - return (ESRCH); + if (pid <= PID_MAX) { + if ((p = pfind(pid)) == NULL) { + if (proctree_locked) + sx_xunlock(&proctree_lock); + return (ESRCH); + } + } else { + /* this is slow, should be optimized */ + sx_slock(&allproc_lock); + FOREACH_PROC_IN_SYSTEM(p) { + PROC_LOCK(p); + mtx_lock_spin(&sched_lock); + FOREACH_THREAD_IN_PROC(p, td2) { + if (td2->td_tid == pid) + break; + } + mtx_unlock_spin(&sched_lock); + if (td2 != NULL) + break; /* proc lock held */ + PROC_UNLOCK(p); + } + sx_sunlock(&allproc_lock); + if (p == NULL) { + if (proctree_locked) + sx_xunlock(&proctree_lock); + return (ESRCH); + } + tid = pid; + pid = p->p_pid; } } if ((error = p_cansee(td, p)) != 0) @@ -498,6 +440,11 @@ goto fail; } + if (tid == 0) { + td2 = FIRST_THREAD_IN_PROC(p); + tid = td2->td_tid; + } + /* * Permissions check */ @@ -563,19 +510,6 @@ break; } - if (tid == 0) - td2 = FIRST_THREAD_IN_PROC(p); - else { - FOREACH_THREAD_IN_PROC(p, td2) { - if (td2->td_tid == tid) - break; - } - if (td2 == NULL) { - error = ESRCH; - goto fail; - } - } - #ifdef FIX_SSTEP /* * Single step fixup ala procfs ==== //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#3 (text+ko) ==== @@ -451,5 +451,4 @@ "ksem_timedwait", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ - "ttrace", /* 444 = ttrace */ }; ==== //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#3 (text+ko) ==== @@ -631,7 +631,5 @@ 441 MNOSTD { int ksem_timedwait(semid_t id, struct timespec *abstime); } 442 MSTD { int thr_suspend(const struct timespec *timeout); } 443 MSTD { int thr_wake(thr_id_t id); } -444 STD { int ttrace(int req, pid_t pid, lwpid_t tid, \ - caddr_t addr, int data); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/davidxu_ksedbg/src/sys/sys/signalvar.h#2 (text+ko) ==== @@ -271,7 +271,7 @@ void signotify(struct thread *td); void tdsignal(struct thread *td, int sig, sigtarget_t target); void trapsignal(struct thread *td, int sig, u_long code); -void ptracestop(struct thread *td, int sig); +int ptracestop(struct thread *td, int sig); /* * Machine-dependent functions: ==== //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#3 (text+ko) ==== @@ -356,5 +356,4 @@ #define SYS_ksem_timedwait 441 #define SYS_thr_suspend 442 #define SYS_thr_wake 443 -#define SYS_ttrace 444 -#define SYS_MAXSYSCALL 445 +#define SYS_MAXSYSCALL 444 ==== //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#3 (text+ko) ==== @@ -297,5 +297,4 @@ kse_switchin.o \ ksem_timedwait.o \ thr_suspend.o \ - thr_wake.o \ - ttrace.o + thr_wake.o ==== //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#3 (text+ko) ==== @@ -1302,13 +1302,6 @@ struct thr_wake_args { char id_l_[PADL_(thr_id_t)]; thr_id_t id; char id_r_[PADR_(thr_id_t)]; }; -struct ttrace_args { - char req_l_[PADL_(int)]; int req; char req_r_[PADR_(int)]; - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char tid_l_[PADL_(lwpid_t)]; lwpid_t tid; char tid_r_[PADR_(lwpid_t)]; - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; - char data_l_[PADL_(int)]; int data; char data_r_[PADR_(int)]; -}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1603,7 +1596,6 @@ int ksem_timedwait(struct thread *, struct ksem_timedwait_args *); int thr_suspend(struct thread *, struct thr_suspend_args *); int thr_wake(struct thread *, struct thr_wake_args *); -int ttrace(struct thread *, struct ttrace_args *); #ifdef COMPAT_43 From owner-p4-projects@FreeBSD.ORG Wed Jun 30 23:14:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7DDA16A4D0; Wed, 30 Jun 2004 23:14:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82E1D16A4CE for ; Wed, 30 Jun 2004 23:14:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A7243D1D for ; Wed, 30 Jun 2004 23:14:26 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UNEPdS055659 for ; Wed, 30 Jun 2004 23:14:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UNEPSw055656 for perforce@freebsd.org; Wed, 30 Jun 2004 23:14:25 GMT (envelope-from davidxu@freebsd.org) Date: Wed, 30 Jun 2004 23:14:25 GMT Message-Id: <200406302314.i5UNEPSw055656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2004 23:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=56173 Change 56173 by davidxu@davidxu_alona on 2004/06/30 23:13:34 Use ptrace Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#2 (text+ko) ==== @@ -229,8 +229,7 @@ return (P2T(ret)); } /* check lwp */ - ret = ttrace(PT_GETREGS, ps_getpid(ta->ph), - ta->map[id].lwp, (caddr_t)&gregs, 0); + ret = ptrace(PT_GETREGS, ta->map[id].lwp, (caddr_t)&gregs, 0); if (ret != 0) { /* no longer exists */ ta->map[id].type = PT_NONE; From owner-p4-projects@FreeBSD.ORG Thu Jul 1 00:03:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9804D16A4D0; Thu, 1 Jul 2004 00:03:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F85716A4CE; Thu, 1 Jul 2004 00:03:29 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD6D143D2D; Thu, 1 Jul 2004 00:03:28 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i6103Sqv031270; Wed, 30 Jun 2004 17:03:28 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i6103Smm044205; Wed, 30 Jun 2004 17:03:28 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i6103Se9044204; Wed, 30 Jun 2004 17:03:28 -0700 (PDT) (envelope-from marcel) Date: Wed, 30 Jun 2004 17:03:27 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040701000327.GA44174@dhcp50.pn.xcllnt.net> References: <200406302305.i5UN5Dtj055376@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200406302305.i5UN5Dtj055376@repoman.freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 00:03:30 -0000 On Wed, Jun 30, 2004 at 11:05:13PM +0000, David Xu wrote: > http://perforce.freebsd.org/chv.cgi?CH=56172 > > Change 56172 by davidxu@davidxu_alona on 2004/06/30 23:04:22 > > Let ptrace deal with lwpid as pid. remove ttrace. Excellent! Any complications with using ptrace(2) or did it all fall out naturally as I hoped? BTW: I'll copy this and libthread_db from your branch to mine. I'll keep using my proc_service.h for now, so I'll have to tweak it a bit. (I don't use the existing proc-service.c in GDB because we need to rewrite the PTID to get this all working for us)... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Thu Jul 1 01:13:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4381716A4D0; Thu, 1 Jul 2004 01:13:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07F9D16A4CE for ; Thu, 1 Jul 2004 01:13:02 +0000 (GMT) Received: from exchhz01.viatech.com.cn (ip-40-162-97-218.anlai.com [218.97.162.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D9DA43D31 for ; Thu, 1 Jul 2004 01:13:00 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from freebsd.org (DAVIDWNT [10.4.1.99]) by exchhz01.viatech.com.cn with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id NVXA68SY; Thu, 1 Jul 2004 09:12:29 +0800 Message-ID: <40E365CE.8070508@freebsd.org> Date: Thu, 01 Jul 2004 09:15:58 +0800 From: David Xu User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5b) Gecko/20030723 Thunderbird/0.1 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Marcel Moolenaar References: <200406302305.i5UN5Dtj055376@repoman.freebsd.org> <20040701000327.GA44174@dhcp50.pn.xcllnt.net> In-Reply-To: <20040701000327.GA44174@dhcp50.pn.xcllnt.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 01:13:02 -0000 Marcel Moolenaar wrote: > On Wed, Jun 30, 2004 at 11:05:13PM +0000, David Xu wrote: > >>http://perforce.freebsd.org/chv.cgi?CH=56172 >> >>Change 56172 by davidxu@davidxu_alona on 2004/06/30 23:04:22 >> >> Let ptrace deal with lwpid as pid. remove ttrace. > > > Excellent! Any complications with using ptrace(2) or did it all > fall out naturally as I hoped? > I think there is not important problem within this change, current if I PT_GETREGS with a pid but not lwpid, I just use first thread in the proc, this needs to be studied further whether we should reject the call for threaded process. also I allow PT_ATTACH etcs to use lwpid. > BTW: I'll copy this and libthread_db from your branch to mine. I'll > keep using my proc_service.h for now, so I'll have to tweak it a bit. > (I don't use the existing proc-service.c in GDB because we need to > rewrite the PTID to get this all working for us)... OK, feel free to do. I only have trouble with gdb_proc_service.h, gdb it defines proc service function prototypes and some other types. but libthread_db needs a proc_service.h, I don't want to let libthread_db depend on gdb_proc_service.h, so we need to keep our proc_service.h consistent with gdb, or we don't use gdb's proc_service.c at all, we write our version of proc_service.c as solaris thread db did. However, in my experience, gdb proc service works well. I only use it when I need to retrieve lwp's registers, the gdb's proc service really doing nothing, it just redirect all requests to current target, I implement fbsd_fetch/store_lwp_registers in my freebsd-thread.c, they will be called by gdb proc service, the code path in my libthread_db and freebsd-thread.c looks like following: libthread_db -> ps_lgetregs -> target_fetch_registers -> fbsd_thread_fetch_registers -> fbsd_fetch_lwp_registers -> -> ptrace(lwp) From owner-p4-projects@FreeBSD.ORG Thu Jul 1 01:45:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0741A16A4D0; Thu, 1 Jul 2004 01:45:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8703816A4CE; Thu, 1 Jul 2004 01:45:49 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id D09B843D41; Thu, 1 Jul 2004 01:45:48 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i611jShW031551; Wed, 30 Jun 2004 18:45:28 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i611jSb1044512; Wed, 30 Jun 2004 18:45:28 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i611jSni044511; Wed, 30 Jun 2004 18:45:28 -0700 (PDT) (envelope-from marcel) Date: Wed, 30 Jun 2004 18:45:28 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040701014528.GB44343@dhcp50.pn.xcllnt.net> References: <200406302305.i5UN5Dtj055376@repoman.freebsd.org> <20040701000327.GA44174@dhcp50.pn.xcllnt.net> <40E365CE.8070508@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <40E365CE.8070508@freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 01:45:51 -0000 On Thu, Jul 01, 2004 at 09:15:58AM +0800, David Xu wrote: > >> > >> Let ptrace deal with lwpid as pid. remove ttrace. > > > > > >Excellent! Any complications with using ptrace(2) or did it all > >fall out naturally as I hoped? > > > > I think there is not important problem within this change, current > if I PT_GETREGS with a pid but not lwpid, I just use first thread > in the proc, this needs to be studied further whether we should reject > the call for threaded process. also I allow PT_ATTACH etcs to use > lwpid. Very nice. I think we're getting in a pretty good shape. What do you think? I plan to commit the libthr changes I in a couple of days. If we're confident that the ptrace(2) change is a keeper, we can also commit it. Then it's just a matter of finishing libthread_db. You already have libpthread mostly covered and I should have libthr and libc_r done soon as well.. > OK, feel free to do. I only have trouble with gdb_proc_service.h, gdb > it defines proc service function prototypes and some other types. but > libthread_db needs a proc_service.h, I don't want to let libthread_db > depend on gdb_proc_service.h, so we need to keep our proc_service.h > consistent with gdb, or we don't use gdb's proc_service.c at all, we > write our version of proc_service.c as solaris thread db did. I embedded the proc_service interface in fbsd-thread.c. I don't use the existing code, because it has Linuxisms and ugliness, not to mention that it's more efficient to not use it (see below). > However, in my experience, gdb proc service works well. > I only use it when I need to retrieve lwp's registers, the gdb's proc > service really doing nothing, it just redirect all requests to > current target, I implement fbsd_fetch/store_lwp_registers > in my freebsd-thread.c, they will be called by gdb proc service, > the code path in my libthread_db and freebsd-thread.c looks like > following: > > libthread_db -> ps_lgetregs -> target_fetch_registers > -> fbsd_thread_fetch_registers -> fbsd_fetch_lwp_registers -> > -> ptrace(lwp) In my code it's: libthread_db -> ps_lgetregs -> target_fetch_registers -> ptrace(lwp). This is because ps_lgetregs is part of the thread target and thus knows to go directly to the target that's underneath the thread target and also does the necessary rewrite of the PTID so that the lower level targets operate on the LWPID without knowing about it. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Thu Jul 1 02:24:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E21616A4D0; Thu, 1 Jul 2004 02:24:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D84AA16A4CE for ; Thu, 1 Jul 2004 02:24:20 +0000 (GMT) Received: from exchhz01.viatech.com.cn (ip-40-162-97-218.anlai.com [218.97.162.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9145D43D2D for ; Thu, 1 Jul 2004 02:24:18 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from freebsd.org (DAVIDWNT [10.4.1.99]) by exchhz01.viatech.com.cn with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id NVXA685Q; Thu, 1 Jul 2004 10:23:51 +0800 Message-ID: <40E37687.4030903@freebsd.org> Date: Thu, 01 Jul 2004 10:27:19 +0800 From: David Xu User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5b) Gecko/20030723 Thunderbird/0.1 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Marcel Moolenaar References: <20040701014528.GB44343@dhcp50.pn.xcllnt.net> In-Reply-To: <20040701014528.GB44343@dhcp50.pn.xcllnt.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 02:24:21 -0000 Marcel Moolenaar wrote: > On Thu, Jul 01, 2004 at 09:15:58AM +0800, David Xu wrote: > >>>> Let ptrace deal with lwpid as pid. remove ttrace. >>> >>> >>>Excellent! Any complications with using ptrace(2) or did it all >>>fall out naturally as I hoped? >>> >> >>I think there is not important problem within this change, current >>if I PT_GETREGS with a pid but not lwpid, I just use first thread >>in the proc, this needs to be studied further whether we should reject >>the call for threaded process. also I allow PT_ATTACH etcs to use >>lwpid. > > > Very nice. I think we're getting in a pretty good shape. What do you > think? > Yes, we are. > I plan to commit the libthr changes I in a couple of days. If we're > confident that the ptrace(2) change is a keeper, we can also commit > it. Then it's just a matter of finishing libthread_db. You already > have libpthread mostly covered and I should have libthr and libc_r > done soon as well.. > Yes, I think libthr needs to use lwpid. For ptrace commit, will you do it or let me do ? I added a PT_CLEARSTEP command, because I think PT_CONTINUE is not sufficient, sometimes, you want to clear single step for a thread, but without resuming the process before other things are done, also I introduced a PT_GETXTHREAD, it is the thread reporting SIGTRAP to debugger, debugger will use the thread as current thread, and dump stack backtrace when process stops. other commands, PT_GETNUMTHRS, PT_GETTHRLIST are not important, and I have never used them yet. > >>OK, feel free to do. I only have trouble with gdb_proc_service.h, gdb >>it defines proc service function prototypes and some other types. but >>libthread_db needs a proc_service.h, I don't want to let libthread_db >>depend on gdb_proc_service.h, so we need to keep our proc_service.h >>consistent with gdb, or we don't use gdb's proc_service.c at all, we >>write our version of proc_service.c as solaris thread db did. > > > I embedded the proc_service interface in fbsd-thread.c. I don't use > the existing code, because it has Linuxisms and ugliness, not to > mention that it's more efficient to not use it (see below). > > Agree. >>However, in my experience, gdb proc service works well. >>I only use it when I need to retrieve lwp's registers, the gdb's proc >>service really doing nothing, it just redirect all requests to >>current target, I implement fbsd_fetch/store_lwp_registers >>in my freebsd-thread.c, they will be called by gdb proc service, >>the code path in my libthread_db and freebsd-thread.c looks like >>following: >> >>libthread_db -> ps_lgetregs -> target_fetch_registers >>-> fbsd_thread_fetch_registers -> fbsd_fetch_lwp_registers -> >>-> ptrace(lwp) > > > In my code it's: > > libthread_db -> ps_lgetregs -> target_fetch_registers -> ptrace(lwp). > > This is because ps_lgetregs is part of the thread target and thus knows > to go directly to the target that's underneath the thread target and > also does the necessary rewrite of the PTID so that the lower level > targets operate on the LWPID without knowing about it. > Yes, if proc service is implemented fbsd-threads.c, then some extra steps can be eliminated. From owner-p4-projects@FreeBSD.ORG Thu Jul 1 02:25:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9319616A4D0; Thu, 1 Jul 2004 02:25:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5383016A4CE for ; Thu, 1 Jul 2004 02:25:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BEE943D49 for ; Thu, 1 Jul 2004 02:25:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i612PJEv060966 for ; Thu, 1 Jul 2004 02:25:19 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i612PHrx060959 for perforce@freebsd.org; Thu, 1 Jul 2004 02:25:17 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 02:25:17 GMT Message-Id: <200407010225.i612PHrx060959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 02:25:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=56180 Change 56180 by davidxu@davidxu_celeron on 2004/07/01 02:25:13 IFC Affected files ... .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/doc/share/sgml/man-refs.ent#2 integrate .. //depot/projects/davidxu_ksedbg/src/UPDATING#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/ftpusers#2 integrate .. //depot/projects/davidxu_ksedbg/src/etc/mail/aliases#2 integrate .. //depot/projects/davidxu_ksedbg/src/include/wordexp.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/vis.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/net/inet.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/posix1e/mac_get.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/posix1e/mac_text.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/msync.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/open.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/poll.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/send.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/Makefile#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/Makefile.inc#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libpthread_dbg/pthread_dbg_int.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libstand/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/ChangeLog#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/FAQ#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/adler32.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/algorithm.txt#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/compress.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/crc32.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/crc32.h#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libz/deflate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/deflate.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/example.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/gzio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/infback.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libz/infblock.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/infblock.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/infcodes.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/infcodes.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/inffast.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/inffast.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/inffixed.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/inflate.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/inflate.h#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libz/inftrees.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/inftrees.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/infutil.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/infutil.h#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/maketree.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libz/minigzip.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/trees.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/uncompr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/zconf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/zlib.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/zlib.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/zutil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libz/zutil.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/fdim.3#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/fmax.3#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/math.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fdim.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmax.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmaxf.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmaxl.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fmin.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fminf.c#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/msun/src/s_fminl.c#1 branch .. //depot/projects/davidxu_ksedbg/src/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#1 branch .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/examples/pppd/ppp.deny.sample#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/acpi.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/ips.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/led.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/misc/pci_vendors#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/NOTES#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.amd64#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.i386#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/files.ia64#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/options#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/cy/cy.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/digi/digi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/rc/rc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/acpica/acpi_toshiba.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/ahb/Makefile#1 branch .. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_pcn.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_ste.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_vr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_xl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/iommu.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/rman.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/tools/tools/pciid/mk_pci_vendors.pl#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/cd9660.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/fstat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/fstat.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/fstat/msdosfs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/indent/indent.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/ldd/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/ldd/sods.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/netstat/inet.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/config/mkheaders.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/extract.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/futil.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/create.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/perform.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/create/pl.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/delete.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/info.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/deps.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/file.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/pen.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/lib/version.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/pgp_sign.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/sha1.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/sign.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/sign/x509.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/acf.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/async.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/hdlc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/hdlc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/link.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/link.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/lqr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/lqr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/mbuf.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/sync.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.sbin/ppp/tcpmss.c#2 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -5235,9 +5235,9 @@ Internet Name Domain), which is the most common implementation of the DNS protocol. DNS is the protocol through which names are mapped to IP addresses, and vice versa. For example, a query for - www.FreeBSD.org + www.FreeBSD.org will receive a reply with the IP address of The FreeBSD Project's - web server, whereas, a query for ftp.FreeBSD.org + web server, whereas, a query for ftp.FreeBSD.org will return the IP address of the corresponding FTP machine. Likewise, the opposite can happen. A query for an IP address can resolve its hostname. It is @@ -5415,7 +5415,7 @@ - When one queries for www.FreeBSD.org, the + When one queries for www.FreeBSD.org, the resolver usually queries the uplink ISP's name server, and retrieves the reply. With a local, caching DNS server, the query only has to be made once to the outside world by the caching DNS server. Every @@ -5847,10 +5847,10 @@ The A record indicates machine names. As seen above, - ns1.example.org would resolve to + ns1.example.org would resolve to 3.2.1.2. Again, the origin symbol, @, is - used here, thus meaning example.org + used here, thus meaning example.org would resolve to 3.2.1.30. @@ -5861,7 +5861,7 @@ The canonical name record is usually used for giving aliases to a machine. In the example, www is aliased to the machine addressed to the origin, or - example.org + example.org (3.2.1.30). CNAMEs can be used to provide alias hostnames, or round robin one hostname among multiple ==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -331,7 +331,7 @@ the system. When setting a label, the user must be able to comprehend - what it is, exactly, that they are doing. Setting the label + what it is, exactly, that is being done. Setting the label too high or too low may jeopardize the entire security structure of their directory or file system. @@ -393,16 +393,16 @@ Label Configuration Virtually all aspects of label policy configuration - will be performed using a set of four commands. Theses + will be performed using a set of four commands. These commands provide a simple interface for object or subject configuration or the manipulation and verification of the configuration. All configuration may be done by use of the &man.setfmac.8; and &man.setpmac.8; utilities respectively. - The setfmac is used to set + The setfmac command is used to set MAC labels on system objects while the - setpmac is used to set the labels on system + setpmac command is used to set the labels on system subjects. Observe: &prompt.root; setfmac biba/high test @@ -412,8 +412,8 @@ quiescent is when an error occurred. In some cases this error may be a Permission denied and is usually obtained when the label is being set or modified - on an object which is restricted. The system administrator, - may use the commands in conjunction to overcome this: + on an object which is restricted. The system administrator + may use the following commands to overcome this: &prompt.root; setfmac biba/high test Permission denied @@ -421,16 +421,16 @@ &prompt.root; getfmac test test: biba/high - As can be observed, the setpmac - can be used to override the policies settings by assigning + As can be observed, setpmac + can be used to override the policy's settings by assigning a different label to the invoked process. The - getpmac is usually used with current - running processes, such as sendmail + getpmac utility is usually used with currently + running processes, such as sendmail: although it takes a process ID in place of a command the logic is extremely similar. It should be pointed out that users will only be able to override policy labels if - they themselves own the object or subject. If a user would - attempt to manipulate a file not in their access level, the + they themselves own the object or subject. If users would + attempt to manipulate a file not in their access levels, the Operation not permitted error will be displayed by the mac_set_link function. @@ -441,7 +441,7 @@ Users themselves are required to have labels so that their files and processes may properly. This is configured through the login.conf file - by use of login classes. Every policy which uses labels + by use of login classes. Every policy that uses labels will enforce the user class setting. An example entry containing every policy is listed @@ -475,7 +475,7 @@ user class default label which will be enforced by MAC. Users will never be permitted to modify this value, thus it can be considered not optional - in the user case. In a real configuration; however, the + in the user case. In a real configuration, however, the administrator will never wish to enable every policy. It is recommended that the rest of this chapter be reviewed before any of this configuration is implemented. @@ -487,7 +487,7 @@ example or discussion. It is useful to note that many sites may have a - particularly large amount of users requiring several + particularly large number of users requiring several different user classes. In depth planning is required as this may get extremely difficult to manage. @@ -517,7 +517,7 @@ Each policy which supports labeling has some tunable which may be used to disable the MAC - label on network interfaces. Setting them to + label on network interfaces. Setting the label to will have a similar effect. Review the output from sysctl, the policy manual pages, or even the information found later in this chapter @@ -563,8 +563,8 @@ - This machine only requires one label - biba/high for everything in the system. + This machine only requires one label, + biba/high, for everything in the system. Here the file system would not require the option as a single label will always be in effect. @@ -680,7 +680,7 @@ Every policy or MAC option supports - a tunables. These usually hang off of the + tunables. These usually hang off of the security.mac.<policyname> tree. To view all of the tunables from MAC use the following command: @@ -1347,8 +1347,8 @@ security.mac.mls.max_compartments is - used to set the maximum amount of compartment levels with - objects; basically the maximum compartment amount allowed + used to set the maximum number of compartment levels with + objects; basically the maximum compartment number allowed on a system. ==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ USE_* A number of variables exist in order to encapsulate common - dependencies that many ports have. + dependencies that many ports have. Although their use is + optional, they can help to reduce the verbosity of the port + Makefiles. Each of them is styled + as USE_*. The + usage of these variables is restricted to the port + Makefiles and + ports/Mk/bsd.*.mk and is not designed + to encapsulate user-settable options — use + WITH_* and + WITHOUT_* + for that purpose. + + + It is always incorrect to set + any USE_* + in /etc/make.conf. For instance, + setting USE_GCC=3.2 + would adds a dependency on gcc32 for every port, + including gcc32 itself! + The <makevar>USE_<replaceable>*</replaceable></makevar> @@ -3231,42 +3250,6 @@ intention will be clear.</para> </sect2> - <sect2> - <title>Optional dependencies - - Some large applications can be built in a number of - configurations, adding functionality if one of a number of - libraries or applications is available. Since not all users - want those libraries or applications, the ports system - provides hooks that the port author can use to decide which - configuration should be built. Supporting these properly will - make users happy, and effectively provide 2 or more ports for the - price of one. - - The easiest of these to use is - WITHOUT_X11. If the port can be built both - with and without X support, then it should normally be built - with X support. If WITHOUT_X11 is defined, - then the version that does not have X support should be - built. - - Various parts of GNOME have such knobs, though they are - slightly more difficult to use. The variables to use in the - Makefile are WANT_* - and HAVE_*. If the application can be - built both with or without one of the dependencies listed - below, then the Makefile should set - WANT_PKG, and should build the version that - uses PKG if HAVE_PKG - is defined. - - The WANT_* variables currently - supported this way are WANT_GLIB, - WANT_GTK, WANT_ESOUND, - WANT_IMLIB, and - WANT_GNOME. - - Circular dependencies are fatal @@ -3286,6 +3269,142 @@ save a large number of people—including yourself— a lot of grief in the process. + + + + + Makefile Options + + Some large applications can be built in a number of + configurations, adding functionality if one of a number of + libraries or applications is available. Examples include + choice of natural (human) language, GUI versus command-line, + or type of database to support. Since not all users + want those libraries or applications, the ports system + provides hooks that the port author can use to control which + configuration should be built. Supporting these properly will + make users happy, and effectively provide 2 or more ports for the + price of one. + + + <makevar>WITH_<replaceable>*</replaceable></makevar> and + <makevar>WITHOUT_<replaceable>*</replaceable></makevar> + + These variables are designed to be set by the system + administrator. There are many that are standardized in + ports/Mk/bsd.*.mk; others are not, + which can be confusing. If you need to add such a + configuration variable, please consider using one of the + ones from the following list. + + + You should not assume that a + WITH_* + necessarily has a corresponding + WITHOUT_* + variable and vice versa. In general, the default is + simply assumed. + + + + Unless otherwise specified, these variables are only + tested for being set or not set, rather than being set to + some kind of variable such as YES or + NO. + + +
+ The <makevar>WITH_<replaceable>*</replaceable></makevar> + and <makevar>WITHOUT_<replaceable>*</replaceable></makevar> + variables + + + + + Variable + + Means + + + + + + WITH_APACHE2 + + If set, use + www/apache2 + instead of the default of + www/apache. + + + + WITH_BERKELEY_DB + + Define this variable to specify the ability to + use a variant of the Berkeley database package such as + databases/db41. + An associated variable, + WITH_BDB_VER, may be + set to values such as 2, 3, 4, 41 or 42. + + + + WITHOUT_GETTEXT + + If set, says that internationalization is not + needed, which can save compile time. By default, + internalization is used. + + + + WITH_MYSQL + + Define this variable to specify the ability to + use a variant of the MySQL database package such as + databases/mysql40-server. + An associated variable, + WANT_MYSQL_VER, may be + set to values such as 323, 40, 41, or 50. + + + + WITH_OPENSSL_BASE + + Use the version of OpenSSL in the base system. + + + + WITH_OPENSSL_PORT + + Use the version of OpenSSL from + security/openssh, + overwriting the version that was originally installed + in the base system. + + + + WITH_POSTGRESQL + + Define this variable to specify the ability to + use a variant of the PostGreSQL database package such as + databases/postgresql72. + + + + + WITHOUT_X11 + + If the port can be built both with and without + X support, then it should normally be built with + with X support. If this variable is defined, then + then the version that does not have X support should + be built instead. + + + +
+ + ==== //depot/projects/davidxu_ksedbg/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.12 2004/02/20 17:33:53 blackend Exp $ - Original revision: 1.80 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.13 2004/06/28 19:03:23 blackend Exp $ + Original revision: 1.83 --> @@ -229,7 +229,13 @@ Ces exemples concernent la carte Creative &soundblaster; Live!. Les autres modules son chargeables sont listés dans - /boot/defaults/loader.conf. + /boot/defaults/loader.conf. Si vous + n'êtes pas sûr du pilote à utiliser, vous + pouvez tenter de charger le pilote + snd_driver, qui est un méta-pilote + chargeant les pilotes les plus courants, cela + accélère la recherche du pilote + adapté. Sinon, vous pouvez compiler le support pour votre carte son en statique dans votre noyau. Les @@ -575,6 +581,42 @@ précède sera automatiquement effectué de façon transparente pour l'utilisateur. + + + + + + Josef + El-Rayes + Contribution de + + + + + Définir les valeurs par défaut du mixeur + des différents canaux + + Les valeurs par défaut du mixeur des + différents canaux sont fixées en dur dans le + code source du pilote &man.pcm.4;. Il existe de nombreuses + applications et “daemons” qui vous permettent de + fixer les valeurs du mixeur, les mémorisent et les + refixent à chaque fois qu'ils sont lancés, mais + ce n'est pas une solution idéale, nous désirons + régler les valeurs par défaut au niveau du + pilote. Ceci se fait en définissant les valeurs + adéquates dans le fichier + /boot/device.hints. Par exemple: + + hint.pcm.0.vol="100" + + Cela fixera le volume du canal à une valeur par + défaut de 100; dès que le module &man.pcm.4; est + chargé. + + Seuls &os; 5.3 et les versions suivantes + supportent cette particularité. + @@ -1126,7 +1168,7 @@ efficace que l'interface X11. La bibliothèque SDL peut être trouvée - dans devel/sdl12 + dans devel/sdl12. @@ -1376,15 +1418,15 @@ matériel. Pour lire à partir d'un DVD, remplacez - testfile.avi par où <N> est + testfile.avi par où N est le numéro du titre à jouer et DEVICE est le fichier spécial de périphérique correspondant au lecteur de DVD. Par exemple, pour jouer le titre 3 depuis /dev/dvd: - &prompt.root; mplayer -vo dga -dvd 2 /dev/dvd + &prompt.root; mplayer -vo dga -dvd 3 /dev/dvd Pour arrêter, avancer, etc..., consultez les combinaisons de touches, qui sont données en ==== //depot/projects/davidxu_ksedbg/doc/share/sgml/man-refs.ent#2 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.281 2004/06/22 03:00:09 trhodes Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.284 2004/06/30 13:53:32 hrs Exp $ --> @@ -516,6 +516,7 @@ + @@ -548,6 +549,7 @@ + @@ -3228,9 +3230,11 @@ + + @@ -3293,6 +3297,7 @@ + @@ -3911,14 +3916,18 @@ + - + + + + @@ -4204,6 +4213,7 @@ + @@ -4215,6 +4225,7 @@ + ==== //depot/projects/davidxu_ksedbg/src/UPDATING#2 (text+ko) ==== @@ -17,7 +17,24 @@ developers choose to disable these features on build machines to maximize performance. -20040623: +20040630: + The netgraph ABI version number has been incremented to indicate + an incompatible change in the ABI. Old netgraph nodes will refuse + to attach until recompiled. Netgraph now uses mbuf tags to move + metadata and this commit removes its home-grown metadata facility. + Nodes should just recompile, unless they use metadata, in which + case the changes are simple; the file ng_ksocket.c serves as an + example of such changes. + +20040630: + ACPI has been updated to disable known-bad BIOS revisions. A message + will be printed on console indicating that ACPI has been disabled + automatically and that the user should use a newer BIOS, if possible. + If you think ACPI does work on your system and want to override + this (i.e., for testing), set hint.acpi.0.disabled="0" at the + loader prompt. + +20040623: pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge separated now. It uses the newly created "_pflogd" user/group combination. If you plan to use pflogd(8) make sure to run @@ -1653,4 +1670,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $ +$FreeBSD: src/UPDATING,v 1.321 2004/06/30 23:13:16 bms Exp $ ==== //depot/projects/davidxu_ksedbg/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.209 2004/06/18 20:09:29 green Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.210 2004/06/30 15:58:46 imp Exp $ ############################################################## >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 1 03:18:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B139E16A4D0; Thu, 1 Jul 2004 03:18:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 553BD16A4CE; Thu, 1 Jul 2004 03:18:31 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFD9543D3F; Thu, 1 Jul 2004 03:18:30 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i613IUmp031830; Wed, 30 Jun 2004 20:18:30 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i613IUta046257; Wed, 30 Jun 2004 20:18:30 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i613ITOp046256; Wed, 30 Jun 2004 20:18:30 -0700 (PDT) (envelope-from marcel) Date: Wed, 30 Jun 2004 20:18:29 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040701031829.GA46242@dhcp50.pn.xcllnt.net> References: <20040701014528.GB44343@dhcp50.pn.xcllnt.net> <40E37687.4030903@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <40E37687.4030903@freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 56172 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 03:18:32 -0000 On Thu, Jul 01, 2004 at 10:27:19AM +0800, David Xu wrote: > > >I plan to commit the libthr changes I in a couple of days. If we're > >confident that the ptrace(2) change is a keeper, we can also commit > >it. Then it's just a matter of finishing libthread_db. You already > >have libpthread mostly covered and I should have libthr and libc_r > >done soon as well.. > > > Yes, I think libthr needs to use lwpid. For ptrace commit, will you > do it or let me do ? Feel free to do it yourself. I have plenty of things to worry about myself :-) -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Thu Jul 1 07:48:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADFE116A4D0; Thu, 1 Jul 2004 07:48:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 82CCD16A4CE for ; Thu, 1 Jul 2004 07:48:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B97643D39 for ; Thu, 1 Jul 2004 07:48:48 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i617mg3N069467 for ; Thu, 1 Jul 2004 07:48:42 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i617mgja069464 for perforce@freebsd.org; Thu, 1 Jul 2004 07:48:42 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 07:48:42 GMT Message-Id: <200407010748.i617mgja069464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 07:48:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=56192 Change 56192 by davidxu@davidxu_celeron on 2004/07/01 07:48:31 IFC Affected files ... .. //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.cc#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#3 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ CATEGORIES. It is intended to make life easier for the user when he is wading through the pile of packages on the - FTP site or the CDROM. Please take a look at the existing categories and pick the ones + FTP site or the CDROM. Please take a look at the current list of categories and pick the ones that are suitable for your port. This list also determines where in the ports tree the port is imported. If you put more than one category here, it is assumed that the port files will be put in the subdirectory with the name in - the first category. See the categories section for more + the first category. See below for more discussion about how to pick the right categories. If your port truly belongs to something that is different from @@ -1313,9 +1313,8 @@ For non-virtual categories, you will find a one-line - description in the pkg/COMMENT file in that - subdirectory (e.g., - archivers/pkg/COMMENT). + description in the COMMENT in that + subdirectory's Makefile. @@ -1596,12 +1595,8 @@ misc Miscellaneous utilities Basically things that - do not belong anywhere else. This is the only category - that should not appear with any other non-virtual category. - If you have misc with something else in - your CATEGORIES line, that means you can - safely delete misc and just put the port - in that other subdirectory! If at all possible, try to + do not belong anywhere else. + If at all possible, try to find a better category for your port than misc, as ports tend to get overlooked in here. @@ -1895,7 +1890,7 @@ - + Choosing the right category As many of the categories overlap, you often have to choose @@ -1905,6 +1900,13 @@ + The first category must be a physical category (see + above). This is + necessary to make the packaging work. Virtual categories and + physical categories may be intermixed after that. + + + Language specific categories always come first. For example, if your port installs Japanese X11 fonts, then your CATEGORIES line would read japanese @@ -1912,7 +1914,7 @@ - Specific categories win over less-specific ones. For + Specific categories are listed before less-specific ones. For instance, an HTML editor should be listed as www editors, not the other way around. Also, you should not list net when the port belongs to @@ -1941,6 +1943,15 @@ + misc + should not appear with any other non-virtual category. + If you have misc with something else in + your CATEGORIES line, that means you can + safely delete misc and just put the port + in that other subdirectory! + + + If your port truly does not belong anywhere else, put it in misc. @@ -7135,6 +7146,7 @@ moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin +courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin @@ -7160,6 +7172,7 @@ maildrop:*:126: rbldns:*:153: moinmoin:*:192: +courier:*:465: qtss:*:554: ircdru:*:555: ==== //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 (text+ko) ==== @@ -35,7 +35,7 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.18 2004/06/30 13:59:40 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.19 2004/07/01 04:56:20 hrs Exp $ 2002 @@ -155,7 +155,7 @@ Therefore, the release engineering team will only create the 5-STABLE branch in the CVS repository after we have found a relatively stable state to use as its basis. It is likely that - there will be + there will be multiple releases in the &release.5x; series before this happens; we estimate that the 5-STABLE branch will be created around the time of @@ -191,7 +191,7 @@ Ongoing work aims to perform fine-grained locking of various kernel subsystems to increase the number of threads of execution that can be running in the kernel. More - information can be found on the + information can be found on the FreeBSD SMP Project page. @@ -332,7 +332,7 @@ branch after a settling time in -CURRENT. &os; &release.5x; does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development - branch will be created sometime after + branch will be created sometime after &release.5branchpoint;.) @@ -383,9 +383,9 @@ account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering resources (particularly developers' time, computing resources, and mirror - archive space). We note that in general, the &os; community + archive space). We note that in general, the &os; community (both users and developers) has shown a preference for - moving forward with new features in + moving forward with new features in the &release.5x; branch and beyond, due to the difficulty involved in backporting (and maintaining) new functionality in &release.4x;. @@ -491,7 +491,7 @@ base system, and should be installed either from a pre-built package or from the Ports Collection. Building Perl as a part of the base system created a number of - difficulties which made updates problematic. + difficulties which made updates problematic. The base system utilities that used Perl have either been rewritten (if still applicable) or discarded (if obsolete). &man.sysinstall.8; will now install the ==== //depot/projects/davidxu_ksedbg/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.747 2004/06/30 16:38:02 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.748 2004/07/01 04:54:21 hrs Exp $ 2000 @@ -239,6 +239,11 @@ for instance) to allow users to set whether or not a given device can wake the system. + The &man.acpi.4; driver has been updated to + be disabled automatically when the machine has well-known broken BIOS. + This behavior can be disabled by setting a loader tunable + hint.acpi.0.disabled to 0. + The &man.ctau.4; driver has been added for Cronyx Tau synchronous serial adapters. This driver was known for a long time as ct in its previous life outside the &os; source tree. &merged; @@ -1212,6 +1217,9 @@ The timezone database has been updated from tzdata2003a to tzdata2004a. + + zlib has been updated to + from version 1.1.4 to version 1.2.1. ==== //depot/projects/davidxu_ksedbg/src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#2 (text+ko) ==== @@ -1,10 +1,10 @@ X"> X"> - + ]> @@ -44,11 +44,12 @@ çÒÕÐÐÁ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× &os; - $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.1 2004/06/28 13:28:15 den Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml,v 1.2 2004/07/01 07:22:17 den Exp $ 2002 2003 + 2004 çÒÕÐÐÁ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× &os; @@ -359,7 +360,8 @@ ÷ÁÖÎÏ ÚÁÍÅÔÉÔØ, ÞÔÏ ÎÅ ÓÍÏÔÒÑ ÎÁ ×ÙÐÕÓË ÒÅÌÉÚÏ× ÓÅÒÉÉ &release.5x;, ÐÏÄÄÅÒÖËÁ ÒÅÌÉÚÏ× &release.4x; ÐÒÏÄÏÌÖÉÔÓÑ ÅÝÅ ÎÅËÏÔÏÒÏÅ ×ÒÅÍÑ. îÁ ÓÁÍÏÍ ÄÅÌÅ, &os; 4.8 ÂÙÌÁ ×ÙÐÕÝÅÎÁ - Ä×ÕÍÑ ÍÅÓÑÃÁÍÉ ÐÏÓÌÅ 5.0, × ÁÐÒÅÌÅ 2003, ÚÁÔÅÍ 4.9 × ÏËÔÑÂÒÅ 2003. + Ä×ÕÍÑ ÍÅÓÑÃÁÍÉ ÐÏÓÌÅ 5.0, × ÁÐÒÅÌÅ 2003, ÚÁÔÅÍ 4.9 × ÏËÔÑÂÒÅ 2003 + É 4.10 × ÍÁÅ 2004. óÌÅÄÕÀÝÉÅ ÒÅÌÉÚÙ ÉÚ ×ÅÔ×É 4-STABLE ÂÕÄÕÔ ÚÁ×ÉÓÅÔØ ÏÔ ÎÅÓËÏÌØËÉÈ ÆÁËÔÏÒÏ×. îÁÉÂÏÌÅÅ ×ÁÖÎÙÊ ÉÚ ÎÉÈ ÜÔÏ ÓÕÝÅÓÔ×Ï×ÁÎÉÅ É ÓÔÁÂÉÌØÎÏÓÔØ ×ÅÔ×É 5-STABLE. åÓÌÉ CURRENT ÎÅÄÏÓÔÁÔÏÞÎÏ ÓÔÁÂÉÌØÎÁ ÄÌÑ ÓÏÚÄÁÎÉÑ @@ -388,8 +390,21 @@ É ÉÓÐÒÁ×ÌÅÎÉÑÍÉ ÂÅÚÏÐÁÓÎÏÓÔÉ. ðÏ ÓÏÂÓÔ×ÅÎÎÏÍÕ ÕÓÍÏÔÒÅÎÉÀ ÇÒÕÐÐÁ ÍÏÖÅÔ ×ÎÏÓÉÔØ ÏÐÒÅÄÅÌÅÎÎÙÅ ÉÓÐÒÁ×ÌÅÎÉÑ É × ÄÒÕÇÉÅ ÒÅÌÉÚÙ. - - + îÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ Õ ÇÒÕÐÐÙ ÐÏÄÇÏÔÏ×ËÉ ÒÅÌÉÚÏ× ÎÅÔ ÏÐÒÅÄÅÌÅÎÎÙÈ + ÐÌÁÎÏ× ÐÏ ÄÁÌØÎÅÊÛÉÍ ÒÅÌÉÚÁÍ ÉÚ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ 4-STABLE, + É ÍÙ ÒÅÛÉÌÉ ÐÒÏÄÏÌÖÁÔØ ÐÏÄÄÅÒÖËÕ 4.10-RELEASE × ËÁÞÅÓÔ×Å + ×ÅÔ×É ÉÓÐÒÁ×ÌÅÎÉÊ (Errata Branch). + òÁÎÅÅ ×ÅÔ×Ø, ÉÚ ËÏÔÏÒÏÊ ×ÙÐÕÓËÁÌÓÑ ÒÅÌÉÚ, ÐÏÄÄÅÒÖÉ×ÁÌÁÓØ + &a.security-officer; × ËÁÞÅÓÔ×Å ×ÅÔ×É ÂÅÚÏÐÁÓÎÏÓÔÉ + (Security Branch) × ÔÅÞÅÎÉÅ ÏÐÒÅÄÅÌÅÎÎÏÇÏ ÐÅÒÉÏÄÁ, + É × ÎÅÅ ×ÎÏÓÉÌÉÓØ ÔÏÌØËÏ ËÒÉÔÉÞÅÓËÉ ×ÁÖÎÙÅ ÉÓÐÒÁ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ. + äÌÑ FreeBSD 4.10-RELEASE ÎÁÂÏÒ ÉÓÐÒÁ×ÌÅÎÉÊ ÂÕÄÅÔ ÒÁÓÛÉÒÅÎ + ÄÌÑ ×ËÌÀÞÅÎÉÑ ÉÓÐÒÁ×ÌÅÎÉÊ ÌÏËÁÌØÎÙÈ DoS, Á ÔÁËÖÅ ÄÒÕÇÉÈ + ËÌÀÞÅ×ÙÈ É ÈÏÒÏÛÏ ÐÒÏÔÅÓÔÉÒÏ×ÁÎÎÙÈ ÉÓÐÒÁ×ÌÅÎÉÊ, ËÏÔÏÒÙÅ ÍÏÇÕÔ + ÎÅ ÏÔÎÏÓÉÔØÓÑ Ë ÂÅÚÏÐÁÓÎÏÓÔÉ. èÏÔÑ ÜÔÉ ÉÓÐÒÁ×ÌÅÎÉÑ ÓËÏÒÅÅ ×ÓÅÇÏ + ÎÅ ÂÕÄÕÔ ÏÐÕÂÌÉËÏ×ÁÎÙ × ËÁÞÅÓÔ×Å ÒÅÌÉÚÁ ÉÚ ×ÅÔ×É, + ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ &os; ÂÕÄÕÔ ×ËÌÀÞÁÔØ ÉÈ ÐÏÄÏÂÎÏ + ÓÏÏÂÝÅÎÉÑÍ ÂÅÚÏÐÁÓÎÏÓÔÉ &os;. ==== //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.8#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.8,v 1.10 2003/09/26 12:24:16 rse Exp $ +.\" $FreeBSD: src/sbin/devd/devd.8,v 1.11 2004/07/01 07:24:18 imp Exp $ .\" .Dd October 17, 2002 .Dt DEVD 8 @@ -109,6 +109,11 @@ .Nm system without modifying the user's other config files. +.Pp +All messages that +.Nm +receives are forwarded to the unix domain socket at +.Pa /var/run/devd.pipe . .Sh SEE ALSO .Xr devctl 4 , .Xr devd.conf 5 ==== //depot/projects/davidxu_ksedbg/src/sbin/devd/devd.cc#2 (text+ko) ==== @@ -30,15 +30,18 @@ // TODO list: // o devd.conf and devd man pages need a lot of help: -// - devd.conf needs to lose the warning about zone files. +// - devd needs to document the unix domain socket // - devd.conf needs more details on the supported statements. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.17 2003/10/24 22:02:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.18 2004/07/01 07:24:18 imp Exp $"); #include +#include +#include +#include #include -#include +#include #include #include @@ -54,11 +57,13 @@ #include #include #include +#include #include #include "devd.h" /* C compatible definitions */ #include "devd.hh" /* C++ class definitions */ +#define PIPE "/var/run/devd.pipe" #define CF "/etc/devd.conf" #define SYSCTL "hw.bus.devctl_disable" @@ -585,6 +590,56 @@ cfg.pop_var_table(); } +int +create_socket(const char *name) +{ + int fd, slen; + struct sockaddr_un sun; + + if ((fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) + err(1, "socket"); + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, name, sizeof(sun.sun_path)); + slen = SUN_LEN(&sun); + unlink(name); + if (bind(fd, (struct sockaddr *) & sun, slen) < 0) + err(1, "bind"); + listen(fd, 4); + fchown(fd, 0, 0); /* XXX - root.wheel */ + fchmod(fd, 0660); + return (fd); +} + +list clients; + +void +notify_clients(const char *data, int len) +{ + list bad; + list::const_iterator i; + + for (i = clients.begin(); i != clients.end(); i++) { + if (write(*i, data, len) <= 0) { + bad.push_back(*i); + close(*i); + } + } + + for (i = bad.begin(); i != bad.end(); i++) + clients.erase(find(clients.begin(), clients.end(), *i)); +} + +void +new_client(int fd) +{ + int s; + + s = accept(fd, NULL, NULL); + if (s != -1) + clients.push_back(s); +} + static void event_loop(void) { @@ -592,14 +647,17 @@ int fd; char buffer[DEVCTL_MAXBUF]; int once = 0; + int server_fd, max_fd; timeval tv; fd_set fds; fd = open(PATH_DEVCTL, O_RDONLY); if (fd == -1) - err(1, "Can't open devctl"); + err(1, "Can't open devctl device %s", PATH_DEVCTL); if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) - err(1, "Can't set close-on-exec flag"); + err(1, "Can't set close-on-exec flag on devctl"); + server_fd = create_socket(PIPE); + max_fd = max(fd, server_fd) + 1; while (1) { if (romeo_must_die) break; @@ -619,19 +677,33 @@ once++; } } - rv = read(fd, buffer, sizeof(buffer) - 1); - if (rv > 0) { - buffer[rv] = '\0'; - while (buffer[--rv] == '\n') + FD_ZERO(&fds); + FD_SET(fd, &fds); + FD_SET(server_fd, &fds); + rv = select(max_fd, &fds, NULL, NULL, NULL); + if (rv == -1) { + if (errno == EINTR) + continue; + err(1, "select"); + } + if (FD_ISSET(fd, &fds)) { + rv = read(fd, buffer, sizeof(buffer) - 1); + if (rv > 0) { + notify_clients(buffer, rv); buffer[rv] = '\0'; - process_event(buffer); - } else if (rv < 0) { - if (errno != EINTR) + while (buffer[--rv] == '\n') + buffer[rv] = '\0'; + process_event(buffer); + } else if (rv < 0) { + if (errno != EINTR) + break; + } else { + /* EOF */ break; - } else { - /* EOF */ - break; + } } + if (FD_ISSET(server_fd, &fds)) + new_client(server_fd); } close(fd); } ==== //depot/projects/davidxu_ksedbg/src/sys/boot/common/newvers.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -33,7 +33,7 @@ # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 LC_ALL=C; export LC_ALL -u=${USER-root} h=`hostname` t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` ==== //depot/projects/davidxu_ksedbg/src/sys/conf/newvers.sh#2 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $ TYPE="FreeBSD" REVISION="5.2" @@ -81,7 +81,7 @@ fi touch version -v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date` +v=`cat version` u=${USER-root} d=`pwd` h=${HOSTNAME-`hostname`} t=`date` i=`make -V KERN_IDENT` cat << EOF > vers.c $COPYRIGHT ==== //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amr.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.52 2004/06/16 09:46:36 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.53 2004/07/01 06:56:10 ps Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -976,7 +976,7 @@ s = splbio(); - if (sc->amr_state & AMR_STATE_INTEN) { + if ((sc->amr_state & AMR_STATE_CRASHDUMP) == 0) { count=0; while (sc->amr_busyslots) { tsleep(sc, PRIBIO | PCATCH, "amrpoll", hz); @@ -1788,7 +1788,7 @@ debug_called(1); - sc->amr_state &= ~AMR_STATE_INTEN; + sc->amr_state |= AMR_STATE_CRASHDUMP; /* get ourselves a command buffer */ if ((ac = amr_alloccmd(sc)) == NULL) @@ -1815,7 +1815,7 @@ if (ac != NULL) amr_releasecmd(ac); - sc->amr_state |= AMR_STATE_INTEN; + sc->amr_state &= ~AMR_STATE_CRASHDUMP; return (error); } ==== //depot/projects/davidxu_ksedbg/src/sys/dev/amr/amrvar.h#2 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.21 2004/06/16 09:46:36 phk Exp $ + * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.22 2004/07/01 06:56:10 ps Exp $ */ #if __FreeBSD_version >= 500005 @@ -187,6 +187,7 @@ #define AMR_STATE_SUSPEND (1<<1) #define AMR_STATE_INTEN (1<<2) #define AMR_STATE_SHUTDOWN (1<<3) +#define AMR_STATE_CRASHDUMP (1<<4) /* per-controller queues */ struct bio_queue_head amr_bioq; /* pending I/O with no commands */ ==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.16 2004/06/27 12:41:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.17 2004/07/01 05:14:12 brooks Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -165,6 +165,9 @@ uaa->product == USB_PRODUCT_FTDI_LK202 || uaa->product == USB_PRODUCT_FTDI_LK204)) return (UMATCH_VENDOR_PRODUCT); + if (uaa->vendor == USB_VENDOR_SIIG2 && + (uaa->product == USB_PRODUCT_SIIG2_US2308)) + return (UMATCH_VENDOR_PRODUCT); return (UMATCH_NONE); } @@ -210,24 +213,43 @@ id = usbd_get_interface_descriptor(iface); ucom->sc_iface = iface; - switch( uaa->product ){ - case USB_PRODUCT_FTDI_SERIAL_8U100AX: - sc->sc_type = UFTDI_TYPE_SIO; - sc->sc_hdrlen = 1; + switch( uaa->vendor ){ + case USB_VENDOR_FTDI: + switch( uaa->product ){ + case USB_PRODUCT_FTDI_SERIAL_8U100AX: + sc->sc_type = UFTDI_TYPE_SIO; + sc->sc_hdrlen = 1; + break; + case USB_PRODUCT_FTDI_SEMC_DSS20: + case USB_PRODUCT_FTDI_SERIAL_8U232AM: + case USB_PRODUCT_FTDI_CFA_631: + case USB_PRODUCT_FTDI_CFA_632: + case USB_PRODUCT_FTDI_CFA_633: + case USB_PRODUCT_FTDI_CFA_634: + case USB_PRODUCT_FTDI_USBSERIAL: + case USB_PRODUCT_FTDI_MX2_3: + case USB_PRODUCT_FTDI_MX4_5: + case USB_PRODUCT_FTDI_LK202: + case USB_PRODUCT_FTDI_LK204: + sc->sc_type = UFTDI_TYPE_8U232AM; + sc->sc_hdrlen = 0; + break; + + default: /* Can't happen */ + goto bad; + } break; - case USB_PRODUCT_FTDI_SEMC_DSS20: - case USB_PRODUCT_FTDI_SERIAL_8U232AM: - case USB_PRODUCT_FTDI_CFA_631: - case USB_PRODUCT_FTDI_CFA_632: - case USB_PRODUCT_FTDI_CFA_633: - case USB_PRODUCT_FTDI_CFA_634: - case USB_PRODUCT_FTDI_USBSERIAL: - case USB_PRODUCT_FTDI_MX2_3: - case USB_PRODUCT_FTDI_MX4_5: - case USB_PRODUCT_FTDI_LK202: - case USB_PRODUCT_FTDI_LK204: - sc->sc_type = UFTDI_TYPE_8U232AM; - sc->sc_hdrlen = 0; + + case USB_VENDOR_SIIG2: + switch( uaa->product ){ + case USB_PRODUCT_SIIG2_US2308: + sc->sc_type = UFTDI_TYPE_8U232AM; + sc->sc_hdrlen = 0; + break; + + default: /* Can't happen */ + goto bad; + } break; default: /* Can't happen */ ==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ugen.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.86 2004/06/27 12:41:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.87 2004/07/01 02:07:01 green Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -406,6 +406,7 @@ if (endpt == USB_CONTROL_ENDPOINT) { sc->sc_is_open[USB_CONTROL_ENDPOINT] = 1; + sc->sc_refcnt++; return (0); } @@ -516,6 +517,7 @@ } } sc->sc_is_open[endpt] = 1; + sc->sc_refcnt++; return (0); } @@ -543,6 +545,8 @@ if (endpt == USB_CONTROL_ENDPOINT) { DPRINTFN(5, ("ugenclose: close control\n")); sc->sc_is_open[endpt] = 0; + if (--sc->sc_refcnt == 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); return (0); } @@ -578,6 +582,8 @@ } } sc->sc_is_open[endpt] = 0; + if (--sc->sc_refcnt == 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); return (0); } @@ -734,10 +740,7 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); - sc->sc_refcnt++; error = ugen_do_read(sc, endpt, uio, flag); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } @@ -834,10 +837,7 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); - sc->sc_refcnt++; error = ugen_do_write(sc, endpt, uio, flag); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } @@ -886,12 +886,13 @@ } s = splusb(); - if (--sc->sc_refcnt >= 0) { + if (sc->sc_refcnt > 0) { /* Wake everyone */ for (i = 0; i < USB_MAX_ENDPOINTS; i++) wakeup(&sc->sc_endpoints[i][IN]); /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); + while (sc->sc_refcnt > 0) + usb_detach_wait(USBDEV(sc->sc_dev)); } splx(s); @@ -1401,10 +1402,7 @@ USB_GET_SC(ugen, UGENUNIT(dev), sc); - sc->sc_refcnt++; error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p); - if (--sc->sc_refcnt < 0) - usb_detach_wakeup(USBDEV(sc->sc_dev)); return (error); } ==== //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.184 2004/06/27 17:27:04 alex Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.185 2004/07/01 05:14:12 brooks Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -379,6 +379,7 @@ vendor DAISY 0x3579 Daisy Technology vendor DELL 0x413c Dell vendor INTEL 0x8086 Intel +vendor SIIG2 0x0b39 SIIG vendor HP2 0xf003 Hewlett Packard /* @@ -1192,6 +1193,7 @@ /* SIIG products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader +product SIIG2 US2308 0x0421 USB to Serial /* Silicon Portals Inc. */ product SILICONPORTALS YAPPH_NF 0x0200 YAP Phone (no firmware) ==== //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1162 2004/06/23 17:33:24 brooks Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1163 2004/07/01 06:02:32 jhb Exp $ # # @@ -66,6 +66,7 @@ # deleting the specification for CPUs you don't need to use may make # parts of the system run faster. # I386_CPU is mutually exclusive with the other CPU types. +# I386_CPU is deprecated and will be removed in 6.0-RELEASE. # #cpu I386_CPU cpu I486_CPU ==== //depot/projects/davidxu_ksedbg/src/sys/modules/acpi/acpi/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.7 2004/06/30 04:47:31 njl Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.8 2004/07/01 04:14:55 marks Exp $ .PATH: ${.CURDIR}/../../../contrib/dev/acpica \ ${.CURDIR}/../../../pci \ @@ -7,6 +7,7 @@ ${.CURDIR}/../../../${MACHINE_ARCH}/acpica KMOD= acpi +WARNS?= 2 # ACPI CA sources CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica ==== //depot/projects/davidxu_ksedbg/src/sys/sys/tty.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * @(#)tty.h 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/tty.h,v 1.86 2004/06/30 21:38:08 phk Exp $ + * $FreeBSD: src/sys/sys/tty.h,v 1.87 2004/07/01 03:08:15 marcel Exp $ */ #ifndef _SYS_TTY_H_ @@ -65,6 +65,8 @@ char *c_cl; /* Pointer to the last cblock. */ }; +struct tty; + typedef void t_oproc_t(struct tty *); typedef void t_stop_t(struct tty *, int); typedef int t_param_t(struct tty *, struct termios *); From owner-p4-projects@FreeBSD.ORG Thu Jul 1 08:48:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A373216A4D2; Thu, 1 Jul 2004 08:48:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7750616A4F1 for ; Thu, 1 Jul 2004 08:48:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 702FD43D46 for ; Thu, 1 Jul 2004 08:48:14 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i618luZK071581 for ; Thu, 1 Jul 2004 08:47:56 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i618lul0071578 for perforce@freebsd.org; Thu, 1 Jul 2004 08:47:56 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 08:47:56 GMT Message-Id: <200407010847.i618lul0071578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 08:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=56198 Change 56198 by davidxu@davidxu_celeron on 2004/07/01 08:47:16 Define struct ps_prochandle. Remove some unnecessary definitions. Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/proc_service.h#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/include/proc_service.h#2 (text+ko) ==== @@ -39,7 +39,10 @@ #include #include -struct ps_prochandle; +struct ps_prochandle +{ + pid_t pid; +}; typedef enum { @@ -52,11 +55,6 @@ PS_NOFREGS } ps_err_e; -/* typedef unsigned long lwpid_t; */ -typedef unsigned long paddr_t; -typedef unsigned long psaddr_t; -/* typedef gregset_t prgregset_t[1]; */ - /* * Every program that links libthread_db must provide a set of process control * primitives to access memory and registers in the target process, to start From owner-p4-projects@FreeBSD.ORG Thu Jul 1 09:11:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0345316A4D0; Thu, 1 Jul 2004 09:11:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D425A16A4CE for ; Thu, 1 Jul 2004 09:11:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B77EF43D31 for ; Thu, 1 Jul 2004 09:11:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i619BPil072305 for ; Thu, 1 Jul 2004 09:11:25 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i619BPrR072302 for perforce@freebsd.org; Thu, 1 Jul 2004 09:11:25 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 09:11:25 GMT Message-Id: <200407010911.i619BPrR072302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 09:11:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=56200 Change 56200 by davidxu@davidxu_celeron on 2004/07/01 09:10:24 rename freebsd-thread.c fbsd-threads.c Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 1 09:13:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40BDC16A4D0; Thu, 1 Jul 2004 09:13:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AD5116A4CE for ; Thu, 1 Jul 2004 09:13:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1376343D48 for ; Thu, 1 Jul 2004 09:13:52 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i619DSUb072397 for ; Thu, 1 Jul 2004 09:13:28 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i619DSql072394 for perforce@freebsd.org; Thu, 1 Jul 2004 09:13:28 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 09:13:28 GMT Message-Id: <200407010913.i619DSql072394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 09:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=56201 Change 56201 by davidxu@davidxu_celeron on 2004/07/01 09:13:11 add proc service functions. if libthread_db can not map a lwp, gdb should deal with it. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ #include "gdb_assert.h" #include -#include "gdb_proc_service.h" +#include "proc_service.h" #include "thread_db.h" #include "bfd.h" @@ -81,16 +81,15 @@ td_thr_events_t *event); static td_err_e (*td_ta_event_getmsg_p) (const td_thragent_t *ta, td_event_msg_t *msg); - static td_err_e (*td_thr_validate_p) (const td_thrhandle_t *th); static td_err_e (*td_thr_get_info_p) (const td_thrhandle_t *th, td_thrinfo_t *infop); static td_err_e (*td_thr_getfpregs_p) (const td_thrhandle_t *th, - gdb_prfpregset_t *regset); + prfpregset_t *regset); static td_err_e (*td_thr_getgregs_p) (const td_thrhandle_t *th, prgregset_t gregs); static td_err_e (*td_thr_setfpregs_p) (const td_thrhandle_t *th, - const gdb_prfpregset_t *fpregs); + const prfpregset_t *fpregs); static td_err_e (*td_thr_setgregs_p) (const td_thrhandle_t *th, prgregset_t gregs); static td_err_e (*td_thr_event_enable_p) (const td_thrhandle_t *th, int event); @@ -111,8 +110,8 @@ #define GET_LWP(ptid) ptid_get_lwp (ptid) #define GET_THREAD(ptid) ptid_get_tid (ptid) -#define is_lwp(ptid) (GET_LWP (ptid) != 0) -#define is_thread(ptid) (GET_THREAD (ptid) != 0) +#define IS_LWP(ptid) (GET_LWP (ptid) != 0) +#define IS_THREAD(ptid) (GET_THREAD (ptid) != 0) #define BUILD_LWP(lwp, pid) ptid_build (pid, lwp, 0) #define BUILD_THREAD(tid, pid) ptid_build (pid, 0, tid) @@ -197,29 +196,7 @@ } } -static int -thread_activated () -{ - int activated; - - if (td_ta_activated_p(thread_agent, &activated)) - return 0; - return (activated); -} - -static long -get_current_lwp (int pid) -{ - lwpid_t lwp; - - if (ptrace (PT_GETXTHREAD, GET_PID(inferior_ptid), (caddr_t)&lwp, 0)) { - perror_with_name("PT_GETXTHREAD"); - } - return (long)lwp; -} - -/* Convert between user-level thread ids and LWP ids. */ - +/* Convert LWP to user-level thread id. */ static ptid_t thread_from_lwp (ptid_t ptid) { @@ -227,139 +204,46 @@ td_thrhandle_t th; td_err_e err; - if (GET_LWP (ptid) == 0) { - ptid = BUILD_LWP (get_current_lwp (GET_PID (ptid)), GET_PID (ptid)); - } - gdb_assert (is_lwp (ptid)); + gdb_assert (IS_LWP (ptid)); err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); - if (err != TD_OK) - error ("Cannot find user-level thread for LWP %d: %s", - GET_LWP (ptid), thread_db_err_str (err)); + if (err == TD_OK) + { + err = td_thr_get_info_p (&th, &ti); + if (err != TD_OK) + error ("Cannot get thread info: %s", thread_db_err_str (err)); + return BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + } - err = td_thr_get_info_p (&th, &ti); - if (err != TD_OK) - error ("Cannot get thread info: %s", thread_db_err_str (err)); - - return BUILD_THREAD (ti.ti_tid, GET_PID (ptid)); + /* the LWP is not mapped to user thread */ + return BUILD_LWP (GET_LWP (ptid), GET_PID (ptid)); } -static ptid_t -lwp_from_thread (ptid_t ptid) +static long +get_current_lwp (int pid) { - td_thrinfo_t ti; - td_thrhandle_t th; - td_err_e err; - - if (!is_thread (ptid)) - return ptid; + lwpid_t lwp; - err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (ptid), &th); - if (err != TD_OK) - error ("Cannot find thread %ld: %s", - (long) GET_THREAD (ptid), thread_db_err_str (err)); + if (ptrace (PT_GETXTHREAD, GET_PID(inferior_ptid), (caddr_t)&lwp, 0)) + perror_with_name("PT_GETXTHREAD"); - err = td_thr_get_info_p (&th, &ti); - if (err != TD_OK) - error ("Cannot get thread info: %s", thread_db_err_str (err)); - - return BUILD_LWP (ti.ti_lid, GET_PID (ptid)); + return (long)lwp; } static void -find_current_thread () +get_current_thread () { - long lwp; - ptid_t tmp, ptid; + long lwp; + ptid_t tmp, ptid; -#if 0 - if (!thread_activated(thread_agent)) - return; -#endif - lwp = get_current_lwp (proc_handle.pid); - tmp = BUILD_LWP (lwp, proc_handle.pid); - ptid = thread_from_lwp (tmp); - if (!in_thread_list(ptid)) { - add_thread (ptid); - inferior_ptid = ptid; - } -} - -static int -thread_db_load (void) -{ - void *handle; - td_err_e err; - - handle = dlopen (LIBTHREAD_DB_SO, RTLD_NOW); - if (handle == NULL) - return 0; - - td_init_p = dlsym (handle, "td_init"); - if (td_init_p == NULL) - return 0; - - td_ta_new_p = dlsym (handle, "td_ta_new"); - if (td_ta_new_p == NULL) - return 0; - - td_ta_map_id2thr_p = dlsym (handle, "td_ta_map_id2thr"); - if (td_ta_map_id2thr_p == NULL) - return 0; - - td_ta_map_lwp2thr_p = dlsym (handle, "td_ta_map_lwp2thr"); - if (td_ta_map_lwp2thr_p == NULL) - return 0; - - td_ta_thr_iter_p = dlsym (handle, "td_ta_thr_iter"); - if (td_ta_thr_iter_p == NULL) - return 0; - - td_thr_validate_p = dlsym (handle, "td_thr_validate"); - if (td_thr_validate_p == NULL) - return 0; - - td_thr_get_info_p = dlsym (handle, "td_thr_get_info"); - if (td_thr_get_info_p == NULL) - return 0; - - td_thr_getfpregs_p = dlsym (handle, "td_thr_getfpregs"); - if (td_thr_getfpregs_p == NULL) - return 0; - - td_thr_getgregs_p = dlsym (handle, "td_thr_getgregs"); - if (td_thr_getgregs_p == NULL) - return 0; - - td_thr_setfpregs_p = dlsym (handle, "td_thr_setfpregs"); - if (td_thr_setfpregs_p == NULL) - return 0; - - td_thr_setgregs_p = dlsym (handle, "td_thr_setgregs"); - if (td_thr_setgregs_p == NULL) - return 0; - - td_thr_sstep_p = dlsym(handle, "td_thr_sstep"); - if (td_thr_sstep_p == NULL) - return 0; - - td_ta_activated_p = dlsym (handle, "td_ta_activated"); - if (td_ta_activated_p == NULL) - return 0; - - td_ta_tsd_iter_p = dlsym (handle, "td_ta_tsd_iter"); - if (td_ta_tsd_iter_p == NULL) - return 0; - - /* Initialize the library. */ - err = td_init_p (); - if (err != TD_OK) + lwp = get_current_lwp (proc_handle.pid); + tmp = BUILD_LWP (lwp, proc_handle.pid); + ptid = thread_from_lwp (tmp); + if (!in_thread_list (ptid)) { - warning ("Cannot initialize libthread_db: %s", thread_db_err_str (err)); - return 0; + add_thread (ptid); + inferior_ptid = ptid; } - - return 1; } static void @@ -374,11 +258,11 @@ /* All symbols have been discarded. If the thread_db target is active, deactivate it now. */ if (using_thread_db) - { - gdb_assert (proc_handle.pid == 0); - unpush_target (&thread_db_ops); - using_thread_db = 0; - } + { + gdb_assert (proc_handle.pid == 0); + unpush_target (&thread_db_ops); + using_thread_db = 0; + } keep_thread_db = 0; @@ -394,8 +278,7 @@ that at this point there is no guarantee that we actually have a child process. */ proc_handle.pid = GET_PID (inferior_ptid); - /* XXX bring in proc service module */ - ps_getpid(&proc_handle); + /* Now attempt to open a connection to the thread library. */ err = td_ta_new_p (&proc_handle, &thread_agent); switch (err) @@ -416,24 +299,26 @@ least until all symbols have been discarded anyway (see above). */ if (objfile == symfile_objfile) - { - gdb_assert (proc_handle.pid == 0); - keep_thread_db = 1; - } + { + gdb_assert (proc_handle.pid == 0); + keep_thread_db = 1; + } /* We can only poke around if there actually is a child process. If there is no child process alive, postpone the steps below until one has been created. */ if (proc_handle.pid != 0) - { - fbsd_thread_find_new_threads (); - find_current_thread (); - } + { + fbsd_thread_find_new_threads (); + get_current_thread (); + } + else + printf_filtered("%s postpone processing\n", __func__); break; default: warning ("Cannot initialize thread debugging library: %s", - thread_db_err_str (err)); + thread_db_err_str (err)); break; } @@ -456,7 +341,7 @@ /* ...and perform the remaining initialization steps. */ fbsd_thread_find_new_threads(); - find_current_thread (); + get_current_thread (); } static void @@ -467,12 +352,27 @@ } static int +single_step (ptid_t ptid, int step) +{ + if (IS_LWP(ptid)) + { + int req = step ? PT_SETSTEP : PT_CLEARSTEP; + return ptrace (req, GET_LWP (ptid), 0, 0) == 0; + } + + td_thrhandle_t th; + if (td_ta_map_id2thr_p (thread_agent, GET_THREAD(ptid), &th) == 0) + { + td_thr_sstep_p (&th, step); + return 1; + } + return 0; +} + +static int resume_callback (struct thread_info *info, void *ta) { - td_thrhandle_t th; - - if (td_ta_map_id2thr_p(ta, GET_THREAD(info->ptid), &th) == 0) - td_thr_sstep_p (&th, 0); + single_step (info->ptid, 0); return 0; } @@ -488,7 +388,7 @@ GET_PID(ptid), GET_LWP(ptid), GET_THREAD(ptid), step); #endif - if (proc_handle.pid == 0 || !thread_activated()) + if (proc_handle.pid == 0) { child_resume (ptid, step, signo); return; @@ -509,10 +409,10 @@ ptid = inferior_ptid; if (resume_all) - iterate_over_threads(resume_callback, thread_agent); - if (td_ta_map_id2thr_p(thread_agent, GET_THREAD(ptid), &th)) - error ("%s: can not map user level thread", __func__); - td_thr_sstep_p(&th, step); + iterate_over_threads(resume_callback, 0); + + if (single_step (ptid, step)) + error ("single step failed"); if (ptrace (PT_CONTINUE, pid, (caddr_t)1, target_signal_to_host(signo)) == -1) @@ -528,37 +428,32 @@ ret = child_ops.to_wait (ptid, ourstatus); if (GET_PID(ret) >= 0 && ourstatus->kind == TARGET_WAITKIND_STOPPED) { - // if (!thread_activated(thread_agent)) - // goto out; if (ptrace (PT_GETXTHREAD, GET_PID(ret), (caddr_t)&lwp, 0)) - perror_with_name ("ptrace PT_GETXTHREAD"); - ret = BUILD_LWP(lwp, GET_PID(ret)); - ret = thread_from_lwp(ret); - if (!in_thread_list (ret)) { + perror_with_name ("ptrace cannot get current lwp"); + ret = thread_from_lwp (BUILD_LWP (lwp, GET_PID (ret))); + if (!in_thread_list (ret)) add_thread (ret); - } } -out: return (ret); } static int fbsd_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write, - struct mem_attrib *attrib, - struct target_ops *target) + struct mem_attrib *attrib, struct target_ops *target) { return child_ops.to_xfer_memory (memaddr, myaddr, len, write, attrib, target); } static void -fbsd_fetch_lwp_registers (int regno) +fbsd_lwp_fetch_registers (int regno) { gregset_t gregs; lwpid_t lwp; - if (!is_lwp (inferior_ptid)) + /* FIXME, is it possible ? */ + if (!IS_LWP (inferior_ptid)) { child_ops.to_fetch_registers (regno); return; @@ -566,15 +461,13 @@ lwp = GET_LWP (inferior_ptid); - if (ttrace (PT_GETREGS, GET_PID (inferior_ptid), lwp, - (caddr_t)&gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1) + error ("Cannot get lwp %d registers: %s\n", lwp, safe_strerror (errno)); supply_gregset (&gregs); fpregset_t fpregs; - if (ttrace (PT_GETFPREGS, GET_PID (inferior_ptid), lwp, - (caddr_t)&fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + if (ptrace (PT_GETFPREGS, lwp, (caddr_t) &fpregs, 0) == -1) + error ("Cannot get lwp %d registers: %s\n ", lwp, safe_strerror (errno)); supply_fpregset (&fpregs); } @@ -583,96 +476,88 @@ fbsd_thread_fetch_registers (int regno) { prgregset_t gregset; - gdb_prfpregset_t fpregset; + prfpregset_t fpregset; td_thrhandle_t th; td_err_e err; - td_thrinfo_t ti; - if (!is_thread (inferior_ptid)) + if (!IS_THREAD (inferior_ptid)) { - fbsd_fetch_lwp_registers (regno); + fbsd_lwp_fetch_registers (regno); return; } err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (inferior_ptid), &th); if (err != TD_OK) error ("Cannot find thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); err = td_thr_getgregs_p (&th, gregset); if (err != TD_OK) error ("Cannot fetch general-purpose registers for thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); err = td_thr_getfpregs_p (&th, &fpregset); if (err != TD_OK) error ("Cannot get floating-point registers for thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); - /* Note that we must call supply_gregset after calling the thread_db - routines because the thread_db routines call ps_lgetgregs and - friends which clobber GDB's register cache. */ - supply_gregset ((gdb_gregset_t *) gregset); + supply_gregset (gregset); supply_fpregset (&fpregset); - - err = td_thr_get_info_p (&th, &ti); } static void -fbsd_store_lwp_registers (int regno) +fbsd_lwp_store_registers (int regno) { lwpid_t lwp; - if (!is_lwp (inferior_ptid)) + /* FIXME, is it possible ? */ + if (!IS_LWP (inferior_ptid)) { child_ops.to_store_registers (regno); - return; + return ; } lwp = GET_LWP (inferior_ptid); gregset_t gregs; - if (ttrace (PT_GETREGS, GET_PID (inferior_ptid), lwp, - (caddr_t)&gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + if (ptrace (PT_GETREGS, lwp, (caddr_t) &gregs, 0) == -1) + error ("Cannot get lwp %d registers: %s\n", lwp, safe_strerror (errno)); fill_gregset (&gregs, regno); - if (ttrace (PT_SETREGS, GET_PID (inferior_ptid), lwp, - (caddr_t)&gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + if (ptrace (PT_SETREGS, lwp, (caddr_t) &gregs, 0) == -1) + error ("Cannot set lwp %d registers: %s\n", lwp, safe_strerror (errno)); fpregset_t fpregs; - if (ttrace (PT_GETFPREGS, GET_PID (inferior_ptid), lwp, - (caddr_t) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + if (ptrace (PT_GETFPREGS, lwp, (caddr_t) &fpregs, 0) == -1) + error ("Cannot get lwp %d float registers: %s\n", lwp, + safe_strerror (errno)); fill_fpregset (&fpregs, regno); - - if (ttrace (PT_SETFPREGS, GET_PID (inferior_ptid), lwp, - (caddr_t) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + if (ptrace (PT_SETFPREGS, lwp, (caddr_t) &fpregs, 0) == -1) + error ("Cannot set lwp %d float registers: %s\n", lwp, + safe_strerr (errno)); } static void fbsd_thread_store_registers (int regno) { prgregset_t gregset; - gdb_prfpregset_t fpregset; + prfpregset_t fpregset; td_thrhandle_t th; td_err_e err; - if (!is_thread (inferior_ptid)) + if (!IS_THREAD (inferior_ptid)) { - fbsd_store_lwp_registers (regno); + fbsd_lwp_store_registers (regno); return; } err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (inferior_ptid), &th); if (err != TD_OK) - error ("Cannot find thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + error ("Cannot find thread %lx: %s", + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); if (regno != -1) { @@ -683,17 +568,17 @@ supply_register (regno, raw); } - fill_gregset ((gdb_gregset_t *) gregset, -1); + fill_gregset (gregset, -1); fill_fpregset (&fpregset, -1); err = td_thr_setgregs_p (&th, gregset); if (err != TD_OK) - error ("Cannot store general-purpose registers for thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + error ("Cannot store general-purpose registers for thread %lx: %s", + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); err = td_thr_setfpregs_p (&th, &fpregset); if (err != TD_OK) - error ("Cannot store floating-point registers for thread %ld: %s", - (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); + error ("Cannot store floating-point registers for thread %lx: %s", + (long) GET_THREAD (inferior_ptid), thread_db_err_str (err)); } static void @@ -724,7 +609,7 @@ proc_handle.pid = GET_PID (ptid); fbsd_thread_find_new_threads (); - find_current_thread (); + get_current_thread (); } } @@ -746,32 +631,40 @@ td_err_e err; gregset_t gregs; - if (is_thread (ptid)) + if (IS_THREAD (ptid)) { err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (ptid), &th); if (err != TD_OK) - return 0; - - err = td_thr_validate_p (&th); - if (err != TD_OK) - return 0; + return 0; err = td_thr_get_info_p (&th, &ti); if (err != TD_OK) - return 0; + return 0; + /* A zombie thread. */ if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE) - return 0; /* A zombie thread. */ + return 0; return 1; } else if (GET_LWP (ptid) == 0) { + /* we sometimes are called with lwp == 0 */ return 1; } - - return ttrace (PT_GETREGS, GET_PID(ptid), GET_LWP (ptid), - (caddr_t)&gregs, 0) == 0; + else + { + err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); + /* + * if the lwp was already mapped to user thread, don't use it + * directly, please use user thread id instead. + */ + if (err == TD_OK) + return 0; + } + + /* check lwp in kernel */ + return ptrace (PT_GETREGS, GET_LWP (ptid), (caddr_t)&gregs, 0) == 0; } static int @@ -785,15 +678,15 @@ if (err != TD_OK) error ("Cannot get thread info: %s", thread_db_err_str (err)); + /* Ignore zombie */ if (ti.ti_state == TD_THR_UNKNOWN || ti.ti_state == TD_THR_ZOMBIE) - return 0; /* A zombie -- ignore. */ + return 0; ptid = BUILD_THREAD (ti.ti_tid, GET_PID (inferior_ptid)); if (!in_thread_list (ptid)) - { add_thread (ptid); - } + return 0; } @@ -802,10 +695,10 @@ { td_err_e err; - /* Iterate over all user-space threads to discover new threads. */ + /* Iterate over all user-space threads to discover new threads. */ err = td_ta_thr_iter_p (thread_agent, find_new_threads_callback, NULL, - TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, - TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); + TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY, + TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS); if (err != TD_OK) error ("Cannot find new threads: %s", thread_db_err_str (err)); } @@ -815,7 +708,7 @@ { static char buf[64]; - if (is_thread (ptid)) + if (IS_THREAD (ptid)) { td_thrhandle_t th; td_thrinfo_t ti; @@ -823,54 +716,41 @@ err = td_ta_map_id2thr_p (thread_agent, GET_THREAD (ptid), &th); if (err != TD_OK) - error ("Cannot find thread %lx: %s", - (long) GET_THREAD (ptid), thread_db_err_str (err)); + error ("Cannot find thread %lx: %s", + GET_THREAD (ptid), thread_db_err_str (err)); err = td_thr_get_info_p (&th, &ti); if (err != TD_OK) - error ("Cannot get thread info for thread %lx: %s", - (long) GET_THREAD (ptid), thread_db_err_str (err)); + error ("Cannot get thread info for thread %lx: %s", + GET_THREAD (ptid), thread_db_err_str (err)); - if (ti.ti_state == TD_THR_ACTIVE && ti.ti_lid != 0) - { - snprintf (buf, sizeof (buf), "Thread %lx (LWP %x)", - (long) ti.ti_tid, ti.ti_lid); - } + if (ti.ti_lid != 0) + { + snprintf (buf, sizeof (buf), "Thread %lx (LWP %d)", + (long) ti.ti_tid, ti.ti_lid); + } else - { - snprintf (buf, sizeof (buf), "Thread %lx (%s)", - (long) ti.ti_tid, thread_db_state_str (ti.ti_state)); - } + { + snprintf (buf, sizeof (buf), "Thread %lx (%s)", + (long) ti.ti_tid, thread_db_state_str (ti.ti_state)); + } return buf; } - else if (is_lwp (ptid)) + else if (IS_LWP (ptid)) { - snprintf (buf, sizeof (buf), "kernel thread %lx", GET_LWP (ptid)); + snprintf (buf, sizeof (buf), "LWP %d", (int) GET_LWP (ptid)); return buf; } return normal_pid_to_str (ptid); } -ps_err_e -ps_lsetstep (struct ps_prochandle *ph, lwpid_t lwp, int step) -{ - int req = step ? PT_SETSTEP : PT_CLEARSTEP; - - if (ttrace(req, ph->pid, lwp, (caddr_t)1, 0)) - { - perror_with_name ("PT_SETSTEP/PT_CLEARSTEP"); - return PS_ERR; - } - return (0); -} - static int tsd_cb (thread_key_t key, void (*destructor)(void *), void *ignore) { struct minimal_symbol *ms; char *name; - + ms = lookup_minimal_symbol_by_pc ((CORE_ADDR)destructor); if (!ms) name = "???"; @@ -915,6 +795,83 @@ thread_db_ops.to_magic = OPS_MAGIC; } +static int +thread_db_load (void) +{ + void *handle; + td_err_e err; + + handle = dlopen (LIBTHREAD_DB_SO, RTLD_NOW); + if (handle == NULL) + return 0; + + td_init_p = dlsym (handle, "td_init"); + if (td_init_p == NULL) + return 0; + + td_ta_new_p = dlsym (handle, "td_ta_new"); + if (td_ta_new_p == NULL) + return 0; + + td_ta_map_id2thr_p = dlsym (handle, "td_ta_map_id2thr"); + if (td_ta_map_id2thr_p == NULL) + return 0; + + td_ta_map_lwp2thr_p = dlsym (handle, "td_ta_map_lwp2thr"); + if (td_ta_map_lwp2thr_p == NULL) + return 0; + + td_ta_thr_iter_p = dlsym (handle, "td_ta_thr_iter"); + if (td_ta_thr_iter_p == NULL) + return 0; + + td_thr_validate_p = dlsym (handle, "td_thr_validate"); + if (td_thr_validate_p == NULL) + return 0; + + td_thr_get_info_p = dlsym (handle, "td_thr_get_info"); + if (td_thr_get_info_p == NULL) + return 0; + + td_thr_getfpregs_p = dlsym (handle, "td_thr_getfpregs"); + if (td_thr_getfpregs_p == NULL) + return 0; + + td_thr_getgregs_p = dlsym (handle, "td_thr_getgregs"); + if (td_thr_getgregs_p == NULL) + return 0; + + td_thr_setfpregs_p = dlsym (handle, "td_thr_setfpregs"); + if (td_thr_setfpregs_p == NULL) + return 0; + + td_thr_setgregs_p = dlsym (handle, "td_thr_setgregs"); + if (td_thr_setgregs_p == NULL) + return 0; + + td_thr_sstep_p = dlsym(handle, "td_thr_sstep"); + if (td_thr_sstep_p == NULL) + return 0; + + td_ta_activated_p = dlsym (handle, "td_ta_activated"); + if (td_ta_activated_p == NULL) + return 0; + + td_ta_tsd_iter_p = dlsym (handle, "td_ta_tsd_iter"); + if (td_ta_tsd_iter_p == NULL) + return 0; + + /* Initialize the library. */ + err = td_init_p (); + if (err != TD_OK) + { + warning ("Cannot initialize libthread_db: %s", thread_db_err_str (err)); + return 0; + } + + return 1; +} + void _initialize_thread_db (void) { @@ -933,7 +890,108 @@ /* Add ourselves to objfile event chain. */ target_new_objfile_chain = target_new_objfile_hook; target_new_objfile_hook = fbsd_thread_new_objfile; - } else { + } + else + { printf_filtered("%s: can not load %s.\n", __func__, LIBTHREAD_DB_SO); - } + } +} + +/* proc service functions */ +void +ps_plog (const char *fmt, ...) +{ + va_list args; + + va_start (args, fmt); + vfprintf_filtered (gdb_stderr, fmt, args); +} + +ps_err_e +ps_pglobal_lookup (struct ps_prochandle *ph, const char *obj, + const char *name, psaddr_t *sym_addr) +{ + struct minimal_symbol *ms; + + ms = lookup_minimal_symbol (name, NULL, NULL); + if (ms == NULL) + return PS_NOSYM; + + *sym_addr = (psaddr_t) SYMBOL_VALUE_ADDRESS (ms); + return PS_OK; +} + +ps_err_e +ps_pdread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) +{ + return target_read_memory ((CORE_ADDR) addr, buf, len); +} + +ps_err_e +ps_pdwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, + size_t len) +{ + return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); +} + +ps_err_e +ps_ptread (struct ps_prochandle *ph, psaddr_t addr, void *buf, size_t len) +{ + return target_read_memory ((CORE_ADDR) addr, buf, len); +} + +ps_err_e +ps_ptwrite (struct ps_prochandle *ph, psaddr_t addr, const void *buf, + size_t len) +{ + return target_write_memory ((CORE_ADDR) addr, (void *)buf, len); +} + +ps_err_e +ps_lgetregs (struct ps_prochandle *ph, lwpid_t lwpid, prgregset_t gregset) +{ + /* should check data modal, .core or process ? */ + if (ptrace (PT_GETREGS, lwpid, (caddr_t)gregset, 0) == -1) + return PS_ERR; + return PS_OK; +} + +ps_err_e +ps_lsetregs (struct ps_prochandle *ph, lwpid_t lwpid, const prgregset_t gregset) +{ + if (ptrace (PT_SETREGS, lwpid, (caddr_t) gregset, 0) == -1) + return PS_ERR; + return PS_OK; +} + +ps_err_e +ps_lgetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, prfpregset_t *fpregset) +{ + if (ptrace (PT_GETFPREGS, lwpid, (caddr_t) fpregset, 0) == -1) + return PS_ERR; + return PS_OK; +} + +ps_err_e +ps_lsetfpregs (struct ps_prochandle *ph, lwpid_t lwpid, + const prfpregset_t *fpregset) +{ + if (ptrace (PT_SETFPREGS, lwpid, (caddr_t) fpregset, 0) == -1) + return PS_ERR; + return PS_OK; +} + +pid_t +ps_getpid (struct ps_prochandle *ph) +{ + return ph->pid; +} + +ps_err_e +ps_lsetstep (struct ps_prochandle *ph, lwpid_t lwp, int step) +{ + if (ptrace ((step ? PT_SETSTEP : PT_CLEARSTEP), lwp, 0, 0)) + return PS_ERR; + return PS_OK; } + From owner-p4-projects@FreeBSD.ORG Thu Jul 1 09:14:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 056AF16A4D2; Thu, 1 Jul 2004 09:14:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C274216A4CE for ; Thu, 1 Jul 2004 09:14:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC92A43D31 for ; Thu, 1 Jul 2004 09:14:46 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i619EUmH072417 for ; Thu, 1 Jul 2004 09:14:30 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i619ETTo072414 for perforce@freebsd.org; Thu, 1 Jul 2004 09:14:29 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 09:14:29 GMT Message-Id: <200407010914.i619ETTo072414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 09:14:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=56202 Change 56202 by davidxu@davidxu_celeron on 2004/07/01 09:14:11 freebsd-threads.c was renamed to fbsd-threads.c Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/Makefile#4 (text+ko) ==== @@ -37,7 +37,7 @@ tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ utils.c valarith.c valops.c valprint.c values.c varobj.c \ - wrapper.c proc-service.c freebsd-threads.c ${LIBSRCS} + wrapper.c fbsd-threads.c ${LIBSRCS} GENSRCS= version.c CFLAGS+= -I${.CURDIR}/../../../../include From owner-p4-projects@FreeBSD.ORG Thu Jul 1 09:20:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E8AD16A4D0; Thu, 1 Jul 2004 09:20:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BCDA16A4CE for ; Thu, 1 Jul 2004 09:20:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 460D543D4C for ; Thu, 1 Jul 2004 09:20:48 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i619Kc2d072604 for ; Thu, 1 Jul 2004 09:20:38 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i619Kb0q072601 for perforce@freebsd.org; Thu, 1 Jul 2004 09:20:37 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 09:20:37 GMT Message-Id: <200407010920.i619Kb0q072601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 09:20:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=56203 Change 56203 by davidxu@davidxu_celeron on 2004/07/01 09:19:47 If a lwp is not used by any user thread, return TD_NOTHR. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/freebsd-threads.c#2 delete .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#3 (text+ko) ==== @@ -302,16 +302,6 @@ return (P2T(ret)); } - /* - * If we reach here, the lwp is upcall thread or similar thing not yet - * mapped to user thread. - * XXX we probably should check if the lwp is existing in process by - * calling getgreg, current we just trust gdb. - */ - th->th_ta_p = (td_thragent_t *)ta; - th->th_unique = pt_map_lwp(ta, lwp); - if (th->th_unique == -1) - return (TD_MALLOC); return (TD_OK); } From owner-p4-projects@FreeBSD.ORG Thu Jul 1 14:17:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2E216A4D0; Thu, 1 Jul 2004 14:17:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D657016A4CE for ; Thu, 1 Jul 2004 14:17:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE56643D49 for ; Thu, 1 Jul 2004 14:17:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61EGZZH080475 for ; Thu, 1 Jul 2004 14:16:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61EGZls080472 for perforce@freebsd.org; Thu, 1 Jul 2004 14:16:35 GMT (envelope-from peter@freebsd.org) Date: Thu, 1 Jul 2004 14:16:35 GMT Message-Id: <200407011416.i61EGZls080472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 56210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 14:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=56210 Change 56210 by peter@peter_work on 2004/07/01 14:15:42 IFC @56209 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#25 integrate .. //depot/projects/hammer/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#50 integrate .. //depot/projects/hammer/sys/conf/files#68 integrate .. //depot/projects/hammer/sys/conf/files.amd64#48 integrate .. //depot/projects/hammer/sys/conf/files.i386#34 integrate .. //depot/projects/hammer/sys/conf/files.ia64#19 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#31 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#11 integrate .. //depot/projects/hammer/sys/conf/options#43 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#40 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_isab.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#12 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#30 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#11 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#18 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#14 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#25 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#22 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#10 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#16 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#11 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#37 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#16 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_toshiba.c#9 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#44 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/mptable.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#41 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#16 integrate .. //depot/projects/hammer/sys/i386/isa/isa.c#4 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#7 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#16 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/hammer/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#17 integrate .. //depot/projects/hammer/sys/kern/link_elf_obj.c#45 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/hammer/sys/modules/Makefile#48 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ahb/Makefile#1 branch .. //depot/projects/hammer/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#29 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#26 integrate .. //depot/projects/hammer/sys/pci/if_dcreg.h#15 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powermac/maciovar.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#22 integrate .. //depot/projects/hammer/sys/powerpc/psim/iobus.c#5 integrate .. //depot/projects/hammer/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#11 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#19 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#13 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#16 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/nexus.c#7 integrate .. //depot/projects/hammer/sys/sys/rman.h#4 integrate .. //depot/projects/hammer/sys/sys/tty.h#12 integrate .. //depot/projects/hammer/sys/tools/acpi_quirks2h.awk#2 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); #include #include @@ -56,3 +56,9 @@ intr_model = model; } + +int +acpi_machdep_quirks(int *quirks) +{ + return (0); +} ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.61 2004/06/30 19:24:26 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -41,6 +41,7 @@ * and I/O memory address space. */ +#define __RMAN_RESOURCE_VISIBLE #include "opt_isa.h" #include ==== //depot/projects/hammer/sys/boot/common/newvers.sh#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -33,7 +33,7 @@ # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 LC_ALL=C; export LC_ALL -u=${USER-root} h=`hostname` t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` ==== //depot/projects/hammer/sys/conf/NOTES#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1236 2004/06/27 02:36:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1238 2004/06/30 01:00:59 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -178,9 +178,18 @@ # and WITNESS options. options MUTEX_NOINLINE +# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters +# when a contested mutex is released rather than just awaking the highest +# priority waiter. +options MUTEX_WAKE_ALL + # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. +# SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table +# used to hold active sleep queues. +# TURNSTILE_PROFILING enables rudimentary profiling of the hash table +# used to hold active lock queues. # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. # WITNESS_DDB causes the witness code to drop into the kernel debugger if @@ -196,6 +205,10 @@ # MUTEX_PROFILING(9) for details. options MUTEX_PROFILING +# Profiling for internal hash tables. +options SLEEPQUEUE_PROFILING +options TURNSTILE_PROFILING + ##################################################################### # COMPATIBILITY OPTIONS ==== //depot/projects/hammer/sys/conf/files#68 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.921 2004/06/30 14:52:49 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # -acpi_quirks.h standard \ +acpi_quirks.h optional acpi \ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ @@ -45,7 +45,7 @@ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ clean "miidevs.h" -pccarddevs.h optional pccard \ +pccarddevs.h standard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ @@ -290,6 +290,7 @@ dev/acpica/acpi_pcib_acpi.c optional acpi pci dev/acpica/acpi_pcib_pci.c optional acpi pci dev/acpica/acpi_powerres.c optional acpi +dev/acpica/acpi_quirk.c optional acpi dev/acpica/acpi_resource.c optional acpi dev/acpica/acpi_thermal.c optional acpi dev/acpica/acpi_timer.c optional acpi ==== //depot/projects/hammer/sys/conf/files.amd64#48 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.37 2004/05/24 12:08:56 bde Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.38 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -35,6 +35,7 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +dev/acpica/acpi_if.m standard amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/hammer/sys/conf/files.i386#34 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.495 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -180,6 +180,7 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_asus.c optional acpi_asus acpi i386/acpica/acpi_machdep.c optional acpi ==== //depot/projects/hammer/sys/conf/files.ia64#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.68 2004/05/17 06:51:19 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.69 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,6 +75,7 @@ geom/geom_gpt.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard ia64/acpica/OsdEnvironment.c optional acpi ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/hammer/sys/conf/kmod.mk#31 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.163 2004/06/29 18:56:14 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -293,7 +293,7 @@ MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ dev/iicbus/iicbus_if.m isa/isa_if.m \ libkern/iconv_converter_if.m \ - dev/eisa/eisa_if.m dev/mii/miibus_if.m \ + dev/acpica/acpi_if.m dev/eisa/eisa_if.m dev/mii/miibus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/hammer/sys/conf/newvers.sh#11 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $ TYPE="FreeBSD" REVISION="5.2" @@ -81,7 +81,7 @@ fi touch version -v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date` +v=`cat version` u=${USER-root} d=`pwd` h=${HOSTNAME-`hostname`} t=`date` i=`make -V KERN_IDENT` cat << EOF > vers.c $COPYRIGHT ==== //depot/projects/hammer/sys/conf/options#43 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.456 2004/06/27 02:36:33 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.457 2004/06/29 02:30:12 jhb Exp $ # # On the handling of kernel options # @@ -110,6 +110,7 @@ SCHED_4BSD opt_sched.h SCHED_ULE opt_sched.h SHOW_BUSYBUFS +SLEEPQUEUE_PROFILING SPX_HACK SUIDDIR opt_suiddir.h MSGMNB opt_sysvipc.h @@ -134,6 +135,7 @@ SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h SW_WATCHDOG opt_watchdog.h +TURNSTILE_PROFILING TTYHOG opt_tty.h VFS_AIO WLCACHE opt_wavelan.h ==== //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#6 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.39 2004/06/29 03:39:06 darrenr Exp $"; #endif #ifndef _KERNEL @@ -2155,9 +2155,6 @@ ip_natsync(ifp); ip_statesync(ifp); } -# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) - IFNET_RUNLOCK(); -# endif ip_natsync((struct ifnet *)-1); # if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) IFNET_RUNLOCK(); ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#40 (text+ko) ==== @@ -26,9 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.167 2004/06/28 03:36:37 imp Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.173 2004/06/30 16:54:10 imp Exp $ */ +#define __RMAN_RESOURCE_VISIBLE #include "opt_acpi.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include "acpi.h" #include @@ -77,36 +79,20 @@ .d_name = "acpi", }; -#if __FreeBSD_version >= 500000 +/* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; -#endif + +/* Bitmap of device quirks. */ +int acpi_quirks; /* Local pools for managing system resources for ACPI child devices. */ -struct rman acpi_rman_io, acpi_rman_mem; - -struct acpi_quirks { - char *OemId; - uint32_t OemRevision; - char *value; -}; - -#define ACPI_OEM_REV_ANY 0 - -static struct acpi_quirks acpi_quirks_table[] = { -#ifdef notyet - /* Bad PCI routing table. Used on some SuperMicro boards. */ - { "PTLTD ", 0x06040000, "pci_link" }, -#endif - - { NULL, 0, NULL } -}; +struct rman acpi_rman_io, acpi_rman_mem; static int acpi_modevent(struct module *mod, int event, void *junk); static void acpi_identify(driver_t *driver, device_t parent); static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); static int acpi_shutdown(device_t dev); -static void acpi_quirks_set(void); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); static int acpi_print_child(device_t bus, device_t child); @@ -122,18 +108,25 @@ int rid, struct resource *r); static uint32_t acpi_isa_get_logicalid(device_t dev); static int acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count); +static char *acpi_device_id_probe(device_t bus, device_t dev, char **ids); +static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, + ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, + ACPI_BUFFER *ret); +static ACPI_STATUS acpi_device_walk_ns(device_t bus, device_t dev, + ACPI_OBJECT_TYPE type, UINT32 max_depth, + ACPI_WALK_CALLBACK user_fn, void *context, void **ret); static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); static int acpi_probe_order(ACPI_HANDLE handle, int *order); static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); +static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); -static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); -static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, - void **status); -static int acpi_wake_limit_walk(int sstate); +static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_prep_walk(int sstate); static int acpi_wake_sysctl_walk(device_t dev); static int acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS); static void acpi_system_eventhandler_sleep(void *arg, int state); @@ -174,6 +167,11 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + /* ACPI bus */ + DEVMETHOD(acpi_id_probe, acpi_device_id_probe), + DEVMETHOD(acpi_evaluate_object, acpi_device_eval_obj), + DEVMETHOD(acpi_walk_namespace, acpi_device_walk_ns), + /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), @@ -217,7 +215,7 @@ static int acpi_modevent(struct module *mod, int event, void *junk) { - switch(event) { + switch (event) { case MOD_LOAD: if (!cold) { printf("The ACPI driver cannot be loaded after boot.\n"); @@ -243,18 +241,17 @@ #ifdef ACPI_DEBUGGER char *debugpoint; #endif - static int error, started = 0; + static int started = 0; + int error, val; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (started) - return_VALUE (error); + return_VALUE (0); started = 1; -#if __FreeBSD_version >= 500000 /* Initialise the ACPI mutex */ mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); -#endif /* * Set the globals from our tunables. This is needed because ACPI-CA @@ -286,13 +283,21 @@ if (ACPI_FAILURE(error = AcpiLoadTables())) { printf("ACPI: table load failed: %s\n", AcpiFormatException(error)); - return_VALUE(error); + AcpiTerminate(); + return_VALUE (error); } - /* Set up any quirks we have for this XSDT. */ - acpi_quirks_set(); - if (acpi_disabled("acpi")) + /* Set up any quirks we have for this system. */ + acpi_table_quirks(&acpi_quirks); + + /* If the user manually set the disabled hint to 0, override any quirk. */ + if (resource_int_value("acpi", 0, "disabled", &val) == 0 && val == 0) + acpi_quirks &= ~ACPI_Q_BROKEN; + if (acpi_quirks & ACPI_Q_BROKEN) { + printf("ACPI disabled by blacklist. Contact your BIOS vendor.\n"); + AcpiTerminate(); return_VALUE (AE_ERROR); + } return_VALUE (AE_OK); } @@ -535,7 +540,7 @@ /* Only enable S4BIOS by default if the FACS says it is available. */ if (AcpiGbl_FACS->S4Bios_f != 0) - sc->acpi_s4bios = 1; + sc->acpi_s4bios = 1; /* * Dispatch the default sleep state to devices. The lid switch is set @@ -628,60 +633,12 @@ /* Allow children to shutdown first. */ bus_generic_shutdown(dev); - /* Disable all wake GPEs not appropriate for reboot/poweroff. */ - acpi_wake_limit_walk(ACPI_STATE_S5); + /* Enable any GPEs that are able to power-on the system (i.e., RTC). */ + acpi_wake_prep_walk(ACPI_STATE_S5); + return (0); } -static void -acpi_quirks_set() -{ - XSDT_DESCRIPTOR *xsdt; - struct acpi_quirks *quirk; - char *env, *tmp; - int len; - - /* - * If the user loaded a custom table or disabled "quirks", leave - * the settings alone. - */ - len = 0; - if ((env = getenv("acpi_dsdt_load")) != NULL) { - /* XXX No strcasecmp but this is good enough. */ - if (*env == 'Y' || *env == 'y') - goto out; - freeenv(env); - } - if ((env = getenv("debug.acpi.disabled")) != NULL) { - if (strstr("quirks", env) != NULL) - goto out; - len = strlen(env); - } - - /* - * Search through our quirk table and concatenate the disabled - * values with whatever we find. - */ - xsdt = AcpiGbl_XSDT; - for (quirk = acpi_quirks_table; quirk->OemId; quirk++) { - if (!strncmp(xsdt->OemId, quirk->OemId, strlen(quirk->OemId)) && - (xsdt->OemRevision == quirk->OemRevision || - quirk->OemRevision == ACPI_OEM_REV_ANY)) { - len += strlen(quirk->value) + 2; - if ((tmp = malloc(len, M_TEMP, M_NOWAIT)) == NULL) - goto out; - sprintf(tmp, "%s %s", env ? env : "", quirk->value); - setenv("debug.acpi.disabled", tmp); - free(tmp, M_TEMP); - break; - } - } - -out: - if (env) - freeenv(env); -} - /* * Handle a new device being added */ @@ -786,6 +743,9 @@ case ACPI_IVAR_PRIVATE: *(void **)result = ad->ad_private; break; + case ACPI_IVAR_FLAGS: + *(int *)result = ad->ad_flags; + break; case ISA_IVAR_VENDORID: case ISA_IVAR_SERIAL: case ISA_IVAR_COMPATID: @@ -821,6 +781,9 @@ case ACPI_IVAR_PRIVATE: ad->ad_private = (void *)value; break; + case ACPI_IVAR_FLAGS: + ad->ad_flags = (int)value; + break; default: panic("bad ivar write request (%d)", index); return (ENOENT); @@ -969,19 +932,7 @@ return (bus_alloc_resource_any(dev, type, rid, RF_ACTIVE)); } -/* - * Handle ISA-like devices probing for a PnP ID to match. - */ -#define PNP_EISAID(s) \ - ((((s[0] - '@') & 0x1f) << 2) \ - | (((s[1] - '@') & 0x18) >> 3) \ - | (((s[1] - '@') & 0x07) << 13) \ - | (((s[2] - '@') & 0x1f) << 8) \ - | (PNP_HEXTONUM(s[4]) << 16) \ - | (PNP_HEXTONUM(s[3]) << 20) \ - | (PNP_HEXTONUM(s[6]) << 24) \ - | (PNP_HEXTONUM(s[5]) << 28)) - +/* Probe _HID and _CID for compatible ISA PNP ids. */ static uint32_t acpi_isa_get_logicalid(device_t dev) { @@ -1064,6 +1015,46 @@ return_VALUE (valid); } +static char * +acpi_device_id_probe(device_t bus, device_t dev, char **ids) +{ + ACPI_HANDLE h; + int i; + + h = acpi_get_handle(dev); + if (ids == NULL || h == NULL || acpi_get_type(dev) != ACPI_TYPE_DEVICE) + return (NULL); + + /* Try to match one of the array of IDs with a HID or CID. */ + for (i = 0; ids[i] != NULL; i++) { + if (acpi_MatchHid(h, ids[i])) + return (ids[i]); + } + return (NULL); +} + +static ACPI_STATUS +acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, + ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiEvaluateObject(h, pathname, parameters, ret)); +} + +static ACPI_STATUS +acpi_device_walk_ns(device_t bus, device_t dev, ACPI_OBJECT_TYPE type, + UINT32 max_depth, ACPI_WALK_CALLBACK user_fn, void *context, void **ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiWalkNamespace(type, h, max_depth, user_fn, context, ret)); +} + static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids) { @@ -1206,7 +1197,7 @@ bus = (device_t)context; if (ACPI_SUCCESS(AcpiGetType(handle, &type))) { - switch(type) { + switch (type) { case ACPI_TYPE_DEVICE: case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_THERMAL: @@ -1232,10 +1223,6 @@ acpi_set_handle(child, handle); AcpiAttachData(handle, acpi_fake_objhandler, child); - /* Check if the device can generate wake events. */ - if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_PRW", NULL, NULL))) - device_set_flags(child, ACPI_FLAG_WAKE_CAPABLE); - /* * Check that the device is present. If it's not present, * leave it disabled (so that we have a device_t attached to @@ -1409,8 +1396,8 @@ /* * Match a HID string against a handle */ -BOOLEAN -acpi_MatchHid(ACPI_HANDLE h, char *hid) +static BOOLEAN +acpi_MatchHid(ACPI_HANDLE h, const char *hid) { ACPI_DEVICE_INFO *devinfo; ACPI_BUFFER buf; @@ -1782,8 +1769,8 @@ sc->acpi_sstate = state; sc->acpi_sleep_disabled = 1; - /* Disable all wake GPEs not appropriate for this state. */ - acpi_wake_limit_walk(state); + /* Enable any GPEs as appropriate and requested by the user. */ + acpi_wake_prep_walk(state); /* Inform all devices that we are going to sleep. */ if (DEVICE_SUSPEND(root_bus) != 0) { @@ -1829,6 +1816,9 @@ break; } } + + /* Resume devices, re-enable GPEs and fixed events. */ + acpi_wake_prep_walk(state); AcpiLeaveSleepState((UINT8)state); DEVICE_RESUME(root_bus); sc->acpi_sstate = ACPI_STATE_S0; @@ -1860,10 +1850,6 @@ { struct acpi_prw_data prw; - /* Check that the device can wake the system. */ - if ((device_get_flags(dev) & ACPI_FLAG_WAKE_CAPABLE) == 0) - return (ENXIO); - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(acpi_get_handle(dev), &prw) != 0) return (ENXIO); @@ -1886,149 +1872,124 @@ ACPI_STATUS status; int flags; - /* Make sure the device supports waking the system. */ - flags = device_get_flags(dev); + /* Make sure the device supports waking the system and get the GPE. */ handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(handle, &prw) != 0) return (ENXIO); + flags = acpi_get_flags(dev); if (enable) { status = AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "enable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); } else { status = AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "disable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); } return (0); } -/* Configure a device's GPE appropriately for the new sleep state. */ -int -acpi_wake_sleep_prep(device_t dev, int sstate) +static int +acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate) { struct acpi_prw_data prw; - ACPI_HANDLE handle; - int flags; + device_t dev; - /* Check that this is an ACPI device and get its GPE. */ - flags = device_get_flags(dev); - handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - - /* Evaluate _PRW to find the GPE. */ + /* Check that this is a wake-capable device and get its GPE. */ if (acpi_parse_prw(handle, &prw) != 0) return (ENXIO); + dev = acpi_get_device(handle); /* - * TBD: All Power Resources referenced by elements 2 through N - * of the _PRW object are put into the ON state. + * The destination sleep state must be less than (i.e., higher power) + * or equal to the value specified by _PRW. If this GPE cannot be + * enabled for the next sleep state, then disable it. If it can and + * the user requested it be enabled, turn on any required power resources + * and set _PSW. */ - - /* - * If the user requested that this device wake the system and the next - * sleep state is valid for this GPE, enable it and the device's wake - * capability. The sleep state must be less than (i.e., higher power) - * or equal to the value specified by _PRW. Return early, leaving - * the appropriate power resources enabled. - */ - if ((flags & ACPI_FLAG_WAKE_ENABLED) != 0 && - sstate <= prw.lowest_wake) { + if (sstate > prw.lowest_wake) { + AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (bootverbose) - device_printf(dev, "wake_prep enabled gpe %#x for state %d\n", - prw.gpe_bit, sstate); - AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); + device_printf(dev, "wake_prep disabled wake for %s (S%d)\n", + acpi_name(handle), sstate); + } else if (dev && (acpi_get_flags(dev) & ACPI_FLAG_WAKE_ENABLED) != 0) { + acpi_pwr_wake_enable(handle, 1); acpi_SetInteger(handle, "_PSW", 1); - return (0); + if (bootverbose) + device_printf(dev, "wake_prep enabled for %s (S%d)\n", + acpi_name(handle), sstate); } - /* - * If the device wake was disabled or this sleep state is too low for - * this device, disable its wake capability and GPE. - */ - AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); - acpi_SetInteger(handle, "_PSW", 0); - if (bootverbose) - device_printf(dev, "wake_prep disabled gpe %#x for state %d\n", - prw.gpe_bit, sstate); - - /* - * TBD: All Power Resources referenced by elements 2 through N - * of the _PRW object are put into the OFF state. - */ - return (0); } -/* Re-enable GPEs after wake. */ -int -acpi_wake_run_prep(device_t dev) +static int +acpi_wake_run_prep(ACPI_HANDLE handle, int sstate) { struct acpi_prw_data prw; - ACPI_HANDLE handle; - int flags; + device_t dev; - /* Check that this is an ACPI device and get its GPE. */ - flags = device_get_flags(dev); - handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - - /* Evaluate _PRW to find the GPE. */ + /* + * Check that this is a wake-capable device and get its GPE. Return + * now if the user didn't enable this device for wake. + */ if (acpi_parse_prw(handle, &prw) != 0) return (ENXIO); + dev = acpi_get_device(handle); + if (dev == NULL || (acpi_get_flags(dev) & ACPI_FLAG_WAKE_ENABLED) == 0) + return (0); /* - * TBD: Be sure all Power Resources referenced by elements 2 through N - * of the _PRW object are in the ON state. + * If this GPE couldn't be enabled for the previous sleep state, it was + * disabled before going to sleep so re-enable it. If it was enabled, + * clear _PSW and turn off any power resources it used. */ + if (sstate > prw.lowest_wake) { + AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); + if (bootverbose) + device_printf(dev, "run_prep re-enabled %s\n", acpi_name(handle)); + } else { + acpi_SetInteger(handle, "_PSW", 0); + acpi_pwr_wake_enable(handle, 0); + if (bootverbose) + device_printf(dev, "run_prep cleaned up for %s\n", + acpi_name(handle)); + } - /* Disable wake capability and if the user requested, enable the GPE. */ - acpi_SetInteger(handle, "_PSW", 0); - if ((flags & ACPI_FLAG_WAKE_ENABLED) != 0) - AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); return (0); } static ACPI_STATUS -acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, void **status) +acpi_wake_prep(ACPI_HANDLE handle, UINT32 level, void *context, void **status) { - struct acpi_prw_data prw; - int *sstate; + int sstate; - /* It's ok not to have _PRW if the device can't wake the system. */ - if (acpi_parse_prw(h, &prw) != 0) - return (AE_OK); - - sstate = (int *)context; - if (*sstate > prw.lowest_wake) - AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); - + /* If suspending, run the sleep prep function, otherwise wake. */ + sstate = *(int *)context; + if (AcpiGbl_SystemAwakeAndRunning) + acpi_wake_sleep_prep(handle, sstate); + else + acpi_wake_run_prep(handle, sstate); return (AE_OK); } -/* Walk all system devices, disabling them if necessary for sstate. */ +/* Walk the tree rooted at acpi0 to prep devices for suspend/resume. */ static int -acpi_wake_limit_walk(int sstate) +acpi_wake_prep_walk(int sstate) { ACPI_HANDLE sb_handle; if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) - AcpiWalkNamespace(ACPI_TYPE_ANY, sb_handle, 100, - acpi_wake_limit, &sstate, NULL); + AcpiWalkNamespace(ACPI_TYPE_DEVICE, sb_handle, 100, + acpi_wake_prep, &sstate, NULL); return (0); } @@ -2039,21 +2000,23 @@ int error, i, numdevs; device_t *devlist; device_t child; + ACPI_STATUS status; error = device_get_children(dev, &devlist, &numdevs); if (error != 0 || numdevs == 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 1 14:40:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0332F16A4D0; Thu, 1 Jul 2004 14:40:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D464616A4CE for ; Thu, 1 Jul 2004 14:40:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDE6E43D54 for ; Thu, 1 Jul 2004 14:40:19 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61Ed27A081059 for ; Thu, 1 Jul 2004 14:39:02 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61Ed2OC081056 for perforce@freebsd.org; Thu, 1 Jul 2004 14:39:02 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 14:39:02 GMT Message-Id: <200407011439.i61Ed2OC081056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 14:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=56211 Change 56211 by davidxu@davidxu_alona on 2004/07/01 14:38:02 Fix typo Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 (text+ko) ==== @@ -537,7 +537,7 @@ fill_fpregset (&fpregs, regno); if (ptrace (PT_SETFPREGS, lwp, (caddr_t) &fpregs, 0) == -1) error ("Cannot set lwp %d float registers: %s\n", lwp, - safe_strerr (errno)); + safe_strerror (errno)); } static void @@ -653,7 +653,7 @@ return 1; } else - { + { err = td_ta_map_lwp2thr_p (thread_agent, GET_LWP (ptid), &th); /* * if the lwp was already mapped to user thread, don't use it @@ -661,7 +661,7 @@ */ if (err == TD_OK) return 0; - } + } /* check lwp in kernel */ return ptrace (PT_GETREGS, GET_LWP (ptid), (caddr_t)&gregs, 0) == 0; @@ -803,7 +803,7 @@ handle = dlopen (LIBTHREAD_DB_SO, RTLD_NOW); if (handle == NULL) - return 0; + return 0; td_init_p = dlsym (handle, "td_init"); if (td_init_p == NULL) From owner-p4-projects@FreeBSD.ORG Thu Jul 1 14:44:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 476B816A4D0; Thu, 1 Jul 2004 14:44:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2315F16A4CE for ; Thu, 1 Jul 2004 14:44:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0697343D2D for ; Thu, 1 Jul 2004 14:44:50 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61Ei9Nm081189 for ; Thu, 1 Jul 2004 14:44:09 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61Ei9xK081186 for perforce@freebsd.org; Thu, 1 Jul 2004 14:44:09 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 14:44:09 GMT Message-Id: <200407011444.i61Ei9xK081186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 14:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=56212 Change 56212 by davidxu@davidxu_alona on 2004/07/01 14:44:03 Corretly check single_step result. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 (text+ko) ==== @@ -411,7 +411,7 @@ if (resume_all) iterate_over_threads(resume_callback, 0); - if (single_step (ptid, step)) + if (!single_step (ptid, step)) error ("single step failed"); if (ptrace (PT_CONTINUE, pid, (caddr_t)1, From owner-p4-projects@FreeBSD.ORG Thu Jul 1 14:48:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 177BD16A4CF; Thu, 1 Jul 2004 14:48:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBA4916A4D1 for ; Thu, 1 Jul 2004 14:48:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A402743D5C for ; Thu, 1 Jul 2004 14:48:21 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61ElDqv081283 for ; Thu, 1 Jul 2004 14:47:13 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61ElDMi081280 for perforce@freebsd.org; Thu, 1 Jul 2004 14:47:13 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 14:47:13 GMT Message-Id: <200407011447.i61ElDMi081280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 14:48:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=56213 Change 56213 by davidxu@davidxu_alona on 2004/07/01 14:46:50 Return TD_NOTHR if a LWP can not be found in thread list, let debugger deal with it. Affected files ... .. //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#4 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/lib/libthread_db/pthread/pthread_db.c#4 (text+ko) ==== @@ -302,7 +302,7 @@ return (P2T(ret)); } - return (TD_OK); + return (TD_NOTHR); } static td_err_e From owner-p4-projects@FreeBSD.ORG Thu Jul 1 17:04:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFDEC16A4D0; Thu, 1 Jul 2004 17:04:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF3E616A4CE; Thu, 1 Jul 2004 17:04:55 +0000 (GMT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5489143D1F; Thu, 1 Jul 2004 17:04:55 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i61H48UZ034777; Thu, 1 Jul 2004 10:04:08 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i61H48kO019431; Thu, 1 Jul 2004 10:04:08 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i61H48N4019430; Thu, 1 Jul 2004 10:04:08 -0700 (PDT) (envelope-from marcel) Date: Thu, 1 Jul 2004 10:04:08 -0700 From: Marcel Moolenaar To: David Xu Message-ID: <20040701170408.GA19419@dhcp50.pn.xcllnt.net> References: <200407010847.i618lul0071578@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200407010847.i618lul0071578@repoman.freebsd.org> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 56198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 17:04:56 -0000 On Thu, Jul 01, 2004 at 08:47:56AM +0000, David Xu wrote: > http://perforce.freebsd.org/chv.cgi?CH=56198 > > Change 56198 by davidxu@davidxu_celeron on 2004/07/01 08:47:16 > > Define struct ps_prochandle. Remove some unnecessary definitions. The debugger typically defines what struct ps_prochandle is. The proc services interface itself (i.e. this header) does not define it. FYI, -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Thu Jul 1 22:37:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE8E016A4D0; Thu, 1 Jul 2004 22:37:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9A0F16A4CE for ; Thu, 1 Jul 2004 22:37:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A372E43D46 for ; Thu, 1 Jul 2004 22:37:31 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61MakCe097554 for ; Thu, 1 Jul 2004 22:36:46 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61MajjU097551 for perforce@freebsd.org; Thu, 1 Jul 2004 22:36:45 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 22:36:45 GMT Message-Id: <200407012236.i61MajjU097551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 22:37:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=56234 Change 56234 by davidxu@davidxu_alona on 2004/07/01 22:35:48 Move ps_prochandle definition to fbsd-threads.c as Marcel said. Affected files ... .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 edit .. //depot/projects/davidxu_ksedbg/src/include/proc_service.h#3 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#5 (text+ko) ==== @@ -39,6 +39,11 @@ #define LIBTHREAD_DB_SO "libthread_db.so" +struct ps_prochandle +{ + pid_t pid; +}; + extern struct target_ops child_ops; /* This module's target vector. */ ==== //depot/projects/davidxu_ksedbg/src/include/proc_service.h#3 (text+ko) ==== @@ -39,10 +39,7 @@ #include #include -struct ps_prochandle -{ - pid_t pid; -}; +struct ps_prochandle; typedef enum { From owner-p4-projects@FreeBSD.ORG Thu Jul 1 23:02:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36CB316A4D1; Thu, 1 Jul 2004 23:02:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 11A2A16A4CE for ; Thu, 1 Jul 2004 23:02:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B8C243D39 for ; Thu, 1 Jul 2004 23:02:09 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i61N0Fbd098212 for ; Thu, 1 Jul 2004 23:00:15 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i61N0FVs098209 for perforce@freebsd.org; Thu, 1 Jul 2004 23:00:15 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 1 Jul 2004 23:00:15 GMT Message-Id: <200407012300.i61N0FVs098209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2004 23:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=56236 Change 56236 by davidxu@davidxu_alona on 2004/07/01 22:59:43 Hook up make installworld. Affected files ... .. //depot/projects/davidxu_ksedbg/src/include/Makefile#2 edit Differences ... ==== //depot/projects/davidxu_ksedbg/src/include/Makefile#2 (text+ko) ==== @@ -11,12 +11,12 @@ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \ - pthread.h \ + proc_service.h pthread.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ - strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ + strings.h sysexits.h tar.h thread_db.h time.h timeconv.h timers.h \ + ttyent.h ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ wctype.h wordexp.h MHDRS= float.h floatingpoint.h stdarg.h From owner-p4-projects@FreeBSD.ORG Fri Jul 2 01:25:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A64F516A4D0; Fri, 2 Jul 2004 01:25:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62BA116A4CE for ; Fri, 2 Jul 2004 01:25:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B2BB43D2F for ; Fri, 2 Jul 2004 01:25:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i621OCCJ003005 for ; Fri, 2 Jul 2004 01:24:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i621OAmS003002 for perforce@freebsd.org; Fri, 2 Jul 2004 01:24:10 GMT (envelope-from marcel@freebsd.org) Date: Fri, 2 Jul 2004 01:24:10 GMT Message-Id: <200407020124.i621OAmS003002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 01:25:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=56243 Change 56243 by marcel@marcel_nfs on 2004/07/02 01:24:05 IFC @56242 Affected files ... .. //depot/projects/gdb/UPDATING#18 integrate .. //depot/projects/gdb/contrib/top/top.X#2 integrate .. //depot/projects/gdb/contrib/top/top.c#2 integrate .. //depot/projects/gdb/contrib/top/top.h#2 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#12 integrate .. //depot/projects/gdb/etc/ftpusers#3 integrate .. //depot/projects/gdb/etc/mail/aliases#3 integrate .. //depot/projects/gdb/include/wordexp.h#2 integrate .. //depot/projects/gdb/lib/libalias/libalias.3#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/gdb/lib/libc/gen/vis.3#3 integrate .. //depot/projects/gdb/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/gdb/lib/libc/locale/ctype.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/mbrlen.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/mbrtowc.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/gdb/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/gdb/lib/libc/net/inet.3#3 integrate .. //depot/projects/gdb/lib/libc/net/resolver.3#3 integrate .. //depot/projects/gdb/lib/libc/posix1e/mac_get.3#3 integrate .. //depot/projects/gdb/lib/libc/posix1e/mac_text.3#2 integrate .. //depot/projects/gdb/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/gdb/lib/libc/string/ffs.3#2 integrate .. //depot/projects/gdb/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/gdb/lib/libc/sys/mount.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/msync.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/open.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/poll.2#4 integrate .. //depot/projects/gdb/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/read.2#4 integrate .. //depot/projects/gdb/lib/libc/sys/send.2#5 integrate .. //depot/projects/gdb/lib/libc/sys/sendfile.2#4 integrate .. //depot/projects/gdb/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/gdb/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/gdb/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_getprocs.3#3 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_radius/pam_radius.8#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_self/pam_self.8#2 integrate .. //depot/projects/gdb/lib/libpthread_dbg/Makefile#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/Makefile.inc#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/i386/pthread_dbg_md.c#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/arch/i386/include/pthread_dbg_md.h#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg.c#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg.h#2 delete .. //depot/projects/gdb/lib/libpthread_dbg/pthread_dbg_int.h#2 delete .. //depot/projects/gdb/lib/libstand/Makefile#2 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/gdb/lib/libugidfw/bsde_get_rule.3#3 integrate .. //depot/projects/gdb/lib/libugidfw/libugidfw.3#3 integrate .. //depot/projects/gdb/lib/libz/ChangeLog#2 integrate .. //depot/projects/gdb/lib/libz/FAQ#2 integrate .. //depot/projects/gdb/lib/libz/Makefile#2 integrate .. //depot/projects/gdb/lib/libz/README#2 integrate .. //depot/projects/gdb/lib/libz/adler32.c#2 integrate .. //depot/projects/gdb/lib/libz/algorithm.txt#2 integrate .. //depot/projects/gdb/lib/libz/compress.c#2 integrate .. //depot/projects/gdb/lib/libz/crc32.c#2 integrate .. //depot/projects/gdb/lib/libz/crc32.h#1 branch .. //depot/projects/gdb/lib/libz/deflate.c#2 integrate .. //depot/projects/gdb/lib/libz/deflate.h#2 integrate .. //depot/projects/gdb/lib/libz/example.c#2 integrate .. //depot/projects/gdb/lib/libz/gzio.c#2 integrate .. //depot/projects/gdb/lib/libz/infback.c#1 branch .. //depot/projects/gdb/lib/libz/infblock.c#2 delete .. //depot/projects/gdb/lib/libz/infblock.h#2 delete .. //depot/projects/gdb/lib/libz/infcodes.c#2 delete .. //depot/projects/gdb/lib/libz/infcodes.h#2 delete .. //depot/projects/gdb/lib/libz/inffast.c#2 integrate .. //depot/projects/gdb/lib/libz/inffast.h#2 integrate .. //depot/projects/gdb/lib/libz/inffixed.h#2 integrate .. //depot/projects/gdb/lib/libz/inflate.c#2 integrate .. //depot/projects/gdb/lib/libz/inflate.h#1 branch .. //depot/projects/gdb/lib/libz/inftrees.c#2 integrate .. //depot/projects/gdb/lib/libz/inftrees.h#2 integrate .. //depot/projects/gdb/lib/libz/infutil.c#2 delete .. //depot/projects/gdb/lib/libz/infutil.h#2 delete .. //depot/projects/gdb/lib/libz/maketree.c#2 delete .. //depot/projects/gdb/lib/libz/minigzip.c#2 integrate .. //depot/projects/gdb/lib/libz/trees.c#2 integrate .. //depot/projects/gdb/lib/libz/uncompr.c#2 integrate .. //depot/projects/gdb/lib/libz/zconf.h#2 integrate .. //depot/projects/gdb/lib/libz/zlib.3#2 integrate .. //depot/projects/gdb/lib/libz/zlib.h#2 integrate .. //depot/projects/gdb/lib/libz/zutil.c#2 integrate .. //depot/projects/gdb/lib/libz/zutil.h#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#7 integrate .. //depot/projects/gdb/lib/msun/man/fabs.3#2 integrate .. //depot/projects/gdb/lib/msun/man/fdim.3#1 branch .. //depot/projects/gdb/lib/msun/man/fmax.3#1 branch .. //depot/projects/gdb/lib/msun/man/hypot.3#3 integrate .. //depot/projects/gdb/lib/msun/man/ieee.3#5 integrate .. //depot/projects/gdb/lib/msun/src/math.h#8 integrate .. //depot/projects/gdb/lib/msun/src/s_fdim.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fmax.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fmaxf.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fmaxl.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fmin.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fminf.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_fminl.c#1 branch .. //depot/projects/gdb/libexec/tftpd/tftpd.c#4 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/Makefile#4 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#2 integrate .. //depot/projects/gdb/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/gdb/sbin/devd/devd.8#2 integrate .. //depot/projects/gdb/sbin/devd/devd.cc#2 integrate .. //depot/projects/gdb/sbin/gpt/add.c#2 integrate .. //depot/projects/gdb/sbin/gpt/gpt.8#2 integrate .. //depot/projects/gdb/sbin/gpt/show.c#2 integrate .. //depot/projects/gdb/share/examples/pppd/ppp.deny.sample#3 integrate .. //depot/projects/gdb/share/man/man4/acpi.4#8 integrate .. //depot/projects/gdb/share/man/man4/ips.4#2 integrate .. //depot/projects/gdb/share/man/man4/led.4#5 integrate .. //depot/projects/gdb/share/misc/pci_vendors#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/gdb/sys/alpha/isa/isa.c#3 integrate .. //depot/projects/gdb/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/gdb/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/gdb/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/gdb/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/gdb/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/gdb/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/gdb/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/gdb/sys/conf/NOTES#27 integrate .. //depot/projects/gdb/sys/conf/files#33 integrate .. //depot/projects/gdb/sys/conf/files.amd64#11 integrate .. //depot/projects/gdb/sys/conf/files.i386#19 integrate .. //depot/projects/gdb/sys/conf/files.ia64#7 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#10 integrate .. //depot/projects/gdb/sys/conf/newvers.sh#3 integrate .. //depot/projects/gdb/sys/conf/options#25 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#9 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#10 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/gdb/sys/dev/acpica/acpi_isab.c#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#13 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#9 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_powerres.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/gdb/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/gdb/sys/dev/amr/amr.c#5 integrate .. //depot/projects/gdb/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#12 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#11 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#11 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#13 integrate .. //depot/projects/gdb/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/gdb/sys/dev/puc/puc.c#3 integrate .. //depot/projects/gdb/sys/dev/random/randomdev.c#10 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#10 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#7 integrate .. //depot/projects/gdb/sys/dev/sab/sab.c#11 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#18 integrate .. //depot/projects/gdb/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/uftdi.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usb_subr.c#8 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/gdb/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/gdb/sys/dev/zs/zs.c#9 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.c#8 integrate .. //depot/projects/gdb/sys/geom/geom_disk.c#6 integrate .. //depot/projects/gdb/sys/geom/geom_slice.c#4 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#6 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#9 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_toshiba.c#7 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#15 integrate .. //depot/projects/gdb/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/mem.c#7 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#7 integrate .. //depot/projects/gdb/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/gdb/sys/i386/include/pmap.h#9 integrate .. //depot/projects/gdb/sys/i386/include/proc.h#4 integrate .. //depot/projects/gdb/sys/i386/isa/isa.c#3 integrate .. //depot/projects/gdb/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/gdb/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/gdb/sys/i386/pci/pci_pir.c#6 integrate .. //depot/projects/gdb/sys/ia64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_idle.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_linker.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_thr.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/gdb/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#12 integrate .. //depot/projects/gdb/sys/kern/subr_rman.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/gdb/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/gdb/sys/kern/subr_turnstile.c#6 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#8 integrate .. //depot/projects/gdb/sys/kern/syscalls.master#8 integrate .. //depot/projects/gdb/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/gdb/sys/modules/Makefile#15 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_asus/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ahb/Makefile#1 branch .. //depot/projects/gdb/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/gdb/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/gdb/sys/netgraph/ng_device.h#2 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/gdb/sys/pc98/conf/NOTES#13 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#15 integrate .. //depot/projects/gdb/sys/pci/if_dc.c#7 integrate .. //depot/projects/gdb/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/gdb/sys/pci/if_pcn.c#5 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#9 integrate .. //depot/projects/gdb/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/gdb/sys/pci/if_sf.c#5 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#7 integrate .. //depot/projects/gdb/sys/pci/if_sk.c#9 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#12 integrate .. //depot/projects/gdb/sys/pci/if_vr.c#7 integrate .. //depot/projects/gdb/sys/pci/if_wb.c#5 integrate .. //depot/projects/gdb/sys/pci/if_xl.c#6 integrate .. //depot/projects/gdb/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/openpic_macio.c#5 integrate .. //depot/projects/gdb/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/pmap.c#7 integrate .. //depot/projects/gdb/sys/powerpc/psim/iobus.c#3 integrate .. //depot/projects/gdb/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/gdb/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#7 integrate .. //depot/projects/gdb/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/gdb/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/gdb/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#5 integrate .. //depot/projects/gdb/sys/sys/interrupt.h#2 integrate .. //depot/projects/gdb/sys/sys/param.h#17 integrate .. //depot/projects/gdb/sys/sys/rman.h#3 integrate .. //depot/projects/gdb/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/gdb/sys/sys/syscall.h#8 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#8 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#8 integrate .. //depot/projects/gdb/sys/sys/thr.h#3 integrate .. //depot/projects/gdb/sys/sys/tty.h#11 integrate .. //depot/projects/gdb/sys/sys/umtx.h#2 integrate .. //depot/projects/gdb/sys/tools/acpi_quirks2h.awk#2 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#11 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#7 integrate .. //depot/projects/gdb/tools/tools/pciid/mk_pci_vendors.pl#2 integrate .. //depot/projects/gdb/usr.bin/cut/cut.1#3 integrate .. //depot/projects/gdb/usr.bin/cut/cut.c#3 integrate .. //depot/projects/gdb/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/fstat/cd9660.c#2 integrate .. //depot/projects/gdb/usr.bin/fstat/fstat.c#4 integrate .. //depot/projects/gdb/usr.bin/fstat/fstat.h#3 integrate .. //depot/projects/gdb/usr.bin/fstat/msdosfs.c#2 integrate .. //depot/projects/gdb/usr.bin/indent/indent.1#4 integrate .. //depot/projects/gdb/usr.bin/ldd/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/ldd/sods.c#3 integrate .. //depot/projects/gdb/usr.bin/netstat/inet.c#7 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#19 integrate .. //depot/projects/gdb/usr.bin/top/machine.c#3 integrate .. //depot/projects/gdb/usr.bin/tr/tr.1#2 integrate .. //depot/projects/gdb/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/gdb/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi.c#4 integrate .. //depot/projects/gdb/usr.sbin/apm/apm.c#5 integrate .. //depot/projects/gdb/usr.sbin/config/mkheaders.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/add.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/extract.c#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/futil.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/add/perform.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/create.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/perform.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/create/pl.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/delete/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/delete/delete.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/delete/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/delete/perform.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/info/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/info/info.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/info/main.c#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/info/perform.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/deps.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/file.c#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/match.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/pen.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/url.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/lib/version.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/pgp_sign.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/sha1.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/sign.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/stand.h#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/sign/x509.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/main.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate .. //depot/projects/gdb/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/acf.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/async.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/hdlc.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/hdlc.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/link.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/link.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/lqr.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/lqr.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/mbuf.h#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/ppp.8.m4#3 integrate .. //depot/projects/gdb/usr.sbin/ppp/sync.c#2 integrate .. //depot/projects/gdb/usr.sbin/ppp/tcpmss.c#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#18 (text+ko) ==== @@ -17,7 +17,24 @@ developers choose to disable these features on build machines to maximize performance. -20040623: +20040630: + The netgraph ABI version number has been incremented to indicate + an incompatible change in the ABI. Old netgraph nodes will refuse + to attach until recompiled. Netgraph now uses mbuf tags to move + metadata and this commit removes its home-grown metadata facility. + Nodes should just recompile, unless they use metadata, in which + case the changes are simple; the file ng_ksocket.c serves as an + example of such changes. + +20040630: + ACPI has been updated to disable known-bad BIOS revisions. A message + will be printed on console indicating that ACPI has been disabled + automatically and that the user should use a newer BIOS, if possible. + If you think ACPI does work on your system and want to override + this (i.e., for testing), set hint.acpi.0.disabled="0" at the + loader prompt. + +20040623: pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge separated now. It uses the newly created "_pflogd" user/group combination. If you plan to use pflogd(8) make sure to run @@ -1653,4 +1670,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.318 2004/06/26 21:58:56 green Exp $ +$FreeBSD: src/UPDATING,v 1.321 2004/06/30 23:13:16 bms Exp $ ==== //depot/projects/gdb/contrib/top/top.X#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" NOTE: changes to the manual page for "top" should be made in the .\" file "top.X" and NOT in the file "top.1". -.\" $FreeBSD: src/contrib/top/top.X,v 1.9 2003/08/26 15:37:19 eivind Exp $ +.\" $FreeBSD: src/contrib/top/top.X,v 1.10 2004/07/01 09:12:38 alfred Exp $ .nr N %topn% .nr D %delay% .TH TOP 1 Local @@ -20,6 +20,8 @@ ] [ .BI \-U username ] [ +.BI \-m io | cpu +] [ .I number ] .SH DESCRIPTION @@ -87,6 +89,9 @@ .I top process. .TP +.BI \-m display +Display either 'cpu' or 'io' statistics. Default is 'cpu'. +.TP .B \-n Use \*(lqnon-interactive\*(rq mode. This is identical to \*(lqbatch\*(rq mode. @@ -214,6 +219,9 @@ .I top show one final display and then immediately exit. .TP +.B m +Toggle the display between 'cpu' and 'io' modes. +.TP .B n or # Change the number of processes to display (prompt for new number). .TP ==== //depot/projects/gdb/contrib/top/top.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.10 2003/07/17 23:56:40 julian Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.11 2004/07/01 09:12:38 alfred Exp $ */ /* @@ -99,6 +99,7 @@ #else extern int proc_compare(); #endif +extern int io_compare(); time_t time(); caddr_t get_process_info(); @@ -192,9 +193,9 @@ fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIutHo"; + static char command_chars[] = "\f qh?en#sdkriIutHmo"; #else - static char command_chars[] = "\f qh?en#sdkriIutH"; + static char command_chars[] = "\f qh?en#sdkriIutHm"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -215,8 +216,9 @@ #define CMD_user 14 #define CMD_selftog 15 #define CMD_thrtog 16 +#define CMD_viewtog 17 #ifdef ORDER -#define CMD_order 17 +#define CMD_order 18 #endif /* set the buffer for stdout */ @@ -272,7 +274,7 @@ optind = 1; } - while ((i = getopt(ac, av, "SIHbinquvs:d:U:o:t")) != EOF) + while ((i = getopt(ac, av, "SIHbinquvs:d:U:m:o:t")) != EOF) { switch(i) { @@ -352,6 +354,20 @@ } break; + case 'm': /* select sort order */ + if (strcmp(optarg, "io") == 0) { + displaymode = DISP_IO; + } else if (strcmp(optarg, "cpu") == 0) { + displaymode = DISP_CPU; + } else { + fprintf(stderr, + "%s: warning: `-m' option can only take args " + "'io' or 'cpu'\n", + myname); + exit(1); + } + break; + case 'o': /* select sort order */ #ifdef ORDER order_name = optarg; @@ -545,19 +561,26 @@ while ((displays == -1) || (displays-- > 0)) { + int (*compare)(); + + /* get the current stats */ get_system_info(&system_info); - /* get the current set of processes */ - processes = - get_process_info(&system_info, - &ps, + if (displaymode == DISP_CPU) { #ifdef ORDER - proc_compares[order_index]); + compare = proc_compares[order_index]; #else - proc_compare); + compare = proc_compare; #endif + } else { + compare = io_compare; + } + /* get the current set of processes */ + processes = + get_process_info(&system_info, &ps, compare); + /* display the load averages */ (*d_loadave)(system_info.last_pid, system_info.load_avg); @@ -968,6 +991,14 @@ ps.thread ? "D" : "Not d"); putchar('\r'); break; + case CMD_viewtog: + if (++displaymode == DISP_MAX) + displaymode = 0; + header_text = format_header(uname_field); + display_header(Yes); + d_header = i_header; + reset_display(); + break; #ifdef ORDER case CMD_order: new_message(MT_standout, ==== //depot/projects/gdb/contrib/top/top.h#2 (text+ko) ==== @@ -1,4 +1,7 @@ /* + * $FreeBSD: src/contrib/top/top.h,v 1.3 2004/07/01 09:12:38 alfred Exp $ + */ +/* * Top - a top users display for Berkeley Unix * * General (global) definitions @@ -34,3 +37,6 @@ #define NUM_AVERAGES 3 +enum displaymodes { DISP_CPU = 0, DISP_IO, DISP_MAX }; + +extern enum displaymodes displaymode; ==== //depot/projects/gdb/etc/defaults/rc.conf#12 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.209 2004/06/18 20:09:29 green Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.210 2004/06/30 15:58:46 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="NO" # Run devd, to trigger programs on device tree changes. +devd_enable="YES" # Run devd, to trigger programs on device tree changes. kldxref_enable="NO" # Build linker.hints files with kldxref(8). kldxref_clobber="NO" # Overwrite old linker.hints at boot. kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. ==== //depot/projects/gdb/etc/ftpusers#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.12 2004/03/20 19:13:06 maxim Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.13 2004/06/30 16:47:08 maxim Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -15,6 +15,7 @@ sshd bind proxy +_pflogd uucp pop www ==== //depot/projects/gdb/etc/mail/aliases#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.19 2004/03/20 19:13:06 maxim Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.20 2004/06/30 16:47:08 maxim Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -23,6 +23,7 @@ postmaster: root # General redirections for pseudo accounts +_pflogd: root bin: root bind: root daemon: root ==== //depot/projects/gdb/include/wordexp.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wordexp.h,v 1.4 2003/01/03 12:03:38 tjr Exp $ + * $FreeBSD: src/include/wordexp.h,v 1.5 2004/06/30 13:55:08 tjr Exp $ */ #ifndef _WORDEXP_H_ @@ -49,7 +49,7 @@ * Flags for wordexp(). */ #define WRDE_APPEND 0x1 /* append to previously generated */ -#define WRDE_DOOFS 0x2 /* we_offs member is valid */ +#define WRDE_DOOFFS 0x2 /* we_offs member is valid */ #define WRDE_NOCMD 0x4 /* disallow command substitution */ #define WRDE_REUSE 0x8 /* reuse wordexp_t */ #define WRDE_SHOWERR 0x10 /* don't redirect stderr to /dev/null */ ==== //depot/projects/gdb/lib/libalias/libalias.3#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.50 2004/01/17 10:52:21 phk Exp $ +.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.51 2004/07/01 17:51:48 ru Exp $ .\" -.Dd April 13, 2000 +.Dd January 17, 2004 .Dt LIBALIAS 3 .Os .Sh NAME @@ -82,7 +82,9 @@ .Bd -ragged -offset indent This function is used to initialize internal data structures. -When called first time a NULL pointer should be passed as argument. +When called the first time, a +.Dv NULL +pointer should be passed as an argument. The following mode bits are always set after calling .Fn LibAliasInit . See the description of @@ -488,11 +490,11 @@ several function calls, will be aliased to the same address. Consider the following example: .Bd -literal -offset indent -LibAliasRedirectAddr(inet_aton("192.168.0.2"), +LibAliasRedirectAddr(la, inet_aton("192.168.0.2"), inet_aton("141.221.254.101")); -LibAliasRedirectAddr(inet_aton("192.168.0.3"), +LibAliasRedirectAddr(la, inet_aton("192.168.0.3"), inet_aton("141.221.254.101")); -LibAliasRedirectAddr(inet_aton("192.168.0.4"), +LibAliasRedirectAddr(la, inet_aton("192.168.0.4"), inet_aton("141.221.254.101")); .Ed .Pp ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.25 2004/06/27 23:27:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.27 2004/06/30 04:54:07 kientzle Exp $"); #include #include @@ -71,6 +71,7 @@ struct extract { mode_t umask; + mode_t default_dir_mode; struct archive_string mkdirpath; struct fixup_entry *fixup_list; @@ -157,6 +158,7 @@ } extract = a->extract; umask(extract->umask = umask(0)); /* Read the current umask. */ + extract->default_dir_mode = DEFAULT_DIR_MODE & ~extract->umask; extract->pst = NULL; restore_pwd = -1; @@ -385,6 +387,7 @@ const struct stat *st; char *p; size_t len; + mode_t mode; extract = a->extract; @@ -399,8 +402,12 @@ p[--len] = '\0'; /* Remove trailing "/" */ /* Recursively try to build the path. */ st = archive_entry_stat(entry); + mode = st->st_mode; + /* Obey umask unless ARCHIVE_EXTRACT_PERM for explicit dirs. */ + if ((flags & ARCHIVE_EXTRACT_PERM) == 0) + mode &= ~extract->umask; extract->pst = NULL; /* Invalidate cached stat data. */ - if (mkdirpath_recursive(a, p, st, st->st_mode, flags)) + if (mkdirpath_recursive(a, p, st, mode, flags)) return (ARCHIVE_WARN); archive_entry_set_mode(entry, 0700); return (restore_metadata(a, entry, flags)); @@ -428,7 +435,7 @@ /* Recursively try to build the path. */ if (mkdirpath_recursive(a, extract->mkdirpath.s, - NULL, DEFAULT_DIR_MODE, 0)) + NULL, extract->default_dir_mode, 0)) return (ARCHIVE_WARN); return (ARCHIVE_OK); } @@ -463,7 +470,7 @@ le->name = strdup(path); if (mode != writable_mode) { - le->mode = mode & ~extract->umask; + le->mode = mode; le->fixup |= FIXUP_MODE; mode = writable_mode; } @@ -522,7 +529,9 @@ p = strrchr(path, '/'); if (p != NULL) { *p = '\0'; /* Terminate path name. */ - r = mkdirpath_recursive(a, path, NULL, DEFAULT_DIR_MODE, 0); + /* Note that implicit dirs always obey the umask. */ + r = mkdirpath_recursive(a, path, NULL, + extract->default_dir_mode, 0); *p = '/'; /* Restore the '/' we just overwrote. */ if (r != ARCHIVE_OK) return (r); @@ -818,14 +827,28 @@ mode &= ~ S_ISGID; } + /* + * Ensure we change permissions on the object we extracted, + * and not any incidental symlink that might have gotten in + * the way. + */ + if (!S_ISLNK(archive_entry_mode(entry))) { + if (chmod(name, mode) != 0) { + archive_set_error(a, errno, "Can't set permissions"); + return (ARCHIVE_WARN); + } + } else { #ifdef HAVE_LCHMOD - if (lchmod(name, mode) != 0) { -#else - if ((archive_entry_mode(entry) & S_IFMT) != S_IFLNK && - chmod(name, mode) != 0) { + /* + * If lchmod() isn't supported, it's no big deal. + * Permissions on symlinks are actually ignored on + * most platforms. + */ + if (lchmod(name, mode) != 0) { + archive_set_error(a, errno, "Can't set permissions"); + return (ARCHIVE_WARN); + } #endif - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); } if (flags & ARCHIVE_EXTRACT_ACL) { ==== //depot/projects/gdb/lib/libc/gen/vis.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)vis.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.23 2004/03/21 11:31:37 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.24 2004/06/30 20:09:08 ru Exp $ .\" .Dd March 21, 2004 .Dt VIS 3 @@ -138,8 +138,14 @@ alter this: .Bl -tag -width VIS_WHITEX .It Dv VIS_GLOB -Also encode magic characters ('*', '?', '[' and '#') recognized by -.Xr glob 3 +Also encode magic characters +.Ql ( * , +.Ql \&? , +.Ql \&[ +and +.Ql # ) +recognized by +.Xr glob 3 . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB ==== //depot/projects/gdb/lib/libc/gen/wordexp.3#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.6 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.7 2004/06/30 13:55:08 tjr Exp $ .\" -.Dd December 27, 2002 +.Dd June 30, 2004 .Dt WORDEXP 3 .Os .Sh NAME @@ -58,7 +58,7 @@ .It Dv WRDE_APPEND Append the words to those generated by a previous call to .Fn wordexp . -.It Dv WRDE_DOOFS +.It Dv WRDE_DOOFFS As many .Dv NULL pointers as are specified by the ==== //depot/projects/gdb/lib/libc/gen/wordexp.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include "un-namespace.h" -__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.5 2004/04/09 11:32:32 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.6 2004/06/30 13:55:08 tjr Exp $"); static int we_askshell(const char *, wordexp_t *, int); static int we_check(const char *, int); @@ -155,12 +155,12 @@ */ sofs = we->we_nbytes; vofs = we->we_wordc; - if ((flags & (WRDE_DOOFS|WRDE_APPEND)) == (WRDE_DOOFS|WRDE_APPEND)) + if ((flags & (WRDE_DOOFFS|WRDE_APPEND)) == (WRDE_DOOFFS|WRDE_APPEND)) vofs += we->we_offs; we->we_wordc += nwords; we->we_nbytes += nbytes; if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 + - (flags & WRDE_DOOFS ? we->we_offs : 0)) * + (flags & WRDE_DOOFFS ? we->we_offs : 0)) * sizeof(char *))) == NULL) { _close(pdes[0]); _waitpid(pid, &status, 0); @@ -194,7 +194,7 @@ * Break the null-terminated expanded word strings out into * the vector. */ - if (vofs == 0 && flags & WRDE_DOOFS) + if (vofs == 0 && flags & WRDE_DOOFFS) while (vofs < we->we_offs) we->we_wordv[vofs++] = NULL; p = we->we_strings + sofs; ==== //depot/projects/gdb/lib/libc/locale/ctype.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ctype.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.14 2004/03/30 08:11:57 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/ctype.3,v 1.15 2004/06/30 20:09:08 ru Exp $ .\" .Dd March 30, 2004 .Dt CTYPE 3 @@ -126,10 +126,10 @@ .Xr isgraph 3 , .Xr isideogram 3 , .Xr islower 3 , -.Xr isrune 3 , .Xr isphonogram 3 , .Xr isprint 3 , .Xr ispunct 3 , +.Xr isrune 3 , .Xr isspace 3 , .Xr isspecial 3 , .Xr isupper 3 , ==== //depot/projects/gdb/lib/libc/locale/mbrlen.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.7 2004/04/08 09:59:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.8 2004/06/30 19:32:41 ru Exp $ .\" .Dd April 7, 2004 .Dt MBRLEN 3 @@ -100,7 +100,7 @@ .It Po Vt size_t Pc Ns \-1 An encoding error has occurred. The next -.Fa fn +.Fa n or fewer bytes do not contribute to a valid multibyte character. .El .Sh EXAMPLES ==== //depot/projects/gdb/lib/libc/locale/mbrtowc.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.4 2004/04/08 09:59:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.5 2004/06/30 19:32:41 ru Exp $ .\" .Dd April 8, 2004 .Dt MBRTOWC 3 @@ -114,7 +114,7 @@ .It Po Vt size_t Pc Ns \-1 An encoding error has occurred. The next -.Fa fn +.Fa n or fewer bytes do not contribute to a valid multibyte character. .El .Sh ERRORS ==== //depot/projects/gdb/lib/libc/locale/multibyte.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.25 2004/04/08 09:59:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.26 2004/06/30 20:09:08 ru Exp $ .\" .Dd April 8, 2004 .Dt MULTIBYTE 3 @@ -51,7 +51,7 @@ .Sh DESCRIPTION The basic elements of some written natural languages, such as Chinese, cannot be represented uniquely with single C -.Va char Ns s . +.Vt char Ns s . The C standard supports two different ways of dealing with extended natural language encodings: wide characters and @@ -59,10 +59,10 @@ Wide characters are an internal representation which allows each basic element to map >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 2 01:45:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E12A916A4D1; Fri, 2 Jul 2004 01:45:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7EE8D16A4CE for ; Fri, 2 Jul 2004 01:45:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 650F943D1F for ; Fri, 2 Jul 2004 01:45:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i621idng003618 for ; Fri, 2 Jul 2004 01:44:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i621idqa003615 for perforce@freebsd.org; Fri, 2 Jul 2004 01:44:39 GMT (envelope-from marcel@freebsd.org) Date: Fri, 2 Jul 2004 01:44:39 GMT Message-Id: <200407020144.i621idqa003615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 01:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=56248 Change 56248 by marcel@marcel_nfs on 2004/07/02 01:43:50 Complete the reversal of the introduction of the getlwpid(2) syscall. We don't need it anymore. Affected files ... .. //depot/projects/gdb/include/unistd.h#4 edit .. //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#3 edit .. //depot/projects/gdb/lib/libthr/thread/thr_cond.c#6 edit .. //depot/projects/gdb/lib/libthr/thread/thr_init.c#7 edit .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#7 edit .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#9 edit .. //depot/projects/gdb/sys/kern/kern_prot.c#7 edit Differences ... ==== //depot/projects/gdb/include/unistd.h#4 (text+ko) ==== @@ -48,11 +48,6 @@ #define _GID_T_DECLARED #endif -#ifndef _LWPID_T_DECLARED -typedef __lwpid_t lwpid_t; -#define _LWPID_T_DECLARED -#endif - #ifndef _OFF_T_DECLARED typedef __off_t off_t; #define _OFF_T_DECLARED @@ -345,7 +340,6 @@ gid_t getgid(void); int getgroups(int, gid_t []); char *getlogin(void); -lwpid_t getlwpid(void); pid_t getpgrp(void); pid_t getpid(void); pid_t getppid(void); ==== //depot/projects/gdb/lib/libc_r/uthread/uthread_init.c#3 (text+ko) ==== @@ -346,9 +346,6 @@ /* Initialize the scheduling switch hook routine: */ _sched_switch_hook = NULL; - /* Save the lwpid of the one LWP this process has. */ - _libc_r_lwpid = getlwpid(); - /* Give this thread default attributes: */ memcpy((void *) &_thread_initial->attr, &_pthread_attr_default, sizeof(struct pthread_attr)); ==== //depot/projects/gdb/lib/libthr/thread/thr_cond.c#6 (text+ko) ==== @@ -440,10 +440,10 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->lwpid); + pthread->name, pthread->uniqueid); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->lwpid); + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* ==== //depot/projects/gdb/lib/libthr/thread/thr_init.c#7 (text+ko) ==== @@ -304,7 +304,6 @@ /* Get our thread id. */ thr_self(&pthread->thr_id); - pthread->lwpid = getlwpid(); /* Find the stack top */ mib[0] = CTL_KERN; ==== //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#7 (text+ko) ==== @@ -800,10 +800,10 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->lwpid); + pthread->name, pthread->uniqueid); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->lwpid); + pthread->name, pthread->uniqueid); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* * For the common case of all threads having equal priority, ==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#9 (text+ko) ==== @@ -477,8 +477,8 @@ */ #define PTHREAD_MAGIC ((u_int32_t) 0xd09ba115) u_int32_t magic; - lwpid_t lwpid; /* for gdb */ char *name; + u_int64_t uniqueid; /* for gdb */ thr_id_t thr_id; sigset_t savedsig; int signest; /* blocked signal netsting level */ ==== //depot/projects/gdb/sys/kern/kern_prot.c#7 (text+ko) ==== @@ -70,23 +70,6 @@ "BSD security policy"); #ifndef _SYS_SYSPROTO_H_ -struct getlwpid_args { - int dummy; -}; -#endif -/* - * MPSAFE - */ -/* ARGSUSED */ -int -getlwpid(struct thread *td, struct getlwpid_args *uap) -{ - - td->td_retval[0] = td->td_tid; - return (0); -} - -#ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; }; From owner-p4-projects@FreeBSD.ORG Fri Jul 2 01:47:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C0CA16A4DA; Fri, 2 Jul 2004 01:47:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F277416A4CE for ; Fri, 2 Jul 2004 01:47:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8C0243D2D for ; Fri, 2 Jul 2004 01:47:53 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i621kgBt003760 for ; Fri, 2 Jul 2004 01:46:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i621kgGE003757 for perforce@freebsd.org; Fri, 2 Jul 2004 01:46:42 GMT (envelope-from marcel@freebsd.org) Date: Fri, 2 Jul 2004 01:46:42 GMT Message-Id: <200407020146.i621kgGE003757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 01:47:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=56249 Change 56249 by marcel@marcel_nfs on 2004/07/02 01:45:49 IFC @56244 Affected files ... .. //depot/projects/gdb/lib/libthr/thread/thr_cond.c#7 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_create.c#7 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/gdb/lib/libthr/thread/thr_private.h#10 integrate Differences ... ==== //depot/projects/gdb/lib/libthr/thread/thr_cond.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.14 2004/05/20 12:06:16 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.15 2004/07/02 00:40:07 marcel Exp $ */ #include #include @@ -439,11 +439,11 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) - _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->uniqueid); + _thread_printf(2, "Thread (%s:%ld) already on condq\n", + pthread->name, pthread->thr_id); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) - _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->uniqueid); + _thread_printf(2, "Thread (%s:%ld) already on mutexq\n", + pthread->name, pthread->thr_id); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* ==== //depot/projects/gdb/lib/libthr/thread/thr_create.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.16 2004/06/30 15:57:36 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_create.c,v 1.17 2004/07/02 00:40:07 marcel Exp $ */ #include #include @@ -43,11 +43,8 @@ #include "thr_private.h" #include "libc_private.h" -static u_int64_t next_uniqueid = 1; - #define OFF(f) offsetof(struct pthread, f) int _thread_next_offset = OFF(tle.tqe_next); -int _thread_uniqueid_offset = OFF(uniqueid); int _thread_name_offset = OFF(name); int _thread_ctx_offset = OFF(ctx); #undef OFF @@ -137,12 +134,6 @@ } new_thread->active_priority = new_thread->base_priority; - /* - * Initialise the unique id which GDB uses to - * track threads. - */ - new_thread->uniqueid = next_uniqueid++; - THREAD_LIST_LOCK; /* Add the thread to the linked list of all threads: */ ==== //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.28 2004/05/20 12:06:16 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.29 2004/07/02 00:40:07 marcel Exp $ */ #include #include @@ -799,11 +799,11 @@ name = pthread->name ? pthread->name : "unknown"; if ((pthread->flags & PTHREAD_FLAGS_IN_CONDQ) != 0) - _thread_printf(2, "Thread (%s:%u) already on condq\n", - pthread->name, pthread->uniqueid); + _thread_printf(2, "Thread (%s:%ld) already on condq\n", + pthread->name, pthread->thr_id); if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) - _thread_printf(2, "Thread (%s:%u) already on mutexq\n", - pthread->name, pthread->uniqueid); + _thread_printf(2, "Thread (%s:%ld) already on mutexq\n", + pthread->name, pthread->thr_id); PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread); /* * For the common case of all threads having equal priority, ==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.37 2004/06/27 10:01:35 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.38 2004/07/02 00:40:07 marcel Exp $ */ #ifndef _THR_PRIVATE_H @@ -478,8 +478,7 @@ #define PTHREAD_MAGIC ((u_int32_t) 0xd09ba115) u_int32_t magic; char *name; - u_int64_t uniqueid; /* for gdb */ - thr_id_t thr_id; + long thr_id; sigset_t savedsig; int signest; /* blocked signal netsting level */ int ptdflags; /* used by other other threads From owner-p4-projects@FreeBSD.ORG Fri Jul 2 03:15:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D37716A4D0; Fri, 2 Jul 2004 03:15:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2824716A4CE for ; Fri, 2 Jul 2004 03:15:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F9FD43D39 for ; Fri, 2 Jul 2004 03:15:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i623EVGa006253 for ; Fri, 2 Jul 2004 03:14:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i623EUfH006250 for perforce@freebsd.org; Fri, 2 Jul 2004 03:14:30 GMT (envelope-from jhb@freebsd.org) Date: Fri, 2 Jul 2004 03:14:30 GMT Message-Id: <200407020314.i623EUfH006250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 03:15:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=56255 Change 56255 by jhb@jhb_slimer on 2004/07/02 03:14:15 IFC @56244. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/sgmap.c#4 integrate .. //depot/projects/smpng/sys/alpha/isa/isa.c#13 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#20 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs.c#13 integrate .. //depot/projects/smpng/sys/alpha/pci/cia.c#17 integrate .. //depot/projects/smpng/sys/alpha/pci/pcibus.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/t2.c#19 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami.c#15 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#6 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#14 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#11 integrate .. //depot/projects/smpng/sys/boot/common/newvers.sh#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/smpng/sys/conf/NOTES#71 integrate .. //depot/projects/smpng/sys/conf/files#112 integrate .. //depot/projects/smpng/sys/conf/files.amd64#17 integrate .. //depot/projects/smpng/sys/conf/files.i386#62 integrate .. //depot/projects/smpng/sys/conf/files.ia64#41 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#32 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#67 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#24 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#43 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#21 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#30 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#23 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#40 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#18 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#24 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#12 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#19 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#46 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#54 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#12 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#16 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#27 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#17 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#83 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#62 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#11 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#25 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#5 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#15 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#44 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#45 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#74 integrate .. //depot/projects/smpng/sys/modules/Makefile#78 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ahb/Makefile#1 branch .. //depot/projects/smpng/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#56 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#27 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#44 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#22 integrate .. //depot/projects/smpng/sys/powerpc/powermac/grackle.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powermac/maciovar.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#40 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobus.c#5 integrate .. //depot/projects/smpng/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#14 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#10 integrate .. //depot/projects/smpng/sys/sys/param.h#63 integrate .. //depot/projects/smpng/sys/sys/rman.h#8 integrate .. //depot/projects/smpng/sys/sys/syscall.h#44 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#44 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#46 integrate .. //depot/projects/smpng/sys/sys/thr.h#3 integrate .. //depot/projects/smpng/sys/sys/tty.h#14 integrate .. //depot/projects/smpng/sys/sys/umtx.h#4 integrate .. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/sgmap.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/isa/isa.c#13 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#20 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/apecs.c#13 (text+ko) ==== @@ -55,8 +55,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/cia.c#17 (text+ko) ==== @@ -87,10 +87,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/pcibus.c#5 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_isa.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/t2.c#19 (text+ko) ==== @@ -51,8 +51,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/tsunami.c#15 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#6 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#14 (text+ko) ==== @@ -56,8 +56,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.14 2004/06/30 04:42:29 njl Exp $"); #include #include @@ -56,3 +56,9 @@ intr_model = model; } + +int +acpi_machdep_quirks(int *quirks) +{ + return (0); +} ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.60 2004/06/03 20:22:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.61 2004/06/30 19:24:26 imp Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -41,6 +41,7 @@ * and I/O memory address space. */ +#define __RMAN_RESOURCE_VISIBLE #include "opt_isa.h" #include ==== //depot/projects/smpng/sys/boot/common/newvers.sh#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.4 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $ # $NetBSD: newvers.sh,v 1.1 1997/07/26 01:50:38 thorpej Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -33,7 +33,7 @@ # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 LC_ALL=C; export LC_ALL -u=${USER-root} h=`hostname` t=`date` +u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -595,10 +595,10 @@ 428 UNIMPL __acl_aclcheck_link ; XXX implement 429 UNIMPL sigwait -430 MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); } +430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } 431 MNOPROTO { void thr_exit(void); } -432 MNOPROTO { int thr_self(thr_id_t *id); } -433 MNOPROTO { int thr_kill(thr_id_t id, int sig); } +432 MNOPROTO { int thr_self(long *id); } +433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO { int jail_attach(int jid); } @@ -608,4 +608,4 @@ 440 UNIMPL kse_switchin 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } -443 MNOPROTO { int thr_wake(thr_id_t id); } +443 MNOPROTO { int thr_wake(long id); } ==== //depot/projects/smpng/sys/conf/NOTES#71 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1237 2004/06/29 02:30:11 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1238 2004/06/30 01:00:59 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -178,6 +178,11 @@ # and WITNESS options. options MUTEX_NOINLINE +# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters +# when a contested mutex is released rather than just awaking the highest +# priority waiter. +options MUTEX_WAKE_ALL + # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. ==== //depot/projects/smpng/sys/conf/files#112 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/sys/conf/files,v 1.914 2004/06/28 16:22:20 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.921 2004/06/30 14:52:49 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # -acpi_quirks.h standard \ +acpi_quirks.h optional acpi \ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ @@ -45,7 +45,7 @@ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule before-depend \ clean "miidevs.h" -pccarddevs.h optional pccard \ +pccarddevs.h standard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ no-obj no-implicit-rule before-depend \ @@ -290,6 +290,7 @@ dev/acpica/acpi_pcib_acpi.c optional acpi pci dev/acpica/acpi_pcib_pci.c optional acpi pci dev/acpica/acpi_powerres.c optional acpi +dev/acpica/acpi_quirk.c optional acpi dev/acpica/acpi_resource.c optional acpi dev/acpica/acpi_thermal.c optional acpi dev/acpica/acpi_timer.c optional acpi ==== //depot/projects/smpng/sys/conf/files.amd64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.37 2004/05/24 12:08:56 bde Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.38 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -35,6 +35,7 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +dev/acpica/acpi_if.m standard amd64/acpica/OsdEnvironment.c optional acpi amd64/acpica/acpi_machdep.c optional acpi amd64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/smpng/sys/conf/files.i386#62 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.495 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -180,6 +180,7 @@ geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_asus.c optional acpi_asus acpi i386/acpica/acpi_machdep.c optional acpi ==== //depot/projects/smpng/sys/conf/files.ia64#41 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.68 2004/05/17 06:51:19 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.69 2004/06/30 14:19:28 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,6 +75,7 @@ geom/geom_gpt.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard +dev/acpica/acpi_if.m standard ia64/acpica/OsdEnvironment.c optional acpi ia64/acpica/acpi_machdep.c optional acpi ia64/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/smpng/sys/conf/kmod.mk#32 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.163 2004/06/29 18:56:14 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -293,7 +293,7 @@ MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ dev/iicbus/iicbus_if.m isa/isa_if.m \ libkern/iconv_converter_if.m \ - dev/eisa/eisa_if.m dev/mii/miibus_if.m \ + dev/acpica/acpi_if.m dev/eisa/eisa_if.m dev/mii/miibus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ ==== //depot/projects/smpng/sys/conf/newvers.sh#12 (text+ko) ==== @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.61 2004/04/07 20:45:56 imp Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $ TYPE="FreeBSD" REVISION="5.2" @@ -81,7 +81,7 @@ fi touch version -v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date` +v=`cat version` u=${USER-root} d=`pwd` h=${HOSTNAME-`hostname`} t=`date` i=`make -V KERN_IDENT` cat << EOF > vers.c $COPYRIGHT ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#67 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.168 2004/06/29 01:33:35 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.174 2004/07/01 17:21:18 imp Exp $ */ #include "opt_acpi.h" @@ -78,36 +78,20 @@ .d_name = "acpi", }; -#if __FreeBSD_version >= 500000 +/* Global mutex for locking access to the ACPI subsystem. */ struct mtx acpi_mutex; -#endif + +/* Bitmap of device quirks. */ +int acpi_quirks; /* Local pools for managing system resources for ACPI child devices. */ -struct rman acpi_rman_io, acpi_rman_mem; - -struct acpi_quirks { - char *OemId; - uint32_t OemRevision; - char *value; -}; - -#define ACPI_OEM_REV_ANY 0 - -static struct acpi_quirks acpi_quirks_table[] = { -#ifdef notyet - /* Bad PCI routing table. Used on some SuperMicro boards. */ - { "PTLTD ", 0x06040000, "pci_link" }, -#endif - - { NULL, 0, NULL } -}; +struct rman acpi_rman_io, acpi_rman_mem; static int acpi_modevent(struct module *mod, int event, void *junk); static void acpi_identify(driver_t *driver, device_t parent); static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); static int acpi_shutdown(device_t dev); -static void acpi_quirks_set(void); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); static int acpi_print_child(device_t bus, device_t child); @@ -123,18 +107,25 @@ int rid, struct resource *r); static uint32_t acpi_isa_get_logicalid(device_t dev); static int acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count); +static char *acpi_device_id_probe(device_t bus, device_t dev, char **ids); +static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev, + ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters, + ACPI_BUFFER *ret); +static ACPI_STATUS acpi_device_walk_ns(device_t bus, device_t dev, + ACPI_OBJECT_TYPE type, UINT32 max_depth, + ACPI_WALK_CALLBACK user_fn, void *context, void **ret); static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); static int acpi_probe_order(ACPI_HANDLE handle, int *order); static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); +static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); -static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); -static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, - void **status); -static int acpi_wake_limit_walk(int sstate); +static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_run_prep(ACPI_HANDLE handle, int sstate); +static int acpi_wake_prep_walk(int sstate); static int acpi_wake_sysctl_walk(device_t dev); static int acpi_wake_set_sysctl(SYSCTL_HANDLER_ARGS); static void acpi_system_eventhandler_sleep(void *arg, int state); @@ -175,6 +166,11 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + /* ACPI bus */ + DEVMETHOD(acpi_id_probe, acpi_device_id_probe), + DEVMETHOD(acpi_evaluate_object, acpi_device_eval_obj), + DEVMETHOD(acpi_walk_namespace, acpi_device_walk_ns), + /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), @@ -218,7 +214,7 @@ static int acpi_modevent(struct module *mod, int event, void *junk) { - switch(event) { + switch (event) { case MOD_LOAD: if (!cold) { printf("The ACPI driver cannot be loaded after boot.\n"); @@ -244,18 +240,17 @@ #ifdef ACPI_DEBUGGER char *debugpoint; #endif - static int error, started = 0; + static int started = 0; + int error, val; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (started) - return_VALUE (error); + return_VALUE (0); started = 1; -#if __FreeBSD_version >= 500000 /* Initialise the ACPI mutex */ mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); -#endif /* * Set the globals from our tunables. This is needed because ACPI-CA @@ -287,13 +282,21 @@ if (ACPI_FAILURE(error = AcpiLoadTables())) { printf("ACPI: table load failed: %s\n", AcpiFormatException(error)); - return_VALUE(error); + AcpiTerminate(); + return_VALUE (error); } - /* Set up any quirks we have for this XSDT. */ - acpi_quirks_set(); - if (acpi_disabled("acpi")) + /* Set up any quirks we have for this system. */ + acpi_table_quirks(&acpi_quirks); + + /* If the user manually set the disabled hint to 0, override any quirk. */ + if (resource_int_value("acpi", 0, "disabled", &val) == 0 && val == 0) + acpi_quirks &= ~ACPI_Q_BROKEN; + if (acpi_quirks & ACPI_Q_BROKEN) { + printf("ACPI disabled by blacklist. Contact your BIOS vendor.\n"); + AcpiTerminate(); return_VALUE (AE_ERROR); + } return_VALUE (AE_OK); } @@ -536,7 +539,7 @@ /* Only enable S4BIOS by default if the FACS says it is available. */ if (AcpiGbl_FACS->S4Bios_f != 0) - sc->acpi_s4bios = 1; + sc->acpi_s4bios = 1; /* * Dispatch the default sleep state to devices. The lid switch is set @@ -629,60 +632,12 @@ /* Allow children to shutdown first. */ bus_generic_shutdown(dev); - /* Disable all wake GPEs not appropriate for reboot/poweroff. */ - acpi_wake_limit_walk(ACPI_STATE_S5); + /* Enable any GPEs that are able to power-on the system (i.e., RTC). */ + acpi_wake_prep_walk(ACPI_STATE_S5); + return (0); } -static void -acpi_quirks_set() -{ - XSDT_DESCRIPTOR *xsdt; - struct acpi_quirks *quirk; - char *env, *tmp; - int len; - - /* - * If the user loaded a custom table or disabled "quirks", leave - * the settings alone. - */ - len = 0; - if ((env = getenv("acpi_dsdt_load")) != NULL) { - /* XXX No strcasecmp but this is good enough. */ - if (*env == 'Y' || *env == 'y') - goto out; - freeenv(env); - } - if ((env = getenv("debug.acpi.disabled")) != NULL) { - if (strstr("quirks", env) != NULL) - goto out; - len = strlen(env); - } - - /* - * Search through our quirk table and concatenate the disabled - * values with whatever we find. - */ - xsdt = AcpiGbl_XSDT; - for (quirk = acpi_quirks_table; quirk->OemId; quirk++) { - if (!strncmp(xsdt->OemId, quirk->OemId, strlen(quirk->OemId)) && - (xsdt->OemRevision == quirk->OemRevision || - quirk->OemRevision == ACPI_OEM_REV_ANY)) { - len += strlen(quirk->value) + 2; - if ((tmp = malloc(len, M_TEMP, M_NOWAIT)) == NULL) - goto out; - sprintf(tmp, "%s %s", env ? env : "", quirk->value); - setenv("debug.acpi.disabled", tmp); - free(tmp, M_TEMP); - break; - } - } - -out: - if (env) - freeenv(env); -} - /* * Handle a new device being added */ @@ -787,6 +742,9 @@ case ACPI_IVAR_PRIVATE: *(void **)result = ad->ad_private; break; + case ACPI_IVAR_FLAGS: + *(int *)result = ad->ad_flags; + break; case ISA_IVAR_VENDORID: case ISA_IVAR_SERIAL: case ISA_IVAR_COMPATID: @@ -822,6 +780,9 @@ case ACPI_IVAR_PRIVATE: ad->ad_private = (void *)value; break; + case ACPI_IVAR_FLAGS: + ad->ad_flags = (int)value; + break; default: panic("bad ivar write request (%d)", index); return (ENOENT); @@ -1053,6 +1014,46 @@ return_VALUE (valid); } +static char * +acpi_device_id_probe(device_t bus, device_t dev, char **ids) +{ + ACPI_HANDLE h; + int i; + + h = acpi_get_handle(dev); + if (ids == NULL || h == NULL || acpi_get_type(dev) != ACPI_TYPE_DEVICE) + return (NULL); + + /* Try to match one of the array of IDs with a HID or CID. */ + for (i = 0; ids[i] != NULL; i++) { + if (acpi_MatchHid(h, ids[i])) + return (ids[i]); + } + return (NULL); +} + +static ACPI_STATUS +acpi_device_eval_obj(device_t bus, device_t dev, ACPI_STRING pathname, + ACPI_OBJECT_LIST *parameters, ACPI_BUFFER *ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiEvaluateObject(h, pathname, parameters, ret)); +} + +static ACPI_STATUS +acpi_device_walk_ns(device_t bus, device_t dev, ACPI_OBJECT_TYPE type, + UINT32 max_depth, ACPI_WALK_CALLBACK user_fn, void *context, void **ret) +{ + ACPI_HANDLE h; + + if ((h = acpi_get_handle(dev)) == NULL) + return (AE_BAD_PARAMETER); + return (AcpiWalkNamespace(type, h, max_depth, user_fn, context, ret)); +} + static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids) { @@ -1195,7 +1196,7 @@ bus = (device_t)context; if (ACPI_SUCCESS(AcpiGetType(handle, &type))) { - switch(type) { + switch (type) { case ACPI_TYPE_DEVICE: case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_THERMAL: @@ -1221,10 +1222,6 @@ acpi_set_handle(child, handle); AcpiAttachData(handle, acpi_fake_objhandler, child); - /* Check if the device can generate wake events. */ - if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_PRW", NULL, NULL))) - device_set_flags(child, ACPI_FLAG_WAKE_CAPABLE); - /* * Check that the device is present. If it's not present, * leave it disabled (so that we have a device_t attached to @@ -1398,8 +1395,8 @@ /* * Match a HID string against a handle */ -BOOLEAN -acpi_MatchHid(ACPI_HANDLE h, char *hid) +static BOOLEAN +acpi_MatchHid(ACPI_HANDLE h, const char *hid) { ACPI_DEVICE_INFO *devinfo; ACPI_BUFFER buf; @@ -1771,8 +1768,8 @@ sc->acpi_sstate = state; sc->acpi_sleep_disabled = 1; - /* Disable all wake GPEs not appropriate for this state. */ - acpi_wake_limit_walk(state); + /* Enable any GPEs as appropriate and requested by the user. */ + acpi_wake_prep_walk(state); /* Inform all devices that we are going to sleep. */ if (DEVICE_SUSPEND(root_bus) != 0) { @@ -1818,6 +1815,9 @@ break; } } + + /* Resume devices, re-enable GPEs and fixed events. */ + acpi_wake_prep_walk(state); AcpiLeaveSleepState((UINT8)state); DEVICE_RESUME(root_bus); sc->acpi_sstate = ACPI_STATE_S0; @@ -1849,10 +1849,6 @@ { struct acpi_prw_data prw; - /* Check that the device can wake the system. */ - if ((device_get_flags(dev) & ACPI_FLAG_WAKE_CAPABLE) == 0) - return (ENXIO); - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(acpi_get_handle(dev), &prw) != 0) return (ENXIO); @@ -1875,149 +1871,124 @@ ACPI_STATUS status; int flags; - /* Make sure the device supports waking the system. */ - flags = device_get_flags(dev); + /* Make sure the device supports waking the system and get the GPE. */ handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - - /* Evaluate _PRW to find the GPE. */ if (acpi_parse_prw(handle, &prw) != 0) return (ENXIO); + flags = acpi_get_flags(dev); if (enable) { status = AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "enable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED); } else { status = AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); if (ACPI_FAILURE(status)) { device_printf(dev, "disable wake failed\n"); return (ENXIO); } - device_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); + acpi_set_flags(dev, flags & ~ACPI_FLAG_WAKE_ENABLED); } return (0); } -/* Configure a device's GPE appropriately for the new sleep state. */ -int -acpi_wake_sleep_prep(device_t dev, int sstate) +static int +acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate) { struct acpi_prw_data prw; - ACPI_HANDLE handle; - int flags; + device_t dev; - /* Check that this is an ACPI device and get its GPE. */ - flags = device_get_flags(dev); - handle = acpi_get_handle(dev); - if ((flags & ACPI_FLAG_WAKE_CAPABLE) == 0 || handle == NULL) - return (ENXIO); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 2 04:20:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF75716A4D0; Fri, 2 Jul 2004 04:20:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93FC616A4CE for ; Fri, 2 Jul 2004 04:20:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B67C43D39 for ; Fri, 2 Jul 2004 04:20:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i624E7Hv008247 for ; Fri, 2 Jul 2004 04:14:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i624E7qW008244 for perforce@freebsd.org; Fri, 2 Jul 2004 04:14:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 2 Jul 2004 04:14:07 GMT Message-Id: <200407020414.i624E7qW008244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 04:20:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=56266 Change 56266 by jhb@jhb_slimer on 2004/07/02 04:13:06 IFC @56264. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#65 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#11 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#19 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#45 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $"); #include #include @@ -66,6 +66,7 @@ int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; + bus_dma_segment_t *segments; }; struct bounce_page { @@ -221,7 +222,9 @@ newtag->lockfunc = dflt_lock; newtag->lockfuncarg = NULL; } - + + newtag->segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); @@ -290,6 +293,8 @@ parent = dmat->parent; atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -332,6 +337,14 @@ return (0); } + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if (dmat->lowaddr < ptoa(Maxmem)) { /* Must bounce */ int maxpages; @@ -425,6 +438,14 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -477,11 +498,6 @@ { vm_offset_t vaddr; vm_offset_t paddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_dma_segment_t *sg; int seg; int error; @@ -496,16 +512,16 @@ * of the bus address space. */ vaddr = trunc_page((vm_offset_t) buf); - dm_segments[0].ds_addr = + dmat->segments[0].ds_addr = map->busaddress + (vm_offset_t) buf - vaddr; - dm_segments[0].ds_len = buflen; + dmat->segments[0].ds_len = buflen; buflen = round_page((vm_offset_t) buf + buflen) - vaddr; sgmap_load_region(chipset.sgmap, map->busaddress, vaddr, buflen); map->buflen = buflen; - (*callback)(callback_arg, dm_segments, 1, error); + (*callback)(callback_arg, dmat->segments, 1, error); return (0); } @@ -560,7 +576,7 @@ } vaddr = (vm_offset_t)buf; - sg = &dm_segments[0]; + sg = &dmat->segments[0]; seg = 1; sg->ds_len = 0; @@ -604,7 +620,7 @@ error = EFBIG; } - (*callback)(callback_arg, dm_segments, seg, error); + (*callback)(callback_arg, dmat->segments, seg, error); return (0); } @@ -617,7 +633,6 @@ */ static int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, - bus_dma_segment_t segs[], void *buf, bus_size_t buflen, struct thread *td, int flags, @@ -625,12 +640,15 @@ int *segp, int first) { + bus_dma_segment_t *segs; bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; pmap_t pmap; + segs = dmat->segments; + if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else @@ -709,11 +727,6 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error; KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, @@ -730,7 +743,6 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len > 0) { error = _bus_dmamap_load_buffer(dmat, - dm_segments, m->m_data, m->m_len, NULL, flags, &lastaddr, &nsegs, first); @@ -743,9 +755,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } return (error); @@ -761,11 +773,6 @@ int flags) { bus_addr_t lastaddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; @@ -796,9 +803,7 @@ caddr_t addr = (caddr_t) iov[i].iov_base; if (minlen > 0) { - error = _bus_dmamap_load_buffer(dmat, - dm_segments, - addr, minlen, + error = _bus_dmamap_load_buffer(dmat, addr, minlen, td, flags, &lastaddr, &nsegs, first); first = 0; @@ -808,9 +813,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } return (error); ==== //depot/projects/smpng/sys/kern/kern_clock.c#35 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.170 2004/06/16 00:26:29 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.171 2004/07/02 03:48:09 jhb Exp $"); #include "opt_ntp.h" #include "opt_ddb.h" @@ -374,7 +374,6 @@ statclock(frame) register struct clockframe *frame; { - struct pstats *pstats; struct rusage *ru; struct vmspace *vm; struct thread *td; @@ -427,16 +426,16 @@ sched_clock(td); /* Update resource usage integrals and maximums. */ - if ((pstats = p->p_stats) != NULL && - (ru = &pstats->p_ru) != NULL && - (vm = p->p_vmspace) != NULL) { - ru->ru_ixrss += pgtok(vm->vm_tsize); - ru->ru_idrss += pgtok(vm->vm_dsize); - ru->ru_isrss += pgtok(vm->vm_ssize); - rss = pgtok(vmspace_resident_count(vm)); - if (ru->ru_maxrss < rss) - ru->ru_maxrss = rss; - } + MPASS(p->p_stats != NULL); + MPASS(p->p_vmspace != NULL); + vm = p->p_vmspace; + ru = &p->p_stats->p_ru; + ru->ru_ixrss += pgtok(vm->vm_tsize); + ru->ru_idrss += pgtok(vm->vm_dsize); + ru->ru_isrss += pgtok(vm->vm_ssize); + rss = pgtok(vmspace_resident_count(vm)); + if (ru->ru_maxrss < rss) + ru->ru_maxrss = rss; mtx_unlock_spin_flags(&sched_lock, MTX_QUIET); } ==== //depot/projects/smpng/sys/kern/subr_prof.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.72 2004/05/29 01:18:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_prof.c,v 1.73 2004/07/02 03:50:47 jhb Exp $"); #include #include @@ -419,17 +419,19 @@ p = td->td_proc; if (uap->scale == 0) { - PROC_LOCK(td->td_proc); - stopprofclock(td->td_proc); - PROC_UNLOCK(td->td_proc); + PROC_LOCK(p); + stopprofclock(p); + PROC_UNLOCK(p); return (0); } + PROC_LOCK(p); upp = &td->td_proc->p_stats->p_prof; + mtx_lock_spin(&sched_lock); upp->pr_off = uap->offset; upp->pr_scale = uap->scale; upp->pr_base = uap->samples; upp->pr_size = uap->size; - PROC_LOCK(p); + mtx_unlock_spin(&sched_lock); startprofclock(p); PROC_UNLOCK(p); @@ -469,16 +471,20 @@ if (ticks == 0) return; prof = &td->td_proc->p_stats->p_prof; + mtx_lock_spin(&sched_lock); if (pc < prof->pr_off || - (i = PC_TO_INDEX(pc, prof)) >= prof->pr_size) + (i = PC_TO_INDEX(pc, prof)) >= prof->pr_size) { + mtx_unlock_spin(&sched_lock); return; /* out of range; ignore */ + } addr = prof->pr_base + i; + mtx_unlock_spin(&sched_lock); if ((v = fuswintr(addr)) == -1 || suswintr(addr, v + ticks) == -1) { - mtx_lock_spin(&sched_lock); prof->pr_addr = pc; prof->pr_ticks = ticks; - td->td_flags |= TDF_OWEUPC | TDF_ASTPENDING ; + mtx_lock_spin(&sched_lock); + td->td_flags |= TDF_OWEUPC | TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); } } @@ -506,7 +512,6 @@ return; } p->p_profthreads++; - PROC_UNLOCK(p); prof = &p->p_stats->p_prof; if (pc < prof->pr_off || (i = PC_TO_INDEX(pc, prof)) >= prof->pr_size) { @@ -514,15 +519,18 @@ } addr = prof->pr_base + i; + PROC_UNLOCK(p); if (copyin(addr, &v, sizeof(v)) == 0) { v += ticks; - if (copyout(&v, addr, sizeof(v)) == 0) + if (copyout(&v, addr, sizeof(v)) == 0) { + PROC_LOCK(p); goto out; + } } stop = 1; + PROC_LOCK(p); out: - PROC_LOCK(p); if (--p->p_profthreads == 0) { if (p->p_flag & P_STOPPROF) { wakeup(&p->p_profthreads); ==== //depot/projects/smpng/sys/kern/subr_trap.c#65 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.266 2004/03/31 08:20:44 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_trap.c,v 1.267 2004/07/02 03:50:47 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -142,7 +142,7 @@ struct proc *p; struct ksegrp *kg; struct rlimit rlim; - u_int prticks, sticks; + u_int sticks; int sflag; int flags; int sig; @@ -180,11 +180,6 @@ td->td_flags &= ~(TDF_ASTPENDING | TDF_NEEDSIGCHK | TDF_NEEDRESCHED | TDF_OWEUPC | TDF_INTERRUPT); cnt.v_soft++; - prticks = 0; - if (flags & TDF_OWEUPC && p->p_flag & P_PROFIL) { - prticks = p->p_stats->p_prof.pr_ticks; - p->p_stats->p_prof.pr_ticks = 0; - } mtx_unlock_spin(&sched_lock); /* * XXXKSE While the fact that we owe a user profiling @@ -196,8 +191,11 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (flags & TDF_OWEUPC && p->p_flag & P_PROFIL) - addupc_task(td, p->p_stats->p_prof.pr_addr, prticks); + if (flags & TDF_OWEUPC && p->p_flag & P_PROFIL) { + addupc_task(td, p->p_stats->p_prof.pr_addr, + p->p_stats->p_prof.pr_ticks); + p->p_stats->p_prof.pr_ticks = 0; + } if (sflag & PS_ALRMPEND) { PROC_LOCK(p); psignal(p, SIGVTALRM); ==== //depot/projects/smpng/sys/pci/agp_via.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/agp_via.c,v 1.15 2004/05/30 20:00:40 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/agp_via.c,v 1.16 2004/07/02 03:39:33 jhb Exp $"); #include "opt_bus.h" @@ -89,6 +89,8 @@ return ("VIA 82C691 (Apollo Pro) host to PCI bridge"); case 0x31881106: return ("VIA 8385 host to PCI bridge"); + case 0x31891106: + return ("VIA 8377 (Apollo KT400/KT400A/KT600) host to PCI bridge"); }; if (pci_get_vendor(dev) == 0x1106) @@ -123,6 +125,7 @@ switch (pci_get_devid(dev)) { case 0x31881106: + case 0x31891106: sc->regs = via_v3_regs; break; default: ==== //depot/projects/smpng/sys/sys/resourcevar.h#19 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)resourcevar.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/resourcevar.h,v 1.41 2004/04/07 04:19:49 imp Exp $ + * $FreeBSD: src/sys/sys/resourcevar.h,v 1.42 2004/07/02 03:50:48 jhb Exp $ */ #ifndef _SYS_RESOURCEVAR_H_ @@ -43,25 +43,31 @@ /* * Kernel per-process accounting / statistics * (not necessarily resident except when running). + * + * Locking key: + * b - created at fork, never changes + * c - locked by proc mtx + * j - locked by sched_lock mtx + * k - only accessed by curthread */ struct pstats { #define pstat_startzero p_ru - struct rusage p_ru; /* stats for this proc */ - struct rusage p_cru; /* sum of stats for reaped children */ - struct itimerval p_timer[3]; /* virtual-time timers */ + struct rusage p_ru; /* Stats for this process. */ + struct rusage p_cru; /* Stats for reaped children. */ + struct itimerval p_timer[3]; /* (j) Virtual-time timers. */ #define pstat_endzero pstat_startcopy #define pstat_startcopy p_prof - struct uprof { /* profile arguments */ - caddr_t pr_base; /* buffer base */ - u_long pr_size; /* buffer size */ - u_long pr_off; /* pc offset */ - u_long pr_scale; /* pc scaling */ - u_long pr_addr; /* temp storage for addr until AST */ - u_int pr_ticks; /* temp storage for ticks until AST */ + struct uprof { /* Profile arguments. */ + caddr_t pr_base; /* (c + j) Buffer base. */ + u_long pr_size; /* (c + j) Buffer size. */ + u_long pr_off; /* (c + j) PC offset. */ + u_long pr_scale; /* (c + j) PC scaling. */ + u_long pr_addr; /* (k) Temporary addr until AST. */ + u_int pr_ticks; /* (k) Temporary ticks until AST. */ } p_prof; #define pstat_endcopy p_start - struct timeval p_start; /* starting time */ + struct timeval p_start; /* (b) Starting time. */ }; #ifdef _KERNEL ==== //depot/projects/smpng/sys/vm/vm_glue.c#45 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.199 2004/06/27 01:58:12 das Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_glue.c,v 1.200 2004/07/02 03:45:07 jhb Exp $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -618,7 +618,6 @@ int flags; { struct proc *p1 = td->td_proc; - struct user *up; GIANT_REQUIRED; @@ -652,22 +651,18 @@ shmfork(p1, p2); } - /* XXXKSE this is unsatisfactory but should be adequate */ - up = p2->p_uarea; - MPASS(p2->p_sigacts != NULL); - /* - * p_stats currently points at fields in the user struct - * but not at &u, instead at p_addr. Copy parts of - * p_stats; zero the rest of p_stats (statistics). + * p_stats currently points at fields in the user struct. + * Copy parts of p_stats; zero the rest of p_stats (statistics). */ - p2->p_stats = &up->u_stats; - bzero(&up->u_stats.pstat_startzero, - (unsigned) ((caddr_t) &up->u_stats.pstat_endzero - - (caddr_t) &up->u_stats.pstat_startzero)); - bcopy(&p1->p_stats->pstat_startcopy, &up->u_stats.pstat_startcopy, - ((caddr_t) &up->u_stats.pstat_endcopy - - (caddr_t) &up->u_stats.pstat_startcopy)); +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) + + p2->p_stats = &p2->p_uarea->u_stats; + bzero(&p2->p_stats->pstat_startzero, + (unsigned) RANGEOF(struct pstats, pstat_startzero, pstat_endzero)); + bcopy(&p1->p_stats->pstat_startcopy, &p2->p_stats->pstat_startcopy, + (unsigned) RANGEOF(struct pstats, pstat_startcopy, pstat_endcopy)); +#undef RANGEOF /* * cpu_fork will copy and update the pcb, set up the kernel stack, From owner-p4-projects@FreeBSD.ORG Fri Jul 2 13:04:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99E2216A4D0; Fri, 2 Jul 2004 13:04:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A33D16A4CF for ; Fri, 2 Jul 2004 13:04:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6167F43D53 for ; Fri, 2 Jul 2004 13:04:25 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i62D35Dm026190 for ; Fri, 2 Jul 2004 13:03:05 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i62D33Iv026187 for perforce@freebsd.org; Fri, 2 Jul 2004 13:03:03 GMT (envelope-from davidxu@freebsd.org) Date: Fri, 2 Jul 2004 13:03:03 GMT Message-Id: <200407021303.i62D33Iv026187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 56301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 13:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=56301 Change 56301 by davidxu@davidxu_alona on 2004/07/02 13:02:48 IFC @56298 Affected files ... .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/ABOUT-NLS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/AUTHORS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/ChangeLog#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/INSTALL#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/NEWS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/README#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/THANKS#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/THANKS-to-translators#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/TODO#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/__fpending.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/__fpending.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/argmatch.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/argmatch.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/closeout.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/closeout.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/error.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/error.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/exit.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/exitfail.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/exitfail.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/gettext.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/hard-locale.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/hard-locale.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/human.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/human.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/inttostr.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/inttostr.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/long-options.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/long-options.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/memcoll.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/memcoll.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/pathmax.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/physmem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/physmem.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/posixver.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quote.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quote.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quotearg.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/quotearg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/stdio-safer.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/strnlen.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/timespec.h#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/umaxtostr.c#1 branch .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/unistd-safer.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/version-etc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/version-etc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xalloc.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xmalloc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xmemcoll.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xmemcoll.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtol.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtol.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtoul.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/lib/xstrtoumax.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/man/sort.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/sort.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/sys2.h#2 delete .. //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/src/system.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.X#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/contrib/top/top.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/alloca.h#1 branch .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/gnu/usr.bin/sort/localedir.h#1 branch .. //depot/projects/davidxu_ksedbg/src/lib/libalias/libalias.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libkvm/kvm_getprocs.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpam/modules/pam_radius/pam_radius.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libpam/modules/pam_self/pam_self.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_cond.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libugidfw/bsde_get_rule.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/libugidfw/libugidfw.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/fabs.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/hypot.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/lib/msun/man/ieee.3#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/add.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/gpt.8#2 integrate .. //depot/projects/davidxu_ksedbg/src/sbin/gpt/show.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/share/man/man4/netgraph.4#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/sab/sab.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/dev/zs/zs.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/net/if_tun.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_de.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_sis.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/psim/iobusvar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/param.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/rman.h#3 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/thr.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/sys/umtx.h#2 integrate .. //depot/projects/davidxu_ksedbg/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/make.1#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/davidxu_ksedbg/src/usr.bin/top/machine.c#3 integrate Differences ... ==== //depot/projects/davidxu_ksedbg/src/contrib/gnu-sort/ABOUT-NLS#2 (text+ko) ==== @@ -1,8 +1,8 @@ Notes on the Free Translation Project ************************************* - Free software is going international! The Free Translation Project -is a way to get maintainers of free software, translators, and users all +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all together, so that will gradually become able to speak many languages. A few packages already provide translations for their messages. @@ -25,7 +25,7 @@ Quick configuration advice ========================== - If you want to exploit the full power of internationalization, you +If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -48,10 +48,10 @@ INSTALL Matters =============== - Some packages are "localizable" when properly installed; the -programs they contain can be made to speak your own native language. -Most such packages use GNU `gettext'. Other packages have their own -ways to internationalization, predating GNU `gettext'. +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already @@ -98,7 +98,7 @@ Using This Package ================== - As a user, if your language has been installed for this package, you +As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -140,7 +140,7 @@ Translating Teams ================= - For the Free Translation Project to be a success, we need interested +For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -170,230 +170,515 @@ Available Packages ================== - Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of July -2002. The matrix shows, in regard of each package, for which languages +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of December +2003. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files be bg ca cs da de el en eo es et fi fr - +----------------------------------------+ - a2ps | [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] [] | - clisp | [] [] [] [] | - clisp | | - clisplow | | - cpio | [] [] [] [] | - darkstat | () | - diffutils | [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] [] | - fetchmail | [] () [] [] [] () | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - gas | [] [] | - gawk | [] [] [] | - gcal | [] [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gnupg | [] [] [] [] [] [] [] | - gprof | [] [] | - gpsdrive | () () () () () | - grep | [] [] [] [] [] [] [] | - gretl | [] | - gthumb | () () () | - hello | [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | () [] [] [] | - jwhois | [] [] | - kbd | [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] [] [] | - libiconv | [] [] [] [] | - lifelines | () () | - lilypond | [] [] [] | - lingoteach | [] [] | - lingoteach_lessons| () () | - lynx | [] [] [] [] [] | - m4 | [] [] [] [] [] | - make | [] [] [] [] | - man-db | [] () () [] () () | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] () [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] | - sharutils | [] [] [] [] [] [] | - sketch | () [] () | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] [] | - textutils | [] [] [] [] [] | - util-linux | [] [] [] [] [] [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] [] [] | - +----------------------------------------+ - be bg ca cs da de el en eo es et fi fr - 0 2 19 10 30 44 9 1 12 45 16 3 53 + Ready PO files am az be bg ca cs da de el en en_GB eo es + +-------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | | + ap-utils | | + bash | [] [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] | + clisp | | + clisp | [] [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | [] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + fslint | | + gas | [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] | + gnubiff | [] | + gnucash | [] () [] [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] | + gpsdrive | () () () | + gramadoir | [] | + grep | [] [] [] [] [] [] | + gretl | [] | + gtick | () | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + jpilot | [] [] [] | + jtag | | + jwhois | [] | + kbd | [] [] [] [] [] | + latrine | () | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | | + sharutils | [] [] [] [] [] [] | + silky | () | + skencil | [] () [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] [] | + tin | () () | + tuxpaint | [] [] [] [] [] [] [] | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] | + xchat | [] [] [] [] | + xfree86_xkb_xml | [] | + xpad | [] | + +-------------------------------------------+ + am az be bg ca cs da de el en en_GB eo es + 0 0 8 3 37 38 56 73 15 1 5 12 64 + + et fa fi fr ga gl he hr hu id is it ja + +----------------------------------------+ + a2ps | [] [] [] () | + aegis | | + ant-phone | | + anubis | [] | + ap-utils | [] | + bash | [] [] | + batchelor | [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] [] | + clisp | | + clisp | [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] | + flex | [] [] | + fslint | | + gas | [] | + gawk | [] [] [] | + gbiff | | + gcal | [] | + gcc | [] | + gettext | [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnubiff | | + gnucash | () [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] [] [] | + gpe-clock | [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () [] () () | + gramadoir | [] | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] | + gtick | [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] | + jpilot | [] () | + jtag | | + jwhois | [] [] [] [] | + kbd | [] | + latrine | | + ld | [] | + libc | [] [] [] [] [] | + libgpewidget | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] | + man-db | () () | + minicom | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | | + screem | | + scrollkeeper | [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] | + sharutils | [] [] [] [] [] | + silky | [] () | + skencil | [] | + sketch | [] | + soundtracker | [] [] [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] | + tin | [] () | + tuxpaint | [] [] [] [] [] [] [] [] | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | | + xpad | [] | + +----------------------------------------+ + et fa fi fr ga gl he hr hu id is it ja + 21 1 25 86 24 24 8 10 38 31 1 23 32 - gl he hr hu id it ja ko lv nb nl nn - +-------------------------------------+ - a2ps | () () [] | - bash | [] | - bfd | [] | - binutils | [] | - bison | [] [] [] [] | - clisp | [] | - clisp | | - clisplow | | - cpio | [] [] [] [] | - darkstat | () | - diffutils | [] [] [] [] [] | - enscript | [] [] | - error | [] | - fetchmail | [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] [] | - flex | [] | - gas | | - gawk | [] | - gcal | | - gcc | [] | - gettext | [] [] | - gnupg | [] [] [] [] | - gprof | | - gpsdrive | [] () () | - grep | [] [] [] [] [] [] [] | - gretl | | - gthumb | () () | - hello | [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - jpilot | () () | - jwhois | [] [] | - kbd | | - ld | | - libc | [] [] [] [] | - libiconv | [] [] [] | - lifelines | | - lilypond | [] [] | - lingoteach | [] | - lingoteach_lessons| | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - make | [] [] [] [] [] [] | - man-db | () () | - mysecretdiary | [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] | - ptx | [] [] [] [] [] | - python | | - recode | [] [] [] | - sed | [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - sharutils | [] [] [] | - sketch | () | - soundtracker | [] [] | - sp | | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - util-linux | () [] | - vorbis-tools | | - wastesedge | | - wdiff | [] [] [] | - wget | [] [] [] [] [] [] | - +-------------------------------------+ - gl he hr hu id it ja ko lv nb nl nn - 23 9 12 18 14 13 26 9 1 8 19 4 + ko lg lt lv ms nb nl nn no pl pt pt_BR ro + +-------------------------------------------+ + a2ps | () [] [] () () [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] [] [] | + ap-utils | [] () [] | + bash | [] [] | + batchelor | [] | + bfd | [] | + binutils | | + bison | [] [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] | + coreutils | [] | + cpio | [] [] [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] [] | + e2fsprogs | [] | + enscript | [] [] [] | + error | [] [] [] | + fetchmail | [] [] () | + fileutils | [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + fslint | [] [] | + gas | | + gawk | [] [] [] | + gbiff | [] [] | + gcal | | + gcc | | + gettext | [] [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] | + gliv | [] [] [] | + glunarclock | [] [] [] | + gnubiff | | + gnucash | [] [] () | + gnucash-glossary | [] [] | + gnupg | [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] | + gpe-calendar | [] [] [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] [] | + gpe-go | [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] | + gprof | [] [] | + gpsdrive | () () () [] | + gramadoir | [] | + grep | [] [] [] [] | + gretl | | + gtick | [] [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] [] [] [] | + kbd | [] [] [] | + latrine | [] | + ld | | + libc | [] [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] | + lifelines | | + lilypond | | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] [] | + man-db | [] | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] | + sed | [] [] [] | + sh-utils | [] | + shared-mime-info | [] | + sharutils | [] | + silky | | + skencil | [] [] | + sketch | [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] | + tin | | + tuxpaint | [] [] [] [] [] [] [] [] [] | + util-linux | [] [] | + vorbis-tools | [] [] | + wastesedge | | + wdiff | [] [] [] [] | + wget | [] [] | + xchat | [] [] | + xfree86_xkb_xml | [] | + xpad | [] [] | + +-------------------------------------------+ + ko lg lt lv ms nb nl nn no pl pt pt_BR ro + 12 0 1 2 12 10 60 4 4 38 25 35 76 - no pl pt pt_BR ru sk sl sv tr uk zh_TW - +----------------------------------------+ - a2ps | () () () [] [] [] [] [] | 10 - bash | [] | 6 - bfd | [] [] | 5 - binutils | [] [] | 5 - bison | [] [] [] | 11 - clisp | | 5 - clisp | | 0 - clisplow | | 0 - cpio | [] [] [] [] | 12 - darkstat | [] () | 1 - diffutils | [] [] [] [] [] [] | 17 - enscript | [] [] [] [] | 8 - error | [] [] [] | 7 - fetchmail | () () [] | 6 - fileutils | [] [] [] [] [] | 13 - findutils | [] [] [] [] [] [] [] | 21 - flex | [] [] [] | 9 - gas | [] | 3 - gawk | [] [] | 6 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] [] | 13 - gnupg | [] [] [] | 14 - gprof | [] [] | 4 - gpsdrive | [] [] () | 3 - grep | [] [] [] [] | 18 - gretl | | 1 - gthumb | () () [] | 1 - hello | [] [] [] [] [] [] [] | 28 - id-utils | [] [] [] [] | 9 - indent | [] [] [] [] [] | 14 - jpilot | () () [] | 4 - jwhois | [] () () [] [] | 7 - kbd | [] [] | 5 - ld | [] [] | 4 - libc | [] [] [] [] [] [] | 17 - libiconv | [] [] [] [] | 11 - lifelines | [] | 1 - lilypond | [] | 6 - lingoteach | [] [] | 5 - lingoteach_lessons| | 0 - lynx | [] [] [] [] | 13 - m4 | [] [] [] | 12 - make | [] [] [] [] | 14 - man-db | | 3 - mysecretdiary | [] [] [] | 7 - nano | [] [] [] [] | 15 - nano_1_0 | [] [] [] [] | 14 - opcodes | [] [] | 7 - parted | [] [] [] | 11 - ptx | [] [] [] [] [] [] [] | 19 - python | | 0 - recode | [] [] [] [] [] [] | 15 - sed | [] [] [] [] [] [] | 23 - sh-utils | [] | 8 - sharutils | [] [] [] [] | 13 - sketch | [] () [] | 4 - soundtracker | [] | 6 - sp | | 1 - tar | [] [] [] [] [] [] [] | 18 - texinfo | [] [] | 10 - textutils | [] [] [] [] [] | 13 - util-linux | [] [] [] | 10 - vorbis-tools | [] | 2 - wastesedge | | 0 - wdiff | [] [] [] [] [] | 14 - wget | [] [] [] [] [] [] [] [] | 24 - +----------------------------------------+ - 36 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW - 67 domains 4 15 2 24 26 12 10 47 42 4 8 594 + ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + +-------------------------------------------+ + a2ps | [] [] [] [] [] | 16 + aegis | () | 0 + ant-phone | | 2 + anubis | [] [] [] | 9 + ap-utils | () | 3 + bash | [] | 9 + batchelor | | 2 + bfd | [] [] | 6 + binutils | [] [] [] | 7 + bison | [] [] [] | 14 + bluez-pin | [] [] [] | 13 + clisp | | 0 + clisp | | 5 + coreutils | [] [] [] [] [] | 16 + cpio | [] [] [] | 14 + darkstat | [] [] [] () () | 12 + diffutils | [] [] [] [] | 22 + e2fsprogs | [] [] | 5 + enscript | [] [] [] | 12 + error | [] [] [] | 15 + fetchmail | [] [] [] | 11 + fileutils | [] [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] [] | 29 + flex | [] [] [] | 13 + fslint | | 2 + gas | [] | 3 + gawk | [] [] | 12 + gbiff | | 3 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] [] | 16 + gettext-examples | [] [] [] [] | 11 + gettext-runtime | [] [] [] [] [] [] [] [] [] | 21 + gettext-tools | [] [] [] [] [] [] | 14 + gimp-print | [] [] | 10 + gliv | | 3 + glunarclock | [] [] [] [] | 13 + gnubiff | | 1 + gnucash | [] [] [] | 9 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 17 + gpe-aerial | [] [] | 7 + gpe-beam | [] [] | 8 + gpe-calendar | [] [] [] [] [] | 13 + gpe-clock | [] [] [] [] | 10 + gpe-conf | [] [] [] | 9 + gpe-contacts | [] [] [] [] | 11 + gpe-edit | [] [] [] [] [] [] | 12 + gpe-go | [] | 5 + gpe-login | [] [] [] [] [] [] | 13 + gpe-ownerinfo | [] [] [] [] [] | 13 + gpe-sketchbook | [] [] [] | 9 + gpe-su | [] [] [] [] | 10 + gpe-taskmanager | [] [] [] [] | 10 + gpe-timesheet | [] [] [] [] [] | 12 + gpe-today | [] [] [] [] [] [] | 13 + gpe-todo | [] [] [] [] [] | 12 + gphoto2 | [] [] [] | 11 + gprof | [] [] | 9 + gpsdrive | [] [] | 4 + gramadoir | | 3 + grep | [] [] [] [] [] | 26 + gretl | | 2 + gtick | [] | 5 + hello | [] [] [] [] [] | 33 + id-utils | [] [] [] | 12 + indent | [] [] [] [] [] | 21 + jpilot | [] [] [] [] [] | 9 + jtag | [] | 1 + jwhois | () () [] [] | 11 + kbd | [] [] | 11 + latrine | | 1 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | [] [] [] [] | 13 + libiconv | [] [] [] [] [] [] [] [] [] | 27 + lifelines | [] | 2 + lilypond | [] | 3 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] [] | 14 + m4 | [] [] [] | 15 + mailutils | [] | 5 + make | [] [] [] [] | 16 + man-db | [] | 5 + minicom | [] | 11 + mysecretdiary | [] [] | 10 + nano | [] [] [] [] [] | 17 + nano_1_0 | [] [] [] [] | 17 + opcodes | [] [] | 6 + parted | [] [] [] | 15 + ptx | [] [] [] | 22 + python | | 0 + radius | [] | 4 + recode | [] [] [] [] | 20 + rpm | [] [] [] | 7 + screem | [] [] | 2 + scrollkeeper | [] [] [] [] | 15 + sed | [] [] [] [] [] [] | 23 + sh-utils | [] [] [] | 14 + shared-mime-info | [] [] | 4 + sharutils | [] [] [] [] [] | 17 + silky | () | 2 + skencil | [] | 6 + sketch | [] | 6 + soundtracker | [] [] | 9 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] [] | 14 + textutils | [] [] [] [] [] | 16 + tin | | 1 + tuxpaint | [] [] [] [] [] | 29 + util-linux | [] [] [] | 15 + vorbis-tools | [] | 8 + wastesedge | | 0 + wdiff | [] [] [] [] | 18 + wget | [] [] [] [] [] [] [] [] | 23 + xchat | [] [] [] [] [] | 14 + xfree86_xkb_xml | [] [] [] [] [] [] | 8 + xpad | | 4 + +-------------------------------------------+ + 51 teams ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW + 120 domains 59 42 16 25 81 0 56 12 1 10 21 22 1260 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -406,15 +691,15 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If July 2002 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at + If December 2003 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. Using `gettext' in new packages =============================== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 2 19:18:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4781416A4D0; Fri, 2 Jul 2004 19:18:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E607316A4CF for ; Fri, 2 Jul 2004 19:18:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C652443D46 for ; Fri, 2 Jul 2004 19:18:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i62JGjRe038382 for ; Fri, 2 Jul 2004 19:16:45 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i62JGieJ038379 for perforce@freebsd.org; Fri, 2 Jul 2004 19:16:44 GMT (envelope-from jhb@freebsd.org) Date: Fri, 2 Jul 2004 19:16:44 GMT Message-Id: <200407021916.i62JGieJ038379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 19:18:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=56321 Change 56321 by jhb@jhb_slimer on 2004/07/02 19:16:11 IFC @56320 to get first preemption merge. Affected files ... .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#33 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#14 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#34 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#53 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#16 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#41 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#91 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#59 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#27 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#66 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#13 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#37 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#37 integrate .. //depot/projects/smpng/sys/net/if_tun.c#34 integrate .. //depot/projects/smpng/sys/pci/if_de.c#17 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#50 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#43 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#46 integrate .. //depot/projects/smpng/sys/sys/proc.h#117 integrate .. //depot/projects/smpng/sys/sys/sched.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.119 2004/06/18 14:36:24 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.120 2004/07/02 15:31:44 netchild Exp $"); #include #include @@ -1799,6 +1799,10 @@ args->cmd = SNDCTL_DSP_GETOPTR; return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_SETDUPLEX: + args->cmd = SNDCTL_DSP_SETDUPLEX; + return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_GETODELAY: args->cmd = SNDCTL_DSP_GETODELAY; return (ioctl(td, (struct ioctl_args *)args)); ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#10 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_ioctl.h,v 1.20 2004/06/18 14:36:24 bms Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -254,6 +254,7 @@ #define LINUX_SNDCTL_DSP_SETTRIGGER LINUX_SNDCTL_DSP_GETTRIGGER #define LINUX_SNDCTL_DSP_GETIPTR 0x5011 #define LINUX_SNDCTL_DSP_GETOPTR 0x5012 +#define LINUX_SNDCTL_DSP_SETDUPLEX 0x5016 #define LINUX_SNDCTL_DSP_GETODELAY 0x5017 #define LINUX_SNDCTL_SEQ_RESET 0x5100 #define LINUX_SNDCTL_SEQ_SYNC 0x5101 ==== //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#10 (text+ko) ==== @@ -1,4 +1,51 @@ ---------------------------------------- +27 May 2004. Summary of changes for version 20040527: + +1) ACPI CA Core Subsystem: + +Completed a new design and implementation for EBDA (Extended BIOS +Data Area) support in the RSDP scan code. The original code +improperly scanned for the EBDA by simply scanning from memory +location 0 to 0x400. The correct method is to first obtain the +EBDA pointer from within the BIOS data area, then scan 1K of +memory starting at the EBDA pointer. There appear to be few if +any machines that place the RSDP in the EBDA, however. + +Integrated a fix for a possible fault during evaluation of +BufferField arguments. Obsolete code that was causing the +problem was removed. + +Found and fixed a problem in the Field Support Code where data +could be corrupted on a bit field read that starts on an aligned +boundary but does not end on an aligned boundary. Merged the +read/write "datum length" calculation code into a common +procedure. + +Rolled in a couple of changes to the FreeBSD-specific header. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release: + Non-Debug Version: 77.6K Code, 11.5K Data, 89.1K Total + Debug Version: 163.2K Code, 67.2K Data, 230.4K Total + Current Release: + Non-Debug Version: 77.7K Code, 11.5K Data, 89.2K Total + Debug Version: 163.3K Code, 67.2K Data, 230.5K Total + + +2) iASL Compiler/Disassembler: + +Fixed a generation warning produced by some overly-verbose +compilers for a 64-bit constant. + +---------------------------------------- 14 May 2004. Summary of changes for version 20040514: 1) ACPI CA Core Subsystem: ==== //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#22 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 156 $ + * $Revision: 158 $ * *****************************************************************************/ @@ -137,7 +137,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040514 +#define ACPI_CA_VERSION 0x20040527 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, @@ -151,7 +151,7 @@ /* Maximum objects in the various object caches */ -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects */ #define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ #define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ #define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ @@ -235,10 +235,11 @@ /* Constants used in searching for the RSDP in low memory */ -#define ACPI_LO_RSDP_WINDOW_BASE 0 /* Physical Address */ -#define ACPI_HI_RSDP_WINDOW_BASE 0xE0000 /* Physical Address */ -#define ACPI_LO_RSDP_WINDOW_SIZE 0x400 -#define ACPI_HI_RSDP_WINDOW_SIZE 0x20000 +#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */ +#define ACPI_EBDA_PTR_LENGTH 2 +#define ACPI_EBDA_WINDOW_SIZE 1024 +#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */ +#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000 #define ACPI_RSDP_SCAN_STEP 16 /* Operation regions */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#15 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 15 $ + * $Revision: 17 $ * *****************************************************************************/ @@ -156,6 +156,7 @@ /* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() + #if __STDC_HOSTED__ #include #endif ==== //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#15 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acinterp.h - Interpreter subcomponent prototypes and defines - * $Revision: 148 $ + * $Revision: 149 $ * *****************************************************************************/ @@ -191,6 +191,12 @@ */ ACPI_STATUS +AcpiExCommonBufferSetup ( + ACPI_OPERAND_OBJECT *ObjDesc, + UINT32 BufferLength, + UINT32 *DatumCount); + +ACPI_STATUS AcpiExExtractFromField ( ACPI_OPERAND_OBJECT *ObjDesc, void *Buffer, ==== //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#19 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 150 $ + * $Revision: 151 $ * *****************************************************************************/ @@ -126,6 +126,9 @@ #define ACPI_LOBYTE(l) ((UINT8)(UINT16)(l)) #define ACPI_HIBYTE(l) ((UINT8)((((UINT16)(l)) >> 8) & 0xFF)) +#define ACPI_SET_BIT(target,bit) ((target) |= (bit)) +#define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit)) + #if ACPI_MACHINE_WIDTH == 16 ==== //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 (text+ko) ==== @@ -2252,7 +2252,7 @@ ConstExprTerm : PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);} | PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);} - | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, 0xFFFFFFFFFFFFFFFFull);} + | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_INTEGER_MAX);} ; /* OptionalCount must appear before ByteList or an incorrect reduction will result */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#19 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 112 $ + * $Revision: 113 $ * ******************************************************************************/ @@ -161,6 +161,9 @@ AcpiDbSleep ( char *ObjectArg) { +#if ACPI_MACHINE_WIDTH == 16 + return (AE_OK); +#else ACPI_STATUS Status; UINT8 SleepState; @@ -185,6 +188,7 @@ Status = AcpiLeaveSleepState (SleepState); return (Status); +#endif } ==== //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#19 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 105 $ + * $Revision: 106 $ * ******************************************************************************/ @@ -824,8 +824,8 @@ (GpeBlock->RegisterCount * 8) -1); AcpiOsPrintf (" RegisterInfo: %p Status %8.8X%8.8X Enable %8.8X%8.8X\n", GpeBlock->RegisterInfo, - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->EnableAddress.Address))); AcpiOsPrintf (" EventInfo: %p\n", GpeBlock->EventInfo); /* Examine each GPE Register within the block */ @@ -838,8 +838,8 @@ " Reg %u: WakeEnable %2.2X, RunEnable %2.2X Status %8.8X%8.8X Enable %8.8X%8.8X\n", i, GpeRegisterInfo->EnableForWake, GpeRegisterInfo->EnableForRun, - ACPI_FORMAT_UINT64 (GpeRegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeRegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->EnableAddress.Address))); /* Now look at the individual GPEs in this byte register */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#18 (text+ko) ==== @@ -2,7 +2,7 @@ * * Module Name: dsopcode - Dispatcher Op Region support and handling of * "control" opcodes - * $Revision: 94 $ + * $Revision: 95 $ * *****************************************************************************/ @@ -153,7 +153,6 @@ ACPI_STATUS Status; ACPI_PARSE_OBJECT *Op; ACPI_WALK_STATE *WalkState; - ACPI_PARSE_OBJECT *Arg; ACPI_FUNCTION_TRACE ("DsExecuteArguments"); @@ -204,9 +203,7 @@ /* Get and init the Op created above */ - Arg = Op->Common.Value.Arg; Op->Common.Node = Node; - Arg->Common.Node = Node; AcpiPsDeleteParseTree (Op); /* Evaluate the deferred arguments */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evgpe - General Purpose Event handling and dispatch - * $Revision: 40 $ + * $Revision: 42 $ * *****************************************************************************/ @@ -206,28 +206,28 @@ if (Type == ACPI_GPE_DISABLE) { - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); return_ACPI_STATUS (AE_OK); } - /* 2) Enable case. Set the appropriate enable bits */ + /* 2) Enable case. Set/Clear the appropriate enable bits */ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_RUNTIME: - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; default: @@ -274,17 +274,19 @@ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); /*lint -fallthrough */ case ACPI_GPE_TYPE_RUNTIME: - GpeEventInfo->Flags |= ACPI_GPE_RUN_ENABLED; + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_RUN_ENABLED); if (WriteToHardware) { @@ -350,11 +352,11 @@ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeEventInfo->Flags &= ~ACPI_GPE_WAKE_ENABLED; + ACPI_CLEAR_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeEventInfo->Flags &= ~ACPI_GPE_WAKE_ENABLED; + ACPI_CLEAR_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); /*lint -fallthrough */ @@ -362,7 +364,7 @@ /* Disable the requested runtime GPE */ - GpeEventInfo->Flags &= ~ACPI_GPE_RUN_ENABLED; + ACPI_CLEAR_BIT (GpeEventInfo->Flags, ACPI_GPE_RUN_ENABLED); Status = AcpiHwWriteGpeEnableReg (GpeEventInfo); break; @@ -721,11 +723,11 @@ if (AcpiGbl_SystemAwakeAndRunning) { - GpeEventInfo->Flags |= ACPI_GPE_SYSTEM_RUNNING; + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_SYSTEM_RUNNING); } else { - GpeEventInfo->Flags &= ~ACPI_GPE_SYSTEM_RUNNING; + ACPI_CLEAR_BIT (GpeEventInfo->Flags, ACPI_GPE_SYSTEM_RUNNING); } /* @@ -739,9 +741,11 @@ { case ACPI_GPE_DISPATCH_HANDLER: - /* Invoke the installed handler (at interrupt level) */ - - GpeEventInfo->Dispatch.Handler->Address ((void *) + /* + * Invoke the installed handler (at interrupt level) + * Ignore return status for now. TBD: leave GPE disabled on error? + */ + (void) GpeEventInfo->Dispatch.Handler->Address ( GpeEventInfo->Dispatch.Handler->Context); /* It is now safe to clear level-triggered events. */ ==== //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#7 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evgpeblk - GPE block creation and initialization. - * $Revision: 34 $ + * $Revision: 36 $ * *****************************************************************************/ @@ -1102,8 +1102,8 @@ /* Dump info about this GPE block */ ACPI_DEBUG_PRINT ((ACPI_DB_INIT, - "GPE %02d to %02d [%4.4s] %d regs at %8.8X%8.8X on int %d\n", - GpeBlock->BlockBaseNumber, + "GPE %02X to %02X [%4.4s] %u regs at %8.8X%8.8X on int 0x%X\n", + (UINT32) GpeBlock->BlockBaseNumber, (UINT32) (GpeBlock->BlockBaseNumber + ((GpeBlock->RegisterCount * ACPI_GPE_REGISTER_WIDTH) -1)), GpeDevice->Name.Ascii, ==== //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#17 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: exconfig - Namespace reconfiguration (Load/Unload opcodes) - * $Revision: 77 $ + * $Revision: 78 $ * *****************************************************************************/ @@ -415,7 +415,7 @@ for (i = 0; i < 8; i++) { Status = AcpiEvAddressSpaceDispatch (ObjDesc, ACPI_READ, - (ACPI_PHYSICAL_ADDRESS) i + Address, 8, + (ACPI_PHYSICAL_ADDRESS) (i + Address), 8, ((UINT8 *) &TableHeader) + i); if (ACPI_FAILURE (Status)) { @@ -443,7 +443,7 @@ for (i = 0; i < TableHeader.Length; i++) { Status = AcpiEvAddressSpaceDispatch (ObjDesc, ACPI_READ, - (ACPI_PHYSICAL_ADDRESS) i + Address, 8, + (ACPI_PHYSICAL_ADDRESS) (i + Address), 8, ((UINT8 *) TablePtr + i)); if (ACPI_FAILURE (Status)) { ==== //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#18 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: exfldio - Aml Field I/O - * $Revision: 104 $ + * $Revision: 106 $ * *****************************************************************************/ @@ -865,14 +865,84 @@ /******************************************************************************* * + * FUNCTION: AcpiExCommonBufferSetup + * + * PARAMETERS: ObjDesc - Field object + * BufferLength - Length of caller's buffer + * DatumCount - Where the DatumCount is returned + * + * RETURN: Status, DatumCount + * + * DESCRIPTION: Common code to validate the incoming buffer size and compute + * the number of field "datums" that must be read or written. + * A "datum" is the smallest unit that can be read or written + * to the field, it is either 1,2,4, or 8 bytes. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiExCommonBufferSetup ( + ACPI_OPERAND_OBJECT *ObjDesc, + UINT32 BufferLength, + UINT32 *DatumCount) +{ + UINT32 ByteFieldLength; + UINT32 ActualByteFieldLength; + + + ACPI_FUNCTION_TRACE ("ExCommonBufferSetup"); + + + /* + * Incoming buffer must be at least as long as the field, we do not + * allow "partial" field reads/writes. We do not care if the buffer is + * larger than the field, this typically happens when an integer is + * read/written to a field that is actually smaller than an integer. + */ + ByteFieldLength = ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->CommonField.BitLength); + if (ByteFieldLength > BufferLength) + { + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "Field size %X (bytes) is too large for buffer (%X)\n", + ByteFieldLength, BufferLength)); + + return_ACPI_STATUS (AE_BUFFER_OVERFLOW); + } + + /* + * Create "actual" field byte count (minimum number of bytes that + * must be read), then convert to datum count (minimum number + * of datum-sized units that must be read) + */ + ActualByteFieldLength = ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->CommonField.StartFieldBitOffset + + ObjDesc->CommonField.BitLength); + + + *DatumCount = ACPI_ROUND_UP_TO (ActualByteFieldLength, + ObjDesc->CommonField.AccessByteWidth); + + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "BufferBytes %X, ActualBytes %X, Datums %X, ByteGran %X\n", + ByteFieldLength, ActualByteFieldLength, + *DatumCount, ObjDesc->CommonField.AccessByteWidth)); + + return_ACPI_STATUS (AE_OK); +} + + +/******************************************************************************* + * * FUNCTION: AcpiExExtractFromField * - * PARAMETERS: *ObjDesc - Field to be read - * *Value - Where to store value + * PARAMETERS: ObjDesc - Field to be read + * Buffer - Where to store the field data + * BufferLength - Length of Buffer * * RETURN: Status * - * DESCRIPTION: Retrieve the value of the given field + * DESCRIPTION: Retrieve the current value of the given field * ******************************************************************************/ @@ -888,7 +958,6 @@ ACPI_INTEGER PreviousRawDatum = 0; ACPI_INTEGER ThisRawDatum = 0; ACPI_INTEGER MergedDatum = 0; - UINT32 ByteFieldLength; UINT32 DatumCount; UINT32 i; @@ -896,41 +965,14 @@ ACPI_FUNCTION_TRACE ("ExExtractFromField"); - /* - * The field must fit within the caller's buffer - */ - ByteFieldLength = ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); - if (ByteFieldLength > BufferLength) - { - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, - "Field size %X (bytes) too large for buffer (%X)\n", - ByteFieldLength, BufferLength)); + /* Validate buffer, compute number of datums */ - return_ACPI_STATUS (AE_BUFFER_OVERFLOW); - } - - /* Convert field byte count to datum count, round up if necessary */ - - DatumCount = ACPI_ROUND_UP_TO (ByteFieldLength, - ObjDesc->CommonField.AccessByteWidth); - - /* - * If the field is not aligned on a datum boundary and does not - * fit within a single datum, we must read an extra datum. - * - * We could just split the aligned and non-aligned cases since the - * aligned case is so very simple, but this would require more code. - */ - if ((ObjDesc->CommonField.EndFieldValidBits != 0) && - (!(ObjDesc->CommonField.Flags & AOPOBJ_SINGLE_DATUM))) + Status = AcpiExCommonBufferSetup (ObjDesc, BufferLength, &DatumCount); + if (ACPI_FAILURE (Status)) { - DatumCount++; + return_ACPI_STATUS (Status); } - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, - "ByteLen %X, DatumLen %X, ByteGran %X\n", - ByteFieldLength, DatumCount,ObjDesc->CommonField.AccessByteWidth)); - /* * Clear the caller's buffer (the whole buffer length as given) * This is very important, especially in the cases where the buffer @@ -1052,12 +1094,13 @@ * * FUNCTION: AcpiExInsertIntoField * - * PARAMETERS: *ObjDesc - Field to be set - * Buffer - Value to store + * PARAMETERS: ObjDesc - Field to be written + * Buffer - Data to be written + * BufferLength - Length of Buffer * * RETURN: Status * - * DESCRIPTION: Store the value into the given field + * DESCRIPTION: Store the Buffer contents into the given field * ******************************************************************************/ @@ -1074,43 +1117,20 @@ ACPI_INTEGER MergedDatum; ACPI_INTEGER PreviousRawDatum; ACPI_INTEGER ThisRawDatum; - UINT32 ByteFieldLength; UINT32 DatumCount; ACPI_FUNCTION_TRACE ("ExInsertIntoField"); - /* - * Incoming buffer must be at least as long as the field, we do not - * allow "partial" field writes. We do not care if the buffer is - * larger than the field, this typically happens when an integer is - * written to a field that is actually smaller than an integer. - */ - ByteFieldLength = ACPI_ROUND_BITS_UP_TO_BYTES ( - ObjDesc->CommonField.BitLength); - if (BufferLength < ByteFieldLength) + /* Validate buffer, compute number of datums */ + + Status = AcpiExCommonBufferSetup (ObjDesc, BufferLength, &DatumCount); + if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, - "Buffer length %X too small for field %X\n", - BufferLength, ByteFieldLength)); - - return_ACPI_STATUS (AE_BUFFER_OVERFLOW); + return_ACPI_STATUS (Status); } - ByteFieldLength = ACPI_ROUND_BITS_UP_TO_BYTES ( - ObjDesc->CommonField.StartFieldBitOffset + - ObjDesc->CommonField.BitLength); - - /* Convert byte count to datum count, round up if necessary */ - - DatumCount = ACPI_ROUND_UP_TO (ByteFieldLength, - ObjDesc->CommonField.AccessByteWidth); - - ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, - "Bytes %X, Datums %X, ByteGran %X\n", - ByteFieldLength, DatumCount, ObjDesc->CommonField.AccessByteWidth)); - /* * Break the request into up to three parts (similar to an I/O request): * 1) non-aligned part at start ==== //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#14 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: tbxfroot - Find the root ACPI table (RSDT) - * $Revision: 72 $ + * $Revision: 73 $ * *****************************************************************************/ @@ -486,14 +486,17 @@ * Flags - Current memory mode (logical vs. * physical addressing) * - * RETURN: Status + * RETURN: Status, RSDP physical address * * DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor * pointer structure. If it is found, set *RSDP to point to it. * - * NOTE: The RSDP must be either in the first 1K of the Extended - * BIOS Data Area or between E0000 and FFFFF (ACPI 1.0 section - * 5.2.2; assertion #421). + * NOTE1: The RSDP must be either in the first 1K of the Extended + * BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.) + * Only a 32-bit physical address is necessary. + * + * NOTE2: This function is always available, regardless of the + * initialization state of the rest of ACPI. * ******************************************************************************/ @@ -504,8 +507,8 @@ { UINT8 *TablePtr; UINT8 *MemRover; - UINT64 PhysAddr; - ACPI_STATUS Status = AE_OK; + UINT32 PhysicalAddress; + ACPI_STATUS Status; ACPI_FUNCTION_TRACE ("TbFindRsdp"); @@ -517,39 +520,62 @@ if ((Flags & ACPI_MEMORY_MODE) == ACPI_LOGICAL_ADDRESSING) { /* - * 1) Search EBDA (low memory) paragraphs + * 1a) Get the location of the EBDA */ - Status = AcpiOsMapMemory ((UINT64) ACPI_LO_RSDP_WINDOW_BASE, ACPI_LO_RSDP_WINDOW_SIZE, + Status = AcpiOsMapMemory ((ACPI_PHYSICAL_ADDRESS) ACPI_EBDA_PTR_LOCATION, + ACPI_EBDA_PTR_LENGTH, (void *) &TablePtr); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %X for length %X\n", - ACPI_LO_RSDP_WINDOW_BASE, ACPI_LO_RSDP_WINDOW_SIZE)); + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", + ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH)); return_ACPI_STATUS (Status); } - MemRover = AcpiTbScanMemoryForRsdp (TablePtr, ACPI_LO_RSDP_WINDOW_SIZE); - AcpiOsUnmapMemory (TablePtr, ACPI_LO_RSDP_WINDOW_SIZE); + ACPI_MOVE_16_TO_32 (&PhysicalAddress, TablePtr); + PhysicalAddress <<= 4; /* Convert segment to physical address */ + AcpiOsUnmapMemory (TablePtr, ACPI_EBDA_PTR_LENGTH); + + /* EBDA present? */ - if (MemRover) + if (PhysicalAddress > 0x400) { - /* Found it, return the physical address */ + /* + * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of 1K length) + */ + Status = AcpiOsMapMemory ((ACPI_PHYSICAL_ADDRESS) PhysicalAddress, + ACPI_EBDA_WINDOW_SIZE, + (void *) &TablePtr); + if (ACPI_FAILURE (Status)) + { + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", + PhysicalAddress, ACPI_EBDA_WINDOW_SIZE)); + return_ACPI_STATUS (Status); + } + + MemRover = AcpiTbScanMemoryForRsdp (TablePtr, ACPI_EBDA_WINDOW_SIZE); + AcpiOsUnmapMemory (TablePtr, ACPI_EBDA_WINDOW_SIZE); + + if (MemRover) + { + /* Found it, return the physical address */ - PhysAddr = ACPI_LO_RSDP_WINDOW_BASE; - PhysAddr += ACPI_PTR_DIFF (MemRover,TablePtr); + PhysicalAddress += ACPI_PTR_DIFF (MemRover, TablePtr); - TableInfo->PhysicalAddress = PhysAddr; - return_ACPI_STATUS (AE_OK); + TableInfo->PhysicalAddress = (ACPI_PHYSICAL_ADDRESS) PhysicalAddress; + return_ACPI_STATUS (AE_OK); + } } /* - * 2) Search upper memory: 16-byte boundaries in E0000h-F0000h + * 2) Search upper memory: 16-byte boundaries in E0000h-FFFFFh */ - Status = AcpiOsMapMemory ((UINT64) ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE, + Status = AcpiOsMapMemory ((ACPI_PHYSICAL_ADDRESS) ACPI_HI_RSDP_WINDOW_BASE, + ACPI_HI_RSDP_WINDOW_SIZE, (void *) &TablePtr); if (ACPI_FAILURE (Status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %X for length %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE)); return_ACPI_STATUS (Status); } @@ -561,10 +587,9 @@ { /* Found it, return the physical address */ - PhysAddr = ACPI_HI_RSDP_WINDOW_BASE; - PhysAddr += ACPI_PTR_DIFF (MemRover, TablePtr); + PhysicalAddress = ACPI_HI_RSDP_WINDOW_BASE + ACPI_PTR_DIFF (MemRover, TablePtr); - TableInfo->PhysicalAddress = PhysAddr; + TableInfo->PhysicalAddress = (ACPI_PHYSICAL_ADDRESS) PhysicalAddress; return_ACPI_STATUS (AE_OK); } } @@ -575,20 +600,31 @@ else { /* - * 1) Search EBDA (low memory) paragraphs + * 1a) Get the location of the EBDA */ - MemRover = AcpiTbScanMemoryForRsdp (ACPI_PHYSADDR_TO_PTR (ACPI_LO_RSDP_WINDOW_BASE), - ACPI_LO_RSDP_WINDOW_SIZE); - if (MemRover) + ACPI_MOVE_16_TO_32 (&PhysicalAddress, ACPI_EBDA_PTR_LOCATION); + PhysicalAddress <<= 4; /* Convert segment to physical address */ + + /* EBDA present? */ + + if (PhysicalAddress > 0x400) { - /* Found it, return the physical address */ + /* + * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of 1K length) + */ + MemRover = AcpiTbScanMemoryForRsdp (ACPI_PHYSADDR_TO_PTR (PhysicalAddress), + ACPI_EBDA_WINDOW_SIZE); + if (MemRover) + { + /* Found it, return the physical address */ - TableInfo->PhysicalAddress = ACPI_TO_INTEGER (MemRover); - return_ACPI_STATUS (AE_OK); + TableInfo->PhysicalAddress = ACPI_TO_INTEGER (MemRover); + return_ACPI_STATUS (AE_OK); + } } /* - * 2) Search upper memory: 16-byte boundaries in E0000h-F0000h + * 2) Search upper memory: 16-byte boundaries in E0000h-FFFFFh */ MemRover = AcpiTbScanMemoryForRsdp (ACPI_PHYSADDR_TO_PTR (ACPI_HI_RSDP_WINDOW_BASE), ACPI_HI_RSDP_WINDOW_SIZE); ==== //depot/projects/smpng/sys/dev/bfe/if_bfe.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.13 2004/05/30 20:08:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.14 2004/07/02 12:16:01 mlaier Exp $"); #include #include @@ -402,7 +402,9 @@ ifp->if_init = bfe_init; ifp->if_mtu = ETHERMTU; ifp->if_baudrate = 100000000; - ifp->if_snd.ifq_maxlen = BFE_TX_QLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, BFE_TX_QLEN); + ifp->if_snd.ifq_drv_maxlen = BFE_TX_QLEN; + IFQ_SET_READY(&ifp->if_snd); bfe_get_config(sc); @@ -1256,7 +1258,7 @@ bfe_txeof(sc); /* We have packets pending, fire them out */ - if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) + if (ifp->if_flags & IFF_RUNNING && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) bfe_start(ifp); BFE_UNLOCK(sc); @@ -1375,7 +1377,7 @@ } while(sc->bfe_tx_ring[idx].bfe_mbuf == NULL) { - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if(m_head == NULL) break; @@ -1384,7 +1386,7 @@ * enough room, let the chip drain the ring. */ if(bfe_encap(sc, m_head, &idx)) { - IF_PREPEND(&ifp->if_snd, m_head); + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_flags |= IFF_OACTIVE; break; } ==== //depot/projects/smpng/sys/dev/em/if_em.c#34 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 2 20:07:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47C1016A4D0; Fri, 2 Jul 2004 20:07:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2107516A4CE for ; Fri, 2 Jul 2004 20:07:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17AFC43D31 for ; Fri, 2 Jul 2004 20:07:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i62K5opY040766 for ; Fri, 2 Jul 2004 20:05:50 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i62K5oFH040763 for perforce@freebsd.org; Fri, 2 Jul 2004 20:05:50 GMT (envelope-from peter@freebsd.org) Date: Fri, 2 Jul 2004 20:05:50 GMT Message-Id: <200407022005.i62K5oFH040763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 56330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 20:07:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=56330 Change 56330 by peter@peter_work on 2004/07/02 20:04:58 IFC @56327 Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#13 integrate .. //depot/projects/hammer/sys/alpha/alpha/sgmap.c#4 integrate .. //depot/projects/hammer/sys/alpha/isa/isa.c#10 integrate .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#10 integrate .. //depot/projects/hammer/sys/alpha/pci/apecs.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/cia.c#7 integrate .. //depot/projects/hammer/sys/alpha/pci/pcibus.c#4 integrate .. //depot/projects/hammer/sys/alpha/pci/t2.c#8 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami.c#7 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#8 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#51 integrate .. //depot/projects/hammer/sys/conf/files#69 integrate .. //depot/projects/hammer/sys/conf/options#44 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#13 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#12 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#41 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#24 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#27 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#34 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#23 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#11 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#40 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#11 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#5 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label.h#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/hammer/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#45 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#34 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_rman.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#15 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#30 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#31 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/hammer/sys/net/if_tun.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#11 integrate .. //depot/projects/hammer/sys/pci/if_de.c#16 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#36 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#29 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#39 integrate .. //depot/projects/hammer/sys/sys/param.h#38 integrate .. //depot/projects/hammer/sys/sys/proc.h#55 integrate .. //depot/projects/hammer/sys/sys/resourcevar.h#9 integrate .. //depot/projects/hammer/sys/sys/rman.h#5 integrate .. //depot/projects/hammer/sys/sys/sched.h#10 integrate .. //depot/projects/hammer/sys/sys/syscall.h#30 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#30 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#30 integrate .. //depot/projects/hammer/sys/sys/thr.h#3 integrate .. //depot/projects/hammer/sys/sys/umtx.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#30 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#11 integrate Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.44 2004/03/13 15:42:59 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.45 2004/07/02 03:47:28 scottl Exp $"); #include #include @@ -66,6 +66,7 @@ int map_count; bus_dma_lock_t *lockfunc; void *lockfuncarg; + bus_dma_segment_t *segments; }; struct bounce_page { @@ -221,7 +222,9 @@ newtag->lockfunc = dflt_lock; newtag->lockfuncarg = NULL; } - + + newtag->segments = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr); @@ -290,6 +293,8 @@ parent = dmat->parent; atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { + if (dmat->segments != NULL) + free(dmat->segments, M_DEVBUF); free(dmat, M_DEVBUF); /* * Last reference count, so @@ -332,6 +337,14 @@ return (0); } + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if (dmat->lowaddr < ptoa(Maxmem)) { /* Must bounce */ int maxpages; @@ -425,6 +438,14 @@ /* If we succeed, no mapping/bouncing will be required */ *mapp = &nobounce_dmamap; + if (dmat->segments == NULL) { + dmat->segments = (bus_dma_segment_t *)malloc( + sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, + M_NOWAIT); + if (dmat->segments == NULL) + return (ENOMEM); + } + if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { @@ -477,11 +498,6 @@ { vm_offset_t vaddr; vm_offset_t paddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif bus_dma_segment_t *sg; int seg; int error; @@ -496,16 +512,16 @@ * of the bus address space. */ vaddr = trunc_page((vm_offset_t) buf); - dm_segments[0].ds_addr = + dmat->segments[0].ds_addr = map->busaddress + (vm_offset_t) buf - vaddr; - dm_segments[0].ds_len = buflen; + dmat->segments[0].ds_len = buflen; buflen = round_page((vm_offset_t) buf + buflen) - vaddr; sgmap_load_region(chipset.sgmap, map->busaddress, vaddr, buflen); map->buflen = buflen; - (*callback)(callback_arg, dm_segments, 1, error); + (*callback)(callback_arg, dmat->segments, 1, error); return (0); } @@ -560,7 +576,7 @@ } vaddr = (vm_offset_t)buf; - sg = &dm_segments[0]; + sg = &dmat->segments[0]; seg = 1; sg->ds_len = 0; @@ -604,7 +620,7 @@ error = EFBIG; } - (*callback)(callback_arg, dm_segments, seg, error); + (*callback)(callback_arg, dmat->segments, seg, error); return (0); } @@ -617,7 +633,6 @@ */ static int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, - bus_dma_segment_t segs[], void *buf, bus_size_t buflen, struct thread *td, int flags, @@ -625,12 +640,15 @@ int *segp, int first) { + bus_dma_segment_t *segs; bus_size_t sgsize; bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr = (vm_offset_t)buf; int seg; pmap_t pmap; + segs = dmat->segments; + if (td != NULL) pmap = vmspace_pmap(td->td_proc->p_vmspace); else @@ -709,11 +727,6 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error; KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL, @@ -730,7 +743,6 @@ for (m = m0; m != NULL && error == 0; m = m->m_next) { if (m->m_len > 0) { error = _bus_dmamap_load_buffer(dmat, - dm_segments, m->m_data, m->m_len, NULL, flags, &lastaddr, &nsegs, first); @@ -743,9 +755,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } return (error); @@ -761,11 +773,6 @@ int flags) { bus_addr_t lastaddr; -#ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; -#else - bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; -#endif int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; @@ -796,9 +803,7 @@ caddr_t addr = (caddr_t) iov[i].iov_base; if (minlen > 0) { - error = _bus_dmamap_load_buffer(dmat, - dm_segments, - addr, minlen, + error = _bus_dmamap_load_buffer(dmat, addr, minlen, td, flags, &lastaddr, &nsegs, first); first = 0; @@ -808,9 +813,9 @@ if (error) { /* force "no valid mappings" in callback */ - (*callback)(callback_arg, dm_segments, 0, 0, error); + (*callback)(callback_arg, dmat->segments, 0, 0, error); } else { - (*callback)(callback_arg, dm_segments, + (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } return (error); ==== //depot/projects/hammer/sys/alpha/alpha/sgmap.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.7 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/isa/isa.c#10 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#10 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.28 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.29 2004/07/01 15:07:26 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/apecs.c#8 (text+ko) ==== @@ -55,8 +55,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.25 2003/12/23 02:36:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs.c,v 1.26 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/cia.c#7 (text+ko) ==== @@ -87,10 +87,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.42 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/cia.c,v 1.43 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/pcibus.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.33 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_isa.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/t2.c#8 (text+ko) ==== @@ -51,8 +51,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.20 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/t2.c,v 1.21 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/tsunami.c#7 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.23 2003/11/17 06:10:14 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami.c,v 1.24 2004/07/01 15:07:27 gallatin Exp $"); #include "opt_cpu.h" +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/pci/tsunami_pci.c#4 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.16 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/tsunami_pci.c,v 1.17 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#8 (text+ko) ==== @@ -56,8 +56,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.26 2003/08/22 07:20:27 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.27 2004/07/01 15:07:27 gallatin Exp $"); +#define __RMAN_RESOURCE_VISIBLE #include #include #include ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.25 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.26 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.16 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.17 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.26 2004/04/14 23:17:57 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.27 2004/07/02 00:38:56 marcel Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#19 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.37 2004/04/14 23:17:37 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.38 2004/07/02 00:35:52 marcel Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -595,10 +595,10 @@ 428 UNIMPL __acl_aclcheck_link ; XXX implement 429 UNIMPL sigwait -430 MNOPROTO { int thr_create(ucontext_t *ctx, thr_id_t *id, int flag s); } +430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } 431 MNOPROTO { void thr_exit(void); } -432 MNOPROTO { int thr_self(thr_id_t *id); } -433 MNOPROTO { int thr_kill(thr_id_t id, int sig); } +432 MNOPROTO { int thr_self(long *id); } +433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } 435 MNOPROTO { int _umtx_unlock(struct umtx *umtx); } 436 MNOPROTO { int jail_attach(int jid); } @@ -608,4 +608,4 @@ 440 UNIMPL kse_switchin 441 UNIMPL ksem_timedwait 442 MNOPROTO { int thr_suspend(const struct timespec *timeout); } -443 MNOPROTO { int thr_wake(thr_id_t id); } +443 MNOPROTO { int thr_wake(long id); } ==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.119 2004/06/18 14:36:24 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.120 2004/07/02 15:31:44 netchild Exp $"); #include #include @@ -1799,6 +1799,10 @@ args->cmd = SNDCTL_DSP_GETOPTR; return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_SETDUPLEX: + args->cmd = SNDCTL_DSP_SETDUPLEX; + return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SNDCTL_DSP_GETODELAY: args->cmd = SNDCTL_DSP_GETODELAY; return (ioctl(td, (struct ioctl_args *)args)); ==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#8 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_ioctl.h,v 1.20 2004/06/18 14:36:24 bms Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.21 2004/07/02 15:31:44 netchild Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -254,6 +254,7 @@ #define LINUX_SNDCTL_DSP_SETTRIGGER LINUX_SNDCTL_DSP_GETTRIGGER #define LINUX_SNDCTL_DSP_GETIPTR 0x5011 #define LINUX_SNDCTL_DSP_GETOPTR 0x5012 +#define LINUX_SNDCTL_DSP_SETDUPLEX 0x5016 #define LINUX_SNDCTL_DSP_GETODELAY 0x5017 #define LINUX_SNDCTL_SEQ_RESET 0x5100 #define LINUX_SNDCTL_SEQ_SYNC 0x5101 ==== //depot/projects/hammer/sys/conf/NOTES#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1238 2004/06/30 01:00:59 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1239 2004/07/02 19:40:35 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -125,6 +125,7 @@ options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. options GEOM_GPT # GPT partitioning +options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_NOP # Test class. options GEOM_PC98 # NEC PC9800 partitioning ==== //depot/projects/hammer/sys/conf/files#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.921 2004/06/30 14:52:49 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.922 2004/07/02 19:40:36 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -940,6 +940,10 @@ crypto/sha2/sha2.c optional geom_bde geom/concat/g_concat.c optional geom_concat geom/gate/g_gate.c optional geom_gate +geom/label/g_label.c optional geom_label +geom/label/g_label_iso9660.c optional geom_label +geom/label/g_label_msdosfs.c optional geom_label +geom/label/g_label_ufs.c optional geom_label geom/nop/g_nop.c optional geom_nop geom/stripe/g_stripe.c optional geom_stripe geom/geom_aes.c optional geom_aes ==== //depot/projects/hammer/sys/conf/options#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.457 2004/06/29 02:30:12 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.458 2004/07/02 19:40:36 pjd Exp $ # # On the handling of kernel options # @@ -71,6 +71,7 @@ GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h GEOM_GPT opt_geom.h +GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h GEOM_NOP opt_geom.h ==== //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#10 (text+ko) ==== @@ -1,4 +1,51 @@ ---------------------------------------- +27 May 2004. Summary of changes for version 20040527: + +1) ACPI CA Core Subsystem: + +Completed a new design and implementation for EBDA (Extended BIOS +Data Area) support in the RSDP scan code. The original code +improperly scanned for the EBDA by simply scanning from memory +location 0 to 0x400. The correct method is to first obtain the +EBDA pointer from within the BIOS data area, then scan 1K of +memory starting at the EBDA pointer. There appear to be few if +any machines that place the RSDP in the EBDA, however. + +Integrated a fix for a possible fault during evaluation of +BufferField arguments. Obsolete code that was causing the +problem was removed. + +Found and fixed a problem in the Field Support Code where data +could be corrupted on a bit field read that starts on an aligned +boundary but does not end on an aligned boundary. Merged the +read/write "datum length" calculation code into a common +procedure. + +Rolled in a couple of changes to the FreeBSD-specific header. + +Code and Data Size: Current and previous core subsystem library +sizes are shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and +these values do not include any ACPI driver or OSPM code. The +debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release: + Non-Debug Version: 77.6K Code, 11.5K Data, 89.1K Total + Debug Version: 163.2K Code, 67.2K Data, 230.4K Total + Current Release: + Non-Debug Version: 77.7K Code, 11.5K Data, 89.2K Total + Debug Version: 163.3K Code, 67.2K Data, 230.5K Total + + +2) iASL Compiler/Disassembler: + +Fixed a generation warning produced by some overly-verbose +compilers for a 64-bit constant. + +---------------------------------------- 14 May 2004. Summary of changes for version 20040514: 1) ACPI CA Core Subsystem: ==== //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#12 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 156 $ + * $Revision: 158 $ * *****************************************************************************/ @@ -137,7 +137,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040514 +#define ACPI_CA_VERSION 0x20040527 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, @@ -151,7 +151,7 @@ /* Maximum objects in the various object caches */ -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects */ #define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ #define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ #define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ @@ -235,10 +235,11 @@ /* Constants used in searching for the RSDP in low memory */ -#define ACPI_LO_RSDP_WINDOW_BASE 0 /* Physical Address */ -#define ACPI_HI_RSDP_WINDOW_BASE 0xE0000 /* Physical Address */ -#define ACPI_LO_RSDP_WINDOW_SIZE 0x400 -#define ACPI_HI_RSDP_WINDOW_SIZE 0x20000 +#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */ +#define ACPI_EBDA_PTR_LENGTH 2 +#define ACPI_EBDA_WINDOW_SIZE 1024 +#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */ +#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000 #define ACPI_RSDP_SCAN_STEP 16 /* Operation regions */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#13 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 15 $ + * $Revision: 17 $ * *****************************************************************************/ @@ -156,6 +156,7 @@ /* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() + #if __STDC_HOSTED__ #include #endif ==== //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acinterp.h - Interpreter subcomponent prototypes and defines - * $Revision: 148 $ + * $Revision: 149 $ * *****************************************************************************/ @@ -191,6 +191,12 @@ */ ACPI_STATUS +AcpiExCommonBufferSetup ( + ACPI_OPERAND_OBJECT *ObjDesc, + UINT32 BufferLength, + UINT32 *DatumCount); + +ACPI_STATUS AcpiExExtractFromField ( ACPI_OPERAND_OBJECT *ObjDesc, void *Buffer, ==== //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#10 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 150 $ + * $Revision: 151 $ * *****************************************************************************/ @@ -126,6 +126,9 @@ #define ACPI_LOBYTE(l) ((UINT8)(UINT16)(l)) #define ACPI_HIBYTE(l) ((UINT8)((((UINT16)(l)) >> 8) & 0xFF)) +#define ACPI_SET_BIT(target,bit) ((target) |= (bit)) +#define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit)) + #if ACPI_MACHINE_WIDTH == 16 ==== //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 (text+ko) ==== @@ -2252,7 +2252,7 @@ ConstExprTerm : PARSEOP_ZERO {$$ = TrCreateValuedLeafNode (PARSEOP_ZERO, 0);} | PARSEOP_ONE {$$ = TrCreateValuedLeafNode (PARSEOP_ONE, 1);} - | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, 0xFFFFFFFFFFFFFFFFull);} + | PARSEOP_ONES {$$ = TrCreateValuedLeafNode (PARSEOP_ONES, ACPI_INTEGER_MAX);} ; /* OptionalCount must appear before ByteList or an incorrect reduction will result */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#12 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbcmds - debug commands and output routines - * $Revision: 112 $ + * $Revision: 113 $ * ******************************************************************************/ @@ -161,6 +161,9 @@ AcpiDbSleep ( char *ObjectArg) { +#if ACPI_MACHINE_WIDTH == 16 + return (AE_OK); +#else ACPI_STATUS Status; UINT8 SleepState; @@ -185,6 +188,7 @@ Status = AcpiLeaveSleepState (SleepState); return (Status); +#endif } ==== //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#10 (text+ko) ==== @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: dbdisply - debug display commands - * $Revision: 105 $ + * $Revision: 106 $ * ******************************************************************************/ @@ -824,8 +824,8 @@ (GpeBlock->RegisterCount * 8) -1); AcpiOsPrintf (" RegisterInfo: %p Status %8.8X%8.8X Enable %8.8X%8.8X\n", GpeBlock->RegisterInfo, - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeBlock->RegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeBlock->RegisterInfo->EnableAddress.Address))); AcpiOsPrintf (" EventInfo: %p\n", GpeBlock->EventInfo); /* Examine each GPE Register within the block */ @@ -838,8 +838,8 @@ " Reg %u: WakeEnable %2.2X, RunEnable %2.2X Status %8.8X%8.8X Enable %8.8X%8.8X\n", i, GpeRegisterInfo->EnableForWake, GpeRegisterInfo->EnableForRun, - ACPI_FORMAT_UINT64 (GpeRegisterInfo->StatusAddress.Address), - ACPI_FORMAT_UINT64 (GpeRegisterInfo->EnableAddress.Address)); + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->StatusAddress.Address)), + ACPI_FORMAT_UINT64 (ACPI_GET_ADDRESS (GpeRegisterInfo->EnableAddress.Address))); /* Now look at the individual GPEs in this byte register */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#10 (text+ko) ==== @@ -2,7 +2,7 @@ * * Module Name: dsopcode - Dispatcher Op Region support and handling of * "control" opcodes - * $Revision: 94 $ + * $Revision: 95 $ * *****************************************************************************/ @@ -153,7 +153,6 @@ ACPI_STATUS Status; ACPI_PARSE_OBJECT *Op; ACPI_WALK_STATE *WalkState; - ACPI_PARSE_OBJECT *Arg; ACPI_FUNCTION_TRACE ("DsExecuteArguments"); @@ -204,9 +203,7 @@ /* Get and init the Op created above */ - Arg = Op->Common.Value.Arg; Op->Common.Node = Node; - Arg->Common.Node = Node; AcpiPsDeleteParseTree (Op); /* Evaluate the deferred arguments */ ==== //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#8 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: evgpe - General Purpose Event handling and dispatch - * $Revision: 40 $ + * $Revision: 42 $ * *****************************************************************************/ @@ -206,28 +206,28 @@ if (Type == ACPI_GPE_DISABLE) { - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); return_ACPI_STATUS (AE_OK); } - /* 2) Enable case. Set the appropriate enable bits */ + /* 2) Enable case. Set/Clear the appropriate enable bits */ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun &= ~RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_RUNTIME: - GpeRegisterInfo->EnableForWake &= ~RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_CLEAR_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeRegisterInfo->EnableForWake |= RegisterBit; - GpeRegisterInfo->EnableForRun |= RegisterBit; + ACPI_SET_BIT (GpeRegisterInfo->EnableForWake, RegisterBit); + ACPI_SET_BIT (GpeRegisterInfo->EnableForRun, RegisterBit); break; default: @@ -274,17 +274,19 @@ switch (GpeEventInfo->Flags & ACPI_GPE_TYPE_MASK) { case ACPI_GPE_TYPE_WAKE: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); break; case ACPI_GPE_TYPE_WAKE_RUN: - GpeEventInfo->Flags |= ACPI_GPE_WAKE_ENABLED; + + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_WAKE_ENABLED); /*lint -fallthrough */ case ACPI_GPE_TYPE_RUNTIME: - GpeEventInfo->Flags |= ACPI_GPE_RUN_ENABLED; + ACPI_SET_BIT (GpeEventInfo->Flags, ACPI_GPE_RUN_ENABLED); if (WriteToHardware) { @@ -350,11 +352,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 2 20:29:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6837316A4D0; Fri, 2 Jul 2004 20:29:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 424ED16A4CE for ; Fri, 2 Jul 2004 20:29:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A36B43D53 for ; Fri, 2 Jul 2004 20:29:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i62KSJss042066 for ; Fri, 2 Jul 2004 20:28:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i62KSJN6042063 for perforce@freebsd.org; Fri, 2 Jul 2004 20:28:19 GMT (envelope-from jhb@freebsd.org) Date: Fri, 2 Jul 2004 20:28:19 GMT Message-Id: <200407022028.i62KSJN6042063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 56333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 20:29:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=56333 Change 56333 by jhb@jhb_slimer on 2004/07/02 20:28:06 IFC @56332. Loop back kernel preemption. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#28 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#9 integrate .. //depot/projects/smpng/sys/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/conf/files#113 integrate .. //depot/projects/smpng/sys/conf/options#79 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#31 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#1 branch .. //depot/projects/smpng/sys/geom/label/g_label.h#1 branch .. //depot/projects/smpng/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/smpng/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/smpng/sys/i386/include/param.h#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#72 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#28 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#32 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_ethersubr.c#50 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#21 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#13 integrate .. //depot/projects/smpng/sys/sys/proc.h#118 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#17 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.78 2004/04/16 20:09:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.79 2004/07/02 20:21:41 jhb Exp $"); #include #include @@ -455,7 +455,7 @@ * thread to the current CPU until we return from the interrupt. */ sched_pin(); - error = ithread_schedule(ithd, !cold); + error = ithread_schedule(ithd); KASSERT(error == 0, ("got an impossible stray interrupt")); sched_unpin(); } ==== //depot/projects/smpng/sys/alpha/include/param.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.33 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.34 2004/07/02 20:21:41 jhb Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -113,6 +113,8 @@ #define SSIZE 1 /* initial stack size/NBPG */ #define SINCR 1 /* increment of stack/NBPG */ +#define PREEMPTION + #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ #endif ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.6 2004/05/30 04:49:39 alc Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.7 2004/07/02 20:21:41 jhb Exp $ */ /* @@ -215,7 +215,7 @@ if (ih == NULL) error = EINVAL; else - error = ithread_schedule(it, !cold); + error = ithread_schedule(it); } if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); ==== //depot/projects/smpng/sys/amd64/include/param.h#9 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.11 2004/06/07 23:47:59 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.12 2004/07/02 20:21:41 jhb Exp $ */ /* @@ -119,6 +119,8 @@ #define NBPML4 (1ul< -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.56 2004/07/01 00:51:31 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.58 2004/07/02 20:15:53 njl Exp $"); #include "opt_acpi.h" #include @@ -367,6 +365,7 @@ acpi_ec_ecdt_probe(device_t parent) { ACPI_TABLE_ECDT *ecdt; + ACPI_TABLE_HEADER *hdr; ACPI_STATUS status; device_t child; ACPI_HANDLE h; @@ -375,8 +374,8 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* Find and validate the ECDT. */ - status = AcpiGetFirmwareTable("ECDT", 1, ACPI_LOGICAL_ADDRESSING, - (ACPI_TABLE_HEADER **)&ecdt); + status = AcpiGetFirmwareTable("ECDT", 1, ACPI_LOGICAL_ADDRESSING, &hdr); + ecdt = (ACPI_TABLE_ECDT *)hdr; if (ACPI_FAILURE(status) || ecdt->control.RegisterBitWidth != 8 || ecdt->data.RegisterBitWidth != 8) { ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.6 2004/05/28 17:50:07 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.7 2004/07/02 20:21:42 jhb Exp $ */ /* @@ -215,7 +215,7 @@ if (ih == NULL) error = EINVAL; else - error = ithread_schedule(it, !cold); + error = ithread_schedule(it); } if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); ==== //depot/projects/smpng/sys/i386/include/param.h#12 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/i386/include/param.h,v 1.70 2004/04/07 20:46:05 imp Exp $ + * $FreeBSD: src/sys/i386/include/param.h,v 1.71 2004/07/02 20:21:42 jhb Exp $ */ /* @@ -97,6 +97,8 @@ #define NBPDR (1< -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.110 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.111 2004/07/02 20:21:43 jhb Exp $"); #include "opt_ddb.h" @@ -365,7 +365,7 @@ } int -ithread_schedule(struct ithd *ithread, int do_switch) +ithread_schedule(struct ithd *ithread) { struct int_entropy entropy; struct thread *td; @@ -399,10 +399,7 @@ /* * Set it_need to tell the thread to keep running if it is already * running. Then, grab sched_lock and see if we actually need to - * put this thread on the runqueue. If so and the do_switch flag is - * true and it is safe to switch, then switch to the ithread - * immediately. Otherwise, set the needresched flag to guarantee - * that this ithread will run before any userland processes. + * put this thread on the runqueue. */ ithread->it_need = 1; mtx_lock_spin(&sched_lock); @@ -410,16 +407,6 @@ CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid); TD_CLR_IWAIT(td); setrunqueue(td); - if (do_switch && - (ctd->td_critnest == 1) ) { - KASSERT((TD_IS_RUNNING(ctd)), - ("ithread_schedule: Bad state for curthread.")); - if (ctd->td_flags & TDF_IDLETD) - ctd->td_state = TDS_CAN_RUN; /* XXXKSE */ - mi_switch(SW_INVOL, NULL); - } else { - curthread->td_flags |= TDF_NEEDRESCHED; - } } else { CTR4(KTR_INTR, "%s: pid %d: it_need %d, state %d", __func__, p->p_pid, ithread->it_need, td->td_state); @@ -480,7 +467,7 @@ */ atomic_store_rel_int(&ih->ih_need, 1); if (!(flags & SWI_DELAY)) { - error = ithread_schedule(it, !cold && !dumping); + error = ithread_schedule(it); KASSERT(error == 0, ("stray software interrupt")); } } ==== //depot/projects/smpng/sys/kern/kern_mutex.c#79 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.139 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.140 2004/07/02 20:21:43 jhb Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -621,7 +621,9 @@ _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line) { struct turnstile *ts; +#ifndef PREEMPTION struct thread *td, *td1; +#endif if (mtx_recursed(m)) { if (--(m->mtx_recurse) == 0) @@ -646,8 +648,10 @@ #else MPASS(ts != NULL); #endif +#ifndef PREEMPTION /* XXX */ td1 = turnstile_head(ts); +#endif #ifdef MUTEX_WAKE_ALL turnstile_broadcast(ts); _release_lock_quick(m); @@ -665,6 +669,7 @@ #endif turnstile_unpend(ts); +#ifndef PREEMPTION /* * XXX: This is just a hack until preemption is done. However, * once preemption is done we need to either wrap the @@ -701,6 +706,7 @@ m, (void *)m->mtx_lock); } mtx_unlock_spin(&sched_lock); +#endif return; } ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#42 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.152 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.153 2004/07/02 20:21:43 jhb Exp $"); #include "opt_ddb.h" #include "opt_ddb_trace.h" @@ -269,7 +269,9 @@ if (!cold && (howto & RB_NOSYNC) == 0 && waittime < 0) { register struct buf *bp; int iter, nbusy, pbusy; +#ifndef PREEMPTION int subiter; +#endif waittime = 0; printf("\nsyncing disks, buffers remaining... "); @@ -300,20 +302,29 @@ iter = 0; pbusy = nbusy; sync(&thread0, NULL); - if (curthread != NULL) { - DROP_GIANT(); - for (subiter = 0; subiter < 50 * iter; subiter++) { - mtx_lock_spin(&sched_lock); - /* - * Allow interrupt threads to run - */ - mi_switch(SW_VOL, NULL); - mtx_unlock_spin(&sched_lock); - DELAY(1000); - } - PICKUP_GIANT(); - } else + +#ifdef PREEMPTION + /* + * Drop Giant and spin for a while to allow + * interrupt threads to run. + */ + DROP_GIANT(); DELAY(50000 * iter); + PICKUP_GIANT(); +#else + /* + * Drop Giant and context switch several times to + * allow interrupt threads to run. + */ + DROP_GIANT(); + for (subiter = 0; subiter < 50 * iter; subiter++) { + mtx_lock_spin(&sched_lock); + mi_switch(SW_VOL, NULL); + mtx_unlock_spin(&sched_lock); + DELAY(1000); + } + PICKUP_GIANT(); +#endif } printf("\n"); /* ==== //depot/projects/smpng/sys/kern/kern_switch.c#36 (text+ko) ==== @@ -86,7 +86,9 @@ ***/ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.67 2004/02/02 08:13:27 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.68 2004/07/02 20:21:43 jhb Exp $"); + +#include "opt_full_preemption.h" #include #include @@ -423,10 +425,10 @@ } } -/************************************************************************ - * Critical section marker functions * - ************************************************************************/ -/* Critical sections that prevent preemption. */ +/* + * Kernel thread preemption implementation. Critical sections mark + * regions of code in which preemptions are not allowed. + */ void critical_enter(void) { @@ -447,6 +449,13 @@ KASSERT(td->td_critnest != 0, ("critical_exit: td_critnest == 0")); if (td->td_critnest == 1) { +#ifdef PREEMPTION + if (td->td_flags & TDF_OWEPREEMPT) { + mtx_lock_spin(&sched_lock); + mi_switch(SW_INVOL, NULL); + mtx_unlock_spin(&sched_lock); + } +#endif td->td_critnest = 0; cpu_critical_exit(); } else { @@ -454,6 +463,86 @@ } } +/* + * This function is called when a thread is about to be put on run queue + * because it has been made runnable or its priority has been adjusted. It + * determines if the new thread should be immediately preempted to. If so, + * it switches to it and eventually returns true. If not, it returns false + * so that the caller may place the thread on an appropriate run queue. + */ +int +maybe_preempt(struct thread *td) +{ + struct thread *ctd; + int cpri, pri; + + mtx_assert(&sched_lock, MA_OWNED); +#ifdef PREEMPTION + /* + * The new thread should not preempt the current thread if any of the + * following conditions are true: + * + * - The current thread has a higher (numerically lower) priority. + * - It is too early in the boot for context switches (cold is set). + * - The current thread has an inhibitor set or is in the process of + * exiting. In this case, the current thread is about to switch + * out anyways, so there's no point in preempting. If we did, + * the current thread would not be properly resumed as well, so + * just avoid that whole landmine. + * - If the new thread's priority is not a realtime priority and + * the current thread's priority is not an idle priority and + * FULL_PREEMPTION is disabled. + * + * If all of these conditions are false, but the current thread is in + * a nested critical section, then we have to defer the preemption + * until we exit the critical section. Otherwise, switch immediately + * to the new thread. + */ + ctd = curthread; + pri = td->td_priority; + cpri = ctd->td_priority; + if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) || + td->td_kse->ke_state != KES_THREAD) + return (0); +#ifndef FULL_PREEMPTION + if (!(pri >= PRI_MIN_ITHD && pri <= PRI_MAX_ITHD) && + !(cpri >= PRI_MIN_IDLE)) + return (0); +#endif + if (ctd->td_critnest > 1) { + CTR1(KTR_PROC, "maybe_preempt: in critical section %d", + ctd->td_critnest); + ctd->td_flags |= TDF_OWEPREEMPT; + return (0); + } + + /* + * Our thread state says that we are already on a run queue, so + * update our state as if we had been dequeued by choosethread(). + */ + MPASS(TD_ON_RUNQ(td)); + TD_SET_RUNNING(td); + CTR3(KTR_PROC, "preempting to thread %p (pid %d, %s)\n", td, + td->td_proc->p_pid, td->td_proc->p_comm); + mi_switch(SW_INVOL, td); + return (1); +#else + return (0); +#endif +} + +#ifndef PREEMPTION +/* XXX: There should be a non-static version of this. */ +static void +printf_caddr_t(void *data) +{ + printf("%s", (char *)data); +} +static char preempt_warning[] = + "WARNING: Kernel preemption is disabled, expect reduced performance.\n"; +SYSINIT(preempt_warning, SI_SUB_COPYRIGHT, SI_ORDER_ANY, printf_caddr_t, + preempt_warning) +#endif /************************************************************************ * SYSTEM RUN QUEUE manipulations and tests * ==== //depot/projects/smpng/sys/kern/kern_synch.c#72 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.251 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.252 2004/07/02 20:21:43 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -299,7 +299,9 @@ if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td)) mtx_assert(&Giant, MA_NOTOWNED); #endif - KASSERT(td->td_critnest == 1, + KASSERT(td->td_critnest == 1 || (td->td_critnest == 2 && + (td->td_flags & TDF_OWEPREEMPT) != 0 && (flags & SW_INVOL) != 0 && + newtd == NULL), ("mi_switch: switch in a critical section")); KASSERT((flags & (SW_INVOL | SW_VOL)) != 0, ("mi_switch: switch must be voluntary or involuntary")); @@ -308,6 +310,7 @@ p->p_stats->p_ru.ru_nvcsw++; else p->p_stats->p_ru.ru_nivcsw++; + /* * Compute the amount of time during which the current * process was running, and add that to its total so far. ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#28 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.42 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.43 2004/07/02 20:21:43 jhb Exp $"); #include #include @@ -654,7 +654,7 @@ sched_tdcnt++; td->td_lastcpu = td->td_oncpu; td->td_last_kse = ke; - td->td_flags &= ~TDF_NEEDRESCHED; + td->td_flags &= ~(TDF_NEEDRESCHED | TDF_OWEPREEMPT); td->td_oncpu = NOCPU; /* * At the last moment, if this thread is still marked RUNNING, @@ -712,6 +712,16 @@ ke->ke_proc->p_comm)); KASSERT(ke->ke_proc->p_sflag & PS_INMEM, ("sched_add: process swapped out")); + +#ifdef SMP + /* + * Only try to preempt if the thread is unpinned or pinned to the + * current CPU. + */ + if (KSE_CAN_MIGRATE(ke) || ke->ke_runq == &runq_pcpu[PCPU_GET(cpuid)]) +#endif + if (maybe_preempt(td)) + return; ke->ke_ksegrp->kg_runq_kses++; ke->ke_state = KES_ONRUNQ; ==== //depot/projects/smpng/sys/kern/sched_ule.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.109 2004/07/02 19:09:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.110 2004/07/02 20:21:43 jhb Exp $"); #include #include @@ -1139,7 +1139,7 @@ td->td_last_kse = ke; td->td_lastcpu = td->td_oncpu; td->td_oncpu = NOCPU; - td->td_flags &= ~TDF_NEEDRESCHED; + td->td_flags &= ~(TDF_NEEDRESCHED | TDF_OWEPREEMPT); /* * If the KSE has been assigned it may be in the process of switching @@ -1623,6 +1623,15 @@ if (td->td_priority < curthread->td_priority) curthread->td_flags |= TDF_NEEDRESCHED; +#ifdef SMP + /* + * Only try to preempt if the thread is unpinned or pinned to the + * current CPU. + */ + if (KSE_CAN_MIGRATE(ke) || ke->ke_cpu == PCPU_GET(cpuid)) +#endif + if (maybe_preempt(td)) + return; ke->ke_ksegrp->kg_runq_kses++; ke->ke_state = KES_ONRUNQ; ==== //depot/projects/smpng/sys/modules/geom/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/geom/Makefile,v 1.7 2004/05/20 10:37:13 pjd Exp $ +# $FreeBSD: src/sys/modules/geom/Makefile,v 1.8 2004/07/02 19:40:35 pjd Exp $ SUBDIR= geom_apple \ geom_bde \ @@ -8,6 +8,7 @@ geom_fox \ geom_gate \ geom_gpt \ + geom_label \ geom_mbr \ geom_nop \ geom_pc98 \ ==== //depot/projects/smpng/sys/net/if_ethersubr.c#50 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.174 2004/06/24 12:31:44 joerg Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.175 2004/07/02 19:44:59 brooks Exp $ */ #include "opt_atalk.h" @@ -847,6 +847,7 @@ void ether_ifattach(struct ifnet *ifp, const u_int8_t *llc) { + int i; struct ifaddr *ifa; struct sockaddr_dl *sdl; @@ -881,8 +882,12 @@ if (BDG_LOADED) bdgtakeifaces_ptr(); - /* Announce Ethernet MAC address. */ - if_printf(ifp, "Ethernet address: %6D\n", llc, ":"); + /* Announce Ethernet MAC address if non-zero. */ + for (i = 0; i < ifp->if_addrlen; i++) + if (llc[i] != 0) + break; + if (i != ifp->if_addrlen) + if_printf(ifp, "Ethernet address: %6D\n", llc, ":"); } /* ==== //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#6 (text+ko) ==== @@ -57,7 +57,7 @@ * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20 * - * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.5 2004/04/07 04:59:59 imp Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.6 2004/07/02 20:21:43 jhb Exp $ */ #include @@ -308,7 +308,7 @@ ih = (struct intr_handler *)cookie; - error = ithread_schedule(ih->ih_ithd, 0); + error = ithread_schedule(ih->ih_ithd); if (error == EINVAL) intr_stray_handler(ih); ==== //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#21 (text+ko) ==== @@ -57,7 +57,7 @@ * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20 * - * $FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.18 2004/04/07 05:00:01 imp Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.19 2004/07/02 20:21:43 jhb Exp $ */ #include @@ -230,11 +230,7 @@ int error; iv = cookie; -#ifdef notyet error = ithread_schedule(iv->iv_ithd); -#else - error = ithread_schedule(iv->iv_ithd, 0); -#endif if (error == EINVAL) intr_stray_vector(iv); } ==== //depot/projects/smpng/sys/sys/interrupt.h#13 (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/sys/interrupt.h,v 1.27 2004/06/28 16:21:51 jhb Exp $ + * $FreeBSD: src/sys/sys/interrupt.h,v 1.28 2004/07/02 20:21:43 jhb Exp $ */ #ifndef _SYS_INTERRUPT_H_ @@ -122,7 +122,7 @@ driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, void **cookiep); int ithread_remove_handler(void *cookie); -int ithread_schedule(struct ithd *ithread, int do_switch); +int ithread_schedule(struct ithd *ithread); int swi_add(struct ithd **ithdp, const char *name, driver_intr_t handler, void *arg, int pri, enum intr_type flags, void **cookiep); ==== //depot/projects/smpng/sys/sys/proc.h#118 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.383 2004/07/02 19:09:50 jhb Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.384 2004/07/02 20:21:43 jhb Exp $ */ #ifndef _SYS_PROC_H_ @@ -346,6 +346,7 @@ #define TDF_IDLETD 0x000020 /* This is one of the per-CPU idle threads. */ #define TDF_SELECT 0x000040 /* Selecting; wakeup/waiting danger. */ #define TDF_TSNOBLOCK 0x000100 /* Don't block on a turnstile due to race. */ +#define TDF_OWEPREEMPT 0x000200 /* Thread has a pending preemption. */ #define TDF_ASTPENDING 0x000800 /* Thread has some asynchronous events. */ #define TDF_TIMOFAIL 0x001000 /* Timeout from sleep after we were awake. */ #define TDF_INTERRUPT 0x002000 /* Thread is marked as interrupted. */ @@ -850,6 +851,7 @@ void fork_return(struct thread *, struct trapframe *); int inferior(struct proc *p); int leavepgrp(struct proc *p); +int maybe_preempt(struct thread *td); void mi_switch(int flags, struct thread *newtd); int p_candebug(struct thread *td, struct proc *p); int p_cansee(struct thread *td, struct proc *p); ==== //depot/projects/smpng/sys/vm/vm_zeroidle.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.25 2004/07/02 19:09:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.26 2004/07/02 20:21:44 jhb Exp $"); #include #include @@ -151,12 +151,14 @@ for (;;) { if (vm_page_zero_check()) { pages += vm_page_zero_idle(); +#ifndef PREEMPTION if (pages > idlezero_maxrun || sched_runnable()) { mtx_lock_spin(&sched_lock); mi_switch(SW_VOL, NULL); mtx_unlock_spin(&sched_lock); pages = 0; } +#endif } else { tsleep(&zero_state, pri, "pgzero", hz * 300); pages = 0; From owner-p4-projects@FreeBSD.ORG Fri Jul 2 23:20:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A233516A4D0; Fri, 2 Jul 2004 23:20:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6530016A4CE for ; Fri, 2 Jul 2004 23:20:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B9C743D4C for ; Fri, 2 Jul 2004 23:20:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i62NKu8m055877 for ; Fri, 2 Jul 2004 23:20:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i62NKrfs055874 for perforce@freebsd.org; Fri, 2 Jul 2004 23:20:53 GMT (envelope-from marcel@freebsd.org) Date: Fri, 2 Jul 2004 23:20:53 GMT Message-Id: <200407022320.i62NKrfs055874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 56347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2004 23:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=56347 Change 56347 by marcel@marcel_nfs on 2004/07/02 23:20:02 IFC @56346 Affected files ... .. //depot/projects/gdb/MAINTAINERS#11 integrate .. //depot/projects/gdb/bin/chio/chio.1#2 integrate .. //depot/projects/gdb/bin/cp/cp.1#3 integrate .. //depot/projects/gdb/bin/date/date.1#4 integrate .. //depot/projects/gdb/bin/df/df.1#6 integrate .. //depot/projects/gdb/bin/domainname/domainname.1#3 integrate .. //depot/projects/gdb/bin/echo/echo.1#3 integrate .. //depot/projects/gdb/bin/hostname/hostname.1#3 integrate .. //depot/projects/gdb/bin/ln/ln.1#3 integrate .. //depot/projects/gdb/bin/ln/symlink.7#3 integrate .. //depot/projects/gdb/bin/ls/ls.1#6 integrate .. //depot/projects/gdb/bin/pax/pax.1#3 integrate .. //depot/projects/gdb/bin/rcp/rcp.1#3 integrate .. //depot/projects/gdb/bin/rm/rm.1#3 integrate .. //depot/projects/gdb/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/gdb/bin/sh/bltin/echo.1#3 integrate .. //depot/projects/gdb/bin/sh/sh.1#4 integrate .. //depot/projects/gdb/bin/stty/stty.1#3 integrate .. //depot/projects/gdb/bin/test/test.1#4 integrate .. //depot/projects/gdb/contrib/gnu-sort/ABOUT-NLS#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/AUTHORS#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/ChangeLog#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/INSTALL#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/NEWS#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/README#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/THANKS#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/THANKS-to-translators#1 branch .. //depot/projects/gdb/contrib/gnu-sort/TODO#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/__fpending.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/__fpending.h#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/argmatch.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/argmatch.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/closeout.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/closeout.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/error.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/error.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/exit.h#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/exitfail.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/exitfail.h#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/gettext.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/hard-locale.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/hard-locale.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/human.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/human.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/inttostr.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/inttostr.h#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/long-options.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/long-options.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/memcoll.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/memcoll.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/pathmax.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/physmem.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/physmem.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/posixver.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/quote.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/quote.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/quotearg.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/quotearg.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/stdio-safer.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/strnlen.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/timespec.h#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/umaxtostr.c#1 branch .. //depot/projects/gdb/contrib/gnu-sort/lib/unistd-safer.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/version-etc.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/version-etc.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xalloc.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xmalloc.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xmemcoll.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xmemcoll.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xstrtol.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xstrtol.h#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xstrtoul.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/lib/xstrtoumax.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/man/sort.1#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/src/sort.c#2 integrate .. //depot/projects/gdb/contrib/gnu-sort/src/sys2.h#2 delete .. //depot/projects/gdb/contrib/gnu-sort/src/system.h#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/gdb/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/gdb/games/fortune/strfile/strfile.8#2 integrate .. //depot/projects/gdb/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/gdb/gnu/usr.bin/man/apropos/apropos.man#2 integrate .. //depot/projects/gdb/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/gdb/gnu/usr.bin/sort/Makefile#3 integrate .. //depot/projects/gdb/gnu/usr.bin/sort/alloca.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/sort/localedir.h#1 branch .. //depot/projects/gdb/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/gdb/include/Makefile#7 integrate .. //depot/projects/gdb/lib/libc/gen/sem_destroy.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem_getvalue.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem_post.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/time.3#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/_ctx_start.S#2 integrate .. //depot/projects/gdb/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/gdb/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/gdb/lib/libc/locale/gb2312.5#2 integrate .. //depot/projects/gdb/lib/libc/locale/mblen.3#4 integrate .. //depot/projects/gdb/lib/libc/sys/connect.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/ntp_gettime.2#2 integrate .. //depot/projects/gdb/lib/libkiconv/kiconv.3#2 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_login_access/login.access.5#2 integrate .. //depot/projects/gdb/lib/libsdp/sdp.3#3 integrate .. //depot/projects/gdb/lib/libufs/bread.3#2 integrate .. //depot/projects/gdb/lib/libufs/cgread.3#2 integrate .. //depot/projects/gdb/lib/libufs/getino.3#2 integrate .. //depot/projects/gdb/lib/libufs/libufs.3#2 integrate .. //depot/projects/gdb/lib/libufs/sbread.3#2 integrate .. //depot/projects/gdb/lib/libufs/ufs_disk_close.3#2 integrate .. //depot/projects/gdb/libexec/atrun/atrun.man#2 integrate .. //depot/projects/gdb/libexec/bootpd/bootpd.8#4 integrate .. //depot/projects/gdb/libexec/bootpd/bootptab.5#2 integrate .. //depot/projects/gdb/libexec/fingerd/fingerd.8#2 integrate .. //depot/projects/gdb/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/gdb/libexec/rbootd/rbootd.8#2 integrate .. //depot/projects/gdb/libexec/revnetgroup/revnetgroup.8#2 integrate .. //depot/projects/gdb/libexec/rexecd/rexecd.8#2 integrate .. //depot/projects/gdb/libexec/rlogind/rlogind.8#2 integrate .. //depot/projects/gdb/libexec/rpc.rwalld/rpc.rwalld.8#2 integrate .. //depot/projects/gdb/libexec/rshd/rshd.8#3 integrate .. //depot/projects/gdb/libexec/rtld-aout/rtld.1aout#2 integrate .. //depot/projects/gdb/libexec/ypxfr/ypxfr.8#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/gdb/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/gdb/sbin/atm/fore_dnld/fore_dnld.8#2 integrate .. //depot/projects/gdb/sbin/badsect/badsect.8#3 integrate .. //depot/projects/gdb/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/gdb/sbin/ccdconfig/ccdconfig.8#3 integrate .. //depot/projects/gdb/sbin/comcontrol/comcontrol.8#2 integrate .. //depot/projects/gdb/sbin/dumpfs/dumpfs.8#3 integrate .. //depot/projects/gdb/sbin/fdisk/fdisk.8#2 integrate .. //depot/projects/gdb/sbin/fdisk_pc98/fdisk.8#2 integrate .. //depot/projects/gdb/sbin/fsck/fsck.8#2 integrate .. //depot/projects/gdb/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/gdb/sbin/fsdb/fsdb.8#2 integrate .. //depot/projects/gdb/sbin/fsirand/fsirand.8#2 integrate .. //depot/projects/gdb/sbin/geom/class/Makefile#2 integrate .. //depot/projects/gdb/sbin/geom/class/label/Makefile#1 branch .. //depot/projects/gdb/sbin/geom/class/label/geom_label.c#1 branch .. //depot/projects/gdb/sbin/geom/class/label/glabel.8#1 branch .. //depot/projects/gdb/sbin/gpt/gpt.8#3 integrate .. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/gdb/sbin/init/init.8#5 integrate .. //depot/projects/gdb/sbin/ip6fw/ip6fw.8#3 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/gdb/sbin/ldconfig/ldconfig.8#2 integrate .. //depot/projects/gdb/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/gdb/sbin/mknod/mknod.8#4 integrate .. //depot/projects/gdb/sbin/mount_cd9660/mount_cd9660.8#4 integrate .. //depot/projects/gdb/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/gdb/sbin/mount_nullfs/mount_nullfs.8#3 integrate .. //depot/projects/gdb/sbin/mount_std/mount_std.8#3 integrate .. //depot/projects/gdb/sbin/mount_umapfs/mount_umapfs.8#3 integrate .. //depot/projects/gdb/sbin/mount_unionfs/mount_unionfs.8#3 integrate .. //depot/projects/gdb/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/gdb/sbin/nos-tun/nos-tun.8#2 integrate .. //depot/projects/gdb/sbin/rcorder/rcorder.8#2 integrate .. //depot/projects/gdb/sbin/reboot/boot_i386.8#3 integrate .. //depot/projects/gdb/sbin/restore/restore.8#5 integrate .. //depot/projects/gdb/sbin/route/route.8#4 integrate .. //depot/projects/gdb/sbin/routed/routed.8#5 integrate .. //depot/projects/gdb/sbin/shutdown/shutdown.8#3 integrate .. //depot/projects/gdb/sbin/slattach/slattach.8#3 integrate .. //depot/projects/gdb/sbin/spppcontrol/spppcontrol.8#2 integrate .. //depot/projects/gdb/sbin/startslip/startslip.1#3 integrate .. //depot/projects/gdb/sbin/vinum/vinum.8#4 integrate .. //depot/projects/gdb/share/examples/etc/make.conf#5 integrate .. //depot/projects/gdb/share/examples/ses/getencstat/getencstat.0#2 integrate .. //depot/projects/gdb/share/examples/ses/sesd/sesd.0#2 integrate .. //depot/projects/gdb/share/examples/ses/setencstat/setencstat.0#2 integrate .. //depot/projects/gdb/share/examples/ses/setobjstat/setobjstat.0#2 integrate .. //depot/projects/gdb/share/man/man3/pthread_switch_add_np.3#2 integrate .. //depot/projects/gdb/share/man/man4/cd.4#2 integrate .. //depot/projects/gdb/share/man/man4/da.4#2 integrate .. //depot/projects/gdb/share/man/man4/ida.4#2 integrate .. //depot/projects/gdb/share/man/man4/iir.4#2 integrate .. //depot/projects/gdb/share/man/man4/inet.4#3 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/acpi_asus.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ct.4#5 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/longrun.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ndis.4#2 integrate .. //depot/projects/gdb/share/man/man4/matcd.4#2 integrate .. //depot/projects/gdb/share/man/man4/multicast.4#2 integrate .. //depot/projects/gdb/share/man/man4/netgraph.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_atmpif.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_sppp.4#3 integrate .. //depot/projects/gdb/share/man/man4/ng_sscop.4#2 integrate .. //depot/projects/gdb/share/man/man4/safe.4#2 integrate .. //depot/projects/gdb/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/gdb/share/man/man4/stg.4#2 integrate .. //depot/projects/gdb/share/man/man4/xe.4#2 integrate .. //depot/projects/gdb/share/man/man5/devfs.5#3 integrate .. //depot/projects/gdb/share/man/man5/fdescfs.5#2 integrate .. //depot/projects/gdb/share/man/man5/make.conf.5#6 integrate .. //depot/projects/gdb/share/man/man7/development.7#2 integrate .. //depot/projects/gdb/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/gdb/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/gdb/share/man/man9/watchdog.9#2 integrate .. //depot/projects/gdb/share/mk/bsd.port.mk#2 integrate .. //depot/projects/gdb/share/mk/bsd.port.subdir.mk#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/be.iso.acc.kbd#2 integrate .. //depot/projects/gdb/share/syscons/keymaps/be.iso.kbd#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#8 integrate .. //depot/projects/gdb/sys/alpha/include/param.h#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/gdb/sys/amd64/include/param.h#3 integrate .. //depot/projects/gdb/sys/arm/arm/intr.c#2 integrate .. //depot/projects/gdb/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/gdb/sys/arm/sa11x0/sa11x0.c#3 integrate .. //depot/projects/gdb/sys/boot/common/loader.8#5 integrate .. //depot/projects/gdb/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/gdb/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/gdb/sys/conf/NOTES#28 integrate .. //depot/projects/gdb/sys/conf/files#34 integrate .. //depot/projects/gdb/sys/conf/options#26 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/CHANGES.txt#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acconfig.h#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acinterp.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acmacros.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbcmds.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbdisply.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsopcode.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpe.c#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpeblk.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exconfig.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#8 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#14 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/gdb/sys/geom/label/g_label.c#1 branch .. //depot/projects/gdb/sys/geom/label/g_label.h#1 branch .. //depot/projects/gdb/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/gdb/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/gdb/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/gdb/sys/i386/include/param.h#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_clock.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_idle.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_intr.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/gdb/sys/kern/kern_sig.c#11 integrate .. //depot/projects/gdb/sys/kern/kern_subr.c#5 integrate .. //depot/projects/gdb/sys/kern/kern_switch.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_synch.c#13 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#19 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#14 integrate .. //depot/projects/gdb/sys/kern/subr_prof.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_trap.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/gdb/sys/kern/sys_process.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/gdb/sys/modules/geom/Makefile#5 integrate .. //depot/projects/gdb/sys/modules/geom/geom_label/Makefile#1 branch .. //depot/projects/gdb/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/gdb/sys/net/if_tun.c#8 integrate .. //depot/projects/gdb/sys/pci/agp_via.c#6 integrate .. //depot/projects/gdb/sys/pci/if_de.c#5 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#10 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#8 integrate .. //depot/projects/gdb/sys/pci/if_xl.c#7 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/gdb/sys/sys/interrupt.h#3 integrate .. //depot/projects/gdb/sys/sys/proc.h#20 integrate .. //depot/projects/gdb/sys/sys/resourcevar.h#4 integrate .. //depot/projects/gdb/sys/sys/sched.h#5 integrate .. //depot/projects/gdb/sys/vm/vm_glue.c#10 integrate .. //depot/projects/gdb/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/gdb/usr.bin/c89/c89.1#2 integrate .. //depot/projects/gdb/usr.bin/calendar/calendar.1#3 integrate .. //depot/projects/gdb/usr.bin/checknr/checknr.1#2 integrate .. //depot/projects/gdb/usr.bin/chpass/chpass.1#3 integrate .. //depot/projects/gdb/usr.bin/compress/compress.1#2 integrate .. //depot/projects/gdb/usr.bin/du/du.1#3 integrate .. //depot/projects/gdb/usr.bin/ee/ee.1#2 integrate .. //depot/projects/gdb/usr.bin/enigma/enigma.1#3 integrate .. //depot/projects/gdb/usr.bin/expand/expand.1#2 integrate .. //depot/projects/gdb/usr.bin/file/file.1#2 integrate .. //depot/projects/gdb/usr.bin/file/magic.5#2 integrate .. //depot/projects/gdb/usr.bin/finger/finger.1#2 integrate .. //depot/projects/gdb/usr.bin/fstat/fstat.1#3 integrate .. //depot/projects/gdb/usr.bin/gcore/gcore.1#2 integrate .. //depot/projects/gdb/usr.bin/gencat/gencat.1#2 integrate .. //depot/projects/gdb/usr.bin/getopt/getopt.1#2 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.1#3 integrate .. //depot/projects/gdb/usr.bin/hesinfo/hesinfo.1#2 integrate .. //depot/projects/gdb/usr.bin/hexdump/hexdump.1#2 integrate .. //depot/projects/gdb/usr.bin/indent/indent.1#5 integrate .. //depot/projects/gdb/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/gdb/usr.bin/ipcs/ipcs.1#4 integrate .. //depot/projects/gdb/usr.bin/join/join.1#3 integrate .. //depot/projects/gdb/usr.bin/jot/jot.1#2 integrate .. //depot/projects/gdb/usr.bin/killall/killall.1#5 integrate .. //depot/projects/gdb/usr.bin/limits/limits.1#2 integrate .. //depot/projects/gdb/usr.bin/locate/locate/locate.1#2 integrate .. //depot/projects/gdb/usr.bin/lock/lock.1#2 integrate .. //depot/projects/gdb/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/gdb/usr.bin/login/login.access.5#2 integrate .. //depot/projects/gdb/usr.bin/look/look.1#2 integrate .. //depot/projects/gdb/usr.bin/lsvfs/lsvfs.1#2 integrate .. //depot/projects/gdb/usr.bin/m4/m4.1#2 integrate .. //depot/projects/gdb/usr.bin/make/make.1#5 integrate .. //depot/projects/gdb/usr.bin/make/parse.c#4 integrate .. //depot/projects/gdb/usr.bin/makewhatis/makewhatis.local.8#2 integrate .. //depot/projects/gdb/usr.bin/minigzip/minigzip.1#2 integrate .. //depot/projects/gdb/usr.bin/mkdep/mkdep.1#2 integrate .. //depot/projects/gdb/usr.bin/mklocale/mklocale.1#3 integrate .. //depot/projects/gdb/usr.bin/mktemp/mktemp.1#2 integrate .. //depot/projects/gdb/usr.bin/mt/mt.1#2 integrate .. //depot/projects/gdb/usr.bin/ncal/ncal.1#2 integrate .. //depot/projects/gdb/usr.bin/ncplogin/ncplogout.1#2 integrate .. //depot/projects/gdb/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/gdb/usr.bin/nl/nl.1#2 integrate .. //depot/projects/gdb/usr.bin/passwd/passwd.1#2 integrate .. //depot/projects/gdb/usr.bin/printf/printf.1#3 integrate .. //depot/projects/gdb/usr.bin/rlogin/rlogin.1#2 integrate .. //depot/projects/gdb/usr.bin/rpcgen/rpcgen.1#2 integrate .. //depot/projects/gdb/usr.bin/rsh/rsh.1#2 integrate .. //depot/projects/gdb/usr.bin/rup/rup.1#2 integrate .. //depot/projects/gdb/usr.bin/ruptime/ruptime.1#2 integrate .. //depot/projects/gdb/usr.bin/rusers/rusers.1#2 integrate .. //depot/projects/gdb/usr.bin/rwall/rwall.1#2 integrate .. //depot/projects/gdb/usr.bin/script/script.1#4 integrate .. //depot/projects/gdb/usr.bin/sed/sed.1#2 integrate .. //depot/projects/gdb/usr.bin/su/su.1#3 integrate .. //depot/projects/gdb/usr.bin/systat/systat.1#2 integrate .. //depot/projects/gdb/usr.bin/tail/tail.1#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#9 integrate .. //depot/projects/gdb/usr.bin/tcopy/tcopy.1#2 integrate .. //depot/projects/gdb/usr.bin/tftp/tftp.1#3 integrate .. //depot/projects/gdb/usr.bin/time/time.1#2 integrate .. //depot/projects/gdb/usr.bin/tput/tput.1#2 integrate .. //depot/projects/gdb/usr.bin/tr/tr.1#3 integrate .. //depot/projects/gdb/usr.bin/tset/tset.1#2 integrate .. //depot/projects/gdb/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/gdb/usr.bin/ul/ul.1#2 integrate .. //depot/projects/gdb/usr.bin/uname/uname.1#2 integrate .. //depot/projects/gdb/usr.bin/uniq/uniq.1#3 integrate .. //depot/projects/gdb/usr.bin/units/units.1#2 integrate .. //depot/projects/gdb/usr.bin/vgrind/vgrind.1#2 integrate .. //depot/projects/gdb/usr.bin/vgrind/vgrindefs.5#2 integrate .. //depot/projects/gdb/usr.bin/vis/vis.1#3 integrate .. //depot/projects/gdb/usr.bin/vmstat/vmstat.8#4 integrate .. //depot/projects/gdb/usr.bin/wall/wall.1#2 integrate .. //depot/projects/gdb/usr.bin/what/what.1#2 integrate .. //depot/projects/gdb/usr.bin/whereis/whereis.1#2 integrate .. //depot/projects/gdb/usr.bin/who/who.1#2 integrate .. //depot/projects/gdb/usr.bin/window/window.1#2 integrate .. //depot/projects/gdb/usr.bin/xinstall/install.1#3 integrate .. //depot/projects/gdb/usr.bin/yacc/yacc.1#2 integrate .. //depot/projects/gdb/usr.bin/ypwhich/ypwhich.1#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.8#3 integrate .. //depot/projects/gdb/usr.sbin/lpr/lpd/lpd.8#2 integrate .. //depot/projects/gdb/usr.sbin/mixer/mixer.8#2 integrate Differences ... ==== //depot/projects/gdb/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.91 2004/05/20 12:44:23 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.92 2004/07/02 19:40:36 pjd Exp $ subsystem login notes ----------------------------- @@ -93,6 +93,7 @@ binutils obrien Insists on BU blocked from unapproved commits geom_concat pjd Pre-commit review requested. geom_gate pjd Pre-commit review requested. +geom_label pjd Pre-commit review requested. geom_nop pjd Pre-commit review requested. geom_stripe pjd Pre-commit review requested. sbin/geom pjd Pre-commit review requested. ==== //depot/projects/gdb/bin/chio/chio.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/chio/chio.1,v 1.23 2003/03/24 16:08:13 charnier Exp $ +.\" $FreeBSD: src/bin/chio/chio.1,v 1.24 2004/07/02 21:04:17 ru Exp $ .\" .Dd May 14, 1998 .Dt CHIO 1 @@ -77,7 +77,8 @@ .Em drive (data transfer), and .Em voltag -(select by volume identifier). The +(select by volume identifier). +The .Em voltag pseudo-element type allows the selection of tapes by their volume tag (typically a barcode on the tape). @@ -114,7 +115,8 @@ .Op Cm inv1 .Op Cm inv2 .Xc -Perform a media unit exchange operation. The media unit in +Perform a media unit exchange operation. +The media unit in .Ar is moved to .Ar @@ -177,10 +179,12 @@ .Xc Perform an .Em INITIALIZE ELEMENT STATUS -operation on the changer. The optional +operation on the changer. +The optional .Ar parameter may be given to specify a timeout in seconds for the -operations. This may be used if the operation takes unusually long +operations. +This may be used if the operation takes unusually long because of buggy firmware or the like. .It Ic voltag Xo .Op Fl fca @@ -189,15 +193,18 @@ .Op Ar