From owner-p4-projects@FreeBSD.ORG Sun Aug 10 00:08:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6AE21065675; Sun, 10 Aug 2008 00:08:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A8F31065674 for ; Sun, 10 Aug 2008 00:08:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73B968FC19 for ; Sun, 10 Aug 2008 00:08:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7A08Dco079907 for ; Sun, 10 Aug 2008 00:08:13 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7A08DjI079905 for perforce@freebsd.org; Sun, 10 Aug 2008 00:08:13 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 10 Aug 2008 00:08:13 GMT Message-Id: <200808100008.m7A08DjI079905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 00:08:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=147027 Change 147027 by pgj@disznohal on 2008/08/10 00:07:25 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#13 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -840,7 +840,7 @@ tot WMM) die door een industriegroep is gedefinieerd als een deelverzameling van 802.11e die nu kan worden gebruikt om multi- mediatoepassingen mogelijk te maken terwijl er gewacht wordt op - de uiteindelijke ratificatie van 802.11e. Het belangrijkste om + de uiteindelijke ratificatie van 802.11e. Het belangrijkste om over 802.11e en WME/WMM te weten is dat ze gepriotiseerd verkeersgebruik van een draadloos netwerk mogelijk maken door middel van Quality of Service (QoS) protocollen en protocollen @@ -882,7 +882,7 @@ verschillende delen: het eigenlijke stuurprogramma ( &man.ath.4;), de ondersteuningslaag voor de hardware die chip-specifieke functies afhandelt (&man.ath.hal.4;), en een - algoritme om de snelheid om frames te verzenden te kiezen uit + algoritme om de snelheid om frames te verzenden te kiezen uit een reeks mogelijke waarden (hier ath_rate_sample). Indien deze ondersteuning als modules wordt geladen, zullen de afhankelijkheden automatisch afgehandeld worden. Voor andere @@ -915,7 +915,7 @@ stuurprogramma voor draadloze apparaten. Daarvoor zijn ook de modules nodig die cryptografische ondersteuning implementeren voor de te gebruiken veiligheidsprotocollen. Het is de - bedoeling dat ze dynamisch door de module &man.wlan.4; worden + bedoeling dat ze dynamisch door de module &man.wlan.4; worden geladen maar momenteel dienen ze handmatig ingesteld te worden. De volgende modules zijn beschikbaar: &man.wlan.wep.4;, &man.wlan.ccmp.4;, en &man.wlan.tkip.4;. @@ -1051,7 +1051,7 @@ S - Korte preambule. Geeft aan dat het netwerk korte + Korte preambule. Geeft aan dat het netwerk korte preambules gebruikt (gedefineerd in 802.11b Hoge Snelheid/DSSS PHY, korte preambule gebruikt een 56-bits synchronisatieveld in tegenstelling tot een @@ -1138,19 +1138,360 @@ zal de kaart forceren om te werken in 802.11g welke alleen voor 2,4GHz frequenties is gedefinieerd dus de 5GHz - kanalen blijven buiten beschouwing. Andere manieren om + kanalen blijven buiten beschouwing. Andere manieren om dit te doen zijn de parameter , om bewerkingen op één specifieke frequentie vast te zetten, en de parameter , om een lijst van te scannen kanalen te specificeren. Meer informatie over deze parameters kan in de hulppagina - &man.ifconfig.8; gevonden worden. + &man.ifconfig.8; gevonden worden. + + + + Authenticatie + + Nadat er een toegangspunt is gekozen moet het station + zich authenticeren voordat het gegevens kan versturen. + Authenticatie kan op verschillende manieren gebeuren. Het + meest gebruikte schema wordt open authenticatie genoemd en + staat doe dat elk station aan het netwerk deelneemt en + communiceert. Deze manier van authenticatie dient + gebruikt te worden voor testdoeleinden tijdens het voor de + eesrte keer opzetten van een draadloos netwerk. Andere + schema's vereisen dat cryptografische overeenkomsten + voltooid worden voordat gegevensverkeer kan stromen; ofwel + door vooraf gedeelde sleutels of geheimen te gebruiken, of + door complexere schema's te gebruiken welke acherliggende + diensten zoals RADIUS betrekken. De meeste gebruikers + zullen open authenticatie gebruiken welke de + standaardinstelling is. De dan meest voorkomende + opstelling is WPA-PSK, ook bekend als WPA Personal, welke + hieronder + beschreven is. + + + Indien er een &apple; &airport; Extreme basisstation + als toegangspunt wordt gebruikt kan het nodig zijn om + gedeelde-sleutel-authenticatie samen met een WEP-sleutel + in te stellen. Dit kan gedaan worden in het bestand + /etc/rc.conf of door het programma + &man.wpa.supplicant.8; te gebruiken. Indien er een + enkel &airport; basisstation wordt gebruikt kan de + toegang met zoiets als het volgende worden ingesteld: + + + ifconfig_ath0="authmode shared wepmode on weptxkey 1 wepkey 01234567 DHCP" + + Over het algemeen dient authenticatie via gedeelde + sleutels worden voorkomen omdat het het materiaal van de + WEP-sleutel op een zeer afgedwongen manier gebruikt wat + het zelfs gemakkelijker maakt om de sleutel te kraken. + Indien WEP gebruikt moet worden (bijvoorbeeld voor + compatibiliteit met verouderde apparaten) is het beter + om WEP met open authenticatie te + gebruiken. Meer informatie met betrekking tot WEP kan + gevonden worden in + . + + + + + Een IP-adres verkrijgen met DHCP + + Nadat het toeganspunt is gekozen en de parameters voor + de authenticatie zijn ingesteld, dient er een IP-adres ter + communicatie verkregen worden. In de meeste gevallen + wordt het draadloze IP-adres verkregen via DHCP. Om dat + te bereiken, dient /etc/rc.conf + bewerkt te worden en DHCP aan de + instellingen voor het apparaat toegevoegd te worden zoals + in de verschillende bovenstaande voorbeelden is laten zien : + + ifconfig_ath0="DHCP" + + Op dit moment kan de draadloze interface geactiveerd + worden: + + &prompt.root; /etc/rc.d/netif start + + Wanneer het interface draait, kan + ifconfig gebruikt worden om de status + van het interface ath0 te zien: + + + &prompt.root; ifconfig ath0 +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps) + status: associated + ssid dlinkap channel 6 bssid 00:13:46:49:41:76 + authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100 + + Het status: associated betekent + dat er verbinding is met een draadloos netwerk (in dit + geval met het netwerk dlinkap). Het + gedeelte bssid 00:13:46:49:41:76 is het + MAC-adres van het toegangspunt; de regel met + authmode vertelt dat de communicatie + niet versleuteld (OPEN) is. + + + + Statisch IP-adres + + In het geval dat het niet mogelijk is om een IP-adres + van een DHCP-server te krijgen, kan er een vast IP-adres + worden ingesteld. Vervang het sleutelwoord + DHCP van hierboven met de + adresinformatie. Zorg ervoor dat de andere parameters + voor het selecteren van een toegangspunt behouden blijven: + + + ifconfig_ath0="ssid uw_ssid_hier inet 192.168.1.100 netmask 255.255.255.0" + + + + + WPA + + + + + + + + + WPA-PSK + + + + + + + + + + network={ + ssid="freebsdap" + psk="freebsdmall" +} + + + + ifconfig_ath0="WPA DHCP" + + + + + + + + + + + + + + + + + + + + + + + + + + + + WPA met EAP-TLS + + + + + + + + + + network={ + ssid="freebsdap" + proto=RSN + key_mgmt=WPA-EAP + eap=TLS + identity="loader" + ca_cert="/etc/certs/cacert.pem" + client_cert="/etc/certs/clientcert.pem" + private_key="/etc/certs/clientkey.pem" + private_key_passwd="freebsdmallclient" +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ifconfig_ath0="WPA DHCP" + + + + + + + + + + WPA met EAP-TTLS + + + + + + network={ + ssid="freebsdap" + proto=RSN + key_mgmt=WPA-EAP + eap=TTLS + identity="test" + password="test" + ca_cert="/etc/certs/cacert.pem" + phase2="auth=MD5" +} + + + + + + + + + + + + + + + + + + + + + + + + + + ifconfig_ath0="WPA DHCP" + + + + + + + + WPA met EAP-PEAP + + + + + + + + network={ + ssid="freebsdap" + proto=RSN + key_mgmt=WPA-EAP + eap=PEAP + identity="test" + password="test" + ca_cert="/etc/certs/cacert.pem" + phase1="peaplabel=0" + phase2="auth=MSCHAPV2" +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ifconfig_ath0="WPA DHCP" + + + + - + + + + WEP + + - @@ -2338,7 +2679,7 @@ pxeboot en niet de kernel laadt. Er zijn andere interessante mogelijkheden, zoals het laden van pxeboot vanuit de map /boot van een &os; CD-ROM ( + class="directory">/boot van een &os; CD-ROM ( aangezien &man.pxeboot.8; een GENERIC kernel kan laden, bestaat de mogelijkheid om PXE te gebruiken om van een CDROM op From owner-p4-projects@FreeBSD.ORG Sun Aug 10 11:11:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 868491065690; Sun, 10 Aug 2008 11:11:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A89E1065674 for ; Sun, 10 Aug 2008 11:11:43 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3EFDB8FC1A for ; Sun, 10 Aug 2008 11:11:43 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABBgDE081941 for ; Sun, 10 Aug 2008 11:11:42 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABBaQf081935 for perforce@freebsd.org; Sun, 10 Aug 2008 11:11:36 GMT (envelope-from strauss@FreeBSD.org) Date: Sun, 10 Aug 2008 11:11:36 GMT Message-Id: <200808101111.m7ABBaQf081935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 11:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147070 Change 147070 by strauss@strauss_marvelman on 2008/08/10 11:10:45 Unix to DOS time conversion test. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#27 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#7 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#27 (text+ko) ==== @@ -381,7 +381,9 @@ struct tm *time; unsigned int dos_time; - time = gmtime(&unix_time); + /* This will not preserve time when creating/extracting the archive + * on two systems with different time zones. */ + time = localtime(&unix_time); dos_time = 0; dos_time += ((time->tm_year - 80) & 0x7f) << 9; @@ -390,10 +392,7 @@ dos_time <<= 16; dos_time += (time->tm_hour & 0x1f) << 11; dos_time += (time->tm_min & 0x3f) << 5; - dos_time += (time->tm_sec & 0x3e) >> 1; /* Only counting every 2 seconds -> [0..30], right? */ - - /* free(time); */ - /* TODO: Getting error when freeing the struct, why? */ + dos_time += (time->tm_sec & 0x3e) >> 1; /* Only counting every 2 seconds. */ return dos_time; } ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#7 (text+ko) ==== @@ -18,6 +18,8 @@ const char *p, *q, *buffend; size_t used; int crc; + const time_t t = time(NULL); + struct tm *tm = localtime(&t); /* Create new ZIP archive in memory without padding. */ assert((a = archive_write_new()) != NULL); @@ -39,6 +41,7 @@ archive_entry_set_dev(entry, 12); archive_entry_set_ino(entry, 89); archive_entry_set_nlink(entry, 1); + archive_entry_set_mtime(entry, t, 0); assertEqualIntA(a, 0, archive_write_header(a, entry)); assertEqualIntA(a, sizeof(data1), archive_write_data(a, data1, sizeof(data1))); assertEqualIntA(a, sizeof(data2), archive_write_data(a, data2, sizeof(data2))); @@ -81,8 +84,8 @@ /* assertEqualInt(i2(p + 6), XXXX); */ /* Version needed to extract */ /* assertEqualInt(i2(p + 8), XXXX); */ /* Flags */ /* assertEqualInt(i2(p + 10), XXXX); */ /* Compression method */ - /* assertEqualInt(i2(p + 12), XXXX); */ /* File time */ - /* assertEqualInt(i2(p + 14), XXXX); */ /* File date */ + assertEqualInt(i2(p + 12), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */ + assertEqualInt(i2(p + 14), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */ crc = crc32(0, &data1, sizeof(data1)); crc = crc32(crc, &data2, sizeof(data2)); assertEqualInt(i4(p + 16), crc); /* CRC-32 */ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 11:22:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E74CE1065674; Sun, 10 Aug 2008 11:21:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC15B1065672 for ; Sun, 10 Aug 2008 11:21:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F4638FC0A for ; Sun, 10 Aug 2008 11:21:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABLxUe082764 for ; Sun, 10 Aug 2008 11:21:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABLxTp082762 for perforce@freebsd.org; Sun, 10 Aug 2008 11:21:59 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 10 Aug 2008 11:21:59 GMT Message-Id: <200808101121.m7ABLxTp082762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 11:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147072 Change 147072 by pgj@disznohal on 2008/08/10 11:21:13 MFen: 1.408 -> 1.410 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml 1.232 -> 1.233 hu_HU.ISO8859-2/books/handbook/config/chapter.sgml 1.285 -> 1.286 hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml 1.84 -> 1.85 hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml 1.41 -> 1.42 hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml 1.15 -> 1.16 hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml 1.184 -> 1.186 hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml 1.135 -> 1.136 hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml 1.71 -> 1.72 hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml 1.447 -> 1.448 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.105 -> 1.106 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml 1.281 -> 1.282 hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml 1.118 -> 1.120 hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml 1.326 -> 1.328 hu_HU.ISO8859-2/books/handbook/security/chapter.sgml 1.129 -> 1.130 hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#11 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#6 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#8 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#9 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#11 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -5151,7 +5151,7 @@ például a pxeboot állomány betöltése a &os; CD-jén található /boot + class="directory">/boot könyvtárból (mivel a &man.pxeboot.8; a GENERIC rendszermagot képes betölteni, ezért a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#11 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2197,16 +2197,20 @@ # $&os;$ # +# # A hálózati nevek adatbázisa # # Ebbe az állományba rakjuk a helyi hálózaton található címeket és # a hozzájuk tartozó hálózati neveket, ahol szinte ugyanez az -# adatbázis megtalálható. A DNS vagy NIS alkalmazása esetén ez az -# állomány nem feltétlenül kerül felhasználásra. A névfeloldás -# sorrendjét az /etc/nsswitch.conf állományban adhatjuk meg. +# adatbázis megtalálható. A 'my.domain' helyére a saját gépünk +# nevét írjuk be. +# +# A DNS vagy NIS alkalmazása esetén ez az állomány nem feltétlenül kerül +# felhasználásra. A névfeloldás sorrendjét az /etc/nsswitch.conf +# állományban adhatjuk meg. # -::1 localhost localhost.my.domain myname.my.domain -127.0.0.1 localhost localhost.my.domain myname.my.domain +::1 localhost localhost.my.domain +127.0.0.1 localhost localhost.my.domain # # Egy képzeletbeli hálózat. @@ -2221,12 +2225,11 @@ # 192.168.0.0 - 192.168.255.255 # # Amikor csatlakozunk az internethez, egy valódi, hivatalosan -# kiosztott számra lesz szükségünk. NAGYON SZÉPEN KÉRÜNK mindenkit, -# hogy ne találj ki magunknak hálózati címeket, hanem használja az -# internet-szolgáltatótól kapott címet (amennyiben rendelkezünk -# ilyennel) vagy az internetes nyilvántartásban szereplõ címek közül -# valamelyiket (FTP-n keresztül jelentkezzünk be az rs.internic.net -# gépre, majd lépjünk be a /templates könyvtárba). +# kiosztott számra lesz szükségünk. Ne találjunk ki magunknak +# hálózati címeket, hanem használjuk az internetszolgáltatótól +# kapott címet (amennyiben rendelkezünk # ilyennel) vagy az +# regionális internetes nyilvántartásban szereplõ címek közül +# valamelyiket (ARIN, APNIC, LACNIC, RIPE NCC vagy AfriNIC). Az /etc/hosts formai ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#4 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -5484,7 +5484,7 @@ kulcsot tartalmazó állomány létrehozását illusztráljuk, amit a /privát + class="directory">/privát könyvtárba csatlakoztatott titkosított adathordozó mesterkulcsához fogunk használni. A kulcs állomány a @@ -5575,7 +5575,7 @@ Miután befejeztük a munkát a titkosított partíción, és a /privát + class="directory">/privát partícióra már nincs tovább szükségünk, érdemes leválasztanunk és kiiktatnunk a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -324,9 +324,9 @@ A &os; 7.0 kiadással a minta pf.conf állomány az - /etc + /etc könyvtárból átkerült a - /usr/share/examples/pf + /usr/share/examples/pf könyvtárba. A &os; 7.0 elõtti kiadásokban alapértelmezés szerint található egy pf.conf ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#4 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -107,7 +107,7 @@ A GEOM rendszer adatszolgáltatókon vagy speciális /dev-állományokon + class="directory">/dev-állományokon keresztül hozzáférést és vezérlést tesz lehetõvé bizonyos osztályokhoz — Master Boot Recordokhoz, @@ -197,7 +197,7 @@ gyökérpartíciójának, használjunk erre a célra egy másik könyvtárat, például a /mnt-ot: + class="directory">/mnt-ot: &prompt.root; mkdir /mnt @@ -232,7 +232,7 @@ Ezzel meg kellett jelennie további másik két eszköznek is a /dev/stripe + class="directory">/dev/stripe könyvtárban, a st0 eszköz mellett. Ezek többek közt az st0a és az @@ -314,7 +314,7 @@ memória (RAM) méretének kétszere legyen. A többi helyet adjuk oda a gyökérpartíciónak (/). Természetesen a többi + class="directory">/). Természetesen a többi csatolási pontot is kihasználhatjuk, külön partíciókkal, de ezzel a feladat nehézsége tízszeresére növekszik, @@ -349,7 +349,7 @@ Ezzel a paranccsal létre kellett jönnie a gm0 eszköznek a /dev/mirror + class="directory">/dev/mirror könyvtárban. @@ -390,7 +390,7 @@ Ellenõrizzük, nem látunk-e a képernyõn valamilyen hibaüzenetet, majd csatlakoztassuk az eszközt a a /mnt pontra: + class="directory">/mnt pontra: &prompt.root; mount /dev/mirror/gm0s1a /mnt @@ -567,7 +567,7 @@ &prompt.root; mount /dev/ggate0 /mnt Innentõl kezdve az eszköz elérhetõ lesz - a /mnt csatlakozási + a /mnt csatlakozási ponton keresztül. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml - %SRCID% 1.15 + %SRCID% 1.16 --> @@ -369,10 +369,10 @@ befogadó rendszer állományrendszerén belül a jail. Jó választás lehet erre a /usr/jail/jailnév, + class="directory">/usr/jail/jailnév, ahol a jailnév a jailt azonosító rendszernév. A /usr/ + class="directory">/usr/ állományrendszeren általában elegendõ hely jut a jail állományrendszerének, ami egy @@ -405,11 +405,11 @@ felmásolásáról. Magyarán szólva, átmásolja az összes telepíhetõ állományt a /usr/src/etc/ + class="directory">/usr/src/etc/ könyvtárból a jail /etc + class="directory">/etc alkönyvtárába, vagyis a $D/etc/ + class="directory">$D/etc/ könyvtárba. @@ -831,11 +831,11 @@ Minden jailt a /home/j + class="directory">/home/j könyvtárban csatlakoztatunk. - A /home/j/mroot + A /home/j/mroot lesz az összes jail sablonja és mindegyikük számára írásvédett. @@ -843,32 +843,32 @@ Minden jailnek létrehozunk egy üres alkönyvtárat a /home/j + class="directory">/home/j könyvtárban. Minden jailnek lesz egy /s alkönyvtára, + class="directory">/s alkönyvtára, amelyet a rendszer írható-olvasható részére irányítunk. Minden jailnek lesz egy saját írható-olvasható része, amely - a /home/j/skel + a /home/j/skel könyvtáron alapszik. Mindegyik elzárt terület (a jailek írható-olvasható része) a - /home/js + /home/js könyvtárban jön létre. Ez a kiosztás feltételezi, hogy a jaileket - a /home + a /home partíción hozzuk létre. Ez természetesen bármi másra megváltoztatható, de akkor figyelnünk @@ -971,7 +971,7 @@ írásvédett állományrendszerre. Ellenõrizzük, hogy a szimbolikus linkek a megfelelõ s/ könyvtárakban + class="directory">s/ könyvtárakban jöttek létre. Valós vagy rossz helyen létrehozott könyvtárak használata esetén a telepítés @@ -1087,14 +1087,14 @@ Azért állítottuk a jail_név_rootdir változó értékét a - /usr/home + /usr/home könyvtárra a /home könyvtár + class="directory">/home könyvtár helyett, mert a &os; alaptelepítésében a /home könyvtár + class="directory">/home könyvtár fizikailag a /usr/home + class="directory">/usr/home könyvtárral egyezik meg. A jail_név_rootdir változó értékeként @@ -1200,7 +1200,7 @@ rendszert a megszokott módon. Ezután hozzunk létre egy új írásvédett sablont a /home/j/mroot2 + class="directory">/home/j/mroot2 könyvtárban. &prompt.root; mkdir /home/j/mroot2 @@ -1257,7 +1257,7 @@ állományrendszerek hozzá vannak kapcsolva az írásvédett állományrendszerhez (/s), ezért azokat + class="directory">/s), ezért azokat elõször le kell választani. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -283,7 +283,78 @@ A hardvereszközeink listájával felvértezve most már egy saját rendszermag létrehozása sem lesz annyira ijesztõ. + + + + Meghajtók, alrendszerek és modulok + + rendszermag + meghajtók, modulok, alrendszerek + + + Mielõtt új rendszermagot + készítenénk, érdemes megfontolnunk, hogy + egyáltalán szükségünk lesz-e + rá. Ha például valamilyen eszköz + támogatásához kell, akkor könnyen + elõfordulhat, hogy azt modulként is be tudjuk + tölteni. + + A rendszermaghoz tartozó modulok a /boot/kernel + könyvtárban találhatóak, és a + &man.kldload.8; segítségével a rendszer + mûködése közben dinamikusan + betölthetõek. Ha nem is az összes, de a + legtöbb meghajtóhoz tartozik egy modul és egy + man oldal. Például az elõzõ szakaszban az + ath vezeték nélküli + Ethernet meghajtóval foglalkoztunk. A következõ + leírást találjuk a hozzátartozó + man oldalon: + Vagy ha modulként akarjuk betölteni ezt a meghajtót + a rendszer indítása során, akkor a &man.loader.conf.5; állományba + vegyük fel a következõ sort: + + if_ath_load="YES" + + A fentebb leírtak szerint tehát ha a + if_ath_load="YES" sort hozzáadjuk a + /boot/loader.conf állományhoz, + akkor a rendszer indulásakor ez a modul mindig dinamikusan + betöltõdik. + + Némely esetben azonban nem áll + rendelkezésünkre ilyen modul. Ez + különösen igaz bizonyos alrendszerekre és a + fontosabb meghajtókra, például az + FFS állományrendszerre + vonatkozóan, mivel ezeknek kötelezõen a + rendszermagban kell lenniük. Ugyanez elmondható a + hálózati támogatásra is (INET). Csak + úgy tudjuk megmondani, hogy valamelyik meghajtóra + szükség van a rendszermagban, ha elõször + megpróbáljuk megkeresni hozzá a + megfelelõ modult. + + + A beépített meghajtók figyelmetlen + eltávolításával könnyen + lefordíthatatlan állapotba kerülhet a + rendszermag. Például, ha a &man.ata.4; + meghajtót kivesszük a rendszermag + konfigurációs + állományából, az + ATA alrendszert használó + meghajtók csak abban az esetben fognak biztosan + mûködni, ha egyúttal felvesszük a + loader.conf állományba. Ha + nem vagyunk benne biztosak, akkor elõször + próbáljuk meg használni a modult és + csak utána hagyjuk el a rendszermagba + épített változatát. + @@ -483,7 +554,7 @@ Lépjünk be a /usr/src + class="directory">/usr/src könyvtárba: &prompt.root; cd /usr/src ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#4 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml - %SRCID% 1.135 + %SRCID% 1.136 --> @@ -572,7 +572,7 @@ írnunk. Amennyiben a &mathematica;hoz tartozó programokat a /usr/local/bin + class="directory">/usr/local/bin könyvtárba telepítettük, akkor itt találunk kell a math, mathematica, ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -2378,9 +2378,9 @@ a lépést kihagyjuk, akkor hibákat kapunk. Továbbá még az elõkészület részeként ne felejtsünk el gondoskodni a - net-mngt/nagios-plugins, - net-mngt/nagios és - www/apache13 portok + net-mngt/nagios-plugins, + net-mngt/nagios és + www/apache13 portok telepítésérõl, beállításáról és megfelelõ mûködésérõl ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.447 + %SRCID% 1.448 --> @@ -3129,7 +3129,7 @@ A telepítés során alapból nem jön létre a /usr/ports/ könyvtár. + class="directory">/usr/ports/ könyvtár. Ha a &os; 6.0-RELEASE kiadását használjuk, akkor a portsnap indítása elõtt ezt a könyvtárat ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -4289,7 +4289,7 @@ többet. A hálózati nevek felosztása leginkább egy állományrendszerhez hasonlítható, például a /dev könyvtár a + class="directory">/dev könyvtár a gyökéren belül található, és így tovább. @@ -4401,7 +4401,7 @@ - /etc/namedb + /etc/namedb A BIND által kezelt zónák adatait tároló könyvtár. @@ -4419,11 +4419,11 @@ Attól függõen, hogy miként állítjuk be az adott zónát a szerveren, a hozzátartozó állományok - a /etc/namedb + a /etc/namedb könyvtáron belül a master, slave vagy dynamic alkönyvtárban + class="directory">master, slave vagy dynamic alkönyvtárban foglalnak helyet. Az itt tárolt állományokban levõ névfeloldási információk alapján válaszol a @@ -4491,7 +4491,7 @@ A named beállításait tartalmazó állományok pillanatnyilag az /etc/namedb könyvtárban + class="directory">/etc/namedb könyvtárban találhatóak és hacsak nem egy egyszerû névfeloldóra tartunk igényt, akkor a használata elõtt módosítanunk is kell. @@ -4505,7 +4505,7 @@ Ha a helyi gépen egy központi zónát akarunk beállítani, akkor lépjünk be az /etc/namedb könyvtárba + class="directory">/etc/namedb könyvtárba és futtassuk le a következõ parancsot: &prompt.root; sh make-localhost ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#6 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -439,7 +439,7 @@ /usr/ports/sysutils/lsof Ez a módszer a /usr/ports/distfiles + class="directory">/usr/ports/distfiles könyvtárba letöltött összes illeszkedõ állományt is kilistázza. @@ -847,7 +847,7 @@ Gondoskodjunk róla, hogy a /usr/ports üres legyen a + class="directory">/usr/ports üres legyen a csup elsõ futtatása elõtt! Ha más forrásból raktuk ide a Portgyûjteményt, a @@ -959,13 +959,13 @@ tartalmazzák a Portsnap portot vagy csomagot, nyugodtan kihagyhatjuk a most következõ lépést. A /usr/ports könyvtár + class="directory">/usr/ports könyvtár magától létrejön a &man.portsnap.8; parancs elsõ futtatása során. A Portsnap korábbi verziói esetén viszont, ha nem létezett, elõzetesen készíteni - kellett egy + kellett egy könyvtárat: &prompt.root; mkdir /usr/ports @@ -974,7 +974,7 @@ Töltsük le a Portgyûjtemény tömörített pillanatképét a - /var/db/portsnap + /var/db/portsnap könyvtárba. Ha akarjuk, ezután a lépés után már lekapcsolódhatunk az internetrõl. @@ -986,13 +986,13 @@ Ha még csak elõször futtatjuk a Portsnapet, bontsuk ki az imént letöltött állapotot a - /usr/ports + /usr/ports könyvtárba: &prompt.root; portsnap extract Ha viszont már korábban is létezett - a /usr/ports + a /usr/ports könyvtárunk és most csak frissítjük, akkor helyette ezt a parancsot adjuk ki: @@ -1729,7 +1729,7 @@ role="package">ports-mgmt/portmanager porton keresztül érhetõ el: - &prompt.root; cd /usr/ports/ports-mgmt/portmanager + &prompt.root; cd /usr/ports/ports-mgmt/portmanager &prompt.root; make install clean Használatával az összes @@ -1791,7 +1791,7 @@ role="package">ports-mgmt/portmaster portból érhetõ el: - &prompt.root; cd /usr/ports/ports-mgmt/portmaster + &prompt.root; cd /usr/ports/ports-mgmt/portmaster &prompt.root; make install clean A Portmaster a portokat az ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#8 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -571,7 +571,7 @@ és így tovább. A nyomtatóeszköz elnevezése ugyanezt a sémát követi: a /dev/lpt0 lesz az elsõ + class="devicefile">/dev/lpt0 lesz az elsõ párhuzamos porton levõ nyomtató stb. @@ -1083,7 +1083,7 @@ állományba is, amire aztán adjuk ki az alábbi parancsot: - &prompt.root; cat állomány > /dev/lptN + &prompt.root; cat állomány > /dev/lptN ahol az állomány a @@ -1550,7 +1550,7 @@ könyvtárat az adott nyomtató nevén. Erre példa: - &prompt.root; mkdir /var/spool/nyomtatónév + &prompt.root; mkdir /var/spool/nyomtatónév Azonban ha a hálózatunkon rengeteg nyomtató található, akkor @@ -1612,7 +1612,7 @@ adunk meg semmilyen nyomtatási könyvtárat, akkor ennek az értéke alapértelmezés szerint a /var/spool/lpd lesz. + class="directory">/var/spool/lpd lesz. @@ -2203,7 +2203,7 @@ /etc/printcap) állományban az lf tulajdonsággal adhatjuk meg, vagy alapértelmezés szerinti a - /dev/console állományba + /dev/console állományba kerül). troff @@ -2949,10 +2949,10 @@ Mivel a konverziós szûrõk az alap &os; rendszeren kívülre kerülnek, ezért ezeket minden valószínûség szerint - valahol a /usr/local + valahol a /usr/local könyvtárban találjuk meg. Ezen belül is általában a - /usr/local/libexec + /usr/local/libexec könyvtárban fordulnak elõ, mivel ezeket csak az LPD futtatja, senki másnak nincs rájuk @@ -3100,7 +3100,7 @@ /etc/printcap állományba: - :tf=/usr/local/libexec/pstf: + :tf=/usr/local/libexec/pstf: Most pedig jöjjön a FORTRAN szerelmeseinek szívét megmelengetõ szkript. Ez egy @@ -4353,9 +4353,9 @@ megfelelõ nyomtatási könyvtárakat az orchid nevû gépen: - &prompt.root; mkdir /var/spool/lpd/rattan /var/spool/lpd/bamboo -&prompt.root; chmod 770 /var/spool/lpd/rattan /var/spool/lpd/bamboo -&prompt.root; chown daemon:daemon /var/spool/lpd/rattan /var/spool/lpd/bamboo + &prompt.root; mkdir /var/spool/lpd/rattan /var/spool/lpd/bamboo +&prompt.root; chmod 770 /var/spool/lpd/rattan /var/spool/lpd/bamboo +&prompt.root; chown daemon:daemon /var/spool/lpd/rattan /var/spool/lpd/bamboo Mostantól kezdve az orchid felhasználói képesek lesznek nyomtatni a @@ -4369,9 +4369,9 @@ Az orchid gépen mûködõ LPD rendszer ezt a munkát a bemásolja a - /var/spool/lpd/bamboo nevû - nyomtatási könyvtárba és feljegyzi - róla, hogy a nyomtatásához DVI + /var/spool/lpd/bamboo + nevû nyomtatási könyvtárba és + feljegyzi róla, hogy a nyomtatásához DVI szûrõre lesz szükség. Ahogy rose gépen található bamboo nyomtatási ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#9 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -3862,7 +3862,7 @@ Erre azért van szükség, mert a Kerberos MIT változata a /usr/local könyvtáron + class="directory">/usr/local könyvtáron belülre telepíti fel a hozzátartozó alkalmazásokat. @@ -5768,7 +5768,7 @@ segédprogramja, amit kizárólag erre a célra hoztak létre. - A ports-mgmt/portaudit port + A ports-mgmt/portaudit port egy adatbázist használ, ahol a &os; biztonsági csapata és a portok fejlesztõi tartják karban az ismert biztonsági ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2495,7 +2495,7 @@ segítségével tudjuk áttölteni a számítógépünkre. - + A gyári Hayes-modem erre nem alkalmas, mihez tudunk vele kezdeni? @@ -2566,7 +2566,7 @@ - + A pn tulajdonságnál a <literal>@</literal> jel nem használható! @@ -2587,7 +2587,7 @@ - + Hogyan hívjunk fel egy számot parancssorból? @@ -2619,7 +2619,7 @@ - + Ehhez minden adandó alkalommal meg kell adnom a sebességet is? @@ -2635,7 +2635,7 @@ - + A terminálszerveren keresztül több más gépet is elérek @@ -2665,7 +2665,7 @@ - + Több vonalon is lehet egy géphez csatlakozni? @@ -2704,7 +2704,7 @@ - + Miért kell kétszer lenyomni a <keycombo action="simul"> <keycap>Ctrl</keycap> @@ -2764,7 +2764,7 @@ </sect2> - <sect2> + <sect2 id="uppercase"> <title>Miért lett hirtelen minden begépelt betû nagybetûs?? @@ -2811,7 +2811,7 @@ - + Hogyan mozgassunk állományokat a <command>tip</command> használatával? @@ -2843,7 +2843,7 @@ - + Hogyan lehet zmodemet használni a <command>tip</command> programban? From owner-p4-projects@FreeBSD.ORG Sun Aug 10 11:23:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E6191065683; Sun, 10 Aug 2008 11:23:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7B2F1065679 for ; Sun, 10 Aug 2008 11:23:00 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC5598FC1B for ; Sun, 10 Aug 2008 11:23:00 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABN0wo082861 for ; Sun, 10 Aug 2008 11:23:00 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABN0ow082859 for perforce@freebsd.org; Sun, 10 Aug 2008 11:23:00 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 10 Aug 2008 11:23:00 GMT Message-Id: <200808101123.m7ABN0ow082859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 11:23:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147073 Change 147073 by pgj@disznohal on 2008/08/10 11:22:21 MFen: 1.16 -> 1.18 hu/administration.sgml 1.3 -> 1.4 hu/community/irc.sgml 1.8 -> 1.9 hu/developers/cvs.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/community/irc.sgml#8 edit .. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#9 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#8 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -170,13 +170,13 @@

&os; Documentation Engineering Team @@ -219,6 +219,7 @@
  • &a.linimon; <linimon@FreeBSD.org>
  • &a.pav; <pav@FreeBSD.org>
  • &a.krion; <krion@FreeBSD.org>
    • +
  • &a.flz; <flz@FreeBSD.org>
    • ==== //depot/projects/docproj_hu/www/hu/community/irc.sgml#8 (text+ko) ==== @@ -9,7 +9,7 @@ ==== //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#9 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -66,10 +66,12 @@ alábbi helyeken is elérhetõek: Amerikai Egyesült Államok, Kalifornia Cseh Köztársaság, + Dánia, + Japán, Kanada, - Portugália és Ukrajna. From owner-p4-projects@FreeBSD.ORG Sun Aug 10 11:28:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B67106566B; Sun, 10 Aug 2008 11:28:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7601B106567F for ; Sun, 10 Aug 2008 11:28:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 512058FC19 for ; Sun, 10 Aug 2008 11:28:06 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABS5Dj083215 for ; Sun, 10 Aug 2008 11:28:05 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABS5gW083213 for perforce@freebsd.org; Sun, 10 Aug 2008 11:28:05 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 10 Aug 2008 11:28:05 GMT Message-Id: <200808101128.m7ABS5gW083213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 11:28:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=147074 Change 147074 by pgj@disznohal on 2008/08/10 11:27:12 Fix %SOURCE% tag for share/sgml/libcommon.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#5 (text+ko) ==== @@ -5,7 +5,7 @@ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 11:47:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DF641065671; Sun, 10 Aug 2008 11:47:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE18E106564A for ; Sun, 10 Aug 2008 11:47:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D364D8FC0A for ; Sun, 10 Aug 2008 11:47:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABlPRI084767 for ; Sun, 10 Aug 2008 11:47:25 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABlPcX084765 for perforce@freebsd.org; Sun, 10 Aug 2008 11:47:25 GMT (envelope-from gabor@freebsd.org) Date: Sun, 10 Aug 2008 11:47:25 GMT Message-Id: <200808101147.m7ABlPcX084765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 11:47:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147076 Change 147076 by gabor@gabor_server on 2008/08/10 11:47:24 - Fall back to regexec() if --color or -o is set because the fixed string code doesn't handle them. If I can fix it then we can revert this change. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#73 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#73 (text+ko) ==== @@ -599,10 +599,13 @@ */ for (i = 0; i < patterns; ++i) { /* Check if cheating is allowed (always is for fgrep). */ - if (grepbehave == GREP_FIXED) + if (grepbehave == GREP_FIXED && !color && !oflag) fgrepcomp(&fg_pattern[i], pattern[i]); else { + if (oflag || color) + goto fallback; if (fastcomp(&fg_pattern[i], pattern[i])) { +fallback: /* Fall back to full regex library */ c = regcomp(&r_pattern[i], pattern[i], cflags); if (c != 0) { From owner-p4-projects@FreeBSD.ORG Sun Aug 10 13:01:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61E0D1065672; Sun, 10 Aug 2008 13:01:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D563106566C for ; Sun, 10 Aug 2008 13:01:41 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02D6E8FC18 for ; Sun, 10 Aug 2008 13:01:41 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AD1e5Z001218 for ; Sun, 10 Aug 2008 13:01:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AD1eZ8001216 for perforce@freebsd.org; Sun, 10 Aug 2008 13:01:40 GMT (envelope-from trasz@freebsd.org) Date: Sun, 10 Aug 2008 13:01:40 GMT Message-Id: <200808101301.m7AD1eZ8001216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 13:01:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=147078 Change 147078 by trasz@trasz_traszkan on 2008/08/10 13:01:20 Parse appended id. Note that it's not really compatible with Sun's implementation - they tend to omit "flags" field; parsing it in that form would be harder. Sun folks just use yacc parser. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_from_text_nfs4.c#6 (text+ko) ==== @@ -43,9 +43,15 @@ #define MAX_ENTRY_LENGTH 512 +/* + * Parse the tag field of ACL entry passed as "str". If qualifier + * needs to follow, then the variable referenced by "need_qualifier" + * is set to 1, otherwise it's set to 0. + */ static int parse_tag(const char *str, acl_entry_t entry, int *need_qualifier) { + assert(need_qualifier != NULL); *need_qualifier = 0; if (strcmp(str, "owner@") == 0) @@ -70,8 +76,13 @@ return (-1); } +/* + * Parse the qualifier field of ACL entry passed as "str". + * If user or group name cannot be resolved, then the variable + * referenced by "need_qualifier" is set to 1. + */ static int -parse_qualifier(char *str, acl_entry_t entry) +parse_qualifier(char *str, acl_entry_t entry, int *need_qualifier) { int qualifier_length, error; id_t id; @@ -80,6 +91,9 @@ struct group *grp; acl_tag_t tag; + assert(need_qualifier != NULL); + *need_qualifier = 0; + qualifier_length = strlen(str); if (qualifier_length == 0) { @@ -110,8 +124,8 @@ /* XXX: Thread-unsafe. */ pwd = getpwnam(str); if (pwd == NULL) { - warnx("malformed ACL: unknown user \"%s\"", str); - return (-1); + *need_qualifier = 1; + return (0); } return (acl_set_qualifier(entry, &(pwd->pw_uid))); @@ -120,8 +134,8 @@ /* XXX: Thread-unsafe. */ grp = getgrnam(str); if (grp == NULL) { - warnx("malformed ACL: unknown group \"%s\"", str); - return (-1); + *need_qualifier = 1; + return (0); } return (acl_set_qualifier(entry, &(grp->gr_gid))); @@ -176,6 +190,29 @@ } static int +parse_appended_id(char *str, acl_entry_t entry) +{ + int qualifier_length; + char *end; + id_t id; + + qualifier_length = strlen(str); + if (qualifier_length == 0) { + warnx("malformed ACL: \"appended id\" field present, " + "but empty"); + return (-1); + } + + id = strtod(str, &end); + if (end - str != qualifier_length) { + warnx("malformed ACL: appended id is not a number"); + return (-1); + } + + return (acl_set_qualifier(entry, &id)); +} + +static int number_of_colons(const char *str) { int count = 0; @@ -195,7 +232,7 @@ { int error, need_qualifier; acl_entry_t entry; - char *field; + char *field, *qualifier_field; error = acl_create_entry(&aclp, &entry); if (error) @@ -223,8 +260,8 @@ if (need_qualifier) { if (str == NULL) goto truncated_entry; - field = strsep(&str, ":"); - error = parse_qualifier(field, entry); + qualifier_field = field = strsep(&str, ":"); + error = parse_qualifier(field, entry, &need_qualifier); if (error) goto malformed_field; } @@ -248,10 +285,23 @@ if (str == NULL) goto truncated_entry; - error = parse_extended(str, entry); + field = strsep(&str, ":"); + error = parse_extended(field, entry); if (error) goto malformed_field; + if (need_qualifier) { + if (str == NULL) { + warnx("malformed ACL: unknown user or group name " + "\"%s\"", qualifier_field); + goto truncated_entry; + } + + error = parse_appended_id(str, entry); + if (error) + goto malformed_field; + } + return (0); truncated_entry: From owner-p4-projects@FreeBSD.ORG Sun Aug 10 13:54:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0641C106567D; Sun, 10 Aug 2008 13:54:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDC451065671 for ; Sun, 10 Aug 2008 13:54:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B48188FC0C for ; Sun, 10 Aug 2008 13:54:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ADsYMR006425 for ; Sun, 10 Aug 2008 13:54:34 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ADsYOJ006423 for perforce@freebsd.org; Sun, 10 Aug 2008 13:54:34 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 13:54:34 GMT Message-Id: <200808101354.m7ADsYOJ006423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 13:54:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=147079 Change 147079 by ed@ed_dull on 2008/08/10 13:53:39 Correct a comment on TF_HIWAT_IN. Affected files ... .. //depot/projects/mpsafetty/sys/sys/tty.h#8 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/tty.h#8 (text+ko) ==== @@ -73,7 +73,7 @@ #define TF_OPENCLOSE 0x0040 /* Device is in open()/close() */ #define TF_ASYNC 0x0080 /* Asynchronous I/O enabled */ #define TF_LITERAL 0x0100 /* Accept the next character literally */ -#define TF_HIWAT_IN 0x0200 /* We've reached the output watermark */ +#define TF_HIWAT_IN 0x0200 /* We've reached the input watermark */ #define TF_HIWAT_OUT 0x0400 /* We've reached the output watermark */ #define TF_HIWAT (TF_HIWAT_IN|TF_HIWAT_OUT) #define TF_STOPPED 0x0800 /* Output flow control - stopped */ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 14:02:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51A89106567A; Sun, 10 Aug 2008 14:02:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13D311065675 for ; Sun, 10 Aug 2008 14:02:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08CD98FC14 for ; Sun, 10 Aug 2008 14:02:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AE2gAf007060 for ; Sun, 10 Aug 2008 14:02:42 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AE2gcP007058 for perforce@freebsd.org; Sun, 10 Aug 2008 14:02:42 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 14:02:42 GMT Message-Id: <200808101402.m7AE2gcP007058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 14:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147080 Change 147080 by ed@ed_dull on 2008/08/10 14:02:17 IFC. Affected files ... .. //depot/projects/mpsafetty/games/random/random.c#3 integrate .. //depot/projects/mpsafetty/games/random/randomize_fd.c#3 integrate .. //depot/projects/mpsafetty/games/random/randomize_fd.h#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/mpsafetty/sbin/geom/class/virstor/geom_virstor.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/mpsafetty/sys/conf/files#10 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#3 integrate .. //depot/projects/mpsafetty/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/mpsafetty/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/mpsafetty/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/mpsafetty/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/mpsafetty/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/mpsafetty/sys/i386/conf/NOTES#4 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#8 integrate .. //depot/projects/mpsafetty/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/sis/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/xl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_sis.c#3 delete .. //depot/projects/mpsafetty/sys/pci/if_sisreg.h#2 delete .. //depot/projects/mpsafetty/sys/pci/if_xl.c#2 delete .. //depot/projects/mpsafetty/sys/pci/if_xlreg.h#2 delete .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/mpsafetty/usr.bin/window/:tt#2 delete .. //depot/projects/mpsafetty/usr.bin/window/:tty#2 delete .. //depot/projects/mpsafetty/usr.bin/window/:var#2 delete .. //depot/projects/mpsafetty/usr.bin/window/:ww#2 delete Differences ... ==== //depot/projects/mpsafetty/games/random/random.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/random/random.c,v 1.22 2008/08/08 01:42:17 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/random.c,v 1.23 2008/08/10 11:31:56 ache Exp $"); #include @@ -162,7 +162,7 @@ /* Compute a random exit status between 0 and denom - 1. */ if (random_exit) - return (int)(denom * random() / RANDOM_MAX); + return (int)(denom * random() / RANDOM_MAX_PLUS1); /* * Select whether to print the first line. (Prime the pump.) @@ -170,7 +170,7 @@ * 0 (which has a 1 / denom chance of being true), we select the * line. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0; while ((ch = getchar()) != EOF) { if (selected) (void)putchar(ch); @@ -180,7 +180,7 @@ err(2, "stdout"); /* Now see if the next line is to be printed. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0; } } if (ferror(stdin)) ==== //depot/projects/mpsafetty/games/random/randomize_fd.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.5 2008/08/08 02:46:47 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.6 2008/08/10 11:31:56 ache Exp $"); #include #include @@ -48,13 +48,10 @@ { struct rand_node *n; - n = (struct rand_node *)malloc(sizeof(struct rand_node)); + n = (struct rand_node *)calloc(1, sizeof(struct rand_node)); if (n == NULL) - err(1, "malloc"); + err(1, "calloc"); - n->len = 0; - n->cp = NULL; - n->next = NULL; return(n); } @@ -175,9 +172,9 @@ (type == RANDOM_TYPE_WORDS && isspace(buf[i])) || (eof && i == buflen - 1)) { make_token: - if (numnode == RANDOM_MAX) { + if (numnode == RANDOM_MAX_PLUS1) { errno = EFBIG; - err(1, "too many lines"); + err(1, "too many delimiters"); } numnode++; n = rand_node_allocate(); @@ -215,7 +212,7 @@ if (n->cp == NULL) break; - if ((int)(denom * random() / RANDOM_MAX) == 0) { + if ((int)(denom * random() / RANDOM_MAX_PLUS1) == 0) { ret = printf("%.*s", (int)n->len - 1, n->cp); if (ret < 0) err(1, "printf"); ==== //depot/projects/mpsafetty/games/random/randomize_fd.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/games/random/randomize_fd.h,v 1.3 2008/08/08 01:42:17 ache Exp $ + * $FreeBSD: src/games/random/randomize_fd.h,v 1.4 2008/08/10 11:31:56 ache Exp $ */ #ifndef __RANDOMIZE_FD__ @@ -33,7 +33,7 @@ * The random() function is defined to return values between 0 and * 2^31 - 1 inclusive in random(3). */ -#define RANDOM_MAX 0x80000000UL +#define RANDOM_MAX_PLUS1 0x80000000UL #define RANDOM_TYPE_UNSET 0 #define RANDOM_TYPE_LINES 1 ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_ar.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.7 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.8 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -389,6 +389,9 @@ ar = (struct ar_w *)a->format_data; + if (ar == NULL) + return (ARCHIVE_OK); + if (ar->has_strtab > 0) { free(ar->strtab); ar->strtab = NULL; ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_set_format_pax.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.47 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.48 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1200,6 +1200,9 @@ struct pax *pax; pax = (struct pax *)a->format_data; + if (pax == NULL) + return (ARCHIVE_OK); + archive_string_free(&pax->pax_header); free(pax); a->format_data = NULL; ==== //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.5 2008/06/26 11:50:11 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.6 2008/08/10 03:13:42 kientzle Exp $"); DEFINE_TEST(test_read_format_zip) { @@ -51,12 +51,14 @@ assertEqualString("file1", archive_entry_pathname(ae)); assertEqualInt(1179604289, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("archive_read_data() returns number of bytes read"); assertEqualInt(18, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); ==== //depot/projects/mpsafetty/sbin/geom/class/virstor/geom_virstor.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.2 2007/11/18 03:17:56 jb Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.3 2008/08/09 16:47:30 ivoras Exp $"); #include #include @@ -157,7 +157,6 @@ off_t mediasize; u_char *sector; int error, fd; - ssize_t abc; pathgen(name, path, sizeof(path)); sector = NULL; @@ -183,7 +182,7 @@ goto out; } bcopy(md, sector, size); - if ((abc = pwrite(fd, sector, sectorsize, mediasize - sectorsize)) != + if (pwrite(fd, sector, sectorsize, mediasize - sectorsize) != (ssize_t)sectorsize) { error = errno; goto out; @@ -273,7 +272,7 @@ (size_t)(md.md_virsize/(1024 * 1024))); } - msize = secsize = ssize = 0; + msize = secsize = 0; for (i = 1; i < (unsigned)nargs; i++) { snprintf(param, sizeof(param), "arg%u", i); name = gctl_get_ascii(req, param); @@ -291,6 +290,11 @@ } } + if (secsize == 0) { + gctl_error(req, "Device not specified"); + return; + } + if (md.md_chunk_size % secsize != 0) { fprintf(stderr, "Error: chunk size is not a multiple of sector " "size."); ==== //depot/projects/mpsafetty/share/man/man4/man4.i386/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.188 2008/07/04 21:06:57 jhb Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.189 2008/08/09 14:54:19 philip Exp $ MAN= acpi_aiboost.4 \ acpi_asus.4 \ @@ -22,6 +22,7 @@ ep.4 \ ex.4 \ fe.4 \ + glxsb.4 \ ichwd.4 \ ie.4 \ io.4 \ ==== //depot/projects/mpsafetty/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1321 2008/07/31 03:51:53 emax Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1323 2008/08/10 10:00:14 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1100,6 +1100,7 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci +dev/sis/if_sis.c optional sis pci dev/sk/if_sk.c optional sk pci dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus @@ -1346,6 +1347,7 @@ clean "wpi.fw" dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +dev/xl/if_xl.c optional xl pci fs/coda/coda_fbsd.c optional vcoda fs/coda/coda_psdev.c optional vcoda fs/coda/coda_subr.c optional vcoda @@ -2086,11 +2088,9 @@ pci/if_mn.c optional mn pci pci/if_pcn.c optional pcn pci pci/if_rl.c optional rl pci -pci/if_sis.c optional sis pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci pci/if_wb.c optional wb pci -pci/if_xl.c optional xl pci pci/intpm.c optional intpm pci pci/ncr.c optional ncr pci pci/nfsmb.c optional nfsmb pci ==== //depot/projects/mpsafetty/sys/conf/files.i386#3 (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.601 2008/08/08 16:26:53 stas Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.602 2008/08/09 14:52:31 philip Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -175,6 +175,8 @@ dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard dev/fe/if_fe_isa.c optional fe isa +dev/glxsb/glxsb.c optional glxsb +dev/glxsb/glxsb_hash.c optional glxsb dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv dev/hptmv/gui_lib.c optional hptmv ==== //depot/projects/mpsafetty/sys/crypto/via/padlock.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005-2006 Pawel Jakub Dawidek + * Copyright (c) 2005-2008 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.14 2008/07/20 07:34:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.20 2008/08/09 20:01:01 pjd Exp $"); #include #include @@ -59,12 +59,14 @@ struct padlock_softc { int32_t sc_cid; uint32_t sc_sid; - TAILQ_HEAD(, padlock_session) sc_sessions; + TAILQ_HEAD(padlock_sessions_head, padlock_session) sc_sessions; struct rwlock sc_sessions_lock; }; static int padlock_newsession(device_t, uint32_t *sidp, struct cryptoini *cri); static int padlock_freesession(device_t, uint64_t tid); +static void padlock_freesession_one(struct padlock_softc *sc, + struct padlock_session *ses, int locked); static int padlock_process(device_t, struct cryptop *crp, int hint __unused); MALLOC_DEFINE(M_PADLOCK, "padlock_data", "PadLock Data"); @@ -152,8 +154,7 @@ return (EBUSY); } } - for (ses = TAILQ_FIRST(&sc->sc_sessions); ses != NULL; - ses = TAILQ_FIRST(&sc->sc_sessions)) { + while ((ses = TAILQ_FIRST(&sc->sc_sessions)) != NULL) { TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); free(ses, M_PADLOCK); } @@ -214,35 +215,30 @@ * allocate one. */ ses = TAILQ_FIRST(&sc->sc_sessions); - if (ses == NULL || ses->ses_used) - ses = NULL; - else { - TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); - ses->ses_used = 1; - TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); - } - rw_wunlock(&sc->sc_sessions_lock); - if (ses == NULL) { + if (ses == NULL || ses->ses_used) { ses = malloc(sizeof(*ses), M_PADLOCK, M_NOWAIT | M_ZERO); - if (ses == NULL) + if (ses == NULL) { + rw_wunlock(&sc->sc_sessions_lock); return (ENOMEM); - ses->ses_used = 1; - rw_wlock(&sc->sc_sessions_lock); + } ses->ses_id = sc->sc_sid++; - TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); - rw_wunlock(&sc->sc_sessions_lock); + } else { + TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); } + ses->ses_used = 1; + TAILQ_INSERT_TAIL(&sc->sc_sessions, ses, ses_next); + rw_wunlock(&sc->sc_sessions_lock); error = padlock_cipher_setup(ses, encini); if (error != 0) { - padlock_freesession(NULL, ses->ses_id); + padlock_freesession_one(sc, ses, 0); return (error); } if (macini != NULL) { error = padlock_hash_setup(ses, macini); if (error != 0) { - padlock_freesession(NULL, ses->ses_id); + padlock_freesession_one(sc, ses, 0); return (error); } } @@ -251,6 +247,24 @@ return (0); } +static void +padlock_freesession_one(struct padlock_softc *sc, struct padlock_session *ses, + int locked) +{ + uint32_t sid = ses->ses_id; + + if (!locked) + rw_wlock(&sc->sc_sessions_lock); + TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); + padlock_hash_free(ses); + bzero(ses, sizeof(*ses)); + ses->ses_used = 0; + ses->ses_id = sid; + TAILQ_INSERT_HEAD(&sc->sc_sessions, ses, ses_next); + if (!locked) + rw_wunlock(&sc->sc_sessions_lock); +} + static int padlock_freesession(device_t dev, uint64_t tid) { @@ -259,7 +273,8 @@ uint32_t sid = ((uint32_t)tid) & 0xffffffff; rw_wlock(&sc->sc_sessions_lock); - TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { + TAILQ_FOREACH_REVERSE(ses, &sc->sc_sessions, padlock_sessions_head, + ses_next) { if (ses->ses_id == sid) break; } @@ -267,11 +282,7 @@ rw_wunlock(&sc->sc_sessions_lock); return (EINVAL); } - TAILQ_REMOVE(&sc->sc_sessions, ses, ses_next); - padlock_hash_free(ses); - bzero(ses, sizeof(*ses)); - ses->ses_used = 0; - TAILQ_INSERT_HEAD(&sc->sc_sessions, ses, ses_next); + padlock_freesession_one(sc, ses, 1); rw_wunlock(&sc->sc_sessions_lock); return (0); } @@ -323,7 +334,8 @@ } rw_rlock(&sc->sc_sessions_lock); - TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) { + TAILQ_FOREACH_REVERSE(ses, &sc->sc_sessions, padlock_sessions_head, + ses_next) { if (ses->ses_id == (crp->crp_sid & 0xffffffff)) break; } ==== //depot/projects/mpsafetty/sys/dev/pccbb/pccbb.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.169 2008/08/09 07:41:18 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.172 2008/08/10 09:55:14 imp Exp $"); #include #include @@ -158,7 +158,7 @@ static void cbb_insert(struct cbb_softc *sc); static void cbb_removal(struct cbb_softc *sc); static uint32_t cbb_detect_voltage(device_t brdev); -static void cbb_cardbus_reset(device_t brdev, int on); +static void cbb_cardbus_reset(device_t brdev, device_t child, int on); static int cbb_cardbus_io_open(device_t brdev, int win, uint32_t start, uint32_t end); static int cbb_cardbus_mem_open(device_t brdev, int win, @@ -927,7 +927,7 @@ /************************************************************************/ static void -cbb_cardbus_reset(device_t brdev, int on) +cbb_cardbus_reset(device_t brdev, device_t child, int on) { struct cbb_softc *sc = device_get_softc(brdev); uint32_t b; @@ -946,28 +946,30 @@ */ if (on && CBB_CARD_PRESENT(cbb_get(sc, CBB_SOCKET_STATE))) { /* - * After clearing reset, wait up to 1.1s for the vendor of - * device 0.0 to become != 0xffff. The PCMCIA PC Card Host - * System Specification says that when powering up the card, - * the PCI Spec v2.1 must be followed. In PCI spec v2.2 Table - * 4-6, Trhfa (Reset High to first Config Access) is at most - * 2^25 clocks, or just over 1s. Secont 2.2.1 states any card - * not ready to participate in bus transactions must tristate - * its outputs. Therefore, any access to its configuration - * registers must be ignored. In that state, the vendor will - * read 0xffff. Section 6.2.1 states a vendor id of 0xffff is - * invalid, so this can never match a real card. Print a - * warning if it never returns a real id. The PCMCIA PC Card - * Electrical Spec Section 5.2.7.1 implies only device 0. + * After clearing reset, wait up to 1.1s for the first + * configuration register (vendor/product) configuration + * register of device 0.0 to become != 0xffffffff. The PCMCIA + * PC Card Host System Specification says that when powering + * up the card, the PCI Spec v2.1 must be followed. In PCI + * spec v2.2 Table 4-6, Trhfa (Reset High to first Config + * Access) is at most 2^25 clocks, or just over 1s. Section + * 2.2.1 states any card not ready to participate in bus + * transactions must tristate its outputs. Therefore, any + * access to its configuration registers must be ignored. In + * that state, the config reg will read 0xffffffff. Section + * 6.2.1 states a vendor id of 0xffff is invalid, so this can + * never match a real card. Print a warning if it never + * returns a real id. The PCMCIA PC Card Electrical Spec + * Section 5.2.7.1 implies only device 0. */ PCI_MASK_CONFIG(brdev, CBBR_BRIDGECTRL, &~CBBM_BRIDGECTRL_RESET, 2); - b = pcib_get_bus(brdev); + b = pcib_get_bus(child); count = 1100 / 20; do { pause("cbbP4", hz * 2 / 100); - } while (PCIB_READ_CONFIG(brdev, b, 0, 0, PCIR_DEVVENDOR, 2) == - 0xfffful && --count >= 0); + } while (PCIB_READ_CONFIG(brdev, b, 0, 0, PCIR_DEVVENDOR, 4) == + 0xfffffffful && --count >= 0); if (count < 0) device_printf(brdev, "Warning: Bus reset timeout\n"); } @@ -985,7 +987,7 @@ err = cbb_do_power(brdev); if (err) return (err); - cbb_cardbus_reset(brdev, 1); + cbb_cardbus_reset(brdev, child, 1); return (0); } @@ -993,7 +995,7 @@ cbb_cardbus_power_disable_socket(device_t brdev, device_t child) { cbb_power(brdev, CARD_OFF); - cbb_cardbus_reset(brdev, 0); + cbb_cardbus_reset(brdev, child, 0); } /************************************************************************/ ==== //depot/projects/mpsafetty/sys/dev/usb/usb_quirks.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.65 2008/03/14 15:59:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.66 2008/08/09 22:25:13 brix Exp $"); #include #include @@ -106,6 +106,10 @@ ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE, + ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G, + ANY, { UQ_HID_IGNORE }}, /* Devices which should be ignored by both ukbd and uhid */ { USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_WISPY1A, ==== //depot/projects/mpsafetty/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.362 2008/08/02 12:15:18 remko Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.363 2008/08/09 22:25:13 brix Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -853,6 +853,8 @@ product APPLE IPOD_08 0x1208 iPod '08' product APPLE IPODVIDEO 0x1209 iPod Video product APPLE IPODNANO 0x120a iPod Nano +product APPLE IPHONE 0x1290 iPhone +product APPLE IPHONE_3G 0x1292 iPhone 3G product APPLE ETHERNET 0x1402 Ethernet A1277 /* Arkmicro Technologies */ ==== //depot/projects/mpsafetty/sys/i386/conf/NOTES#4 (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.1260 2008/08/08 16:26:53 stas Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1261 2008/08/09 14:52:31 philip Exp $ # # @@ -687,6 +687,12 @@ options SAFE_DEBUG # enable debugging support: hw.safe.debug options SAFE_RNDTEST # enable rndtest support +# +# glxsb is a driver for the Security Block in AMD Geode LX processors. +# Requires 'device crypto'. +# +device glxsb # AMD Geode LX Security Block + ##################################################################### # ==== //depot/projects/mpsafetty/sys/kern/vfs_mount.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.286 2008/08/09 11:14:05 des Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.287 2008/08/10 12:15:36 kib Exp $"); #include #include @@ -192,6 +192,8 @@ { struct vfsopt *opt, *temp; + if (opts == NULL) + return; TAILQ_FOREACH_SAFE(opt, opts, link, temp) { if (strcmp(opt->name, name) == 0) vfs_freeopt(opts, opt); ==== //depot/projects/mpsafetty/sys/modules/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.582 2008/08/08 16:26:53 stas Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.583 2008/08/09 14:52:31 philip Exp $ .include @@ -94,6 +94,7 @@ fxp \ gem \ geom \ + ${_glxsb} \ hatm \ hifn \ hme \ @@ -387,6 +388,7 @@ _exca= exca _ext2fs= ext2fs _fe= fe +_glxsb= glxsb _i2c= i2c _ibcs2= ibcs2 _ie= ie ==== //depot/projects/mpsafetty/sys/modules/sis/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/modules/sis/Makefile,v 1.11 2005/09/27 18:10:38 mlaier Exp $ +# $FreeBSD: src/sys/modules/sis/Makefile,v 1.12 2008/08/10 10:00:14 imp Exp $ -.PATH: ${.CURDIR}/../../pci +.PATH: ${.CURDIR}/../../dev/sis KMOD= if_sis SRCS= if_sis.c device_if.h bus_if.h pci_if.h ==== //depot/projects/mpsafetty/sys/modules/xl/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/modules/xl/Makefile,v 1.14 2005/09/27 18:10:41 mlaier Exp $ +# $FreeBSD: src/sys/modules/xl/Makefile,v 1.15 2008/08/10 09:45:52 imp Exp $ -.PATH: ${.CURDIR}/../../pci +.PATH: ${.CURDIR}/../../dev/xl KMOD= if_xl SRCS= if_xl.c device_if.h bus_if.h pci_if.h ==== //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.344 2008/08/06 14:47:19 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.345 2008/08/10 12:15:36 kib Exp $"); #include "opt_mac.h" #include "opt_quota.h" @@ -169,8 +169,7 @@ * persist "snapshot" in the options list. */ vfs_deleteopt(mp->mnt_optnew, "snapshot"); - if (mp->mnt_opt != NULL) - vfs_deleteopt(mp->mnt_opt, "snapshot"); + vfs_deleteopt(mp->mnt_opt, "snapshot"); } MNT_ILOCK(mp); ==== //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.34 2008/08/09 09:37:44 phk Exp $ +# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.35 2008/08/09 21:51:57 sam Exp $ # set -e @@ -650,6 +650,7 @@ ;; -i) do_image=false + ;; -w) shift; do_world=false From owner-p4-projects@FreeBSD.ORG Sun Aug 10 15:43:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3763106567E; Sun, 10 Aug 2008 15:43:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8748C106567A for ; Sun, 10 Aug 2008 15:43:25 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D4E68FC23 for ; Sun, 10 Aug 2008 15:43:25 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AFhPr8017589 for ; Sun, 10 Aug 2008 15:43:25 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AFhPnn017587 for perforce@freebsd.org; Sun, 10 Aug 2008 15:43:25 GMT (envelope-from snagg@FreeBSD.org) Date: Sun, 10 Aug 2008 15:43:25 GMT Message-Id: <200808101543.m7AFhPnn017587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 15:43:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147085 Change 147085 by snagg@snagg_macosx on 2008/08/10 15:42:31 Added tests for socket(2), bind(2) and connect(2). Bug fixes in various events, added check_sock to test struct sockaddr_in. Affected files ... .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#12 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#10 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_bind.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_connect.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_fork.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_kill.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#8 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_pipe.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_rename.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setauid.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#6 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setresuid.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#6 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_socket.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_stat.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_symlink.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_sysctl.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_waitpid.c#3 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#12 (text+ko) ==== @@ -244,6 +244,18 @@ return (0); } + +/* + * Check a sockaddr_in struct + */ +int check_sock(au_socketinet32_t s , struct sockaddr_in a) +{ + if( s.family == a.sin_family && s.port == a.sin_port && + s.addr == a.sin_addr.s_addr) + return (1); + + return (0); +} /* * Check the return value of a bsm-token ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#10 (text+ko) ==== @@ -31,12 +31,15 @@ #include #include #include +#include #include #include #include +#include + #include #include #include @@ -121,6 +124,7 @@ char get_c(char *string); FILE *init_log(pid_t pid); void report_error(tokenstr_t tok, FILE *f); +void report_error_string(char *str, FILE *f); int check_exit(au_exit_t ex, int val); int check_text(au_text_t text, char *val); int check_ret(au_ret32_t ret, int r, char *val); @@ -131,3 +135,4 @@ int check_ext_priv(au_proc32_t pr, struct priv p); int check_priv_child(au_proc32ex_t pr, struct priv p); int check_attr_path(au_attr32_t attr, char *path); +int check_sock(au_socketinet32_t s , struct sockaddr_in a); ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#4 (text+ko) ==== @@ -192,11 +192,11 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_ATTR)) report_error_string("Missing Attribute token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; if(tmp->next != NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_fork.c#3 (text+ko) ==== @@ -159,9 +159,9 @@ to_parse = WAITING; if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; if(tmp->next != NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_kill.c#4 (text+ko) ==== @@ -241,11 +241,11 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PROCESS)) report_error_string("Missing Process token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; arg_counter = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#8 (text+ko) ==== @@ -211,15 +211,15 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_ATTR)) report_error_string("Missing Attribute token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || tmp->arg3 && arg_counter != 2 || !tmp->arg3 && arg_counter != 1) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) report_error_string("Missing Path token", f); control_flag = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_pipe.c#2 (text+ko) ==== @@ -164,9 +164,9 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; if(tmp->next != NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_rename.c#3 (text+ko) ==== @@ -208,11 +208,11 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_ATTR)) report_error_string("Missing Attribute token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH) || path_counter != 2) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH) || path_counter != 2) report_error_string("Missing Path token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; path_counter = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setauid.c#3 (text+ko) ==== @@ -182,9 +182,9 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#6 (text+ko) ==== @@ -181,9 +181,9 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; if(tmp->next != NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setresuid.c#3 (text+ko) ==== @@ -189,9 +189,9 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 3) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 3) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; arg_counter = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#6 (text+ko) ==== @@ -179,9 +179,9 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; if(tmp->next != NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_stat.c#2 (text+ko) ==== @@ -164,11 +164,11 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_ATTR)) report_error_string("Missing Attribute token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) report_error_string("Missing Path token", f); control_flag = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_symlink.c#3 (text+ko) ==== @@ -193,11 +193,11 @@ to_parse = WAITING; if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_TEXT)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_TEXT)) report_error_string("Missing Text token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_PATH)) report_error_string("Missing Path token", f); control_flag = 0; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_sysctl.c#2 (text+ko) ==== @@ -179,11 +179,12 @@ to_parse = WAITING; if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG) || arg_counter != 2) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; + arg_counter = 0; if(tmp->next != NULL) tmp = tmp->next; break; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_waitpid.c#3 (text+ko) ==== @@ -161,9 +161,9 @@ to_parse = WAITING; if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_SUBJECT)) report_error_string("Missing Subject token", f); - else if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) + if (!TOKEN_FLAG_ISSET(control_flag, TOKEN_ARG)) report_error_string("Missing Argument token", f); - else if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) + if(!TOKEN_FLAG_ISSET(control_flag, TOKEN_RETURN)) report_error_string("Missing Return token", f); control_flag = 0; From owner-p4-projects@FreeBSD.ORG Sun Aug 10 16:16:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFBBA1065675; Sun, 10 Aug 2008 16:16:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 825B4106564A for ; Sun, 10 Aug 2008 16:16:59 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7A0278FC1E for ; Sun, 10 Aug 2008 16:16:59 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AGGx9T021331 for ; Sun, 10 Aug 2008 16:16:59 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AGGxB5021329 for perforce@freebsd.org; Sun, 10 Aug 2008 16:16:59 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 10 Aug 2008 16:16:59 GMT Message-Id: <200808101616.m7AGGxB5021329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 16:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147086 Change 147086 by snb@snb_toro on 2008/08/10 16:16:20 I don't need all these files in this branch. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/README.acls#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/README.extattr#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/acl.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dinode.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dir.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/extattr.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/gjournal.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/inode.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/quota.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_acl.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_bmap.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_extattr.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_extern.h#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_gjournal.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_inode.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_lookup.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_quota.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_vfsops.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_vnops.c#2 delete .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufsmount.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 10 16:48:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E701065687; Sun, 10 Aug 2008 16:48:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4066106567F for ; Sun, 10 Aug 2008 16:48:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C82F8FC0C for ; Sun, 10 Aug 2008 16:48:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AGmV3L033192 for ; Sun, 10 Aug 2008 16:48:31 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AGmVL2033190 for perforce@freebsd.org; Sun, 10 Aug 2008 16:48:31 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 16:48:31 GMT Message-Id: <200808101648.m7AGmVL2033190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 16:48:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147088 Change 147088 by ed@ed_dull on 2008/08/10 16:48:23 Already add some deleted files to ObsoleteFiles.inc. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#5 edit Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#5 (text+ko) ==== @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080820: MPSAFE TTY layer integrated +OLD_FILES+=usr/include/sys/linedisc.h +OLD_FILES+=usr/share/man3/posix_openpt.3.gz # 20080725: sgtty.h removed OLD_FILES+=usr/include/sgtty.h # 20080719: sade(8) removed on all but amd64, i386 and sparc64 From owner-p4-projects@FreeBSD.ORG Sun Aug 10 16:49:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3350A1065671; Sun, 10 Aug 2008 16:49:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8142106567B for ; Sun, 10 Aug 2008 16:49:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C66A88FC20 for ; Sun, 10 Aug 2008 16:49:32 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AGnW61033264 for ; Sun, 10 Aug 2008 16:49:32 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AGnW1W033262 for perforce@freebsd.org; Sun, 10 Aug 2008 16:49:32 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 16:49:32 GMT Message-Id: <200808101649.m7AGnW1W033262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 16:49:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147089 Change 147089 by ed@ed_dull on 2008/08/10 16:49:21 Small typo in the manpage pathname. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#6 edit Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#6 (text+ko) ==== @@ -16,7 +16,7 @@ # 20080820: MPSAFE TTY layer integrated OLD_FILES+=usr/include/sys/linedisc.h -OLD_FILES+=usr/share/man3/posix_openpt.3.gz +OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz # 20080725: sgtty.h removed OLD_FILES+=usr/include/sgtty.h # 20080719: sade(8) removed on all but amd64, i386 and sparc64 From owner-p4-projects@FreeBSD.ORG Sun Aug 10 16:50:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DC2106566B; Sun, 10 Aug 2008 16:50:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BD53106567F for ; Sun, 10 Aug 2008 16:50:34 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EEA5E8FC1D for ; Sun, 10 Aug 2008 16:50:33 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AGoXuA033390 for ; Sun, 10 Aug 2008 16:50:33 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AGoX04033388 for perforce@freebsd.org; Sun, 10 Aug 2008 16:50:33 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 10 Aug 2008 16:50:33 GMT Message-Id: <200808101650.m7AGoX04033388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 16:50:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=147090 Change 147090 by snb@snb_unagi on 2008/08/10 16:49:48 Scripts for benchmarking dirhash performance for somewhat large vfs.ufs.dirhash_maxmem values. Affected files ... .. //depot/projects/soc2008/snb-dirhash/benchmark/dirhash_benchmark.sh#1 add .. //depot/projects/soc2008/snb-dirhash/benchmark/run_multiple.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Aug 10 16:51:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD9AD1065676; Sun, 10 Aug 2008 16:51:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 814A71065672 for ; Sun, 10 Aug 2008 16:51:35 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FEC68FC23 for ; Sun, 10 Aug 2008 16:51:35 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AGpZ46033474 for ; Sun, 10 Aug 2008 16:51:35 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AGpY1v033472 for perforce@freebsd.org; Sun, 10 Aug 2008 16:51:34 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 10 Aug 2008 16:51:34 GMT Message-Id: <200808101651.m7AGpY1v033472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 16:51:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=147091 Change 147091 by snb@snb_unagi on 2008/08/10 16:51:31 These should be executable. Affected files ... .. //depot/projects/soc2008/snb-dirhash/benchmark/dirhash_benchmark.sh#2 edit .. //depot/projects/soc2008/snb-dirhash/benchmark/run_multiple.sh#2 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/benchmark/dirhash_benchmark.sh#2 (kxtext/text+ko) ==== ==== //depot/projects/soc2008/snb-dirhash/benchmark/run_multiple.sh#2 (kxtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Aug 10 17:31:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF3A41065670; Sun, 10 Aug 2008 17:31:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50B821065673 for ; Sun, 10 Aug 2008 17:31:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 491BA8FC21 for ; Sun, 10 Aug 2008 17:31:15 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AHVFPV037590 for ; Sun, 10 Aug 2008 17:31:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AHVF7a037588 for perforce@freebsd.org; Sun, 10 Aug 2008 17:31:15 GMT (envelope-from gabor@freebsd.org) Date: Sun, 10 Aug 2008 17:31:15 GMT Message-Id: <200808101731.m7AHVF7a037588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 17:31:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=147092 Change 147092 by gabor@gabor_server on 2008/08/10 17:30:17 - Fixed string code can now use the starting position to continue searching - Reversed searching cannot be used when we are using -o or --color, because we need to count and record the matches then - Thus now we are using the fixed string code in the former cases with the modifications Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#5 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#74 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#73 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#5 (text+ko) ==== @@ -169,7 +169,7 @@ */ if ((!(lflag || cflag)) && ((!(bol || eol)) && ((lastHalfDot) && ((firstHalfDot < 0) || - ((fg->patternLen - (lastHalfDot + 1)) < firstHalfDot))))) { + ((fg->patternLen - (lastHalfDot + 1)) < firstHalfDot)))) && !oflag && !color) { fg->reversedSearch = 1; hasDot = fg->patternLen - (firstHalfDot < 0 ? firstLastHalfDot : firstHalfDot) - 1; @@ -228,8 +228,14 @@ int j; int rtrnVal = REG_NOMATCH; - pmatch->rm_so = -1; - pmatch->rm_eo = -1; + if (pmatch->rm_so == dataLen) + return (rtrnVal); + + if (fg->bol && pmatch->rm_so != 0) { + pmatch->rm_so = dataLen; + pmatch->rm_eo = dataLen; + return (rtrnVal); + } /* No point in going farther if we do not have enough data. */ if (dataLen < fg->patternLen) @@ -258,7 +264,7 @@ j = dataLen; do { if (grep_cmp(fg->pattern, data + j - fg->patternLen, - fg->patternLen) == -1) { + fg->patternLen) == -1) { pmatch->rm_so = j - fg->patternLen; pmatch->rm_eo = j; rtrnVal = 0; @@ -271,7 +277,7 @@ } while (j >= fg->patternLen); } else { /* Quick Search algorithm. */ - j = 0; + j = pmatch->rm_so; do { if (grep_cmp(fg->pattern, data + j, fg->patternLen) == -1) { pmatch->rm_so = j; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#74 (text+ko) ==== @@ -599,13 +599,10 @@ */ for (i = 0; i < patterns; ++i) { /* Check if cheating is allowed (always is for fgrep). */ - if (grepbehave == GREP_FIXED && !color && !oflag) + if (grepbehave == GREP_FIXED) fgrepcomp(&fg_pattern[i], pattern[i]); else { - if (oflag || color) - goto fallback; if (fastcomp(&fg_pattern[i], pattern[i])) { -fallback: /* Fall back to full regex library */ c = regcomp(&r_pattern[i], pattern[i], cflags); if (c != 0) { ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#73 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Aug 10 17:41:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE0461065678; Sun, 10 Aug 2008 17:41:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B17551065677 for ; Sun, 10 Aug 2008 17:41:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A95D28FC18 for ; Sun, 10 Aug 2008 17:41:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AHfPQY040376 for ; Sun, 10 Aug 2008 17:41:25 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AHfPgs040374 for perforce@freebsd.org; Sun, 10 Aug 2008 17:41:25 GMT (envelope-from gabor@freebsd.org) Date: Sun, 10 Aug 2008 17:41:25 GMT Message-Id: <200808101741.m7AHfPgs040374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 17:41:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147093 Change 147093 by gabor@gabor_server on 2008/08/10 17:40:42 - More C-ish variable names - style(9) Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#6 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#41 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#6 (text+ko) ==== @@ -49,35 +49,35 @@ int i; /* Initialize. */ - fg->patternLen = strlen(pattern); + fg->len = strlen(pattern); fg->bol = 0; fg->eol = 0; - fg->reversedSearch = 0; + fg->reversed = 0; /* * Make a copy and upper case it for later if in -i mode, * else just copy the pointer. */ if (iflag) { - fg->pattern = grep_malloc(fg->patternLen + 1); - for (i = 0; i < fg->patternLen; i++) + fg->pattern = grep_malloc(fg->len + 1); + for (i = 0; i < fg->len; i++) fg->pattern[i] = toupper(pattern[i]); - fg->pattern[fg->patternLen] = '\0'; + fg->pattern[fg->len] = '\0'; } else fg->pattern = (unsigned char *)pattern; /* really const */ /* Preprocess pattern. */ for (i = 0; i <= UCHAR_MAX; i++) - fg->qsBc[i] = fg->patternLen; - for (i = 1; i < fg->patternLen; i++) { - fg->qsBc[fg->pattern[i]] = fg->patternLen - i; + fg->qsBc[i] = fg->len; + for (i = 1; i < fg->len; i++) { + fg->qsBc[fg->pattern[i]] = fg->len - i; /* * If case is ignored, make the jump apply to both upper and * lower cased characters. As the pattern is stored in upper * case, apply the same to the lower case equivalents. */ if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i; + fg->qsBc[tolower(fg->pattern[i])] = fg->len - i; } } @@ -97,29 +97,30 @@ int lastHalfDot = 0; /* Initialize. */ - fg->patternLen = strlen(pattern); + fg->len = strlen(pattern); fg->bol = 0; fg->eol = 0; - fg->reversedSearch = 0; + fg->reversed = 0; /* Remove end-of-line character ('$'). */ - if (pattern[fg->patternLen - 1] == '$') { + if (pattern[fg->len - 1] == '$') { eol++; fg->eol = 1; - fg->patternLen--; + fg->len--; } /* Remove beginning-of-line character ('^'). */ if (pattern[0] == '^') { bol++; fg->bol = 1; - fg->patternLen--; + fg->len--; } - if (fg->patternLen >= 14 && + if (fg->len >= 14 && strncmp(pattern + fg->bol, "[[:<:]]", 7) == 0 && - strncmp(pattern + fg->bol + fg->patternLen - 7, "[[:>:]]", 7) == 0) { - fg->patternLen -= 14; + strncmp(pattern + fg->bol + fg->len - 7, "[[:>:]]", 7) == 0) { + fg->len -= 14; + /* Word boundary is handled separately in util.c */ wflag = 1; } @@ -128,12 +129,12 @@ * match character classes at the beginning and ending of the * string respectively. */ - fg->pattern = grep_malloc(fg->patternLen + 1); - memcpy(fg->pattern, pattern + bol + wflag, fg->patternLen); - fg->pattern[fg->patternLen] = '\0'; + fg->pattern = grep_malloc(fg->len + 1); + memcpy(fg->pattern, pattern + bol + wflag, fg->len); + fg->pattern[fg->len] = '\0'; /* Look for ways to cheat...er...avoid the full regex engine. */ - for (i = 0; i < fg->patternLen; i++) + for (i = 0; i < fg->len; i++) { /* Can still cheat? */ if ((isalnum(fg->pattern[i])) || isspace(fg->pattern[i]) || @@ -145,7 +146,7 @@ fg->pattern[i] = toupper(fg->pattern[i]); } else if (fg->pattern[i] == '.') { hasDot = i; - if (i < fg->patternLen / 2) { + if (i < fg->len / 2) { if (firstHalfDot < 0) /* Closest dot to the beginning */ firstHalfDot = i; @@ -169,11 +170,11 @@ */ if ((!(lflag || cflag)) && ((!(bol || eol)) && ((lastHalfDot) && ((firstHalfDot < 0) || - ((fg->patternLen - (lastHalfDot + 1)) < firstHalfDot)))) && !oflag && !color) { - fg->reversedSearch = 1; - hasDot = fg->patternLen - (firstHalfDot < 0 ? + ((fg->len - (lastHalfDot + 1)) < firstHalfDot)))) && !oflag && !color) { + fg->reversed = 1; + hasDot = fg->len - (firstHalfDot < 0 ? firstLastHalfDot : firstHalfDot) - 1; - grep_revstr(fg->pattern, fg->patternLen); + grep_revstr(fg->pattern, fg->len); } /* @@ -196,105 +197,105 @@ */ /* Adjust the shift based on location of the last dot ('.'). */ - shiftPatternLen = fg->patternLen - hasDot; + shiftPatternLen = fg->len - hasDot; /* Preprocess pattern. */ for (i = 0; i <= UCHAR_MAX; i++) fg->qsBc[i] = shiftPatternLen; - for (i = hasDot + 1; i < fg->patternLen; i++) { - fg->qsBc[fg->pattern[i]] = fg->patternLen - i; + for (i = hasDot + 1; i < fg->len; i++) { + fg->qsBc[fg->pattern[i]] = fg->len - i; /* * If case is ignored, make the jump apply to both upper and * lower cased characters. As the pattern is stored in upper * case, apply the same to the lower case equivalents. */ if (iflag) - fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i; + fg->qsBc[tolower(fg->pattern[i])] = fg->len - i; } /* * Put pattern back to normal after pre-processing to allow for easy * comparisons later. */ - if (fg->reversedSearch) - grep_revstr(fg->pattern, fg->patternLen); + if (fg->reversed) + grep_revstr(fg->pattern, fg->len); return (0); } int -grep_search(fastgrep_t *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch) +grep_search(fastgrep_t *fg, unsigned char *data, size_t len, regmatch_t *pmatch) { - int j; - int rtrnVal = REG_NOMATCH; + int j; + int ret = REG_NOMATCH; - if (pmatch->rm_so == dataLen) - return (rtrnVal); + if (pmatch->rm_so == len) + return (ret); if (fg->bol && pmatch->rm_so != 0) { - pmatch->rm_so = dataLen; - pmatch->rm_eo = dataLen; - return (rtrnVal); + pmatch->rm_so = len; + pmatch->rm_eo = len; + return (ret); } /* No point in going farther if we do not have enough data. */ - if (dataLen < fg->patternLen) - return (rtrnVal); + if (len < fg->len) + return (ret); /* Only try once at the beginning or ending of the line. */ if (fg->bol || fg->eol) { /* Simple text comparison. */ /* Verify data is >= pattern length before searching on it. */ - if (dataLen >= fg->patternLen) { + if (len >= fg->len) { /* Determine where in data to start search at. */ if (fg->eol) - j = dataLen - fg->patternLen; + j = len - fg->len; else j = 0; - if (!((fg->bol && fg->eol) && (dataLen != fg->patternLen))) + if (!((fg->bol && fg->eol) && (len != fg->len))) if (grep_cmp(fg->pattern, data + j, - fg->patternLen) == -1) { + fg->len) == -1) { pmatch->rm_so = j; - pmatch->rm_eo = j + fg->patternLen; - rtrnVal = 0; + pmatch->rm_eo = j + fg->len; + ret = 0; } } - } else if (fg->reversedSearch) { + } else if (fg->reversed) { /* Quick Search algorithm. */ - j = dataLen; + j = len; do { - if (grep_cmp(fg->pattern, data + j - fg->patternLen, - fg->patternLen) == -1) { - pmatch->rm_so = j - fg->patternLen; + if (grep_cmp(fg->pattern, data + j - fg->len, + fg->len) == -1) { + pmatch->rm_so = j - fg->len; pmatch->rm_eo = j; - rtrnVal = 0; + ret = 0; break; } /* Shift if within bounds, otherwise, we are done. */ - if (j == fg->patternLen) + if (j == fg->len) break; - j -= fg->qsBc[data[j - fg->patternLen - 1]]; - } while (j >= fg->patternLen); + j -= fg->qsBc[data[j - fg->len - 1]]; + } while (j >= fg->len); } else { /* Quick Search algorithm. */ j = pmatch->rm_so; do { - if (grep_cmp(fg->pattern, data + j, fg->patternLen) == -1) { + if (grep_cmp(fg->pattern, data + j, fg->len) == -1) { pmatch->rm_so = j; - pmatch->rm_eo = j + fg->patternLen; - rtrnVal = 0; + pmatch->rm_eo = j + fg->len; + ret = 0; break; } /* Shift if within bounds, otherwise, we are done. */ - if (j + fg->patternLen == dataLen) + if (j + fg->len == len) break; else - j += fg->qsBc[data[j + fg->patternLen]]; - } while (j <= (dataLen - fg->patternLen)); + j += fg->qsBc[data[j + fg->len]]; + } while (j <= (len - fg->len)); } - return (rtrnVal); + return (ret); } /* @@ -304,7 +305,7 @@ static int grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len) { - int i; + int i; for (i = 0; i < len; i++) { if (((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.')) @@ -319,8 +320,8 @@ static void grep_revstr(unsigned char *str, int len) { - int i; - char c; + int i; + char c; for (i = 0; i < len / 2; i++) { c = str[i]; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#41 (text+ko) ==== @@ -93,13 +93,12 @@ typedef struct { unsigned char *pattern; - int patternLen; + int len; int qsBc[UCHAR_MAX + 1]; /* flags */ int bol; int eol; - int wmatch; - int reversedSearch; + int reversed; } fastgrep_t; /* Flags passed to regcomp() and regexec() */ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 17:42:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BEF11065673; Sun, 10 Aug 2008 17:42:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F310C1065670 for ; Sun, 10 Aug 2008 17:42:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D168F8FC19 for ; Sun, 10 Aug 2008 17:42:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AHgQOJ040564 for ; Sun, 10 Aug 2008 17:42:26 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AHgQRf040562 for perforce@freebsd.org; Sun, 10 Aug 2008 17:42:26 GMT (envelope-from gabor@freebsd.org) Date: Sun, 10 Aug 2008 17:42:26 GMT Message-Id: <200808101742.m7AHgQRf040562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 17:42:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=147094 Change 147094 by gabor@gabor_server on 2008/08/10 17:42:02 - Add my Copyright as I added code to this file Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#7 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#7 (text+ko) ==== @@ -2,6 +2,7 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (C) 2008 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Sun Aug 10 17:46:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 790861065677; Sun, 10 Aug 2008 17:46:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B3561065672 for ; Sun, 10 Aug 2008 17:46:31 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19A518FC1A for ; Sun, 10 Aug 2008 17:46:31 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AHkUSu041208 for ; Sun, 10 Aug 2008 17:46:30 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AHkUE5041206 for perforce@freebsd.org; Sun, 10 Aug 2008 17:46:30 GMT (envelope-from gabor@freebsd.org) Date: Sun, 10 Aug 2008 17:46:30 GMT Message-Id: <200808101746.m7AHkUE5041206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 17:46:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=147095 Change 147095 by gabor@gabor_server on 2008/08/10 17:45:44 - More style(9) Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#8 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#8 (text+ko) ==== @@ -34,6 +34,12 @@ * meantime, we need to use this workaround. */ +#include + +#ifndef lint +__FBSDID("$FreeBSD$"); +#endif /* not lint */ + #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Aug 10 18:11:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76FD71065676; Sun, 10 Aug 2008 18:11:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B8611065674 for ; Sun, 10 Aug 2008 18:11:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33E4C8FC08 for ; Sun, 10 Aug 2008 18:11:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AIAvD4045662 for ; Sun, 10 Aug 2008 18:10:58 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AIAtjG045654 for perforce@freebsd.org; Sun, 10 Aug 2008 18:10:55 GMT (envelope-from trasz@freebsd.org) Date: Sun, 10 Aug 2008 18:10:55 GMT Message-Id: <200808101810.m7AIAtjG045654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 18:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147097 Change 147097 by trasz@trasz_traszkan on 2008/08/10 18:10:13 Replace some asserts with proper error handling. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#10 (text+ko) ==== @@ -51,7 +51,8 @@ id_t *id; error = acl_get_tag_type(entry, &tag); - assert(!error); + if (error) + return (error); switch (tag) { case ACL_USER_OBJ: @@ -60,7 +61,8 @@ case ACL_USER: id = (id_t *)acl_get_qualifier(entry); - assert(id); + if (id == NULL) + return (-1); /* XXX: Thread-unsafe. */ if (!numeric) pwd = getpwuid(*id); @@ -78,7 +80,8 @@ case ACL_GROUP: id = (id_t *)acl_get_qualifier(entry); - assert(id); + if (id == NULL) + return (-1); /* XXX: Thread-unsafe. */ if (!numeric) grp = getgrgid(*id); @@ -95,7 +98,6 @@ break; default: - assert(!"Tag?"); return (-1); } @@ -109,7 +111,8 @@ acl_extended_t extended; error = acl_get_extended_np(entry, &extended); - assert(!error); + if (error) + return (error); switch (extended) { case ACL_EXTENDED_ALLOW: @@ -129,7 +132,6 @@ break; default: - assert(!"Extended?"); return (-1); } @@ -144,7 +146,8 @@ id_t *id; error = acl_get_tag_type(entry, &tag); - assert(!error); + if (error) + return (error); switch (tag) { case ACL_USER_OBJ: @@ -155,7 +158,8 @@ default: id = (id_t *)acl_get_qualifier(entry); - assert(id); + if (id == NULL) + return (-1); snprintf(str, size, ":%d", (unsigned int)*id); } From owner-p4-projects@FreeBSD.ORG Sun Aug 10 20:15:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75731106566C; Sun, 10 Aug 2008 20:15:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39534106564A for ; Sun, 10 Aug 2008 20:15:06 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 307878FC16 for ; Sun, 10 Aug 2008 20:15:06 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AKF6ex061417 for ; Sun, 10 Aug 2008 20:15:06 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AKF6qs061415 for perforce@freebsd.org; Sun, 10 Aug 2008 20:15:06 GMT (envelope-from trasz@freebsd.org) Date: Sun, 10 Aug 2008 20:15:06 GMT Message-Id: <200808102015.m7AKF6qs061415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 20:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=147103 Change 147103 by trasz@trasz_traszkan on 2008/08/10 20:14:19 Manual pages. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#36 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_clear_flags_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_create_entry.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_flag_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_extended_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flag_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_extended_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_qualifier.3#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip_np.3#1 add .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#36 (text+ko) ==== @@ -6,13 +6,11 @@ to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. -- Either add or extend existing manual pages for new API routines: - acl_add_flag_np, acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np, - acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np, - acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np, - acl_strip_np. +- Enhance fstest with checks for NFS4 ACL functionality. + +- Update acl(9) manual page. -- Enhance fstest with checks for NFS4 ACL functionality. +- Put more content into the manual pages. - Make 'struct acl' variable size. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#6 (text+ko) ==== @@ -31,28 +31,38 @@ SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map MAN+= acl.3 \ + acl_add_flag_np.3 \ acl_add_perm.3 \ acl_calc_mask.3 \ + acl_clear_flags_np.3 \ acl_clear_perms.3 \ acl_copy_entry.3 \ acl_create_entry.3 \ acl_delete.3 \ acl_delete_entry.3 \ + acl_delete_flag_np.3 \ acl_delete_perm.3 \ acl_dup.3 \ acl_free.3 \ acl_from_text.3 \ acl_get.3 \ acl_get_entry.3 \ + acl_get_extended_np.3 \ + acl_get_flagset_np.3 \ + acl_get_flag_np.3 \ acl_get_permset.3 \ acl_get_perm_np.3 \ acl_get_qualifier.3 \ acl_get_tag_type.3 \ acl_init.3 \ + acl_is_trivial_np.3 \ acl_set.3 \ + acl_set_extended_np.3 \ + acl_set_flagset_np.3 \ acl_set_permset.3 \ acl_set_qualifier.3 \ acl_set_tag_type.3 \ + acl_strip_np.3 \ acl_to_text.3 \ acl_valid.3 \ extattr.3 \ @@ -66,15 +76,18 @@ mac_text.3 \ posix1e.3 -MLINKS+=acl_delete.3 acl_delete_def_file.3 \ +MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ + acl_delete.3 acl_delete_def_file.3 \ acl_delete.3 acl_delete_file_np.3 \ acl_delete.3 acl_delete_fd_np.3 \ + acl_delete_entry.3 acl_delete_entry_np.3\ acl_get.3 acl_get_file.3 \ acl_get.3 acl_get_fd.3 \ acl_get.3 acl_get_fd_np.3 \ acl_set.3 acl_set_file.3 \ acl_set.3 acl_set_fd.3 \ acl_set.3 acl_set_fd_np.3 \ + acl_to_text.3 acl_to_text_np.3 \ acl_valid.3 acl_valid_file_np.3 \ acl_valid.3 acl_valid_fd_np.3 \ extattr.3 extattr_namespace_to_string.3 \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl.3#2 (text+ko) ==== @@ -48,7 +48,7 @@ and validate ACLs associated with file objects. As well as the POSIX.1e routines, there are a number of non-portable extensions defined that allow for alternative ACL semantics than the -POSIX.1e semantics, such as AFS, NTFS, Coda, and NWFS semantics. +POSIX.1e semantics, such as NFS4, AFS, NTFS, Coda, and NWFS semantics. Where routines are non-standard, they are suffixed with _np to indicate that they are not portable. .Pp @@ -59,6 +59,10 @@ .Pp Available functions, sorted by behavior, include: .Bl -tag -width indent +.It Fn acl_add_flag_np +This function is described in +.Xr acl_add_flag_np 3 , +and may be used to add flags to a flagset. .It Fn acl_add_perm This function is described in .Xr acl_add_perm 3 , @@ -70,6 +74,10 @@ the .Dv ACL_MASK entry. +.It Fn acl_clear_flags_np +This function is described in +.Xr acl_clear_flags_np 3 , +and may be used to clear all flags from a flagset. .It Fn acl_clear_perms This function is described in .Xr acl_clear_perms 3 , @@ -78,8 +86,11 @@ This function is described in .Xr acl_copy_entry 3 , and may be used to copy the contents of an ACL entry. -.It Fn acl_create_entry -This function is described in +.It Xo +.Fn acl_create_entry , +.Fn acl_create_entry_np +.Xc +These functions are described in .Xr acl_create_entry 3 , and may be used to create an empty entry in an ACL. .It Xo @@ -92,10 +103,17 @@ These functions are described in .Xr acl_delete 3 , and may be used to delete ACLs from file system objects. -.It Fn acl_delete_entry -This function is described in +.It Xo +.Fn acl_delete_entry , +.Fn acl_delete_entry_np , +.Xc +This functions are described in .Xr acl_delete_entry 3 , and may be used to delete an entry from an ACL. +.It Fn acl_delete_flag_np +This function is described in +.Xr acl_delete_flag_np 3 , +and may be used to delete flags from a flagset. .It Fn acl_delete_perm This function is described in .Xr acl_delete_perm 3 , @@ -126,6 +144,14 @@ These functions are described in .Xr acl_get 3 , and may be used to retrieve ACLs from file system objects. +.It Fn acl_get_extended_np +This function is described in +.Xr acl_get_extended_np 3 , +and may be used to retrieve an ACL type from an ACL entry. +.It Fn acl_get_flagset_np +This function is described in +.Xr acl_get_flagset_np 3 , +and may be used to retrieve a flagset from an ACL entry. .It Fn acl_get_permset This function is described in .Xr acl_get_permset 3 , @@ -142,6 +168,10 @@ This function is described in .Xr acl_init 3 , and may be used to allocate a fresh (empty) ACL structure. +.It Fn acl_is_trivial_np +This function is described in +.Xr acl_is_trivial_np 3 , +and may be used to find out whether ACL is trivial. .It Xo .Fn acl_set_fd , .Fn acl_set_fd_np , @@ -151,6 +181,14 @@ These functions are described in .Xr acl_set 3 , and may be used to assign an ACL to a file system object. +.It Fn acl_set_extended_np +This function is described in +.Xr acl_set_extended_np 3 , +and may be used to set the ACL type of an ACL entry. +.It Fn acl_set_flagset_np +This function is described in +.Xr acl_set_flagset_np 3 , +and may be used to set the flags of an ACL entry from a flagset. .It Fn acl_set_permset This function is described in .Xr acl_set_permset 3 , @@ -163,8 +201,15 @@ This function is described in .Xr acl_set_tag_type 3 , and may be used to set the tag type of an ACL. -.It Fn acl_to_text -This function is described in +.It Fn acl_strip_np +This function is describe din +.Xr acl-strip_np 3 , +and may be used to remove extended entries from an ACL. +.It Xo +.Fn acl_to_text , +.Fn acl_to_text_np +.Xc +These functions are described in .Xr acl_to_text 3 , and may be used to generate a text-form of a POSIX.1e semantics ACL. .It Xo @@ -189,25 +234,34 @@ .Sh SEE ALSO .Xr getfacl 1 , .Xr setfacl 1 , +.Xr acl_add_flag_np 3 , .Xr acl_add_perm 3 , .Xr acl_calc_mask 3 , +.Xr acl_clear_flags_np 3 , .Xr acl_clear_perms 3 , .Xr acl_copy_entry 3 , .Xr acl_create_entry 3 , .Xr acl_delete_entry 3 , +.Xr acl_delete_flag_np 3 , .Xr acl_delete_perm 3 , .Xr acl_dup 3 , .Xr acl_free 3 , .Xr acl_from_text 3 , .Xr acl_get 3 , +.Xr acl_get_extended_np 3 , +.Xr acl_get_flagset_np 3 , .Xr acl_get_permset 3 , .Xr acl_get_qualifier 3 , .Xr acl_get_tag_type 3 , .Xr acl_init 3 , +.Xr acl_is_trivial_np 3 , .Xr acl_set 3 , +.Xr acl_set_extended_np 3 , +.Xr acl_set_flagset_np 3 , .Xr acl_set_permset 3 , .Xr acl_set_qualifier 3 , .Xr acl_set_tag_type 3 , +.Xr acl_strip_np 3 , .Xr acl_to_text 3 , .Xr acl_valid 3 , .Xr posix1e 3 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_create_entry.3#2 (text+ko) ==== @@ -30,6 +30,7 @@ .Os .Sh NAME .Nm acl_create_entry +.Nm acl_create_entry_np .Nd create a new ACL entry .Sh LIBRARY .Lb libc @@ -38,6 +39,8 @@ .In sys/acl.h .Ft int .Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p" +.Ft int +.Fn acl_create_entry_np "acl_t *acl_p" "acl_entry_t *entry_p" "int index" .Sh DESCRIPTION The .Fn acl_create_entry @@ -45,6 +48,16 @@ is a POSIX.1e call that creates a new ACL entry in the ACL pointed to by .Fa acl_p . +The +.Fn acl_create_entry_np +function is a non-portable version that creates the ACL entry +at position +.Fa index . +Positions are numbered starting from zero, i.e. calling +.Fn acl_create_entry_np +with +.Fa index +argument equal to zero will prepend the entry to the ACL. .Sh RETURN VALUES .Rv -std acl_create_entry .Sh ERRORS @@ -56,6 +69,9 @@ Argument .Fa acl_p does not point to a pointer to a valid ACL. +Argument +.Fa index +is out of bounds. .It Bq Er ENOMEM The ACL working storage requires more memory than is allowed by the hardware or system-imposed memory ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.3#2 (text+ko) ==== @@ -29,7 +29,8 @@ .Dt ACL_DELETE_ENTRY 3 .Os .Sh NAME -.Nm acl_delete_entry +.Nm acl_delete_entry , +.Nm acl_delete_entry_np , .Nd delete an ACL entry from an ACL .Sh LIBRARY .Lb libc @@ -38,6 +39,8 @@ .In sys/acl.h .Ft int .Fn acl_delete_entry "acl_t acl" "acl_entry_t entry_d" +.Ft int +.Fn acl_delete_entry_np "acl_t acl" "int index" .Sh DESCRIPTION The .Fn acl_delete_entry @@ -46,6 +49,18 @@ .Fa entry_d from ACL .Fa acl . +The +.Fn acl_delete_entry_np +function is a non-portable version that removes the ACL entry +at position +.Fa index +from ACL +.Fa acl . +Positions are numbered starting from zero, i.e. calling +.Fn acl_delete_entry_np +with +.Fa index +argument equal to zero will remove the first ACL entry. .Sh RETURN VALUES .Rv -std acl_delete_entry .Sh ERRORS @@ -61,6 +76,9 @@ .Fa entry_d is not a valid descriptor for an ACL entry in .Fa acl . +Argument +.Fa index +is out of bounds. .El .Sh SEE ALSO .Xr acl 3 , ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_qualifier.3#2 (text+ko) ==== @@ -42,7 +42,7 @@ The .Fn acl_set_qualifier function -is a POSIX.1e call that sets the qualifier of the tag for the ACl entry +is a POSIX.1e call that sets the qualifier of the tag for the ACL entry .Fa entry_d to the value referred to by .Fa tag_qualifier_p . ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#2 (text+ko) ==== @@ -31,7 +31,8 @@ .Dt ACL_TO_TEXT 3 .Os .Sh NAME -.Nm acl_to_text +.Nm acl_to_text , +.Nm acl_to_text_np .Nd convert an ACL to text .Sh LIBRARY .Lb libc @@ -40,10 +41,14 @@ .In sys/acl.h .Ft char * .Fn acl_to_text "acl_t acl" "ssize_t *len_p" +.Ft char * +.Fn acl_to_text_np "acl_t acl" "ssize_t *len_p" "int flags" .Sh DESCRIPTION The .Fn acl_to_text -function translates the ACL pointed to by argument +and +.Fn acl_to_text_np +functions translate the ACL pointed to by argument .Va acl into a NULL terminated character string. If the pointer @@ -51,9 +56,22 @@ is not NULL, then the function shall return the length of the string (not including the NULL terminator) in the location pointed to by .Va len_p . -The format of the text string returned by +If the ACL is POSIX, the format of the text string returned by .Fn acl_to_text -shall be the POSIX.1e long ACL form. +shall be the POSIX.1e long ACL form. If the ACL is NFS4, the format +of the text string shall be the compact form, unless the +.Va ACL_TEXT_VERBOSE +flag is given. +.Pp +The flags specified are formed by +.Em or Ns 'ing +the following values +.Pp +.Bd -literal -offset indent -compact +ACL_TEXT_VERBOSE format ACL using verbose form +ACL_TEXT_NUMERIC_IDS do not resolve IDs into user or group names +ACL_TEXT_APPEND_ID in addition to user and group names, append numeric IDs +.Ed .Pp This function allocates any memory necessary to contain the string and returns a pointer to the string. From owner-p4-projects@FreeBSD.ORG Sun Aug 10 20:51:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DACD1065673; Sun, 10 Aug 2008 20:51:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41EDC106566B for ; Sun, 10 Aug 2008 20:51:43 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 39BBC8FC20 for ; Sun, 10 Aug 2008 20:51:43 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AKph4V073722 for ; Sun, 10 Aug 2008 20:51:43 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AKphn2073720 for perforce@freebsd.org; Sun, 10 Aug 2008 20:51:43 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 10 Aug 2008 20:51:43 GMT Message-Id: <200808102051.m7AKphn2073720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 20:51:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147104 Change 147104 by snb@snb_unagi on 2008/08/10 20:51:33 Fewer transactions on postmark benchmark, skip grepping through kernel source, and remove checked out source tree. Affected files ... .. //depot/projects/soc2008/snb-dirhash/benchmark/dirhash_benchmark.sh#3 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/benchmark/dirhash_benchmark.sh#3 (kxtext) ==== @@ -49,7 +49,7 @@ set location ./pm set number 1000000 set subdirectories 500 -set transactions 100000 +set transactions 10000 run EOF @@ -84,12 +84,16 @@ echo ">>> make buildworld test <<<" cd ./src /usr/bin/time sh -c "make buildworld > ../buildworld.log 2>&1" -/usr/bin/time sh -c "find ./src/sys -name '*.c' | xargs fgrep SCM_RIGHTS > ../src_find.log 2>&1" /usr/bin/time rm -rf /usr/obj cd .. sleep_random echo "" +echo ">>> removing source tree <<<" +/usr/bin/time rm -rf ./src +sleep_random + +echo "" echo ">>> removing svnroot <<<" /usr/bin/time rm -rf $SVNROOT sleep_random From owner-p4-projects@FreeBSD.ORG Sun Aug 10 21:09:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F413C1065674; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2FD11065670 for ; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8AC58FC16 for ; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AL9T37076151 for ; Sun, 10 Aug 2008 21:09:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AL9TFB076149 for perforce@freebsd.org; Sun, 10 Aug 2008 21:09:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Aug 2008 21:09:29 GMT Message-Id: <200808102109.m7AL9TFB076149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 21:09:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147106 Change 147106 by hselasky@hselasky_laptop001 on 2008/08/10 21:08:29 Add support for custom TTY names. Requested by Andrew Thompson. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#5 (text+ko) ==== @@ -304,6 +304,7 @@ { struct tty *tp; int error = 0; + char buf[32]; /* temporary TTY device name buffer */ tp = ttyalloc(); @@ -323,11 +324,24 @@ DPRINTF("tp = %p, unit = %d\n", tp, sc->sc_unit); + buf[0] = 0; /* set some default value */ + + /* Check if the client has a custom TTY name */ + if (sc->sc_callback->usb2_com_tty_name) { + sc->sc_callback->usb2_com_tty_name(sc, buf, + sizeof(buf), sc->sc_local_unit); + } + if (buf[0] == 0) { + /* Use default TTY name */ + if (snprintf(buf, sizeof(buf), "U%u", sc->sc_unit)) { + /* ignore */ + } + } #if !(defined(TS_CALLOUT) || (__FreeBSD_version >= 700022)) #define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for * FreeBSD 6.x */ #endif - error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit); + error = ttycreate(tp, TS_CALLOUT, "%s", buf); if (error) { ttyfree(tp); goto done; ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#3 (text+ko) ==== @@ -91,7 +91,7 @@ * while it is open! */ struct usb2_com_callback { - void (*usb2_com_cfg_get_status) (struct usb2_com_softc *, uint8_t *, uint8_t *); + void (*usb2_com_cfg_get_status) (struct usb2_com_softc *, uint8_t *plsr, uint8_t *pmsr); void (*usb2_com_cfg_set_dtr) (struct usb2_com_softc *, uint8_t); void (*usb2_com_cfg_set_rts) (struct usb2_com_softc *, uint8_t); void (*usb2_com_cfg_set_break) (struct usb2_com_softc *, uint8_t); @@ -105,6 +105,7 @@ void (*usb2_com_stop_read) (struct usb2_com_softc *); void (*usb2_com_start_write) (struct usb2_com_softc *); void (*usb2_com_stop_write) (struct usb2_com_softc *); + void (*usb2_com_tty_name) (struct usb2_com_softc *, char *pbuf, uint16_t buflen, uint16_t local_subunit); }; /* Line status register */ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 21:30:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 007661065672; Sun, 10 Aug 2008 21:30:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8FD11065696 for ; Sun, 10 Aug 2008 21:30:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 590058FC0A for ; Sun, 10 Aug 2008 21:30:51 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ALUpZR078642 for ; Sun, 10 Aug 2008 21:30:51 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ALUpBO078640 for perforce@freebsd.org; Sun, 10 Aug 2008 21:30:51 GMT (envelope-from trasz@freebsd.org) Date: Sun, 10 Aug 2008 21:30:51 GMT Message-Id: <200808102130.m7ALUpBO078640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 21:30:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=147107 Change 147107 by trasz@trasz_traszkan on 2008/08/10 21:30:24 Kernel manual pages. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#37 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#1 add Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#37 (text+ko) ==== @@ -8,9 +8,11 @@ - Enhance fstest with checks for NFS4 ACL functionality. -- Update acl(9) manual page. +- Add the manual page for acl_get_brand_np. + +- Add the information about branding to manual pages. -- Put more content into the manual pages. +- Add the information about correct constants to the manual pages. - Make 'struct acl' variable size. ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#4 (text+ko) ==== @@ -240,6 +240,7 @@ usbdi.9 \ utopia.9 \ vaccess.9 \ + vaccess_acl_nfs4.9 \ vaccess_acl_posix1e.9 \ vcount.9 \ vflush.9 \ ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#2 (text+ko) ==== @@ -97,13 +97,20 @@ .It Dv ACL_MASK The maximum discretionary access rights that can be granted to a process in the file group class. +This is only valid for POSIX.1e ACLs. .It Dv ACL_OTHER Discretionary access rights for processes not covered by any other ACL entry. +This is only valid for POSIX.1e ACLs. .It Dv ACL_OTHER_OBJ Same as .Dv ACL_OTHER . -Each ACL entry must contain exactly one +.It Dv ACL_EVERYONE +Discretionary access rights for all users. +This is only valid for NFS4 ACLs. +.El +.Pp +Each POSIX.1e ACL must contain exactly one .Dv ACL_USER_OBJ , one .Dv ACL_GROUP_OBJ , @@ -117,13 +124,13 @@ are present, then exactly one .Dv ACL_MASK entry should be present. -.El .It Vt uid_t Va ae_id The ID of user for whom this ACL describes access permissions. .It Vt acl_perm_t Va ae_perm This field defines what kind of access the process matching this ACL has for accessing the associated file. -.Bl -tag -width ".Dv ACL_POSIX1E_BITS" +For POSIX.1e ACLs, the following are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" .It Dv ACL_EXECUTE The process may execute the associated file. .It Dv ACL_WRITE @@ -134,70 +141,56 @@ The process has no read, write or execute permissions to the associated file. .El +.Pp +For NFS4 ACLs, the following are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" +.It Dv ACL_READ_DATA +.It Dv ACL_LIST_DIRECTORY +Same as +.Dv ACL_READ_DATA . +.It Dv ACL_WRITE_DATA +.It Dv ACL_ADD_FILE +Same as +.Dv ACL_ACL_WRITE_DATA . +.It Dv ACL_APPEND_DATA +.It Dv ACL_ADD_SUBDIRECTORY +Same as +.Dv ACL_APPEND_DATA . +.It Dv ACL_READ_NAMED_ATTRS +.It Dv ACL_WRITE_NAMED_ATTRS +.It Dv ACL_EXECUTE +.It Dv ACL_DELETE_CHILD +.It Dv ACL_READ_ATTRIBUTES +.It Dv ACL_WRITE_ATTRIBUTES +.It Dv ACL_DELETE +.It Dv ACL_READ_ACL +.It Dv ACL_WRITE_ACL +.It Dv ACL_WRITE_OWNER +.It Dv ACL_SYNCHRONIZE +.El +.It Vt acl_extended_t Va ae_extended +This field defines the type of NFS4 ACL entry. +It is not used with POSIX.1e ACLs. +The following values are valid: +.Bl -tag -width ".Dv ACL_WRITE_NAMED_ATTRS" +.It Dv ACL_EXTENDED_ALLOW +.It Dv ACL_EXTENDED_DENY +.El +.It Vt acl_flag_t Va ae_flags +This field defines the inheritance flags of NFS4 ACL entry. +It is not used with POSIX.1e ACLs. +The following values are valid: +.Bl -tag -width ".Dv ACL_ENTRY_DIRECTORY_INHERIT" +.It Dv ACL_ENTRY_FILE_INHERIT +.It Dv ACL_ENTRY_DIRECTORY_INHERIT +.It Dv ACL_ENTRY_LIMIT_INHERIT +.It Dv ACL_ENTRY_ONLY_INHERIT .El -.Sh IMPLEMENTATION NOTES -.Bd -literal -typedef mode_t *acl_permset_t; - -/* internal ACL structure */ -struct acl { - int acl_cnt; - struct acl_entry acl_entry[ACL_MAX_ENTRIES]; -}; - -/* external ACL structure */ -struct acl_t_struct { - struct acl ats_acl; - int ats_cur_entry; -}; -typedef struct acl_t_struct *acl_t; - -/* - * Possible valid values for ae_tag field. - */ -#define ACL_UNDEFINED_TAG 0x00000000 -#define ACL_USER_OBJ 0x00000001 -#define ACL_USER 0x00000002 -#define ACL_GROUP_OBJ 0x00000004 -#define ACL_GROUP 0x00000008 -#define ACL_MASK 0x00000010 -#define ACL_OTHER 0x00000020 -#define ACL_OTHER_OBJ ACL_OTHER - -/* - * Possible valid values for acl_type_t arguments. - */ -#define ACL_TYPE_ACCESS 0x00000000 -#define ACL_TYPE_DEFAULT 0x00000001 -#define ACL_TYPE_AFS 0x00000002 -#define ACL_TYPE_CODA 0x00000003 -#define ACL_TYPE_NTFS 0x00000004 -#define ACL_TYPE_NWFS 0x00000005 - -/* - * Possible flags in ae_perm field. - */ -#define ACL_EXECUTE 0x0001 -#define ACL_WRITE 0x0002 -#define ACL_READ 0x0004 -#define ACL_PERM_NONE 0x0000 -#define ACL_PERM_BITS (ACL_EXECUTE | ACL_WRITE | ACL_READ) -#define ACL_POSIX1E_BITS (ACL_EXECUTE | ACL_WRITE | ACL_READ) - -/* - * Possible entry_id values for acl_get_entry() - */ -#define ACL_FIRST_ENTRY 0 -#define ACL_NEXT_ENTRY 1 - -/* - * Undefined value in ae_id field - */ -#define ACL_UNDEFINED_ID ((uid_t)-1) -.Ed +.El .Sh SEE ALSO .Xr acl 3 , .Xr vaccess_acl_posix1e 9 , +.Xr vaccess_acl_nfs4 9 , .Xr VFS 9 , .Xr vnaccess 9 , .Xr VOP_ACLCHECK 9 , From owner-p4-projects@FreeBSD.ORG Sun Aug 10 21:36:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F381065677; Sun, 10 Aug 2008 21:36:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD8AB1065675 for ; Sun, 10 Aug 2008 21:36:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C23278FC33 for ; Sun, 10 Aug 2008 21:36:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ALavMX079372 for ; Sun, 10 Aug 2008 21:36:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ALavWI079370 for perforce@freebsd.org; Sun, 10 Aug 2008 21:36:57 GMT (envelope-from trasz@freebsd.org) Date: Sun, 10 Aug 2008 21:36:57 GMT Message-Id: <200808102136.m7ALavWI079370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 21:36:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147109 Change 147109 by trasz@trasz_traszkan on 2008/08/10 21:36:18 Add manual page for acl_get_brand_np. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#38 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#1 add Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#38 (text+ko) ==== @@ -8,8 +8,6 @@ - Enhance fstest with checks for NFS4 ACL functionality. -- Add the manual page for acl_get_brand_np. - - Add the information about branding to manual pages. - Add the information about correct constants to the manual pages. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#7 (text+ko) ==== @@ -46,6 +46,7 @@ acl_free.3 \ acl_from_text.3 \ acl_get.3 \ + acl_get_brand_np.3 \ acl_get_entry.3 \ acl_get_extended_np.3 \ acl_get_flagset_np.3 \ From owner-p4-projects@FreeBSD.ORG Sun Aug 10 23:01:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F05521065672; Sun, 10 Aug 2008 23:01:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B41C5106564A for ; Sun, 10 Aug 2008 23:01:23 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A456F8FC1B for ; Sun, 10 Aug 2008 23:01:23 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AN1N7g088052 for ; Sun, 10 Aug 2008 23:01:23 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AN1N31088050 for perforce@freebsd.org; Sun, 10 Aug 2008 23:01:23 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 23:01:23 GMT Message-Id: <200808102301.m7AN1N31088050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 23:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147114 Change 147114 by ed@ed_mekker on 2008/08/10 23:01:13 Make a proper definition for the forced baud rate for pseudo-devices. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/sysmouse.c#2 edit .. //depot/projects/mpsafetty/sys/kern/tty.c#19 edit .. //depot/projects/mpsafetty/sys/sys/ttydefaults.h#2 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/sysmouse.c#2 (text+ko) ==== @@ -148,11 +148,12 @@ static int smdev_param(struct tty *tp, struct termios *t) { + /* * Set the output baud rate to zero. The mouse device supports * no output, so we don't want to waste buffers. */ - t->c_ispeed = B115200; + t->c_ispeed = TTYDEF_SPEED_PSEUDO; t->c_ospeed = B0; return (0); ==== //depot/projects/mpsafetty/sys/kern/tty.c#19 (text+ko) ==== @@ -809,7 +809,7 @@ { /* Use a fake baud rate, we're not a real device. */ - t->c_ispeed = t->c_ospeed = B38400; + t->c_ispeed = t->c_ospeed = TTYDEF_SPEED_PSEUDO; return (0); } ==== //depot/projects/mpsafetty/sys/sys/ttydefaults.h#2 (text+ko) ==== @@ -52,6 +52,7 @@ #define TTYDEF_LFLAG TTYDEF_LFLAG_ECHO #define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) #define TTYDEF_SPEED (B9600) +#define TTYDEF_SPEED_PSEUDO (B38400) /* * Control Character Defaults From owner-p4-projects@FreeBSD.ORG Sun Aug 10 23:10:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF7B4106567B; Sun, 10 Aug 2008 23:10:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 958DD1065679 for ; Sun, 10 Aug 2008 23:10:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 858378FC13 for ; Sun, 10 Aug 2008 23:10:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ANAeEx089918 for ; Sun, 10 Aug 2008 23:10:40 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ANAXBU089909 for perforce@freebsd.org; Sun, 10 Aug 2008 23:10:33 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 23:10:33 GMT Message-Id: <200808102310.m7ANAXBU089909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 23:10:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147115 Change 147115 by ed@ed_mekker on 2008/08/10 23:10:30 style(9) nitting: use tabs after a define. Affected files ... .. //depot/projects/mpsafetty/sys/sys/tty.h#9 edit .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#2 edit .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#2 edit .. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#2 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/tty.h#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #ifndef _SYS_TTY_H_ -#define _SYS_TTY_H_ +#define _SYS_TTY_H_ #include #include ==== //depot/projects/mpsafetty/sys/sys/ttydevsw.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #ifndef _SYS_TTYDEVSW_H_ -#define _SYS_TTYDEVSW_H_ +#define _SYS_TTYDEVSW_H_ #ifndef _SYS_TTY_H_ #error "can only be included through " ==== //depot/projects/mpsafetty/sys/sys/ttydisc.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #ifndef _SYS_TTYDISC_H_ -#define _SYS_TTYDISC_H_ +#define _SYS_TTYDISC_H_ #ifndef _SYS_TTY_H_ #error "can only be included through " ==== //depot/projects/mpsafetty/sys/sys/ttyqueue.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #ifndef _SYS_TTYQUEUE_H_ -#define _SYS_TTYQUEUE_H_ +#define _SYS_TTYQUEUE_H_ #ifndef _SYS_TTY_H_ #error "can only be included through " From owner-p4-projects@FreeBSD.ORG Mon Aug 11 01:54:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D97F41065675; Mon, 11 Aug 2008 01:54:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8492A1065670 for ; Mon, 11 Aug 2008 01:54:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7EA8FC18 for ; Mon, 11 Aug 2008 01:54:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7B1sT30016591 for ; Mon, 11 Aug 2008 01:54:29 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7B1sTRC016589 for perforce@freebsd.org; Mon, 11 Aug 2008 01:54:29 GMT (envelope-from weongyo@FreeBSD.org) Date: Mon, 11 Aug 2008 01:54:29 GMT Message-Id: <200808110154.m7B1sTRC016589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 147123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 01:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147123 Change 147123 by weongyo@weongyo_ws on 2008/08/11 01:53:44 Add missed USB vendor infomation for upgt(4). Affected files ... .. //depot/projects/vap/sys/dev/usb/usbdevs#24 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/usbdevs#24 (text+ko) ==== @@ -435,6 +435,7 @@ vendor TRUMPION 0x090a Trumpion Microelectronics vendor FEIYA 0x090c Feiya vendor ALATION 0x0910 Alation Systems +vendor GLOBESPAN 0x0915 Globespan vendor CONCORDCAMERA 0x0919 Concord Camera vendor GARMIN 0x091e Garmin International vendor GOHUBS 0x0921 GoHubs @@ -497,6 +498,7 @@ vendor HTC 0x0bb4 HTC vendor REALTEK 0x0bda Realtek vendor ADDONICS2 0x0bf6 Addonics Technology +vendor FSC 0x0bf8 Fujitsu Siemens Computers vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI vendor MICRODIA 0x0c45 Chicony @@ -700,6 +702,7 @@ product ACCTON 2664W 0x3501 2664W product ACCTON 111 0x3503 T-Sinus 111 Wireless Adapter product ACCTON SMCWUSBG 0x4505 SMCWUSB-G +product ACCTON PRISM_GT 0x4521 PrismGT USB 2.0 WLAN product ACCTON SS1001 0x5046 SpeedStream Ethernet Adapter product ACCTON ZD1211B 0xe501 ZD1211B @@ -1028,6 +1031,7 @@ product COMPOSITE USBPS2 0x0001 USB to PS2 Adaptor /* Conceptronic products */ +product CONCEPTRONIC PRISM_GT 0x3762 PrismGT USB 2.0 WLAN product CONCEPTRONIC C11U 0x7100 C11U product CONCEPTRONIC WL210 0x7110 WL-210 product CONCEPTRONIC AR5523_1 0x7801 AR5523 @@ -1094,7 +1098,9 @@ product DELL PORT 0x0058 Port Replicator product DELL AIO926 0x5115 Photo AIO Printer 926 product DELL BC02 0x8000 BC02 Bluetooth USB Adapter +product DELL PRISM_GT_1 0x8102 PrismGT USB 2.0 WLAN product DELL TM350 0x8103 TrueMobile 350 Bluetooth USB Adapter +product DELL PRISM_GT_2 0x8104 PrismGT USB 2.0 WLAN product DELL U740 0x8135 Dell U740 CDMA /* Delorme Paublishing products */ @@ -1245,6 +1251,9 @@ /* Freecom products */ product FREECOM DVD 0xfc01 DVD drive +/* Fujitsu Siemens Computers products */ +product FSC E5400 0x1009 PrismGT USB 2.0 WLAN + /* Future Technology Devices products */ product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial @@ -1312,6 +1321,10 @@ product GLOBALSUN AR5523_2 0x7811 AR5523 product GLOBALSUN AR5523_2_NF 0x7812 AR5523 (no firmware) +/* Globespan products */ +product GLOBESPAN PRISM_GT_1 0x2000 PrismGT USB 2.0 WLAN +product GLOBESPAN PRISM_GT_2 0x2002 PrismGT USB 2.0 WLAN + /* G.Mate, Inc products */ product GMATE YP3X00 0x1001 YP3X00 PDA @@ -1438,6 +1451,7 @@ product INTEL TESTBOARD 0x9890 82930 test board /* Intersil products */ +product INTERSIL PRISM_GT 0x1000 PrismGT USB 2.0 WLAN product INTERSIL PRISM_2X 0x3642 Prism2.x or Atmel WLAN /* Interpid Control Systems products */ @@ -1779,6 +1793,7 @@ product NETGEAR EA101X 0x1002 Ethernet product NETGEAR FA101 0x1020 Ethernet 10/100, USB1.1 product NETGEAR FA120 0x1040 USB 2.0 Ethernet +product NETGEAR WG111V2_2 0x4240 PrismGT USB 2.0 WLAN product NETGEAR WG111U 0x4300 WG111U product NETGEAR WG111U_NF 0x4301 WG111U (no firmware) product NETGEAR2 MA101 0x4100 MA101 @@ -2357,6 +2372,7 @@ product WINMAXGROUP FLASH64MC 0x6660 USB Flash Disk 64M-C /* Wistron NeWeb products */ +product WISTRONNEWEB UR045G 0x0427 PrismGT USB 2.0 WLAN product WISTRONNEWEB UR055G 0x0711 UR055G product WISTRONNEWEB AR5523_1 0x0826 AR5523 product WISTRONNEWEB AR5523_1_NF 0x0827 AR5523 (no firmware) @@ -2369,6 +2385,10 @@ /* Xirlink products */ product XIRLINK PCCAM 0x8080 IBM PC Camera +/* Xyratex products */ +product XYRATEX PRISM_GT_1 0x2000 PrismGT USB 2.0 WLAN +product XYRATEX PRISM_GT_2 0x2002 PrismGT USB 2.0 WLAN + /* Y-E Data products */ product YEDATA FLASHBUSTERU 0x0000 Flashbuster-U @@ -2388,6 +2408,7 @@ product ZCOM M4Y750 0x0001 M4Y-750 product ZCOM XI725 0x0002 XI-725/726 product ZCOM XI735 0x0005 XI-735 +product ZCOM XG703A 0x0008 PrismGT USB 2.0 WLAN product ZCOM ZD1211 0x0011 ZD1211 product ZCOM AR5523 0x0012 AR5523 product ZCOM AR5523_NF 0x0013 AR5523 driver (no firmware) From owner-p4-projects@FreeBSD.ORG Mon Aug 11 08:18:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0508F1065671; Mon, 11 Aug 2008 08:18:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD3F1106567E for ; Mon, 11 Aug 2008 08:18:03 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A861C8FC0C for ; Mon, 11 Aug 2008 08:18:03 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7B8I37e065494 for ; Mon, 11 Aug 2008 08:18:03 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7B8I3u1065492 for perforce@freebsd.org; Mon, 11 Aug 2008 08:18:03 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 11 Aug 2008 08:18:03 GMT Message-Id: <200808110818.m7B8I3u1065492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 08:18:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=147137 Change 147137 by strauss@strauss_marvelman on 2008/08/11 08:17:38 ZIP version information Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#28 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#8 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#28 (text+ko) ==== @@ -34,15 +34,17 @@ #endif #include +#include "archive.h" +#include "archive_entry.h" +#include "archive_private.h" +#include "archive_write_private.h" + #define ZIP_SIGNATURE_LOCAL_FILE_HEADER 0x04034b50 #define ZIP_SIGNATURE_DATA_DESCRIPTOR 0x08074b50 #define ZIP_SIGNATURE_FILE_HEADER 0x02014b50 #define ZIP_SIGNATURE_CENTRAL_DIRECTORY_END 0x06054b50 - -#include "archive.h" -#include "archive_entry.h" -#include "archive_private.h" -#include "archive_write_private.h" +#define ZIP_VERSION_EXTRACT 0x0014 /* ZIP version 2.0 is needed. */ +#define ZIP_VERSION_BY 0x0314 /* Made by UNIX, using ZIP version 2.0. */ static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s); static int archive_write_zip_finish(struct archive_write *); @@ -202,7 +204,7 @@ */ memset(&h, 0, sizeof(h)); zip_encode(ZIP_SIGNATURE_LOCAL_FILE_HEADER, &h.signature, sizeof(h.signature)); - zip_encode(0x0200, &h.version, sizeof(h.version)); + zip_encode(ZIP_VERSION_EXTRACT, &h.version, sizeof(h.version)); zip_encode(0x4, &h.flags, sizeof(h.flags)); /* Flagging bit 3 for using data descriptor. */ zip_encode(dos_time(archive_entry_mtime(entry)), &h.timedate, sizeof(h.timedate)); zip_encode(strlen(path), &h.filename_length, sizeof(h.filename_length)); @@ -285,7 +287,6 @@ * Fields not used are: * * - flags - * - timedate (TODO) * - extra_length * - comment_length * - disk_number @@ -293,7 +294,8 @@ */ memset(&h, 0, sizeof(h)); zip_encode(ZIP_SIGNATURE_FILE_HEADER, &h.signature, sizeof(h.signature)); - zip_encode(0x0200, &h.version_extract, sizeof(h.version_extract)); + zip_encode(ZIP_VERSION_EXTRACT, &h.version_extract, sizeof(h.version_extract)); + zip_encode(ZIP_VERSION_BY, &h.version_by, sizeof(h.version_by)); entries = 0; offset_start = zip->written_bytes; ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 11 09:24:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DE121065672; Mon, 11 Aug 2008 09:24:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 073ED106564A for ; Mon, 11 Aug 2008 09:24:15 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E68578FC0C for ; Mon, 11 Aug 2008 09:24:14 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7B9OE1d081620 for ; Mon, 11 Aug 2008 09:24:14 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7B9OEBL081618 for perforce@freebsd.org; Mon, 11 Aug 2008 09:24:14 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 11 Aug 2008 09:24:14 GMT Message-Id: <200808110924.m7B9OEBL081618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 09:24:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=147142 Change 147142 by snb@snb_toro on 2008/08/11 09:23:37 * Replace DH_RECLAIMAGE with a writeable sysctl (vfs.ufs.dirhash_reclaimage) * Fix bug where ufsdirhash_lowmem() tries to delete old locked hashes instead of skipping them, and doesn't delete the unlocked ones. * ufsdirhash_lowmem() now is more aggressive and deletes at a minimum enough dirhashes to free 10% of ufs_dirhashmem per invocation, and always deletes hashes it can older than ufs_dirhashreclaimage, as suggested by Alan Cox. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#3 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#8 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#3 (text+ko) ==== @@ -68,12 +68,6 @@ #define DH_SCOREINIT 8 /* initial dh_score when dirhash built */ #define DH_SCOREMAX 64 /* max dh_score value */ -/* - * If a vm_lowmem signal is received, we will try to free memory by - * deleting all hashes older than DH_RECLAIMAGE seconds. - */ -#define DH_RECLAIMAGE 5 - /* * The main hash table has 2 levels. It is an array of pointers to * blocks of DH_NBLKOFF offsets. ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#8 (text+ko) ==== @@ -85,6 +85,10 @@ static int ufs_dirhashlowmemcount = 0; SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_lowmemcount, CTLFLAG_RD, &ufs_dirhashlowmemcount, 0, "number of times low memory hook called"); +static int ufs_dirhashreclaimage = 5; +SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_reclaimage, CTLFLAG_RW, + &ufs_dirhashreclaimage, 0, + "max time in seconds of hash inactivity before deletion in low VM events"); static int ufsdirhash_hash(struct dirhash *dh, char *name, int namelen); @@ -1173,39 +1177,34 @@ { struct dirhash *dh; int memfreed = 0; + /* XXX: this 10% may need to be adjusted */ int memwanted = ufs_dirhashmem / 10; ufs_dirhashlowmemcount++; DIRHASHLIST_LOCK(); /* - * Delete dirhashes not used for more than DH_RECLAIMAGE seconds. - * If we can't get a lock on the dirhash, it will be skipped. Quit - * when we have freed up 10% or more of the memory currently used by - * dirhashes. - * XXX 10% may need to be adjusted? + * Delete dirhashes not used for more than ufs_dirhashreclaimage + * seconds. If we can't get a lock on the dirhash, it will be skipped. */ for (dh = TAILQ_FIRST(&ufsdirhash_list); dh != NULL; dh = TAILQ_NEXT(dh, dh_list)) { - if (time_second - dh->dh_lastused > DH_RECLAIMAGE && - lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + continue; + if (time_second - dh->dh_lastused > ufs_dirhashreclaimage) memfreed += ufsdirhash_destroy(dh); - if (memfreed >= memwanted) - break; } /* - * If no hashes were old enough, instead try deleting a single dirhash - * from the end of the list. + * If not enough memory was freed, keep deleting hashes from the head + * of the dirhash list. The ones closest to the head should be the + * oldest. */ - dh = TAILQ_FIRST(&ufsdirhash_list); - while (memfreed == 0 && dh != NULL) { - if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { - dh = TAILQ_NEXT(dh, dh_list); + for (dh = TAILQ_FIRST(&ufsdirhash_list); memfreed < memwanted && + dh !=NULL; dh = TAILQ_NEXT(dh, dh_list)) { + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) continue; - } memfreed += ufsdirhash_destroy(dh); - break; } DIRHASHLIST_UNLOCK(); } From owner-p4-projects@FreeBSD.ORG Mon Aug 11 09:32:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 774951065682; Mon, 11 Aug 2008 09:32:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39597106566C for ; Mon, 11 Aug 2008 09:32:24 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCC428FC21 for ; Mon, 11 Aug 2008 09:32:23 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7B9WNZH082274 for ; Mon, 11 Aug 2008 09:32:23 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7B9WN8q082272 for perforce@freebsd.org; Mon, 11 Aug 2008 09:32:23 GMT (envelope-from remko@freebsd.org) Date: Mon, 11 Aug 2008 09:32:23 GMT Message-Id: <200808110932.m7B9WN8q082272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 147143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 09:32:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147143 Change 147143 by remko@remko_nakur on 2008/08/11 09:32:04 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mh/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/nanobsd/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/remote-install/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/Makefile#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 delete .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#2 integrate .. //depot/projects/docproj_nl/www/en/projects/c99/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#5 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.276 2008/07/22 17:05:47 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.277 2008/08/06 22:03:48 pgj Exp $ 1999 @@ -256,19 +256,19 @@ to the appropriate repomeisters. - ncvs@ - regarding + ncvs@ - regarding /home/ncvs, the src repository - pcvs@ - regarding + pcvs@ - regarding /home/pcvs, the ports repository - dcvs@ - regarding + dcvs@ - regarding /home/dcvs, the doc repository - projcvs@ - regarding + projcvs@ - regarding /home/projcvs, the third party projects repository @@ -2627,7 +2627,7 @@ Alternatively, you can use the rmport - script, from ports/Tools/scripts. + script, from ports/Tools/scripts. This script has been written by &a.vd;, who is also its current maintainer, so please send questions, patches or suggestions about rmport to him. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + That will grab all the email in your inbox that was sent to + class="directory">inbox that was sent to freebsd-hackers or cc'd to that list. The brace options allow you to group search criteria together. This is sometimes very necessary as in the following example ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/nanobsd/article.sgml#2 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.3 2007/12/21 21:19:54 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.4 2008/08/06 22:03:49 pgj Exp $ 2006 @@ -104,24 +104,24 @@ The configuration file partition, which can be mounted - under the /cfg directory + under the /cfg directory at run time. These partitions are normally mounted read-only. - The /etc and - /var directories are + The /etc and + /var directories are &man.md.4; (malloc) disks. The configuration file partition persists under the - /cfg directory. It - contains files for /etc + /cfg directory. It + contains files for /etc directory and is briefly mounted read-only right after the system boot, therefore it is required to copy modified files - from /etc back to the - /cfg directory if changes + from /etc back to the + /cfg directory if changes are expected to persist after the system restarts. @@ -136,11 +136,11 @@ The partition containing - /cfg should be mounted + /cfg should be mounted only at boot time and while overriding the configuration files. - Keeping /cfg mounted at + Keeping /cfg mounted at all times is not a good idea, especially if the NanoBSD system runs off a mass storage medium that may be adversely affected by a large number @@ -155,7 +155,7 @@ A NanoBSD image is built using a simple nanobsd.sh shell script, which can be found in the - /usr/src/tools/tools/nanobsd + /usr/src/tools/tools/nanobsd directory. This script creates an image, which can be copied on the storage medium using the &man.dd.1; utility. @@ -290,7 +290,7 @@ A more useful example of a customization function is the following, which changes the default size of the - /etc directory + /etc directory from 5MB to 30MB: cust_etc_size () ( @@ -318,7 +318,7 @@ cust_install_files — Installs files from the - nanobsd/Files + nanobsd/Files directory, which contains some useful scripts for system administration. @@ -446,7 +446,7 @@ NanoBSD system, it is possible to use either the updatep1 or updatep2 script located in the - /root directory, depending + /root directory, depending from which partition is running the current system. According to which services are available on host serving ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 (text+ko) ==== @@ -23,7 +23,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.10 2008/04/24 19:44:25 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.11 2008/08/06 22:03:49 pgj Exp $ &tm-attrib.freebsd; @@ -220,13 +220,13 @@ This will map the entire Perforce repository to the - Root directory of your + Root directory of your client. DO NOT USE THIS DEFAULT! The &os; repo is huge, and trying to map and sync it all will take an enormous amount of resources. Instead, only map the section of the repo that you intend to work on. For example, there is the smpng project tree at //depot/projects/smpng. A + class="directory">//depot/projects/smpng. A mapping for this might look like: //depot/projects/smpng/... //client/... @@ -306,7 +306,7 @@ You can sync a subset of your tree or client by specifying a relative path to the sync command. For example, to only sync the - ufs directory of the + ufs directory of the smpng project, you might do the following: @@ -336,9 +336,9 @@ depot) is a single flat tree. Every file, whether a unique creation or a derivative from a branch, is accessible via a simple path under the server //depot directory. When you create a + class="directory">//depot directory. When you create a branch, all you are doing is creating a new path under the - //depot. This is in sharp + //depot. This is in sharp contrast to systems like CVS, where each branch lives in the same path as its parent. With Perforce, the server tracks the relationship between the files in the parent and @@ -811,7 +811,7 @@ Every 2 minutes, the CVS server is polled for updates in the HEAD branch, and those updates are committed to Perforce in the //depot/vendor/freebsd/... tree. This + class="directory">//depot/vendor/freebsd/... tree. This tree is then available for branching and integrating to derivative projects. Any project that directly modifies that &os; source code should have this tree as its branch parent (or grandparent, @@ -862,19 +862,19 @@ //depot/projects/soc2005/project-name/... + class="directory">//depot/projects/soc2005/project-name/... //depot/projects/soc2006/project-name/... + class="directory">//depot/projects/soc2006/project-name/... //depot/projects/soc2007/project-name/... + class="directory">//depot/projects/soc2007/project-name/... //depot/projects/soc2008/project-name/... + class="directory">//depot/projects/soc2008/project-name/... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ Basic Configuration We need to install the threaded perl. - Install lang/perl5.8 + Install lang/perl5.8 with the USE_THREADS=yes variable set. The current version of perl may need to be removed first; errors will be reported @@ -66,7 +66,7 @@ This will require all ports which require perl to be rebuilt and reinstalled; - ports-mgmt/portupgrade + ports-mgmt/portupgrade is perfect for this. At least it will point out which ports have been removed and which will need to be reinstalled. @@ -75,21 +75,21 @@ Now for the database server; MySQL is perfect for this sort of work. Install the - databases/mysql40-server + databases/mysql40-server along with - databases/p5-DBD-mysql40. + databases/p5-DBD-mysql40. The previous port should imply the installation of - databases/p5-DBI-137 + databases/p5-DBI-137 so that knocks off another step. Install the perl based portable - server plugin, net/p5-Net-Daemon + server plugin, net/p5-Net-Daemon port. Most of these port installations should have been straight forward. The next step will be more involved. Now install the - mail/p5-Sendmail-Milter + mail/p5-Sendmail-Milter port. As of this writing the Makefile contains a line beginning with BROKEN, just remove it or comment it out. It is only marked @@ -141,7 +141,7 @@ is beyond the scope of this document. Change the working directory to the - relaydelay-0.04 + relaydelay-0.04 directory: &prompt.root; cd relaydelay-0.04 @@ -164,7 +164,7 @@ If everything worked correctly a new file, relaydelay.log, should exist in - /var/log. It should + /var/log. It should contain something similar to the following text: Loaded Config File: /etc/mail/relaydelay.conf @@ -192,7 +192,7 @@ http://lists.puremagic.com/pipermail/greylist-users/2003-November/000327.html and save it in the - relaydelay-0.04 + relaydelay-0.04 directory. In the following examples this script is referred to as addlist.pl. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/remote-install/article.sgml#2 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.5 2008/05/03 08:26:12 loader Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.6 2008/08/06 22:03:49 pgj Exp $ &tm-attrib.freebsd; @@ -229,10 +229,10 @@ The first step is to mount the &os; installation CD, or the installation ISO image to /cdrom. For the sake of example, + class="directory">/cdrom. For the sake of example, in this article we will assume that you have downloaded the &os; 7.0-RELEASE ISO. Mounting this ISO image to - the /cdrom directory is + the /cdrom directory is easy with the &man.mdconfig.8; utility: &prompt.root; mdconfig -a -t vnode -u 10 -f 7.0-RELEASE-amd64-disc1.iso @@ -247,7 +247,7 @@ The above make command has to be run from the top level of the mfsBSD directory tree, i.e. ~/mfsbsd-1.0-beta1/. + class="directory">~/mfsbsd-1.0-beta1/. @@ -317,9 +317,9 @@ introduction, this article will present how to set up a system with RAID-1 and ZFS capabilities. Our set up will consist of a small &man.gmirror.8; mirrored - / (root), /usr and /var file systems, and the rest of + / (root), /usr and /var file systems, and the rest of the disk space will be allocated for a &man.zpool.8; mirrored ZFS file system. Please note, that the ZFS file system will be @@ -363,11 +363,11 @@ to the &man.bsdlabel.8; manual page in order to find out how to create partitions. Create partitions a for / (root) file system, + class="directory">/ (root) file system, b for swap, d for - /var, + /var, e for /usr and finally + class="directory">/usr and finally f which will later be used for ZFS. @@ -417,7 +417,7 @@ Enter. With the help of arrow keys, move the cursor on the Install Root item, press Space and change it to /mnt. Press + class="directory">/mnt. Press Enter to submit your changes and exit the Options menu by pressing q. @@ -474,7 +474,7 @@ Copy the GENERIC kernel to the - /boot/kernel + /boot/kernel directory: &prompt.root; cp -Rp /boot/GENERIC/* /boot/kernel ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.23 2006/10/18 19:34:16 danger Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.24 2008/08/10 00:20:27 pgj Exp $ # # Build the FreeBSD Developers' Handbook. # @@ -25,7 +25,6 @@ # SGML content SRCS= book.sgml -SRCS+= dma/chapter.sgml SRCS+= introduction/chapter.sgml SRCS+= ipv6/chapter.sgml SRCS+= kernelbuild/chapter.sgml ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ Kernel - &chap.dma; &chap.kernelbuild; &chap.kerneldebug; ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.22 2006/10/16 19:15:36 danger Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent,v 1.23 2008/08/10 00:20:27 pgj Exp $ --> @@ -22,7 +22,6 @@ - ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -37,7 +37,7 @@ Up to version 4.X of &os; this was the recommended way to build a new kernel. It can still be used on newer versions (instead of the buildkernel target of the toplevel - /usr/src/ makefiles). + /usr/src/ makefiles). Building the kernel this way may be useful when working on the kernel code and it may actually be faster than the New procedure when only a single option or two were ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -966,6 +966,7 @@ * Programmed by G. Adam Stanislav */ #include <stdio.h> +#include <string.h> #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> @@ -1181,6 +1182,7 @@ * June 19, 2001 */ #include <stdio.h> +#include <string.h> #include <time.h> #include <unistd.h> #include <sys/types.h> @@ -1582,7 +1584,7 @@ host = (argc > 1) ? (char *)argv[1] : "time.nist.gov"; if ((he = gethostbyname(host)) == NULL) { - perror(host); + herror(host); return 2; } ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -138,10 +138,10 @@ The Bywater Basic Interpreter can be found in the Ports Collection as - lang/bwbasic + lang/bwbasic and the Phil Cockroft's Basic Interpreter (formerly Rabbit Basic) is available as - lang/pbasic. + lang/pbasic. @@ -163,14 +163,14 @@ Various implementations of Lisp that can run on &unix; systems are available in the Ports Collection for &os;. GNU Common Lisp can be found as - lang/gcl. CLISP + lang/gcl. CLISP by Bruno Haible and Michael Stoll is available as - lang/clisp. + lang/clisp. For CMUCL, which includes a highly-optimizing compiler too, or simpler Lisp implementations like SLisp, which implements most of the Common Lisp constructs in a few hundred lines of C code, - lang/cmucl and - lang/slisp are available + lang/cmucl and + lang/slisp are available respectively. @@ -184,7 +184,7 @@ writing CGI scripts. Perl is available in the Ports Collection as - lang/perl5 for all + lang/perl5 for all &os; releases, and is installed as /usr/bin/perl in the base system 4.X releases. @@ -201,12 +201,12 @@ abstraction to be used in research work. Scheme is available from the Ports Collection as - lang/elk for the + lang/elk for the Elk Scheme Interpreter. The MIT Scheme Interpreter can be found in - lang/mit-scheme + lang/mit-scheme and the SCM Scheme Interpreter in - lang/scm. + lang/scm. @@ -218,7 +218,7 @@ facilities for processing strings and structures. The version of Icon for &os; can be found in the Ports Collection as - lang/icon. + lang/icon. @@ -235,7 +235,7 @@ The latest version of Logo for &os; is available from the Ports Collection in - lang/logo. + lang/logo. @@ -253,7 +253,7 @@ The latest version of Python is available from the Ports Collection in - lang/python. + lang/python. @@ -268,7 +268,7 @@ programs. Ruby is available from the Ports Collection as - lang/ruby18. + lang/ruby18. @@ -285,7 +285,7 @@ Various versions of Tcl are available as ports for &os;. The latest version, Tcl 8.4, can be found in - lang/tcl84. + lang/tcl84. @@ -328,14 +328,14 @@ support in the base system, but both GNU Pascal Compiler (GPC) and the Free Pascal Compiler are available in the Ports Collection as - lang/gpc and - lang/fpc. + lang/gpc and + lang/fpc. As the edit-compile-run-debug cycle is rather tedious when using separate programs, many commercial compiler makers have produced Integrated Development Environments (IDEs for short). FreeBSD does not include - an IDE in the base system, but devel/kdevelop is + an IDE in the base system, but devel/kdevelop is available in the Ports Collection and many use Emacs for this purpose. Using Emacs as an IDE is discussed in @@ -1431,7 +1431,7 @@ Finally, if you find its text-based command-prompt style off-putting, there is a graphical front-end for it - (devel/xxgdb) in the Ports + (devel/xxgdb) in the Ports Collection. This section is intended to be an introduction to using @@ -1759,7 +1759,7 @@ And doubtless many more that I have overlooked. Emacs can be installed on &os; using - the editors/emacs + the editors/emacs port. Once it is installed, start it up and do C-h ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#6 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1077 2008/07/23 21:32:46 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1097 2008/08/09 23:19:31 pgj Exp $ 1995 @@ -368,7 +368,7 @@ not capable of identifying the difference between a real problem and a temporary problem, you should not use &os.current;. This branch sometimes evolves quite quickly - and can be un-buildable for a number of days at a time. + and can be un-buildable sometimes. People that use &os.current; are expected to be able to analyze any problems and only report them if they are deemed to be mistakes rather than glitches. @@ -425,7 +425,7 @@ Official snapshots are generated each month on a regular basis for all actively developed branches. There are also daily snapshot builds of the popular &arch.i386; and - &arch.amd64 branches, hosted on . @@ -630,12 +630,7 @@ The project produces a wide range of documentation, available online from this link: . The same - documents are available as packages, that you can easily - install on your &os; system. More details on documentation - packages can be found in the next paragraphs. - - In addition, . In addition, the Bibliography at the end of this FAQ, and the one in the Handbook @@ -668,7 +663,7 @@ The document's language and encoding. These are based on the locale names you will find under - /usr/share/locale on your &os; + /usr/share/locale on your &os; system. The current languages and encodings that we have for documentation are as follows: @@ -686,13 +681,13 @@ en_US.ISO8859-1 - US English + English (United States) bn_BD.ISO10646-1 - Bengali (or Bangla) + Bengali or Bangla (Bangladesh) @@ -704,7 +699,7 @@ de_DE.ISO8859-1 - German + German (Germany) @@ -716,37 +711,37 @@ es_ES.ISO8859-1 - Spanish + Spanish (Spain) fr_FR.ISO8859-1 - French + French (France) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 11 09:53:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0079106567A; Mon, 11 Aug 2008 09:53:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3CCB1065676 for ; Mon, 11 Aug 2008 09:53:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F5768FC15 for ; Mon, 11 Aug 2008 09:53:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7B9rjw4083918 for ; Mon, 11 Aug 2008 09:53:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7B9rj7p083916 for perforce@freebsd.org; Mon, 11 Aug 2008 09:53:45 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 09:53:45 GMT Message-Id: <200808110953.m7B9rj7p083916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 09:53:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147145 Change 147145 by trasz@trasz_traszkan on 2008/08/11 09:52:59 Update manual page for mount(8). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#3 (text+ko) ==== @@ -120,11 +120,14 @@ The following options are available: .Bl -tag -width indent .It Cm acls -Enable Access Control Lists, or ACLS, which can be customized via the +Enable POSIX.1e Access Control Lists, or ACLS, which can be customized via the .Xr setfacl 1 and .Xr getfacl 1 commands. +This flag is mutially exlusive with +.Cm nfs4acls +flag. .It Cm async All .Tn I/O @@ -177,6 +180,15 @@ .Xr mac 4 for more information, which cause the multilabel mount flag to be set automatically at mount-time. +.It Cm nfs4acls +Enable NFS4 ACLS, which can be customized via the +.Xr setfacl 1 +and +.Xr getfacl 1 +commands. +This flag is mutially exlusive with +.Cm acls +flag. .It Cm noasync Metadata I/O should be done synchronously, while data I/O should be done asynchronously. From owner-p4-projects@FreeBSD.ORG Mon Aug 11 12:32:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38ADE106568E; Mon, 11 Aug 2008 12:32:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F075A1065677 for ; Mon, 11 Aug 2008 12:32:26 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD3E08FC31 for ; Mon, 11 Aug 2008 12:32:26 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BCWQJe001612 for ; Mon, 11 Aug 2008 12:32:26 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BCWQI0001610 for perforce@freebsd.org; Mon, 11 Aug 2008 12:32:26 GMT (envelope-from snagg@FreeBSD.org) Date: Mon, 11 Aug 2008 12:32:26 GMT Message-Id: <200808111232.m7BCWQI0001610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 12:32:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=147149 Change 147149 by snagg@snagg_macosx on 2008/08/11 12:31:34 Added test for exit(2), some bugfixes. Affected files ... .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#13 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#11 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_bind.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#5 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_connect.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_exit.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_fork.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_kill.c#5 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#9 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_pipe.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_rename.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setauid.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#7 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setresuid.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#7 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_socket.c#2 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_stat.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_symlink.c#4 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_sysctl.c#3 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_waitpid.c#4 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#13 (text+ko) ==== ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#11 (text+ko) ==== ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_bind.c#2 (text+ko) ==== @@ -105,6 +105,7 @@ long control_flag; to_parse = WAITING; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#5 (text+ko) ==== @@ -117,7 +117,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_connect.c#2 (text+ko) ==== @@ -145,6 +145,7 @@ long control_flag; to_parse = WAITING; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_fork.c#4 (text+ko) ==== @@ -95,7 +95,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_kill.c#5 (text+ko) ==== @@ -157,6 +157,7 @@ to_parse = WAITING; arg_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#9 (text+ko) ==== @@ -126,6 +126,7 @@ to_parse = WAITING; arg_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_pipe.c#3 (text+ko) ==== @@ -95,6 +95,7 @@ to_parse = WAITING; arg_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_rename.c#4 (text+ko) ==== @@ -129,6 +129,7 @@ to_parse = WAITING; path_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setauid.c#4 (text+ko) ==== @@ -118,7 +118,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#7 (text+ko) ==== @@ -117,7 +117,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setresuid.c#4 (text+ko) ==== @@ -107,7 +107,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#7 (text+ko) ==== @@ -115,7 +115,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_socket.c#2 (text+ko) ==== @@ -112,6 +112,7 @@ to_parse = WAITING; arg_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_stat.c#3 (text+ko) ==== @@ -93,7 +93,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_symlink.c#4 (text+ko) ==== @@ -122,7 +122,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_sysctl.c#3 (text+ko) ==== @@ -109,6 +109,7 @@ to_parse = WAITING; arg_counter = 0; + control_flag = 0; fp = fopen(path, "r"); if(fp == NULL) ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_waitpid.c#4 (text+ko) ==== @@ -97,7 +97,8 @@ long control_flag; to_parse = WAITING; - + control_flag = 0; + fp = fopen(path, "r"); if(fp == NULL) return; From owner-p4-projects@FreeBSD.ORG Mon Aug 11 12:59:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E940B1065686; Mon, 11 Aug 2008 12:59:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93A211065672 for ; Mon, 11 Aug 2008 12:59:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 805938FC1A for ; Mon, 11 Aug 2008 12:59:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BCxsaA013052 for ; Mon, 11 Aug 2008 12:59:54 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BCxs0r013050 for perforce@freebsd.org; Mon, 11 Aug 2008 12:59:54 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 12:59:54 GMT Message-Id: <200808111259.m7BCxs0r013050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 12:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=147150 Change 147150 by trasz@trasz_traszkan on 2008/08/11 12:59:01 Fix one failing test (return EACCES instead of EPERM for DELETE/DELETE_CHILD); introduce several other ones. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#18 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/fstest.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chmod/12.t#1 add .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#18 (text+ko) ==== @@ -249,7 +249,7 @@ return (0); } - if (acc_mode & (VADMIN_PERMS | VDELETE_CHILD | VDELETE)) + if (acc_mode & VADMIN_PERMS) denied = EPERM; else denied = EACCES; ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/fstest.c#3 (text+ko) ==== @@ -82,6 +82,7 @@ ACTION_PREPENDACL, ACTION_READACL, #endif + ACTION_WRITE, }; #define TYPE_NONE 0x0000 @@ -127,6 +128,7 @@ { "prependacl", ACTION_PREPENDACL, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, { "readacl", ACTION_READACL, { TYPE_STRING, TYPE_NONE } }, #endif + { "write", ACTION_WRITE, { TYPE_STRING, TYPE_NONE } }, { NULL, -1, { TYPE_NONE } } }; @@ -533,6 +535,15 @@ rval = 0; break; #endif + + case ACTION_WRITE: + rval = open(STR(0), O_WRONLY); + if (rval < 0) + break; + + rval = write(rval, "x", 1); + break; + default: fprintf(stderr, "unsupported syscall\n"); exit(1); ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#2 (text+ko) ==== @@ -5,13 +5,15 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..27" +echo "1..49" n0=`namegen` n1=`namegen` n2=`namegen` +n3=`namegen` expect 0 mkdir ${n2} 0755 +expect 0 mkdir ${n3} 0777 cdir=`pwd` cd ${n2} @@ -28,7 +30,7 @@ expect 0 mkdir ${n0} 0755 expect 0 rmdir ${n0} -# Tests 8..16 - check out whether user 65534 is permitted to create and remove +# Check whether user 65534 is permitted to create and remove # files, but not subdirectories. expect 0 prependacl . user:65534:write_data::allow,user:65534:append_data::deny @@ -46,9 +48,25 @@ expect 0 mkdir ${n0} 0755 expect 0 -u 65534 -g 65534 rmdir ${n0} -# XXX: Check for moving things from/to ${n0}. +# Can move files from other directory? +expect 0 create ../${n3}/${n1} 0644 +expect 0 -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} + +# Can move files from other directory overwriting existing files? +expect 0 create ../${n3}/${n1} 0644 +expect 0 -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} + +expect 0 -u 65534 -g 65534 unlink ${n0} + +# Can move directories from other directory? +expect 0 mkdir ../${n3}/${n1} 0777 +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} + +# Can move directories from other directory overwriting existing directory? +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} +expect 0 -u 65534 -g 65534 rmdir ../${n3}/${n1} -# Tests 17..27 - check out whether user 65534 is permitted to create +# Check whether user 65534 is permitted to create # subdirectories, but not files - and to remove neither of them. expect 0 prependacl . user:65534:write_data::deny,user:65534:append_data::allow @@ -67,7 +85,25 @@ expect EACCES -u 65534 -g 65534 rmdir ${n0} expect 0 rmdir ${n0} -# XXX: Check for moving things from/to ${n0}. +# Can move files from other directory? +expect 0 create ../${n3}/${n1} 0644 +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} + +# Can move files from other directory overwriting existing files? +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} +expect 0 -u 65534 -g 65534 unlink ../${n3}/${n1} + +# Can move directories from other directory? +expect 0 mkdir ../${n3}/${n1} 0777 +expect 0 -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} + +# Can move directories from other directory overwriting existing directory? +expect 0 mkdir ../${n3}/${n1} 0777 +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} +expect 0 prependacl . user:65534:delete_child::allow +expect 0 -u 65534 -g 65534 rename ../${n3}/${n1} ${n0} +expect 0 -u 65534 -g 65534 rmdir ${n0} cd ${cdir} expect 0 rmdir ${n2} +expect 0 rmdir ${n3} ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#2 (text+ko) ==== @@ -5,7 +5,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..17" +echo "1..52" n0=`namegen` n1=`namegen` @@ -15,7 +15,7 @@ cdir=`pwd` cd ${n2} -# Tests 1..12 - check out whether user 65534 is permitted to read ACL. +# Check whether user 65534 is permitted to read ACL. expect 0 create ${n0} 0644 expect 0 readacl ${n0} expect 0 -u 65534 -g 65534 readacl ${n0} @@ -27,12 +27,77 @@ expect 0 readacl ${n0} expect 0 unlink ${n0} -# Tests 12..17 - check out whether user 65534 is permitted to write ACL. +# Check whether user 65534 is permitted to write ACL. expect 0 create ${n0} 0644 expect EPERM -u 65534 -g 65534 prependacl ${n0} user:65534:read_data::allow expect 0 prependacl ${n0} user:65534:write_acl::allow expect 0 -u 65534 -g 65534 prependacl ${n0} user:65534:read_data::allow expect 0 unlink ${n0} +# Check whether user 65534 is permitted to write mode. +expect 0 create ${n0} 0755 +expect EPERM -u 65534 -g 65534 chmod ${n0} 0777 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect 0 -u 65534 -g 65534 chmod ${n0} 0777 +expect 0 unlink ${n0} + +# There is an interesting problem with interaction between ACL_WRITE_ACL +# and SUID/SGID bits. In case user does have ACL_WRITE_ACL, but is not +# a file owner, Solaris does the following: +# 1. Setting SUID fails with EPERM. +# 2. Setting SGID succeeds, but mode is not changed. +# 3. Modifying ACL does not clear SUID nor SGID bits. +# 4. Writing the file does clear both SUID and SGID bits. +# +# What we are doing is the following: +# 1. Setting SUID or SGID fails with EPERM. +# 2. Modifying ACL does not clear SUID nor SGID bits. +# 3. Writing the file does clear both SUID and SGID bits. +# +# Check whether user 65534 is denied to write mode with SUID bit. +expect 0 create ${n0} 0755 +expect EPERM -u 65534 -g 65534 chmod ${n0} 04777 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect EPERM -u 65534 -g 65534 chmod ${n0} 04777 +expect 0 unlink ${n0} + +# Check whether user 65534 is denied to write mode with SGID bit. +expect 0 create ${n0} 0755 +expect EPERM -u 65534 -g 65534 chmod ${n0} 02777 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect EPERM -u 65534 -g 65534 chmod ${n0} 02777 +expect 0 unlink ${n0} + +# Check whether user 65534 is allowed to write mode with sticky bit. +expect 0 mkdir ${n0} 0755 +expect EPERM -u 65534 -g 65534 chmod ${n0} 01777 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect 0 -u 65534 -g 65534 chmod ${n0} 01777 +expect 0 rmdir ${n0} + +# Check whether modifying the ACL by not-owner preserves the SUID. +expect 0 create ${n0} 04755 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect 0 -u 65534 -g 65534 prependacl ${n0} user:65534:write_data::allow +expect 04755 stat ${n0} mode +expect 0 unlink ${n0} + +# Check whether modifying the ACL by not-owner preserves the SGID. +expect 0 create ${n0} 02755 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect 0 -u 65534 -g 65534 prependacl ${n0} user:65534:write_data::allow +expect 02755 stat ${n0} mode +expect 0 unlink ${n0} + +# Check whether modifying the ACL by not-owner preserves the sticky bit. +expect 0 mkdir ${n0} 01755 +expect 0 prependacl ${n0} user:65534:write_acl::allow +expect 0 -u 65534 -g 65534 prependacl ${n0} user:65534:write_data::allow +expect 01755 stat ${n0} mode +expect 0 rmdir ${n0} + +# Clearing the SUID and SGID bits when being written to by non-owner +# is checked in chmod/12.t. + cd ${cdir} expect 0 rmdir ${n2} ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#2 (text+ko) ==== @@ -5,34 +5,127 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..15" +echo "1..65" n0=`namegen` n1=`namegen` n2=`namegen` +n3=`namegen` expect 0 mkdir ${n2} 0755 +expect 0 mkdir ${n3} 0777 cdir=`pwd` cd ${n2} -# Tests 2..8 DELETE_CHILD denied on writable directory. +# Unlink allowed on writable directory. expect 0 create ${n0} 0644 expect EACCES -u 65534 -g 65534 unlink ${n0} expect 0 prependacl . user:65534:write_data::allow expect 0 -u 65534 -g 65534 unlink ${n0} + +# Moving file elsewhere allowed on writable directory. expect 0 create ${n0} 0644 +expect 0 prependacl . user:65534:write_data::deny +expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} +expect 0 prependacl . user:65534:write_data::allow +expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} + +# Moving file from elsewhere allowed on writable directory. +expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect 0 -u 65534 -g 65534 unlink ${n0} + +# Moving file from elsewhere overwriting local file allowed +# on writable directory. +expect 0 create ${n0} 0644 +expect 0 create ../${n3}/${n0} 0644 +expect 0 prependacl . user:65534:write_data::deny +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect 0 prependacl . user:65534:write_data::allow +expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect 0 -u 65534 -g 65534 unlink ${n0} + +# Denied DELETE changes nothing wrt removing. +expect 0 create ${n0} 0644 +expect 0 prependacl ${n0} user:65534:delete::deny +expect 0 -u 65534 -g 65534 unlink ${n0} + +# Denied DELETE changes nothing wrt moving elsewhere or from elsewhere. +expect 0 create ${n0} 0644 +expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} +expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect 0 -u 65534 -g 65534 unlink ${n0} + +# DELETE_CHILD denies unlink on writable directory. +expect 0 create ${n0} 0644 expect 0 prependacl . user:65534:delete_child::deny -expect EPERM -u 65534 -g 65534 unlink ${n0} +expect EACCES -u 65534 -g 65534 unlink ${n0} +expect 0 unlink ${n0} + +# DELETE_CHILD denies moving file elsewhere. +expect 0 create ${n0} 0644 +expect EACCES -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} +expect 0 rename ${n0} ../${n3}/${n0} + +# DELETE_CHILD does not deny moving file from elsewhere +# to a writable directory. +expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# DELETE_CHILD denies moving file from elsewhere +# to a writable directory overwriting local file. +expect 0 create ../${n3}/${n0} 0644 +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# DELETE allowed on file allows for unlinking, no matter +# what permissions on containing directory are. +expect 0 prependacl ${n0} user:65534:delete::allow +expect 0 -u 65534 -g 65534 unlink ${n0} + +# Same for moving the file elsewhere. +expect 0 create ${n0} 0644 +expect 0 prependacl ${n0} user:65534:delete::allow +expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} + +# Same for moving the file from elsewhere into a writable +# directory with DELETE_CHILD denied. +expect 0 -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} +expect 0 unlink ${n0} -# Tests 9..15 DELETE allowed on file. -expect EPERM -u 65534 -g 65534 unlink ${n0} +# DELETE does not allow for overwriting a file in a unwritable +# directory with DELETE_CHILD denied. +expect 0 create ${n0} 0644 +expect 0 create ../${n3}/${n0} 0644 +expect 0 prependacl . user:65534:write_data::deny +expect 0 prependacl . user:65534:delete_child::deny +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} expect 0 prependacl ${n0} user:65534:delete::allow +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# But it allows for plain deletion. expect 0 -u 65534 -g 65534 unlink ${n0} -# DELETE_CHILD allowed on directory. +# DELETE_CHILD allowed on unwritable directory. expect 0 create ${n0} 0644 expect 0 prependacl . user:65534:delete_child::allow expect 0 -u 65534 -g 65534 unlink ${n0} +# Moving things elsewhere is allowed. +expect 0 create ${n0} 0644 +expect 0 -u 65534 -g 65534 rename ${n0} ../${n3}/${n0} + +# Moving things back is not. +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# Even if we're overwriting. +expect 0 create ${n0} 0644 +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# Even if we have DELETE on the existing file. +expect 0 prependacl ${n0} user:65534:delete::allow +expect EACCES -u 65534 -g 65534 rename ../${n3}/${n0} ${n0} + +# Denied DELETE changes nothing wrt removing. +expect 0 prependacl ${n0} user:65534:delete::deny +expect 0 -u 65534 -g 65534 unlink ${n0} + cd ${cdir} expect 0 rmdir ${n2} From owner-p4-projects@FreeBSD.ORG Mon Aug 11 14:52:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 028B8106566C; Mon, 11 Aug 2008 14:52:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA985106564A for ; Mon, 11 Aug 2008 14:52:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A91B68FC14 for ; Mon, 11 Aug 2008 14:52:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BEquSv025362 for ; Mon, 11 Aug 2008 14:52:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BEquJV025360 for perforce@freebsd.org; Mon, 11 Aug 2008 14:52:56 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 14:52:56 GMT Message-Id: <200808111452.m7BEquJV025360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 14:52:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147154 Change 147154 by trasz@trasz_traszkan on 2008/08/11 14:52:02 Deny setting setuid if we have ACL_WRITE_ACL, but are not the file owner. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 (text+ko) ==== @@ -257,5 +257,11 @@ if (error) return (error); } + /* + * Deny setting setuid if we are not the file owner. + */ + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) + return (EPERM); + return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#10 (text+ko) ==== @@ -717,6 +717,13 @@ if (error) return (error); } + + /* + * Deny setting setuid if we are not the file owner. + */ + if ((mode & ISUID) && ip->i_uid != cred->cr_uid) + return (EPERM); + ip->i_mode &= ~ALLPERMS; ip->i_mode |= (mode & ALLPERMS); DIP_SET(ip, i_mode, ip->i_mode); From owner-p4-projects@FreeBSD.ORG Mon Aug 11 15:02:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 255191065677; Mon, 11 Aug 2008 15:02:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD0FE1065674 for ; Mon, 11 Aug 2008 15:02:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB8838FC13 for ; Mon, 11 Aug 2008 15:02:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BF25NV026082 for ; Mon, 11 Aug 2008 15:02:05 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BF25fu026080 for perforce@freebsd.org; Mon, 11 Aug 2008 15:02:05 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 15:02:05 GMT Message-Id: <200808111502.m7BF25fu026080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 15:02:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=147155 Change 147155 by trasz@trasz_traszkan on 2008/08/11 15:01:07 For some reason, mkdir(2) with permissions equal to 01755 results in mode 0755, without sticky bit. Work around this. With this change, ZFS passes regression tests. For now. ;-) Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#3 (text+ko) ==== @@ -5,7 +5,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..52" +echo "1..53" n0=`namegen` n1=`namegen` @@ -90,7 +90,8 @@ expect 0 unlink ${n0} # Check whether modifying the ACL by not-owner preserves the sticky bit. -expect 0 mkdir ${n0} 01755 +expect 0 mkdir ${n0} 0755 +expect 0 chmod ${n0} 01755 expect 0 prependacl ${n0} user:65534:write_acl::allow expect 0 -u 65534 -g 65534 prependacl ${n0} user:65534:write_data::allow expect 01755 stat ${n0} mode From owner-p4-projects@FreeBSD.ORG Mon Aug 11 15:38:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67FBB1065672; Mon, 11 Aug 2008 15:38:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BBCE106566B for ; Mon, 11 Aug 2008 15:38:43 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 193408FC1C for ; Mon, 11 Aug 2008 15:38:43 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BFcgXD030128 for ; Mon, 11 Aug 2008 15:38:42 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BFcgHc030126 for perforce@freebsd.org; Mon, 11 Aug 2008 15:38:42 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 11 Aug 2008 15:38:42 GMT Message-Id: <200808111538.m7BFcgHc030126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 15:38:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147156 Change 147156 by strauss@strauss_marvelman on 2008/08/11 15:38:27 Added support for extra fields (mtime, atime, ctime, uid, gid), somehow format is still wrong, unzip does not recognize it Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#29 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#29 (text+ko) ==== @@ -43,8 +43,11 @@ #define ZIP_SIGNATURE_DATA_DESCRIPTOR 0x08074b50 #define ZIP_SIGNATURE_FILE_HEADER 0x02014b50 #define ZIP_SIGNATURE_CENTRAL_DIRECTORY_END 0x06054b50 +#define ZIP_SIGNATURE_EXTRA_TIMESTAMP 0x5455 +#define ZIP_SIGNATURE_EXTRA_UNIX 0x7855 #define ZIP_VERSION_EXTRACT 0x0014 /* ZIP version 2.0 is needed. */ -#define ZIP_VERSION_BY 0x0314 /* Made by UNIX, using ZIP version 2.0. */ +#define ZIP_VERSION_BY 0x0314 /* Made by UNIX, using ZIP version 2.0. */ +#define ZIP_FLAGS 0x04 /* Flagging bit 3 for using data descriptor. */ static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s); static int archive_write_zip_finish(struct archive_write *); @@ -93,9 +96,24 @@ char uncompressed_size[4]; }; +struct zip_extra_data { + char time_id[2]; + char time_size[2]; + struct time_data { + char flag; + char data[4]; + } mtime, atime, ctime; + char unix_id[2]; + char unix_size[2]; + char unix_uid[2]; + char unix_gid[2]; +}; + struct zip_file_header_link { struct zip_file_header_link *next; struct archive_entry *entry; + char extra_length[2]; + struct zip_extra_data extra_data; off_t offset; uLong crc32; }; @@ -159,22 +177,25 @@ static int archive_write_zip_header(struct archive_write *a, struct archive_entry *entry) { - /* TODO: Also handle non-regular file entries. */ - if (archive_entry_filetype(entry) != AE_IFREG) { - archive_set_error(&a->archive, EPERM, "Non-regular files are not yet supported."); - return ARCHIVE_FAILED; - }; - struct zip *zip; struct zip_local_file_header h; + struct zip_extra_data e; struct zip_data_descriptor *d; struct zip_file_header_link *l; const char *path; int ret; + int64_t size; + /* TODO: Also handle non-regular file entries. */ + if (archive_entry_filetype(entry) != AE_IFREG) { + archive_set_error(&a->archive, EPERM, "Non-regular files are not yet supported."); + return ARCHIVE_FAILED; + }; + zip = a->format_data; d = &zip->data_descriptor; path = archive_entry_pathname(entry); + size = archive_entry_size(entry); /* Append archive entry to the central directory data. * Storing in reverse order, for ease of coding. @@ -205,26 +226,47 @@ memset(&h, 0, sizeof(h)); zip_encode(ZIP_SIGNATURE_LOCAL_FILE_HEADER, &h.signature, sizeof(h.signature)); zip_encode(ZIP_VERSION_EXTRACT, &h.version, sizeof(h.version)); - zip_encode(0x4, &h.flags, sizeof(h.flags)); /* Flagging bit 3 for using data descriptor. */ + zip_encode(ZIP_FLAGS, &h.flags, sizeof(h.flags)); zip_encode(dos_time(archive_entry_mtime(entry)), &h.timedate, sizeof(h.timedate)); zip_encode(strlen(path), &h.filename_length, sizeof(h.filename_length)); + zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); + + /* Formatting extra data. */ + zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); + zip_encode(ZIP_SIGNATURE_EXTRA_TIMESTAMP, &e.time_id, sizeof(e.time_id)); + zip_encode(sizeof(e.atime) + sizeof(e.mtime) + sizeof(e.ctime), &e.time_size, sizeof(e.time_size)); + zip_encode(0x01, &e.mtime.flag, sizeof(e.mtime.flag)); + zip_encode(archive_entry_mtime(entry), &e.mtime.data, sizeof(e.mtime.data)); + zip_encode(0x02, &e.atime.flag, sizeof(e.atime.flag)); + zip_encode(archive_entry_atime(entry), &e.atime.data, sizeof(e.atime.data)); + zip_encode(0x04, &e.ctime.flag, sizeof(e.ctime.flag)); + zip_encode(archive_entry_ctime(entry), &e.ctime.data, sizeof(e.ctime.data)); + zip_encode(ZIP_SIGNATURE_EXTRA_UNIX, &e.unix_id, sizeof(e.unix_id)); + zip_encode(sizeof(e.unix_uid) + sizeof(e.unix_gid), &e.unix_size, sizeof(e.unix_size)); + zip_encode(archive_entry_uid(entry), &e.unix_uid, sizeof(e.unix_uid)); + zip_encode(archive_entry_gid(entry), &e.unix_gid, sizeof(e.unix_gid)); + l->extra_data = e; + l->extra_length[0] = h.extra_length[0]; + l->extra_length[1] = h.extra_length[1]; /* This will surely change when compression is implemented. */ - int64_t size = archive_entry_size(entry); zip_encode(size, &d->compressed_size, sizeof(d->compressed_size)); zip_encode(size, &d->uncompressed_size, sizeof(d->uncompressed_size)); ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - zip->written_bytes += sizeof(h); ret = (a->compressor.write)(a, path, strlen(path)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); + zip->written_bytes += strlen(path); - zip->written_bytes += strlen(path); + ret = (a->compressor.write)(a, &e, sizeof(e)); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + zip->written_bytes += sizeof(e); return (ARCHIVE_OK); } @@ -296,6 +338,7 @@ zip_encode(ZIP_SIGNATURE_FILE_HEADER, &h.signature, sizeof(h.signature)); zip_encode(ZIP_VERSION_EXTRACT, &h.version_extract, sizeof(h.version_extract)); zip_encode(ZIP_VERSION_BY, &h.version_by, sizeof(h.version_by)); + zip_encode(ZIP_FLAGS, &h.flags, sizeof(h.flags)); entries = 0; offset_start = zip->written_bytes; @@ -309,20 +352,25 @@ zip_encode(size, &h.compressed_size, sizeof(h.compressed_size)); zip_encode(size, &h.uncompressed_size, sizeof(h.uncompressed_size)); zip_encode(strlen(path), &h.filename_length, sizeof(h.filename_length)); + h.extra_length[0] = l->extra_length[0]; + h.extra_length[1] = l->extra_length[1]; zip_encode(l->offset, &h.offset, sizeof(h.offset)); - /* Writing file header. */ ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); zip->written_bytes += sizeof(h); - /* Writing filename. */ ret = (a->compressor.write)(a, path, strlen(path)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); zip->written_bytes += strlen(path); + ret = (a->compressor.write)(a, &l->extra_data, sizeof(l->extra_data)); + if (ret != ARCHIVE_OK) + return (ARCHIVE_FATAL); + zip->written_bytes += sizeof(l->extra_data); + l = l->next; entries++; } From owner-p4-projects@FreeBSD.ORG Mon Aug 11 16:03:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A4FD1065677; Mon, 11 Aug 2008 16:03:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0FB81065671 for ; Mon, 11 Aug 2008 16:03:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFD248FC0C for ; Mon, 11 Aug 2008 16:03:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BG37wJ033158 for ; Mon, 11 Aug 2008 16:03:07 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BG37k3033156 for perforce@freebsd.org; Mon, 11 Aug 2008 16:03:07 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 16:03:07 GMT Message-Id: <200808111603.m7BG37k3033156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 16:03:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147157 Change 147157 by trasz@trasz_traszkan on 2008/08/11 16:02:50 Check if we are allowed to remove target when overwriting using rename(2). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#11 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#11 (text+ko) ==== @@ -604,6 +604,12 @@ LK_EXCLUSIVE, &tdp)) != 0) return (error); + error = ufs_delete_denied(vdp, tdp, cred, cnp->cn_thread); + if (error) { + vput(tdp); + return (error); + } + #ifdef SunOS_doesnt_do_that /* * The only purpose of this check is to return the correct From owner-p4-projects@FreeBSD.ORG Mon Aug 11 16:11:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7BB4106567F; Mon, 11 Aug 2008 16:11:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 888DD106564A for ; Mon, 11 Aug 2008 16:11:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E8D58FC26 for ; Mon, 11 Aug 2008 16:11:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BGBHfS033867 for ; Mon, 11 Aug 2008 16:11:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BGBG6u033861 for perforce@freebsd.org; Mon, 11 Aug 2008 16:11:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 16:11:16 GMT Message-Id: <200808111611.m7BGBG6u033861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 16:11:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=147158 Change 147158 by hselasky@hselasky_laptop001 on 2008/08/11 16:11:10 IFC @ 147147 Affected files ... .. //depot/projects/usb/src/sys/Makefile#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/support.S#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/intr.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#12 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/usb/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/usb/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/usb/src/sys/boot/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#5 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_internal.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/usb/src/sys/bsm/audit_record.h#6 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#6 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/usb/src/sys/conf/NOTES#17 integrate .. //depot/projects/usb/src/sys/conf/files#33 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#9 integrate .. //depot/projects/usb/src/sys/conf/files.i386#11 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#8 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/usb/src/sys/conf/options#10 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/usb/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/usb/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/usb/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/usb/src/sys/dev/aha/aha.c#5 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/usb/src/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/usb/src/sys/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_vsc8211.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/LICENSE#1 branch .. //depot/projects/usb/src/sys/dev/e1000/README#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#1 branch .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#1 branch .. //depot/projects/usb/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/usb/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/usb/src/sys/dev/em/LICENSE#4 delete .. //depot/projects/usb/src/sys/dev/em/README#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82540.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82541.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82541.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82542.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82543.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82543.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82571.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_82571.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_api.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_api.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_defines.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_hw.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_mac.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_mac.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_manage.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_manage.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.c#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.h#4 delete .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.c#2 delete .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_phy.c#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_phy.h#5 delete .. //depot/projects/usb/src/sys/dev/em/e1000_regs.h#4 delete .. //depot/projects/usb/src/sys/dev/em/if_em.c#10 delete .. //depot/projects/usb/src/sys/dev/em/if_em.h#8 delete .. //depot/projects/usb/src/sys/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/usb/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/et/if_et.c#2 integrate .. //depot/projects/usb/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/usb/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/usb/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ie_isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ie/if_ievar.h#3 integrate .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_82575.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_api.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_api.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_defines.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_hw.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_mac.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_mac.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_manage.c#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_manage.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_osdep.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_osdep.h#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_phy.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_phy.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/e1000_regs.h#2 delete .. //depot/projects/usb/src/sys/dev/igb/if_igb.c#3 delete .. //depot/projects/usb/src/sys/dev/igb/if_igb.h#3 delete .. //depot/projects/usb/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/ds1339.c#1 branch .. //depot/projects/usb/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbb.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iiconf.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicsmb.c#4 integrate .. //depot/projects/usb/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#5 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate .. //depot/projects/usb/src/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#6 integrate .. //depot/projects/usb/src/sys/dev/led/led.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/usb/src/sys/dev/nvram/nvram.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/usb/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/usb/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/usb/src/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#61 integrate .. //depot/projects/usb/src/sys/dev/usb/ohci.c#66 integrate .. //depot/projects/usb/src/sys/dev/usb/ugen.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/uhid.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#4 edit .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/usb/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wireg.h#3 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/usb/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/usb/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/usb/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_slice.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#8 integrate .. //depot/projects/usb/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#12 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#8 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#7 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/usb/src/sys/i386/include/profile.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_environment.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#10 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#10 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_clist.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty.c#8 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#1 branch .. //depot/projects/usb/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/usb/src/sys/libkern/arc4random.c#2 integrate .. //depot/projects/usb/src/sys/libkern/memset.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#19 integrate .. //depot/projects/usb/src/sys/modules/accf_dns/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/em/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/et/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/mem/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/usb/src/sys/net/bpf.c#10 integrate .. //depot/projects/usb/src/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/usb/src/sys/net/bpfdesc.h#7 integrate .. //depot/projects/usb/src/sys/net/if.h#6 integrate .. //depot/projects/usb/src/sys/net/if_gre.c#8 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#9 integrate .. //depot/projects/usb/src/sys/net/if_media.h#8 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/usb/src/sys/net/route.c#8 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/common/ng_bluetooth.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/TODO#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#29 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#12 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/usb/src/sys/netinet/accf_dns.c#1 branch .. //depot/projects/usb/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp_offload.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/usb/src/sys/netinet/toedev.h#2 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#10 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#5 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/usb/src/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/usb/src/sys/pci/if_sis.c#6 delete .. //depot/projects/usb/src/sys/pci/if_sisreg.h#4 delete .. //depot/projects/usb/src/sys/pci/if_xl.c#8 delete .. //depot/projects/usb/src/sys/pci/if_xlreg.h#6 delete .. //depot/projects/usb/src/sys/pci/viapm.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/rpc/auth_unix.c#3 integrate .. //depot/projects/usb/src/sys/rpc/rpcclnt.c#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/usb/src/sys/security/audit/audit.h#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/usb/src/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/usb/src/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/usb/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/usb/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/usb/src/sys/sys/_task.h#2 integrate .. //depot/projects/usb/src/sys/sys/callout.h#5 integrate .. //depot/projects/usb/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/usb/src/sys/sys/elf_common.h#6 integrate .. //depot/projects/usb/src/sys/sys/eventhandler.h#6 integrate .. //depot/projects/usb/src/sys/sys/imgact.h#4 integrate .. //depot/projects/usb/src/sys/sys/interrupt.h#6 integrate .. //depot/projects/usb/src/sys/sys/ioctl_compat.h#4 integrate .. //depot/projects/usb/src/sys/sys/kernel.h#9 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#5 integrate .. //depot/projects/usb/src/sys/sys/link_elf.h#3 integrate .. //depot/projects/usb/src/sys/sys/param.h#12 integrate .. //depot/projects/usb/src/sys/sys/priv.h#7 integrate .. //depot/projects/usb/src/sys/sys/proc.h#9 integrate .. //depot/projects/usb/src/sys/sys/procfs.h#2 integrate .. //depot/projects/usb/src/sys/sys/refcount.h#2 integrate .. //depot/projects/usb/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/usb/src/sys/sys/sockbuf.h#1 branch .. //depot/projects/usb/src/sys/sys/socket.h#9 integrate .. //depot/projects/usb/src/sys/sys/socketvar.h#8 integrate .. //depot/projects/usb/src/sys/sys/sockio.h#3 integrate .. //depot/projects/usb/src/sys/sys/sockopt.h#1 branch .. //depot/projects/usb/src/sys/sys/sockstate.h#1 branch .. //depot/projects/usb/src/sys/sys/sysctl.h#9 integrate .. //depot/projects/usb/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/usb/src/sys/sys/termios.h#3 integrate .. //depot/projects/usb/src/sys/sys/ttycom.h#4 integrate .. //depot/projects/usb/src/sys/sys/vmmeter.h#6 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#8 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_balloc.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_glue.c#8 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#8 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#10 integrate Differences ... ==== //depot/projects/usb/src/sys/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.49 2008/05/26 10:39:52 bz Exp $ +# $FreeBSD: src/sys/Makefile,v 1.52 2008/08/08 18:00:33 philip Exp $ .include @@ -8,14 +8,17 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu isa kern libkern modules net net80211 netatalk \ +CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ + geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ - pci rpc security sys ufs vm ${ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} +.if defined(ALL_ARCH) +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v +.else +CSCOPE_ARCHDIR ?= ${MACHINE} +.endif -ARCHDIR ?= ${MACHINE} - # Loadable kernel modules .if defined(MODULES_WITH_WORLD) @@ -41,4 +44,11 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.86 2008/07/15 03:34:49 alc Exp $"); #include #include @@ -480,8 +480,6 @@ mflags = M_NOWAIT; else mflags = M_WAITOK; - if (flags & BUS_DMA_ZERO) - mflags |= M_ZERO; /* If we succeed, no mapping/bouncing will be required */ *mapp = NULL; @@ -489,13 +487,15 @@ if (dmat->segments == NULL) { dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, - M_NOWAIT); + mflags); if (dmat->segments == NULL) { CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } } + if (flags & BUS_DMA_ZERO) + mflags |= M_ZERO; /* * XXX: @@ -531,7 +531,7 @@ pmap_change_attr((vm_offset_t)*vaddr, dmat->maxsize, PAT_UNCACHEABLE); CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", - __func__, dmat, dmat->flags, ENOMEM); + __func__, dmat, dmat->flags, 0); return (0); } ==== //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ */ #include @@ -113,8 +113,8 @@ movq PCB_GSBASE(%r8),%r10 testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz store_gs /* static predict not taken */ -done_store_gs: + jnz store_seg +done_store_seg: testl $PCB_DBREGS,PCB_FLAGS(%r8) jnz store_dr /* static predict not taken */ @@ -176,6 +176,10 @@ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) jnz do_kthread + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz load_seg +done_load_seg: + cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ @@ -184,7 +188,6 @@ movl PCB_FSBASE+4(%r8),%edx wrmsr 1: - cmpq PCB_GSBASE(%r8),%r10 jz 2f /* Restore userland %gs */ @@ -193,8 +196,8 @@ movl PCB_GSBASE+4(%r8),%edx wrmsr 2: + do_tss: - /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax movq %r8, PCPU(RSP0) @@ -208,10 +211,6 @@ jnz load_dr /* static predict not taken */ done_load_dr: - testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz load_gs /* static predict not taken */ -done_load_gs: - /* Restore context. */ movq PCB_R15(%r8),%r15 movq PCB_R14(%r8),%r14 @@ -243,23 +242,35 @@ movq %r10,PCB_GSBASE(%r8) jmp do_tss -store_gs: +store_seg: movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl %ds,PCB_DS(%r8) + movl %es,PCB_ES(%r8) + movl %fs,PCB_FS(%r8) + jmp done_store_seg +2: movq PCB_GS32P(%r8),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) - jmp done_store_gs + jmp 1b -load_gs: +load_seg: + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl $MSR_GSBASE,%ecx + rdmsr + movl PCB_GS(%r8),%gs + wrmsr + movl PCB_DS(%r8),%ds + movl PCB_ES(%r8),%es + movl PCB_FS(%r8),%fs + jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ - movq PCB_GS32P(%r8),%rax +2: movq PCB_GS32P(%r8),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) - movl $MSR_GSBASE,%ecx - rdmsr - movl PCB_GS(%r8),%gs - wrmsr - jmp done_load_gs + jmp 1b store_dr: movq %dr7,%rax /* yes, do the save */ ==== //depot/projects/usb/src/sys/amd64/amd64/genassym.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -140,6 +140,7 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); +ASSYM(PCB_GS32BIT, PCB_GS32BIT); ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#13 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.628 2008/07/09 06:04:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $"); /* * Manages physical address maps. @@ -221,17 +221,24 @@ vm_offset_t va); static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); +static int pmap_change_attr_locked(vm_offset_t va, vm_size_t size, int mode); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, + vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); +static void pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte); static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); +static void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); +static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); +static void pmap_pte_attr(pt_entry_t *pte, int cache_bits); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, vm_page_t *free); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -465,11 +472,12 @@ } /* Now set up the direct map space using either 2MB or 1GB pages */ + /* Preset PG_M and PG_A because demotion expects it */ if ((amd_feature & AMDID_PAGE1GB) == 0) { for (i = 0; i < NPDEPG * ndmpdp; i++) { ((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT; ((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS | - PG_G; + PG_G | PG_M | PG_A; } /* And the direct map space's PDP */ for (i = 0; i < ndmpdp; i++) { @@ -482,7 +490,7 @@ ((pdp_entry_t *)DMPDPphys)[i] = (vm_paddr_t)i << PDPSHIFT; ((pdp_entry_t *)DMPDPphys)[i] |= PG_RW | PG_V | PG_PS | - PG_G; + PG_G | PG_M | PG_A; } } @@ -737,6 +745,13 @@ SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD, &pmap_pde_promotions, 0, "2MB page promotions"); +SYSCTL_NODE(_vm_pmap, OID_AUTO, pdpe, CTLFLAG_RD, 0, + "1GB page mapping counters"); + +static u_long pmap_pdpe_demotions; +SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, demotions, CTLFLAG_RD, + &pmap_pdpe_demotions, 0, "1GB page demotions"); + /*************************************************** * Low level helper routines..... @@ -984,13 +999,12 @@ if (pdep != NULL) { pde = *pdep; if (pde) { - if ((pde & PG_PS) != 0) { + if ((pde & PG_PS) != 0) rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); - PMAP_UNLOCK(pmap); - return rtval; + else { + pte = pmap_pde_to_pte(pdep, va); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } - pte = pmap_pde_to_pte(pdep, va); - rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } } PMAP_UNLOCK(pmap); @@ -1039,17 +1053,25 @@ vm_paddr_t pmap_kextract(vm_offset_t va) { - pd_entry_t *pde; + pd_entry_t pde; vm_paddr_t pa; if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) { pa = DMAP_TO_PHYS(va); } else { - pde = vtopde(va); - if (*pde & PG_PS) { - pa = (*pde & PG_PS_FRAME) | (va & PDRMASK); + pde = *vtopde(va); + if (pde & PG_PS) { + pa = (pde & PG_PS_FRAME) | (va & PDRMASK); } else { - pa = *vtopte(va); + /* + * Beware of a concurrent promotion that changes the + * PDE at this point! For example, vtopte() must not + * be used to access the PTE because it would use the + * new PDE. It is, however, safe to use the old PDE + * because the page table page is preserved by the + * promotion. + */ + pa = *pmap_pde_to_pte(&pde, va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); } } @@ -1073,7 +1095,7 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } -PMAP_INLINE void +static __inline void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) { pt_entry_t *pte; @@ -2197,58 +2219,88 @@ } /* - * Tries to demote a 2MB page mapping. + * Fills a page table page with mappings to consecutive physical pages. + */ +static void +pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte) +{ + pt_entry_t *pte; + + for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { + *pte = newpte; + newpte += PAGE_SIZE; + } +} + +/* + * Tries to demote a 2MB page mapping. If demotion fails, the 2MB page + * mapping is invalidated. */ static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { pd_entry_t newpde, oldpde; - pt_entry_t *firstpte, newpte, *pte; + pt_entry_t *firstpte, newpte; vm_paddr_t mptepa; vm_page_t free, mpte; PMAP_LOCK_ASSERT(pmap, MA_OWNED); + oldpde = *pde; + KASSERT((oldpde & (PG_PS | PG_V)) == (PG_PS | PG_V), + ("pmap_demote_pde: oldpde is missing PG_PS and/or PG_V")); mpte = pmap_lookup_pt_page(pmap, va); if (mpte != NULL) pmap_remove_pt_page(pmap, mpte); else { - KASSERT((*pde & PG_W) == 0, + KASSERT((oldpde & PG_W) == 0, ("pmap_demote_pde: page table page for a wired mapping" " is missing")); - free = NULL; - pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); - pmap_invalidate_page(pmap, trunc_2mpage(va)); - pmap_free_zero_pages(free); - CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#lx" - " in pmap %p", va, pmap); - return (FALSE); + + /* + * Invalidate the 2MB page mapping and return "failure" if the + * mapping was never accessed or the allocation of the new + * page table page fails. + */ + if ((oldpde & PG_A) == 0 || (mpte = vm_page_alloc(NULL, + pmap_pde_pindex(va), VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | + VM_ALLOC_WIRED)) == NULL) { + free = NULL; + pmap_remove_pde(pmap, pde, trunc_2mpage(va), &free); + pmap_invalidate_page(pmap, trunc_2mpage(va)); + pmap_free_zero_pages(free); + CTR2(KTR_PMAP, "pmap_demote_pde: failure for va %#lx" + " in pmap %p", va, pmap); + return (FALSE); + } } mptepa = VM_PAGE_TO_PHYS(mpte); firstpte = (pt_entry_t *)PHYS_TO_DMAP(mptepa); - oldpde = *pde; newpde = mptepa | PG_M | PG_A | (oldpde & PG_U) | PG_RW | PG_V; - KASSERT((oldpde & (PG_A | PG_V)) == (PG_A | PG_V), - ("pmap_demote_pde: oldpde is missing PG_A and/or PG_V")); + KASSERT((oldpde & PG_A) != 0, + ("pmap_demote_pde: oldpde is missing PG_A")); KASSERT((oldpde & (PG_M | PG_RW)) != PG_RW, ("pmap_demote_pde: oldpde is missing PG_M")); - KASSERT((oldpde & PG_PS) != 0, - ("pmap_demote_pde: oldpde is missing PG_PS")); newpte = oldpde & ~PG_PS; if ((newpte & PG_PDE_PAT) != 0) newpte ^= PG_PDE_PAT | PG_PTE_PAT; /* - * If the mapping has changed attributes, update the page table - * entries. + * If the page table page is new, initialize it. */ + if (mpte->wire_count == 1) { + mpte->wire_count = NPTEPG; + pmap_fill_ptp(firstpte, newpte); + } KASSERT((*firstpte & PG_FRAME) == (newpte & PG_FRAME), ("pmap_demote_pde: firstpte and newpte map different physical" " addresses")); + + /* + * If the mapping has changed attributes, update the page table + * entries. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 11 16:23:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AC2D1065679; Mon, 11 Aug 2008 16:23:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2A3E106567E for ; Mon, 11 Aug 2008 16:23:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E0F808FC13 for ; Mon, 11 Aug 2008 16:23:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BGNTgG034777 for ; Mon, 11 Aug 2008 16:23:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BGNTS6034775 for perforce@freebsd.org; Mon, 11 Aug 2008 16:23:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 16:23:29 GMT Message-Id: <200808111623.m7BGNTS6034775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 16:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147159 Change 147159 by hselasky@hselasky_laptop001 on 2008/08/11 16:23:26 Fix some products in "usbdevs" which breaks compilation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#4 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#4 (text+ko) ==== @@ -793,7 +793,7 @@ /* AIPTEK products */ product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega -product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 +product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card @@ -1002,7 +1002,7 @@ /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard -product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera +product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera /* CH Products */ product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#4 (text+ko) ==== @@ -800,7 +800,7 @@ /* AIPTEK products */ #define USB_PRODUCT_AIPTEK_POCKETCAM3M 0x2011 /* PocketCAM 3Mega */ -#define USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ +#define USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ /* AirPrime products */ #define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ @@ -1009,7 +1009,7 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ -#define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ +#define USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d /* TwinkleCam USB camera */ /* CH Products */ #define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#4 (text+ko) ==== @@ -599,9 +599,9 @@ "PocketCAM 3Mega", }, { - USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, + USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3, 0, - "", + "Sunplus", "PenCam Mega 1.3", }, { @@ -1385,9 +1385,9 @@ "KB-8933 keyboard", }, { - USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM, + USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, 0, - "", + "Chicony", "TwinkleCam USB camera", }, { From owner-p4-projects@FreeBSD.ORG Mon Aug 11 16:51:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8665B106568E; Mon, 11 Aug 2008 16:51:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47E75106567E for ; Mon, 11 Aug 2008 16:51:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 367F88FC0C for ; Mon, 11 Aug 2008 16:51:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BGpx9E046327 for ; Mon, 11 Aug 2008 16:51:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BGpxaG046325 for perforce@freebsd.org; Mon, 11 Aug 2008 16:51:59 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 16:51:59 GMT Message-Id: <200808111651.m7BGpxaG046325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 16:51:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147160 Change 147160 by trasz@trasz_traszkan on 2008/08/11 16:51:06 Fix the fix from 147154. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#39 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#11 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#39 (text+ko) ==== @@ -12,6 +12,11 @@ - Add the information about correct constants to the manual pages. +- Decide what to do when chmod(2) needs to add ACL entries, but + there is no room in 'struct acl' to do that. Solaris seems to + limit the numer of user-settable entries to half of ACL_MAX_ENTRIES, + so there is no risk of running out of them in chmod(2). + - Make 'struct acl' variable size. - Benchmark things. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 (text+ko) ==== @@ -260,8 +260,10 @@ /* * Deny setting setuid if we are not the file owner. */ - if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) - return (EPERM); - + if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#11 (text+ko) ==== @@ -721,8 +721,11 @@ /* * Deny setting setuid if we are not the file owner. */ - if ((mode & ISUID) && ip->i_uid != cred->cr_uid) - return (EPERM); + if ((mode & ISUID) && ip->i_uid != cred->cr_uid) { + error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0); + if (error) + return (error); + } ip->i_mode &= ~ALLPERMS; ip->i_mode |= (mode & ALLPERMS); From owner-p4-projects@FreeBSD.ORG Mon Aug 11 17:16:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE0FC1065684; Mon, 11 Aug 2008 17:16:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81FCE106566B for ; Mon, 11 Aug 2008 17:16:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56AA58FC27 for ; Mon, 11 Aug 2008 17:16:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BHGOv7049398 for ; Mon, 11 Aug 2008 17:16:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BHGNDw049396 for perforce@freebsd.org; Mon, 11 Aug 2008 17:16:23 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 17:16:23 GMT Message-Id: <200808111716.m7BHGNDw049396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147162 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 17:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147162 Change 147162 by trasz@trasz_traszkan on 2008/08/11 17:16:20 Make sure we don't allow for setting ACL with acl_cnt > ACL_MAX_ENTRIES. Oops. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#19 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#19 (text+ko) ==== @@ -970,7 +970,7 @@ * valid. There can be none of them too. Really. */ - if (aclp->acl_cnt < 1) + if (acl->acl_cnt > ACL_MAX_ENTRIES || acl->acl_cnt < 0) return (EINVAL); for (i = 0; i < aclp->acl_cnt; i++) { From owner-p4-projects@FreeBSD.ORG Mon Aug 11 17:54:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8171E106567D; Mon, 11 Aug 2008 17:54:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4381E1065677 for ; Mon, 11 Aug 2008 17:54:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 320388FC1A for ; Mon, 11 Aug 2008 17:54:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BHs2Lh053031 for ; Mon, 11 Aug 2008 17:54:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BHs2Xd053029 for perforce@freebsd.org; Mon, 11 Aug 2008 17:54:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 17:54:02 GMT Message-Id: <200808111754.m7BHs2Xd053029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 17:54:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=147163 Change 147163 by hselasky@hselasky_laptop001 on 2008/08/11 17:53:11 Add missing locking of "usb2_mtx". Caught by an mtx_assert() . Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#19 (text+ko) ==== @@ -2322,6 +2322,7 @@ * If the current USB transfer is completing we need to start the * next one: */ + mtx_lock(xfer->usb2_mtx); if (pipe->pipe_q.curr == xfer) { usb2_command_wrapper(&(pipe->pipe_q), NULL); @@ -2333,6 +2334,7 @@ xfer->pipe->is_synced = 0; } } + mtx_unlock(xfer->usb2_mtx); done: return (0); } From owner-p4-projects@FreeBSD.ORG Mon Aug 11 18:24:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B0911065677; Mon, 11 Aug 2008 18:24:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F287106564A for ; Mon, 11 Aug 2008 18:24:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CC908FC18 for ; Mon, 11 Aug 2008 18:24:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BIOcfV056754 for ; Mon, 11 Aug 2008 18:24:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BIOc6u056752 for perforce@freebsd.org; Mon, 11 Aug 2008 18:24:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 18:24:38 GMT Message-Id: <200808111824.m7BIOc6u056752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 18:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=147165 Change 147165 by hselasky@hselasky_laptop001 on 2008/08/11 18:23:50 Style: This is the first of two patches to remove extra indenting level inserted by "indent". Remove the curly brackets after all the cases in the switch statements. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#17 (text+ko) ==== @@ -1387,13 +1387,30 @@ static int ugen_fs_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) { + struct usb2_config usb2_config[1]; + struct usb2_device_request req; + union { + struct usb2_fs_complete *pcomp; + struct usb2_fs_start *pstart; + struct usb2_fs_stop *pstop; + struct usb2_fs_init *pinit; + struct usb2_fs_uninit *puninit; + struct usb2_fs_open *popen; + struct usb2_fs_close *pclose; + struct usb2_fs_clear_stall_sync *pstall; + void *addr; + } u; + struct usb2_pipe *pipe; + struct usb2_endpoint_descriptor *ed; int error = 0; + uint8_t iface_index; + uint8_t isread; + uint8_t ep_index; + + u.addr = addr; switch (cmd) { - case USB_FS_COMPLETE:{ - struct usb2_fs_complete *pd = addr; - uint8_t ep_index; - + case USB_FS_COMPLETE: mtx_lock(f->priv_mtx); error = ugen_fs_get_complete(f, &ep_index); mtx_unlock(f->priv_mtx); @@ -1402,48 +1419,41 @@ error = EBUSY; break; } - pd->ep_index = ep_index; - error = ugen_fs_copy_out(f, pd->ep_index); + u.pcomp->ep_index = ep_index; + error = ugen_fs_copy_out(f, u.pcomp->ep_index); break; - } - case USB_FS_START:{ - struct usb2_fs_start *pd = addr; - - error = ugen_fs_copy_in(f, pd->ep_index); + case USB_FS_START: + error = ugen_fs_copy_in(f, u.pstart->ep_index); if (error) { break; } mtx_lock(f->priv_mtx); - usb2_transfer_start(f->fs_xfer[pd->ep_index]); + usb2_transfer_start(f->fs_xfer[u.pstart->ep_index]); mtx_unlock(f->priv_mtx); break; - } - case USB_FS_STOP:{ - struct usb2_fs_stop *pd = addr; - if (pd->ep_index >= f->fs_ep_max) { + case USB_FS_STOP: + if (u.pstop->ep_index >= f->fs_ep_max) { error = EINVAL; break; } mtx_lock(f->priv_mtx); - usb2_transfer_stop(f->fs_xfer[pd->ep_index]); + usb2_transfer_stop(f->fs_xfer[u.pstop->ep_index]); mtx_unlock(f->priv_mtx); break; - } - case USB_FS_INIT:{ - struct usb2_fs_init *pd = addr; + case USB_FS_INIT: /* verify input parameters */ - if (pd->pEndpoints == NULL) { + if (u.pinit->pEndpoints == NULL) { error = EINVAL; break; } - if (pd->ep_index_max > 127) { + if (u.pinit->ep_index_max > 127) { error = EINVAL; break; } - if (pd->ep_index_max == 0) { + if (u.pinit->ep_index_max == 0) { error = EINVAL; break; } @@ -1463,61 +1473,50 @@ error = EBUSY; break; } - error = usb2_fifo_alloc_buffer(f, 1, pd->ep_index_max); + error = usb2_fifo_alloc_buffer(f, 1, u.pinit->ep_index_max); if (error) { break; } f->fs_xfer = malloc(sizeof(f->fs_xfer[0]) * - pd->ep_index_max, M_USB, M_WAITOK | M_ZERO); + u.pinit->ep_index_max, M_USB, M_WAITOK | M_ZERO); if (f->fs_xfer == NULL) { usb2_fifo_free_buffer(f); error = ENOMEM; break; } - f->fs_ep_max = pd->ep_index_max; - f->fs_ep_ptr = pd->pEndpoints; + f->fs_ep_max = u.pinit->ep_index_max; + f->fs_ep_ptr = u.pinit->pEndpoints; break; - } - case USB_FS_UNINIT:{ - struct usb2_fs_uninit *pd = addr; - - if (pd->dummy != 0) { + case USB_FS_UNINIT: + if (u.puninit->dummy != 0) { error = EINVAL; break; } error = ugen_fs_uninit(f); break; - } - case USB_FS_OPEN:{ - struct usb2_config usb2_config[1]; - struct usb2_fs_open *pd = addr; - struct usb2_pipe *pipe; - struct usb2_endpoint_descriptor *ed; - uint8_t iface_index; - uint8_t isread; - - if (pd->ep_index >= f->fs_ep_max) { + case USB_FS_OPEN: + if (u.popen->ep_index >= f->fs_ep_max) { error = EINVAL; break; } - if (f->fs_xfer[pd->ep_index] != NULL) { + if (f->fs_xfer[u.popen->ep_index] != NULL) { error = EBUSY; break; } - if (pd->max_bufsize > USB_FS_MAX_BUFSIZE) { - pd->max_bufsize = USB_FS_MAX_BUFSIZE; + if (u.popen->max_bufsize > USB_FS_MAX_BUFSIZE) { + u.popen->max_bufsize = USB_FS_MAX_BUFSIZE; } - if (pd->max_frames > USB_FS_MAX_FRAMES) { - pd->max_frames = USB_FS_MAX_FRAMES; + if (u.popen->max_frames > USB_FS_MAX_FRAMES) { + u.popen->max_frames = USB_FS_MAX_FRAMES; break; } - if (pd->max_frames == 0) { + if (u.popen->max_frames == 0) { error = EINVAL; break; } - pipe = usb2_get_pipe_by_addr(f->udev, pd->ep_no); + pipe = usb2_get_pipe_by_addr(f->udev, u.popen->ep_no); if (pipe == NULL) { error = EINVAL; break; @@ -1530,7 +1529,7 @@ iface_index = pipe->iface_index; error = usb2_check_thread_perm(f->udev, curthread, fflags, - iface_index, pd->ep_no); + iface_index, u.popen->ep_no); if (error) { break; } @@ -1543,8 +1542,8 @@ usb2_config[0].mh.flags.proxy_buffer = 1; usb2_config[0].mh.callback = &ugen_default_fs_callback; usb2_config[0].mh.timeout = 0; /* no timeout */ - usb2_config[0].mh.frames = pd->max_frames; - usb2_config[0].mh.bufsize = pd->max_bufsize; + usb2_config[0].mh.frames = u.popen->max_frames; + usb2_config[0].mh.bufsize = u.popen->max_bufsize; usb2_config[0].md = usb2_config[0].mh; /* symmetric config */ if (usb2_config[0].type == UE_CONTROL) { @@ -1574,16 +1573,16 @@ } } error = usb2_transfer_setup(f->udev, &iface_index, - f->fs_xfer + pd->ep_index, usb2_config, 1, + f->fs_xfer + u.popen->ep_index, usb2_config, 1, f, f->priv_mtx); if (error == 0) { /* update maximums */ - pd->max_packet_length = - f->fs_xfer[pd->ep_index]->max_frame_size; - pd->max_bufsize = - f->fs_xfer[pd->ep_index]->max_data_length; - f->fs_xfer[pd->ep_index]->priv_fifo = - ((uint8_t *)0) + pd->ep_index; + u.popen->max_packet_length = + f->fs_xfer[u.popen->ep_index]->max_frame_size; + u.popen->max_bufsize = + f->fs_xfer[u.popen->ep_index]->max_data_length; + f->fs_xfer[u.popen->ep_index]->priv_fifo = + ((uint8_t *)0) + u.popen->ep_index; /* * Increase performance by dropping locks we * don't need: @@ -1593,33 +1592,25 @@ error = ENOMEM; } break; - } - case USB_FS_CLOSE:{ - struct usb2_fs_close *pd = addr; - - if (pd->ep_index >= f->fs_ep_max) { + case USB_FS_CLOSE: + if (u.pclose->ep_index >= f->fs_ep_max) { error = EINVAL; break; } - if (f->fs_xfer[pd->ep_index] == NULL) { + if (f->fs_xfer[u.pclose->ep_index] == NULL) { error = EINVAL; break; } - usb2_transfer_unsetup(f->fs_xfer + pd->ep_index, 1); + usb2_transfer_unsetup(f->fs_xfer + u.pclose->ep_index, 1); break; - } - case USB_FS_CLEAR_STALL_SYNC:{ - struct usb2_fs_clear_stall_sync *pd = addr; - struct usb2_pipe *pipe; - struct usb2_device_request req; - - if (pd->ep_index >= f->fs_ep_max) { + case USB_FS_CLEAR_STALL_SYNC: + if (u.pstall->ep_index >= f->fs_ep_max) { error = EINVAL; break; } - if (f->fs_xfer[pd->ep_index] == NULL) { + if (f->fs_xfer[u.pstall->ep_index] == NULL) { error = EINVAL; break; } @@ -1628,13 +1619,13 @@ break; } mtx_lock(f->priv_mtx); - error = usb2_transfer_pending(f->fs_xfer[pd->ep_index]); + error = usb2_transfer_pending(f->fs_xfer[u.pstall->ep_index]); mtx_unlock(f->priv_mtx); if (error) { return (EBUSY); } - pipe = f->fs_xfer[pd->ep_index]->pipe; + pipe = f->fs_xfer[u.pstall->ep_index]->pipe; /* setup a clear-stall packet */ req.bmRequestType = UT_WRITE_ENDPOINT; @@ -1651,7 +1642,6 @@ error = ENXIO; } break; - } default: error = ENOTTY; @@ -1663,8 +1653,19 @@ static int ugen_iface_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) { + union { + struct usb2_interface_descriptor *idesc; + struct usb2_endpoint_descriptor *ed; + struct usb2_alt_interface *ai; + int *pint; + void *addr; + } u; + struct usb2_interface *iface; + struct usb2_pipe *pipe; int error = 0; + u.addr = addr; + switch (cmd) { case USB_SET_SHORT_XFER: if (f->xfer[0] || f->xfer[1]) { @@ -1712,50 +1713,39 @@ *(int *)addr = f->bufsize; break; - case USB_GET_INTERFACE_DESC:{ - struct usb2_interface_descriptor *idesc = addr; - struct usb2_interface *iface; - + case USB_GET_INTERFACE_DESC: iface = usb2_get_iface(f->udev, f->iface_index); if (iface && iface->idesc) { - *idesc = *(iface->idesc); + *u.idesc = *(iface->idesc); } else { error = EIO; break; } break; - } + + case USB_GET_ENDPOINT_DESC: - case USB_GET_ENDPOINT_DESC:{ - struct usb2_endpoint_descriptor *ed = addr; - struct usb2_pipe *pipe = f->priv_sc0; + pipe = f->priv_sc0; if (pipe && pipe->edesc) { - *ed = *(pipe->edesc); + *u.ed = *pipe->edesc; } else { error = EINVAL; break; } break; - } - case USB_SET_RX_STALL_FLAG:{ - int *pv = addr; - - if ((fflags & FREAD) && (*pv)) { + case USB_SET_RX_STALL_FLAG: + if ((fflags & FREAD) && (*u.pint)) { f->flag_stall = 1; } break; - } - case USB_SET_TX_STALL_FLAG:{ - int *pv = addr; - - if ((fflags & FWRITE) && (*pv)) { + case USB_SET_TX_STALL_FLAG: + if ((fflags & FWRITE) && (*u.pint)) { f->flag_stall = 1; } break; - } default: error = ENOTTY; @@ -1767,8 +1757,22 @@ static int ugen_ctrl_ioctl(struct usb2_fifo *f, u_long cmd, void *addr, int fflags) { + union { + struct usb2_interface_descriptor *idesc; + struct usb2_alt_interface *ai; + struct usb2_device_descriptor *ddesc; + struct usb2_config_descriptor *cdesc; + struct usb2_device_stats *stat; + uint32_t *ptime; + void *addr; + } u; + struct usb2_device_descriptor *dtemp; + struct usb2_config_descriptor *ctemp; + struct usb2_interface *iface; + int error = 0; uint8_t n; - int error = 0; + + u.addr = addr; switch (cmd) { case USB_DISCOVER: @@ -1795,56 +1799,42 @@ error = ugen_set_config(f, *(int *)addr); break; - case USB_GET_ALTINTERFACE:{ - struct usb2_alt_interface *ai = addr; - struct usb2_interface *iface; - + case USB_GET_ALTINTERFACE: iface = usb2_get_iface(f->udev, - ai->uai_interface_index); + u.ai->uai_interface_index); if (iface && iface->idesc) { - ai->uai_alt_index = iface->alt_index; + u.ai->uai_alt_index = iface->alt_index; } else { error = EINVAL; } break; - } - case USB_SET_ALTINTERFACE:{ - struct usb2_alt_interface *ai = addr; + case USB_SET_ALTINTERFACE: if (!(fflags & FWRITE)) { error = EPERM; break; } error = ugen_set_interface(f, - ai->uai_interface_index, ai->uai_alt_index); + u.ai->uai_interface_index, u.ai->uai_alt_index); break; - } - case USB_GET_DEVICE_DESC:{ - struct usb2_device_descriptor *ddesc = addr; - struct usb2_device_descriptor *temp; - - temp = usb2_get_device_descriptor(f->udev); - if (!temp) { + case USB_GET_DEVICE_DESC: + dtemp = usb2_get_device_descriptor(f->udev); + if (!dtemp) { error = EIO; break; } - *ddesc = *temp; + *u.ddesc = *dtemp; break; - } - case USB_GET_CONFIG_DESC:{ - struct usb2_config_descriptor *cdesc = addr; - struct usb2_config_descriptor *temp; - - temp = usb2_get_config_descriptor(f->udev); - if (!temp) { + case USB_GET_CONFIG_DESC: + ctemp = usb2_get_config_descriptor(f->udev); + if (!ctemp) { error = EIO; break; } - *cdesc = *temp; + *u.cdesc = *ctemp; break; - } case USB_GET_FULL_DESC: error = ugen_get_cdesc(f, addr); @@ -1872,30 +1862,24 @@ error = usb2_gen_fill_devicenames(f, addr); break; - case USB_DEVICESTATS:{ - struct usb2_device_stats *ustat = addr; - + case USB_DEVICESTATS: for (n = 0; n != 4; n++) { - ustat->uds_requests_fail[n] = + u.stat->uds_requests_fail[n] = f->udev->bus->stats_err.uds_requests[n]; - ustat->uds_requests_ok[n] = + u.stat->uds_requests_ok[n] = f->udev->bus->stats_ok.uds_requests[n]; } break; - } case USB_DEVICEENUMERATE: error = ugen_re_enumerate(f); break; - case USB_GET_PLUGTIME:{ - uint32_t *ptime = addr; - - *ptime = f->udev->plugtime; + case USB_GET_PLUGTIME: + *u.ptime = f->udev->plugtime; break; - } /* ... more IOCTL's to come ! ... --hps */ From owner-p4-projects@FreeBSD.ORG Mon Aug 11 18:25:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D0431065678; Mon, 11 Aug 2008 18:25:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 607641065675 for ; Mon, 11 Aug 2008 18:25:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DA888FC21 for ; Mon, 11 Aug 2008 18:25:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BIPdXd056879 for ; Mon, 11 Aug 2008 18:25:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BIPdcQ056877 for perforce@freebsd.org; Mon, 11 Aug 2008 18:25:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 18:25:39 GMT Message-Id: <200808111825.m7BIPdcQ056877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 18:25:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=147166 Change 147166 by hselasky@hselasky_laptop001 on 2008/08/11 18:25:37 Result from running "usb_style.sh", which is based on the "indent" system utility. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#18 (text+ko) ==== @@ -1398,8 +1398,8 @@ struct usb2_fs_open *popen; struct usb2_fs_close *pclose; struct usb2_fs_clear_stall_sync *pstall; - void *addr; - } u; + void *addr; + } u; struct usb2_pipe *pipe; struct usb2_endpoint_descriptor *ed; int error = 0; @@ -1411,237 +1411,237 @@ switch (cmd) { case USB_FS_COMPLETE: - mtx_lock(f->priv_mtx); - error = ugen_fs_get_complete(f, &ep_index); - mtx_unlock(f->priv_mtx); + mtx_lock(f->priv_mtx); + error = ugen_fs_get_complete(f, &ep_index); + mtx_unlock(f->priv_mtx); - if (error) { - error = EBUSY; - break; - } - u.pcomp->ep_index = ep_index; - error = ugen_fs_copy_out(f, u.pcomp->ep_index); + if (error) { + error = EBUSY; break; + } + u.pcomp->ep_index = ep_index; + error = ugen_fs_copy_out(f, u.pcomp->ep_index); + break; case USB_FS_START: - error = ugen_fs_copy_in(f, u.pstart->ep_index); - if (error) { - break; - } - mtx_lock(f->priv_mtx); - usb2_transfer_start(f->fs_xfer[u.pstart->ep_index]); - mtx_unlock(f->priv_mtx); + error = ugen_fs_copy_in(f, u.pstart->ep_index); + if (error) { break; + } + mtx_lock(f->priv_mtx); + usb2_transfer_start(f->fs_xfer[u.pstart->ep_index]); + mtx_unlock(f->priv_mtx); + break; case USB_FS_STOP: - if (u.pstop->ep_index >= f->fs_ep_max) { - error = EINVAL; - break; - } - mtx_lock(f->priv_mtx); - usb2_transfer_stop(f->fs_xfer[u.pstop->ep_index]); - mtx_unlock(f->priv_mtx); + if (u.pstop->ep_index >= f->fs_ep_max) { + error = EINVAL; break; + } + mtx_lock(f->priv_mtx); + usb2_transfer_stop(f->fs_xfer[u.pstop->ep_index]); + mtx_unlock(f->priv_mtx); + break; case USB_FS_INIT: - /* verify input parameters */ - if (u.pinit->pEndpoints == NULL) { - error = EINVAL; - break; - } - if (u.pinit->ep_index_max > 127) { - error = EINVAL; - break; - } - if (u.pinit->ep_index_max == 0) { - error = EINVAL; - break; - } - if (f->fs_xfer != NULL) { - error = EBUSY; - break; - } - if (f->flag_no_uref) { - error = EINVAL; - break; - } - if (f->dev_ep_index != 0) { - error = EINVAL; - break; - } - if (ugen_fifo_in_use(f, fflags)) { - error = EBUSY; - break; - } - error = usb2_fifo_alloc_buffer(f, 1, u.pinit->ep_index_max); - if (error) { - break; - } - f->fs_xfer = malloc(sizeof(f->fs_xfer[0]) * - u.pinit->ep_index_max, M_USB, M_WAITOK | M_ZERO); - if (f->fs_xfer == NULL) { - usb2_fifo_free_buffer(f); - error = ENOMEM; - break; - } - f->fs_ep_max = u.pinit->ep_index_max; - f->fs_ep_ptr = u.pinit->pEndpoints; + /* verify input parameters */ + if (u.pinit->pEndpoints == NULL) { + error = EINVAL; + break; + } + if (u.pinit->ep_index_max > 127) { + error = EINVAL; + break; + } + if (u.pinit->ep_index_max == 0) { + error = EINVAL; + break; + } + if (f->fs_xfer != NULL) { + error = EBUSY; + break; + } + if (f->flag_no_uref) { + error = EINVAL; + break; + } + if (f->dev_ep_index != 0) { + error = EINVAL; + break; + } + if (ugen_fifo_in_use(f, fflags)) { + error = EBUSY; + break; + } + error = usb2_fifo_alloc_buffer(f, 1, u.pinit->ep_index_max); + if (error) { + break; + } + f->fs_xfer = malloc(sizeof(f->fs_xfer[0]) * + u.pinit->ep_index_max, M_USB, M_WAITOK | M_ZERO); + if (f->fs_xfer == NULL) { + usb2_fifo_free_buffer(f); + error = ENOMEM; break; + } + f->fs_ep_max = u.pinit->ep_index_max; + f->fs_ep_ptr = u.pinit->pEndpoints; + break; case USB_FS_UNINIT: - if (u.puninit->dummy != 0) { - error = EINVAL; - break; - } - error = ugen_fs_uninit(f); + if (u.puninit->dummy != 0) { + error = EINVAL; break; + } + error = ugen_fs_uninit(f); + break; case USB_FS_OPEN: - if (u.popen->ep_index >= f->fs_ep_max) { + if (u.popen->ep_index >= f->fs_ep_max) { + error = EINVAL; + break; + } + if (f->fs_xfer[u.popen->ep_index] != NULL) { + error = EBUSY; + break; + } + if (u.popen->max_bufsize > USB_FS_MAX_BUFSIZE) { + u.popen->max_bufsize = USB_FS_MAX_BUFSIZE; + } + if (u.popen->max_frames > USB_FS_MAX_FRAMES) { + u.popen->max_frames = USB_FS_MAX_FRAMES; + break; + } + if (u.popen->max_frames == 0) { + error = EINVAL; + break; + } + pipe = usb2_get_pipe_by_addr(f->udev, u.popen->ep_no); + if (pipe == NULL) { + error = EINVAL; + break; + } + ed = pipe->edesc; + if (ed == NULL) { + error = ENXIO; + break; + } + iface_index = pipe->iface_index; + + error = usb2_check_thread_perm(f->udev, curthread, fflags, + iface_index, u.popen->ep_no); + if (error) { + break; + } + bzero(usb2_config, sizeof(usb2_config)); + + usb2_config[0].type = ed->bmAttributes & UE_XFERTYPE; + usb2_config[0].endpoint = ed->bEndpointAddress & UE_ADDR; + usb2_config[0].direction = ed->bEndpointAddress & (UE_DIR_OUT | UE_DIR_IN); + usb2_config[0].mh.interval = USB_DEFAULT_INTERVAL; + usb2_config[0].mh.flags.proxy_buffer = 1; + usb2_config[0].mh.callback = &ugen_default_fs_callback; + usb2_config[0].mh.timeout = 0; /* no timeout */ + usb2_config[0].mh.frames = u.popen->max_frames; + usb2_config[0].mh.bufsize = u.popen->max_bufsize; + usb2_config[0].md = usb2_config[0].mh; /* symmetric config */ + + if (usb2_config[0].type == UE_CONTROL) { + if (f->udev->flags.usb2_mode != USB_MODE_HOST) { error = EINVAL; break; } - if (f->fs_xfer[u.popen->ep_index] != NULL) { - error = EBUSY; - break; - } - if (u.popen->max_bufsize > USB_FS_MAX_BUFSIZE) { - u.popen->max_bufsize = USB_FS_MAX_BUFSIZE; - } - if (u.popen->max_frames > USB_FS_MAX_FRAMES) { - u.popen->max_frames = USB_FS_MAX_FRAMES; - break; - } - if (u.popen->max_frames == 0) { - error = EINVAL; - break; - } - pipe = usb2_get_pipe_by_addr(f->udev, u.popen->ep_no); - if (pipe == NULL) { - error = EINVAL; - break; - } - ed = pipe->edesc; - if (ed == NULL) { - error = ENXIO; - break; - } - iface_index = pipe->iface_index; + } else { + + isread = ((usb2_config[0].endpoint & + (UE_DIR_IN | UE_DIR_OUT)) == UE_DIR_IN); - error = usb2_check_thread_perm(f->udev, curthread, fflags, - iface_index, u.popen->ep_no); - if (error) { - break; + if (f->udev->flags.usb2_mode != USB_MODE_HOST) { + isread = !isread; } - bzero(usb2_config, sizeof(usb2_config)); - - usb2_config[0].type = ed->bmAttributes & UE_XFERTYPE; - usb2_config[0].endpoint = ed->bEndpointAddress & UE_ADDR; - usb2_config[0].direction = ed->bEndpointAddress & (UE_DIR_OUT | UE_DIR_IN); - usb2_config[0].mh.interval = USB_DEFAULT_INTERVAL; - usb2_config[0].mh.flags.proxy_buffer = 1; - usb2_config[0].mh.callback = &ugen_default_fs_callback; - usb2_config[0].mh.timeout = 0; /* no timeout */ - usb2_config[0].mh.frames = u.popen->max_frames; - usb2_config[0].mh.bufsize = u.popen->max_bufsize; - usb2_config[0].md = usb2_config[0].mh; /* symmetric config */ - - if (usb2_config[0].type == UE_CONTROL) { - if (f->udev->flags.usb2_mode != USB_MODE_HOST) { - error = EINVAL; + /* check permissions */ + if (isread) { + if (!(fflags & FREAD)) { + error = EPERM; break; } } else { - - isread = ((usb2_config[0].endpoint & - (UE_DIR_IN | UE_DIR_OUT)) == UE_DIR_IN); - - if (f->udev->flags.usb2_mode != USB_MODE_HOST) { - isread = !isread; - } - /* check permissions */ - if (isread) { - if (!(fflags & FREAD)) { - error = EPERM; - break; - } - } else { - if (!(fflags & FWRITE)) { - error = EPERM; - break; - } + if (!(fflags & FWRITE)) { + error = EPERM; + break; } } - error = usb2_transfer_setup(f->udev, &iface_index, - f->fs_xfer + u.popen->ep_index, usb2_config, 1, - f, f->priv_mtx); - if (error == 0) { - /* update maximums */ - u.popen->max_packet_length = - f->fs_xfer[u.popen->ep_index]->max_frame_size; - u.popen->max_bufsize = - f->fs_xfer[u.popen->ep_index]->max_data_length; - f->fs_xfer[u.popen->ep_index]->priv_fifo = - ((uint8_t *)0) + u.popen->ep_index; - /* - * Increase performance by dropping locks we - * don't need: - */ - f->flag_no_uref = 1; - } else { - error = ENOMEM; - } - break; + } + error = usb2_transfer_setup(f->udev, &iface_index, + f->fs_xfer + u.popen->ep_index, usb2_config, 1, + f, f->priv_mtx); + if (error == 0) { + /* update maximums */ + u.popen->max_packet_length = + f->fs_xfer[u.popen->ep_index]->max_frame_size; + u.popen->max_bufsize = + f->fs_xfer[u.popen->ep_index]->max_data_length; + f->fs_xfer[u.popen->ep_index]->priv_fifo = + ((uint8_t *)0) + u.popen->ep_index; + /* + * Increase performance by dropping locks we + * don't need: + */ + f->flag_no_uref = 1; + } else { + error = ENOMEM; + } + break; case USB_FS_CLOSE: - if (u.pclose->ep_index >= f->fs_ep_max) { - error = EINVAL; - break; - } - if (f->fs_xfer[u.pclose->ep_index] == NULL) { - error = EINVAL; - break; - } - usb2_transfer_unsetup(f->fs_xfer + u.pclose->ep_index, 1); + if (u.pclose->ep_index >= f->fs_ep_max) { + error = EINVAL; + break; + } + if (f->fs_xfer[u.pclose->ep_index] == NULL) { + error = EINVAL; break; + } + usb2_transfer_unsetup(f->fs_xfer + u.pclose->ep_index, 1); + break; case USB_FS_CLEAR_STALL_SYNC: - if (u.pstall->ep_index >= f->fs_ep_max) { - error = EINVAL; - break; - } - if (f->fs_xfer[u.pstall->ep_index] == NULL) { - error = EINVAL; - break; - } - if (f->udev->flags.usb2_mode != USB_MODE_HOST) { - error = EINVAL; - break; - } - mtx_lock(f->priv_mtx); - error = usb2_transfer_pending(f->fs_xfer[u.pstall->ep_index]); - mtx_unlock(f->priv_mtx); + if (u.pstall->ep_index >= f->fs_ep_max) { + error = EINVAL; + break; + } + if (f->fs_xfer[u.pstall->ep_index] == NULL) { + error = EINVAL; + break; + } + if (f->udev->flags.usb2_mode != USB_MODE_HOST) { + error = EINVAL; + break; + } + mtx_lock(f->priv_mtx); + error = usb2_transfer_pending(f->fs_xfer[u.pstall->ep_index]); + mtx_unlock(f->priv_mtx); - if (error) { - return (EBUSY); - } - pipe = f->fs_xfer[u.pstall->ep_index]->pipe; + if (error) { + return (EBUSY); + } + pipe = f->fs_xfer[u.pstall->ep_index]->pipe; - /* setup a clear-stall packet */ - req.bmRequestType = UT_WRITE_ENDPOINT; - req.bRequest = UR_CLEAR_FEATURE; - USETW(req.wValue, UF_ENDPOINT_HALT); - req.wIndex[0] = pipe->edesc->bEndpointAddress; - req.wIndex[1] = 0; - USETW(req.wLength, 0); + /* setup a clear-stall packet */ + req.bmRequestType = UT_WRITE_ENDPOINT; + req.bRequest = UR_CLEAR_FEATURE; + USETW(req.wValue, UF_ENDPOINT_HALT); + req.wIndex[0] = pipe->edesc->bEndpointAddress; + req.wIndex[1] = 0; + USETW(req.wLength, 0); - error = usb2_do_request(f->udev, NULL, &req, NULL); - if (error == 0) { - usb2_clear_data_toggle(f->udev, pipe); - } else { - error = ENXIO; - } - break; + error = usb2_do_request(f->udev, NULL, &req, NULL); + if (error == 0) { + usb2_clear_data_toggle(f->udev, pipe); + } else { + error = ENXIO; + } + break; default: error = ENOTTY; @@ -1657,9 +1657,9 @@ struct usb2_interface_descriptor *idesc; struct usb2_endpoint_descriptor *ed; struct usb2_alt_interface *ai; - int *pint; - void *addr; - } u; + int *pint; + void *addr; + } u; struct usb2_interface *iface; struct usb2_pipe *pipe; int error = 0; @@ -1713,39 +1713,39 @@ *(int *)addr = f->bufsize; break; - case USB_GET_INTERFACE_DESC: - iface = usb2_get_iface(f->udev, f->iface_index); - if (iface && iface->idesc) { - *u.idesc = *(iface->idesc); - } else { - error = EIO; - break; - } + case USB_GET_INTERFACE_DESC: + iface = usb2_get_iface(f->udev, f->iface_index); + if (iface && iface->idesc) { + *u.idesc = *(iface->idesc); + } else { + error = EIO; break; + } + break; case USB_GET_ENDPOINT_DESC: - pipe = f->priv_sc0; + pipe = f->priv_sc0; - if (pipe && pipe->edesc) { - *u.ed = *pipe->edesc; - } else { - error = EINVAL; - break; - } + if (pipe && pipe->edesc) { + *u.ed = *pipe->edesc; + } else { + error = EINVAL; break; + } + break; case USB_SET_RX_STALL_FLAG: - if ((fflags & FREAD) && (*u.pint)) { - f->flag_stall = 1; - } - break; + if ((fflags & FREAD) && (*u.pint)) { + f->flag_stall = 1; + } + break; case USB_SET_TX_STALL_FLAG: - if ((fflags & FWRITE) && (*u.pint)) { - f->flag_stall = 1; - } - break; + if ((fflags & FWRITE) && (*u.pint)) { + f->flag_stall = 1; + } + break; default: error = ENOTTY; @@ -1762,10 +1762,10 @@ struct usb2_alt_interface *ai; struct usb2_device_descriptor *ddesc; struct usb2_config_descriptor *cdesc; - struct usb2_device_stats *stat; + struct usb2_device_stats *stat; uint32_t *ptime; - void *addr; - } u; + void *addr; + } u; struct usb2_device_descriptor *dtemp; struct usb2_config_descriptor *ctemp; struct usb2_interface *iface; @@ -1800,41 +1800,41 @@ break; case USB_GET_ALTINTERFACE: - iface = usb2_get_iface(f->udev, - u.ai->uai_interface_index); - if (iface && iface->idesc) { - u.ai->uai_alt_index = iface->alt_index; - } else { - error = EINVAL; - } - break; + iface = usb2_get_iface(f->udev, + u.ai->uai_interface_index); + if (iface && iface->idesc) { + u.ai->uai_alt_index = iface->alt_index; + } else { + error = EINVAL; + } + break; case USB_SET_ALTINTERFACE: - if (!(fflags & FWRITE)) { - error = EPERM; - break; - } - error = ugen_set_interface(f, - u.ai->uai_interface_index, u.ai->uai_alt_index); + if (!(fflags & FWRITE)) { + error = EPERM; break; + } + error = ugen_set_interface(f, + u.ai->uai_interface_index, u.ai->uai_alt_index); + break; case USB_GET_DEVICE_DESC: - dtemp = usb2_get_device_descriptor(f->udev); - if (!dtemp) { - error = EIO; - break; - } - *u.ddesc = *dtemp; + dtemp = usb2_get_device_descriptor(f->udev); + if (!dtemp) { + error = EIO; break; + } + *u.ddesc = *dtemp; + break; case USB_GET_CONFIG_DESC: - ctemp = usb2_get_config_descriptor(f->udev); - if (!ctemp) { - error = EIO; - break; - } - *u.cdesc = *ctemp; + ctemp = usb2_get_config_descriptor(f->udev); + if (!ctemp) { + error = EIO; break; + } + *u.cdesc = *ctemp; + break; case USB_GET_FULL_DESC: error = ugen_get_cdesc(f, addr); @@ -1863,23 +1863,23 @@ break; case USB_DEVICESTATS: - for (n = 0; n != 4; n++) { + for (n = 0; n != 4; n++) { - u.stat->uds_requests_fail[n] = - f->udev->bus->stats_err.uds_requests[n]; + u.stat->uds_requests_fail[n] = + f->udev->bus->stats_err.uds_requests[n]; - u.stat->uds_requests_ok[n] = - f->udev->bus->stats_ok.uds_requests[n]; - } - break; + u.stat->uds_requests_ok[n] = + f->udev->bus->stats_ok.uds_requests[n]; + } + break; case USB_DEVICEENUMERATE: error = ugen_re_enumerate(f); break; case USB_GET_PLUGTIME: - *u.ptime = f->udev->plugtime; - break; + *u.ptime = f->udev->plugtime; + break; /* ... more IOCTL's to come ! ... --hps */ From owner-p4-projects@FreeBSD.ORG Mon Aug 11 18:34:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 147C5106567A; Mon, 11 Aug 2008 18:34:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAEBD1065674 for ; Mon, 11 Aug 2008 18:34:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A84E38FC25 for ; Mon, 11 Aug 2008 18:34:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BIYm9o057983 for ; Mon, 11 Aug 2008 18:34:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BIYmqn057981 for perforce@freebsd.org; Mon, 11 Aug 2008 18:34:48 GMT (envelope-from sam@freebsd.org) Date: Mon, 11 Aug 2008 18:34:48 GMT Message-Id: <200808111834.m7BIYmqn057981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 147167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 18:34:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147167 Change 147167 by sam@sam_ebb on 2008/08/11 18:34:26 consolidate channel parsing and fix strol use when the channel string has trailing flags (e.g. 36:ht/20); not sure how this worked before but it definitely did Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#25 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#25 (text+ko) ==== @@ -659,28 +659,36 @@ } static void +getchannel(int s, struct ieee80211_channel *chan, const char *val) +{ + int v, flags; + char *eptr; + + memset(chan, 0, sizeof(*chan)); + if (isanyarg(val)) { + chan->ic_freq = IEEE80211_CHAN_ANY; + return; + } + getchaninfo(s); + errno = 0; + v = strtol(val, &eptr, 10); + if (v == 0 && errno != 0) + errx(1, "invalid channel number%s", + errno == ERANGE ? " (out of range)" : ""); + flags = getchannelflags(val, v); + if (v > 255) { /* treat as frequency */ + mapfreq(chan, v, flags); + } else { + mapchan(chan, v, flags); + } +} + +static void set80211channel(const char *val, int d, int s, const struct afswtch *rafp) { struct ieee80211_channel chan; - memset(&chan, 0, sizeof(chan)); - if (!isanyarg(val)) { - int v, flags; - char *ep; - - getchaninfo(s); - v = strtol(val, &ep, 10); - if (val[0] == '\0' || ep[0] != '\0' || errno == ERANGE) - errx(1, "invalid channel number"); - flags = getchannelflags(val, v); - if (v > 255) { /* treat as frequency */ - mapfreq(&chan, v, flags); - } else { - mapchan(&chan, v, flags); - } - } else { - chan.ic_freq = IEEE80211_CHAN_ANY; - } + getchannel(s, &chan, val); set80211(s, IEEE80211_IOC_CURCHAN, 0, sizeof(chan), &chan); } @@ -688,17 +696,8 @@ set80211chanswitch(const char *val, int d, int s, const struct afswtch *rafp) { struct ieee80211_chanswitch_req csr; - int v, flags; - memset(&csr, 0, sizeof(csr)); - getchaninfo(s); - v = atoi(val); - flags = getchannelflags(val, v); - if (v > 255) { /* treat as frequency */ - mapfreq(&csr.csa_chan, v, flags); - } else { - mapchan(&csr.csa_chan, v, flags); - } + getchannel(s, &csr.csa_chan, val); csr.csa_mode = 1; csr.csa_count = 5; set80211(s, IEEE80211_IOC_CHANSWITCH, 0, sizeof(csr), &csr); From owner-p4-projects@FreeBSD.ORG Mon Aug 11 18:51:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A29391065683; Mon, 11 Aug 2008 18:51:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65F94106564A for ; Mon, 11 Aug 2008 18:51:05 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A00C8FC08 for ; Mon, 11 Aug 2008 18:51:05 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BIp5t7059369 for ; Mon, 11 Aug 2008 18:51:05 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BIp5Dg059367 for perforce@freebsd.org; Mon, 11 Aug 2008 18:51:05 GMT (envelope-from snagg@FreeBSD.org) Date: Mon, 11 Aug 2008 18:51:05 GMT Message-Id: <200808111851.m7BIp5Dg059367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 18:51:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=147169 Change 147169 by snagg@snagg_macosx on 2008/08/11 18:50:13 Added core dump test. Affected files ... .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#14 edit .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_coredump.c#1 add Differences ... ==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#14 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 11 19:45:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 824AE1065675; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45786106566C for ; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 333588FC18 for ; Mon, 11 Aug 2008 19:45:00 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BJj067065084 for ; Mon, 11 Aug 2008 19:45:00 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BJj0vC065080 for perforce@freebsd.org; Mon, 11 Aug 2008 19:45:00 GMT (envelope-from sson@FreeBSD.org) Date: Mon, 11 Aug 2008 19:45:00 GMT Message-Id: <200808111945.m7BJj0vC065080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 147173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 19:45:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147173 Change 147173 by sson@sson_amd64 on 2008/08/11 19:44:59 strcpy() -> strncpy() to appease static checkers. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#13 $ */ #include @@ -71,14 +71,14 @@ if (strlen(classname) >= AU_CLASS_NAME_MAX) return (NULL); - strcpy(c->ac_name, classname); + strncpy(c->ac_name, classname, AU_CLASS_NAME_MAX); /* * Check for very large class description. */ if (strlen(classdesc) >= AU_CLASS_DESC_MAX) return (NULL); - strcpy(c->ac_desc, classdesc); + strncpy(c->ac_desc, classdesc, AU_CLASS_DESC_MAX); c->ac_class = strtoul(classflag, (char **) NULL, 0); return (c); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#20 $ */ #include @@ -368,7 +368,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(name, dir); + strncpy(name, dir, len); pthread_mutex_unlock(&mutex); return (ret); } @@ -458,7 +458,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } @@ -485,7 +485,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } @@ -512,7 +512,7 @@ pthread_mutex_unlock(&mutex); return (-3); } - strcpy(auditstr, str); + strncpy(auditstr, str, len); pthread_mutex_unlock(&mutex); return (0); } ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#15 $ */ #include @@ -68,13 +68,13 @@ if (strlen(evname) >= AU_EVENT_NAME_MAX) return (NULL); - strcpy(e->ae_name, evname); + strncpy(e->ae_name, evname, AU_EVENT_NAME_MAX); if (evdesc != NULL) { if (strlen(evdesc) >= AU_EVENT_DESC_MAX) return (NULL); - strcpy(e->ae_desc, evdesc); + strncpy(e->ae_desc, evdesc, AU_EVENT_DESC_MAX); } else - strcpy(e->ae_desc, ""); + strncpy(e->ae_desc, "", AU_EVENT_DESC_MAX); e->ae_number = atoi(evno); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#15 $ */ #include @@ -157,10 +157,10 @@ if (sel != 0) { if (verbose) { - strcpy(strptr, c.ac_desc); + strncpy(strptr, c.ac_desc, AU_CLASS_DESC_MAX); strptr += strlen(c.ac_desc); } else { - strcpy(strptr, c.ac_name); + strncpy(strptr, c.ac_name, AU_CLASS_NAME_MAX); strptr += strlen(c.ac_name); } *strptr = ','; /* delimiter */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#17 $ */ #include @@ -66,7 +66,7 @@ if (strlen(username) >= AU_USER_NAME_MAX) return (NULL); - strcpy(u->au_name, username); + strncpy(u->au_name, username, AU_USER_NAME_MAX); if (getauditflagsbin(always, &(u->au_always)) == -1) return (NULL); From owner-p4-projects@FreeBSD.ORG Mon Aug 11 19:47:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B30481065673; Mon, 11 Aug 2008 19:47:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 76B1B106564A for ; Mon, 11 Aug 2008 19:47:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 642268FC1A for ; Mon, 11 Aug 2008 19:47:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BJl2EH065895 for ; Mon, 11 Aug 2008 19:47:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BJl2w7065893 for perforce@freebsd.org; Mon, 11 Aug 2008 19:47:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 11 Aug 2008 19:47:02 GMT Message-Id: <200808111947.m7BJl2w7065893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 19:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=147174 Change 147174 by hselasky@hselasky_laptop001 on 2008/08/11 19:46:17 Implement a set of IOCTLs that can change the permissions on the USB root, bus, device and interface. A permission is inactive when the mode is zero. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#16 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#23 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#20 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#16 (text+ko) ==== @@ -156,7 +156,6 @@ uint32_t uid; uint32_t gid; uint16_t mode; - uint8_t active; }; /* ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#23 (text+ko) ==== @@ -111,7 +111,6 @@ .uid = UID_ROOT, .gid = GID_OPERATOR, .mode = 0660, - .active = 1, }; static struct cdevsw usb2_devsw = { @@ -238,7 +237,6 @@ iface->perm.uid = uid; iface->perm.gid = gid; iface->perm.mode = mode; - iface->perm.active = 1; mtx_unlock(&usb2_ref_lock); } @@ -246,6 +244,168 @@ } /*------------------------------------------------------------------------* + * usb2_set_perm + * + * This function will set the permissions at the given level. + * + * Return values: + * 0: Success. + * Else: Failure. + *------------------------------------------------------------------------*/ +static int +usb2_set_perm(struct usb2_dev_perm *psrc, uint8_t level) +{ + struct usb2_location loc; + struct usb2_perm *pdst; + uint32_t devloc; + int error; + + /* only super-user can set permissions */ + error = suser(curthread); + if (error) { + return (error); + } + if ((psrc->bus_index >= USB_BUS_MAX) || + (psrc->dev_index >= USB_DEV_MAX) || + (psrc->iface_index >= USB_IFACE_MAX)) { + return (EINVAL); + } + devloc = 0; + switch (level) { + case 3: + devloc += psrc->iface_index * + USB_DEV_MAX * USB_BUS_MAX; + /* FALLTHROUGH */ + case 2: + devloc += psrc->dev_index * + USB_BUS_MAX; + /* FALLTHROUGH */ + case 1: + devloc += psrc->bus_index; + break; + default: + break; + } + + if ((level > 0) && (level < 4)) { + error = usb2_ref_device(NULL, &loc, devloc); + if (error) { + return (error); + } + } + switch (level) { + case 3: + pdst = &loc.iface->perm; + break; + case 2: + pdst = &loc.udev->perm; + break; + case 1: + pdst = &loc.bus->perm; + break; + default: + pdst = &usb2_perm; + break; + } + + /* all permissions are protected by "usb2_ref_lock" */ + mtx_lock(&usb2_ref_lock); + pdst->uid = psrc->user_id; + pdst->gid = psrc->group_id; + pdst->mode = psrc->mode; + mtx_unlock(&usb2_ref_lock); + + if ((level > 0) && (level < 4)) { + usb2_unref_device(&loc); + } + return (0); /* success */ +} + +/*------------------------------------------------------------------------* + * usb2_get_perm + * + * This function will get the permissions at the given level. + * + * Return values: + * 0: Success. + * Else: Failure. + *------------------------------------------------------------------------*/ +static int +usb2_get_perm(struct usb2_dev_perm *pdst, uint8_t level) +{ + struct usb2_location loc; + struct usb2_perm *psrc; + uint32_t devloc; + int error; + + if ((pdst->bus_index >= USB_BUS_MAX) || + (pdst->dev_index >= USB_DEV_MAX) || + (pdst->iface_index >= USB_IFACE_MAX)) { + return (EINVAL); + } +retry: + devloc = 0; + switch (level) { + case 3: + devloc += pdst->iface_index * + USB_DEV_MAX * USB_BUS_MAX; + /* FALLTHROUGH */ + case 2: + devloc += pdst->dev_index * + USB_BUS_MAX; + /* FALLTHROUGH */ + case 1: + devloc += pdst->bus_index; + break; + default: + break; + } + + if ((level > 0) && (level < 4)) { + error = usb2_ref_device(NULL, &loc, devloc); + if (error) { + return (error); + } + } + switch (level) { + case 3: + psrc = &loc.iface->perm; + break; + case 2: + psrc = &loc.udev->perm; + break; + case 1: + psrc = &loc.bus->perm; + break; + default: + psrc = &usb2_perm; + break; + } + + /* all permissions are protected by "usb2_ref_lock" */ + mtx_lock(&usb2_ref_lock); + if (psrc->mode != 0) { + pdst->user_id = psrc->uid; + pdst->group_id = psrc->gid; + pdst->mode = psrc->mode; + error = 0; + } else { + error = EINVAL; + } + mtx_unlock(&usb2_ref_lock); + + if ((level > 0) && (level < 4)) { + usb2_unref_device(&loc); + if (error) { + /* try to find the permission one level down */ + level--; + goto retry; + } + } + return (error); +} + +/*------------------------------------------------------------------------* * usb2_match_perm * * This function will compare two permission structures and see if @@ -260,7 +420,7 @@ { uint16_t mode; - if (psystem->active && puser->active) { + if ((psystem->mode != 0) && (puser->mode != 0)) { /* continue */ } else { return (0); /* no access */ @@ -962,9 +1122,6 @@ perm.mode |= 0444; if (fflags & FWRITE) perm.mode |= 0222; - perm.active = 1; - - mtx_lock(udev->default_mtx); /* scan down the permissions tree */ if ((ep_index != 0) && iface && @@ -984,7 +1141,6 @@ /* no access */ err = EPERM; } - mtx_unlock(udev->default_mtx); return (err); } @@ -1108,16 +1264,44 @@ usb2_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td) { + union { + struct usb2_read_dir *urd; + struct usb2_dev_perm *udp; + void *data; + } u; int err; + u.data = data; + switch (cmd) { - case USB_READ_DIR:{ - struct usb2_read_dir *urd = (void *)data; - - err = usb2_read_symlink(urd->urd_data, - urd->urd_startentry, urd->urd_maxlen); - break; - } + case USB_READ_DIR: + err = usb2_read_symlink(u.urd->urd_data, + u.urd->urd_startentry, u.urd->urd_maxlen); + break; + case USB_SET_IFACE_PERM: + err = usb2_set_perm(u.udp, 3); + break; + case USB_SET_DEVICE_PERM: + err = usb2_set_perm(u.udp, 2); + break; + case USB_SET_BUS_PERM: + err = usb2_set_perm(u.udp, 1); + break; + case USB_SET_ROOT_PERM: + err = usb2_set_perm(u.udp, 0); + break; + case USB_GET_IFACE_PERM: + err = usb2_get_perm(u.udp, 3); + break; + case USB_GET_DEVICE_PERM: + err = usb2_get_perm(u.udp, 2); + break; + case USB_GET_BUS_PERM: + err = usb2_get_perm(u.udp, 1); + break; + case USB_GET_ROOT_PERM: + err = usb2_get_perm(u.udp, 0); + break; default: err = ENOTTY; break; ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#20 (text+ko) ==== @@ -470,7 +470,7 @@ iface->idesc = NULL; iface->alt_index = 0; iface->parent_iface_index = USB_IFACE_INDEX_ANY; - iface->perm.active = 0; /* disable permissions */ + iface->perm.mode = 0; /* disable permissions */ iface++; } ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#11 (text+ko) ==== @@ -180,6 +180,18 @@ uint8_t ep_index; }; +struct usb2_dev_perm { + /* Permissions */ + uint16_t user_id; + uint16_t group_id; + uint16_t mode; + + /* Device location */ + uint16_t bus_index; + uint16_t dev_index; + uint16_t iface_index; +}; + /* USB controller */ #define USB_REQUEST _IOWR('U', 1, struct usb2_ctl_request) #define USB_SETDEBUG _IOW ('U', 2, int) @@ -222,10 +234,18 @@ #define USB_IFACE_DRIVER_DETACH _IOW ('U', 125, int) #define USB_GET_PLUGTIME _IOR ('U', 126, uint32_t) #define USB_READ_DIR _IOW ('U', 127, struct usb2_read_dir) +#define USB_SET_ROOT_PERM _IOW ('U', 128, struct usb2_dev_perm) +#define USB_SET_BUS_PERM _IOW ('U', 129, struct usb2_dev_perm) +#define USB_SET_DEVICE_PERM _IOW ('U', 130, struct usb2_dev_perm) +#define USB_SET_IFACE_PERM _IOW ('U', 131, struct usb2_dev_perm) +#define USB_GET_ROOT_PERM _IOW ('U', 132, struct usb2_dev_perm) +#define USB_GET_BUS_PERM _IOW ('U', 133, struct usb2_dev_perm) +#define USB_GET_DEVICE_PERM _IOW ('U', 134, struct usb2_dev_perm) +#define USB_GET_IFACE_PERM _IOW ('U', 135, struct usb2_dev_perm) /* Modem device */ -#define USB_GET_CM_OVER_DATA _IOR ('U', 130, int) -#define USB_SET_CM_OVER_DATA _IOW ('U', 131, int) +#define USB_GET_CM_OVER_DATA _IOR ('U', 160, int) +#define USB_SET_CM_OVER_DATA _IOW ('U', 161, int) /* USB file system interface */ #define USB_FS_START _IOW ('U', 192, struct usb2_fs_start) From owner-p4-projects@FreeBSD.ORG Mon Aug 11 19:54:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D5871065682; Mon, 11 Aug 2008 19:54:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C41881065678 for ; Mon, 11 Aug 2008 19:54:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1A848FC1C for ; Mon, 11 Aug 2008 19:54:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BJs9Ec066410 for ; Mon, 11 Aug 2008 19:54:09 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BJs9QX066408 for perforce@freebsd.org; Mon, 11 Aug 2008 19:54:09 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 19:54:09 GMT Message-Id: <200808111954.m7BJs9QX066408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 19:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147175 Change 147175 by trasz@trasz_traszkan on 2008/08/11 19:53:25 With NFS4 ACLs, chmod(2) may need to add additional entries. Make sure it has room for that by limiting the acl_cnt to about half of ACL_MAX_ENTRIES in ACL setting routines. This is similar to what SunOS does. Bump ACL_MAX_ENTRIES to 202, so that "struct acl" is exactly one page long. This breaks binary compatibility, requring libc recompilation, and on-disk format, requiring one to remove nfs4.acl extattr for every file. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#40 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#20 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#18 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#40 (text+ko) ==== @@ -12,11 +12,6 @@ - Add the information about correct constants to the manual pages. -- Decide what to do when chmod(2) needs to add ACL entries, but - there is no room in 'struct acl' to do that. Solaris seems to - limit the numer of user-settable entries to half of ACL_MAX_ENTRIES, - so there is no risk of running out of them in chmod(2). - - Make 'struct acl' variable size. - Benchmark things. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.h#8 (text+ko) ==== @@ -33,7 +33,7 @@ #define _ACL_SUPPORT_H #define _POSIX1E_ACL_STRING_PERM_MAXSIZE 3 /* read, write, exec */ -#define _ACL_T_ALIGNMENT_BITS 12 +#define _ACL_T_ALIGNMENT_BITS 13 int _acl_type_unold(acl_type_t type); int _acl_differs(const acl_t a, const acl_t b); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#20 (text+ko) ==== @@ -98,6 +98,9 @@ if (denied_explicitly != NULL) *denied_explicitly = 0; + KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0")); + KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); + for (i = 0; i < aclp->acl_cnt; i++) { entry = &(aclp->acl_entry[i]); @@ -289,12 +292,12 @@ { struct acl_entry *entry; + KASSERT(aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES")); + entry = &(aclp->acl_entry[aclp->acl_cnt]); aclp->acl_cnt++; - if (aclp->acl_cnt >= ACL_MAX_ENTRIES) - return (NULL); - entry->ae_tag = tag; entry->ae_id = ACL_UNDEFINED_ID; entry->ae_perm = perm; @@ -309,8 +312,8 @@ { int i; - if (aclp->acl_cnt + 1 >= ACL_MAX_ENTRIES) - return (NULL); + KASSERT(aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES")); for (i = aclp->acl_cnt; i > entry_index; i--) aclp->acl_entry[i] = aclp->acl_entry[i - 1]; @@ -368,9 +371,6 @@ * ACE. */ copy = _acl_duplicate_entry(aclp, i); - /* XXX: Is EPERM a good choice here? */ - if (copy == NULL) - return (EPERM); /* * 1.3.2. In the first ACE, the flag @@ -472,8 +472,6 @@ */ previous = entry; entry = _acl_duplicate_entry(aclp, i); - if (entry == NULL) - return (EPERM); /* Adjust counter, as we've just extended the ACL. */ i++; @@ -840,8 +838,8 @@ ACL_ENTRY_FILE_INHERIT)) == 0) continue; - KASSERT(child_aclp->acl_cnt < ACL_MAX_ENTRIES, - ("child_aclp->acl_cnt < ACL_MAX_ENTRIES")); + KASSERT(child_aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, + ("child_aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES")); child_aclp->acl_entry[child_aclp->acl_cnt] = *parent_entry; child_aclp->acl_cnt++; } @@ -901,8 +899,6 @@ * 2.D. Copy the original ACE into a second, adjacent ACE. */ copy = _acl_duplicate_entry(child_aclp, i); - if (copy == NULL) - return (EPERM); /* * 2.E. On the first ACE, ensure that ACL_ENTRY_ONLY_INHERIT @@ -970,7 +966,7 @@ * valid. There can be none of them too. Really. */ - if (acl->acl_cnt > ACL_MAX_ENTRIES || acl->acl_cnt < 0) + if (aclp->acl_cnt > ACL_MAX_ENTRIES || aclp->acl_cnt <= 0) return (EINVAL); for (i = 0; i < aclp->acl_cnt; i++) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#9 (text+ko) ==== @@ -206,6 +206,18 @@ error = copyin_acl(aclp, inkernelacl, type); if (error != 0) goto out_free; + + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries. + * Make sure it has enough room for that - splitting every entry + * into two and appending "canonical six" entries at the end. + */ + if (type == ACL_TYPE_NFS4 && + inkernelacl->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) { + error = ENOSPC; + goto out_free; + } + error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error != 0) goto out_free; @@ -302,6 +314,18 @@ error = copyin_acl(aclp, inkernelacl, type); if (error != 0) goto out_free; + + /* + * With NFS4 ACLs, chmod(2) may need to add additional entries. + * Make sure it has enough room for that - splitting every entry + * into two and appending "canonical six" entries at the end. + */ + if (type == ACL_TYPE_NFS4 && + inkernelacl->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) { + error = ENOSPC; + goto out_free; + } + error = VOP_ACLCHECK(vp, type_unold(type), inkernelacl, td->td_ucred, td); out_free: ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#18 (text+ko) ==== @@ -50,7 +50,12 @@ #define NFS4_ACL_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM #define NFS4_ACL_EXTATTR_NAME "nfs4.acl" #define OLDACL_MAX_ENTRIES 32 -#define ACL_MAX_ENTRIES OLDACL_MAX_ENTRIES +/* + * With 204 entries, "struct acl" is exactly one page big. + * Note that with NFS4 ACLs, the maximum number of ACL entries one + * may set on file or directory is about half of ACL_MAX_ENTRIES. + */ +#define ACL_MAX_ENTRIES 204 /* * "struct oldacl" is used in compatibility ACL syscalls and for on-disk From owner-p4-projects@FreeBSD.ORG Mon Aug 11 21:18:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6A231065674; Mon, 11 Aug 2008 21:18:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A151106566B for ; Mon, 11 Aug 2008 21:18:36 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E1538FC14 for ; Mon, 11 Aug 2008 21:18:36 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BLIaW1085119 for ; Mon, 11 Aug 2008 21:18:36 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BLIaPh085117 for perforce@freebsd.org; Mon, 11 Aug 2008 21:18:36 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 11 Aug 2008 21:18:36 GMT Message-Id: <200808112118.m7BLIaPh085117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 21:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=147184 Change 147184 by snb@snb_toro on 2008/08/11 21:18:31 It's definitely a good idea to unlock the dirhash if we aren't deleting it. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#9 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#9 (text+ko) ==== @@ -1193,6 +1193,9 @@ continue; if (time_second - dh->dh_lastused > ufs_dirhashreclaimage) memfreed += ufsdirhash_destroy(dh); + /* Unlock if we didn't delete the dirhash */ + else + lockmgr(&dh->dh_lock, LK_RELEASE, 0); } /* From owner-p4-projects@FreeBSD.ORG Mon Aug 11 22:21:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F829106568C; Mon, 11 Aug 2008 22:21:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63D471065676 for ; Mon, 11 Aug 2008 22:21:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3787B8FC12 for ; Mon, 11 Aug 2008 22:21:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BMLeZY091699 for ; Mon, 11 Aug 2008 22:21:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BMLerN091697 for perforce@freebsd.org; Mon, 11 Aug 2008 22:21:40 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 22:21:40 GMT Message-Id: <200808112221.m7BMLerN091697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 22:21:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=147186 Change 147186 by trasz@trasz_traszkan on 2008/08/11 22:21:11 Comment this damn thing out so I can run kernel with INVARIANTS for more than one hour without panicing with "truncate3". ;-/ Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#2 (text+ko) ==== @@ -481,7 +481,7 @@ } } done: -#ifdef INVARIANTS +#if 0 for (level = SINGLE; level <= TRIPLE; level++) if (newblks[NDADDR + level] != DIP(ip, i_ib[level])) panic("ffs_truncate1"); From owner-p4-projects@FreeBSD.ORG Mon Aug 11 22:31:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1811D106567F; Mon, 11 Aug 2008 22:31:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEC931065678 for ; Mon, 11 Aug 2008 22:31:50 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BCA038FC16 for ; Mon, 11 Aug 2008 22:31:50 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BMVo7R092491 for ; Mon, 11 Aug 2008 22:31:50 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BMVopx092489 for perforce@freebsd.org; Mon, 11 Aug 2008 22:31:50 GMT (envelope-from sson@FreeBSD.org) Date: Mon, 11 Aug 2008 22:31:50 GMT Message-Id: <200808112231.m7BMVopx092489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 147187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 22:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=147187 Change 147187 by sson@sson_amd64 on 2008/08/11 22:31:01 More strcpy() -> strncpy() and strcat() -> strncat() changes. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#33 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#5 (text+ko) ==== @@ -12,7 +12,7 @@ versions of the system includes in a kernel source tree, and will use the OpenBSM build infrastructure with an unmodified OpenBSM distribution, allowing the customized system includes to be used with the OpenBSM build. - Submitted by stacey Son. + Submitted by Stacey Son. OpenBSM 1.1 alpha 1 @@ -337,4 +337,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#4 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#5 $ ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#33 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#33 $ */ #include @@ -152,16 +152,20 @@ char *fn; char *curdir; const char *sep = "/"; + size_t len; curdir = dirent->dirname; syslog(LOG_DEBUG, "dir = %s", dirent->dirname); - fn = malloc(strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1); + len = strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1; + fn = malloc(len); if (fn == NULL) return (NULL); - strcpy(fn, curdir); - strcat(fn, sep); - strcat(fn, name); + strncpy(fn, curdir, len); + len -= strlen(curdir); + strncat(fn, sep, len); + len -= strlen(sep); + strncat(fn, name, len); return (fn); } @@ -173,17 +177,19 @@ { char *ptr; char *oldname; + size_t len; if (lastfile != NULL) { - oldname = (char *)malloc(strlen(lastfile) + 1); + len = strlen(lastfile) + 1; + oldname = (char *)malloc(len); if (oldname == NULL) return (-1); - strcpy(oldname, lastfile); + strncpy(oldname, lastfile, len); /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { *ptr = '.'; - strcpy(ptr+1, TS); + strncpy(ptr+1, TS, POSTFIX_LEN); if (rename(oldname, lastfile) != 0) syslog(LOG_ERR, "Could not rename %s to %s: %m", oldname, @@ -249,8 +255,8 @@ if (getTSstr(TS, POSTFIX_LEN) != 0) return (-1); - strcpy(timestr, TS); - strcat(timestr, NOT_TERMINATED); + strncpy(timestr, TS, POSTFIX_LEN); + strncat(timestr, NOT_TERMINATED, POSTFIX_LEN); #ifdef AUDIT_REVIEW_GROUP /* @@ -355,7 +361,7 @@ free(dirent); return (-1); } - strcpy(dirent->dirname, cur_dir); + strncpy(dirent->dirname, cur_dir, MAXNAMLEN); TAILQ_INSERT_TAIL(&dir_q, dirent, dirs); } ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#25 $ */ /* @@ -111,7 +111,7 @@ for (nstrs = 0, i = 0; i < len; i++) { if (copy[i] == ',' && i > 0) { if (copy[i - 1] == '\\') - strcpy(©[i - 1], ©[i]); + strncpy(©[i - 1], ©[i], len); else { nstrs++; copy[i] = '\0'; From owner-p4-projects@FreeBSD.ORG Mon Aug 11 22:53:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 369E5106566C; Mon, 11 Aug 2008 22:53:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED318106568A for ; Mon, 11 Aug 2008 22:53:12 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D995F8FC19 for ; Mon, 11 Aug 2008 22:53:12 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BMrCQV094610 for ; Mon, 11 Aug 2008 22:53:12 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BMrCAm094608 for perforce@freebsd.org; Mon, 11 Aug 2008 22:53:12 GMT (envelope-from andenore@FreeBSD.org) Date: Mon, 11 Aug 2008 22:53:12 GMT Message-Id: <200808112253.m7BMrCAm094608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 147189 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 22:53:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=147189 Change 147189 by andenore@andenore_laptop on 2008/08/11 22:53:11 A lot of bug fixing, documenting and man-page writing. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#11 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/Makefile#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#8 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.h#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/main.c#6 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/pkg_convert.1#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#8 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/perform.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#6 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/Makefile#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#11 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/date.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/deps.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/file.c#4 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#14 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/match.c#9 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#9 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#5 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#11 (text+ko) ==== @@ -16,8 +16,8 @@ things, but it looks Ok. (The old output is available via the -b option) - Print installation date with -n (human readable) or -N (seconds since epoch) - Added installtime comparison with the -M option, e.g, - "pkg_info -M '*>2008 07 18'" will list all packages installed after - the date YYYY MM DD. + "pkg_info -M '*>2008-07-18 18:30:21'" will list all packages installed after + the date YYYY-MM-DD hh:mm:ss. Add: - Indexes information to dbcache according to the add @@ -28,8 +28,8 @@ Delete: - Deindexes information according to the delete - Now supports range deletion with installdates, e.g., - pkg_delete -i -M '*>=2008 07 14<2008 08' will delete all packages - installed between dates 2008 07 14 and 2008 08, asking for y/n before + pkg_delete -i -M '*>=2008-07-14<2008-08' will delete all packages + installed between dates 2008-07-14 and 2008-08, asking for y/n before the deletion. Lib: @@ -47,4 +47,4 @@ Packinglist: - - A @comment DATE:seconds-since-epoch has been added (affects add/create/info/lib)+ - A @comment DATE:YYYY-MM-DD hh:mm:ss has been added (affects add/create/info/lib) ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/Makefile#5 (text+ko) ==== @@ -3,7 +3,7 @@ PROG= pkg_add SRCS= main.c perform.c futil.c extract.c -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${.CURDIR}/../lib -g WARNS?= 3 WFORMAT?= 1 ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#5 (text+ko) ==== @@ -95,7 +95,7 @@ static void usage(void); -static char opts[] = "hviIRfFnrp:P:SMt:C:K"; +static char opts[] = "hviIRfFnrp:P:qSMt:C:K"; static struct option longopts[] = { { "chroot", required_argument, NULL, 'C' }, { "dry-run", no_argument, NULL, 'n' }, @@ -181,6 +181,10 @@ errx(1, "-t Argument too long."); break; + case 'q': + Quiet = TRUE; + break; + case 'S': AddMode = SLAVE; break; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#8 (text+ko) ==== @@ -272,9 +272,8 @@ matched[i]); conflictsfound = 1; } - free(matched[i]); } - free(matched); + continue; } } @@ -300,6 +299,7 @@ printf(" with '%s' origin", deporigin); printf(".\n"); } + if (isinstalledpkg(p->name) <= 0 && !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { char path[FILENAME_MAX], *cp = NULL; @@ -476,6 +476,9 @@ // warnx("you do not own %s (proceeding anyways)", tmp); // } + if (getuid() != 0) + warnx("not running as root - trying to record install anyway"); + sprintf(LogDir, "%s/%s", LOG_DIR, Plist.name); zapLogDir = 1; if (Verbose) @@ -531,8 +534,8 @@ /* make sure we've opened the database */ if (openDatabase(O_CREAT | O_RDWR)) warn("Could not open database %s, may lead to inconsistency", DBCACHE_FILE); - cache_plist(&Plist, Verbose); // cache information - closeDatabase(); + else + cache_plist(&Plist, Verbose, FALSE); // cache information /* record dependency in the dependents +REQUIRED_BY file */ for (p = Plist.head; p ; p = p->next) { @@ -573,9 +576,11 @@ } } } + if (dep_count > 0) { depmatches = matchallbyorigin((const char **)deporigins, NULL); free(deporigins); + if (!IgnoreDeps && depmatches) { for (i = 0; i < dep_count; i++) { if (depmatches[i]) { ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/converter.h#4 (text+ko) ==== @@ -1,9 +1,31 @@ +/* $FreeBSD$ */ + +/* + * FreeBSD install - a package for the installation and maintainance + * of non-core utilities. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * Anders Nore (andenore@FreeBSD.org) + * 12 August 2008 + * + * Various global variables used by pkg_convert + */ + #ifndef _INST_CONVERTER_H #define _INST_CONVERTER_H extern Boolean CheckExists; extern Boolean Textual; extern Boolean Print; +extern Boolean CacheAllDates; extern char * Key; #endif /* _INST_CONVERTER_H */ ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/main.c#6 (text+ko) ==== @@ -1,3 +1,25 @@ +/* $FreeBSD$ */ + +/* + * FreeBSD install - a package for the installation and maintainance + * of non-core utilities. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * Anders Nore (andenore@FreeBSD.org) + * 12 August 2008 + * + * pkg_convert, a program for caching parts of the flat package-database + * into a berkeley-db file. + */ + #include #include #include @@ -5,10 +27,10 @@ Boolean CheckExists = FALSE; Boolean Print = FALSE; Boolean Textual = FALSE; - +Boolean CacheAllDates = FALSE; void usage(void); -static char opts[] = "vthep"; +static char opts[] = "vdthep"; static struct option longopts[] = { { "verbose", no_argument, NULL, 'v' }, @@ -30,6 +52,9 @@ pkgs = argv; while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) { switch(ch) { + case 'd': + CacheAllDates = TRUE; + break; case 'v': Verbose++; break; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/perform.c#10 (text+ko) ==== @@ -1,3 +1,23 @@ +/* $FreeBSD$ */ + +/* + * FreeBSD install - a package for the installation and maintainance + * of non-core utilities. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * Anders Nore (andenore@FreeBSD.org) + * 12 August 2008 + * + */ + #include #include #include @@ -86,13 +106,9 @@ FILE *fp; Package pkg; - /* - * Add Which indexing i.e. index files installed by package and they point - * to the installed package (alot of redundant data) - */ - pkg.head = pkg.tail = NULL; pkg.name = pkg.origin = NULL; + pkg.datetime = NULL; snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, pkgname, CONTENTS_FNAME); fp = fopen(tmp, "r"); @@ -109,7 +125,7 @@ return 1; } - return cache_plist(&pkg, Verbose); + return cache_plist(&pkg, Verbose, CacheAllDates); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/convert/pkg_convert.1#5 (text+ko) ==== @@ -23,7 +23,7 @@ .Nd a utility for caching information in PKG_DBDIR to a BerkeleyDB file .Sh SYNOPSIS .Nm -.Op Fl v +.Op Fl vd .Op Fl et Ar key .Op Fl p Ar key @@ -37,6 +37,12 @@ .Bl -tag -width indent .It Fl v Turn on verbose output. +.It Fl d +Cache the ctime (time when file status was last changed) of the +COMMENT +file as the installation time for the package for all packages who does +not have a '@comment DATE:YYYY-MM-DD hh:mm:ss' (this should not be a problem +if you always had pkg_tools with installtime support), this is often the +accurate installation time, but not always. .It Fl e Ar key Checks if key is in database. .It Fl p Ar key ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/create/perform.c#8 (text+ko) ==== @@ -252,7 +252,7 @@ plist_add_installtime(&plist); check_list(home, &plist); write_plist(&plist, stdout); - int retval = cache_plist(&plist, FALSE); + int retval = cache_plist(&plist, FALSE, FALSE); closeDatabase(); exit(retval); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/perform.c#10 (text+ko) ==== @@ -340,7 +340,6 @@ /* * Look through package dbs in LOG_DIR and find which * packages installed the files in which_list. - * TODO: Speedup with bdb cache */ static int find_pkg(struct which_head *which_list) @@ -380,18 +379,22 @@ /* If cache exists check database for the key (i.e., file absolute path) */ if (CacheExists == TRUE) { -// DEBUG("find_pkg: USES CACHE\n"); TAILQ_FOREACH(wp, which_list, next) { if (wp->skip == TRUE) continue; DBT tmp; if (dbKeyExists(wp->file, &tmp)) strlcpy(wp->package, tmp.data, PATH_MAX); - else - DEBUG("find_pkg: Doesn't exist\n"); + else { +#ifdef DEBUG + printf("find_pkg: Doesn't exist\n"); +#endif + } } } else { - DEBUG("debug: not using cache; run pkg_convert\n"); +#ifdef DEBUG + printf("debug: not using cache; run pkg_convert\n"); +#endif installed = matchinstalled(MATCH_ALL, NULL, &errcode); if (installed == NULL) return errcode; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#6 (text+ko) ==== @@ -15,13 +15,7 @@ .\" .\" .\" @(#)pkg_info.1 ->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/info/pkg_info.1#19 -.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.62 2007/12/09 11:01:58 krion Exp $ -==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/info/pkg_info.1#20 .\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.63 2008/05/30 14:26:08 flz Exp $ -==== YOURS //andenore_laptop/src/usr.sbin/pkg_install/info/pkg_info.1 -.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.60 2007/03/04 13:30:02 ru Exp $ -<<<< .\" .Dd May 30, 2008 .Dt PKG_INFO 1 @@ -31,7 +25,7 @@ .Nd a utility for displaying information on software packages .Sh SYNOPSIS .Nm -.Op Fl bcdDEfghGiIjkKLmnNopPqQrRsvVxX +.Op Fl bcdDEfghGiIjkKLmMnNopPqQrRsvVxX .Op Fl e Ar package .Op Fl l Ar prefix .Op Fl t Ar template @@ -61,7 +55,8 @@ A package name may either be the name of an installed package, the pathname to a package distribution file or a URL to an FTP available package. -Package version numbers can also be matched in a relational manner using the +Package version numbers and installdates (see -M) can also be matched in a +relational manner using the .Pa >= , <= , > and .Pa < @@ -128,6 +123,16 @@ Show the .Xr mtree 8 file (if any) for each package. +.It Fl M +Compare +.Ar pkg-name ... +using installdates instead of version numbers (default). +The format used is 'YYYY-MM-DD hh:mm:ss' +For example, +.Pp +.Dl "pkg_info -M '*>2008-08-11'" +.Pp +will match all packages installed after 2008-08-11. .It Fl L Show the files within each package. This is different from just ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/Makefile#5 (text+ko) ==== @@ -4,7 +4,7 @@ INTERNALLIB= SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c database.c match.c \ deps.c version.c pkgwrap.c url.c date.c -CFLAGS= +CFLAGS=-g WARNS?= 3 WFORMAT?= 1 ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#11 (text+ko) ==== @@ -1,3 +1,24 @@ +/* $FreeBSD$ */ + +/* + * FreeBSD install - a package for the installation and maintainance + * of non-core utilities. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * Anders Nore (andenore@FreeBSD.org) + * 12 August 2008 + * + * Various functions for use with berkeley-db (using non-relational btree). + */ + #include "lib.h" #include @@ -63,6 +84,8 @@ database = opendb(DBCACHE_FILE, flags); if (database != NULL) CacheExists = TRUE; + else + warn("Could not open database: %s\n", DBCACHE_FILE); } return ( database == NULL ); @@ -72,13 +95,18 @@ * Put data key/data into database */ int dbput(const DB *db, DBT *key, DBT *data) { - return db->put(db, key, data, 0); + return db->put(db, key, data, 0); } int dbsave(const DBT *key, const DBT *data) { - assert(database != NULL); + assert(database != NULL); + int retval; + + retval = dbput(database, (DBT *)key, (DBT *)data); + if (retval != 0) + warn("%s: cannot save to database", __func__); - return dbput(database, (DBT *)key, (DBT *)data); + return retval; } int dbAddPackage(const char *pkgname, const char *pkgdata) { @@ -148,16 +176,19 @@ * Checks if the given key exists */ Boolean dbKeyExists(const char *aKey, DBT *data) { - assert(database != NULL); + assert(database != NULL); + assert(aKey != NULL); + assert(data != NULL); - DBT key; - key.size = strlen(aKey) + 1; - key.data = (char *)aKey; + DBT key; + key.size = strlen(aKey) + 1; + key.data = (char *)aKey; - if(database->get(database, &key, data, 0) == 0) - return TRUE; - else - return FALSE; + if (database->get(database, &key, data, 0) == 0) { + return TRUE; + } else { + return FALSE; + } } /* @@ -203,38 +234,46 @@ int closedb(DB *db) { - return db->close(db); + int retval = db->close(db); + db = NULL; + return retval; } void closeDatabase() { -// assert(database != NULL); -// DEBUG("closeDatabase()\n"); +// assert(database != NULL); +#ifdef DEBUG + DEBUG("closeDatabase()\n"); +#endif if(database != NULL) closedb(database); +#ifdef DEBUG else DEBUG("closeDatbase(): Database already closed()\n"); +#endif } /* * cache_plist - * Caches the information about the package pkg into the database + * Caches the information about the package pkg into the database: + * pkgname -> origin (for origin lookup) + * +Dpkgname -> installdatetime (for datetime lookup range search) + * installed-file -> pkgname (for "which" searching pkg_info -w) */ int -cache_plist(Package *pkg, Boolean showmsg) +cache_plist(Package *pkg, Boolean showmsg, Boolean cacheAllDates) { PackingList itr = NULL; Boolean skip = FALSE; char *cwd; DBT key, data; - time_t etime; + char *szTime; struct stat fstat; if (pkg->name == NULL || pkg->origin == NULL) { - if (showmsg) - warnx("%s does not appear to be a valid package!", pkg->name); + warnx("%s does not appear to be a valid package!", pkg->name); return 1; } @@ -278,28 +317,31 @@ } /* Cache installtime */ - if (pkg->datetime != 0) - etime = pkg->datetime; - else { + if (pkg->datetime != NULL) { + szTime = pkg->datetime; + } else if (cacheAllDates) { char path[PATH_MAX]; snprintf(path, sizeof(path), "%s/%s/%s", LOG_DIR, pkg->name, COMMENT_FNAME); if (stat(path, &fstat) == -1) warn("Cannot stat file: %s", path); - etime = fstat.st_ctime; + szTime = getDateString(fstat.st_ctime); } - char *tmp[128], tmp2[128]; + char tmp[128], tmp2[128]; snprintf(&tmp, sizeof(tmp), "+D%s", pkg->name); - snprintf(&tmp2, sizeof(tmp2), "%d", (int)etime); + snprintf(&tmp2, sizeof(tmp2), "%s", szTime); key.size = strlen(tmp) + 1; key.data = (char *)tmp; data.size = strlen(tmp2) + 1; data.data = (char *)tmp2; - dbsave(&key, &data); - if (Verbose && showmsg) - printf("Saving installdate: %s %s\n", tmp, tmp2); + /* Only cache installtime if we have one or we want one */ + if (pkg->datetime || cacheAllDates) { + if (Verbose && showmsg) + printf("Saving installdate: %s -> %s\n", tmp, tmp2); + dbsave(&key, &data); + } return 0; } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/date.c#3 (text+ko) ==== @@ -1,45 +1,90 @@ +/* $FreeBSD$ */ +/* + * FreeBSD install - a package for the installation and maintainance + * of non-core utilities. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * Anders Nore (andenore@FreeBSD.org) + * 12 August 2008 + * + * Various functions for date and time handling. + */ + #include "lib.h" +/* + * getInstallDate - gets the installdate for pkgname if it exists + * If successful returns second-since-epoch of the installdate otherwise + * return -1. + */ int getInstallDate(const char *pkgname) { - int result = 0; + unsigned int year = 0; + unsigned int month = 0; + unsigned int day = 0; + unsigned int hour = 0; + unsigned int minute = 0; + unsigned int second = 0; char path[PATH_MAX]; FILE *fp; Package plist; + DBT data; + bzero(&data, sizeof(data)); bzero(&plist, sizeof(plist)); if (CacheExists) { char key[1024]; - DBT data; snprintf(key, sizeof(key), "+D%s", pkgname); - if (dbKeyExists(key, &data)) { - if(sscanf(data.data, "%d", &result) == 0) { - warnx("getInstallDate: Database may be corrupt"); - return -1; - } else { - return result; - } + if (!dbKeyExists(key, &data)) { + warnx("Could not get installdate for package '%s', if you want to cache " + "information for all packages see pkg_convert(1).\n", pkgname); + return -1; + } + } else { + + /* If we don't have cache (reading plist = SLOW) */ + snprintf(path, sizeof(path), "%s/%s/%s", LOG_DIR, pkgname, CONTENTS_FNAME); + + fp = fopen(path, "r"); + if (!fp) { + warn("Could not open %s", path); + return -1; } + read_plist(&plist, fp); + data.data = plist.datetime; } - /* If we don't have cache or the key don't exist (reading plist = SLOW) */ - snprintf(path, sizeof(path), "%s/%s/%s", LOG_DIR, pkgname, CONTENTS_FNAME); + if (data.data == NULL) + return -1; - fp = fopen(path, "r"); - if (!fp) { - warn("Could not open %s", path); - return 0; + if (sscanf(data.data, "%u-%u-%u %u:%u:%u", &year, &month, &day, &hour, &minute, &second) != 0) { + return getTime(year, month, day, hour, minute, second); + } else { + warnx("%u-%u-%u %u:%u", year, month, day, hour, minute, second); + warnx("Invalid datetime format: %s", data.data); + return -1; } - read_plist(&plist, fp); - - return plist.datetime; } +/* + * getTime - gets the time in seconds-since-epoch of the variables + * supplied. + * returns -1 on failure. + */ int -getTime(int year, int month, int day) +getTime(unsigned int year, unsigned int month, unsigned int day, + unsigned int hour, unsigned int minute, unsigned int second) { time_t rawtime; struct tm *timeinfo; @@ -49,22 +94,43 @@ timeinfo->tm_year = year - 1900; timeinfo->tm_mon = month - 1; timeinfo->tm_mday = day; + timeinfo->tm_hour = hour; + timeinfo->tm_min = minute; + timeinfo->tm_sec = second; - return mktime(timeinfo); + /* + * Get the time, if the date > 2038-01-18 we get the wrong time and + * result = -1, this is because of the y2k+38 bug. + */ + int result = mktime(timeinfo); + if (result == -1) + warnx("could not get correct time, output may be incorrect, check your input.\n"); + return result; } +/* + * date_cmp - compares the installtime of pkgname to the date string *date + * with format "YYYY-MM-DD hh:mm:ss". + * returns: + * 1 if pkgname > date + * 0 if pkgname == date + * -1 if pkgname < date + */ int date_cmp(const char *pkgname, const char *date) { unsigned int year = 0; unsigned int month = 0; unsigned int day = 0; + unsigned int hour = 0; + unsigned int minute = 0; + unsigned int second = 0; - if ((sscanf(date, "%u %u %u", &year, &month, &day) == 0)) - warnx("Invalid date format: %s", date); + if ((sscanf(date, "%u-%u-%u %u:%u:%u", &year, &month, &day, &hour, &minute, &second) == 0)) + warnx("Invalid datetime format: %s", date); int time1 = getInstallDate(pkgname); - int time2 = getTime(year, month, day); + int time2 = getTime(year, month, day, hour, minute, second); if (time1 > time2) { return 1; @@ -73,4 +139,23 @@ } else { return -1; } +} + +/* + * getDateString - returns a string of format "YYYY-MM-DD hh:mm:ss" + * representing the seconds-since-epoch clock variable. + * NB: The string returned is static, so calling this function more than once + * will alter a previously return string. + */ +char * +getDateString(const time_t clock) +{ + struct tm *installTime; + static char timeString[80]; + + installTime = localtime(&clock); + snprintf(&timeString, sizeof(timeString), "%u-%02u-%02u %02u:%02u:%02u", + installTime->tm_year + 1900, installTime->tm_mon + 1, installTime->tm_mday, + installTime->tm_hour, installTime->tm_min, installTime->tm_sec); + return timeString; } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/deps.c#4 (text+ko) ==== @@ -254,12 +254,13 @@ void fix_dependencies(char *pkgname) { - int i; + int i, errcode; char **matched; PackingList p = NULL; + if (Verbose) printf("Recording existing dependency's on %s\n", pkgname); - int errcode; + matched = matchinstalled(MATCH_ALL, NULL, &errcode); for (i = 0; matched[i] != NULL; i++) { FILE *fp; @@ -296,7 +297,5 @@ } } free_plist(&nplist); - free(matched[i]); } - free(matched); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/file.c#4 (text+ko) ==== @@ -29,6 +29,10 @@ char sizeTable[][5] = { "Byte", "kB", "MB", "GB", "TB" }; +int power(int , int); +char *printHumanReadable(unsigned int); +unsigned int human_readable(unsigned int, int *, unsigned int, int *); + /* Quick check to see if a file exists */ Boolean fexists(const char *fname) @@ -473,7 +477,7 @@ printHumanReadable(unsigned int size) { static char result[32]; - int index = 0; + unsigned int index = 0; int tmpSize = 0, precision = 0; tmpSize = human_readable(size, &precision, 1, &index); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#14 (text+ko) ==== @@ -122,8 +122,6 @@ #define PLIST_FMT_VER_MAJOR 1 #define PLIST_FMT_VER_MINOR 1 -#define DEBUG(s) printf(s) - enum _plist_t { PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD, PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE, @@ -154,7 +152,8 @@ struct _plist *head, *tail; const char *name; const char *origin; - int fmtver_maj, fmtver_mnr, datetime; + const char *datetime; + int fmtver_maj, fmtver_mnr; }; typedef struct _pack Package; @@ -265,12 +264,14 @@ Boolean dbPackageExists(const char *portname); void closeDatabase(void); int dbScan(DBT *key, DBT *data); -int cache_plist(Package *pkg, Boolean showmsg); +int cache_plist(Package *pkg, Boolean showmsg, Boolean cacheAllDates); /* Date */ int getInstallDate(const char *pkgname); -int getTime(int year, int month, int day); +int getTime(unsigned int year, unsigned int month, unsigned int day, + unsigned int hour, unsigned int minute, unsigned int second); int date_cmp(const char *pkgname, const char *date); +char *getDateString(const time_t clock); /* Externs */ extern Boolean Quiet; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/match.c#9 (text+ko) ==== @@ -47,6 +47,8 @@ /* * Function to query names of installed packages. * MatchType - one of MATCH_ALL, MATCH_EREGEX, MATCH_REGEX, MATCH_GLOB, MATCH_NGLOB; + if MatchType = (MatchType * 10) then the comparison with <>=! is done + with the installation date instead of version comparison. * patterns - NULL-terminated list of glob or regex patterns * (could be NULL for MATCH_ALL); * retval - return value (could be NULL if you don't want/need @@ -94,9 +96,9 @@ /* Count number of patterns */ if (patterns != NULL) { for (len = 0; patterns[len]; len++) {} - lmatched = alloca(sizeof(*lmatched) * len); + lmatched = malloc(sizeof(*lmatched) * len); if (lmatched == NULL) { - warnx("%s(): alloca() failed", __func__); + warnx("%s(): malloc() failed", __func__); if (retval != NULL) *retval = 1; return NULL; @@ -116,7 +118,7 @@ errcode = 0; if (MatchType == MATCH_ALL) matched = f->fts_name; - else + else for (i = 0; patterns[i]; i++) { errcode = pattern_match(MatchType * (dateMatch ? 10 : 1), patterns[i], f->fts_name); if (errcode == 1) { @@ -127,10 +129,10 @@ if (matched != NULL || errcode != 0) break; } - + if (errcode == 0 && matched != NULL) errcode = storeappend(store, matched); - + if (errcode != 0) { if (retval != NULL) *retval = 1; @@ -147,6 +149,7 @@ if (lmatched[i] == FALSE) storeappend(store, patterns[i]); } + free(lmatched); if (store->used == 0) return NULL; @@ -275,7 +278,6 @@ int i, j; Boolean CorruptPrinted = FALSE; - if (retval != NULL) *retval = 0; @@ -298,8 +300,8 @@ */ if (CacheExists) { DBT data; - - if(dbKeyExists(installed[i], &data)) { + + if (dbKeyExists(installed[i], &data)) { asprintf(&buf, "%s", (char *)data.data); allorigins[i] = buf; continue; @@ -326,6 +328,7 @@ snprintf(tmp, PATH_MAX, "%s/%s", tmp, CONTENTS_FNAME); fp = fopen(tmp, "r"); if (fp == NULL) { + printf("tmp = %s\n", tmp); warnx("the package info for package '%s' is corrupt", installed[i]); continue; } @@ -370,12 +373,12 @@ storeappend(store, installed[j]); } } + } - if (store->used == 0) - matches[i] = NULL; - else - matches[i] = store->store; - } + if (store->used == 0) + matches[i] = NULL; + else + matches[i] = store->store; } if (allorigins) { @@ -629,10 +632,10 @@ store->currlen = 0; store->store = NULL; } else if (store->store != NULL) { - /* Free previously allocated memory */ - for (i = 0; store->store[i] != NULL; i++) - free(store->store[i]); - store->store[0] = NULL; + /* Free previously allocated memory */ + for (i = 0; store->store[i] != NULL; i++) + free(store->store[i]); + store->store[0] = NULL; } store->used = 0; @@ -645,31 +648,31 @@ static int storeappend(struct store *store, const char *item) { - if (store->used + 2 > store->currlen) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 11 23:35:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C6261065671; Mon, 11 Aug 2008 23:35:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 404631065686 for ; Mon, 11 Aug 2008 23:35:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D1B48FC1B for ; Mon, 11 Aug 2008 23:35:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BNZu9f099612 for ; Mon, 11 Aug 2008 23:35:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BNZumY099610 for perforce@freebsd.org; Mon, 11 Aug 2008 23:35:56 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 23:35:56 GMT Message-Id: <200808112335.m7BNZumY099610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 23:35:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147191 Change 147191 by trasz@trasz_traszkan on 2008/08/11 23:35:24 Centralize ACL allocation and freeing. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#21 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#19 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#12 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#21 (text+ko) ==== @@ -331,9 +331,6 @@ *a1, *a2, *a3, *a4, *a5, *a6; mode_t amode; - /* XXX: Move it somewhere. */ - aclp->acl_magic = ACL_MAGIC; - /* * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt * ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#10 (text+ko) ==== @@ -76,7 +76,6 @@ bzero(dest, sizeof(*dest)); - dest->acl_magic = ACL_MAGIC; dest->acl_cnt = source->acl_cnt; for (i = 0; i < dest->acl_cnt; i++) { @@ -202,7 +201,7 @@ struct mount *mp; int error; - inkernelacl = uma_zalloc(acl_zone, M_WAITOK); + inkernelacl = acl_alloc(); error = copyin_acl(aclp, inkernelacl, type); if (error != 0) goto out_free; @@ -235,7 +234,7 @@ VOP_UNLOCK(vp, 0); vn_finished_write(mp); out_free: - uma_zfree(acl_zone, inkernelacl); + acl_free(inkernelacl); return(error); } @@ -249,7 +248,7 @@ struct acl *inkernelacl; int error; - inkernelacl = uma_zalloc(acl_zone, M_WAITOK); + inkernelacl = acl_alloc(); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); #ifdef MAC @@ -268,7 +267,7 @@ VOP_UNLOCK(vp, 0); if (error == 0) error = copyout_acl(inkernelacl, aclp, type); - uma_zfree(acl_zone, inkernelacl); + acl_free(inkernelacl); return (error); } @@ -310,7 +309,7 @@ struct acl *inkernelacl; int error; - inkernelacl = uma_zalloc(acl_zone, M_WAITOK); + inkernelacl = acl_alloc(); error = copyin_acl(aclp, inkernelacl, type); if (error != 0) goto out_free; @@ -329,7 +328,7 @@ error = VOP_ACLCHECK(vp, type_unold(type), inkernelacl, td->td_ucred, td); out_free: - uma_zfree(acl_zone, inkernelacl); + acl_free(inkernelacl); return (error); } @@ -574,6 +573,43 @@ return (error); } +/* + * Allocate "struct acl" instance. + */ +struct acl * +acl_alloc(void) +{ + struct acl *aclp; + + aclp = uma_zalloc(acl_zone, M_WAITOK | M_ZERO); + aclp->acl_magic = ACL_MAGIC; + aclp->acl_length = ACL_MAX_ENTRIES; + aclp->acl_cnt = 0; + + return (aclp); +} + +/* + * Free "struct acl". + */ +void +acl_free(struct acl *aclp) +{ + uma_zfree(acl_zone, aclp); +} + +/* + * Return the size, in bytes, required to store ACL with "cnt" entries. + */ +int +acl_size_for_cnt(int cnt) +{ + int size = sizeof(struct acl) - (ACL_MAX_ENTRIES - cnt) * + sizeof(struct acl_entry); + + return size; +} + /* ARGUSED */ static void ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#19 (text+ko) ==== @@ -238,11 +238,6 @@ #define ACL_TEXT_NUMERIC_IDS 0x02 #define ACL_TEXT_APPEND_ID 0x04 -#ifdef _KERNEL - -extern uma_zone_t acl_zone; - -#endif /* * POSIX.1e ACLs are capable of expressing the read, write, and execute bits * of the POSIX mode field. We provide two masks: one that defines the bits @@ -282,6 +277,9 @@ int acl_posix1e_check(struct acl *acl); int acl_nfs4_check(const struct acl *aclp, int is_directory); +struct acl *acl_alloc(void); +void acl_free(struct acl *aclp); +int acl_size_for_cnt(int cnt); #else /* !_KERNEL */ /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#12 (text+ko) ==== @@ -344,7 +344,7 @@ else type = ACL_TYPE_ACCESS; - acl = uma_zalloc(acl_zone, M_WAITOK); + acl = acl_alloc(); error = VOP_GETACL(vp, type, acl, ap->a_cred, ap->a_td); switch (error) { @@ -373,7 +373,7 @@ error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid, ap->a_mode, ap->a_cred, NULL); } - uma_zfree(acl_zone, acl); + acl_free(acl); } else #endif /* !UFS_ACL */ error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid, @@ -659,7 +659,7 @@ int error; struct acl *aclp; - aclp = uma_zalloc(acl_zone, M_WAITOK); + aclp = acl_alloc(); error = VOP_GETACL(vp, ACL_TYPE_NFS4, aclp, cred, td); /* @@ -676,7 +676,7 @@ error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, td); out: - uma_zfree(acl_zone, aclp); + acl_free(aclp); return (error); } @@ -1428,8 +1428,8 @@ int error; struct acl *parent_aclp, *child_aclp; - parent_aclp = uma_zalloc(acl_zone, M_WAITOK); - child_aclp = uma_zalloc(acl_zone, M_WAITOK | M_ZERO); + parent_aclp = acl_alloc(); + child_aclp = acl_alloc(); error = VOP_GETACL(parentvp, ACL_TYPE_NFS4, parent_aclp, cred, td); if (error) @@ -1445,8 +1445,8 @@ goto out; out: - uma_zfree(acl_zone, parent_aclp); - uma_zfree(acl_zone, child_aclp); + acl_free(parent_aclp); + acl_free(child_aclp); return (error); } @@ -1564,8 +1564,8 @@ #ifdef UFS_ACL acl = dacl = NULL; if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) { - acl = uma_zalloc(acl_zone, M_WAITOK); - dacl = uma_zalloc(acl_zone, M_WAITOK); + acl = acl_alloc(); + dacl = acl_alloc(); /* * Retrieve default ACL from parent, if any. @@ -1595,16 +1595,16 @@ */ ip->i_mode = dmode; DIP_SET(ip, i_mode, dmode); - uma_zfree(acl_zone, acl); - uma_zfree(acl_zone, dacl); + acl_free(acl); + acl_free(dacl); dacl = acl = NULL; break; default: UFS_VFREE(tvp, ip->i_number, dmode); vput(tvp); - uma_zfree(acl_zone, acl); - uma_zfree(acl_zone, dacl); + acl_free(acl); + acl_free(dacl); return (error); } } else { @@ -1674,13 +1674,13 @@ break; default: - uma_zfree(acl_zone, acl); - uma_zfree(acl_zone, dacl); + acl_free(acl); + acl_free(dacl); dacl = acl = NULL; goto bad; } - uma_zfree(acl_zone, acl); - uma_zfree(acl_zone, dacl); + acl_free(acl); + acl_free(dacl); dacl = acl = NULL; } @@ -1753,9 +1753,9 @@ } else { #ifdef UFS_ACL if (acl != NULL) - uma_zfree(acl_zone, acl); + acl_free(acl); if (dacl != NULL) - uma_zfree(acl_zone, dacl); + acl_free(dacl); #endif dp->i_effnlink--; dp->i_nlink--; @@ -2401,7 +2401,7 @@ #ifdef UFS_ACL acl = NULL; if ((dvp->v_mount->mnt_flag & MNT_ACLS) != 0) { - acl = uma_zalloc(acl_zone, M_WAITOK); + acl = acl_alloc(); /* * Retrieve default ACL for parent, if any. @@ -2436,14 +2436,14 @@ */ ip->i_mode = mode; DIP_SET(ip, i_mode, mode); - uma_zfree(acl_zone, acl); + acl_free(acl); acl = NULL; break; default: UFS_VFREE(tvp, ip->i_number, mode); vput(tvp); - uma_zfree(acl_zone, acl); + acl_free(acl); acl = NULL; return (error); } @@ -2509,10 +2509,10 @@ break; default: - uma_zfree(acl_zone, acl); + acl_free(acl); goto bad; } - uma_zfree(acl_zone, acl); + acl_free(acl); } if (dvp->v_mount->mnt_flag & MNT_NFS4ACLS) { From owner-p4-projects@FreeBSD.ORG Mon Aug 11 23:53:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32A8E1065675; Mon, 11 Aug 2008 23:53:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB0631065672 for ; Mon, 11 Aug 2008 23:53:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8D8A8FC14 for ; Mon, 11 Aug 2008 23:53:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7BNrDL7001018 for ; Mon, 11 Aug 2008 23:53:13 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7BNrDLU001016 for perforce@freebsd.org; Mon, 11 Aug 2008 23:53:13 GMT (envelope-from trasz@freebsd.org) Date: Mon, 11 Aug 2008 23:53:13 GMT Message-Id: <200808112353.m7BNrDLU001016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2008 23:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=147193 Change 147193 by trasz@trasz_traszkan on 2008/08/11 23:52:39 Add comment about _ACL_T_ALIGNMENT_BITS. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#20 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#20 (text+ko) ==== @@ -54,6 +54,9 @@ * With 204 entries, "struct acl" is exactly one page big. * Note that with NFS4 ACLs, the maximum number of ACL entries one * may set on file or directory is about half of ACL_MAX_ENTRIES. + * + * If you increase this, you might also need to increase + * _ACL_T_ALIGNMENT_BITS in lib/libc/posix1e/acl_support.h. */ #define ACL_MAX_ENTRIES 204 From owner-p4-projects@FreeBSD.ORG Tue Aug 12 00:27:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51D45106566C; Tue, 12 Aug 2008 00:27:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 158131065760 for ; Tue, 12 Aug 2008 00:27:50 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 029088FC18 for ; Tue, 12 Aug 2008 00:27:50 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7C0RnJo006232 for ; Tue, 12 Aug 2008 00:27:49 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7C0RnQ5006230 for perforce@freebsd.org; Tue, 12 Aug 2008 00:27:49 GMT (envelope-from csjp@freebsd.org) Date: Tue, 12 Aug 2008 00:27:49 GMT Message-Id: <200808120027.m7C0RnQ5006230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2008 00:27:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147195 Change 147195 by csjp@ibm01 on 2008/08/12 00:27:25 Drop a Phoenix Down on to mac_chkexec and revive it from an unconscious state. This allows it to build. More goodies to follow. Submitted by: Samy Al Bahra Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#19 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -60,10 +61,11 @@ #include +#include + #include -#include +#include "mac_chkexec.h" -#include /* * Prototypes @@ -79,12 +81,12 @@ static int mac_chkexec_set_vcsum(struct vnode *, struct mac_vcsum *); static int mac_chkexec_check(struct vnode *, struct ucred *); -static int mac_chkexec_check_vnode_exec(struct ucred *, +static int mac_chkexec_vnode_check_exec(struct ucred *, struct vnode *, struct label *, struct image_params *, struct label *); -static int mac_chkexec_check_vnode_mmap(struct ucred *, +static int mac_chkexec_vnode_check_mmap(struct ucred *, struct vnode *, struct label *, int, int); -static int mac_chkexec_check_kld_load(struct ucred *, +static int mac_chkexec_kld_check_load(struct ucred *, struct vnode *, struct label *); static int mac_chkexec_vpcmp(struct vcache *, struct vcache *); @@ -655,7 +657,7 @@ } static int -mac_chkexec_check_vnode_exec(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, struct label *execlabel) { @@ -669,7 +671,7 @@ } static int -mac_chkexec_check_vnode_mmap(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_mmap(struct ucred *cred, struct vnode *vp, struct label *label, int prot, int flags) { int error; @@ -687,7 +689,7 @@ } static int -mac_chkexec_check_kld_load(struct ucred *cred, struct vnode *vp, +mac_chkexec_kld_check_load(struct ucred *cred, struct vnode *vp, struct label *vlabel) { int error; @@ -706,7 +708,7 @@ * with this inode. */ static int -mac_chkexec_check_vnode_open(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_open(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int acc_mode) { @@ -720,7 +722,7 @@ } static int -mac_chkexec_check_vnode_delete(struct ucred *cred, struct vnode *dvp, +mac_chkexec_vnode_check_unlink(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) { @@ -743,7 +745,7 @@ * If the checksums do not match, deny access. */ static int -mac_chkexec_check_vnode_access(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) { int error; @@ -763,7 +765,7 @@ * with storing the checksums, deny access. */ static int -mac_chkexec_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_setextattr(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int attrnamespace, const char *name, struct uio *uio) { @@ -781,7 +783,7 @@ } static int -mac_chkexec_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp, +mac_chkexec_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name) { @@ -798,7 +800,7 @@ } static int -mac_chkexec_check_vnode_write(struct ucred *cred, struct ucred *fcred, +mac_chkexec_vnode_check_write(struct ucred *cred, struct ucred *fcred, struct vnode *vp, struct label *label) { @@ -866,15 +868,15 @@ { .mpo_init = mac_chkexec_init, .mpo_destroy = mac_chkexec_destroy, - .mpo_check_vnode_exec = mac_chkexec_check_vnode_exec, - .mpo_check_vnode_mmap = mac_chkexec_check_vnode_mmap, - .mpo_check_kld_load = mac_chkexec_check_kld_load, - .mpo_check_vnode_open = mac_chkexec_check_vnode_open, - .mpo_check_vnode_delete = mac_chkexec_check_vnode_delete, - .mpo_check_vnode_access = mac_chkexec_check_vnode_access, - .mpo_check_vnode_deleteextattr = mac_chkexec_check_vnode_deleteextattr, - .mpo_check_vnode_setextattr = mac_chkexec_check_vnode_setextattr, - .mpo_check_vnode_write = mac_chkexec_check_vnode_write, + .mpo_vnode_check_exec = mac_chkexec_vnode_check_exec, + .mpo_vnode_check_mmap = mac_chkexec_vnode_check_mmap, + .mpo_kld_check_load = mac_chkexec_kld_check_load, + .mpo_vnode_check_open = mac_chkexec_vnode_check_open, + .mpo_vnode_check_unlink = mac_chkexec_vnode_check_unlink, + .mpo_vnode_check_access = mac_chkexec_vnode_check_access, + .mpo_vnode_check_deleteextattr = mac_chkexec_vnode_check_deleteextattr, + .mpo_vnode_check_setextattr = mac_chkexec_vnode_check_setextattr, + .mpo_vnode_check_write = mac_chkexec_vnode_check_write, .mpo_syscall = mac_chkexec_syscall, }; From owner-p4-projects@FreeBSD.ORG Tue Aug 12 05:24:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFCEB1065672; Tue, 12 Aug 2008 05:24:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93B7C1065681 for ; Tue, 12 Aug 2008 05:24:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7CD9A8FC14 for ; Tue, 12 Aug 2008 05:24:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7C5OqlI055796 for ; Tue, 12 Aug 2008 05:24:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7C5OpWT055790 for perforce@freebsd.org; Tue, 12 Aug 2008 05:24:51 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 12 Aug 2008 05:24:51 GMT Message-Id: <200808120524.m7C5OpWT055790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147208 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2008 05:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=147208 Change 147208 by pgj@disznohal on 2008/08/12 05:24:41 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#12 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#13 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#5 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#10 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/bz.key#2 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/community/irc.sgml#9 integrate .. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#6 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#11 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ + - Key fingerprint = 5E31 F886 E2EE BA7E 2AA5 DDD4 21C5 0916 0E4A 7875 -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -sub 1024g/6139751B 2000-02-04 +pub 1024D/3CCF1842 2007-02-20 + Key fingerprint = 1400 3F19 8FEF A3E7 7207 EE8D 2B58 B8F8 3CCF 1842 +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +sub 4096g/F36BDC5D 2007-02-20 ]]> ==== //depot/projects/docproj_hu/www/hu/administration.sgml#9 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_hu/www/hu/community/irc.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> ==== //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> ==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#6 (text+ko) ==== @@ -1,7 +1,7 @@ - + + @@ -35,56 +35,65 @@ Óýíïøç - LPD óýóôçìá spooling - åêôõðþóåéò + LPD spooling system + printing - Ôï FreeBSD ìðïñåß íá ÷ñçóéìïðïéçèåß ãéá íá åêôõðþóåé óå ìéá åõñåßá ãêÜìá åêôõðùôþí, áðü ôïí - ðáëáéüôåñï êñïõóôéêü ùò ôïí ðëÝïí ôåëåõôáßï laser åêôõðùôÞ, êáé ïôéäÞðïôå - åíäéÜìåóá, åðéôñÝðïíôáò óáò íá ðáñÜãåôå åêôõðþóåéò õøçëÞò ðïéüôçôáò áðü ôéò + Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôï &os; ãéá íá êÜíåôå åêôõðþóåéò + óå äéÜöïñïõò ôýðïõò åêôõðùôþí, áðü ôïí ðáëáéüôåñï êñïõóôéêü ùò ôïí ðéï + óýã÷ñïíï laser åêôõðùôÞ, êáèþò êáé ïðïéáóäÞðïôå Üëëçò ôå÷íïëïãßáò + áíÜìåóá ôïõò, êáé íá äçìéïõñãÞóåôå åêôõðþóåéò õøçëÞò ðïéüôçôáò ìå ôéò åöáñìïãÝò ðïõ åêôåëåßôå. - Ôï FreeBSD ìðïñåß åðßóçò íá ñõèìéóôåß íá äñá ùò åîõðçñåôçôÞò åêôõðþóåùí óå Ýíá - äßêôõï; ìå áõôÞ ôç äõíáôüôçôá ôï FreeBSD ìðïñåß íá ëÜâåé åñãáóßåò åêôýðùóçò áðü äéÜöïñïõò - Üëëïõò õðïëïãéóôÝò, óõìðåñéëáìâáíïìÝíùí õðïëïãéóôþí FreeBSD, &windows; êáé &macos;. - Ôï FreeBSD ìðïñåß íá åîáóöáëßóåé üôé ìüíï ìéá åñãáóßá èá ôõðþíåôáé êÜèå ÷ñïíéêÞ óôéãìÞ êáé ìðïñåß - íá ôçñåß óôáôéóôéêÜ ãéá ôï ðïéïé ÷ñÞóôåò êáé ìç÷áíÞìáôá êÜíïõí ôéò ðåñéóóüôåñåò åêôõðþóåéò, - íá ðáñÜãåé banner óåëßäåò ðïõ äåß÷íïõí óå ðïéïí áíÞêåé ç êÜèå åêôýðùóç, êáé ðïëëÜ Üëëá. - + Ôï &os; ìðïñåß åðßóçò íá ñõèìéóôåß þóôå íá ëåéôïõñãåß ùò + åîõðçñåôçôÞò åêôõðþóåùí äéêôýïõ. Ìå áõôÞ ôç äõíáôüôçôá ôï &os; ìðïñåß + íá ëáìâÜíåé åñãáóßåò åêôýðùóçò áðü äéÜöïñïõò Üëëïõò õðïëïãéóôÝò, + óõìðåñéëáìâáíïìÝíùí õðïëïãéóôþí &os;, &windows; êáé &macos;. Ôï &os; + ìðïñåß íá åîáóöáëßæåé üôé ìüíï ìéá åñãáóßá èá ôõðþíåôáé êÜèå ÷ñïíéêÞ + óôéãìÞ êáé ìðïñåß íá ôçñåß óôáôéóôéêÜ ãéá ôïõò ÷ñÞóôåò êáé ôá + ìç÷áíÞìáôá ðïõ èá êÜíïõí ôéò ðåñéóóüôåñåò åêôõðþóåéò, íá ðáñÜãåé + óåëßäåò banner ðïõ íá äåß÷íïõí óå ðïéüí áíÞêåé ç êÜèå + åêôýðùóç, êáé ðïëëÜ Üëëá. Áöïý äéáâÜóåôå áõôü ôï êåöÜëáéï èá îÝñåôå: - Ðùò íá ñõèìßóåôå ôïí print spooler ôïõ FreeBSD. + Ðùò íá ñõèìßóåôå ôçí ïõñÜ åêôõðþóåùí (print spooler) ôïõ + &os;. - Ðùò íá åãêáôáóôÞóåôå ößëôñá åêôýðùóçò, íá ÷åéñéóôåßôå åéäéêÝò åñãáóßåò åêôýðùóçò - äéáöïñåôéêÜ, óõìðåñéëáìâáíïìÝíïõ êáé ôçò ìåôáôñïðÞò åéóåñ÷üìåíùí êåéìÝíùí óå ìïñöÝò åêôýðùóçò - ðïõ åßíáé êáôáíïçôÝò áðü ôïõò åêôõðùôÝò óáò. + Ðùò íá åãêáèéóôÜôå ößëôñá åêôýðùóçò, íá ÷åéñßæåóôå + åéäéêÝò åñãáóßåò åêôýðùóçò (ð.÷. ôç ìåôáôñïðÞ + åéóåñ÷üìåíùí êåéìÝíùí óå ìïñöÝò åêôýðùóçò ðïõ åßíáé êáôáíïçôÝò áðü + ôïõò åêôõðùôÝò óáò). - Ðùò íá åíåñãïðïéÞóåôå, óåëßäåò ôýðïõ header Þ banner óôéò åêôõðþóåéò óáò. + Ðùò íá åíåñãïðïéÞóåôå óåëßäåò ôýðïõ êåöáëßäáò Þ banner óôéò + åêôõðþóåéò óáò. - Ðùò íá åêôõðþóåôå óå åêôõðùôÝò ðïõ åßíáé óõíäåäåìÝíïé óå Üëëïõò õðïëïãéóôÝò. + Ðùò íá åêôõðþíåôå óå åêôõðùôÝò ðïõ åßíáé óõíäåäåìÝíïé óå Üëëïõò + õðïëïãéóôÝò. - Ðùò íá ôõðþóåôå óå åêôõðùôÝò ðïõ åßíáé óõíäåäåìÝíïé áðåõèåßáò óôï - äßêôõï. + Ðùò íá åêôõðþíåôå óå åêôõðùôÝò ðïõ åßíáé óõíäåäåìÝíïé áðåõèåßáò + óôï äßêôõï. - Ðùò íá åëÝã÷åôå ôïõò ðåñéïñéóìïýò åêôýðùóçò, óõìðåñéëáìâáíïìÝíïõ êáé ôïõ ðåñéïñéóìïý ôïõ ìåãÝèïõò ôùí - åñãáóéþí åêôýðùóçò, êáé áðáãüñåõóç åêôõðþóåùí óå óõãêåêñéìÝíïõò ÷ñÞóôåò. + Ðùò íá åëÝã÷åôå ôïõò ðåñéïñéóìïýò åêôýðùóçò, óõìðåñéëáìâáíïìÝíùí + ôùí ðåñéïñéóìþí ìåãÝèïõò ôùí åñãáóéþí åêôýðùóçò, êáé ðùò íá + ðáñåìðïäßæåôå ôçí äõíáôüôçôá åêôýðùóçò óå óõãêåêñéìÝíïõò + ÷ñÞóôåò. - Ðùò íá êñáôÞóåôå óôáôéóôéêÜ ãéá ôïí åêôõðùôÞ, êáé óôïé÷åßá ãéá ôç ÷ñÞóç - ôïõ åêôõðùôÞ. + Ðùò íá êñáôÞóåôå óôáôéóôéêÜ ãéá ôïí åêôõðùôÞ, êáé êáôáãñáöÞ + ãéá ôç ÷ñÞóç ôïõ åêôõðùôÞ áðü êÜèå ÷ñÞóôç. @@ -96,907 +105,957 @@ - Íá ãíùñßæåôå ðùò íá ñõèìßóåôå êáé íá åãêáôáóôÞóåôå Ýíá íÝï ðõñÞíá - (). + Íá ãíùñßæåôå ðùò íá ñõèìßóåôå êáé íá åãêáôáóôÞóåôå Ýíá íÝï + ðõñÞíá (). - Introduction + ÅéóáãùãÞ - In order to use printers with FreeBSD, you may set - them up to work with the Berkeley line printer spooling system, - also known as the LPD spooling system, - or just LPD. - It is the standard printer control system in FreeBSD. This - chapter introduces LPD and - will guide you through its configuration. + Ãéá íá ÷ñçóéìïðïéÞóåôå åêôõðùôÝò óôï &os;, èá ÷ñåéáóôåß íá + ñõèìßóåôå ôç ëåéôïõñãßá ôïõò ìå ôï óýóôçìá ðáñï÷Ýôåõóçò (spooling) + åêôõðùôþí ãñáììÞò ôïõ Berkeley, ãíùóôü åðßóçò êáé ùò óýóôçìá + ðáñï÷Ýôåõóçò LPD, Þ áðëÜ + LPD. Áõôü åßíáé ôï ðñïêáèïñéóìÝíï óýóôçìá + åëÝã÷ïõ åêôõðùôþí óôï &os;. Ôï êåöÜëáéï áõôü åßíáé ìéá åéóáãùãÞ óôï + LPD êáé èá óáò êáèïäçãÞóåé óôéò ñõèìßóåéò + ôïõ. - If you are already familiar with - LPD or another printer spooling - system, you may wish to skip to section Basic Setup. + ÅÜí óáò åßíáé ïéêåßï ôï LPD Þ êÜðïéï Üëëï + óýóôçìá ðáñï÷Ýôåõóçò åêôõðùôþí, ôüôå ìðïñåßôå íá ìåôáðçäÞóåôå óôçí + åíüôçôá ÂáóéêÞ ÅãêáôÜóôáóç. - LPD controls everything about a - host's printers. It is responsible for a number of things: + Ôï LPD ìðïñåß íá åëÝã÷åé åî' ïëïêëÞñïõ + üëåò ôéò ëåéôïõñãßåò ôùí åêôõðùôþí åíüò õðïëïãéóôÞ. Åßíáé êõñßùò + õðåýèõíï ãéá Ýíá ðëÞèïò ëåéôïõñãéþí: - It controls access to attached printers and printers - attached to other hosts on the network. + ÅëÝã÷åé ôçí ðñüóâáóç óå áðåõèåßáò óõíäåìÝíïõò åêôõðùôÝò êáé + åêôõðùôÝò ðñïóáñôçìÝíïõò óå Üëëïõò êüìâïõò óôï äßêôõï. - print jobs + åñãáóßåò åêôýðùóçò - It enables users to submit files to be printed; these - submissions are known as jobs. + ÅðéôñÝðåé óå ÷ñÞóôåò íá óôÝëíïõí áñ÷åßá ðñïò åêôýðùóç. Ïé + áðïóôïëÝò áõôÝò åßíáé ãíùóôÝò ùò + åñãáóßåò (jobs). - It prevents multiple users from accessing a printer at the - same time by maintaining a queue for each - printer. + Äéáôçñåß ïõñÜ áíáìïíÞò (queue) ãéá êÜèå + åêôõðùôÞ, þóôå íá ðñïëáìâÜíåé ôçí ôáõôü÷ñïíç ðñüóâáóç áðü ðïëëïýò + ÷ñÞóôåò. - It can print header pages (also known - as banner or burst - pages) so users can easily find jobs they have printed in a - stack of printouts. + Ìðïñåß íá åêôõðþíåé óåëßäåò êåöáëßäáò + (ãíùóôÝò åðßóçò ùò banner Þ + óåëßäåò burst) þóôå ïé ÷ñÞóôåò íá ìðïñïýí + åýêïëá íá îå÷ùñßóïõí ôéò åñãáóßåò ôïõò ìÝóá óôçí óôïßâá + åêôõðþóåùí. - It takes care of communications parameters for printers - connected on serial ports. + Öñïíôßæåé ãéá ôçí ïñèüôçôá ôùí ðáñáìÝôñùí åðéêïéíùíßáò ôùí + åêôõðùôþí ðïõ åßíáé óõíäåäåìÝíïé óå óåéñéáêÝò èýñåò. - It can send jobs over the network to a - LPD spooler on another host. + Ìðïñåß ìÝóù ôïõ äéêôýïõ íá óôåßëåé åñãáóßåò óå óýóôçìá + ðáñï÷Ýôåõóçò LPD äéáöïñåôéêïý + õðïëïãéóôÞ. - It can run special filters to format jobs to be printed for - various printer languages or printer capabilities. + Ìðïñåß íá åêôåëÝóåé äéÜöïñá ößëôñá ãéá íá ðñïóáñìüóåé åñãáóßåò + þóôå íá åßíáé äõíáôÞ ç åêôýðùóç ôïõò óå åêôõðùôÝò ðïõ ÷ñçóéìïðïéïýí + äéáöïñåôéêÝò ãëþóóåò Þ Ý÷ïõí äéáöïñåôéêÝò äõíáôüôçôåò. - It can account for printer usage. + Ìðïñåß íá êÜíåé êáôáìÝôñçóç ÷ñÞóçò ôïõ åêôõðùôÞ. - Through a configuration file - (/etc/printcap), and by providing the special - filter programs, you can enable the LPD - system to do all or some - subset of the above for a great variety of printer hardware. + ÌÝóù ôïõ áñ÷åßïõ ñýèìéóçò (/etc/printcap), + êáé ìå ôç âïÞèåéá åéäéêþí ðñïãñáììÜôùí ößëôñùí, ìðïñåßôå íá + åíåñãïðïéÞóåôå ôï óýóôçìá LPD íá êÜíåé üëåò + Þ êÜðïéåò áðü ôéò ðáñáðÜíù åñãáóßåò óå ìéá ìåãÜëç ãêÜìá óõóêåõþí + åêôýðùóçò. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 06:57:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 911C91065675; Thu, 14 Aug 2008 06:57:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5482A106566B for ; Thu, 14 Aug 2008 06:57:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FC538FC17 for ; Thu, 14 Aug 2008 06:57:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7E6vxo6026760 for ; Thu, 14 Aug 2008 06:57:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7E6vxHg026758 for perforce@freebsd.org; Thu, 14 Aug 2008 06:57:59 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 06:57:59 GMT Message-Id: <200808140657.m7E6vxHg026758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 06:57:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147364 Change 147364 by trasz@trasz_traszkan on 2008/08/14 06:57:08 Add tests for cp(1) and mv(1); misc fixes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/03.t#1 add .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#2 (text+ko) ==== @@ -40,7 +40,7 @@ fi cd / -umount $MNT +umount -f $MNT rmdir $MNT mdconfig -du $MD ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#2 (text+ko) ==== @@ -41,7 +41,7 @@ fi cd / -umount $MNT +umount -f $MNT rmdir $MNT mdconfig -du $MD ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#2 (text+ko) ==== @@ -1,5 +1,7 @@ # This is a tools-level test for NFS4 ACL functionality. Run it as root -# using ACL-enabled kernel. +# using ACL-enabled kernel: +# +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test # # WARNING: Creates files in unsafe way. @@ -55,6 +57,23 @@ > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow +# Test user and group name resolving. +$ rm xxx +$ touch xxx +$ setfacl -a2 u:root:write_acl:allow,g:daemon:read_acl:deny xxx +$ getfacl xxx +> # file: xxx +> # owner: root +> # group: wheel +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> user:root:-----------C--:------:allow +> group:daemon:----------c---:------:deny +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow + # Check whether ls correctly marks files with "+". $ ls -l xxx | cut -d' ' -f1 > -rw-r--r--+ ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#2 (text+ko) ==== @@ -1,5 +1,7 @@ # This is a tools-level test for POSIX.1e ACL functionality. Run it as root -# using ACL-enabled kernel. +# using ACL-enabled kernel: +# +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test # # WARNING: Creates files in unsafe way. From owner-p4-projects@FreeBSD.ORG Thu Aug 14 07:15:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 428C9106567E; Thu, 14 Aug 2008 07:15:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2104106567A for ; Thu, 14 Aug 2008 07:15:16 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD7ED8FC22 for ; Thu, 14 Aug 2008 07:15:16 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7E7FGLT029322 for ; Thu, 14 Aug 2008 07:15:16 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7E7FGFB029320 for perforce@freebsd.org; Thu, 14 Aug 2008 07:15:16 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 07:15:16 GMT Message-Id: <200808140715.m7E7FGFB029320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 07:15:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=147365 Change 147365 by trasz@trasz_traszkan on 2008/08/14 07:14:19 Misc fixes for tools-level tests. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/01.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/03.t#2 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#3 (text+ko) ==== @@ -10,7 +10,7 @@ # # Output should be obvious. -echo "1..1" +echo "1..4" if [ `whoami` != "root" ]; then echo "not ok 1 - you need to be root to run this test." @@ -29,14 +29,25 @@ exit 1 fi +echo "ok 1" + cd $MNT +# First, check whether we can crash the kernel by creating too many +# entries. For some reason this won't work in the test file. +touch xxx +setfacl -x5 xxx +while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +chmod 600 xxx +rm xxx +echo "ok 2" + $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null if [ $? -eq 0 ]; then - echo "ok 1" + echo "ok 3" else - echo "not ok 1" + echo "not ok 3" fi cd / @@ -44,3 +55,5 @@ rmdir $MNT mdconfig -du $MD +echo "ok 4" + ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/01.t#2 (text+ko) ==== @@ -12,7 +12,7 @@ # # Output should be obvious. -echo "1..1" +echo "1..4" if [ `whoami` != "root" ]; then echo "not ok 1 - you need to be root to run this test." @@ -30,14 +30,25 @@ exit 1 fi +echo "ok 1" + cd $MNT +# First, check whether we can crash the kernel by creating too many +# entries. For some reason this won't work in the test file. +touch xxx +setfacl -x5 xxx +while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +chmod 600 xxx +rm xxx +echo "ok 2" + $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null if [ $? -eq 0 ]; then - echo "ok 1" + echo "ok 3" else - echo "not ok 1" + echo "not ok 3" fi cd / @@ -45,3 +56,5 @@ rmdir $MNT mdconfig -du $MD +echo "ok 4" + ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#3 (text+ko) ==== @@ -11,7 +11,7 @@ # Output should be obvious. # -echo "1..1" +echo "1..4" if [ `whoami` != "root" ]; then echo "not ok 1 - you need to be root to run this test." @@ -30,14 +30,26 @@ exit 1 fi +echo "ok 1" + cd $MNT +# First, check whether we can crash the kernel by creating too many +# entries. For some reason this won't work in the test file. +touch xxx +i=0; +while :; do i=$(($i+1)); setfacl -m u:$i:rwx xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +chmod 600 xxx +rm xxx +echo "ok 2" + + $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null if [ $? -eq 0 ]; then - echo "ok 1" + echo "ok 3" else - echo "not ok 1" + echo "not ok 3" fi cd / @@ -45,3 +57,5 @@ rmdir $MNT mdconfig -du $MD +echo "ok 4" + ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/03.t#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # Output should be obvious. -echo "1..1" +echo "1..5" if [ `whoami` != "root" ]; then echo "not ok 1 - you need to be root to run this test." @@ -26,35 +26,40 @@ exit 1 fi +echo "ok 1" + MD2=`mdconfig -at swap -s 10m` MNT2=$MNTROOT/posix mkdir $MNT2 newfs /dev/$MD2 > /dev/null mount -o acls /dev/$MD2 $MNT2 if [ $? -ne 0 ]; then - echo "not ok 1 - mount failed." + echo "not ok 2 - mount failed." exit 1 fi +echo "ok 2" + MD3=`mdconfig -at swap -s 10m` MNT3=$MNTROOT/none mkdir $MNT3 newfs /dev/$MD3 > /dev/null mount /dev/$MD3 $MNT3 if [ $? -ne 0 ]; then - echo "not ok 1 - mount failed." + echo "not ok 3 - mount failed." exit 1 fi +echo "ok 3" cd $MNTROOT $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null if [ $? -eq 0 ]; then - echo "ok 1" + echo "ok 4" else - echo "not ok 1" + echo "not ok 4" fi cd / @@ -73,3 +78,5 @@ rmdir $MNTROOT +echo "ok 5" + ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#3 (text+ko) ==== @@ -177,13 +177,6 @@ > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow -# Time for the kernel part. Check whether we can crash -# the system using too many entries. -# XXX: This does not actually work. Find out why. -$ while :; do setfacl -a42 u:0:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done -$ chmod 600 xxx -$ setfacl -b xxx - # Check whether chmod actually does what it should do. $ rm xxx $ touch xxx From owner-p4-projects@FreeBSD.ORG Thu Aug 14 07:18:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DD111065679; Thu, 14 Aug 2008 07:18:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21D8B1065674 for ; Thu, 14 Aug 2008 07:18:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DC3D8FC0A for ; Thu, 14 Aug 2008 07:18:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7E7IJoV029576 for ; Thu, 14 Aug 2008 07:18:19 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7E7IJBw029574 for perforce@freebsd.org; Thu, 14 Aug 2008 07:18:19 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 07:18:19 GMT Message-Id: <200808140718.m7E7IJBw029574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 07:18:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147366 Change 147366 by trasz@trasz_traszkan on 2008/08/14 07:17:39 Add a comment about OLDACL_MAX_ENTRIES. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#21 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#21 (text+ko) ==== @@ -57,6 +57,10 @@ * * If you increase this, you might also need to increase * _ACL_T_ALIGNMENT_BITS in lib/libc/posix1e/acl_support.h. + * + * The maximum number of POSIX.1e ACLs is controlled + * by OLDACL_MAX_ENTRIES. Changing that one will break binary + * compatibility with userland and change on-disk ACL layout. */ #define ACL_MAX_ENTRIES 204 From owner-p4-projects@FreeBSD.ORG Thu Aug 14 07:42:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57E2B106567B; Thu, 14 Aug 2008 07:42:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BFDC1065677 for ; Thu, 14 Aug 2008 07:42:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 078068FC0C for ; Thu, 14 Aug 2008 07:42:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7E7giv6031566 for ; Thu, 14 Aug 2008 07:42:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7E7giGV031564 for perforce@freebsd.org; Thu, 14 Aug 2008 07:42:44 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 07:42:44 GMT Message-Id: <200808140742.m7E7giGV031564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 07:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=147367 Change 147367 by trasz@trasz_traszkan on 2008/08/14 07:42:03 Update setfacl(1) manual page and usage(). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#4 (text+ko) ==== @@ -33,11 +33,11 @@ .Nd set ACL information .Sh SYNOPSIS .Nm +.Op Fl bdhkn .Op Fl a Ar position entries -.Op Fl bdhkn .Op Fl m Ar entries .Op Fl M Ar file -.Op Fl x Ar entries +.Op Fl x Ar entries | position .Op Fl X Ar file .Op Ar .Sh DESCRIPTION @@ -57,7 +57,8 @@ specified in .Ar entries , starting at position -.Ar position . +.Ar position , +counting from zero. This option is only applicable to NFS4 ACLs. .It Fl b Remove all ACL entries except for the three required entries @@ -106,10 +107,14 @@ .It Fl n Do not recalculate the permissions associated with the ACL mask entry. This option is not applicable to NFS4 ACLs. -.It Fl x Ar entries -Remove the ACL entries specified in +.It Fl x Ar entries | position +If .Ar entries +is specified, remove the ACL entries specified there from the access or default ACL of the specified files. +Otherwise, remove entry at index +.Ar position , +counting from zero. .It Fl X Ar file Remove the ACL entries specified in the file .Ar file @@ -386,6 +391,11 @@ from .Pa file . .Pp +.Dl setfacl -x0 file +.Pp +Remove the first entry from the NFS4 ACL from +.Pa file . +.Pp .Dl setfacl -bn file .Pp Remove all ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#10 (text+ko) ==== @@ -102,8 +102,8 @@ usage(void) { - fprintf(stderr, "usage: setfacl [-bdhkn] [-m entries] [-M file] " - "[-x entries] [-X file] [file ...]\n"); + fprintf(stderr, "usage: setfacl [-bdhkn] [-a position entries] " + "[-m entries] [-M file] [-x entries] [-X file] [file ...]\n"); exit(1); } From owner-p4-projects@FreeBSD.ORG Thu Aug 14 07:49:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3B3E1065671; Thu, 14 Aug 2008 07:49:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D9FE1065678 for ; Thu, 14 Aug 2008 07:49:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3702D8FC17 for ; Thu, 14 Aug 2008 07:49:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7E7nuR1032080 for ; Thu, 14 Aug 2008 07:49:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7E7nqVq032076 for perforce@freebsd.org; Thu, 14 Aug 2008 07:49:52 GMT (envelope-from jb@freebsd.org) Date: Thu, 14 Aug 2008 07:49:52 GMT Message-Id: <200808140749.m7E7nqVq032076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 147368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 07:49:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147368 Change 147368 by jb@freebsd3 on 2008/08/14 07:49:12 IF7 Affected files ... .. //depot/projects/dtrace7/src/UPDATING#5 integrate .. //depot/projects/dtrace7/src/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/BUGS#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/FAQ#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/FREEBSD-vendstock#1 branch .. //depot/projects/dtrace7/src/contrib/cvs/HACKING#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/INSTALL#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/NEWS#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/README#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/TESTS#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/TODO#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/compile#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/config.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/configure.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/README#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/dtrace7/src/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/depcomp#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/diff/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/HACKING.DOCS#1 branch .. //depot/projects/dtrace7/src/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/mdate-sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/dtrace7/src/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/install-sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/dtrace7/src/contrib/cvs/lib/xsize.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/missing#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/mkinstalldirs#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/add.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/client.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/client.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/history.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/history.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/import.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/log.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/login.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/main.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/parseinfo.c#3 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/release.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/root.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/root.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/run.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/server.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/server.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/status.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/update.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/version.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/cvs/tools/README#2 integrate .. //depot/projects/dtrace7/src/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/dtrace7/src/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sysctl#3 integrate .. //depot/projects/dtrace7/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/dtrace7/src/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/Makefile#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive.h#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/archive.h.in#4 delete .. //depot/projects/dtrace7/src/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_link_resolver.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_private.h#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_entry_strmode.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_compression_program.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_disk.3#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_pax.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/cpio.5#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/filter_fork.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/tar.5#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/main.c#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test.h#4 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_acl_pax.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_archive_api_feature.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_link_resolver.c#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_pax_filename_encoding.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_extract.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_mtree.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_tar_empty_filename.c#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_zip.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_tar_large.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_ustar_filenames.c#1 branch .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_hardlink.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_disk_secure.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_cpio_odc.c#2 integrate .. //depot/projects/dtrace7/src/lib/libarchive/test/test_write_format_tar_ustar.c#1 branch .. //depot/projects/dtrace7/src/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/dtrace7/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/getenv.c#3 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/cpuset.2#1 branch .. //depot/projects/dtrace7/src/lib/libc/sys/cpuset_getaffinity.2#1 branch .. //depot/projects/dtrace7/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/setfib.2#1 branch .. //depot/projects/dtrace7/src/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/dtrace7/src/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/dtrace7/src/lib/libthr/thread/thr_condattr.c#2 integrate .. //depot/projects/dtrace7/src/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/dtrace7/src/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/dtrace7/src/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/dtrace7/src/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/dtrace7/src/sbin/mksnap_ffs/mksnap_ffs.8#2 integrate .. //depot/projects/dtrace7/src/sbin/ping6/ping6.8#2 integrate .. //depot/projects/dtrace7/src/sbin/ping6/ping6.c#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/ahc.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/miibus.4#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/xl.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/tmpfs.5#2 integrate .. //depot/projects/dtrace7/src/share/man/man9/Makefile#5 integrate .. //depot/projects/dtrace7/src/share/man/man9/rwlock.9#3 integrate .. //depot/projects/dtrace7/src/share/man/man9/zone.9#2 integrate .. //depot/projects/dtrace7/src/share/syscons/keymaps/fr.macbook.acc.kbd#2 integrate .. //depot/projects/dtrace7/src/sys/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/dtrace7/src/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/dtrace7/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/dtrace7/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/dtrace7/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/dtrace7/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/dtrace7/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/exception.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/dtrace7/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/include/machdep.h#2 integrate .. //depot/projects/dtrace7/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/dtrace7/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/files.ep80219#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/files.i80219#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/files.i80321#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/files.iq31244#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i80321/obio_space.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/files.i81342#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/i8134x/obio_space.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate .. //depot/projects/dtrace7/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/dtrace7/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#3 integrate .. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/dtrace7/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/dtrace7/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/dtrace7/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/dtrace7/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/dtrace7/src/sys/conf/NOTES#9 integrate .. //depot/projects/dtrace7/src/sys/conf/files#16 integrate .. //depot/projects/dtrace7/src/sys/conf/files.arm#3 integrate .. //depot/projects/dtrace7/src/sys/conf/options#7 integrate .. //depot/projects/dtrace7/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/dtrace7/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/dtrace7/src/sys/contrib/rdma/core_priv.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_addr.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_cache.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_fmr_pool.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_mad.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_marshall.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_pack.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_sa.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_smi.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_umem.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_user_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_user_mad.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_user_sa.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_user_verbs.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/ib_verbs.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/iw_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/krping/getopt.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/krping/getopt.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/krping/krping.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/krping/krping.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/krping/krping_dev.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_addr.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_cache.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_cm_ib.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_cma.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_device.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_iwcm.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_user_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/rdma_verbs.c#1 branch .. //depot/projects/dtrace7/src/sys/contrib/rdma/types.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/age/if_age.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/dtrace7/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/dtrace7/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_user.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_wr.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/LICENSE#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/README#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_api.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_api.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/if_em.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/if_em.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/if_igb.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/e1000/if_igb.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/em/LICENSE#3 delete .. //depot/projects/dtrace7/src/sys/dev/em/README#2 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_80003es2lan.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82540.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82541.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82542.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82543.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_82571.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_api.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_defines.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_hw.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_ich8lan.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_mac.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_manage.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_nvm.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_osdep.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_osdep.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.c#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_phy.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/e1000_regs.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/em/if_em.c#5 delete .. //depot/projects/dtrace7/src/sys/dev/em/if_em.h#4 delete .. //depot/projects/dtrace7/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_82575.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_82575.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_api.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_api.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_defines.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_hw.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_mac.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_mac.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_manage.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_manage.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_osdep.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_osdep.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_phy.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_phy.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/e1000_regs.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/if_igb.c#2 delete .. //depot/projects/dtrace7/src/sys/dev/igb/if_igb.h#2 delete .. //depot/projects/dtrace7/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/LICENSE#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/dtrace7/src/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/dtrace7/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/dtrace7/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/dtrace7/src/sys/gdb/gdb_cons.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_if.m#3 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_pc98.c#2 integrate .. //depot/projects/dtrace7/src/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/dtrace7/src/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/dtrace7/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/gnu/fs/ext2fs/inode.h#2 integrate .. //depot/projects/dtrace7/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/locore.s#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/dtrace7/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/dtrace7/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/dtrace7/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/dtrace7/src/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/dtrace7/src/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/dtrace7/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/dtrace7/src/sys/kern/init_main.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_conf.c#7 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_event.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#7 integrate .. //depot/projects/dtrace7/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_blist.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/dtrace7/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_cons.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/tty_tty.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_hash.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/dtrace7/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#17 integrate .. //depot/projects/dtrace7/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/cxgb/iw_cxgb/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/dtrace7/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/mem/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/dtrace7/src/sys/modules/rdma/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/rdma/addr/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/rdma/cma/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/rdma/core/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/rdma/iwcm/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/rdma/krping/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/net/bpf.c#5 integrate .. //depot/projects/dtrace7/src/sys/net/if.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/if.h#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/dtrace7/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_gif.c#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_gif.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_gre.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_gre.h#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/dtrace7/src/sys/net/if_stf.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/if_var.h#3 integrate .. //depot/projects/dtrace7/src/sys/net/if_vlan.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/netisr.c#2 integrate .. //depot/projects/dtrace7/src/sys/net/route.c#4 integrate .. //depot/projects/dtrace7/src/sys/net/route.h#3 integrate .. //depot/projects/dtrace7/src/sys/net/rtsock.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/dtrace7/src/sys/netatalk/at_proto.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatm/sigpvc/sigpvc_if.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatm/spans/spans_if.c#2 integrate .. //depot/projects/dtrace7/src/sys/netatm/uni/uni_load.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/if_atm.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_var.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp.h#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_lro.c#1 branch .. //depot/projects/dtrace7/src/sys/netinet/tcp_lro.h#1 branch .. //depot/projects/dtrace7/src/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/dtrace7/src/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/dtrace7/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/dtrace7/src/sys/netinet/toedev.h#1 branch .. //depot/projects/dtrace7/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/dtrace7/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/dtrace7/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/dtrace7/src/sys/netipx/ipx_proto.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/dtrace7/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/dtrace7/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm.h#2 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm_advlock.c#1 branch .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot.h#2 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/dtrace7/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/dtrace7/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/pci/agp_i810.c#4 integrate .. //depot/projects/dtrace7/src/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/dtrace7/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/if_wb.c#2 integrate .. //depot/projects/dtrace7/src/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/dtrace7/src/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/clnt.h#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/dtrace7/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/dtrace7/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit.h#4 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/dtrace7/src/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/dtrace7/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/dtrace7/src/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/dtrace7/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/dtrace7/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/dtrace7/src/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/dtrace7/src/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/_types.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/apm.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/blist.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/cpuset.h#1 branch .. //depot/projects/dtrace7/src/sys/sys/domain.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/event.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/imgact.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/jail.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/lockf.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/module.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/param.h#10 integrate .. //depot/projects/dtrace7/src/sys/sys/priv.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/proc.h#8 integrate .. //depot/projects/dtrace7/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sched.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sockbuf.h#1 branch .. //depot/projects/dtrace7/src/sys/sys/socket.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/sockio.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/sockopt.h#1 branch .. //depot/projects/dtrace7/src/sys/sys/sockstate.h#1 branch .. //depot/projects/dtrace7/src/sys/sys/syscall.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/dtrace7/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/dtrace7/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/dtrace7/src/sys/sys/types.h#3 integrate .. //depot/projects/dtrace7/src/sys/sys/vnode.h#4 integrate .. //depot/projects/dtrace7/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/dtrace7/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_init.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/dtrace7/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/dtrace7/src/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/dtrace7/src/tools/regression/file/flock/flock.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/Makefile#4 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/io.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/dtrace7/src/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/dtrace7/src/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/gzip/unbzip2.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/gzip/znew#2 integrate .. //depot/projects/dtrace7/src/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/dtrace7/src/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/dtrace7/src/usr.bin/ktrace/ktrace.1#2 integrate .. //depot/projects/dtrace7/src/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/dtrace7/src/usr.bin/ktrace/subr.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/netstat/route.c#4 integrate .. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.1#4 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/Makefile#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/matching.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/read.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/siginfo.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/subst.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/config.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/main.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-acl.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-basic.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-deep-dir.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-flags.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-nodump.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-overwrite.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test-utf8.sh#2 delete .. //depot/projects/dtrace7/src/usr.bin/tar/test/test.h#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_0.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_basic.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_copy.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_getdate.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_help.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_option_T.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_patterns.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_stdio.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/test/test_version.c#1 branch .. //depot/projects/dtrace7/src/usr.bin/tar/util.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/truss/extern.h#3 integrate .. //depot/projects/dtrace7/src/usr.bin/truss/main.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/truss/syscall.h#2 integrate .. //depot/projects/dtrace7/src/usr.bin/truss/syscalls.c#2 integrate .. //depot/projects/dtrace7/src/usr.bin/units/units.lib#2 integrate .. //depot/projects/dtrace7/src/usr.bin/window/:tt#2 delete .. //depot/projects/dtrace7/src/usr.bin/window/:tty#2 delete .. //depot/projects/dtrace7/src/usr.bin/window/:var#2 delete .. //depot/projects/dtrace7/src/usr.bin/window/:ww#2 delete .. //depot/projects/dtrace7/src/usr.bin/yacc/skeleton.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/Makefile#3 integrate .. //depot/projects/dtrace7/src/usr.sbin/config/config.y#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/config/lang.l#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/cron/cron/cron.8#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/cron/cron/cron.h#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/cron/cron/do_command.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pw/pw_user.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/pw/pwupd.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/dtrace7/src/usr.sbin/rpc.statd/file.c#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/setfib/Makefile#1 branch .. //depot/projects/dtrace7/src/usr.sbin/setfib/setfib.1#1 branch .. //depot/projects/dtrace7/src/usr.sbin/setfib/setfib.c#1 branch .. //depot/projects/dtrace7/src/usr.sbin/sysinstall/package.c#2 integrate Differences ... ==== //depot/projects/dtrace7/src/UPDATING#5 (text+ko) ==== @@ -1,4 +1,4 @@ -Updating Information for FreeBSD current users +Updating Information for FreeBSD STABLE users This file is maintained and copyrighted by M. Warner Losh . See end of file for further details. For commonly @@ -8,6 +8,41 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. +20080811: + Today STABLE got a reorganization of the Intel E1000 + driver code. In order to better support our new adapters + there is a new driver, igb, that is now to be used for + either the 82575 or 82576 adapters. The source however, + is all now in sys/dev/e1000, both em and igb drivers are + built from that common directory if you configure them + in the kernel. Making loadable drivers still happens in + the same place: sys/modules/[em, igb]. + + The important thing to note is that the 82575 adapters + were supported in the em driver in 7.0, but now needed + to be moved into igb, so if you have the effected cards + be sure and make any script changes to follow the name >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 10:41:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24ABC1065677; Thu, 14 Aug 2008 10:41:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCBC2106566C for ; Thu, 14 Aug 2008 10:41:49 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8EF18FC1E for ; Thu, 14 Aug 2008 10:41:49 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EAfnBJ058472 for ; Thu, 14 Aug 2008 10:41:49 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EAfnts058470 for perforce@freebsd.org; Thu, 14 Aug 2008 10:41:49 GMT (envelope-from snb@FreeBSD.org) Date: Thu, 14 Aug 2008 10:41:49 GMT Message-Id: <200808141041.m7EAfnts058470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 10:41:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147371 Change 147371 by snb@snb_toro on 2008/08/14 10:40:58 Replaces expanded $FreeBSD$ keywords so my diffs against svn are less cluttered. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#4 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#10 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ufs/ufs/dirhash.h,v 1.6 2008/04/11 09:48:12 jeff Exp $ + * $FreeBSD$ */ #ifndef _UFS_UFS_DIRHASH_H_ ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.24 2008/04/11 09:48:12 jeff Exp $"); +__FBSDID("$FreeBSD$"); #include "opt_ufs.h" From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:25:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64F24106567C; Thu, 14 Aug 2008 12:25:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28B121065676 for ; Thu, 14 Aug 2008 12:25:40 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF13F8FC15 for ; Thu, 14 Aug 2008 12:25:39 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ECPd5M069093 for ; Thu, 14 Aug 2008 12:25:39 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ECPdhD069091 for perforce@freebsd.org; Thu, 14 Aug 2008 12:25:39 GMT (envelope-from snb@FreeBSD.org) Date: Thu, 14 Aug 2008 12:25:39 GMT Message-Id: <200808141225.m7ECPdhD069091@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 12:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=147372 Change 147372 by snb@snb_toro on 2008/08/14 12:25:05 Branch from freebsd_7 so I can have a 7-STABLE version of the new dirhash code, too. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/dirhash.h#1 branch .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/ufs_dirhash.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:53:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C24A1065678; Thu, 14 Aug 2008 12:53:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3C721065673 for ; Thu, 14 Aug 2008 12:53:07 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE4AA8FC08 for ; Thu, 14 Aug 2008 12:53:07 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ECr7BV080554 for ; Thu, 14 Aug 2008 12:53:07 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ECr7J5080552 for perforce@freebsd.org; Thu, 14 Aug 2008 12:53:07 GMT (envelope-from strauss@FreeBSD.org) Date: Thu, 14 Aug 2008 12:53:07 GMT Message-Id: <200808141253.m7ECr7J5080552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147374 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 12:53:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147374 Change 147374 by strauss@strauss_marvelman on 2008/08/14 12:52:47 - Fix: Finishing an entry did write the CRC-32 in the wrong descriptor (only occured on archives with multiple entries). - Change: The order of entries in the central directory is no longer reversed (this is allowed according to the specification but can cause confusion). - A lot more tests, added test for folder entry. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/TODO#15 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#36 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#12 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/TODO#15 (text+ko) ==== @@ -1,6 +1,8 @@ To Be Done ========== +- Fix compiler warnings (also in checks) +- Consider switching to 0x000d extension - Consider portability of code to other operating systems - Test for memory leaks again (ask Tim) - Update ZIP writer in docs ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#36 (text+ko) ==== @@ -153,6 +153,7 @@ struct zip { struct zip_data_descriptor data_descriptor; struct zip_file_header_link *central_directory; + struct zip_file_header_link *central_directory_end; off_t offset; size_t written_bytes; }; @@ -184,6 +185,7 @@ return (ARCHIVE_FATAL); } zip->central_directory = NULL; + zip->central_directory_end = NULL; zip->offset = 0; zip->written_bytes = 0; a->format_data = zip; @@ -229,9 +231,7 @@ d = &zip->data_descriptor; size = archive_entry_size(entry); - /* Append archive entry to the central directory data. - * Storing in reverse order, for ease of coding. - * According to specification order should not matter, right? */ + /* Append archive entry to the central directory data. */ l = (struct zip_file_header_link *) malloc(sizeof(*l)); if (l == NULL) { archive_set_error(&a->archive, ENOMEM, "Can't allocate zip header data"); @@ -239,8 +239,13 @@ } l->entry = archive_entry_clone(entry); l->crc32 = crc32(0, NULL, 0); - l->next = zip->central_directory; - zip->central_directory = l; + l->next = NULL; + if (zip->central_directory == NULL) { + zip->central_directory = l; + } else { + zip->central_directory_end->next = l; + } + zip->central_directory_end = l; /* Store the offset of this header for later use in central directory. */ l->offset = zip->written_bytes; @@ -303,7 +308,7 @@ { int ret; struct zip *zip = a->format_data; - struct zip_file_header_link *l = zip->central_directory; + struct zip_file_header_link *l = zip->central_directory_end; ret = (a->compressor.write)(a, buff, s); if (ret >= 0) { @@ -323,7 +328,7 @@ int ret; struct zip *zip = a->format_data; struct zip_data_descriptor *d = &zip->data_descriptor; - struct zip_file_header_link *l = zip->central_directory; + struct zip_file_header_link *l = zip->central_directory_end; zip_encode(l->crc32, &d->crc32, sizeof(d->crc32)); @@ -369,7 +374,8 @@ entries = 0; offset_start = zip->written_bytes; - /* Formatting individual header fields per entry. */ + /* Formatting individual header fields per entry and + * writing each entry. */ while (l != NULL) { size = archive_entry_size(l->entry); ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip_no_compression.c#12 (text+ko) ==== @@ -33,28 +33,38 @@ DEFINE_TEST(test_write_format_zip_no_compression) { + /* Buffer data */ struct archive *a; struct archive_entry *entry; char buff[100000]; - const char *p, *q, *buffend; + const char *buffend; + /* p is the pointer to walk over the central directory, + * q walks over the local headers, the data and the data descriptors. */ + const char *p, *q; size_t used; - int crc; /* File data */ char file_name[] = "file"; char file_data1[] = {'1', '2', '3', '4', '5'}; char file_data2[] = {'6', '7', '8', '9', '0'}; int file_perm = 00644; + short file_uid = 10; + short file_gid = 20; /* Folder data */ - char folder_name[] = "folder"; + char folder_name[] = "folder/"; int folder_perm = 00755; + short folder_uid = 30; + short folder_gid = 40; - /* Time fields */ + /* Time data */ time_t t; struct tm *tm; t = time(NULL); tm = localtime(&t); + + /* Misc variables */ + int crc; /* Create new ZIP archive in memory without padding. */ assert((a = archive_write_new()) != NULL); @@ -70,37 +80,35 @@ assert((entry = archive_entry_new()) != NULL); archive_entry_set_pathname(entry, file_name); archive_entry_set_mode(entry, S_IFREG | 0644); - archive_entry_set_size(entry, 10); - archive_entry_set_uid(entry, 80); - archive_entry_set_gid(entry, 90); - archive_entry_set_dev(entry, 12); - archive_entry_set_ino(entry, 89); - archive_entry_set_nlink(entry, 1); + archive_entry_set_size(entry, sizeof(file_data1) + sizeof(file_data2)); + archive_entry_set_uid(entry, file_uid); + archive_entry_set_gid(entry, file_gid); archive_entry_set_mtime(entry, t, 0); + archive_entry_set_atime(entry, t, 0); + archive_entry_set_ctime(entry, t, 0); assertEqualIntA(a, 0, archive_write_header(a, entry)); assertEqualIntA(a, sizeof(file_data1), archive_write_data(a, file_data1, sizeof(file_data1))); assertEqualIntA(a, sizeof(file_data2), archive_write_data(a, file_data2, sizeof(file_data2))); archive_entry_free(entry); /* Folder */ - /*assert((entry = archive_entry_new()) != NULL); + assert((entry = archive_entry_new()) != NULL); archive_entry_set_pathname(entry, folder_name); archive_entry_set_mode(entry, S_IFDIR | folder_perm); archive_entry_set_size(entry, 0); - archive_entry_set_uid(entry, 80); - archive_entry_set_gid(entry, 90); - archive_entry_set_dev(entry, 12); - archive_entry_set_ino(entry, 89); - archive_entry_set_nlink(entry, 1); + archive_entry_set_uid(entry, folder_uid); + archive_entry_set_gid(entry, folder_gid); archive_entry_set_mtime(entry, t, 0); + archive_entry_set_atime(entry, t, 0); + archive_entry_set_ctime(entry, t, 0); assertEqualIntA(a, 0, archive_write_header(a, entry)); - archive_entry_free(entry);*/ + archive_entry_free(entry); - /* Close out the archive . */ + /* Close the archive . */ assertA(0 == archive_write_close(a)); assertA(0 == archive_write_finish(a)); - /* Verify the format of the Zip file. */ + /* Remember the end of the archive in memory. */ buffend = buff + used; /* Verify "End of Central Directory" record. */ @@ -125,7 +133,9 @@ failure("Central file record at offset %d should begin with" " PK\\001\\002 signature", i4(buffend - 10)); - assertEqualMem(p, "PK\001\002", 4); + + /* Verify file entry in central directory. */ + assertEqualMem(p, "PK\001\002", 4); /* Signature */ assertEqualInt(i2(p + 4), 3 * 256 + 20); /* Version made by */ assertEqualInt(i2(p + 6), 20); /* Version needed to extract */ assertEqualInt(i2(p + 8), 8); /* Flags */ @@ -137,20 +147,128 @@ assertEqualInt(i4(p + 16), crc); /* CRC-32 */ assertEqualInt(i4(p + 20), sizeof(file_data1) + sizeof(file_data2)); /* Compressed size */ assertEqualInt(i4(p + 24), sizeof(file_data1) + sizeof(file_data2)); /* Uncompressed size */ - assertEqualInt(i2(p + 28), strlen(file_name)); /* Filename length */ + assertEqualInt(i2(p + 28), strlen(file_name)); /* Pathname length */ assertEqualInt(i2(p + 30), 13); /* Extra field length */ assertEqualInt(i2(p + 32), 0); /* File comment length */ assertEqualInt(i2(p + 34), 0); /* Disk number start */ assertEqualInt(i2(p + 36), 0); /* Internal file attrs */ assertEqualInt(i4(p + 38) >> 16 & 01777, file_perm); /* External file attrs */ + assertEqualInt(i4(p + 42), 0); /* Offset of local header */ + assertEqualMem(p + 46, file_name, strlen(file_name)); /* Pathname */ + p = p + 46 + strlen(file_name); + assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */ + assertEqualInt(i2(p + 2), 5); /* 'UT' size */ + assertEqualInt(p[4], 7); /* 'UT' flags */ + assertEqualInt(i4(p + 5), t); /* 'UT' mtime */ + p = p + 9; + assertEqualInt(i2(p), 0x7855); /* 'Ux' extension header */ + assertEqualInt(i2(p + 2), 0); /* 'Ux' size */ + p = p + 4; + + /* Verify local header of file entry. */ + q = buff; + assertEqualMem(q, "PK\003\004", 4); /* Signature */ + assertEqualInt(i2(q + 4), 20); /* Version needed to extract */ + assertEqualInt(i2(q + 6), 8); /* Flags */ + assertEqualInt(i2(q + 8), 0); /* Compression method */ + assertEqualInt(i2(q + 10), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */ + assertEqualInt(i2(q + 12), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */ + assertEqualInt(i4(q + 14), 0); /* CRC-32 */ + assertEqualInt(i4(q + 18), 0); /* Compressed size */ + assertEqualInt(i4(q + 22), 0); /* Uncompressed size */ + assertEqualInt(i2(q + 26), strlen(file_name)); /* Pathname length */ + assertEqualInt(i2(q + 28), 25); /* Extra field length */ + assertEqualMem(q + 30, file_name, strlen(file_name)); /* Pathname */ + q = q + 30 + strlen(file_name); + assertEqualInt(i2(q), 0x5455); /* 'UT' extension header */ + assertEqualInt(i2(q + 2), 13); /* 'UT' size */ + assertEqualInt(q[4], 7); /* 'UT' flags */ + assertEqualInt(i4(q + 5), t); /* 'UT' mtime */ + assertEqualInt(i4(q + 9), t); /* 'UT' atime */ + assertEqualInt(i4(q + 13), t); /* 'UT' ctime */ + q = q + 17; + assertEqualInt(i2(q), 0x7855); /* 'Ux' extension header */ + assertEqualInt(i2(q + 2), 4); /* 'Ux' size */ + assertEqualInt(i2(q + 4), file_uid); /* 'Ux' UID */ + assertEqualInt(i2(q + 6), file_gid); /* 'Ux' GID */ + q = q + 8; + + /* Verify data of file entry. */ + assertEqualMem(q, file_data1, sizeof(file_data1)); + assertEqualMem(q + sizeof(file_data1), file_data2, sizeof(file_data2)); + q = q + sizeof(file_data1) + sizeof(file_data2); + + /* Verify data descriptor of file entry. */ + assertEqualMem(q, "PK\007\010", 4); /* Signature */ + assertEqualInt(i4(q + 4), crc); /* CRC-32 */ + assertEqualInt(i4(q + 8), sizeof(file_data1) + sizeof(file_data2)); /* Compressed size */ + assertEqualInt(i4(q + 12), sizeof(file_data1) + sizeof(file_data2)); /* Uncompressed size */ + q = q + 16; + /* Verify folder entry in central directory. */ + assertEqualMem(p, "PK\001\002", 4); /* Signature */ + assertEqualInt(i2(p + 4), 3 * 256 + 20); /* Version made by */ + assertEqualInt(i2(p + 6), 20); /* Version needed to extract */ + assertEqualInt(i2(p + 8), 8); /* Flags */ + assertEqualInt(i2(p + 10), 0); /* Compression method */ + assertEqualInt(i2(p + 12), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */ + assertEqualInt(i2(p + 14), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */ + crc = 0; + assertEqualInt(i4(p + 16), crc); /* CRC-32 */ + assertEqualInt(i4(p + 20), 0); /* Compressed size */ + assertEqualInt(i4(p + 24), 0); /* Uncompressed size */ + assertEqualInt(i2(p + 28), strlen(folder_name)); /* Pathname length */ + assertEqualInt(i2(p + 30), 13); /* Extra field length */ + assertEqualInt(i2(p + 32), 0); /* File comment length */ + assertEqualInt(i2(p + 34), 0); /* Disk number start */ + assertEqualInt(i2(p + 36), 0); /* Internal file attrs */ + assertEqualInt(i4(p + 38) >> 16 & 01777, folder_perm); /* External file attrs */ + assertEqualInt(i4(p + 42), q - buff); /* Offset of local header */ + assertEqualMem(p + 46, folder_name, strlen(folder_name)); /* Pathname */ + p = p + 46 + strlen(folder_name); + assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */ + assertEqualInt(i2(p + 2), 5); /* 'UT' size */ + assertEqualInt(p[4], 7); /* 'UT' flags */ + assertEqualInt(i4(p + 5), t); /* 'UT' mtime */ + p = p + 9; + assertEqualInt(i2(p), 0x7855); /* 'Ux' extension header */ + assertEqualInt(i2(p + 2), 0); /* 'Ux' size */ + p = p + 4; - /* Get address of local header for this file. */ - q = buff + i4(p + 42); - failure("Local file header at offset %d should begin with" - " PK\\003\\004 signature", - i4(p + 42)); - assertEqualMem(q, "PK\003\004", 4); - /* TODO: Verify local header */ + /* Verify local header of folder entry. */ + assertEqualMem(q, "PK\003\004", 4); /* Signature */ + assertEqualInt(i2(q + 4), 20); /* Version needed to extract */ + assertEqualInt(i2(q + 6), 8); /* Flags */ + assertEqualInt(i2(q + 8), 0); /* Compression method */ + assertEqualInt(i2(q + 10), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */ + assertEqualInt(i2(q + 12), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */ + assertEqualInt(i4(q + 14), 0); /* CRC-32 */ + assertEqualInt(i4(q + 18), 0); /* Compressed size */ + assertEqualInt(i4(q + 22), 0); /* Uncompressed size */ + assertEqualInt(i2(q + 26), strlen(folder_name)); /* Pathname length */ + assertEqualInt(i2(q + 28), 25); /* Extra field length */ + assertEqualMem(q + 30, folder_name, strlen(folder_name)); /* Pathname */ + q = q + 30 + strlen(folder_name); + assertEqualInt(i2(q), 0x5455); /* 'UT' extension header */ + assertEqualInt(i2(q + 2), 13); /* 'UT' size */ + assertEqualInt(q[4], 7); /* 'UT' flags */ + assertEqualInt(i4(q + 5), t); /* 'UT' mtime */ + assertEqualInt(i4(q + 9), t); /* 'UT' atime */ + assertEqualInt(i4(q + 13), t); /* 'UT' ctime */ + q = q + 17; + assertEqualInt(i2(q), 0x7855); /* 'Ux' extension header */ + assertEqualInt(i2(q + 2), 4); /* 'Ux' size */ + assertEqualInt(i2(q + 4), folder_uid); /* 'Ux' UID */ + assertEqualInt(i2(q + 6), folder_gid); /* 'Ux' GID */ + q = q + 8; + + /* There should not be any data in the folder entry, + * meaning next is the data descriptor header. */ -}+ /* Verify data descriptor of folder entry. */ + assertEqualMem(q, "PK\007\010", 4); /* Signature */ + assertEqualInt(i4(q + 4), crc); /* CRC-32 */ + assertEqualInt(i4(q + 8), 0); /* Compressed size */ + assertEqualInt(i4(q + 12), 0); /* Uncompressed size */ + q = q + 16; +} From owner-p4-projects@FreeBSD.ORG Thu Aug 14 12:54:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 535501065673; Thu, 14 Aug 2008 12:54:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16B9F106564A for ; Thu, 14 Aug 2008 12:54:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 027358FC1D for ; Thu, 14 Aug 2008 12:54:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ECs8WX080620 for ; Thu, 14 Aug 2008 12:54:08 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ECs8UC080618 for perforce@freebsd.org; Thu, 14 Aug 2008 12:54:08 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 12:54:08 GMT Message-Id: <200808141254.m7ECs8UC080618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 12:54:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=147375 Change 147375 by trasz@trasz_traszkan on 2008/08/14 12:53:32 Test applying mode to an ACL and vice versa. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#4 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#4 (text+ko) ==== @@ -177,7 +177,7 @@ > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow -# Check whether chmod actually does what it should do. +# Test applying mode to an ACL. $ rm xxx $ touch xxx $ setfacl -a0 user:42:r:allow,user:43:w:deny,user:43:w:allow,user:44:x:allow -x everyone@::allow xxx @@ -278,9 +278,195 @@ $ ls -l xxx | cut -d' ' -f1 > -r----x-w-+ -# XXX: Verify what happens during chmodding with inheritance flags being set. +$ mkdir ddd +$ setfacl -a0 group:44:rwapd:allow ddd +$ setfacl -a0 group:43:write_data/delete_child:d:deny,group@:ad:allow ddd +$ setfacl -a0 user:42:rx:fi:allow,group:42:write_data/delete_child:d:allow ddd +$ setfacl -m everyone@:-w-p--a-R-c--s:fi:allow ddd +$ getfacl -n ddd +> # file: ddd +> # owner: root +> # group: wheel +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-d----:allow +> group:43:-w--D---------:-d----:deny +> group@:-----da-------:------:allow +> group:44:rw-p-da-------:------:allow +> owner@:--------------:------:deny +> owner@:rwxp---A-W-Co-:------:allow +> group@:-w-p----------:------:deny +> group@:r-x-----------:------:allow +> everyone@:-w-p---A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:f-i---:allow +$ chmod 777 ddd +$ getfacl -n ddd +> # file: ddd +> # owner: root +> # group: wheel +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-di---:allow +> group:42:--------------:------:deny +> group:42:-w--D---------:------:allow +> group:43:-w--D---------:-di---:deny +> group:43:-w--D---------:------:deny +> group@:-----da-------:------:allow +> group:44:--------------:------:deny +> group:44:rw-p-da-------:------:allow +> owner@:--------------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:--------------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:f-i---:allow +> owner@:--------------:------:deny +> owner@:rwxp---A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:rwxp----------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:rwxp--a-R-c--s:------:allow + +$ rmdir ddd +$ mkdir ddd +$ setfacl -a0 group:44:rwapd:allow ddd +$ setfacl -a0 group:43:write_data/delete_child:d:deny,group@:ad:allow ddd +$ setfacl -a0 user:42:rx:fi:allow,group:42:write_data/delete_child:d:allow ddd +$ setfacl -m everyone@:-w-p--a-R-c--s:fi:allow ddd +$ chmod 124 ddd +$ getfacl -n ddd +> # file: ddd +> # owner: root +> # group: wheel +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-di---:allow +> group:42:--------------:------:deny +> group:42:----D---------:------:allow +> group:43:-w--D---------:-di---:deny +> group:43:-w--D---------:------:deny +> group@:-----da-------:------:allow +> group:44:r-------------:------:deny +> group:44:r----da-------:------:allow +> owner@:--------------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:--------------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:f-i---:allow +> owner@:rw-p----------:------:deny +> owner@:--x----A-W-Co-:------:allow +> group@:r-x-----------:------:deny +> group@:-w-p----------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow + +$ rmdir ddd +$ mkdir ddd +$ setfacl -a0 group:44:rwapd:allow ddd +$ setfacl -a0 group:43:write_data/delete_child:d:deny,group@:ad:allow ddd +$ setfacl -a0 user:42:rx:allow,user:42:rx:fi:allow,group:42:write_data/delete_child:d:allow ddd +$ setfacl -m everyone@:-w-p--a-R-c--s:fi:allow ddd +$ chmod 412 ddd +$ getfacl -n ddd +> # file: ddd +> # owner: root +> # group: wheel +> user:42:r-------------:------:deny +> user:42:r-x-----------:------:allow +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-di---:allow +> group:42:-w------------:------:deny +> group:42:-w--D---------:------:allow +> group:43:-w--D---------:-di---:deny +> group:43:-w--D---------:------:deny +> group@:-----da-------:------:allow +> group:44:rw-p----------:------:deny +> group:44:rw-p-da-------:------:allow +> owner@:--------------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:--------------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:f-i---:allow +> owner@:-wxp----------:------:deny +> owner@:r------A-W-Co-:------:allow +> group@:rw-p----------:------:deny +> group@:--x-----------:------:allow +> everyone@:r-x----A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:------:allow + +$ rmdir ddd +$ mkdir ddd +$ setfacl -a0 group:44:rwapd:allow ddd +$ setfacl -a0 group:43:write_data/delete_child:d:deny,group@:ad:allow ddd +$ setfacl -a0 user:42:rx:allow,user:42:rx:fi:allow,group:42:write_data/delete_child:d:allow ddd +$ setfacl -m everyone@:-w-p--a-R-c--s:fi:allow ddd +$ chown 42 ddd +$ chmod 412 ddd +$ getfacl -n ddd +> # file: ddd +> # owner: 42 +> # group: wheel +> user:42:--x-----------:------:deny +> user:42:r-x-----------:------:allow +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-di---:allow +> group:42:-w------------:------:deny +> group:42:-w--D---------:------:allow +> group:43:-w--D---------:-di---:deny +> group:43:-w--D---------:------:deny +> group@:-----da-------:------:allow +> group:44:rw-p----------:------:deny +> group:44:rw-p-da-------:------:allow +> owner@:--------------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:--------------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:f-i---:allow +> owner@:-wxp----------:------:deny +> owner@:r------A-W-Co-:------:allow +> group@:rw-p----------:------:deny +> group@:--x-----------:------:allow +> everyone@:r-x----A-W-Co-:------:deny +> everyone@:-w-p--a-R-c--s:------:allow + +# Test applying ACL to mode. +$ rmdir ddd +$ mkdir ddd +$ setfacl -a0 u:42:rwx:fi:allow ddd +$ ls -ld ddd | cut -d' ' -f1 +> drwxr-xr-x+ + +$ rmdir ddd +$ mkdir ddd +$ chmod 0 ddd +$ setfacl -a0 owner@:r:allow,group@:w:deny,group@:wx:allow ddd +$ ls -ld ddd | cut -d' ' -f1 +> dr----x---+ + +# XXX: This one is fishy. Shouldn't it be "dr---wx---+"? +$ rmdir ddd +$ mkdir ddd +$ chmod 0 ddd +$ setfacl -a0 owner@:r:allow,group@:w:fi:deny,group@:wx:allow ddd +$ ls -ld ddd | cut -d' ' -f1 +> dr----x---+ + +$ rmdir ddd +$ mkdir ddd +$ chmod 0 ddd +$ setfacl -a0 owner@:r:allow,group:43:w:deny,group:43:wx:allow ddd +$ ls -ld ddd | cut -d' ' -f1 +> dr--------+ + +$ rmdir ddd +$ mkdir ddd +$ chmod 0 ddd +$ setfacl -a0 owner@:r:allow,user:43:w:deny,user:43:wx:allow ddd +$ ls -ld ddd | cut -d' ' -f1 +> dr--------+ -# Inheritance tests. +# Test inheritance. +$ rmdir ddd $ mkdir ddd $ setfacl -a0 user:42:rx:fi:allow,group:42:write_data/delete_child:dn:deny ddd $ cd ddd From owner-p4-projects@FreeBSD.ORG Thu Aug 14 13:26:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 446531065679; Thu, 14 Aug 2008 13:26:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 086AC1065677 for ; Thu, 14 Aug 2008 13:26:42 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E84418FC13 for ; Thu, 14 Aug 2008 13:26:41 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EDQffF084579 for ; Thu, 14 Aug 2008 13:26:41 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EDQfn8084577 for perforce@freebsd.org; Thu, 14 Aug 2008 13:26:41 GMT (envelope-from snb@FreeBSD.org) Date: Thu, 14 Aug 2008 13:26:41 GMT Message-Id: <200808141326.m7EDQfn8084577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 147376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 13:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=147376 Change 147376 by snb@snb_toro on 2008/08/14 13:26:35 Dynamic memory dirhash for FreeBSD 7 Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/dirhash.h#2 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/ufs_dirhash.c#2 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/dirhash.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ufs/ufs/dirhash.h,v 1.5 2005/01/07 02:29:26 imp Exp $ + * $FreeBSD$ */ #ifndef _UFS_UFS_DIRHASH_H_ @@ -100,6 +100,8 @@ int dh_onlist; /* true if on the ufsdirhash_list chain */ + time_t dh_lastused; /* time the dirhash was last read or written*/ + /* Protected by ufsdirhash_mtx. */ TAILQ_ENTRY(dirhash) dh_list; /* chain of all dirhashes */ }; ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/freebsd7/ufs_dirhash.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.23 2005/10/31 15:41:28 rwatson Exp $"); +__FBSDID("$FreeBSD$"); #include "opt_ufs.h" @@ -47,6 +47,8 @@ #include #include #include +#include +#include #include #include @@ -79,6 +81,13 @@ static int ufs_dirhashcheck = 0; SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_docheck, CTLFLAG_RW, &ufs_dirhashcheck, 0, "enable extra sanity tests"); +static int ufs_dirhashlowmemcount = 0; +SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_lowmemcount, CTLFLAG_RD, + &ufs_dirhashlowmemcount, 0, "number of times low memory hook called"); +static int ufs_dirhashreclaimage = 5; +SYSCTL_INT(_vfs_ufs, OID_AUTO, dirhash_reclaimage, CTLFLAG_RW, + &ufs_dirhashreclaimage, 0, + "max time in seconds of hash inactivity before deletion in low VM events"); static int ufsdirhash_hash(struct dirhash *dh, char *name, int namelen); @@ -87,7 +96,9 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); +static int ufsdirhash_destroy(struct dirhash *dh); static int ufsdirhash_recycle(int wanted); +static void ufsdirhash_lowmem(void); static uma_zone_t ufsdirhash_zone; @@ -215,6 +226,7 @@ dh->dh_seqopt = 0; dh->dh_seqoff = 0; dh->dh_score = DH_SCOREINIT; + dh->dh_lastused = time_second; ip->i_dirhash = dh; bmask = VFSTOUFS(vp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; @@ -377,6 +389,9 @@ if (dh->dh_score < DH_SCOREMAX) dh->dh_score++; + /* Update last used time. */ + dh->dh_lastused = time_second; + vp = ip->i_vnode; bmask = VFSTOUFS(vp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; blkoff = -1; @@ -643,6 +658,9 @@ dh->dh_hused++; DH_ENTRY(dh, slot) = offset; + /* Update last used time. */ + dh->dh_lastused = time_second; + /* Update the per-block summary info. */ ufsdirhash_adjfree(dh, offset, -DIRSIZ(0, dirp)); DIRHASH_UNLOCK(dh); @@ -1014,6 +1032,48 @@ } /* + * Delete the given dirhash and reclaim its memory. Assumes that + * ufsdirhash_list is locked, and leaves it locked. Also assumes + * that dh is locked. Returns the amount of memory freed. + */ +static int +ufsdirhash_destroy(struct dirhash *dh) +{ + doff_t **hash; + u_int8_t *blkfree; + int i, mem, narrays; + + KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); + + /* Remove it from the list and detach its memory. */ + TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); + dh->dh_onlist = 0; + hash = dh->dh_hash; + dh->dh_hash = NULL; + blkfree = dh->dh_blkfree; + dh->dh_blkfree = NULL; + narrays = dh->dh_narrays; + mem = narrays * sizeof(*dh->dh_hash) + + narrays * DH_NBLKOFF * sizeof(**dh->dh_hash) + + dh->dh_nblk * sizeof(*dh->dh_blkfree); + + /* Unlock everything, free the detached memory. */ + DIRHASH_UNLOCK(dh); + DIRHASHLIST_UNLOCK(); + for (i = 0; i < narrays; i++) + DIRHASH_BLKFREE(hash[i]); + FREE(hash, M_DIRHASH); + FREE(blkfree, M_DIRHASH); + + /* Account for the returned memory. */ + DIRHASHLIST_LOCK(); + ufs_dirhashmem -= mem; + + return (mem); +} + + +/* * Try to free up `wanted' bytes by stealing memory from existing * dirhashes. Returns zero with list locked if successful. */ @@ -1021,9 +1081,6 @@ ufsdirhash_recycle(int wanted) { struct dirhash *dh; - doff_t **hash; - u_int8_t *blkfree; - int i, mem, narrays; DIRHASHLIST_LOCK(); while (wanted + ufs_dirhashmem > ufs_dirhashmaxmem) { @@ -1033,7 +1090,6 @@ return (-1); } DIRHASH_LOCK(dh); - KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); /* Decrement the score; only recycle if it becomes zero. */ if (--dh->dh_score > 0) { @@ -1042,32 +1098,50 @@ return (-1); } - /* Remove it from the list and detach its memory. */ - TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); - dh->dh_onlist = 0; - hash = dh->dh_hash; - dh->dh_hash = NULL; - blkfree = dh->dh_blkfree; - dh->dh_blkfree = NULL; - narrays = dh->dh_narrays; - mem = narrays * sizeof(*dh->dh_hash) + - narrays * DH_NBLKOFF * sizeof(**dh->dh_hash) + - dh->dh_nblk * sizeof(*dh->dh_blkfree); + /* Destroy the dirhash, and repeat if necessary. */ + ufsdirhash_destroy(dh); + } + /* Success; return with list locked. */ + return (0); +} + +/* + * Calback that frees some dirhashes when the system is low on virtual memory. + */ +static void +ufsdirhash_lowmem() +{ + struct dirhash *dh; + int memfreed = 0; + /* XXX: this 10% may need to be adjusted */ + int memwanted = ufs_dirhashmem / 10; - /* Unlock everything, free the detached memory. */ - DIRHASH_UNLOCK(dh); - DIRHASHLIST_UNLOCK(); - for (i = 0; i < narrays; i++) - DIRHASH_BLKFREE(hash[i]); - FREE(hash, M_DIRHASH); - FREE(blkfree, M_DIRHASH); + ufs_dirhashlowmemcount++; - /* Account for the returned memory, and repeat if necessary. */ - DIRHASHLIST_LOCK(); - ufs_dirhashmem -= mem; + DIRHASHLIST_LOCK(); + /* + * Delete dirhashes not used for more than ufs_dirhashreclaimage + * seconds. + */ + for (dh = TAILQ_FIRST(&ufsdirhash_list); dh != NULL; dh = + TAILQ_NEXT(dh, dh_list)) { + if (time_second - dh->dh_lastused > ufs_dirhashreclaimage) { + DIRHASH_LOCK(dh); + memfreed += ufsdirhash_destroy(dh); + } + } + + /* + * If not enough memory was freed, keep deleting hashes from the head + * of the dirhash list. The ones closest to the head should be the + * oldest. + */ + for (dh = TAILQ_FIRST(&ufsdirhash_list); memfreed < memwanted && + dh !=NULL; dh = TAILQ_NEXT(dh, dh_list)) { + DIRHASH_LOCK(dh); + memfreed += ufsdirhash_destroy(dh); } - /* Success; return with list locked. */ - return (0); + DIRHASHLIST_UNLOCK(); } @@ -1078,6 +1152,11 @@ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); mtx_init(&ufsdirhash_mtx, "dirhash list", NULL, MTX_DEF); TAILQ_INIT(&ufsdirhash_list); + + /* Register a callback function to handle low memory signals */ + EVENTHANDLER_REGISTER(vm_lowmem, ufsdirhash_lowmem, NULL, + EVENTHANDLER_PRI_FIRST); + } void From owner-p4-projects@FreeBSD.ORG Thu Aug 14 14:08:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F2521065673; Thu, 14 Aug 2008 14:08:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52969106566C for ; Thu, 14 Aug 2008 14:08:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F0798FC19 for ; Thu, 14 Aug 2008 14:08:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EE8O5O089246 for ; Thu, 14 Aug 2008 14:08:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EE8OSO089244 for perforce@freebsd.org; Thu, 14 Aug 2008 14:08:24 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 14:08:24 GMT Message-Id: <200808141408.m7EE8OSO089244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 14:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147378 Change 147378 by trasz@trasz_traszkan on 2008/08/14 14:07:57 Inheritance tests. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#5 (text+ko) ==== @@ -468,34 +468,144 @@ # Test inheritance. $ rmdir ddd $ mkdir ddd +$ setfacl -a0 group:43:write_data/write_acl:fin:deny,u:43:rwxp:allow ddd $ setfacl -a0 user:42:rx:fi:allow,group:42:write_data/delete_child:dn:deny ddd +$ setfacl -a0 user:42:write_acl/write_owner:fi:allow ddd +$ setfacl -a0 group:41:read_data/read_attributes:dni:allow ddd +$ setfacl -a0 user:41:write_data/write_attributes:fn:allow ddd +$ getfacl -qn ddd +> user:41:-w-----A------:f--n--:allow +> group:41:r-----a-------:-din--:allow +> user:42:-----------Co-:f-i---:allow +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:-d-n--:deny +> group:43:-w---------C--:f-in--:deny +> user:43:rwxp----------:------:allow +> owner@:--------------:------:deny +> owner@:rwxp---A-W-Co-:------:allow +> group@:-w-p----------:------:deny +> group@:r-x-----------:------:allow +> everyone@:-w-p---A-W-Co-:------:deny +> everyone@:r-x---a-R-c--s:------:allow + $ cd ddd $ touch xxx -$ getfacl -n xxx -> # file: xxx -> # owner: root -> # group: wheel +$ getfacl -qn xxx +> user:41:-w------------:------:deny +> user:41:-w-----A------:------:allow +> user:42:--------------:------:deny +> user:42:--------------:------:allow > user:42:--x-----------:------:deny > user:42:r-x-----------:------:allow +> group:43:-w---------C--:------:deny > owner@:--x-----------:------:deny > owner@:rw-p---A-W-Co-:------:allow > group@:-wxp----------:------:deny > group@:r-------------:------:allow > everyone@:-wxp---A-W-Co-:------:deny > everyone@:r-----a-R-c--s:------:allow + +$ rm xxx +$ umask 077 +$ touch xxx +$ getfacl -qn xxx +> user:41:-w------------:------:deny +> user:41:-w-----A------:------:allow +> user:42:--------------:------:deny +> user:42:--------------:------:allow +> user:42:r-x-----------:------:deny +> user:42:r-x-----------:------:allow +> group:43:-w---------C--:------:deny +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:rwxp----------:------:deny +> group@:--------------:------:allow +> everyone@:rwxp---A-W-Co-:------:deny +> everyone@:------a-R-c--s:------:allow + +$ rm xxx +$ umask 770 +$ touch xxx +$ getfacl -qn xxx +> user:41:-w------------:------:deny +> user:41:-w-----A------:------:allow +> user:42:--------------:------:deny +> user:42:--------------:------:allow +> user:42:r-x-----------:------:deny +> user:42:r-x-----------:------:allow +> group:43:-w---------C--:------:deny +> owner@:rwxp----------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:rwxp----------:------:deny +> group@:--------------:------:allow +> everyone@:--x----A-W-Co-:------:deny +> everyone@:rw-p--a-R-c--s:------:allow + +$ rm xxx +$ umask 707 +$ touch xxx +$ getfacl -qn xxx +> user:41:--------------:------:deny +> user:41:-w-----A------:------:allow +> user:42:--------------:------:deny +> user:42:--------------:------:allow +> user:42:--x-----------:------:deny +> user:42:r-x-----------:------:allow +> group:43:-w---------C--:------:deny +> owner@:rwxp----------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--x-----------:------:deny +> group@:rw-p----------:------:allow +> everyone@:rwxp---A-W-Co-:------:deny +> everyone@:------a-R-c--s:------:allow + +$ umask 077 $ mkdir yyy -$ getfacl -n yyy -> # file: yyy -> # owner: root -> # group: wheel +$ getfacl -qn yyy +> group:41:r-------------:------:deny +> group:41:r-----a-------:------:allow +> user:42:--------------:f-i---:allow > user:42:r-x-----------:f-i---:allow > group:42:-w--D---------:------:deny > owner@:--------------:------:deny > owner@:rwxp---A-W-Co-:------:allow -> group@:-w-p----------:------:deny -> group@:r-x-----------:------:allow -> everyone@:-w-p---A-W-Co-:------:deny -> everyone@:r-x---a-R-c--s:------:allow +> group@:rwxp----------:------:deny +> group@:--------------:------:allow +> everyone@:rwxp---A-W-Co-:------:deny +> everyone@:------a-R-c--s:------:allow + +$ rmdir yyy +$ umask 770 +$ mkdir yyy +$ getfacl -qn yyy +> group:41:r-------------:------:deny +> group:41:r-----a-------:------:allow +> user:42:--------------:f-i---:allow +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:------:deny +> owner@:rwxp----------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:rwxp----------:------:deny +> group@:--------------:------:allow +> everyone@:-------A-W-Co-:------:deny +> everyone@:rwxp--a-R-c--s:------:allow + +$ rmdir yyy +$ umask 707 +$ mkdir yyy +$ getfacl -qn yyy +> group:41:--------------:------:deny +> group:41:------a-------:------:allow +> user:42:--------------:f-i---:allow +> user:42:r-x-----------:f-i---:allow +> group:42:-w--D---------:------:deny +> owner@:rwxp----------:------:deny +> owner@:-------A-W-Co-:------:allow +> group@:--------------:------:deny +> group@:rwxp----------:------:allow +> everyone@:rwxp---A-W-Co-:------:deny +> everyone@:------a-R-c--s:------:allow + $ rmdir yyy $ rm xxx $ cd .. From owner-p4-projects@FreeBSD.ORG Thu Aug 14 14:46:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CF10106569B; Thu, 14 Aug 2008 14:46:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02E011065677 for ; Thu, 14 Aug 2008 14:46:07 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E52A18FC22 for ; Thu, 14 Aug 2008 14:46:06 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EEk6Bo092473 for ; Thu, 14 Aug 2008 14:46:06 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EEk6OZ092471 for perforce@freebsd.org; Thu, 14 Aug 2008 14:46:06 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 14:46:06 GMT Message-Id: <200808141446.m7EEk6OZ092471@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 14:46:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=147388 Change 147388 by trasz@trasz_traszkan on 2008/08/14 14:46:05 Fix an obvious error (READ | APPEND instead of WRITE | APPEND). Remove a redundant check. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#23 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#23 (text+ko) ==== @@ -429,18 +429,13 @@ /* * 1.5.1.2. The "who" field is the same as the current * ACE, - */ - if (previous->ae_id != entry->ae_id || - previous->ae_tag != entry->ae_tag) - meets = 0; - - /* + * * 1.5.1.3. The flag bit ACE4_IDENTIFIER_GROUP * is the same as it is in the current ACE, * and no other flag bits are set, */ - if ((previous->ae_tag == ACL_GROUP) != - (entry->ae_tag == ACL_GROUP)) + if (previous->ae_id != entry->ae_id || + previous->ae_tag != entry->ae_tag) meets = 0; if (previous->ae_flags) @@ -551,9 +546,9 @@ if (extramode & ACL_WRITE) { entry->ae_perm &= - ~(ACL_READ_DATA | ACL_APPEND_DATA); + ~(ACL_WRITE_DATA | ACL_APPEND_DATA); previous->ae_perm &= - ~(ACL_READ_DATA | ACL_APPEND_DATA); + ~(ACL_WRITE_DATA | ACL_APPEND_DATA); } } From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:29:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8457D1065682; Thu, 14 Aug 2008 15:29:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4743C1065686 for ; Thu, 14 Aug 2008 15:29:52 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 374118FC22 for ; Thu, 14 Aug 2008 15:29:52 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EFTqAw096916 for ; Thu, 14 Aug 2008 15:29:52 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EFTppv096914 for perforce@freebsd.org; Thu, 14 Aug 2008 15:29:51 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 14 Aug 2008 15:29:51 GMT Message-Id: <200808141529.m7EFTppv096914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 147390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 15:29:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=147390 Change 147390 by thompsa@thompsa_burger on 2008/08/14 15:29:51 IFC @147386 Affected files ... .. //depot/projects/vap/contrib/gcc/common.opt#3 integrate .. //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#4 integrate .. //depot/projects/vap/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/vap/etc/periodic/security/550.ipfwlimit#3 integrate .. //depot/projects/vap/games/random/random.c#4 integrate .. //depot/projects/vap/games/random/randomize_fd.c#4 integrate .. //depot/projects/vap/games/random/randomize_fd.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_tar_large.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_ustar_filenames.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_write_format_tar_ustar.c#2 integrate .. //depot/projects/vap/lib/libbluetooth/Makefile#3 integrate .. //depot/projects/vap/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/vap/lib/libbluetooth/bluetooth.h#3 integrate .. //depot/projects/vap/lib/libgeom/geom_xml2tree.c#4 integrate .. //depot/projects/vap/lib/libpcap/config.h#3 integrate .. //depot/projects/vap/lib/libthread_db/thread_db.h#4 integrate .. //depot/projects/vap/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#3 integrate .. //depot/projects/vap/sbin/geom/class/virstor/geom_virstor.c#3 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#26 edit .. //depot/projects/vap/sbin/ifconfig/regdomain.c#5 integrate .. //depot/projects/vap/share/man/man4/Makefile#18 integrate .. //depot/projects/vap/share/man/man4/bpf.4#6 integrate .. //depot/projects/vap/share/man/man4/man4.i386/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/man4.i386/glxsb.4#1 branch .. //depot/projects/vap/share/man/man4/miibus.4#4 integrate .. //depot/projects/vap/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#5 integrate .. //depot/projects/vap/sys/amd64/amd64/db_disasm.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/vap/sys/conf/files#47 integrate .. //depot/projects/vap/sys/conf/files.i386#15 integrate .. //depot/projects/vap/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/vap/sys/dev/age/if_age.c#4 integrate .. //depot/projects/vap/sys/dev/aha/aha.c#5 integrate .. //depot/projects/vap/sys/dev/bfe/if_bfe.c#9 integrate .. //depot/projects/vap/sys/dev/cpufreq/ichss.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_lro.c#3 delete .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/vap/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vap/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vap/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vap/sys/dev/iicbus/ad7418.c#4 integrate .. //depot/projects/vap/sys/dev/iicbus/ds1339.c#3 delete .. //depot/projects/vap/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vap/sys/dev/led/led.c#7 integrate .. //depot/projects/vap/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/vap/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#15 integrate .. //depot/projects/vap/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vap/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vap/sys/dev/usb/umass.c#9 integrate .. //depot/projects/vap/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/vap/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vap/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vap/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vap/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vap/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vap/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vap/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vap/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vap/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vap/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vap/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vap/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vap/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/vap/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/vap/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/vap/sys/geom/geom_ccd.c#5 integrate .. //depot/projects/vap/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/vap/sys/geom/geom_disk.c#7 integrate .. //depot/projects/vap/sys/geom/geom_kern.c#6 integrate .. //depot/projects/vap/sys/geom/geom_slice.c#5 integrate .. //depot/projects/vap/sys/geom/geom_subr.c#10 integrate .. //depot/projects/vap/sys/geom/part/g_part.c#8 integrate .. //depot/projects/vap/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#16 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#11 integrate .. //depot/projects/vap/sys/i386/cpufreq/p4tcc.c#6 integrate .. //depot/projects/vap/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/vap/sys/i386/cpufreq/smist.c#5 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#5 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#5 integrate .. //depot/projects/vap/sys/i386/i386/db_disasm.c#3 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#10 integrate .. //depot/projects/vap/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vap/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vap/sys/i386/xen/clock.c#1 branch .. //depot/projects/vap/sys/i386/xen/exception.s#1 branch .. //depot/projects/vap/sys/i386/xen/locore.s#1 branch .. //depot/projects/vap/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vap/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#12 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#13 integrate .. //depot/projects/vap/sys/kern/subr_sbuf.c#6 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#16 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/vap/sys/modules/Makefile#37 integrate .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#6 integrate .. //depot/projects/vap/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vap/sys/modules/sis/Makefile#5 integrate .. //depot/projects/vap/sys/modules/xl/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.c#19 integrate .. //depot/projects/vap/sys/net/if_enc.c#5 integrate .. //depot/projects/vap/sys/net/if_enc.h#1 branch .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#61 integrate .. //depot/projects/vap/sys/netinet/sctp_bsd_addr.c#9 integrate .. //depot/projects/vap/sys/netipsec/ipsec_input.c#6 integrate .. //depot/projects/vap/sys/netipsec/ipsec_output.c#7 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#7 integrate .. //depot/projects/vap/sys/pci/if_sis.c#7 delete .. //depot/projects/vap/sys/pci/if_sisreg.h#5 delete .. //depot/projects/vap/sys/pci/if_xl.c#8 delete .. //depot/projects/vap/sys/pci/if_xlreg.h#8 delete .. //depot/projects/vap/sys/rpc/clnt_rc.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit.c#12 integrate .. //depot/projects/vap/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/vap/sys/sparc64/include/asi.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/cache.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/cpufunc.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/vap/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/clock.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/db_disasm.c#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/exception.S#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/locore.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_locore.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/vap/sys/sparc64/sparc64/prof_machdep.c#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/swtch.S#5 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/vap/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/vap/sys/sys/lock.h#9 integrate .. //depot/projects/vap/sys/sys/param.h#27 integrate .. //depot/projects/vap/sys/sys/sbuf.h#3 integrate .. //depot/projects/vap/sys/sys/sx.h#6 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/vap/sys/vm/redzone.c#3 integrate .. //depot/projects/vap/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vap/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vap/sys/xen/gnttab.c#1 branch .. //depot/projects/vap/sys/xen/gnttab.h#1 branch .. //depot/projects/vap/sys/xen/interface/COPYING#1 branch .. //depot/projects/vap/sys/xen/interface/acm.h#1 branch .. //depot/projects/vap/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vap/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vap/sys/xen/interface/callback.h#1 branch .. //depot/projects/vap/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vap/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vap/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vap/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vap/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vap/sys/xen/interface/features.h#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vap/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vap/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vap/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vap/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vap/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vap/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vap/sys/xen/interface/memory.h#1 branch .. //depot/projects/vap/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vap/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vap/sys/xen/interface/platform.h#1 branch .. //depot/projects/vap/sys/xen/interface/sched.h#1 branch .. //depot/projects/vap/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vap/sys/xen/interface/trace.h#1 branch .. //depot/projects/vap/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vap/sys/xen/interface/version.h#1 branch .. //depot/projects/vap/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vap/sys/xen/interface/xen.h#1 branch .. //depot/projects/vap/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vap/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vap/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_xs.c#1 branch .. //depot/projects/vap/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/vap/tools/regression/geom/MdLoad/MdLoad.c#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/FlashDevice.sub#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/vap/usr.bin/rpcgen/rpc_svcout.c#3 integrate .. //depot/projects/vap/usr.bin/window/:tt#3 delete .. //depot/projects/vap/usr.bin/window/:tty#3 delete .. //depot/projects/vap/usr.bin/window/:var#3 delete .. //depot/projects/vap/usr.bin/window/:ww#3 delete .. //depot/projects/vap/usr.sbin/cpucontrol/cpucontrol.c#2 integrate .. //depot/projects/vap/usr.sbin/sysinstall/devices.c#5 integrate .. //depot/projects/vap/usr.sbin/sysinstall/dist.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/dist.h#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/menus.c#6 integrate Differences ... ==== //depot/projects/vap/contrib/gcc/common.opt#3 (text+ko) ==== @@ -578,7 +578,7 @@ Does nothing. Preserved for backward compatibility. fmath-errno -Common Report Var(flag_errno_math) Init(1) +Common Report Var(flag_errno_math) Init(0) Set errno after built-in math functions fmem-report ==== //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.76 2008/08/10 19:02:57 das Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -86,11 +86,6 @@ #define TARGET_ELF 1 -/* This goes away when the math emulator is fixed. */ -#undef TARGET_SUBTARGET_DEFAULT -#define TARGET_SUBTARGET_DEFAULT \ - (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) - /* Don't default to pcc-struct-return, we want to retain compatibility with older gcc versions AND pcc-struct-return is nonreentrant. (even though the SVR4 ABI for the i386 says that records and unions are ==== //depot/projects/vap/contrib/gcc/doc/invoke.texi#3 (text+ko) ==== @@ -5677,7 +5677,8 @@ The default is @option{-fmath-errno}. -On Darwin systems, the math library never sets @code{errno}. There is therefore +On Darwin and FreeBSD systems, the math library never sets @code{errno}. +There is therefore no reason for the compiler to consider the possibility that it might, and @option{-fno-math-errno} is the default. @@ -9507,7 +9508,7 @@ @opindex mno-fancy-math-387 Some 387 emulators do not support the @code{sin}, @code{cos} and @code{sqrt} instructions for the 387. Specify this option to avoid -generating those instructions. This option is the default on FreeBSD, +generating those instructions. This option is the default on OpenBSD and NetBSD@. This option is overridden when @option{-march} indicates that the target cpu will always have an FPU and so the instruction will not need emulation. As of revision 2.6.1, these ==== //depot/projects/vap/etc/periodic/security/550.ipfwlimit#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.10 2005/09/11 14:29:58 maxim Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.11 2008/08/10 18:11:24 antoine Exp $ # # Show ipfw rules which have reached the log limit @@ -42,19 +42,16 @@ case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) - IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` - if [ $? -ne 0 ]; then + IPFW_VERBOSE=`sysctl -n net.inet.ip.fw.verbose 2> /dev/null` + if [ $? -ne 0 ] || [ "$IPFW_VERBOSE" -eq 0 ]; then exit 0 fi TMP=`mktemp -t security` ipfw -a list | grep " log " | \ grep '^[[:digit:]]\+[[:space:]]\+[[:digit:]]\+' | \ - awk -v limit="$IPFW_LOG_LIMIT" \ + awk \ '{if ($6 == "logamount") { if ($2 > $7) - {print $0} - } else { - if ($2 > limit) {print $0}} }' > ${TMP} ==== //depot/projects/vap/games/random/random.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/random/random.c,v 1.22 2008/08/08 01:42:17 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/random.c,v 1.24 2008/08/11 23:24:42 ache Exp $"); #include @@ -162,7 +162,7 @@ /* Compute a random exit status between 0 and denom - 1. */ if (random_exit) - return (int)(denom * random() / RANDOM_MAX); + return (int)(denom * random() / RANDOM_MAX_PLUS1); /* * Select whether to print the first line. (Prime the pump.) @@ -170,7 +170,7 @@ * 0 (which has a 1 / denom chance of being true), we select the * line. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / RANDOM_MAX_PLUS1) == 0; while ((ch = getchar()) != EOF) { if (selected) (void)putchar(ch); @@ -180,7 +180,8 @@ err(2, "stdout"); /* Now see if the next line is to be printed. */ - selected = (int)(denom * random() / RANDOM_MAX) == 0; + selected = (int)(denom * random() / + RANDOM_MAX_PLUS1) == 0; } } if (ferror(stdin)) ==== //depot/projects/vap/games/random/randomize_fd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.5 2008/08/08 02:46:47 ache Exp $"); +__FBSDID("$FreeBSD: src/games/random/randomize_fd.c,v 1.7 2008/08/11 23:24:42 ache Exp $"); #include #include @@ -175,9 +175,9 @@ (type == RANDOM_TYPE_WORDS && isspace(buf[i])) || (eof && i == buflen - 1)) { make_token: - if (numnode == RANDOM_MAX) { + if (numnode == RANDOM_MAX_PLUS1) { errno = EFBIG; - err(1, "too many lines"); + err(1, "too many delimiters"); } numnode++; n = rand_node_allocate(); @@ -215,8 +215,10 @@ if (n->cp == NULL) break; - if ((int)(denom * random() / RANDOM_MAX) == 0) { - ret = printf("%.*s", (int)n->len - 1, n->cp); + if ((int)(denom * random() / + RANDOM_MAX_PLUS1) == 0) { + ret = printf("%.*s", + (int)n->len - 1, n->cp); if (ret < 0) err(1, "printf"); } ==== //depot/projects/vap/games/random/randomize_fd.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/games/random/randomize_fd.h,v 1.3 2008/08/08 01:42:17 ache Exp $ + * $FreeBSD: src/games/random/randomize_fd.h,v 1.4 2008/08/10 11:31:56 ache Exp $ */ #ifndef __RANDOMIZE_FD__ @@ -33,7 +33,7 @@ * The random() function is defined to return values between 0 and * 2^31 - 1 inclusive in random(3). */ -#define RANDOM_MAX 0x80000000UL +#define RANDOM_MAX_PLUS1 0x80000000UL #define RANDOM_TYPE_UNSET 0 #define RANDOM_TYPE_LINES 1 ==== //depot/projects/vap/lib/libarchive/archive_write_set_format_ar.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.7 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ar.c,v 1.8 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -389,6 +389,9 @@ ar = (struct ar_w *)a->format_data; + if (ar == NULL) + return (ARCHIVE_OK); + if (ar->has_strtab > 0) { free(ar->strtab); ar->strtab = NULL; ==== //depot/projects/vap/lib/libarchive/archive_write_set_format_pax.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.47 2008/05/26 17:00:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.48 2008/08/10 02:06:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -1200,6 +1200,9 @@ struct pax *pax; pax = (struct pax *)a->format_data; + if (pax == NULL) + return (ARCHIVE_OK); + archive_string_free(&pax->pax_header); free(pax); a->format_data = NULL; ==== //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.2 2008/03/12 05:12:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); /* * Background: There are two written standards for the tar file format. @@ -93,7 +93,11 @@ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); +#endif } DEFINE_TEST(test_compat_tar_hardlink) ==== //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_pax_filename_encoding.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); #include @@ -149,7 +149,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -175,7 +179,11 @@ assertEqualString(longname, archive_entry_pathname(entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } /* @@ -249,7 +257,11 @@ archive_entry_free(entry); assertEqualInt(0, archive_write_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now read the entries back. @@ -293,5 +305,9 @@ assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry)); assertEqualInt(0, archive_read_close(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else assertEqualInt(0, archive_read_finish(a)); +#endif } ==== //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.5 2008/06/26 11:50:11 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.6 2008/08/10 03:13:42 kientzle Exp $"); DEFINE_TEST(test_read_format_zip) { @@ -51,12 +51,14 @@ assertEqualString("file1", archive_entry_pathname(ae)); assertEqualInt(1179604289, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("archive_read_data() returns number of bytes read"); assertEqualInt(18, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); ==== //depot/projects/vap/lib/libarchive/test/test_tar_large.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_large.c,v 1.3 2008/08/10 21:14:26 kientzle Exp $"); #include #include @@ -179,7 +179,6 @@ #else static off_t memory_read_skip(struct archive *a, void *_private, off_t skip) -#endif { struct memdata *private = _private; @@ -198,6 +197,7 @@ } return (skip); } +#endif DEFINE_TEST(test_tar_large) { ==== //depot/projects/vap/lib/libarchive/test/test_ustar_filenames.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_ustar_filenames.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $"); /* * Exercise various lengths of filenames in ustar archives. @@ -111,7 +111,11 @@ /* Close out the archive. */ assertA(0 == archive_write_close(a)); - assertA(0 == archive_write_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else + assertEqualInt(0, archive_write_finish(a)); +#endif /* * Now, read the data back. @@ -153,7 +157,11 @@ failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen); assertEqualInt(1, archive_read_next_header(a, &ae)); assert(0 == archive_read_close(a)); - assert(0 == archive_read_finish(a)); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_read_finish(a); +#else + assertEqualInt(0, archive_read_finish(a)); +#endif } DEFINE_TEST(test_ustar_filenames) ==== //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.2 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $"); #define UMASK 022 @@ -131,7 +131,11 @@ assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(ad); +#else assertEqualInt(0, archive_write_finish(ad)); +#endif /* Test the entries on disk. */ assert(0 == stat("link1a", &st)); ==== //depot/projects/vap/lib/libarchive/test/test_write_format_tar_ustar.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.1 2008/05/26 17:00:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_tar_ustar.c,v 1.2 2008/08/11 01:19:36 kientzle Exp $"); static int is_null(const char *p, size_t l) @@ -188,7 +188,11 @@ assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); +#if ARCHIVE_VERSION_NUMBER < 2000000 + archive_write_finish(a); +#else assert(0 == archive_write_finish(a)); +#endif /* * Verify the archive format. ==== //depot/projects/vap/lib/libbluetooth/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $ -# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.3 2007/05/21 02:49:02 deischen Exp $ +# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.4 2008/08/13 19:35:31 emax Exp $ LIB= bluetooth MAN= bluetooth.3 @@ -27,4 +27,8 @@ MLINKS+= bluetooth.3 bt_ntoa.3 MLINKS+= bluetooth.3 bt_aton.3 +MLINKS+= bluetooth.3 bdaddr_same.3 +MLINKS+= bluetooth.3 bdaddr_any.3 +MLINKS+= bluetooth.3 bdaddr_copy.3 + .include ==== //depot/projects/vap/lib/libbluetooth/bluetooth.3#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.7 2005/01/21 10:26:11 ru Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.8 2008/08/13 19:35:31 emax Exp $ .\" -.Dd May 7, 2003 +.Dd August 13, 2008 .Dt BLUETOOTH 3 .Os .Sh NAME @@ -40,7 +40,10 @@ .Nm bt_setprotoent , .Nm bt_endprotoent , .Nm bt_aton , -.Nm bt_ntoa +.Nm bt_ntoa , +.Nm bdaddr_same , +.Nm bdaddr_any , +.Nm bdaddr_copy .Nd Bluetooth routines .Sh LIBRARY .Lb libbluetooth @@ -70,6 +73,12 @@ .Fn bt_aton "const char *str" "bdaddr_t *ba" .Ft const char * .Fn bt_ntoa "const bdaddr_t *ba" "char *str" +.Ft int +.Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b" +.Ft int +.Fn bdaddr_any "const bdaddr_t *a" +.Ft int +.Fn bdaddr_copy "const bdaddr_t *dst" "const bdaddr_t *src" .Sh DESCRIPTION The .Fn bt_gethostent , @@ -186,6 +195,28 @@ string representing the address into the buffer provided. It is up to the caller to ensure that provided buffer has enough space. If no buffer was provided then internal static buffer will be used. +.Pp +The +.Fn bdaddr_same , +.Fn bdaddr_any +and +.Fn bdaddr_copy +are handy shorthand Bluetooth address utility functions. +The +.Fn bdaddr_same +function will test if two provided BD_ADDRs are the same. +The +.Fn bdaddr_any +function will test if provided BD_ADDR is +.Dv ANY +BD_ADDR. +The +.Fn bdaddr_copy +function will copy provided +.Fa src +BD_ADDR into provided +.Fa dst +BD_ADDR. .Sh FILES .Bl -tag -width ".Pa /etc/bluetooth/hosts" -compact .It Pa /etc/bluetooth/hosts ==== //depot/projects/vap/lib/libbluetooth/bluetooth.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $ - * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.2 2005/03/17 21:39:44 emax Exp $ + * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.3 2008/08/13 19:35:31 emax Exp $ */ #ifndef _BLUETOOTH_H_ @@ -72,6 +72,36 @@ char const * bt_ntoa (bdaddr_t const *ba, char *str); int bt_aton (char const *str, bdaddr_t *ba); +/* + * bdaddr utility functions (from NetBSD) + */ + +static __inline int +bdaddr_same(const bdaddr_t *a, const bdaddr_t *b) +{ + return (a->b[0] == b->b[0] && a->b[1] == b->b[1] && + a->b[2] == b->b[2] && a->b[3] == b->b[3] && + a->b[4] == b->b[4] && a->b[5] == b->b[5]); +} + +static __inline int +bdaddr_any(const bdaddr_t *a) +{ + return (a->b[0] == 0 && a->b[1] == 0 && a->b[2] == 0 && + a->b[3] == 0 && a->b[4] == 0 && a->b[5] == 0); +} + +static __inline void +bdaddr_copy(bdaddr_t *d, const bdaddr_t *s) +{ + d->b[0] = s->b[0]; + d->b[1] = s->b[1]; + d->b[2] = s->b[2]; + d->b[3] = s->b[3]; + d->b[4] = s->b[4]; + d->b[5] = s->b[5]; +} + __END_DECLS #endif /* ndef _BLUETOOTH_H_ */ ==== //depot/projects/vap/lib/libgeom/geom_xml2tree.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.6 2008/07/08 17:34:50 lulf Exp $ + * $FreeBSD: src/lib/libgeom/geom_xml2tree.c,v 1.7 2008/08/09 11:14:05 des Exp $ */ #include @@ -68,7 +68,7 @@ mt = userData; mt->level++; - mt->sbuf[mt->level] = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + mt->sbuf[mt->level] = sbuf_new_auto(); id = NULL; ref = NULL; for (i = 0; attr[i] != NULL; i += 2) { ==== //depot/projects/vap/lib/libpcap/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libpcap/config.h,v 1.6 2007/10/16 02:10:44 mlaier Exp $ */ +/* $FreeBSD: src/lib/libpcap/config.h,v 1.7 2008/08/13 15:41:21 ed Exp $ */ /* This is an edited copy of the config.h generated by configure. */ /* config.h. Generated by configure. */ @@ -15,7 +15,7 @@ /* #undef BDEBUG */ /* define if you have a cloning BPF device */ -/* #undef HAVE_CLONING_BPF */ +#define HAVE_CLONING_BPF 1 /* define if you have the DAG API */ /* #undef HAVE_DAG_API */ ==== //depot/projects/vap/lib/libthread_db/thread_db.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.7 2008/07/30 00:59:19 marcel Exp $ + * $FreeBSD: src/lib/libthread_db/thread_db.h,v 1.8 2008/08/13 00:03:35 marcel Exp $ */ #ifndef _THREAD_DB_H_ @@ -184,7 +184,7 @@ int ti_pri; lwpid_t ti_lid; char ti_db_suspended; - char ti_traceme; + int ti_traceme; sigset_t ti_sigmask; sigset_t ti_pending; psaddr_t ti_tls; ==== //depot/projects/vap/sbin/geom/class/eli/geli.8#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/sbin/geom/class/eli/geli.8,v 1.22 2007/09/01 06:33:01 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.23 2008/08/12 19:42:03 pjd Exp $ .\" .Dd September 16, 2006 .Dt GELI 8 @@ -81,7 +81,7 @@ .Op Fl e Ar ealgo .Op Fl l Ar keylen .Op Fl s Ar sectorsize -.Ar prov ... +.Ar prov .Nm .Cm configure .Op Fl bB ==== //depot/projects/vap/sbin/geom/class/eli/geom_eli.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.24 2007/05/15 20:25:16 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.25 2008/08/12 19:42:03 pjd Exp $"); #include #include @@ -82,7 +82,7 @@ * attach [-dprv] [-k keyfile] prov * detach [-fl] prov ... * stop - alias for 'detach' - * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov ... + * onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov * configure [-bB] prov ... * setkey [-pPv] [-n keyno] [-k keyfile] [-K newkeyfile] prov * delkey [-afv] [-n keyno] prov @@ -156,7 +156,7 @@ { 's', "sectorsize", §orsize, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - NULL, "[-d] [-a aalgo] [-e ealgo] [-l keylen] [-s sectorsize] prov ..." + NULL, "[-d] [-a aalgo] [-e ealgo] [-l keylen] [-s sectorsize] prov" }, { "configure", G_FLAG_VERBOSE, eli_main, { ==== //depot/projects/vap/sbin/geom/class/virstor/geom_virstor.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.2 2007/11/18 03:17:56 jb Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/virstor/geom_virstor.c,v 1.3 2008/08/09 16:47:30 ivoras Exp $"); #include #include @@ -157,7 +157,6 @@ off_t mediasize; u_char *sector; int error, fd; - ssize_t abc; pathgen(name, path, sizeof(path)); sector = NULL; @@ -183,7 +182,7 @@ goto out; } bcopy(md, sector, size); - if ((abc = pwrite(fd, sector, sectorsize, mediasize - sectorsize)) != + if (pwrite(fd, sector, sectorsize, mediasize - sectorsize) != (ssize_t)sectorsize) { error = errno; goto out; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:30:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7FD71065674; Thu, 14 Aug 2008 15:30:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74B9C106567B for ; Thu, 14 Aug 2008 15:30:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 65A0A8FC1C for ; Thu, 14 Aug 2008 15:30:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EFUrCW097043 for ; Thu, 14 Aug 2008 15:30:53 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EFUr82097041 for perforce@freebsd.org; Thu, 14 Aug 2008 15:30:53 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Aug 2008 15:30:53 GMT Message-Id: <200808141530.m7EFUr82097041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 15:30:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=147391 Change 147391 by hselasky@hselasky_laptop001 on 2008/08/14 15:30:46 Replace some DELAY() calls by "usb2_pause_mtx()". Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#4 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#8 (text+ko) ==== @@ -1427,7 +1427,7 @@ (sc->sc_clocks_on) (sc->sc_clocks_arg); } /* wait a little for things to stabilise */ - DELAY(1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); /* disable and clear all interrupts */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#8 (text+ko) ==== @@ -174,8 +174,7 @@ at91_udp_pull_down(sc); /* wait 10ms for pulldown to stabilise */ - - DELAY(10000); + usb2_pause_mtx(NULL, 10); sc->sc_iclk = at91_pmc_clock_ref("udc_clk"); sc->sc_fclk = at91_pmc_clock_ref("udpck"); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#11 (text+ko) ==== @@ -161,7 +161,7 @@ EOWRITE4(sc, EHCI_USBCMD, 0); /* Halt controller */ for (n = 0; n != 100; n++) { - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); hcr = EOREAD4(sc, EHCI_USBSTS); if (hcr & EHCI_STS_HCH) { hcr = 0; @@ -177,7 +177,7 @@ EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET); for (n = 0; n != 100; n++) { - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); hcr = EOREAD4(sc, EHCI_USBCMD); if (!(hcr & EHCI_CMD_HCRESET)) { hcr = 0; @@ -462,7 +462,7 @@ EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF); for (i = 0; i < 100; i++) { - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH; if (!hcr) { break; @@ -498,10 +498,11 @@ if (ehci_hc_reset(sc)) { DPRINTF("reset failed!\n"); } + /* XXX let stray task complete */ + usb2_pause_mtx(&sc->sc_bus.mtx, 50); + mtx_unlock(&sc->sc_bus.mtx); - DELAY(1000 * 300); /* XXX let stray task complete */ - usb2_callout_drain(&sc->sc_tmo_pcd); return; @@ -537,7 +538,7 @@ if (hcr == 0) { break; } - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); } if (hcr != 0) { @@ -551,7 +552,7 @@ if (hcr == EHCI_STS_HCH) { break; } - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); } if (hcr != EHCI_STS_HCH) { @@ -595,7 +596,8 @@ } if (hcr) { - DELAY(1000 * USB_RESUME_WAIT); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_RESUME_WAIT); for (i = 1; i <= sc->sc_noport; i++) { cmd = EOREAD4(sc, EHCI_PORTSC(i)); @@ -613,15 +615,16 @@ if (hcr != EHCI_STS_HCH) { break; } - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); } if (hcr == EHCI_STS_HCH) { device_printf(sc->sc_bus.bdev, "config timeout\n"); } + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_RESUME_WAIT); + mtx_unlock(&sc->sc_bus.mtx); - DELAY(1000 * USB_RESUME_WAIT); - /* catch any lost interrupts */ ehci_do_poll(&sc->sc_bus); @@ -3357,9 +3360,8 @@ DELAY(USB_PORT_ROOT_RESET_DELAY * 1000); } else { /* Wait for reset to complete. */ - l = usb2_config_td_sleep - (&sc->sc_config_td, - (hz * USB_PORT_ROOT_RESET_DELAY) / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_PORT_ROOT_RESET_DELAY); } /* Terminate reset sequence. */ @@ -3370,9 +3372,8 @@ DELAY(EHCI_PORT_RESET_COMPLETE * 1000); } else { /* Wait for HC to complete reset. */ - l = usb2_config_td_sleep - (&sc->sc_config_td, - (hz * EHCI_PORT_RESET_COMPLETE) / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, + EHCI_PORT_RESET_COMPLETE); } v = EOREAD4(sc, port); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#8 (text+ko) ==== @@ -453,7 +453,7 @@ "to give up control\n"); pci_write_config(self, eecp + EHCI_LEGSUP_OS_SEM, 1, 1); - to = 5000; + to = 500; while (1) { bios_sem = pci_read_config(self, eecp + EHCI_LEGSUP_BIOS_SEM, 1); @@ -465,7 +465,7 @@ "timed out waiting for BIOS\n"); break; } - DELAY(1000); + usb2_pause_mtx(NULL, 10); /* wait 10ms */ } } return; ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#4 (text+ko) ==== @@ -238,11 +238,7 @@ DELAY(10000); } else { /* Wait for reset to complete. */ - if (usb2_config_td_sleep - (&sc->sc_config_td, - (hz / 100))) { - /* ignore */ - } + usb2_pause_mtx(&sc->sc_bus.mtx, 10); } temp = MUSB2_READ_1(sc, MUSB2_REG_POWER); @@ -1514,7 +1510,7 @@ (sc->sc_clocks_on) (sc->sc_clocks_arg); } /* wait a little for things to stabilise */ - DELAY(1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); /* disable and clear all interrupts */ @@ -1536,8 +1532,7 @@ musbotg_pull_common(sc, 0); /* wait a little bit (10ms) */ - - DELAY(10000); + usb2_pause_mtx(&sc->sc_bus.mtx, 10); /* enable double packet buffering */ ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#10 (text+ko) ==== @@ -173,7 +173,7 @@ DPRINTF("SMM active, request owner change\n"); OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_OCR); for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) { - DELAY(1000 * 1); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); ctl = OREAD4(sc, OHCI_CONTROL); } if (ctl & OHCI_IR) { @@ -186,7 +186,8 @@ DPRINTF("cold started\n"); reset: /* controller was cold started */ - DELAY(1000 * USB_BUS_RESET_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_BUS_RESET_DELAY); } /* @@ -195,7 +196,9 @@ */ DPRINTF("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev)); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); - DELAY(1000 * USB_BUS_RESET_DELAY); + + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_BUS_RESET_DELAY); /* we now own the host controller and the bus has been reset */ ival = OHCI_GET_IVAL(OREAD4(sc, OHCI_FM_INTERVAL)); @@ -257,7 +260,8 @@ desca = OREAD4(sc, OHCI_RH_DESCRIPTOR_A); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca | OHCI_NOCP); OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */ - DELAY(1000 * OHCI_ENABLE_POWER_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, + OHCI_ENABLE_POWER_DELAY); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca); /* @@ -266,7 +270,8 @@ */ sc->sc_noport = 0; for (i = 0; (i < 10) && (sc->sc_noport == 0); i++) { - DELAY(1000 * OHCI_READ_DESC_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, + OHCI_READ_DESC_DELAY); sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); } @@ -426,10 +431,11 @@ OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); + /* XXX let stray task complete */ + usb2_pause_mtx(&sc->sc_bus.mtx, 50); + mtx_unlock(&sc->sc_bus.mtx); - DELAY(1000 * 50); /* XXX let stray task complete */ - usb2_callout_drain(&sc->sc_tmo_rhsc); return; @@ -463,7 +469,9 @@ } ctl |= OHCI_HCFS_SUSPEND; OWRITE4(sc, OHCI_CONTROL, ctl); - DELAY(1000 * USB_RESUME_WAIT); + + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_RESUME_WAIT); mtx_unlock(&sc->sc_bus.mtx); return; @@ -495,10 +503,10 @@ ctl = OREAD4(sc, OHCI_CONTROL); ctl |= OHCI_HCFS_RESUME; OWRITE4(sc, OHCI_CONTROL, ctl); - DELAY(1000 * USB_RESUME_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, USB_RESUME_DELAY); ctl = (ctl & ~OHCI_HCFS_MASK) | OHCI_HCFS_OPERATIONAL; OWRITE4(sc, OHCI_CONTROL, ctl); - DELAY(1000 * USB_RESUME_RECOVERY); + usb2_pause_mtx(&sc->sc_bus.mtx, USB_RESUME_RECOVERY); sc->sc_control = sc->sc_intre = 0; mtx_unlock(&sc->sc_bus.mtx); @@ -2448,9 +2456,8 @@ /* polling */ DELAY(USB_PORT_ROOT_RESET_DELAY * 1000); } else { - l = usb2_config_td_sleep - (&sc->sc_config_td, - (hz * USB_PORT_ROOT_RESET_DELAY) / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_PORT_ROOT_RESET_DELAY); } if ((OREAD4(sc, port) & UPS_RESET) == 0) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#8 (text+ko) ==== @@ -279,7 +279,8 @@ /* wait */ - DELAY(1000 * USB_BUS_RESET_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_BUS_RESET_DELAY); /* terminate all transfers */ @@ -291,7 +292,7 @@ while (n--) { /* wait one millisecond */ - DELAY(1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); if (!(UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET)) { goto done_1; @@ -307,7 +308,7 @@ while (n--) { /* wait one millisecond */ - DELAY(1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); /* check if HC is stopped */ if (UREAD2(sc, UHCI_STS) & UHCI_STS_HCH) { @@ -354,7 +355,7 @@ while (n--) { /* wait one millisecond */ - DELAY(1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); /* check that controller has started */ @@ -647,7 +648,7 @@ UHCICMD(sc, UHCI_CMD_EGSM); - DELAY(1000 * USB_RESUME_WAIT); + usb2_pause_mtx(&sc->sc_bus.mtx, USB_RESUME_WAIT); mtx_unlock(&sc->sc_bus.mtx); return; @@ -666,7 +667,8 @@ UHCICMD(sc, UHCI_CMD_FGR); - DELAY(1000 * USB_RESUME_DELAY); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_RESUME_DELAY); /* and start traffic again */ @@ -2420,7 +2422,6 @@ uint16_t port; uint16_t x; uint8_t lim; - uint8_t l; if (index == 1) port = UHCI_PORTSC1; @@ -2436,8 +2437,8 @@ /* polling */ DELAY(USB_PORT_ROOT_RESET_DELAY * 1000); } else { - l = usb2_config_td_sleep(&sc->sc_config_td, - (hz * USB_PORT_ROOT_RESET_DELAY) / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_PORT_ROOT_RESET_DELAY); } DPRINTFN(4, "uhci port %d reset, status0 = 0x%04x\n", @@ -2450,8 +2451,7 @@ /* polling */ DELAY(1000); } else { - l = usb2_config_td_sleep(&sc->sc_config_td, - hz / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, 1); } DPRINTFN(4, "uhci port %d reset, status1 = 0x%04x\n", @@ -2466,8 +2466,8 @@ /* polling */ DELAY(USB_PORT_RESET_DELAY * 1000); } else { - l = usb2_config_td_sleep(&sc->sc_config_td, - (hz * USB_PORT_RESET_DELAY) / 1000); + usb2_pause_mtx(&sc->sc_bus.mtx, + USB_PORT_RESET_DELAY); } x = UREAD2(sc, port); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#7 (text+ko) ==== @@ -1386,8 +1386,7 @@ uss820dci_pull_down(sc); /* wait 10ms for pulldown to stabilise */ - - DELAY(10000); + usb2_pause_mtx(&sc->sc_bus.mtx, 10); /* check hardware revision */ temp = USS820_READ_1(sc, USS820_REV); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#4 (text+ko) ==== @@ -125,9 +125,9 @@ * usb2_pause_mtx - factored out code * * This function will delay the code by the passed number of - * milliseconds. The passed mutex "mtx" will be dropped while - * waiting. The number of milliseconds per second is 1024 for sake of - * optimisation. + * milliseconds. The passed mutex "mtx" will be dropped while waiting, + * if "mtx" is not NULL. The number of milliseconds per second is 1024 + * for sake of optimisation. *------------------------------------------------------------------------*/ void usb2_pause_mtx(struct mtx *mtx, uint32_t ms) @@ -145,12 +145,14 @@ */ ms++; - mtx_unlock(mtx); + if (mtx != NULL) + mtx_unlock(mtx); if (pause("USBWAIT", ms)) { /* ignore */ } - mtx_lock(mtx); + if (mtx != NULL) + mtx_lock(mtx); } return; } From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:32:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE2D31065684; Thu, 14 Aug 2008 15:32:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A15B71065681 for ; Thu, 14 Aug 2008 15:32:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93E848FC0C for ; Thu, 14 Aug 2008 15:32:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EFWtvQ097179 for ; Thu, 14 Aug 2008 15:32:55 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EFWt2A097177 for perforce@freebsd.org; Thu, 14 Aug 2008 15:32:55 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 15:32:55 GMT Message-Id: <200808141532.m7EFWt2A097177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 15:32:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147392 Change 147392 by trasz@trasz_traszkan on 2008/08/14 15:32:00 Tweak computing mode from ACL and computing inherited ACL to match ZFS. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#24 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#24 (text+ko) ==== @@ -686,8 +686,10 @@ entry->ae_extended != ACL_EXTENDED_DENY) continue; +#ifdef SunOS_doesnt_do_that if (entry->ae_flags & ACL_ENTRY_ONLY_INHERIT) continue; +#endif if (entry->ae_tag == ACL_USER_OBJ) { if ((entry->ae_perm & ACL_READ_DATA) && @@ -857,6 +859,14 @@ ACL_ENTRY_ONLY_INHERIT); /* + * This is not in the specification, but SunOS + * apparently does that. + */ + if (entry->ae_extended == ACL_EXTENDED_ALLOW) + entry->ae_perm &= ~(ACL_WRITE_ACL | + ACL_WRITE_OWNER); + + /* * Continue on to the next ACE. */ continue; @@ -880,7 +890,7 @@ } /* - * 2.C. If the type of hte ACE is neither ALLOW nor deny, + * 2.C. If the type of the ACE is neither ALLOW nor deny, * then continue. */ if (entry->ae_extended != ACL_EXTENDED_ALLOW && @@ -912,9 +922,6 @@ * an implementation MAY clear the following * mask bits: ACL_WRITE_ACL, ACL_WRITE_OWNER. */ - /* - * XXX: MAY? - */ if (copy->ae_extended == ACL_EXTENDED_ALLOW) copy->ae_perm &= ~(ACL_WRITE_ACL | ACL_WRITE_OWNER); From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:35:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4432C1065689; Thu, 14 Aug 2008 15:35:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07B881065680 for ; Thu, 14 Aug 2008 15:35:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D49668FC1F for ; Thu, 14 Aug 2008 15:35:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EFZwBJ097515 for ; Thu, 14 Aug 2008 15:35:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EFZwqg097513 for perforce@freebsd.org; Thu, 14 Aug 2008 15:35:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Aug 2008 15:35:58 GMT Message-Id: <200808141535.m7EFZwqg097513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 15:35:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147394 Change 147394 by hselasky@hselasky_laptop001 on 2008/08/14 15:35:15 Turn on BUS-DMA support in UMASS driver by default. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#5 (text+ko) ==== @@ -124,7 +124,7 @@ #include -#if 0 +#if 1 /* this enables loading of virtual buffers into DMA */ #define UMASS_USB_FLAGS .ext_buffer=1, #else From owner-p4-projects@FreeBSD.ORG Thu Aug 14 15:42:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 756841065674; Thu, 14 Aug 2008 15:42:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38D841065671 for ; Thu, 14 Aug 2008 15:42:05 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2BF4E8FC1A for ; Thu, 14 Aug 2008 15:42:05 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EFg51O098018 for ; Thu, 14 Aug 2008 15:42:05 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EFg5K4098016 for perforce@freebsd.org; Thu, 14 Aug 2008 15:42:05 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 14 Aug 2008 15:42:05 GMT Message-Id: <200808141542.m7EFg5K4098016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 147395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 15:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=147395 Change 147395 by sson@sson_amd64 on 2008/08/14 15:42:03 Fixed auditd break. String length clean up. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#36 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#36 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#36 $ */ #include @@ -72,9 +72,6 @@ #include "audit_triggers_server.h" #endif /* USE_MACH_IPC */ -#ifndef HAVE_STRLCAT -#include -#endif #ifndef HAVE_STRLCPY #include #endif @@ -160,11 +157,10 @@ syslog(LOG_DEBUG, "dir = %s", dirent->dirname); /* - * Sanity check on file name. It should be exactly the size - * (2 * POSTFIX_LEN) + 1. + * Sanity check on file name. */ - if (strlen(name) != (2 * POSTFIX_LEN) + 1) { - syslog(LOG_ERR, "invalid filename (%s)", name); + if (strlen(name) != (FILENAME_LEN - 1)) { + syslog(LOG_ERR, "Invalid file name: %s", name); return (NULL); } asprintf(&fn, "%s/%s", dirent->dirname, name); @@ -190,7 +186,7 @@ /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { - strlcpy(ptr, TS, POSTFIX_LEN); + strlcpy(ptr, TS, TIMESTAMP_LEN); if (rename(oldname, lastfile) != 0) syslog(LOG_ERR, "Could not rename %s to %s: %m", oldname, @@ -244,9 +240,9 @@ static int swap_audit_file(void) { - char timestr[(2 * POSTFIX_LEN) + 1]; + char timestr[FILENAME_LEN]; char *fn; - char TS[POSTFIX_LEN]; + char TS[TIMESTAMP_LEN]; struct dir_ent *dirent; #ifdef AUDIT_REVIEW_GROUP struct group *grp; @@ -255,12 +251,10 @@ #endif int error, fd; - if (getTSstr(TS, POSTFIX_LEN) != 0) + if (getTSstr(TS, TIMESTAMP_LEN) != 0) return (-1); - strlcpy(timestr, TS, POSTFIX_LEN); - strlcat(timestr, ".", 1); - strlcat(timestr, NOT_TERMINATED, POSTFIX_LEN); + snprintf(timestr, FILENAME_LEN, "%s.%s", TS, NOT_TERMINATED); #ifdef AUDIT_REVIEW_GROUP /* @@ -411,7 +405,7 @@ { struct auditinfo ai; int err_ret = 0; - char TS[POSTFIX_LEN]; + char TS[TIMESTAMP_LEN]; int aufd; token_t *tok; long cond; @@ -446,7 +440,7 @@ strerror(errno)); err_ret = 1; } - if (getTSstr(TS, POSTFIX_LEN) == 0) + if (getTSstr(TS, TIMESTAMP_LEN) == 0) close_lastfile(TS); if (lastfile != NULL) free(lastfile); ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#11 (text+ko) ==== @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#11 $ */ #ifndef _AUDITD_H_ @@ -46,8 +46,10 @@ */ #define AUDIT_REVIEW_GROUP "audit" -#define POSTFIX_LEN (sizeof("YYYYMMDDhhmmss") - 1) #define NOT_TERMINATED "not_terminated" +#define POSTFIX_LEN (sizeof("YYYYMMDDhhmmss") - 1) +#define FILENAME_LEN ((2 * POSTFIX_LEN) + 2) +#define TIMESTAMP_LEN (POSTFIX_LEN + 1) struct dir_ent { char *dirname; From owner-p4-projects@FreeBSD.ORG Thu Aug 14 16:02:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BBDE1065672; Thu, 14 Aug 2008 16:02:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2534106564A for ; Thu, 14 Aug 2008 16:02:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C83DD8FC29 for ; Thu, 14 Aug 2008 16:02:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EG2PK9099533 for ; Thu, 14 Aug 2008 16:02:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EG2PRO099531 for perforce@freebsd.org; Thu, 14 Aug 2008 16:02:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 14 Aug 2008 16:02:25 GMT Message-Id: <200808141602.m7EG2PRO099531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 16:02:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147396 Change 147396 by hselasky@hselasky_laptop001 on 2008/08/14 16:01:56 Diff reduction. Affected files ... .. //depot/projects/usb/src/sys/arm/at91/at91_piovar.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/arm/at91/at91_piovar.h#7 (text+ko) ==== @@ -25,18 +25,19 @@ /* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H -#define ARM_AT91_AT91_PIOVAR_H +#define ARM_AT91_AT91_PIOVAR_H -void at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask, int use_pullup); -void at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask, int use_pullup); -void at91_pio_use_gpio(uint32_t pio, uint32_t gpio_mask); -void at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask); -void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, int use_pullup); -void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); -void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); -uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); -void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch); -void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); +void at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask, int use_pullup); +void at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask, int use_pullup); +void at91_pio_use_gpio(uint32_t pio, uint32_t gpio_mask); +void at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask); +void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, + int use_pullup); +void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); +void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); +uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); +void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch); +void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio); -#endif /* ARM_AT91_AT91_PIOVAR_H */ +#endif /* ARM_AT91_AT91_PIOVAR_H */ From owner-p4-projects@FreeBSD.ORG Thu Aug 14 17:31:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD81410656D7; Thu, 14 Aug 2008 17:31:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7088B10656C1 for ; Thu, 14 Aug 2008 17:31:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EF978FC14 for ; Thu, 14 Aug 2008 17:31:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EHVu0Y018123 for ; Thu, 14 Aug 2008 17:31:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EHVuGE018121 for perforce@freebsd.org; Thu, 14 Aug 2008 17:31:56 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 17:31:56 GMT Message-Id: <200808141731.m7EHVuGE018121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 17:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147399 Change 147399 by trasz@trasz_traszkan on 2008/08/14 17:31:11 Even more tests for inheritance. These are produced from ZFS behaviour and test something that is not quite standard. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#6 (text+ko) ==== @@ -606,6 +606,136 @@ > everyone@:rwxp---A-W-Co-:------:deny > everyone@:------a-R-c--s:------:allow +# There is some complication regarding how write_acl and write_owner flags +# get inherited. Make sure we got it right. +$ setfacl -b . +$ setfacl -a0 u:42:Co:f:allow . +$ setfacl -a0 u:43:Co:d:allow . +$ setfacl -a0 u:44:Co:fd:allow . +$ setfacl -a0 u:45:Co:fi:allow . +$ setfacl -a0 u:46:Co:di:allow . +$ setfacl -a0 u:47:Co:fdi:allow . +$ setfacl -a0 u:48:Co:fn:allow . +$ setfacl -a0 u:49:Co:dn:allow . +$ setfacl -a0 u:50:Co:fdn:allow . +$ setfacl -a0 u:51:Co:fni:allow . +$ setfacl -a0 u:52:Co:dni:allow . +$ setfacl -a0 u:53:Co:fdni:allow . +$ umask 022 +$ rm xxx +$ touch xxx +$ getfacl -nq xxx +> user:53:--------------:------:deny +> user:53:--------------:------:allow +> user:51:--------------:------:deny +> user:51:--------------:------:allow +> user:50:--------------:------:deny +> user:50:--------------:------:allow +> user:48:--------------:------:deny +> user:48:--------------:------:allow +> user:47:--------------:------:deny +> user:47:--------------:------:allow +> user:45:--------------:------:deny +> user:45:--------------:------:allow +> user:44:--------------:------:deny +> user:44:--------------:------:allow +> user:42:--------------:------:deny +> user:42:--------------:------:allow +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow + +$ rmdir yyy +$ mkdir yyy +$ getfacl -nq yyy +> user:53:--------------:------:deny +> user:53:--------------:------:allow +> user:52:--------------:------:deny +> user:52:--------------:------:allow +> user:50:--------------:------:deny +> user:50:--------------:------:allow +> user:49:--------------:------:deny +> user:49:--------------:------:allow +> user:47:-----------Co-:fdi---:allow +> user:47:--------------:------:deny +> user:47:--------------:------:allow +> user:46:-----------Co-:-di---:allow +> user:46:--------------:------:deny +> user:46:--------------:------:allow +> user:45:--------------:f-i---:allow +> user:44:-----------Co-:fdi---:allow +> user:44:--------------:------:deny +> user:44:--------------:------:allow +> user:43:-----------Co-:-di---:allow +> user:43:--------------:------:deny +> user:43:--------------:------:allow +> user:42:--------------:f-i---:allow +> owner@:--------------:------:deny +> owner@:rwxp---A-W-Co-:------:allow +> group@:-w-p----------:------:deny +> group@:r-x-----------:------:allow +> everyone@:-w-p---A-W-Co-:------:deny +> everyone@:r-x---a-R-c--s:------:allow + +$ setfacl -b . +$ setfacl -a0 u:42:Co:f:deny . +$ setfacl -a0 u:43:Co:d:deny . +$ setfacl -a0 u:44:Co:fd:deny . +$ setfacl -a0 u:45:Co:fi:deny . +$ setfacl -a0 u:46:Co:di:deny . +$ setfacl -a0 u:47:Co:fdi:deny . +$ setfacl -a0 u:48:Co:fn:deny . +$ setfacl -a0 u:49:Co:dn:deny . +$ setfacl -a0 u:50:Co:fdn:deny . +$ setfacl -a0 u:51:Co:fni:deny . +$ setfacl -a0 u:52:Co:dni:deny . +$ setfacl -a0 u:53:Co:fdni:deny . +$ umask 022 +$ rm xxx +$ touch xxx +$ getfacl -nq xxx +> user:53:-----------Co-:------:deny +> user:51:-----------Co-:------:deny +> user:50:-----------Co-:------:deny +> user:48:-----------Co-:------:deny +> user:47:-----------Co-:------:deny +> user:45:-----------Co-:------:deny +> user:44:-----------Co-:------:deny +> user:42:-----------Co-:------:deny +> owner@:--x-----------:------:deny +> owner@:rw-p---A-W-Co-:------:allow +> group@:-wxp----------:------:deny +> group@:r-------------:------:allow +> everyone@:-wxp---A-W-Co-:------:deny +> everyone@:r-----a-R-c--s:------:allow + +$ rmdir yyy +$ mkdir yyy +$ getfacl -nq yyy +> user:53:-----------Co-:------:deny +> user:52:-----------Co-:------:deny +> user:50:-----------Co-:------:deny +> user:49:-----------Co-:------:deny +> user:47:-----------Co-:fdi---:deny +> user:47:-----------Co-:------:deny +> user:46:-----------Co-:-di---:deny +> user:46:-----------Co-:------:deny +> user:45:-----------Co-:f-i---:deny +> user:44:-----------Co-:fdi---:deny +> user:44:-----------Co-:------:deny +> user:43:-----------Co-:-di---:deny +> user:43:-----------Co-:------:deny +> user:42:-----------Co-:f-i---:deny +> owner@:--------------:------:deny +> owner@:rwxp---A-W-Co-:------:allow +> group@:-w-p----------:------:deny +> group@:r-x-----------:------:allow +> everyone@:-w-p---A-W-Co-:------:deny +> everyone@:r-x---a-R-c--s:------:allow + $ rmdir yyy $ rm xxx $ cd .. From owner-p4-projects@FreeBSD.ORG Thu Aug 14 18:29:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37F451065752; Thu, 14 Aug 2008 18:29:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6B74106569F for ; Thu, 14 Aug 2008 18:28:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43BBE8FC26 for ; Thu, 14 Aug 2008 18:28:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EISxWs023917 for ; Thu, 14 Aug 2008 18:28:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EISxvn023915 for perforce@freebsd.org; Thu, 14 Aug 2008 18:28:59 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 18:28:59 GMT Message-Id: <200808141828.m7EISxvn023915@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 18:29:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147402 Change 147402 by trasz@trasz_traszkan on 2008/08/14 18:28:04 Make inheritance in UFS work just as in ZFS. There is some non-standard behaviour, but 1. it is the same thing ZFS does and 2. it does not elevate privileges or loosen restrictions in any way; actually it does the reverse. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#25 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#25 (text+ko) ==== @@ -804,7 +804,7 @@ const struct acl *parent_aclp, mode_t mode, int file_owner_id, int is_directory) { - int i, error; + int i, error, flags; const struct acl_entry *parent_entry; struct acl_entry *entry, *copy; @@ -822,14 +822,30 @@ */ for (i = 0; i < parent_aclp->acl_cnt; i++) { parent_entry = &(parent_aclp->acl_entry[i]); + flags = parent_entry->ae_flags; + + /* + * Entry is not inheritable at all. + */ + if ((flags & (ACL_ENTRY_DIRECTORY_INHERIT | + ACL_ENTRY_FILE_INHERIT)) == 0) + continue; - if (((parent_entry->ae_flags & - ACL_ENTRY_FILE_INHERIT) == 0) && !is_directory) + /* + * We're creating a file, but entry is not inheritable + * by files. + */ + if (!is_directory && (flags & ACL_ENTRY_FILE_INHERIT) == 0) continue; - if ((parent_entry->ae_flags & - (ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENTRY_FILE_INHERIT)) == 0) + /* + * Entry is inheritable only by files, but has NO_PROPAGATE + * flag set, and we're creating a directory, so it wouldn't + * propagate to any file in that directory anyway. + */ + if (is_directory && + (flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0 && + (flags & ACL_ENTRY_LIMIT_INHERIT)) continue; KASSERT(child_aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, @@ -846,6 +862,16 @@ entry = &(child_aclp->acl_entry[i]); /* + * This is not in the specification, but SunOS + * apparently does that. + */ + if (((entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT) || + (entry->ae_flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0 || + !is_directory) && + entry->ae_extended == ACL_EXTENDED_ALLOW) + entry->ae_perm &= ~(ACL_WRITE_ACL | ACL_WRITE_OWNER); + + /* * 2.A. If the ACL_ENTRY_LIMIT_INHERIT is set, or if the object * being created is not a directory, then clear the * following flags: ACL_ENTRY_LIMIT_INHERIT, @@ -859,14 +885,6 @@ ACL_ENTRY_ONLY_INHERIT); /* - * This is not in the specification, but SunOS - * apparently does that. - */ - if (entry->ae_extended == ACL_EXTENDED_ALLOW) - entry->ae_perm &= ~(ACL_WRITE_ACL | - ACL_WRITE_OWNER); - - /* * Continue on to the next ACE. */ continue; From owner-p4-projects@FreeBSD.ORG Thu Aug 14 20:25:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E0EC1065687; Thu, 14 Aug 2008 20:25:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50C0C1065675 for ; Thu, 14 Aug 2008 20:25:58 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DF4B8FC1C for ; Thu, 14 Aug 2008 20:25:58 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EKPwII036007 for ; Thu, 14 Aug 2008 20:25:58 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EKPwaw036005 for perforce@freebsd.org; Thu, 14 Aug 2008 20:25:58 GMT (envelope-from gabor@freebsd.org) Date: Thu, 14 Aug 2008 20:25:58 GMT Message-Id: <200808142025.m7EKPwaw036005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 20:25:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147408 Change 147408 by gabor@gabor_server on 2008/08/14 20:25:14 IFC Affected files ... .. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 integrate .. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/docproj_es/doc/share/mk/doc.xml.mk#2 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/beech.key#2 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/brix.key#3 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/bz.key#2 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/glarkin.key#1 branch .. //depot/projects/docproj_es/doc/share/pgpkeys/nwhitehorn.key#1 branch .. //depot/projects/docproj_es/doc/share/pgpkeys/pgollucci.key#1 branch .. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#4 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#4 integrate .. //depot/projects/docproj_es/doc/share/pgpkeys/rnoland.key#1 branch .. //depot/projects/docproj_es/doc/share/pgpkeys/sson.key#1 branch .. //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#4 integrate .. //depot/projects/docproj_es/doc/share/sgml/mirrors.xml#3 integrate .. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/docproj_es/www/en/administration.sgml#2 integrate .. //depot/projects/docproj_es/www/en/cgi/cvsweb.conf#2 integrate .. //depot/projects/docproj_es/www/en/cgi/man.cgi#5 integrate .. //depot/projects/docproj_es/www/en/community.xsl#3 integrate .. //depot/projects/docproj_es/www/en/community/Makefile#2 integrate .. //depot/projects/docproj_es/www/en/community/social.xsl#1 branch .. //depot/projects/docproj_es/www/en/developers.sgml#4 integrate .. //depot/projects/docproj_es/www/en/developers/cvs.sgml#2 integrate .. //depot/projects/docproj_es/www/en/docproj/current.sgml#2 integrate .. //depot/projects/docproj_es/www/en/donations/donors.sgml#3 integrate .. //depot/projects/docproj_es/www/en/events/Makefile#2 integrate .. //depot/projects/docproj_es/www/en/gnome/docs/develfaq.sgml#2 integrate .. //depot/projects/docproj_es/www/en/gnome/docs/faq2.sgml#2 integrate .. //depot/projects/docproj_es/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/docproj_es/www/en/gnome/index.xsl#3 integrate .. //depot/projects/docproj_es/www/en/java/dists/16.sgml#2 integrate .. //depot/projects/docproj_es/www/en/projects/c99/index.sgml#2 integrate .. //depot/projects/docproj_es/www/en/releases/index.sgml#2 integrate .. //depot/projects/docproj_es/www/en/search/search.sgml#3 integrate .. //depot/projects/docproj_es/www/en/support/bugreports.sgml#2 integrate .. //depot/projects/docproj_es/www/share/mk/doc.xml.mk#2 integrate .. //depot/projects/docproj_es/www/share/sgml/advisories.xml#2 integrate .. //depot/projects/docproj_es/www/share/sgml/commercial.consult.xml#4 integrate .. //depot/projects/docproj_es/www/share/sgml/events.xml#4 integrate .. //depot/projects/docproj_es/www/share/sgml/navibar.ent#2 integrate .. //depot/projects/docproj_es/www/share/sgml/news.xml#5 integrate .. //depot/projects/docproj_es/www/share/sgml/press.xml#3 integrate .. //depot/projects/docproj_es/www/share/sgml/templates.events.xsl#3 integrate .. //depot/projects/docproj_es/www/share/sgml/templates.pastevents.xsl#1 branch Differences ... ==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.451 2008/06/19 15:03:43 amdmi3 Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.459 2008/08/09 19:21:39 sbruno Exp $ --> aaron@FreeBSD.org"> @@ -318,6 +318,8 @@ erich@FreeBSD.org"> +erik@FreeBSD.org"> + erwin@FreeBSD.org"> fanf@FreeBSD.org"> @@ -364,6 +366,8 @@ gj@FreeBSD.org"> +glarkin@FreeBSD.org"> + glebius@FreeBSD.org"> glewis@FreeBSD.org"> @@ -778,6 +782,8 @@ nsouch@FreeBSD.org"> +nwhitehorn@FreeBSD.org"> + nyan@FreeBSD.org"> obraun@FreeBSD.org"> @@ -824,6 +830,8 @@ pgj@FreeBSD.org"> +pgollucci@FreeBSD.org"> + phantom@FreeBSD.org"> philip@FreeBSD.org"> @@ -870,6 +878,8 @@ rink@FreeBSD.org"> +rnoland@FreeBSD.org"> + rnordier@FreeBSD.org"> roam@FreeBSD.org"> @@ -912,6 +922,8 @@ sat@FreeBSD.org"> +sbruno@FreeBSD.org"> + scf@FreeBSD.org"> schweikh@FreeBSD.org"> @@ -970,6 +982,8 @@ sos@FreeBSD.org"> +sson@FreeBSD.org"> + ssouhlal@FreeBSD.org"> adam@redprince.net"> @@ -1070,6 +1084,8 @@ ups@FreeBSD.org"> +vanhu@FreeBSD.org"> + vanilla@FreeBSD.org"> vd@FreeBSD.org"> ==== //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -423,11 +423,19 @@ FreeBSD vendors pre-release coordination mailing list"> freebsd-vendors"> + +Discussion of various virtualization techniques supported by FreeBSD"> +freebsd-virtualization"> + -Discussion on the VuXML +Discussion on the VuXML infrastructure"> freebsd-vuxml"> + +FreeBSD Work-In-Progress Status"> +freebsd-wip-status"> + FreeBSD Webmaster mailing list"> freebsd-www"> ==== //depot/projects/docproj_es/doc/share/mk/doc.xml.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.13 2008/01/16 08:21:47 murray Exp $ +# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.14 2008/06/22 23:14:33 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -187,6 +187,7 @@ .endif XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl +XSL_EVENTS_PAST= ${WEB_PREFIX}/share/sgml/templates.pastevents.xsl # DEPENDSET: commercial ........................................................ _DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \ ==== //depot/projects/docproj_es/doc/share/pgpkeys/beech.key#2 (text+ko) ==== @@ -1,35 +1,35 @@ - + -sub 1024g/018C35E9 2007-06-09 +sub 1024g/5D7681A3 2007-06-08 ]]> ==== //depot/projects/docproj_es/doc/share/pgpkeys/brix.key#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -6,7 +6,6 @@ pub 1024D/54E278F8 2003-04-09 Key fingerprint = 7B63 EF32 7831 A704 220D 7E61 BFE4 387E 54E2 78F8 uid Henrik Brix Andersen -uid Henrik Brix Andersen uid Henrik Brix Andersen sub 1024g/3B13C209 2003-04-09 ]]> @@ -115,110 +114,112 @@ p2dnSIaZefM4bnKifsWwr6fDRb4TowSTV/rAGiP0tTpj4GiNS3n570g4w2EO/jrt d+e7dxxQByOrkSP5AASQ2FBFdvWBHNmnLyMNHQGPeRdgxFGAUyRdQuplKZdQpMmI 64Pgp9jTRxmxVdYqYTaOdunVYs5B+7QkSGVucmlrIEJyaXggQW5kZXJzZW4gPGJy -aXhAYWF1dWcuZGs+iF4EExECAB4FAkNCRCUCGwMGCwkIBwMCAxUCAwMWAgECHgEC -F4AACgkQv+Q4flTiePhB6wCdEl+U42TOiSvAx9ECTSKR2pEyYoEAnj0O+McjsCxg -eWOAiHxkH6S1MSA5iEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo3JYwCgvJXm7Sv3 -0SSF/vkUA7lYZnMXpk4AoJhq9b0iLW4qwgNhgrYYbBE6c+6piJwEEAECAAYFAkQM -D3YACgkQH3+pCANY/L1+5QP7BxzDnx+SYAqmAWudmO5gqRzwhB4L9nrtPa3hGkWN -EMuxJjBCkJJHoX/rxMYkR2ZdSFIFX++7Y3qsI7d2GUCMBgCqN8zdfwWvrpjBBNpL -SVliNwvEujAi1BmTixDbiq4CKwai6gxsFEDYsA05cX2Njg1bYbX/XjRcGpNQPKun -a8GIRgQQEQIABgUCRAycfgAKCRAJxOeJkBbvUN6JAJ9fHHR1Ms09rYyajMra0aX+ -7XaUswCcCjNoayZQlf+6DkJBaQFiGi/FMTCIRgQQEQIABgUCRDFIzQAKCRDz3nmC -81+kz2+0AJ4pLGBcGNMBWAIOujapeYQfKif2TQCcCgcrHLwm7btUTbaHHD1g5LMw -paeIRgQQEQIABgUCRMz8SAAKCRBdVo7rtLWu28G4AJ92TcPH0fM68/NerGJRA5Qt -sYm9CwCdHCuab38MAWv115wvbrXLQZK4HcOIRgQTEQIABgUCRQ1LqQAKCRCfd8Cs -b3oRX3tPAKCMuerpLB9Boh39hsmcVfw8MZjlggCg7kMhr5MI6/a2z2oLvakXo2Ao -M5KIRgQQEQIABgUCRSzZqQAKCRDVCFOpIhPnco9wAJ93feKzaBOMflNEpZH4B+jt -N5bm9gCgrthnnQToMNZl3b5RWvLiP0f0pAyJAkgEEAECADIFAkVXKvErGmh0dHA6 -Ly93d3cucGFlcHMuY3gvZ3BnL3NpZ25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNN -BXB4D/sFtImOodWUaR2QacEiFUduIK6NS5DhfiW2fXtEUAdFoh2IE8Iwlc61DVKM -f1jSFkIFaMs4OdTnYuiM702x9CW2XrT5pO4ORMXACpmCpqLJU4RoUKpE2Y5ABrwi -t3MqGUFoyunebnhc9IgItrJ620asHm0RfIwI5LC6fV+6wuSiES1zhsg/zPZ8aTnY -TfGCh/vCttqxDmuxUEsVK9E7T17XZJCLeV+PR93LLrMDvVSyRwJLOSkpCqgGL/g6 -/asvw/lGX0g8G4WmHmQW42FrtpfBJF+hRwO2d9iLZ5ubzqcdRkydwOBx/x3tzPjx -Cjq+U32tnSCys1YAo9mYaCfYQcuvaa0P4hditNAypAJYORxB+ik7wtXoioD08pUc -A2BhxgKjUe3D1r+C8x7njZ8lWSwGeJaNxUhmsRou5SI1nG9cG4blHWMNGg/jnGXA -ozmca5VRHzQJoTabBg84TIXdbBzTQECPBUJp0r69roYnF3Rmpyov4iHHe5gtIQ9H -gW2A7XDMNyDVeEtYHi8OqhOPVi2c/sU/mWTMP5n5w17+H+AHPrZP+iFRSREnIcEu -nBlKg3TfBgIT+isMVtG1HcEGNuQQTHVgrx/JSjLuwUWxdyOg23KFanBM2gY+p6ZY -Qng8xa2fGC4rzQmI+/4xoAiey8xEoYLU2DypEuhJadFUhSUx4YhGBBARAgAGBQJF -WOY9AAoJEK6UZT1dE6xF5SoAoITs52ZAf6SVB8FBT/eLnx5Ni2K1AJ42rKcj8HMb -NQf4bOjamJNrlo7YHYhGBBARAgAGBQJFWhAZAAoJEBRll9zcw5nHQ8cAnA99vx1/ -TIdt/r2h1byHrCgPvNTaAJ9zPyo9IzZlJ5oSiGDo0cr/Rkw154hGBBARAgAGBQJF -Y2gdAAoJEBdynXf0qFEvjiMAnRKDj/PC26266T+sdLZfSyRngb1oAJ4rbxayEIqu -63igRuCBsuAvOrtTBohGBBARAgAGBQJG7wWGAAoJEJ7XWD/BTrKCsQIAn2Lwn9l5 -UtDEcVk5E2knZtVfDX5zAJwMfIwV8u921zNypcgpzSwkLdrmKIhGBBARAgAGBQJG -739QAAoJECGmRpvR77qmhc8AoK4zsYbuIhYrdYV+HfB5xivwzuR0AJsEO3/FNwHO -neiAkRqUP5o0DtqrXIhrBBARAgArBQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNh -Y2VydC5vcmcvY3BzLnBocAAKCRDSuw0BZdD9WCXFAKCN9ym4MaPJrl1rXPLH7nhI -38iSUgCfXi386GkvwKKZuZzeOiibzcbjnauIcwQQEQIAMwUCQ/8J+wWDAeEzgCYa -aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9 -WLlXAJ4mP3eT18lsEijZsQo65cXCTxnCbACfYva7F6eu2E2dG2TzMDb/e8TTTg+0 -I0hlbnJpayBCcml4IEFuZGVyc2VuIDwwMTA3OUBpaGEuZGs+iEkEMBECAAkFAkS5 -PskCHSAACgkQv+Q4flTiePj4BwCdEW0dQCinDGdSvvVLuWlF10mcv1MAoKeV3Qme -9GOG3KIDi2+0YYVfALWMiEYEEBECAAYFAkPMcpwACgkQN0y+n1M3mo39kwCeLYh6 -qjL75pvCYnPlu7cAaWloIPsAoKzVrhyrWPavpDOpjUHNK6aOjR4niEYEEBECAAYF -AkQMnH4ACgkQCcTniZAW71AFMwCfZlhOSlwpyKprNvg9oNgM7cDpo70AoIz2//rs -tyB3hBmF7m/HDtDRzAz9iEYEEBECAAYFAkQxSM0ACgkQ8955gvNfpM+OIQCeL9vt -1bc267tdDbSxFWvSUu1WeOIAnj+EtBz+Q4yi9OU6s01OOA31yjH6iEYEEBECAAYF -AkVY5j0ACgkQrpRlPV0TrEUvwACffomLxMEYRAkdxzEkcAhLzS31F+sAoIwCFDdH -fzbgMbsP4s5W2fCX1LWCiF4EExECAB4FAkNNAyICGwMGCwkIBwMCAxUCAwMWAgEC -HgECF4AACgkQv+Q4flTiePhQtACfUzPG3iBf/BMLQl17C6hl9bSOKAMAnRKgGiKW -i++keWWxfB5/qDNVxNzmiHMEEBECADMFAkP/CfsFgwHhM4AmGmh0dHA6Ly93d3cu -Y2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAACgkQ0rsNAWXQ/VhpSwCfa0RYTPKo -Hh6Ogsm2h7ScHHUYXosAn09Q7GxkfNbRg745zWgPkRt5HEVgiJwEEAECAAYFAkQM -D3YACgkQH3+pCANY/L3RtQP+IPJFC1yUq5Pgm3LEaUDB8ngxFYP2IPQ3KH0ehmbe -4OHU0c9E5yh1ViNlYKWKxTUhUKPUMJPjOESKdmU0WBHrnQ5FKZmr8K/uGCdHU+lh -YQwzgMYkjTn7AS44YukZLkQ490ZP5lhVMtFWLJdVEZGK1oO0bSeRcB0RMwrT+z1g -NYe0JEhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdpbXAub3JnPohJBDARAgAJ -BQJCCgVMAh0gAAoJEL/kOH5U4nj4M7oAn3LAoaE29feNavUpw/hqD0f4nnPkAJ9N -ZeroZkX09hlGDvA4liC34DPRI4hGBBARAgAGBQJDzHKcAAoJEDdMvp9TN5qNzO4A -n1IY29nD0bMD/5hxDtJUt8qO1x3vAJ9dlLb448dgdpxLUdDCf3aeHOlmpYhGBBIR -AgAGBQJB2VIpAAoJEK6f5wUIDEyl7ocAoIcvdubBFFCmxmwweGhXgU2SX6lQAJsE -Ym6joOMZ2tOLA8WcKzghMkGDBIhZBBMRAgAZBQI+lEJYBAsHAwIDFQIDAxYCAQIe -AQIXgAAKCRC/5Dh+VOJ4+PMeAJ9C58QMyzQBgC5SGUikeFA566K0dgCdEiMguJ0C -0qwtjERzndmsiY7DOmKIXgQTEQIAHgUCQgoFFwIbAwYLCQgHAwIDFQIDAxYCAQIe -AQIXgAAKCRC/5Dh+VOJ4+BpNAJwJBy7+NfNDQcxWU+6DKHkWAIovKwCfWPk+0S74 -OBOx0+NUXOxtcq/mCES0JkhlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QGdlbnRv -by5vcmc+iEkEMBECAAkFAkUMaXgCHSAACgkQv+Q4flTiePhWGQCglliBZWa/HU+0 -qtQZnt/rIRn1b+IAniiTtF0Ll90A770pMIjsJ8cXe8AfiEYEEBECAAYFAkJrwiEA -CgkQqy9aWxUlaZBlggCg4Cp+lHk+M6HKbhoEAHK5XszVHQoAoI+422ohFYnow4bp -H+3sJXANyHc6iEYEEBECAAYFAkPMcpkACgkQN0y+n1M3mo3tggCeL+Oa440W4UVm -z2CHvUloy0oiRUgAoLRHa406iEBCgESdsl5I9LWw95pRiEYEEBECAAYFAkQMnHcA -CgkQCcTniZAW71DrigCdFfiK45WTr54R7kGFJ8Cbdv5LtDkAn2FJzdglgl6ZJPns -1OWZlipeOagoiEYEEBECAAYFAkQxSAUACgkQ8955gvNfpM8niwCeOhuAcBWGPQPu -xAsGj2Tze+bsCC8An26dkM9a5EkDkjF3+2lJ9DU31SA9iEYEEBECAAYFAkTM/EcA -CgkQXVaO67S1rtt1zQCg1KgdWTEID8WM+UDFa5BcoMsIP/YAoPWQDKrrU5e0iZZ6 -UyPv/CvGwUXjiEYEEBECAAYFAkVY5jkACgkQrpRlPV0TrEVxMACeIQSuxaCcBviL -RlzEv++ei+3v00EAoIkQmrMYVq5TQxgoIeaHrgVt3A33iEYEEhECAAYFAkHZUigA -CgkQrp/nBQgMTKUBegCgjS4riHWPKMibqhhdC1u50DbVdo4An32389aHCCSUIPOP -xUD3qgD0AVh+iEYEEhECAAYFAkMRYYQACgkQ80zyLxSSJydLEQCeNKplzVjXHY7q -qDC9xCxbGm/aEoUAn3crkx580XUKRUTP5x0mTm8DbU2ziEYEExECAAYFAkIKCGgA -CgkQ1QhTqSIT53IkPgCdGpOSyJ+mpFrzGZFgh/Lj8BnxNasAni1xPecPOx/jbMvM -jzkDF/tTqYHFiEYEExECAAYFAkIslDgACgkQ7p4sJIfNPb0oJwCfcEpNBQYY1j+W -9msAFlkSMi6HcDMAoK7Bh9O9Nl9xPHU7sr/IDIu6R+S4iF4EExECAB4CGwMGCwkI -BwMCAxUCAwMWAgECHgECF4AFAkUMaRoACgkQv+Q4flTiePiIPACbB8tt2u3orcg/ -5HxImRnaomc7TLMAnRv0PIUdFiEfK1l+gS2uwSXija00iF4EExECAB4FAkFWy4wC -GwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePi8MQCgxoTyVFHwWKxh -nSKpFT/QuZHmNj0AoL+kL/3CB40D5yJnV8lg+wvQIGr8iGEEExECACECGwMGCwkI -BwMCAxUCAwMWAgECHgECF4AFAkIKCw8CGQEACgkQv+Q4flTiePh0CACfUPBi6e9J -JXlLmDmoDU+YDcUs+eQAniFqFhySOuqV5X/Pa3q8tgCtHDTjiHMEEBECADMFAkJX -FtcFgwHhM4AmGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAA -CgkQ0rsNAWXQ/VirxgCfWvTJDRYtAEvwBOmWHWT2x2DIarcAn185FVF/u3bR+ECL -qtsT+iDZz4z/iJwEEAECAAYFAkQMD3IACgkQH3+pCANY/L31AQP+M0Ai3kaYca4P -o6dnZ0iGmXnzOG5yon7FsK+nw0W+E6MEk1f6wBoj9LU6Y+BojUt5+e9IOMNhDv46 -7Xfnu3ccUAcjq5Ej+QAEkNhQRXb1gRzZpy8jDR0Bj3kXYMRRgFMkXULqZSmXUKTJ -iOuD4KfY00cZsVXWKmE2jnbp1WLOQfu0J0hlbnJpayBCcml4IEFuZGVyc2VuIDxi -cml4QEZyZWVCU0Qub3JnPohgBBMRAgAgBQJHKQT+AhsDBgsJCAcDAgQVAggDBBYC -AwECHgECF4AACgkQv+Q4flTiePhqeQCfWx0ViywCxSkExyqgaSqVNXH8+VsAoLoR -KzkDFGDGM8th/coby9cu73YeuQENBD6UQl8QBAD67SO20OScwP3/oJr1tjmNFTIB -BTo10Jt1/mBMlFp4rkEbysvcjv2vppRYRjbG7EwuYyfRebA6XLF+l9K+ZCIq5ICM -qto7UKNyNnWpjw9wLwiPkeMck5QrmXC8/bH1PHXCw8m6NxSiRYd2YbLYO/ErShDf -MrZJi9wt0pY97s6rkwADBgP+OgEQ2woWjwk3s9A6+cGoGCD/N84mNSBFl6LVOqiA -TkgFzm9VenDsV1LuVbvd8d/NUZ+jm2ANALFxlgKxeqthJhFZLXZIckp5GVPRqrUJ -KauF04fQZ8w9JI6Kp3brnaN6wa0nxC3pqYwZdBjDUjaOtes27UqqlTYX0sQaDLM0 -ARGIRgQYEQIABgUCPpRCXwAKCRC/5Dh+VOJ4+PRnAJ4p+ftWiiCBRqfHnRhf3pTl -zxGDUQCgw+Jkqwvej2KCMft2Xavc7w2qYVU= -=KjaD +aXhAYWF1dWcuZGs+iEkEMBECAAkFAkheiI8CHSAACgkQv+Q4flTiePhbMwCgwElj +kjekm3o6i4E7w53JcOZOnnUAmwVcqrVDeWo14NTVW6wcDA30dP7kiF4EExECAB4F +AkNCRCUCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePhB6wCdEl+U +42TOiSvAx9ECTSKR2pEyYoEAnj0O+McjsCxgeWOAiHxkH6S1MSA5iEYEEBECAAYF +AkPMcpwACgkQN0y+n1M3mo3JYwCgvJXm7Sv30SSF/vkUA7lYZnMXpk4AoJhq9b0i +LW4qwgNhgrYYbBE6c+6piJwEEAECAAYFAkQMD3YACgkQH3+pCANY/L1+5QP7BxzD +nx+SYAqmAWudmO5gqRzwhB4L9nrtPa3hGkWNEMuxJjBCkJJHoX/rxMYkR2ZdSFIF +X++7Y3qsI7d2GUCMBgCqN8zdfwWvrpjBBNpLSVliNwvEujAi1BmTixDbiq4CKwai +6gxsFEDYsA05cX2Njg1bYbX/XjRcGpNQPKuna8GIRgQQEQIABgUCRAycfgAKCRAJ +xOeJkBbvUN6JAJ9fHHR1Ms09rYyajMra0aX+7XaUswCcCjNoayZQlf+6DkJBaQFi +Gi/FMTCIRgQQEQIABgUCRDFIzQAKCRDz3nmC81+kz2+0AJ4pLGBcGNMBWAIOujap +eYQfKif2TQCcCgcrHLwm7btUTbaHHD1g5LMwpaeIRgQQEQIABgUCRMz8SAAKCRBd +Vo7rtLWu28G4AJ92TcPH0fM68/NerGJRA5QtsYm9CwCdHCuab38MAWv115wvbrXL +QZK4HcOIRgQTEQIABgUCRQ1LqQAKCRCfd8Csb3oRX3tPAKCMuerpLB9Boh39hsmc +Vfw8MZjlggCg7kMhr5MI6/a2z2oLvakXo2AoM5KIRgQQEQIABgUCRSzZqQAKCRDV +CFOpIhPnco9wAJ93feKzaBOMflNEpZH4B+jtN5bm9gCgrthnnQToMNZl3b5RWvLi +P0f0pAyJAkgEEAECADIFAkVXKvErGmh0dHA6Ly93d3cucGFlcHMuY3gvZ3BnL3Np +Z25pbmctcG9saWN5LmFzYwAKCRAmSeYoxdNNBXB4D/sFtImOodWUaR2QacEiFUdu +IK6NS5DhfiW2fXtEUAdFoh2IE8Iwlc61DVKMf1jSFkIFaMs4OdTnYuiM702x9CW2 +XrT5pO4ORMXACpmCpqLJU4RoUKpE2Y5ABrwit3MqGUFoyunebnhc9IgItrJ620as +Hm0RfIwI5LC6fV+6wuSiES1zhsg/zPZ8aTnYTfGCh/vCttqxDmuxUEsVK9E7T17X +ZJCLeV+PR93LLrMDvVSyRwJLOSkpCqgGL/g6/asvw/lGX0g8G4WmHmQW42FrtpfB +JF+hRwO2d9iLZ5ubzqcdRkydwOBx/x3tzPjxCjq+U32tnSCys1YAo9mYaCfYQcuv +aa0P4hditNAypAJYORxB+ik7wtXoioD08pUcA2BhxgKjUe3D1r+C8x7njZ8lWSwG +eJaNxUhmsRou5SI1nG9cG4blHWMNGg/jnGXAozmca5VRHzQJoTabBg84TIXdbBzT +QECPBUJp0r69roYnF3Rmpyov4iHHe5gtIQ9HgW2A7XDMNyDVeEtYHi8OqhOPVi2c +/sU/mWTMP5n5w17+H+AHPrZP+iFRSREnIcEunBlKg3TfBgIT+isMVtG1HcEGNuQQ +THVgrx/JSjLuwUWxdyOg23KFanBM2gY+p6ZYQng8xa2fGC4rzQmI+/4xoAiey8xE +oYLU2DypEuhJadFUhSUx4YhGBBARAgAGBQJFWOY9AAoJEK6UZT1dE6xF5SoAoITs +52ZAf6SVB8FBT/eLnx5Ni2K1AJ42rKcj8HMbNQf4bOjamJNrlo7YHYhGBBARAgAG +BQJFWhAZAAoJEBRll9zcw5nHQ8cAnA99vx1/TIdt/r2h1byHrCgPvNTaAJ9zPyo9 +IzZlJ5oSiGDo0cr/Rkw154hGBBARAgAGBQJFY2gdAAoJEBdynXf0qFEvjiMAnRKD +j/PC26266T+sdLZfSyRngb1oAJ4rbxayEIqu63igRuCBsuAvOrtTBohGBBARAgAG +BQJG7wWGAAoJEJ7XWD/BTrKCsQIAn2Lwn9l5UtDEcVk5E2knZtVfDX5zAJwMfIwV +8u921zNypcgpzSwkLdrmKIhGBBARAgAGBQJG739QAAoJECGmRpvR77qmhc8AoK4z +sYbuIhYrdYV+HfB5xivwzuR0AJsEO3/FNwHOneiAkRqUP5o0DtqrXIhrBBARAgAr +BQJG8YqxBYMB4oUAHhpodHRwOi8vd3d3LmNhY2VydC5vcmcvY3BzLnBocAAKCRDS +uw0BZdD9WCXFAKCN9ym4MaPJrl1rXPLH7nhI38iSUgCfXi386GkvwKKZuZzeOiib +zcbjnauIcwQQEQIAMwUCQ/8J+wWDAeEzgCYaaHR0cDovL3d3dy5jYWNlcnQub3Jn +L2luZGV4LnBocD9pZD0xMAAKCRDSuw0BZdD9WLlXAJ4mP3eT18lsEijZsQo65cXC +TxnCbACfYva7F6eu2E2dG2TzMDb/e8TTTg+0I0hlbnJpayBCcml4IEFuZGVyc2Vu +IDwwMTA3OUBpaGEuZGs+iEkEMBECAAkFAkS5PskCHSAACgkQv+Q4flTiePj4BwCd +EW0dQCinDGdSvvVLuWlF10mcv1MAoKeV3Qme9GOG3KIDi2+0YYVfALWMiEYEEBEC +AAYFAkPMcpwACgkQN0y+n1M3mo39kwCeLYh6qjL75pvCYnPlu7cAaWloIPsAoKzV +rhyrWPavpDOpjUHNK6aOjR4niEYEEBECAAYFAkQMnH4ACgkQCcTniZAW71AFMwCf +ZlhOSlwpyKprNvg9oNgM7cDpo70AoIz2//rstyB3hBmF7m/HDtDRzAz9iEYEEBEC +AAYFAkQxSM0ACgkQ8955gvNfpM+OIQCeL9vt1bc267tdDbSxFWvSUu1WeOIAnj+E +tBz+Q4yi9OU6s01OOA31yjH6iEYEEBECAAYFAkVY5j0ACgkQrpRlPV0TrEUvwACf +fomLxMEYRAkdxzEkcAhLzS31F+sAoIwCFDdHfzbgMbsP4s5W2fCX1LWCiF4EExEC +AB4FAkNNAyICGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQv+Q4flTiePhQtACf +UzPG3iBf/BMLQl17C6hl9bSOKAMAnRKgGiKWi++keWWxfB5/qDNVxNzmiHMEEBEC +ADMFAkP/CfsFgwHhM4AmGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9pbmRleC5waHA/ +aWQ9MTAACgkQ0rsNAWXQ/VhpSwCfa0RYTPKoHh6Ogsm2h7ScHHUYXosAn09Q7Gxk +fNbRg745zWgPkRt5HEVgiJwEEAECAAYFAkQMD3YACgkQH3+pCANY/L3RtQP+IPJF +C1yUq5Pgm3LEaUDB8ngxFYP2IPQ3KH0ehmbe4OHU0c9E5yh1ViNlYKWKxTUhUKPU +MJPjOESKdmU0WBHrnQ5FKZmr8K/uGCdHU+lhYQwzgMYkjTn7AS44YukZLkQ490ZP +5lhVMtFWLJdVEZGK1oO0bSeRcB0RMwrT+z1gNYe0JEhlbnJpayBCcml4IEFuZGVy +c2VuIDxicml4QGdpbXAub3JnPohJBDARAgAJBQJCCgVMAh0gAAoJEL/kOH5U4nj4 +M7oAn3LAoaE29feNavUpw/hqD0f4nnPkAJ9NZeroZkX09hlGDvA4liC34DPRI4hG +BBARAgAGBQJDzHKcAAoJEDdMvp9TN5qNzO4An1IY29nD0bMD/5hxDtJUt8qO1x3v +AJ9dlLb448dgdpxLUdDCf3aeHOlmpYhGBBIRAgAGBQJB2VIpAAoJEK6f5wUIDEyl +7ocAoIcvdubBFFCmxmwweGhXgU2SX6lQAJsEYm6joOMZ2tOLA8WcKzghMkGDBIhZ +BBMRAgAZBQI+lEJYBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRC/5Dh+VOJ4+PMeAJ9C +58QMyzQBgC5SGUikeFA566K0dgCdEiMguJ0C0qwtjERzndmsiY7DOmKIXgQTEQIA +HgUCQgoFFwIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRC/5Dh+VOJ4+BpNAJwJ +By7+NfNDQcxWU+6DKHkWAIovKwCfWPk+0S74OBOx0+NUXOxtcq/mCES0JkhlbnJp +ayBCcml4IEFuZGVyc2VuIDxicml4QGdlbnRvby5vcmc+iEkEMBECAAkFAkUMaXgC +HSAACgkQv+Q4flTiePhWGQCglliBZWa/HU+0qtQZnt/rIRn1b+IAniiTtF0Ll90A +770pMIjsJ8cXe8AfiEYEEBECAAYFAkJrwiEACgkQqy9aWxUlaZBlggCg4Cp+lHk+ +M6HKbhoEAHK5XszVHQoAoI+422ohFYnow4bpH+3sJXANyHc6iEYEEBECAAYFAkPM +cpkACgkQN0y+n1M3mo3tggCeL+Oa440W4UVmz2CHvUloy0oiRUgAoLRHa406iEBC +gESdsl5I9LWw95pRiEYEEBECAAYFAkQMnHcACgkQCcTniZAW71DrigCdFfiK45WT +r54R7kGFJ8Cbdv5LtDkAn2FJzdglgl6ZJPns1OWZlipeOagoiEYEEBECAAYFAkQx +SAUACgkQ8955gvNfpM8niwCeOhuAcBWGPQPuxAsGj2Tze+bsCC8An26dkM9a5EkD +kjF3+2lJ9DU31SA9iEYEEBECAAYFAkTM/EcACgkQXVaO67S1rtt1zQCg1KgdWTEI +D8WM+UDFa5BcoMsIP/YAoPWQDKrrU5e0iZZ6UyPv/CvGwUXjiEYEEBECAAYFAkVY +5jkACgkQrpRlPV0TrEVxMACeIQSuxaCcBviLRlzEv++ei+3v00EAoIkQmrMYVq5T +QxgoIeaHrgVt3A33iEYEEhECAAYFAkHZUigACgkQrp/nBQgMTKUBegCgjS4riHWP +KMibqhhdC1u50DbVdo4An32389aHCCSUIPOPxUD3qgD0AVh+iEYEEhECAAYFAkMR +YYQACgkQ80zyLxSSJydLEQCeNKplzVjXHY7qqDC9xCxbGm/aEoUAn3crkx580XUK +RUTP5x0mTm8DbU2ziEYEExECAAYFAkIKCGgACgkQ1QhTqSIT53IkPgCdGpOSyJ+m +pFrzGZFgh/Lj8BnxNasAni1xPecPOx/jbMvMjzkDF/tTqYHFiEYEExECAAYFAkIs +lDgACgkQ7p4sJIfNPb0oJwCfcEpNBQYY1j+W9msAFlkSMi6HcDMAoK7Bh9O9Nl9x +PHU7sr/IDIu6R+S4iF4EExECAB4CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkUM +aRoACgkQv+Q4flTiePiIPACbB8tt2u3orcg/5HxImRnaomc7TLMAnRv0PIUdFiEf +K1l+gS2uwSXija00iF4EExECAB4FAkFWy4wCGwMGCwkIBwMCAxUCAwMWAgECHgEC +F4AACgkQv+Q4flTiePi8MQCgxoTyVFHwWKxhnSKpFT/QuZHmNj0AoL+kL/3CB40D +5yJnV8lg+wvQIGr8iGEEExECACECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAkIK +Cw8CGQEACgkQv+Q4flTiePh0CACfUPBi6e9JJXlLmDmoDU+YDcUs+eQAniFqFhyS +OuqV5X/Pa3q8tgCtHDTjiHMEEBECADMFAkJXFtcFgwHhM4AmGmh0dHA6Ly93d3cu +Y2FjZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAACgkQ0rsNAWXQ/VirxgCfWvTJDRYt +AEvwBOmWHWT2x2DIarcAn185FVF/u3bR+ECLqtsT+iDZz4z/iJwEEAECAAYFAkQM +D3IACgkQH3+pCANY/L31AQP+M0Ai3kaYca4Po6dnZ0iGmXnzOG5yon7FsK+nw0W+ +E6MEk1f6wBoj9LU6Y+BojUt5+e9IOMNhDv467Xfnu3ccUAcjq5Ej+QAEkNhQRXb1 +gRzZpy8jDR0Bj3kXYMRRgFMkXULqZSmXUKTJiOuD4KfY00cZsVXWKmE2jnbp1WLO +Qfu0J0hlbnJpayBCcml4IEFuZGVyc2VuIDxicml4QEZyZWVCU0Qub3JnPohgBBMR +AgAgBQJHKQT+AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQv+Q4flTiePhq +eQCfWx0ViywCxSkExyqgaSqVNXH8+VsAoLoRKzkDFGDGM8th/coby9cu73YeuQEN +BD6UQl8QBAD67SO20OScwP3/oJr1tjmNFTIBBTo10Jt1/mBMlFp4rkEbysvcjv2v +ppRYRjbG7EwuYyfRebA6XLF+l9K+ZCIq5ICMqto7UKNyNnWpjw9wLwiPkeMck5Qr +mXC8/bH1PHXCw8m6NxSiRYd2YbLYO/ErShDfMrZJi9wt0pY97s6rkwADBgP+OgEQ +2woWjwk3s9A6+cGoGCD/N84mNSBFl6LVOqiATkgFzm9VenDsV1LuVbvd8d/NUZ+j +m2ANALFxlgKxeqthJhFZLXZIckp5GVPRqrUJKauF04fQZ8w9JI6Kp3brnaN6wa0n +xC3pqYwZdBjDUjaOtes27UqqlTYX0sQaDLM0ARGIRgQYEQIABgUCPpRCXwAKCRC/ +5Dh+VOJ4+PRnAJ4p+ftWiiCBRqfHnRhf3pTlzxGDUQCgw+Jkqwvej2KCMft2Xavc +7w2qYVU= +=4lil -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_es/doc/share/pgpkeys/bz.key#2 (text+ko) ==== @@ -1,47 +1,210 @@ - + - Key fingerprint = 5E31 F886 E2EE BA7E 2AA5 DDD4 21C5 0916 0E4A 7875 -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -uid Bjoern A. Zeeb -sub 1024g/6139751B 2000-02-04 +pub 1024D/3CCF1842 2007-02-20 + Key fingerprint = 1400 3F19 8FEF A3E7 7207 EE8D 2B58 B8F8 3CCF 1842 +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +uid Bjoern A. Zeeb +sub 4096g/F36BDC5D 2007-02-20 ]]> ==== //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -384,6 +384,11 @@ &pgpkey.gioria; + + &a.pgollucci; + &pgpkey.pgollucci; + + &a.daichi; &pgpkey.daichi; @@ -594,6 +599,11 @@ &pgpkey.erwin; + + &a.glarkin; + &pgpkey.glarkin; + + &a.laszlof; &pgpkey.laszlof; @@ -839,6 +849,11 @@ &pgpkey.simon; + + &a.rnoland; + &pgpkey.rnoland; + + &a.anders; &pgpkey.anders; @@ -1338,3 +1353,14 @@ &a.ivoras; &pgpkey.ivoras; + + + &a.nwhitehorn; + &pgpkey.nwhitehorn; + + + + &a.sson; + &pgpkey.sson; + + ==== //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#4 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -93,6 +93,7 @@ + @@ -202,6 +203,7 @@ + @@ -214,6 +216,7 @@ + @@ -227,6 +230,7 @@ + @@ -250,6 +254,7 @@ + ==== //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#4 (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.465 2008/06/21 07:18:59 pgj Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.466 2008/07/08 13:12:46 manolis Exp $ --> @@ -730,7 +730,7 @@ - + ==== //depot/projects/docproj_es/doc/share/sgml/mirrors.xml#3 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.71 2008/05/06 13:28:52 roberto Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.72 2008/07/23 19:34:32 erwin Exp $ @@ -554,7 +554,6 @@ ftp.dk.FreeBSD.org ftp://ftp.dk.FreeBSD.org/pub/FreeBSD/ - http://ftp.dk.FreeBSD.org/pub/FreeBSD/ @@ -562,11 +561,6 @@ ftp://ftp2.dk.FreeBSD.org/pub/FreeBSD/ - - ftp3.dk.FreeBSD.org - ftp://ftp3.dk.FreeBSD.org/pub/FreeBSD/ - - cvsup.dk.FreeBSD.org @@ -575,10 +569,6 @@ cvsup2.dk.FreeBSD.org - - cvsup3.dk.FreeBSD.org - - hostmaster@dk.FreeBSD.org ==== //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.332 2008/07/06 10:57:58 danger Exp $ 2000 @@ -724,13 +724,6 @@ - - Token Ring Interfaces - - &hwlist.oltr; - - - FDDI Interfaces [&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; driver) @@ -764,8 +757,6 @@ &hwlist.ath; - &hwlist.cnw; - [&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network adapter (&man.ipw.4; driver) @@ -809,13 +800,6 @@ &hwlist.ctau; - [&arch.i386;] Granch SBNI12 point-to-point communications - adapters (&man.sbni.4; driver) - - - [&arch.i386;] Granch SBNI16 SHDSL modems (&man.sbsh.4; - driver) - &hwlist.cm; ==== //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1090 2008/06/05 13:37:40 rafan Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1092 2008/07/29 04:23:18 bmah Exp $ 2000 @@ -170,7 +170,8 @@ kse library was never developed to its full potential. Backwards compatibility for applications using KSE threading will be provided via &man.libmap.conf.5; for dynamically linked - binaries. + binaries. The &os; Project greatly appreciates the work of + &a.julian;, &a.deischen;, and &a.davidxu; on KSE support. The &os; kernel now exports information about certain kernel features via the kern.features sysctl tree. ==== //depot/projects/docproj_es/www/en/administration.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -95,13 +95,13 @@
      >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 14 20:28:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3795106567C; Thu, 14 Aug 2008 20:28:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96B571065678 for ; Thu, 14 Aug 2008 20:28:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7BAC48FC14 for ; Thu, 14 Aug 2008 20:28:00 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7EKS0NI036177 for ; Thu, 14 Aug 2008 20:28:00 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7EKS0Ud036175 for perforce@freebsd.org; Thu, 14 Aug 2008 20:28:00 GMT (envelope-from trasz@freebsd.org) Date: Thu, 14 Aug 2008 20:28:00 GMT Message-Id: <200808142028.m7EKS0Ud036175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Aug 2008 20:28:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147409 Change 147409 by trasz@trasz_traszkan on 2008/08/14 20:27:48 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#42 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#42 (text+ko) ==== @@ -6,7 +6,7 @@ to ACL_READ_NAMED_ATTRS, so there is no need for translation between the two in kern/subr_acl_nfs4.c. -- Enhance fstest with checks for NFS4 ACL functionality. +- Find out how _directory_ removal access checking works in ZFS. - Make 'struct acl' variable size. From owner-p4-projects@FreeBSD.ORG Fri Aug 15 00:58:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 040B3106567A; Fri, 15 Aug 2008 00:58:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC73F1065678 for ; Fri, 15 Aug 2008 00:58:34 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A43A98FC08 for ; Fri, 15 Aug 2008 00:58:34 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F0wYU3082973 for ; Fri, 15 Aug 2008 00:58:34 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F0wYjt082971 for perforce@freebsd.org; Fri, 15 Aug 2008 00:58:34 GMT (envelope-from csjp@freebsd.org) Date: Fri, 15 Aug 2008 00:58:34 GMT Message-Id: <200808150058.m7F0wYjt082971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 00:58:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=147416 Change 147416 by csjp@ibm01 on 2008/08/15 00:57:48 - Drop in the crypto code for the writer (client) side - Fix the Makefile so that only use the pthread linking flag when it's required for linking - change -pthread -> -lpthread Affected files ... .. //depot/projects/trustedbsd/netauditd/Makefile#7 edit .. //depot/projects/trustedbsd/netauditd/crypto.h#3 add .. //depot/projects/trustedbsd/netauditd/crypto_client.c#1 add .. //depot/projects/trustedbsd/netauditd/crypto_common.c#1 add Differences ... ==== //depot/projects/trustedbsd/netauditd/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ CC = gcc -CFLAGS = -Wall -g -pthread +CFLAGS = -Wall -g TARGETS = netauditd -OBJ = conf.o lex.yy.o netauditd.o reader.o y.tab.o writer.o +OBJ = conf.o crypto_common.o crypto_client.o lex.yy.o netauditd.o reader.o y.tab.o writer.o all: $(TARGETS) @@ -16,7 +16,7 @@ $(CC) $(CFLAGS) -c lex.yy.c netauditd: $(OBJ) - $(CC) $(CFLAGS) -o $@ $(OBJ) + $(CC) $(CFLAGS) -o $@ $(OBJ) -lssl -lpthread y.tab.o: grammar.y yacc -vd grammar.y From owner-p4-projects@FreeBSD.ORG Fri Aug 15 06:51:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D0D1065682; Fri, 15 Aug 2008 06:51:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3388F1065679 for ; Fri, 15 Aug 2008 06:51:32 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1535A8FC1A for ; Fri, 15 Aug 2008 06:51:32 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F6pWjl030898 for ; Fri, 15 Aug 2008 06:51:32 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F6pWbd030896 for perforce@freebsd.org; Fri, 15 Aug 2008 06:51:32 GMT (envelope-from remko@freebsd.org) Date: Fri, 15 Aug 2008 06:51:32 GMT Message-Id: <200808150651.m7F6pWbd030896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 147424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 06:51:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147424 Change 147424 by remko@remko_nakur on 2008/08/15 06:51:10 Import Rene's latest work. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 (text+ko) ==== @@ -159,7 +159,7 @@ teruglusapparaat - Het interface (kolom Netif) dat deze + De interface (kolom Netif) dat deze routeertabel aangeeft om voor localhost te gebruiken is lo0, ook bekend als het teruglusapparaat. Dit geeft aan dat alle verkeer voor deze @@ -178,7 +178,7 @@ adressen, ook bekend als MAC-adressen. &os; zal automatisch elke host (test0 in het voorbeeld) op het lokale Ethernet identificeren en een route voor die host - toevoegen, direct van deze host over het Ethernet-interface, + toevoegen, direct van deze host over de Ethernet-interface, ed0. Er is ook een timeout (kolom Expire) met deze routesoort geassocieerd, die gebruikt wordt indien er binnen een bepaalde tijd geen @@ -209,14 +209,14 @@ De regel met host1 verwijst naar deze host, het kent deze door het Ethernetadres. Aangezien het de - zendende host is, weet &os; dat het het teruglus-interface ( + zendende host is, weet &os; dat het de teruglus-interface ( lo0) moet gebruiken, in plaats van het - over het Ethernet-interface te verzenden. + over de Ethernet-interface te verzenden. De twee regels met host2 geven een voorbeeld van wat er gebeurt als een alias met &man.ifconfig.8; gebruikt wordt (in de sectie over Ethernet staan redenen waarom - dit gedaan wordt). Het symbool => na het + dit gedaan wordt). Het symbool => na de interface lo0 zegt dat niet alleen de teruglus gebruikt wordt (aangezien dit adres ook verwijst naar de lokale host), maar specifiek dat dit een alias is. Zulke @@ -296,7 +296,7 @@ moet maken, controleert het de routeertabel op reeds bekende paden. Indien de verre host binnen een subnet valt waarvan bekend is hoe het bereikt kan worden (gekloonde routes), - controleert het systeem of het met het daarbij behorende + controleert het systeem of het met de daarbij behorende interface verbinding kan maken. Indien alle bekende paden falen, heeft het systeem @@ -333,7 +333,7 @@ Lokaal2 staan op deze site. Lokaal1 is verbonden met een internetprovider via een inbel-PPP-verbinding. Deze PPP-server is door een LAN - verbonden met een andere gateway-computer door een extern + verbonden met een andere gateway-computer door een externe interface naar de Internet-feed van de internetprovider. De standaardroutes voor de machines zijn: @@ -369,7 +369,7 @@ is voor Lokaal1, in plaats van de server van de internetprovider waarmee het verbonden is?. - Onthoud dat, aangezien het PPP-interface een adres gebruikt + Onthoud dat, aangezien de PPP-interface een adres gebruikt op het lokale netwerk van de internetprovider voor deze kant van de verbinding, routes voor alle andere machines op het lokale netwerk van de internetprovider automatisch aangemaakt worden. @@ -467,7 +467,7 @@ router Een netwerkrouter is simpelweg een systeem dat pakketten van - het ene naar het andere interface doorstuurt. + de ene naar de andere interface doorstuurt. Internetstandaarden en goede ontwerppraktijken verhinderen het &os; Project dit standaard in &os; aan te zetten. Deze mogelijkheid kan worden aangezet door de volgende variabele in @@ -998,9 +998,9 @@ freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 EPS WPA - Het interface dient als up te worden gemarkeerd + De interface dient als up te worden gemarkeerd voordat het scannen begint. Voor verdere scans is het - niet nodig om het inferface als up te markeren. + niet nodig om de interface als up te markeren. De uitvoer van een scanverzoek vermeld elk gevonden @@ -1040,7 +1040,7 @@ Privacy. Vertrouwelijkheid is vereist voor alle gegevensframes die binnen het BSS worden uitgewisseld. Dit betekent dat dit BSS eist dat het station - cryptografsiche middelen als WEP, TKIP of AES-CCMP + cryptografische middelen als WEP, TKIP of AES-CCMP dient te gebruiken om de gegevensframes die met anderen worden uitgewisseld te versleutelen en te ontsleutelen. @@ -1205,7 +1205,8 @@ te bereiken, dient /etc/rc.conf bewerkt te worden en DHCP aan de instellingen voor het apparaat toegevoegd te worden zoals - in de verschillende bovenstaande voorbeelden is laten zien : + in de verschillende bovenstaande voorbeelden is laten zien + : ifconfig_ath0="DHCP" @@ -1214,9 +1215,9 @@ &prompt.root; /etc/rc.d/netif start - Wanneer het interface draait, kan + Wanneer de interface draait, kan ifconfig gebruikt worden om de status - van het interface ath0 te zien: + van de interface ath0 te zien: &prompt.root; ifconfig ath0 @@ -1256,67 +1257,201 @@ WPA - + WPA (Wi-Fi Protected Access) is een beveiligingsprotocol + dat samen met 802.11-netwerken wordt gebruikt om het gebrek + aan degelijke authenticatie en de zwakte van WEP te benadrukken. + WPA verbetert het 802.1X-authenticatieprotocol en gebruikt + een sleutel gekozen uit meerdere in plaats van WEP voor + gegevensintegriteit. De enige sleutel welke WPA vereist is + TKIP (Temporary Key Integrity Protocol), een sleutel dat de + basis-RC4-sleutel welke door WEP wordt gebruikt uitbreidt + door integriteitscontroles, knoeidetectie, en maatregelen om + op elke gedectecteerde inbraak te reageren toe te voegen. + TKIP is ontworpen om op verouderde hardware met enkel + wijzigingen in software te draaien; het representeert een + compromis dat de veiligheid verbetert maar nog steeds niet + geheel immuun is tegen aanvallen. WPA specificeert ook de + sleutel AES-CCMP als een alternatief voor TKIP welke te + verkiezen is indien mogelijk; voor deze specificatie wordt + gewoonlijk de term WPA2 (of RSN) gebruikt. - + WPA definieert protocollen voor authenticatie en + versleuteling. Authenticatie gebeurt het meeste door + één van deze twee technieken te gebruiken: + door 802.1X en een achterliggende authenticatiedienst zoals + RADIUS, of door een minimale overeenkomst tussen het station + en het toegangspunt door een van te voren gedeeld geheim te + gebruiken. Het eerste wordt vaak WPA Enterprise genoemd en + het laatste staat bekend als WPA Personal. Aangezien de + meeste mensen geen achterliggende RADIUS-server voor een + draadloos netwerk zullen opzetten, is WPA-PSK veruit de + meest gebruikte configuratie voor WPA. - + Het beheer van de draadloze verbinding en de + authenticatie (sleutelonderhandeling of authenticatie met + een server) gebeurt met het gereedschap + &man.wpa.supplicant.8;. Dit programma vereist dat er een + instellingenbestand, + /etc/wpa_supplicant.conf, draait. + Meer informatie over dit bestand kan in de hulppagina + &man.wpa.supplicant.conf.5; worden gevonden. WPA-PSK - + WPA-PSK, ook bekend als WPA-Personal, is gebaseerd op + een vooraf gedeelde sleutel (PSK) gegenereerd vanuit een + gegeven wachtwoord die gebruikt zal worden als de + hoofdsleutel in het draadloze netwerk. Dit betekent dat + alle draadloze gebruikers dezelfde sleutel zullen delen. + WPA-PSK is bedoeld voor kleine netwerken waar het gebruik + van een authenticatieserver niet mogelijk of gewenst is. + - + Gebruik altijd sterke wachtwoorden welke voldoende + lang zijn en opgebouwd zijn uit een grote + tekenverzameling zodat ze niet gemakkelijk worden + geraden of aangevallen. - + De eerste stap is het instellen van het bestand + /etc/wpa_supplicant.conf met het SSID + en de vooraf gedeelde sleutel van het netwerk: network={ ssid="freebsdap" psk="freebsdmall" } - + Daarna zal in /etc/rc.conf worden + aangegeven dat de draadloze configuratie met WPA zal + gebeuren en dat het IP-adres met DHCP zal worden verkregen + : ifconfig_ath0="WPA DHCP" - + Hierna kan de interface geactiveerd worden: - + &prompt.root; /etc/rc.d/netif start +Starting wpa_supplicant. +DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 5 +DHCPDISCOVER on ath0 to 255.255.255.255 port 67 interval 6 +DHCPOFFER from 192.168.0.1 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPACK from 192.168.0.1 +bound to 192.168.0.254 -- renewal in 300 seconds. +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36 + protmode CTS roaming MANUAL bintval 100 - + Ook kan gepoogd worden dit handmatig in te stellen + door hetzelfde + /etc/wpa_supplicant.conf als hierboven + te gebruiken, en dit te draaien: - + &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf +Trying to associate with 00:11:95:c3:0d:ac (SSID='freebsdap' freq=2412 MHz) +Associated with 00:11:95:c3:0d:ac +WPA: Key negotiation completed with 00:11:95:c3:0d:ac [PTK=TKIP GTK=TKIP] - + De volgende stap is het lanceren van het commando + dhclient om een IP-adres van de + DHCP-server te krijgen: - + &prompt.root; dhclient ath0 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPACK from 192.168.0.1 +bound to 192.168.0.254 -- renewal in 300 seconds. +&prompt.root; ifconfig ath0 +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/48Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36 + protmode CTS roaming MANUAL bintval 100 - + Indien /etc/rc.conf is + ingesteld met de regel + ifconfig_ath0="DHCP" is het niet + nodig om het commando dhclient + handmatig te draaien, dhclient zal + dan gedraaid worden nadat + wpa_supplicant de sleutels heeft + onderzocht. - + In het geval dat het niet mogelijk is om DHCP te + gebruiken, kan een statisch IP-adres worden ingesteld + nadat wpa_supplicant het station heeft + geauthenticeerd: - + &prompt.root; ifconfig ath0 inet 192.168.0.100 netmask 255.255.255.0 +&prompt.root; ifconfig ath0 +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/36Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA privacy ON deftxkey UNDEF TKIP 2:128-bit txpowmax 36 + protmode CTS roaming MANUAL bintval 100 - + Indien DHCP niet wordt gebruikt, dienen ook de + standaard gateway en de naamserver handmatig ingesteld te + worden: - + &prompt.root; route add default uw_standaard_router +&prompt.root; echo "nameserver uw_DNS_server" >> /etc/resolv.conf WPA met EAP-TLS - + De tweede manier om WPA te gebruiken is met een + achterliggende 802.1X-authenticatieserver, in dit geval + wordt WPA WPA-Enterprise genoemd om het verschil met het + minder veilige WPA-Personal met de vooraf gedeelde sleutel + aan te duiden. De authenticatie in WPA-Enterprise is + gebaseerd op EAP (Uitbreidbaar Authenticatie-Protocol). + - + EAP wordt niet met een encryptiemethode geleverd, het + was besloten om EAP in een versleutelde tunnel te + omsluiten. Er zijn vele soorten van + EAP-authenticatiemethodes ontworpen, de meest voorkomende + methodes zijn EAP-TLS, EAP-TTLS, en EAP-PEAP. - + EAP-TLS (EAP met TransportLaagBeveiliging) is een zeer + goed ondersteund authenticatieprotocol in de draadloze + wereld aangezien het de eerste EAP-methode was die + gecertificeerd werd door de Wi-Fi alliantie. + EAP-TLS vereist dat er drie certificaten draaien: het + CA-certificaat (geïnstalleerd op alle machines), het + servercertificaat voor de authenticatieserver, en een + clientcertificaat voor elke draadloze client. Bij deze + EAP-methode authenticeren zowel de authenticatieserver als + de draadloze client elkaar door hun respectievelijke + certificaten te laten zien, en ze controleren dat deze + certificaten zijn getekend door de certificatenauthoriteit + (CA) van de organisatie. - + Zoals voorheen gebeurt het instellen via + /etc/wpa_supplicant.conf: network={ ssid="freebsdap" @@ -1332,59 +1467,104 @@ - + Dit veld geeft de naam van het netwerk (SSID) aan. + - + Hier wordt het RSN (IEEE 802.11i) protocol + gebruikt, ofwel WPA2. - + De regel key_mgmt verwijst naar + het gebruikte sleutelbeheerprotocol. In dit geval is + het WPA dat EAP-authenticatie gebruikt: + WPA-EAP. - + In dit veld wordt de EAP-methode voor de + verbinding genoemd. - + Het veld identity bevat de + identiteitsstring voor EAP. - + Het veld ca_cert geeft de + padnaam van het CA-certificaatbestand aan. Dit + bestand is nodig om het servercertificaat te + controleren. - + De regel client_cert geeft de + padnaam van het clientcertificaatbestand aan. Dit + certificaat is uniek voor elke draadloze client van + het netwerk. - + Het veld private_key is de + padnaam naar het bestand dat de privésleutel + van het clientcertificaat bevat. - + Het veld private_key_passwd + bevat het wachtwoord voor de privésleutel. + - + Voeg vervolgens de volgende regel toe aan + /etc/rc.conf: ifconfig_ath0="WPA DHCP" - + De volgende stap is het activeren van de interface met + behulp van de faciliteit rc.c: - + &prompt.root; /etc/rc.d/netif start +Starting wpa_supplicant. +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPACK from 192.168.0.20 +bound to 192.168.0.254 -- renewal in 300 seconds. +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit + txpowmax 36 protmode CTS roaming MANUAL bintval 100 - + Zoals eerder is laten zien, is het ook mogelijk om de + interface handmatig te activeren met zowel de commando's + wpa_supplicant en + ifconfig. WPA met EAP-TTLS - + Bij EAP-TLS hebben zowel de authenticatieserver als de + client een certificaat nodig, met EAP-TTLS (EAP-Getunnelde + TransportLaagBeveiliging) is een clientcertificaat + optioneel. Deze methode komt in de buurt van wat sommige + beveiligde websites doen, waar de webserver een veilige + SSL-tunnel kan aanmaken zelfs als de bezoekers geen + client-side certificaten hebben. EAP-TTLS zal de + versleutelde TLS-tunnel gebruiken voor het veilig + transporteren van de authenticatiegegevens. - + De instellingen worden gedaan via het bestand + /etc/wpa_supplicant.conf: network={ ssid="freebsdap" @@ -1399,43 +1579,90 @@ - + Dit veld noemt de EAP-methode voor de verbinding. + - + Het veld identity bevat de + identiteitsstring voor EAP-authenticatie binnen de + versleutelde TLS-tunnel. - + Het veld password bevat het + wachtwoord voor de EAP-authenticatie. - + Het veld ca_cert wijst naar de + padnaam van het CA-certificaatbestand. Dit bestand is + nodig om het servercertificaat te controleren. - + Dit veld noemt de gebruikte authenticatiemethode + in de versleutelde TLS-tunnel. In dit geval is EAP + met MD5-Challenge gebruikt. De binnenste + authenticatie-fase wordt vaak + phase2 genoemd. - + Ook dient de volgende regel toegevoegd te worden aan + /etc/rc.conf: ifconfig_ath0="WPA DHCP" - + De volgende stap is het activeren van de interface: - + &prompt.root; /etc/rc.d/netif start +Starting wpa_supplicant. +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPACK from 192.168.0.20 +bound to 192.168.0.254 -- renewal in 300 seconds. +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit + txpowmax 36 protmode CTS roaming MANUAL bintval 100 WPA met EAP-PEAP - + PEAP (Beveiligd EAP) is ontworpen als een alternatief + voor EAP-TTLS. Er zijn twee soorten PEAP-methodes, de + meest voorkomende is PEAPv0/EAP-MSCHAPv2. In de rest van + dit document wordt de term PEAP gebruikt om te verwijzen + naar die EAP-methode. PEAP is de meest gebruikte + EAP-standaard na EAP-TLS, in andere woorden, indien er een + netwerk met verschillende besturingssystemen is, zou PEAP + de best ondersteunde standaard na EAP-TLS moeten zijn. + - + PEAP is soortgelijk aan EAP-TTLS: het gebruikt een + server-side certificaat om de clients te authenticeren + door een beveiligde TLS-tunnel tussen de client en de + authenticatieserver aan te maken, welke de uitwisseling + van de authenticatie-informatie beschermt. Vanuit een + beveiligingsoogpunt gezien is het verschil tussen EAP-TTLS + en PEAP dat PEAP-authenticatie de gebruikersnaam + onversleuteld uitzendt, alleen het wachtwoord wordt in de + beveiligde TLS-tunnel verzonden. EAP-TTLS gebruikt de + TLS-tunnel voor zowel de gebruikersnaam als het wachtwoord + . - + Het bestand + /etc/wpa_supplicant.conf dient + gewijzigd te worden om de EAP-PEAP-gerelateerde + instellingen toe te voegen: network={ ssid="freebsdap" @@ -1451,46 +1678,566 @@ - + Dit veld noemt de EAP-methode voor de verbinding. + - + Het veld identity bevat de + identiteitsstring voor EAP-authenticatie binnen de + versleutelde TLS-tunnel. - + Het veld password bevat het + wachtwoord voor de EAP-authenticatie. - + Het veld ca_cert wijst naar de + padnaam van het CA-certificaatbestand. Dit bestand is + nodig om het servercertificaat te controleren. - + Dit veld bevat de parameters voor de eeerste fase + van de authenticatie (de TLS-tunnel). Afhankelijk van + de gebruikte authenticatieserver moet er een specifiek + label voor de authenticatie worden opgegeven. In de + meeste gevallen zal het label client EAP + encryption zijn welke ingesteld is door + peaplabel=0 te gebruiken. Meer + informatie kan in de hulppagina + &man.wpa.supplicant.conf.5; gevonden worden. - + Dit veld noemt het authenticatieprotocol dat in de + versleutelde TLS-tunnel gebruikt wordt. In het geval + van PEAP is dit auth=MSCHAPV2. + - + Het volgende dient te worden toegevoegd aan + /etc/rc.conf: ifconfig_ath0="WPA DHCP" - + Hierna kan de interface worden geactiveerd: - + &prompt.root; /etc/rc.d/netif start +Starting wpa_supplicant. +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPREQUEST on ath0 to 255.255.255.255 port 67 +DHCPACK from 192.168.0.20 +bound to 192.168.0.254 -- renewal in 300 seconds. +ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.254 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (DS/11Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode WPA2/802.11i privacy ON deftxkey UNDEF TKIP 2:128-bit + txpowmax 36 protmode CTS roaming MANUAL bintval 100 WEP - + WEP (Bedraad Equivalent Privacy) maakt deel uit van de + oorspronkelijke 802.11 standaard. Er is geen + authenticatiemechanisme, slechts een zwakke vorm van + toegangscontrole, en het is gemakkelijk te kraken. + + WEP kan worden opgezet met ifconfig: + + + &prompt.root; ifconfig ath0 ssid mijn_net wepmode on weptxkey 3 wepkey 3:0x3456789012 \ + inet 192.168.1.100 netmask 255.255.255.0 + + + + De weptxkey geeft aan welke + WEP-sleutel zal worden gebruikt tijdens het verzenden. + Hier wordt de derde sleutel gebruikt. Dit dient + overeen te komen met de instelling in het toegangspunt. + + + + + De wepkey stelt de geselecteerde + WEP-sleutel in. Het dient in het formaat + index:sleutel te zijn, als de + sleutel niet is gegeven, wordt sleutel + 1 ingesteld. Dat wil zeggen dat de + index opgegeven dient te worden indien er een andere + sleutel dan de eerste wordt gebruikt. + + + De 0x3456789012 dient vervangen + te worden door de sleutel die ingesteld is voor + gebruik met het toegangspunt. + + + + + Het wordt aangeraden om de hulppagina &man.ifconfig.8; + te lezen voor verdere informatie. + + De faciliteit wpa_supplicant kan ook + gebruikt worden om de draadloze interface in te stellen voor + WEP. Het bovenstaande voorbeeld kan worden ingesteld door + de volgende regels toe te voegen aan + /etc/wpa_supplicant.conf: + + network={ + ssid="mijn_net" + key_mgmt=NONE + wep_key3=3456789012 + wep_tx_keyid=3 +} + + Daarna: + + &prompt.root; wpa_supplicant -i ath0 -c /etc/wpa_supplicant.conf +Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz) +Associated with 00:13:46:49:41:76 + + + + + + Ad-hoc-modus + + IBSS-modus, ook ad-hoc-modus genoemd, is ontworpen voor + point-to-point-verbindingen. Om bijvoorbeeld een ad-hoc-netwerk + tussen de machine A en de machine + B op te zetten, is het slechts nodig om twee + IP-adressen en een SSID te kiezen. + + Op machine A: + + &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.1 netmask 255.255.255.0 +&prompt.root; ifconfig ath0 + ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 + inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4 + ether 00:11:95:c3:0d:ac + media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>) + status: associated + ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac + authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100 + + De parameter adhoc geeft aan dat de + interface in de IBSS-modus draait. + + Op B zal het mogelijk moeten zijn om + A te detecteren: + + &prompt.root; ifconfig ath0 up scan + SSID BSSID CHAN RATE S:N INT CAPS + freebsdap 02:11:95:c3:0d:ac 2 54M 19:3 100 IS + + De I in de uitvoer bevestigt dat machine + A in ad-hoc-modus verkeert. Het is slechts + nodig om B met een ander IP-adres in te stellen + : + + &prompt.root; ifconfig ath0 ssid freebsdap mediaopt adhoc inet 192.168.0.2 netmask 255.255.255.0 +&prompt.root; ifconfig ath0 + ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect <adhoc> (autoselect <adhoc>) + status: associated + ssid freebsdap channel 2 bssid 02:11:95:c3:0d:ac + authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100 + + Zowel A als B zijn nu + klaar om informatie uit te wisselen. + + + + &os; Host Toegangspunten + + &os; kan als toegangspunt (AP) functioneren wat de noodzaak + om een hardwarematig AP te kopen of een ad-hoc-netwerk te + draaien wegneemt. Dit kan bijzonder nuttig zijn indien de + &os;-machine als gateway naar een ander netwerk (bijvoorbeeld + het Internet) functioneert. + + + Basisinstellingen + + Voordat de &os;-machine als een AP wordt ingesteld, dient + de kernel te worden ingesteld met de juiste ondersteuning voor + draadloos netwerken voor de draadloze kaart. Ook dient er + ondersteuning voor de te gebruiken beveiligingsprotocollen te + worden toegevoegd. Meer details staan in . + + + Momenteel staan de NDIS-stuurpgrogrammawrapper en de + stuurprogramma's van &windows; het werken als AP niet toe. + Alleen originele draadloze &os;-stuurprogramma's + ondersteunen AP-modus. + + + Wanneer de ondersteuning voor draadloos netwerken is + geladen, kan gecontroleerd worden of het draadloze apparaat + de hostgebaseerde toegangspuntmodus ondersteunt (ook bekend + als hostap-modus): + + &prompt.root; ifconfig ath0 list caps +ath=783ed0f<WEP,TKIP,AES,AES_CCM,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREABLE,MONITOR,TKIPMIC,WPA1,WPA2,BURST,WME> + + Deze uitvoer geeft de mogelijkheden van de kaart weer, het + woord HOSTAP bevestigt dat deze draadloze + kaart als toeganspunt kan functioneren. Ook worden + verschillende ondersteunde versleutelmethoden genoemd: WEP, + TKIP, WPA2, enz., deze informatie is belangrijk om te weten + welke beveiligingsprotocollen ingesteld kunnen worden op het + toegangspunt. + + Het draadloze apparaat kan nu in hostap-modus worden gezet + en ingesteld worden met de juiste SSID en IP-adres: + + &prompt.root; ifconfig ath0 ssid freebsdap mode 11g mediaopt hostap inet 192.168.0.1 netmask 255.255.255.0 + + Gebruik weer ifconfig om de status van + de interface ath0 te zien: + + &prompt.root; ifconfig ath0 + ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 + inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4 + ether 00:11:95:c3:0d:ac + media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <hostap> + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode OPEN privacy OFF txpowmax 38 bmiss 7 protmode CTS burst dtimperiod 1 bintval 100 + + De parameter hostap geeft aan dat de + interface in hostgebaseerde toegangspuntmodus draait. + + Het instellen van de interface kan automatisch tijdens het + opstarten gedaan worde door de volgende regel aan + /etc/rc.conf toe te voegen: + + ifconfig_ath0="ssid freebsdap mode 11g mediaopt hostap inet 192.168.0.1 netmask 255.255.255.0" + + + + Hostgebaseerde toegangspunt zonder authenticatie of + versleuteling + + Hoewel het niet aangeraden wordt om een AP zonder enige + vorm van authenticatie of encryptie te draaien, is dit een + eenvoudige manier om te controleren of het AP werkt. Deze + configuratie is ook belangrijk voor het debuggen van problemen + met clients. + + Nadat het AP is ingesteld als eerder is laten zien, is het + mogelijk om van een andere draadloze machine een scan te + beginnen om het AP te vinden: + + &prompt.root; ifconfig ath0 up scan +SSID BSSID CHAN RATE S:N INT CAPS +freebsdap 00:11:95:c3:0d:ac 1 54M 22:1 100 ES + + De clientmachine heeft het AP gevonden en kan ermee + geassocieeerd worden: + + &prompt.root; ifconfig ath0 ssid freebsdap inet 192.168.0.2 netmask 255.255.255.0 +&prompt.root; ifconfig ath0 + ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500 + inet6 fe80::211:95ff:fed5:4362%ath0 prefixlen 64 scopeid 0x1 + inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255 + ether 00:11:95:d5:43:62 + media: IEEE 802.11 Wireless Ethernet autoselect (OFDM/54Mbps) + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac + authmode OPEN privacy OFF txpowmax 36 protmode CTS bintval 100 + + + + WPA hostgebaseerde toegangspunt + + Deze sectie zal zich richten op opzetten van een &os; + toegangspunt dat het beveilingsprotocol WPA gebruikt. Meer + details over WPA en het instellen van op WPA gebaseerde + draadloze clients kan gevonden worden in . + + De daemon hostapd wordt + gebruikt om clientauthenticatie en sleutelbeheer op het + toegangspunt met WPA af te handelen. + + In het volgende zullen alle instellingsbewerkingen worden + uitgevoerd op de &os;-machine die als AP dienst doet. Wanneer + het AP correct werkt, zou hostapd + automatisch tijdens het opstarten aangezet moeten worden met + de volgende regel in /etc/rc.conf: + + hostapd_enable="YES" + + Zorg ervoor dat voordat geprobeerd wordt om + hostapd in te stellen, de + basisinstellingen die in zijn geïntroduceerd + zijn uitgevoerd. + + + WPA-PSK + + WPA-PSK is bedoeld voor kleine netwerken waar het + gebruik van een achterliggende authenticatieserver niet + mogelijk of gewenst is. + + Het instellen wordt gedaan in het bestand + /etc/hostapd.conf: + + interface=ath0 +debug=1 +ctrl_interface=/var/run/hostapd +ctrl_interface_group=wheel +ssid=freebsdap +wpa=1 +wpa_passphrase=freebsdmall +wpa_key_mgmt=WPA-PSK +wpa_pairwise=CCMP TKIP + + + + Dit veld geeft aan welke draadloze inteface voor het + toegangspunt wordt gebruikt. + + + + Dit veld stelt het verbositeitsniveau in dat tijdens + het draaien van hostapd wordt + gebruikt. Een waarde van 1 + vertegenwoordigt het minimale niveau. + + + + Het veld ctrl_interface geeft de + padnaam van de door hostapd + gebruikte map om de domeinsocketbestanden voor + communicatie met externe programma's zoals + &man.hostapd.cli.8; in op te slaan. Hier wordt de + standaardwaarde gebruikt. + + + + De regel ctrl_interface_group + stelt de groep in (hier is het de groep + wheel) die toegang heeft tot de + control interfacebestanden. + + + + Het veld wpa maakt WPA mogelijk + en specificeert welk WPA-authenticatieprotocol nodig zal + zijn. De waarde 1 stelt het AP in op + WPA-PSK. + + + + Het veld wpa_passphrase bevat het + ASCII-wachtwoord voor de WPA-authenticatie. + + + Gebruik altijd sterke wachtwoorden welke voldoende + lang zijn en opgebouwd zijn uit een grote + tekenverzameling zodat ze niet gemakkelijk worden + geraden of aangevallen. + + + + + De regel wpa_key_mgmt verwijst + naar het gebruikte sleutelbeheerprotocol. In dit geval + is dat WPA-PSK. + + + + Het veld wpa_pairwise geeft aan + welke versleutelingsalgoritmes door het toegangspunt + worden geaccepteerd. Hier worden zowel de versleuteling + TKIP (WPA) en CCMP (WPA2) geaccepteerd. De + versleuteling CCMP is een alternatief voor TKIP en wordt + sterk aangeraden indien mogelijk; TKIP dient alleen + gebruikt te worden voor stations die geen CCMP aankunnen + . + + + + De volgende stap is het starten van + hostapd: + + &prompt.root /etc/rc.d/hostapd forcestart + + &prompt.root; ifconfig ath0 + ath0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 2290 + inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255 + inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4 + ether 00:11:95:c3:0d:ac + media: IEEE 802.11 Wireless Ethernet autoselect mode 11g <hostap> + status: associated + ssid freebsdap channel 1 bssid 00:11:95:c3:0d:ac >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 08:06:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 152741065672; Fri, 15 Aug 2008 08:06:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBE64106566B for ; Fri, 15 Aug 2008 08:06:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AD41F8FC12 for ; Fri, 15 Aug 2008 08:06:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F86mtK039025 for ; Fri, 15 Aug 2008 08:06:48 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F86mA0039023 for perforce@freebsd.org; Fri, 15 Aug 2008 08:06:48 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 08:06:48 GMT Message-Id: <200808150806.m7F86mA0039023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 08:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147425 Change 147425 by zec@zec_tpx32 on 2008/08/15 08:06:14 Add an intro section to the document, clarify a few issues, randomly s/virtual machine/virtual environment/ or vimage or vnet where appropriate. Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#6 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#6 (text+ko) ==== @@ -6,21 +6,94 @@ =================== Vimage is a framework in the BSD kernel which allows a co-operating module -to present multiple instances of itself so that it can participate -in a virtual machine scenario. +to operate on multiple independent instances of its state so that it can +participate in a virtual machine / virtual environment scenario. + +The implementation approach taken by the vimage framwork is a replacement +of selected global state variables with constructs that allow for the +virtualized state to be stored and resolved in appropriate instances of +module-specific container structures. The code operating on virtualized state +has to conform to a set of rules described further bellow, among other things +in order to allow for all the changes to be conditionally compilable, i.e. +permitting the virtualized code to fall back to operation on global state. + +The most visible change throughout the existing code is typically replacement +of direct references to global variables with macros; foo_var thus becomes +V_foo_var. V_foo_bar macros will resolve back to foo_bar global in default +kernel builds, and alternatively to some_base_pointer->_foo_bar for "options +VIMAGE" kernel configs. Prepending of "V_" prefixes to variable references +helps in visual discrimination between global and virtualized state. The +framework extends the sysctl infrastructure to support access to virtualized +state through introduction of the SYSCTL_V family of macros; those also +automatically fall back to their standard SYSCTL counterparts in default +kernel builds. Transparent kldsym(2) lookups are provided to virtualized +variables explicitly marked for visibility to kldsym interface, which permits +userland binaries such as netstat to operate unmodified on "options VIMAGE" +kernels, though this may have wide security implications. + +The vimage struct is currently primarily a placeholder for pointers to +module-specific struct instances; currently V_NET (networking), V_CPU +(CPU scheduling), and V_PROCG (jail-style interprocess protection) major +module classes are defined. Each vimage module may or may not be further +split into minor or submodules; the networking subsystem (vimage id V_NET; +struct vnet) in particular is organized in submodules such as VNET_MOD_NET +(mandatory shared infrastructure: routing tables, interface lists etc.); +VNET_MOD_INET (IPv4 state including transport protocols); VNET_MOD_INET6, +VNET_MOD_IPSEC, VNET_MOD_IPFW, VNET_MOD_NETGRAPH etc. The speciality of +VNET submodules is in that they not only provide storage for virtualized +data, but also enforce ordering of initialization and cleanup. Hence, not +all submodules must necessarily allocate private storage for their specific +data; they may be defined solely for to support proper initialization +ordering. + +Each process is associated with a vimage, and vimages currently hang off of +ucred-s. This relationship defines a process's administrative affinity +to a vimage and thus indirectly to all of its modules (NET, CPU, PROCG) +as well as to any submodules. All network interfaces and sockets hold +pointers back to their parent vnets; this relationship is obviously entirely +independent from proc->ucred->vimage bindings. Hence, when a process +opens a socket, the socket will get bound to a vnet instance hanging off of +proc->ucred->vimage->vnet, but once such a socket->vnet binding gets +established, it cannot be changed for the entire socket lifetime. Certain +classes of network interfaces (Ethernet in particular) can be assigned +from one vnet to another at any time. By definition all vnets are +are independent and can communicate only if they are explicitly provided +with communication paths; currently only netgraph can be used to establish +inter-vnet datapaths. + +In network traffic processing the vnet affinity is defined either by the +inbound interface or by the socket / pcb -> vnet binding. However, there +are many functions in the network stack that cannot implicitly fetch +the vnet context from their standard arguments. Instead of explicitly +extending argument lists of such functions with a struct vnet *, +a per-thread variable td_vnet was introduced, which can be fetched via +the curvnet macro (#define curvnet curthread->td_vnet). The curvnet +context has to be set on entry to the network stack (socket operations, +packet reception, or timer-driven functions) and cleared on exit. This +must be done via provided CURVNET_SET() / CURVNET_RESTORE() family of +macros, which allow for "stacking" of curvnet context setting and provide +additional debugging info in INVARIANTS kernel configs. In most cases +however a developer writing virtualized code will not have to set / +restore the curvnet context unless the code would include timer-driven +events, given that those are inherently vnet-contextless on entry. + + +Converting / virtualizing existing code +======================================= There are several steps need in virtualisation. + 1/ decide whether the module needs to be virtualised. if the module is a driver for specific hardware, it makes sense that there be only one instance of the driver as there is only one piece of physical hardware. There are changes in the networking code to allow - physical (or virtual) interfaces to be moved between virtual machines. - This generally requires NO changes to the network drivers of the classes + physical (or virtual) interfaces to be moved between vnets. This + generally requires NO changes to the network drivers of the classes covered (e.g. ethernet). 2/ decide if your module is part of one of the major module groups. - These are V_GLOBAL V_NET V_PROCG V_CPU. + These are currently V_NET V_PROCG V_CPU. The reader will note that the descriptions below use the acronym VNET a lot. The vimage system has been at this time broken into a number of @@ -32,11 +105,6 @@ processors to it, but keep the saem filesystem and network setup, or alternatively to share processors but to have virtualised networking. - The current code has a "vnet" pointer in the thread. It could be argued - that it should actually be a vimage. - - [comments from Marko here] - 3/ If the module is to be virtualised, decide which attributes of the module should be virtualised. @@ -51,26 +119,28 @@ achieve the behaviour required for part #2. 5/ Work out for all the code paths through the module, how the path entering - the module can divine which virtual machine it is on. + the module can divine which virtual environment it is on. Some examples: - * Since interfaces are all assigned to one virtual machine or - another, an incoming packet has a pointer to the receive interface, - which in turn has a pointer to the virtual machine instance. + * Since interfaces are all assigned to one vnet or another, an incoming + packet has a pointer to the receive interface, which in turn has a + pointer back to the vnet. * Similarly, on any request from outside the kernel, (direct or indirect) - the current thread has a way to get to the current virtual machine - instance (easily referable as the "curvnet" macro). + the current thread has a way to get to the current virtual environment + instance via td->ucred->vimage. For existig sockets the vnet context + must be used via so->so_vnet since td->ucred->vimage might change after + socket creation. * Timer initiated actions usually have a (void *) argument which points to some private structure for the module. It should be possible to add - a pointer to the appropriate virtual machine instance into whatever - structure that points to. - * Sometimes an action (timer initialted or initialted by module load or - unload simply has to chack all the virtual machine instances. - There is a macro (pair) for this which will iterate through all the - virtual machine instances. + a pointer to the appropriate module instance into whatever structure + that points to. + * Sometimes an action (timer trigerred or trigerred by module load or + unload simply has to check all the vimage or module instances. + There are macro (pairs) for this which will iterate through all the + VNET or VPROCG instances. This covers most of the cases, however in some cases it may still be - required for the module to stash away the virtual machine instance + required for the module to stash away the virtual environment instance somewhere, and make associated changes in the code. 6/ Add the code described below to the files that make up the module @@ -80,7 +150,7 @@ temp. note: for module FOO add a definition for VNET_MOD_FOO in sys/vimage.h. Thos will eventually be dynamically assigned. -For now these instructions refer mainly to VNET and not VCPU etc. +For now these instructions refer mainly to VNET and not VCPU, VPROCG etc. Symbols defined in other modules that have been virtualised will have been moved to a module-specific virtualisation structure. It will be defined in a @@ -103,18 +173,19 @@ When VIMAGE is compiled in, the macro will evaluate to an access to an element in a structure pointed to by a local varible. For this reason, it is necessary to also add, at the beginning of -these functions another MACRO that will instanciate this local variable +these functions another MACRO that will instantiate this local variable and point it at the correct place. -As an example, prior to using the "V_ifnet" structure, we must -add the following MACRO at the head of a code block enclosing the references. - INIT_VNET_NET(initial_value); +As an example, prior to using the "V_ifnet" structure in a program block, +we must add the following MACRO at the head of a code block enclosing the +references to set up module-specific base pointer variable: + INIT_VNET_NET(initial_valu); When VIMAGE is not defined, this will evaluate to nothing but when it IS defined, it will evaluate to: struct vnet_net *vnet_net = (initial_value); The initial value is usually something like "curvnet" which in turn -is a macro that derives the virtual machine reference from the current thread. +is a macro that derives the vnet affinity from the current thread. It could also be (m->m_ifp->if_vnet) if we were receiving an mbuf. In the case where it is just one function in a module calling @@ -125,17 +196,17 @@ marked as "unused"). Usually, when a packet enters the system it is carried through the processing -path via a single thread, and that thread will set its virtual machine +path via a single thread, and that thread will set its virtual environment reference to that indicated by the packet on picking up that new packet. This means that in the normal inbound processing path as well as the outgoing process path the current thread can be used to indicate the -current virtual machine. In the case of timer initiated events, best practice -would also be to set the current virtual machine reference to that indicated -calculated by whatever way that would be done, so that any functions called -could rely on the current thread being a good reference for the correct -virtual machine. +current virtual environment. In the case of timer initiated events, best +practice would also be to set the current virtual module reference to that +indicated calculated by whatever way that would be done, so that any functions +called could rely on the current thread being a good reference for the correct +virtual module. -When a new module is defined for virtualisation. The following +When a new VNET submodule is defined for virtualisation, the following structure defining macro is used to define it to the framework. @@ -150,17 +221,18 @@ .vmi_struct_size = \ sizeof(struct vnet_##m_name_lc), \ .vmi_symmap = m_symmap \ + The ID we allocated in the temporary first step in "Details" is -the first entry here. Eventually this should be automatically done +the first entry here; eventually this should be automatically done by module name. The DEPENDSON field tells us the order that modules -should be initialised in a new virtual machine. This may later need +should be initialised in a new virtual environment. This may later need to be changes to a list of text module names for dynamic calculation. -The rest of the fields are self explanatory.. +The rest of the fields are self explanatory. With the exception of the symmap entry. The symmap allows us to intercept calls by libkvm to the linker when it is looking up symbols and to redirect it dynamically. this allows for example "netstat -r" to find the -routing tables for THIS virtual machine. (cute eh?) +routing tables for THIS virtual environment. (of course that won't work for core dumps). (XXX *needs thought *) As example of virtualising a dummy module named the FOO module @@ -194,11 +266,13 @@ #endif /* !_FOO_VFOO_H_ */ ========================================================= -For each time the foo module is initiated for a new virtual machine, +For each time the foo module is initiated for a new virtual environment, the foo_bar structure must be initiated, so a new foo_creator and destructor functions are defined for the module. The Module will call these when a new -virtual machine is created or destroyed. The constructor must be called once -for the base machine when the system is booted, even when VIMAGE is not defined. +virtual environment is created or destroyed. The constructor must be called +once for the base machine when the system is booted, even when options VIMAGE +is not defined. + ==================== in module foo.c ====== #include "opt_vimage.h" [...] @@ -229,7 +303,7 @@ #ifdef VIMAGE /* If we have symbols we need to divert for libkvm - * then put them in here. We may net need to do anything if + * then put them in here. We may not need to do anything if * the symbols are not used by libkvm. */ static struct vnet_symmap vnet_net_symmap[] = { @@ -239,7 +313,7 @@ }; /* * Declare our module and state that we want to be done after the - * loopback interface is initialised for the virtual machine. + * loopback interface is initialised for the virtual environment. */ VNET_MOD_DECLARE(FOO, foo, vnet_foo_iattach, vnet_foo_idetach, LOIF, vnet_foo_symmap) @@ -295,7 +369,7 @@ /* Initialize everything. */ /* put your code here */ #ifdef VIMAGE - /* This will do the work for each vortual machine. */ + /* This will do the work for each vortual environment. */ vnet_mod_register(&vnet_foo_modinfo); #else /* !VIMAGE */ #ifdef FUTURE @@ -309,7 +383,7 @@ case MOD_UNLOAD: /* You can't unload it because an interface may be using it. */ /* this needs work */ - /* Should refuse to unload if any virtual machines */ + /* Should refuse to unload if any virtual environment */ /* are using this still. */ /* MARKO, fill in here */ error = EBUSY; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 08:47:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44CA8106566C; Fri, 15 Aug 2008 08:47:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0826A1065682 for ; Fri, 15 Aug 2008 08:47:30 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCFE88FC1B for ; Fri, 15 Aug 2008 08:47:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F8lTWH051458 for ; Fri, 15 Aug 2008 08:47:29 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F8lT2v051456 for perforce@freebsd.org; Fri, 15 Aug 2008 08:47:29 GMT (envelope-from trasz@freebsd.org) Date: Fri, 15 Aug 2008 08:47:29 GMT Message-Id: <200808150847.m7F8lT2v051456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 08:47:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147427 Change 147427 by trasz@trasz_traszkan on 2008/08/15 08:47:11 Simplify the setfacl(1) utility, removing the acl[2] array and a few global variables. Note that the default ACL handling and mask recalculation were not tested. Will do that later. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#9 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#9 (text+ko) ==== @@ -36,10 +36,11 @@ #include "setfacl.h" -static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new); +static int merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, + int acl_brand); static int -merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new) +merge_user_group(acl_entry_t *entry, acl_entry_t *entry_new, int acl_brand) { acl_permset_t permset; acl_extended_t extended; @@ -62,7 +63,7 @@ if (acl_set_permset(*entry_new, permset) == -1) err(1, "acl_set_permset() failed"); - if (acl_type == ACL_TYPE_NFS4) { + if (acl_brand == ACL_BRAND_NFS4) { if (acl_get_extended_np(*entry, &extended)) err(1, "acl_get_extended_np() failed"); if (acl_set_extended_np(*entry_new, extended)) @@ -97,7 +98,7 @@ int acl_brand, prev_acl_brand; acl_get_brand_np(acl, &acl_brand); - acl_get_brand_np(prev_acl[0], &prev_acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); if (acl_brand != prev_acl_brand) { warnx("%s: branding mismatch; existing ACL is %s, " @@ -107,10 +108,7 @@ return (-1); } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) err(1, "%s: acl_dup() failed", filename); @@ -145,7 +143,7 @@ * For NFS4, in addition to "tag" and "id" we also * compare "extended". */ - if (acl_type == ACL_TYPE_NFS4) { + if (acl_brand == ACL_BRAND_NFS4) { if (acl_get_extended_np(entry, &extended)) err(1, "%s: acl_get_extended_np() " "failed", filename); @@ -160,7 +158,7 @@ case ACL_USER: case ACL_GROUP: have_entry = merge_user_group(&entry, - &entry_new); + &entry_new, acl_brand); if (have_entry == 0) break; /* FALLTHROUGH */ @@ -176,7 +174,7 @@ err(1, "%s: acl_set_permset() failed", filename); - if (acl_type == ACL_TYPE_NFS4) { + if (acl_brand == ACL_BRAND_NFS4) { if (acl_get_extended_np(entry, &extended)) err(1, "%s: acl_get_extended_np() failed", filename); @@ -207,7 +205,7 @@ * Appending them at the end makes no sense, since * in most cases they wouldn't even get evaluated. */ - if (acl_type == ACL_TYPE_NFS4) { + if (acl_brand == ACL_BRAND_NFS4) { if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { warn("%s: acl_create_entry_np() failed", filename); acl_free(acl_new); @@ -232,13 +230,8 @@ } } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; - } + acl_free(*prev_acl); + *prev_acl = acl_new; return (0); } @@ -248,24 +241,25 @@ { acl_entry_t entry, entry_new; acl_t acl_new; - int entry_id, acl_brand; + int entry_id, acl_brand, prev_acl_brand; + + acl_get_brand_np(acl, &acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_type != ACL_TYPE_NFS4) { + if (prev_acl_brand != ACL_BRAND_NFS4) { warnx("%s: the '-a' option is only applicable to NFS4 ACLs", filename); return (-1); } - acl_get_brand_np(acl, &acl_brand); - if (acl_brand != ACL_BRAND_NFS4) { - warnx("%s: branding mismatch; existing ACL is %s, " - "entry to be added is NFS4", filename, + warnx("%s: branding mismatch; existing ACL is NFS4, " + "entry to be added is %s", filename, acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX"); return (-1); } - acl_new = acl_dup(prev_acl[ACCESS_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) err(1, "%s: acl_dup() failed", filename); @@ -295,8 +289,8 @@ err(1, "%s: acl_copy_entry() failed", filename); } - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; + acl_free(*prev_acl); + *prev_acl = acl_new; return (0); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#6 (text+ko) ==== @@ -51,7 +51,7 @@ carried_error = 0; acl_get_brand_np(acl, &acl_brand); - acl_get_brand_np(prev_acl[0], &prev_acl_brand); + acl_get_brand_np(*prev_acl, &prev_acl_brand); if (acl_brand != prev_acl_brand) { warnx("%s: branding mismatch; existing ACL is %s, " @@ -63,10 +63,7 @@ carried_error = 0; - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) err(1, "%s: acl_dup() failed", filename); @@ -87,13 +84,8 @@ } } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; - } + acl_free(*prev_acl); + *prev_acl = acl_new; if (carried_error) return (-1); @@ -112,10 +104,7 @@ carried_error = 0; - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - acl_new = acl_dup(prev_acl[ACCESS_ACL]); - else - acl_new = acl_dup(prev_acl[DEFAULT_ACL]); + acl_new = acl_dup(*prev_acl); if (acl_new == NULL) err(1, "%s: acl_dup() failed", filename); @@ -148,13 +137,8 @@ warn("%s: acl_delete_entry_np() failed", filename); } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; - } + acl_free(*prev_acl); + *prev_acl = acl_new; if (carried_error) return (-1); @@ -168,16 +152,11 @@ int remove_default(acl_t *prev_acl, const char *filename) { + acl_free(*prev_acl); + *prev_acl = acl_init(ACL_MAX_ENTRIES); + if (*prev_acl == NULL) + err(1, "%s: acl_init() failed", filename); - if (prev_acl[1]) { - acl_free(prev_acl[1]); - prev_acl[1] = acl_init(ACL_MAX_ENTRIES); - if (prev_acl[1] == NULL) - err(1, "%s: acl_init() failed", filename); - } else { - warn("%s: cannot remove default ACL", filename); - return (-1); - } return (0); } @@ -187,22 +166,13 @@ void remove_ext(acl_t *prev_acl, const char *filename) { - acl_t acl_new, acl_old; + acl_t acl_new; - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - acl_old = prev_acl[ACCESS_ACL]; - else - acl_old = prev_acl[DEFAULT_ACL]; - - acl_new = acl_strip_np(acl_old, !n_flag); + acl_new = acl_strip_np(*prev_acl, !n_flag); if (acl_new == NULL) err(1, "%s: acl_strip_np() failed", filename); - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) { - acl_free(prev_acl[ACCESS_ACL]); - prev_acl[ACCESS_ACL] = acl_new; - } else { - acl_free(prev_acl[DEFAULT_ACL]); - prev_acl[DEFAULT_ACL] = acl_new; - } + acl_free(*prev_acl); + *prev_acl = acl_new; } + ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#11 (text+ko) ==== @@ -41,9 +41,9 @@ #include "setfacl.h" -static void add_filename(const char *filename); -static acl_t *get_file_acls(const char *filename); -static void usage(void); +static void add_filename(const char *filename); +static acl_t get_file_acl(const char *filename, acl_type_t type, int h_flag); +static void usage(void); static void add_filename(const char *filename) @@ -59,41 +59,55 @@ TAILQ_INSERT_TAIL(&filelist, file, next); } -static acl_t * -get_file_acls(const char *filename) +static acl_t +get_file_acl(const char *filename, acl_type_t type, int h_flag) { - acl_t *acl; + acl_t acl = NULL; struct stat sb; - int type; - if (stat(filename, &sb) == -1) { - warn("%s: stat() failed", filename); - return (NULL); + if (pathconf(filename, _PC_EXTENDED_SECURITY_NP)) { + if (type == ACL_TYPE_ACCESS) { + type = ACL_TYPE_NFS4; + } else { + warnx("%s: there are no default entries in NFS4 ACLs", + filename); + return (NULL); + } } - if (pathconf(filename, _PC_EXTENDED_SECURITY_NP)) - type = ACL_TYPE_NFS4; - else - type = ACL_TYPE_ACCESS; + switch (type) { + case ACL_TYPE_ACCESS: + case ACL_TYPE_NFS4: + if (h_flag) + acl = acl_get_link_np(filename, type); + else + acl = acl_get_file(filename, type); + break; + + case ACL_TYPE_DEFAULT: + if (stat(filename, &sb) == -1) { + warn("%s: stat() failed", filename); + return (NULL); + } + + if (S_ISDIR(sb.st_mode) == 0) + return (NULL); + + if (h_flag) + acl = acl_get_link_np(filename, ACL_TYPE_DEFAULT); + else + acl = acl_get_file(filename, ACL_TYPE_DEFAULT); + break; + } - acl = zmalloc(sizeof(acl_t) * 2); - if (h_flag) - acl[ACCESS_ACL] = acl_get_link_np(filename, type); - else - acl[ACCESS_ACL] = acl_get_file(filename, type); - if (acl[ACCESS_ACL] == NULL) - err(1, "%s: acl_get_file() failed", filename); - if (S_ISDIR(sb.st_mode) && type != ACL_TYPE_NFS4) { + if (acl == NULL) { if (h_flag) - acl[DEFAULT_ACL] = acl_get_link_np(filename, - ACL_TYPE_DEFAULT); + warn("%s: acl_get_link_np() failed", filename); else - acl[DEFAULT_ACL] = acl_get_file(filename, - ACL_TYPE_DEFAULT); - if (acl[DEFAULT_ACL] == NULL) - err(1, "%s: acl_get_file() failed", filename); - } else - acl[DEFAULT_ACL] = NULL; + warn("%s: acl_get_file() failed", filename); + + return (NULL); + } return (acl); } @@ -110,9 +124,11 @@ int main(int argc, char *argv[]) { - acl_t *acl, final_acl; + acl_t acl; + acl_type_t acl_type; char filename[PATH_MAX]; int local_error, carried_error, ch, i, entry_number; + int h_flag; struct sf_file *file; struct sf_entry *entry; const char *fn_dup; @@ -233,17 +249,9 @@ /* cycle through each file */ TAILQ_FOREACH(file, &filelist, next) { - /* get our initial access and default ACL's */ - acl = get_file_acls(file->filename); + acl = get_file_acl(file->filename, acl_type, h_flag); if (acl == NULL) continue; - if ((acl_type == ACL_TYPE_DEFAULT) && !acl[1]) { - if (pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) - warnx("%s: there are no default entries in NFS4 ACLs", file->filename); - else - warnx("%s: default ACL not valid", file->filename); - continue; - } local_error = 0; @@ -260,15 +268,15 @@ switch(entry->op) { case OP_ADD_ACL: local_error += add_acl(entry->acl, - entry->entry_number, acl, file->filename); + entry->entry_number, &acl, file->filename); break; case OP_MERGE_ACL: - local_error += merge_acl(entry->acl, acl, + local_error += merge_acl(entry->acl, &acl, file->filename); need_mask = 1; break; case OP_REMOVE_EXT: - remove_ext(acl, file->filename); + remove_ext(&acl, file->filename); need_mask = 0; break; case OP_REMOVE_DEF: @@ -283,17 +291,19 @@ file->filename); local_error++; } - local_error += remove_default(acl, file->filename); + if (acl_type == ACL_TYPE_DEFAULT) + local_error += remove_default(&acl, + file->filename); need_mask = 0; break; case OP_REMOVE_ACL: - local_error += remove_acl(entry->acl, acl, + local_error += remove_acl(entry->acl, &acl, file->filename); need_mask = 1; break; case OP_REMOVE_BY_NUMBER: local_error += remove_by_number(entry->entry_number, - acl, file->filename); + &acl, file->filename); need_mask = 1; break; } @@ -305,43 +315,32 @@ continue; } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - final_acl = acl[ACCESS_ACL]; - else - final_acl = acl[DEFAULT_ACL]; - if (acl_type == ACL_TYPE_NFS4) need_mask = 0; - if (need_mask && (set_acl_mask(&final_acl, + if (need_mask && (set_acl_mask(&acl, file->filename) == -1)) { warnx("%s: failed to set ACL mask", file->filename); carried_error++; } else if (h_flag) { if (acl_set_link_np(file->filename, acl_type, - final_acl) == -1) { + acl) == -1) { carried_error++; warn("%s: acl_set_link_np() failed", file->filename); } } else { if (acl_set_file(file->filename, acl_type, - final_acl) == -1) { + acl) == -1) { carried_error++; warn("%s: acl_set_file() failed", file->filename); } } - if (acl_type == ACL_TYPE_ACCESS || acl_type == ACL_TYPE_NFS4) - acl[ACCESS_ACL] = final_acl; - else - acl[DEFAULT_ACL] = final_acl; - - acl_free(acl[ACCESS_ACL]); - acl_free(acl[DEFAULT_ACL]); - free(acl); + acl_free(acl); } return (carried_error); } + ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#5 (text+ko) ==== @@ -41,10 +41,6 @@ #define OP_REMOVE_BY_NUMBER 0x04 /* remove acl's (-xX) by acl entry number */ #define OP_ADD_ACL 0x05 /* add acls entries at a given position */ -/* ACL types for the acl array */ -#define ACCESS_ACL 0 -#define DEFAULT_ACL 1 - /* TAILQ entry for acl operations */ struct sf_entry { uint op; @@ -76,11 +72,9 @@ /* util.c */ void *zmalloc(size_t size); -acl_type_t acl_type; uint have_mask; uint need_mask; uint have_stdin; -uint h_flag; uint n_flag; #endif /* _SETFACL_H */ From owner-p4-projects@FreeBSD.ORG Fri Aug 15 09:14:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF4D106567C; Fri, 15 Aug 2008 09:14:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0038B1065672 for ; Fri, 15 Aug 2008 09:14:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D55FD8FC0A for ; Fri, 15 Aug 2008 09:14:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F9EvoJ054809 for ; Fri, 15 Aug 2008 09:14:57 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F9EvbU054807 for perforce@freebsd.org; Fri, 15 Aug 2008 09:14:57 GMT (envelope-from trasz@freebsd.org) Date: Fri, 15 Aug 2008 09:14:57 GMT Message-Id: <200808150914.m7F9EvbU054807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 09:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147429 Change 147429 by trasz@trasz_traszkan on 2008/08/15 09:14:32 Don't panic with null pointer dereference on setfacl -k. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#11 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#11 (text+ko) ==== @@ -479,6 +479,10 @@ ap->a_cred, ap->a_td); if (error != 0) return (error); + + error = acl_copy_acl_into_oldacl(ap->a_aclp, &old); + if (error) + return (error); } else { /* * Delete operation. @@ -506,10 +510,6 @@ if ((error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td))) return (error); - error = acl_copy_acl_into_oldacl(ap->a_aclp, &old); - if (error) - return (error); - switch(ap->a_type) { case ACL_TYPE_ACCESS: error = vn_extattr_set(ap->a_vp, IO_NODELOCKED, From owner-p4-projects@FreeBSD.ORG Fri Aug 15 09:41:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B5951065677; Fri, 15 Aug 2008 09:41:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3BBC106566C for ; Fri, 15 Aug 2008 09:41:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A3F4F8FC1A for ; Fri, 15 Aug 2008 09:41:24 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F9fOxv056947 for ; Fri, 15 Aug 2008 09:41:24 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F9fOAY056945 for perforce@freebsd.org; Fri, 15 Aug 2008 09:41:24 GMT (envelope-from trasz@freebsd.org) Date: Fri, 15 Aug 2008 09:41:24 GMT Message-Id: <200808150941.m7F9fOAY056945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 09:41:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147430 Change 147430 by trasz@trasz_traszkan on 2008/08/15 09:40:37 Fix default ACL support. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#12 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#3 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#12 (text+ko) ==== @@ -90,8 +90,11 @@ return (NULL); } - if (S_ISDIR(sb.st_mode) == 0) + if (S_ISDIR(sb.st_mode) == 0) { + warnx("%s: default ACL may only be set on a directory", + filename); return (NULL); + } if (h_flag) acl = acl_get_link_np(filename, ACL_TYPE_DEFAULT); @@ -257,8 +260,6 @@ if (acl_type != ACL_TYPE_DEFAULT && pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) acl_type = ACL_TYPE_NFS4; - else - acl_type = ACL_TYPE_ACCESS; /* cycle through each option */ TAILQ_FOREACH(entry, &entrylist, next) { ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#3 (text+ko) ==== @@ -63,7 +63,7 @@ > mask::r-- > other::r-- -# Make sure cp without any flags does not copy copy the ACL. +# Make sure cp without any flags does not copy the ACL. $ cp xxx yyy $ ls -l yyy | cut -d' ' -f1 > -rw-r--r-- @@ -150,8 +150,42 @@ > mask::rw- > other::--- -# XXX: Test default ACLs. -# XXX: Test inheritance. +# Test default ACLs. +$ umask 022 +$ mkdir ddd +$ getfacl -qn ddd +> user::rwx +> group::r-x +> other::r-x + +$ getfacl -dqn ddd +$ setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx ddd +$ getfacl -dqn ddd +> user::rwx +> group::r-x +> mask::rwx +> other::r-x + +$ setfacl -dm g:42:rwx,u:42:r ddd +$ setfacl -dm g::w ddd +$ getfacl -dqn ddd +> user::rwx +> user:42:r-- +> group::-w- +> group:42:rwx +> mask::rwx +> other::r-x + +$ setfacl -dx group:42: ddd +$ getfacl -dqn ddd +> user::rwx +> user:42:r-- +> group::-w- +> mask::rw- +> other::r-x + +> # XXX: Test inheritance. +$ rmdir ddd $ rm xxx From owner-p4-projects@FreeBSD.ORG Fri Aug 15 09:44:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EFDE1065672; Fri, 15 Aug 2008 09:44:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 030D61065670 for ; Fri, 15 Aug 2008 09:44:28 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D75BD8FC1F for ; Fri, 15 Aug 2008 09:44:27 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F9iRBf057149 for ; Fri, 15 Aug 2008 09:44:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F9iRuE057147 for perforce@freebsd.org; Fri, 15 Aug 2008 09:44:27 GMT (envelope-from trasz@freebsd.org) Date: Fri, 15 Aug 2008 09:44:27 GMT Message-Id: <200808150944.m7F9iRuE057147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 09:44:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=147431 Change 147431 by trasz@trasz_traszkan on 2008/08/15 09:43:38 Don't silently ignore "-d" flag in getfacl(1); warn instead. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#11 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#11 (text+ko) ==== @@ -197,8 +197,15 @@ else more_than_one++; - if (pathconf(path, _PC_EXTENDED_SECURITY_NP)) + if (pathconf(path, _PC_EXTENDED_SECURITY_NP)) { + if (type == ACL_TYPE_DEFAULT) { + warnx("%s: there are no default entries in NFS4 ACLs", + path); + return (-1); + } + type = ACL_TYPE_NFS4; + } if (!qflag) printf("# file: %s\n# owner: %s\n# group: %s\n", path, From owner-p4-projects@FreeBSD.ORG Fri Aug 15 09:47:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B28A1065671; Fri, 15 Aug 2008 09:47:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E4DB106567A for ; Fri, 15 Aug 2008 09:47:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D3CE8FC1D for ; Fri, 15 Aug 2008 09:47:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7F9lVgV057487 for ; Fri, 15 Aug 2008 09:47:31 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7F9lUuh057485 for perforce@freebsd.org; Fri, 15 Aug 2008 09:47:30 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 15 Aug 2008 09:47:30 GMT Message-Id: <200808150947.m7F9lUuh057485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 09:47:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=147432 Change 147432 by ed@ed_dull on 2008/08/15 09:46:52 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/mpsafetty/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/mpsafetty/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/mpsafetty/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/uuid/uuid_stream.c#1 branch .. //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/mpsafetty/share/man/man4/bpf.4#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/mpsafetty/sys/conf/files#12 integrate .. //depot/projects/mpsafetty/sys/dev/age/if_age.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/mpsafetty/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/mpsafetty/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/mpsafetty/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/trap.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/clock.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/locore.s#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thread.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#3 integrate .. //depot/projects/mpsafetty/sys/libkern/strcspn.c#1 branch .. //depot/projects/mpsafetty/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ste/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/tl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/wb/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/pci/if_pcn.c#2 delete .. //depot/projects/mpsafetty/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/mpsafetty/sys/pci/if_ste.c#2 delete .. //depot/projects/mpsafetty/sys/pci/if_stereg.h#2 delete .. //depot/projects/mpsafetty/sys/pci/if_tl.c#2 delete .. //depot/projects/mpsafetty/sys/pci/if_tlreg.h#2 delete .. //depot/projects/mpsafetty/sys/pci/if_wb.c#2 delete .. //depot/projects/mpsafetty/sys/pci/if_wbreg.h#2 delete .. //depot/projects/mpsafetty/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/libkern.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/lock.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#4 integrate .. //depot/projects/mpsafetty/sys/vm/redzone.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#5 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_copy.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_option_T.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.err.uu#1 branch .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.out.uu#1 branch .. //depot/projects/mpsafetty/usr.bin/tar/test/test_patterns.tgz.uu#1 branch .. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/menus.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libbluetooth/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $ -# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.3 2007/05/21 02:49:02 deischen Exp $ +# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.4 2008/08/13 19:35:31 emax Exp $ LIB= bluetooth MAN= bluetooth.3 @@ -27,4 +27,8 @@ MLINKS+= bluetooth.3 bt_ntoa.3 MLINKS+= bluetooth.3 bt_aton.3 +MLINKS+= bluetooth.3 bdaddr_same.3 +MLINKS+= bluetooth.3 bdaddr_any.3 +MLINKS+= bluetooth.3 bdaddr_copy.3 + .include ==== //depot/projects/mpsafetty/lib/libbluetooth/bluetooth.3#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.7 2005/01/21 10:26:11 ru Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.8 2008/08/13 19:35:31 emax Exp $ .\" -.Dd May 7, 2003 +.Dd August 13, 2008 .Dt BLUETOOTH 3 .Os .Sh NAME @@ -40,7 +40,10 @@ .Nm bt_setprotoent , .Nm bt_endprotoent , .Nm bt_aton , -.Nm bt_ntoa +.Nm bt_ntoa , +.Nm bdaddr_same , +.Nm bdaddr_any , +.Nm bdaddr_copy .Nd Bluetooth routines .Sh LIBRARY .Lb libbluetooth @@ -70,6 +73,12 @@ .Fn bt_aton "const char *str" "bdaddr_t *ba" .Ft const char * .Fn bt_ntoa "const bdaddr_t *ba" "char *str" +.Ft int +.Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b" +.Ft int +.Fn bdaddr_any "const bdaddr_t *a" +.Ft int +.Fn bdaddr_copy "const bdaddr_t *dst" "const bdaddr_t *src" .Sh DESCRIPTION The .Fn bt_gethostent , @@ -186,6 +195,28 @@ string representing the address into the buffer provided. It is up to the caller to ensure that provided buffer has enough space. If no buffer was provided then internal static buffer will be used. +.Pp +The +.Fn bdaddr_same , +.Fn bdaddr_any +and +.Fn bdaddr_copy +are handy shorthand Bluetooth address utility functions. +The +.Fn bdaddr_same +function will test if two provided BD_ADDRs are the same. +The +.Fn bdaddr_any +function will test if provided BD_ADDR is +.Dv ANY +BD_ADDR. +The +.Fn bdaddr_copy +function will copy provided +.Fa src +BD_ADDR into provided +.Fa dst +BD_ADDR. .Sh FILES .Bl -tag -width ".Pa /etc/bluetooth/hosts" -compact .It Pa /etc/bluetooth/hosts ==== //depot/projects/mpsafetty/lib/libbluetooth/bluetooth.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $ - * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.2 2005/03/17 21:39:44 emax Exp $ + * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.3 2008/08/13 19:35:31 emax Exp $ */ #ifndef _BLUETOOTH_H_ @@ -72,6 +72,36 @@ char const * bt_ntoa (bdaddr_t const *ba, char *str); int bt_aton (char const *str, bdaddr_t *ba); +/* + * bdaddr utility functions (from NetBSD) + */ + +static __inline int +bdaddr_same(const bdaddr_t *a, const bdaddr_t *b) +{ + return (a->b[0] == b->b[0] && a->b[1] == b->b[1] && + a->b[2] == b->b[2] && a->b[3] == b->b[3] && + a->b[4] == b->b[4] && a->b[5] == b->b[5]); +} + +static __inline int +bdaddr_any(const bdaddr_t *a) +{ + return (a->b[0] == 0 && a->b[1] == 0 && a->b[2] == 0 && + a->b[3] == 0 && a->b[4] == 0 && a->b[5] == 0); +} + +static __inline void +bdaddr_copy(bdaddr_t *d, const bdaddr_t *s) +{ + d->b[0] = s->b[0]; + d->b[1] = s->b[1]; + d->b[2] = s->b[2]; + d->b[3] = s->b[3]; + d->b[4] = s->b[4]; + d->b[5] = s->b[5]; +} + __END_DECLS #endif /* ndef _BLUETOOTH_H_ */ ==== //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#4 (text+ko) ==== @@ -128,7 +128,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.174 2008/08/08 20:42:42 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1012,10 +1012,11 @@ /* Exponentially back off. */ for (i = 1; i <= SPIN_LIMIT_2POW; i++) { - for (j = 0; j < (1U << i); j++) + for (j = 0; j < (1U << i); j++) { ret++; + CPU_SPINWAIT; + } - CPU_SPINWAIT; if (_pthread_mutex_trylock(lock) == 0) return (ret); } @@ -2209,8 +2210,8 @@ */ regind = diff / size; } - } else if (size <= ((sizeof(size_invs) / sizeof(unsigned)) - << QUANTUM_2POW_MIN) + 2) { + } else if (size <= (((sizeof(size_invs) / sizeof(unsigned)) + 2) + << QUANTUM_2POW_MIN)) { regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; regind >>= SIZE_INV_SHIFT; } else { ==== //depot/projects/mpsafetty/lib/libc/uuid/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $ +# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.5 2008/08/14 22:23:16 emax Exp $ # DCE 1.1 UUID implementation sources .PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ - uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c + uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \ + uuid_to_string.c SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map MAN+= uuid.3 @@ -16,4 +17,8 @@ MLINKS+=uuid.3 uuid_from_string.3 MLINKS+=uuid.3 uuid_hash.3 MLINKS+=uuid.3 uuid_is_nil.3 +MLINKS+=uuid.3 uuid_enc_le.3 +MLINKS+=uuid.3 uuid_dec_le.3 +MLINKS+=uuid.3 uuid_enc_be.3 +MLINKS+=uuid.3 uuid_dec_be.3 MLINKS+=uuid.3 uuid_to_string.3 ==== //depot/projects/mpsafetty/lib/libc/uuid/uuid.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/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $ +.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.7 2008/08/14 22:23:16 emax Exp $ .\" -.Dd January 3, 2005 +.Dd August 13, 2008 .Dt UUID 3 .Os .Sh NAME @@ -52,6 +52,14 @@ .Fn uuid_is_nil "const uuid_t *uuid" "uint32_t *status" .Ft void .Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status" +.Ft void +.Fn uuid_enc_le "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_le "const void *buf" "uuid_t *" +.Ft void +.Fn uuid_enc_be "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_be "const void *buf" "uuid_t *" .Sh DESCRIPTION The family of DCE 1.1 compliant UUID functions allow applications to operate on universally unique identifiers, or UUIDs. @@ -74,6 +82,26 @@ respectively. A 16-bit hash value can be obtained by calling .Fn uuid_hash . +.Pp +The +.Fn uuid_enc_le +and +.Fn uuid_enc_be +functions encode a binary representation of a UUID into an octet stream +in little-endian and big-endian byte-order, respectively. +The destination buffer must be pre-allocated by the caller, and must be +large enough to hold the 16-octet binary UUID. +These routines are not part of the DCE RPC API. +They are provided for convenience. +.Pp +The +.Fn uuid_dec_le +and +.Fn uuid_dec_be +functions decode a UUID from an octet stream in little-endian and +big-endian byte-order, respectively. +These routines are not part of the DCE RPC API. +They are provided for convenience. .Sh RETURN VALUES The successful or unsuccessful completion of the function is returned in the ==== //depot/projects/mpsafetty/sbin/ifconfig/ifieee80211.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.56 2008/08/09 05:37:22 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.57 2008/08/14 03:49:14 thompsa Exp $ */ /*- @@ -670,8 +670,10 @@ getchaninfo(s); v = strtol(val, &ep, 10); - if (val[0] == '\0' || ep[0] != '\0' || errno == ERANGE) - errx(1, "invalid channel number"); + if (val[0] == '\0' || val == ep || errno == ERANGE || + /* channel may be suffixed with nothing, :flag, or /width */ + (ep[0] != '\0' && ep[0] != ':' && ep[0] != '/')) + errx(1, "invalid channel specification"); flags = getchannelflags(val, v); if (v > 255) { /* treat as frequency */ mapfreq(&chan, v, flags); ==== //depot/projects/mpsafetty/share/man/man4/bpf.4#2 (text+ko) ==== @@ -47,7 +47,7 @@ .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" -.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.51 2008/07/07 09:27:02 dwmalone Exp $ +.\" $FreeBSD: src/share/man/man4/bpf.4,v 1.52 2008/08/13 17:45:06 ed Exp $ .\" .Dd February 26, 2007 .Dt BPF 4 @@ -65,9 +65,7 @@ are accessible through this mechanism. .Pp The packet filter appears as a character special device, -.Pa /dev/bpf0 , -.Pa /dev/bpf1 , -etc. +.Pa /dev/bpf . After opening the device, the file descriptor must be bound to a specific network interface with the .Dv BIOCSETIF @@ -881,8 +879,8 @@ and .Fn BPF_JUMP opcode operand true_offset false_offset . .Sh FILES -.Bl -tag -compact -width /dev/bpfXXX -.It Pa /dev/bpf Ns Sy n +.Bl -tag -compact -width /dev/bpf +.It Pa /dev/bpf the packet filter device .El .Sh EXAMPLES ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.8 2008/08/12 21:31:31 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -157,9 +157,9 @@ case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); + ADDib(sizeof(int32_t), ECX); CMPrd(EDI, ECX); - JLEb(6); + JBEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -171,9 +171,9 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); + ADDib(sizeof(int16_t), ECX); CMPrd(EDI, ECX); - JLEb(4); + JBEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -184,7 +184,7 @@ ZEROrd(EAX); MOVid(ins->k, ECX); CMPrd(EDI, ECX); - JLEb(4); + JBEb(4); MOVrq3(R8, RBX); RET(); MOVobb(RBX, RCX, AL); @@ -202,9 +202,9 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); + ADDib(sizeof(int32_t), ECX); CMPrd(EDI, ECX); - JLEb(6); + JBEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -217,9 +217,9 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); + ADDib(sizeof(int16_t), ECX); CMPrd(EDI, ECX); - JLEb(4); + JBEb(4); MOVrq3(R8, RBX); RET(); MOVobw(RBX, RSI, AX); @@ -231,7 +231,7 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); CMPrd(EDI, ECX); - JLEb(4); + JBEb(4); MOVrq3(R8, RBX); RET(); MOVobb(RBX, RCX, AL); @@ -240,7 +240,7 @@ case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); CMPrd(EDI, ECX); - JLEb(6); + JBEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); RET(); @@ -293,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -374,7 +363,7 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); + TESTrd(EDX, EDX); JNEb(6); ZEROrd(EAX); MOVrq3(R8, RBX); ==== //depot/projects/mpsafetty/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.7 2008/08/12 21:31:31 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -294,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -369,42 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -417,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/mpsafetty/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1325 2008/08/12 00:27:32 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -977,6 +977,7 @@ dev/pci/pci_user.c optional pci dev/pci/pcib_if.m standard dev/pci/vga_pci.c optional pci +dev/pcn/if_pcn.c optional pcn pci dev/pdq/if_fea.c optional fea eisa dev/pdq/if_fpa.c optional fpa pci dev/pdq/pdq.c optional nowerror fea eisa | fpa pci @@ -1193,6 +1194,7 @@ dev/spibus/spibus_if.m optional spibus dev/sr/if_sr.c optional sr dev/sr/if_sr_pci.c optional sr pci +dev/ste/if_ste.c optional ste pci dev/stg/tmc18c30.c optional stg dev/stg/tmc18c30_isa.c optional stg isa dev/stg/tmc18c30_pccard.c optional stg pccard @@ -1224,6 +1226,7 @@ dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux dev/tdfx/tdfx_pci.c optional tdfx pci dev/ti/if_ti.c optional ti pci +dev/tl/if_tl.c optional tl pci dev/trm/trm.c optional trm dev/twa/tw_cl_init.c optional twa \ compile-with "${NORMAL_C} -I$S/dev/twa" @@ -1325,6 +1328,7 @@ dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci dev/watchdog/watchdog.c standard +dev/wb/if_wb.c optional wb pci dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi dev/wi/if_wi_pccard.c optional wi pccard @@ -2085,11 +2089,7 @@ pci/amdpm.c optional amdpm pci | nfpm pci pci/amdsmb.c optional amdsmb pci pci/if_mn.c optional mn pci -pci/if_pcn.c optional pcn pci pci/if_rl.c optional rl pci -pci/if_ste.c optional ste pci -pci/if_tl.c optional tl pci -pci/if_wb.c optional wb pci pci/intpm.c optional intpm pci pci/ncr.c optional ncr pci pci/nfsmb.c optional nfsmb pci ==== //depot/projects/mpsafetty/sys/dev/age/if_age.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.3 2008/07/18 01:00:54 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.4 2008/08/14 02:43:18 kevlo Exp $"); #include #include @@ -1427,7 +1427,7 @@ MII_BMCR, BMCR_RESET | BMCR_AUTOEN | BMCR_STARTNEG); DELAY(1000); if (aneg != 0) { - /* Poll link state until jme(4) get a 10/100 link. */ + /* Poll link state until age(4) get a 10/100 link. */ for (i = 0; i < MII_ANEGTICKS_GIGE; i++) { mii_pollstat(mii); if ((mii->mii_media_status & IFM_AVALID) != 0) { ==== //depot/projects/mpsafetty/sys/dev/xen/console/console.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.1 2008/08/12 20:01:57 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.2 2008/08/15 04:00:44 kmacy Exp $"); #include #include @@ -276,7 +276,6 @@ NULL, SHUTDOWN_PRI_DEFAULT)) == NULL) printf("xencons: shutdown event registration failed!\n"); - TRACE_EXIT; return (0); } @@ -368,7 +367,6 @@ if (sc == NULL) return (ENXIO); - TRACE_ENTER; tp = dev->si_tty; s = spltty(); if (!ISTTYOPEN(tp)) { @@ -390,7 +388,6 @@ xen_console_up = 1; error = (*linesw[tp->t_line]->l_open)(dev, tp); - TRACE_EXIT; return error; } ==== //depot/projects/mpsafetty/sys/dev/xen/console/xencons_ring.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/xen/console/xencons_ring.c,v 1.1 2008/08/12 20:01:57 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/xencons_ring.c,v 1.2 2008/08/15 04:00:44 kmacy Exp $"); #include #include @@ -119,7 +119,6 @@ "xencons", xencons_handle_input, NULL, INTR_TYPE_MISC | INTR_MPSAFE, NULL); if (err) { - XENPRINTF("XEN console request irq failed %i\n", err); return err; } ==== //depot/projects/mpsafetty/sys/i386/i386/bpf_jit_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.8 2008/08/12 21:31:31 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -164,9 +164,9 @@ case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); + ADDib(sizeof(int32_t), ECX); CMPrd(EDI, ECX); - JLEb(7); + JBEb(7); ZEROrd(EAX); POP(EBX); POP(ESI); @@ -180,9 +180,9 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); + ADDib(sizeof(int16_t), ECX); CMPrd(EDI, ECX); - JLEb(5); + JBEb(5); POP(EBX); POP(ESI); POP(EDI); @@ -195,7 +195,7 @@ ZEROrd(EAX); MOVid(ins->k, ECX); CMPrd(EDI, ECX); - JLEb(5); + JBEb(5); POP(EBX); POP(ESI); POP(EDI); @@ -215,9 +215,9 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); + ADDib(sizeof(int32_t), ECX); CMPrd(EDI, ECX); - JLEb(7); + JBEb(7); ZEROrd(EAX); POP(EBX); POP(ESI); @@ -232,9 +232,9 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); + ADDib(sizeof(int16_t), ECX); CMPrd(EDI, ECX); - JLEb(5); + JBEb(5); POP(EBX); POP(ESI); POP(EDI); @@ -248,7 +248,7 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); CMPrd(EDI, ECX); - JLEb(5); + JBEb(5); POP(EBX); POP(ESI); POP(EDI); @@ -259,7 +259,7 @@ case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); CMPrd(EDI, ECX); - JLEb(7); + JBEb(7); ZEROrd(EAX); POP(EBX); POP(ESI); @@ -314,70 +314,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 10:58:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC8D1065677; Fri, 15 Aug 2008 10:58:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C55AB106566B for ; Fri, 15 Aug 2008 10:58:43 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8ABF38FC17 for ; Fri, 15 Aug 2008 10:58:43 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FAwhD1064340 for ; Fri, 15 Aug 2008 10:58:43 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FAwhES064338 for perforce@freebsd.org; Fri, 15 Aug 2008 10:58:43 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 10:58:43 GMT Message-Id: <200808151058.m7FAwhES064338@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 10:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147437 Change 147437 by zec@zec_tinderbox on 2008/08/15 10:58:11 Fix a typo. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#6 (text+ko) ==== @@ -674,7 +674,7 @@ INP_INFO_WLOCK(&V_ripcbinfo); error = in_pcballoc(so, &V_ripcbinfo); if (error) { - INP_INFO_WUNLOCK(&V_Viripcbinfo); + INP_INFO_WUNLOCK(&V_ripcbinfo); return (error); } inp = (struct inpcb *)so->so_pcb; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 11:54:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD38106567E; Fri, 15 Aug 2008 11:54:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6A1A106566C for ; Fri, 15 Aug 2008 11:54:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4B3B8FC0C for ; Fri, 15 Aug 2008 11:54:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FBs9XM070848 for ; Fri, 15 Aug 2008 11:54:09 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FBs80r070846 for perforce@freebsd.org; Fri, 15 Aug 2008 11:54:08 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 11:54:08 GMT Message-Id: <200808151154.m7FBs80r070846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 11:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=147441 Change 147441 by zec@zec_tinderbox on 2008/08/15 11:54:06 Unbreak GENERIC build. Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/in.h#3 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#7 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#4 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/in.h#3 (text+ko) ==== @@ -1009,6 +1009,8 @@ #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) #define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) +#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) +#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) #define V_isn_secret VNET_INET(isn_secret) #define V_isn_last_reseed VNET_INET(isn_last_reseed) ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#5 (text+ko) ==== @@ -133,11 +133,11 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); -static int tcp_do_ecn = 0; +int tcp_do_ecn = 0; +int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); -static int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#7 (text+ko) ==== @@ -139,6 +139,7 @@ #define SCF_UNREACH 0x10 /* icmp unreachable received */ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ +#define SCF_ECN 0x100 /* send ECN setup packet */ #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ void *sc_toepcb; /* TOE protocol block */ ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_var.h#5 (text+ko) ==== @@ -521,9 +521,6 @@ extern int tcp_sc_rst_sock_fail; /* RST on sock alloc failure */ extern int tcp_do_ecn; /* TCP ECN enabled/disabled */ extern int tcp_ecn_maxretries; -extern int tcp_sack_maxholes; -extern int tcp_sack_globalmaxholes; -extern int tcp_sack_globalholes; extern int tcp_do_tso; extern int tcp_do_autosndbuf; extern int tcp_autosndbuf_max; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 13:31:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6058F1065671; Fri, 15 Aug 2008 13:31:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23C7A106566B for ; Fri, 15 Aug 2008 13:31:50 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00E228FC08 for ; Fri, 15 Aug 2008 13:31:50 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FDVnEp092098 for ; Fri, 15 Aug 2008 13:31:49 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FDVn4X092096 for perforce@freebsd.org; Fri, 15 Aug 2008 13:31:49 GMT (envelope-from remko@freebsd.org) Date: Fri, 15 Aug 2008 13:31:49 GMT Message-Id: <200808151331.m7FDVn4X092096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Cc: Subject: PERFORCE change 147448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 13:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147448 Change 147448 by remko@remko_nakur on 2008/08/15 13:31:41 Import my WIP for the PPP and SLIP chapter. 13% Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -10,172 +10,1331 @@ Jim Mock - Herstructureerd, gereorganiseerd en geupdate door + Geherstructureerd, gereorganiseerd en geupdate + door + + + Remko + Lodder + Vertaald door + + - * PPP en SLIP + PPP en SLIP - * Samenvatting + Overzicht + + PPP + + + SLIP + + + &os; heeft een aantal manieren om de ene computer met een + andere te verbinden. Om een netwerk of internet verbinding + op te zetten door een inbel modem, of om anderen toe te + staan dit te doen door de machine heen vereist het gebruik + van PPP en SLIP. Dit hoofdstuk beschrijft het opzetten van + op modems gebaseerde diensten in meer detail. + + Na het lezen van dit hoofdstuk weet u: + + + + Hoe gebruikers PPP opgezet kan worden. + + + Hoe kernel PPP opgezet kan worden. + + + Hoe PPPoE opgezet kan worden (PPP + over Ethernet). + + + Hoe PPPoA opgezet kan worden (PPP + over ATM). + + + Hoe een SLIP server en client opgezet kan worden en + hoe dat geconfigureerd wordt. + + + + + PPP + user PPP + + + PPP + kernel PPP + + + PPP + over Ethernet + + + Voordat dit hoofdstuk gelezen wordt, moet u: + + + + Bekend zijn met basis netwerk terminologie. + + + De basis en doeleinden van een inbel verbinding + en van PPP en/of SLIP. + + + + U kan zich afvragen wat het verschil is tussen gebruiker PPP + en kernel PPP. Het antwoord is simpel: gebruiker PPP verwerkt + inkomend en uitgaande data in het gebruiersland in plaats van + in de kerenl. Dit is duur in dezin van het kopieren van de + data tussen de kernel en het gebruikersland, maar levert een meer + rijke hoeveelheid aan mogelijkheden voor de PPP implementatie. + Gebruikers PPP gebruikt het tun apparaat + om te communiceren met de buitenwereld waar de kernel PPP gebruik + maakt van het ppp apparaat. - + + Voor de rest van dit hoofdstuk, zal gebruiker PPP gerefereerd + worden als ppp tenzij er onderscheid + gemaakt moet worden met andere PPP software zoals + pppd. Tenzij anders vermeld moeten + alle uitgelegde command's in dit hoofdstuk gestart worden als + root. + - - Tom - Rhodes - Geupdate en verbeterd door - + + Tom + Rhodes + Geupdate en uitgebreid door + - - Brian - Somers + + Brian + Somers Origineel bijgedragen door - + Nik Clayton - Met input van - - + Met input van + + Dirk - Frömberg - - - Peter - Childs - + Frömberg + + + Peter + Childs + - * Gebruikers PPP gebruiken + + Gebruik maken van gebruiker PPP - * Gebruikers PPP + Gebruiker PPP - * Aannames Assumptions + Aannames + + Dit document neemt aan dat u het volgende heeft: + + + + ISP + + + PPP + + + Een account bij een Internet Service Provider (ISP) + waarmee verbinding gemaakt wordt door mdidel van + PPP. + + + + U heeft een modem of een ander apparaat verbonden + met uw pc en correct geconfigureerd wat het u mogelijk + maakt om verbinding te maken met uw ISP. + + + + De inbel nummers van uw ISP. + + + + PAP + + + CHAP + + + UNIX + + + login naam + + + wachtwoord + + + Uw loginnaam en wachtwoord (danwel een standaard &unix; + style login en wachtwoord combinatie of een PAP of CHAP + login en password combinatie). + + + + naamserver + + + Het IP adres van één of meerdere naam + servers. Normaal gesproken krijgt u twee IP adressen van + uw ISP om te gebruiken. Als u er echter geen + één gekregen heeft, kunt u het commando + enable dns gebruiken in + ppp.conf en + ppp zal de naam servers voor + u configureren. Deze optie is afhankelijk van de PPP + implementatie van de ISP, welke DNS onderhandeling + moet ondersteunen. + + + + De volgende informatie kan aangeleverd worden door uw + ISP maar is niet volledig noodzakelijk: + + + + Het IP adres van uw ISP's doorgang. De doorgang is + de machine waarmee u verbinding maakt en welke ingesteld + wordt als de standaard route. Als + u deze informatie niet heeft, kunt u een willekeurig + adres verzinnen en zal de ISP PPP server het juiste adres + vertellen zodra u verbinding maakt. + + Dit wordt IP adres wordt door + ppp HISADDR + genoemd. + + + + Het netmasker wat gebruikt moet worden. Als uw ISP + deze niet heeft opgegeven, kan 255.255.255.255 veilig gebruikt + worden. + + + + statisch ip adres + + + Als uw ISP een vast IP adres en hostname levert, kunt + u dit invoeren. In andere gevallen laten bepaalt de + andere kant welk adres er uitgegeven wordt. + + + + Als u niet in bezit bent van de vereiste informatie, moet + u contact opnemen met uw ISP. + + + Door de rest van dit hoofdstuk worden veel van de + voorbeelden van configuratie bestanden genummerd per + regel. Deze nummers dienen alleen als hulp voor de + presentatie en discussie en zijn niet bedoeld om + daadwerkelijk in het echte bestand geplaatst te worden. + Juiste identatie met tabs en spaties zijn ook + belangrijk. + - - * Creeëren van PPP device nodes + Automatische <application>PPP</application> configuratie + + + PPP + configuratie + - - + zowel ppp en pppd + (de implementatie van PPP op kernel niveau) gebruiken de + configuratie bestanden die zich in de + /etc/ppp directory bevinden. Voorbeelden + van gebruiker PPP kunnen gevonden worden in + /usr/share/examples/ppp/. - - * Automatische <application>PPP</application> - configuratie + Het configureren van ppp vereist + dat u een aantal bestanden bewerkt, afhankelijk van uw + eisen. Wat u moet invoeren is deels afhankelijk van wat + uw ISP u aanbied met oog op statische IP adressen (lees u + krijgt een statisch adres welke u altijd gebruikt) of + dynamisch (lees: uw IP adres veranderd elke keer als + u verbinding maakt met uw ISP). - * PPP en statische ip adressen + PPP en statische ip adressen + + + PPP + met statische IP adressen + + + U moet het /etc/ppp/ppp.conf + bewerken. Het zou er dan als volgend uit moeten zien: + + + Regels die eindigen met een : + starten in de eerste kolom (het begin vande regel) + — alle andere regels moeten inspringen zoals + getoond door middel van spaties of tabs. + + + 1 default: +2 set log Phase Chat LCP IPCP CCP tun command +3 ident user-ppp VERSION (built COMPILATIONDATE) +4 set device /dev/cuad0 +5 set speed 115200 +6 set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \ +7 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" +8 set timeout 180 +9 enable dns +10 +11 provider: +12 set phone "(123) 456 7890" +13 set authname foo +14 set authkey bar +15 set login "TIMEOUT 10 \"\" \"\" gin:--gin: \\U word: \\P col: ppp" +16 set timeout 300 +17 set ifaddr x.x.x.x y.y.y.y 255.255.255.255 0.0.0.0 +18 add default HISADDR + + + + Regel 1: + + + Dit identificeert de standaard regel. Commando's + in deze regel worden automatisch gestart zodra + ppp gestart wordt. + + + + + Regel 2: + + + Zet log paramaters aan. Zodra de configuratie + naar verwachting werkt, moet deze regel gereduceerd + worden tot: + + set log phase tun + + om te voorkomen dat er extreem grote log files + komen. + + + + + Regel 3: + + + Vertelt PPP hoe het zichzelf moet identificeren + aan de andere kant. PPP identificeert zichzelf aan + de andere kant, als het problemen heeft met het + onderhandelen en het opzetten van de link en het + leveren van informatie die de beheerders van de andere + kant nuttig kunnen vinden om zulke problemen te + onderzoeken. + + + + + Regel 4: + + + Identificeert het apparaat waaraan de model + verbonden is. COM1 is + /dev/cuad0 + en + COM2 is + /dev/cuad1. + + + + + Regel 5: + + + Stelt de snelheid in waarmee verbinding gemaakt + wordt. Als 115200 niet werkt (wat wel zou moeten + kunnen met elke nieuwe modem), probeert u dan de + instelling van 38400. + + + + + Regels 6 & 7: + + + PPP + gebruiker PPP + + + + De inbel regel. Gebruiker PPP gebruikt een + verwachting-verstuur syntax wat vergelijkbaar is + met het &man.chat.8; programma. Bekijk de handleiding + voor meer informatie over de mogelijkheden van deze + taal. + + Let op dat dit commando doorgaat op de volgende + regel zodat deze leesbaar blijft. Elk commando in + ppp.conf kan dit doen als het + laatste karakter op een regel, het ``\'' karakter + is. + + + + + Regel 8: + + + Stelt de idle timeout in voor een link. 180 + seconden is de standaard, dus deze regel is puur + cosmetisch. + + + + + Regel 9: + + + Vertelt PPP om de andere kant te vragen om een + bevestiging van de lokale opzoek instellingen. Als + u een lokale naam server draait moet deze regel + uitgecommentarieerd worden, of verwijderd. + + + + + Regel 10: + + + Een blanco regel voor de leesbaarheid. Blanco + regels worden genegeerd door PPP. + + + + + Regel 11: + + + Identificeert een sectie voor een provider die + provider genoemd wordt. Dit kan + gewijzigd worden in de naam van uw zodat er later + gebruik gemaakt van worden van de optie + + om de verbinding te starten. + + + + + Regel 12: + + + Stelt het telefoonnummer in voor deze provider. + Meerdere telefoonnummers kunnen gespecificeerd worden + door gebruik te maken van de dubbele punt + (:) of het pipe karakter + (|) als scheidingsteken. Het + verschil tussen de twee scheidingstekens wordt + beschreven in de &man.ppp.8; handleiding. + Om samen te vatten, als u wilt roteren tussen de + nummers gebruikt u dan een dubbelepunt. Als u altijd + het eerste nummer eerst wilt draaien en alleen de + andere nummers wilt draaien als het eerste nummer + faalt, gebruik dan het pipe karakter. Quote altijd + de hele set van telefoonnummers zoals getoond. + + U moet het telefoonnummer citeren met dubbele quotes + (") als er enige intentie is in het + gebruik van spaties in het telefoonummer. Dit kan een + simpele, maar subtiele error creeëren. + + + + + Regels 13 & 14: + + + Identificeert de gebruikersnaam en het + wachtwoord. Wanneer gebruik gemaakt wordt van een + &unix; style login worden deze waarden verwezen + door het set login commando door + gebruik te maken van de \U en \P variabelen. + Wanneer er verbinding gemaakt wordt door PPP en CHAP + worden deze waardes gebruikt tijdens het + authenticeren. + + + + + Regels 15: + + + PAP + CHAP + Als u gebruik maakt van PPP en CHAP, zal er geen + login op dit moment zijn, en moet deze regel + uitgecommentarieerd worden of verwijderd. Zie het + PAP en CHAP + authenticatie hoofdstuk voor meer details. + + De login string is hetzelfde als een chat-achtige + syntax van de inbel string. In dit voorbeeld werkt + de string voro een dienst wiens login sessie als + volgt eruit ziet: + + J. Random Provider +login: foo +password: bar +protocol: ppp + + You will need to alter this script to suit your + own needs. When you write this script for the first + time, you should ensure that you have enabled + chat logging so you can determine if + the conversation is going as expected. + + + + + Line 16: + + timeout + + Sets the default idle timeout (in seconds) for the + connection. Here, the connection will be closed + automatically after 300 seconds of inactivity. If you + never want to timeout, set this value to zero or use + the command line switch. + + + + + Line 17: + ISP + + Sets the interface addresses. The string + x.x.x.x should be + replaced by the IP address that your provider has + allocated to you. The string + y.y.y.y should be + replaced by the IP address that your ISP indicated + for their gateway (the machine to which you + connect). If your ISP has not given you a gateway + address, use 10.0.0.2/0. If you need to + use a guessed address, make sure that + you create an entry in + /etc/ppp/ppp.linkup as per the + instructions for PPP and Dynamic IP + addresses. If this line is omitted, + ppp cannot run in + mode. + + + + + Line 18: + + + Adds a default route to your ISP's gateway. The + special word HISADDR is replaced with + the gateway address specified on line 17. It is + important that this line appears after line 17, + otherwise HISADDR will not yet be + initialized. + + If you do not wish to run ppp in , + this line should be moved to the + ppp.linkup file. + + + + + It is not necessary to add an entry to + ppp.linkup when you have a static IP + address and are running ppp in mode as your + routing table entries are already correct before you connect. + You may however wish to create an entry to invoke programs after + connection. This is explained later with the sendmail + example. - + Example configuration files can be found in the + /usr/share/examples/ppp/ directory. - * PPP en dynamische ip adressen + PPP and Dynamic IP Addresses + + + PPP + with dynamic IP addresses + + + + IPCP + + + If your service provider does not assign static IP + addresses, ppp can be configured to + negotiate the local and remote addresses. This is done by + guessing an IP address and allowing + ppp to set it up correctly using the IP + Configuration Protocol (IPCP) after connecting. The + ppp.conf configuration is the same as + PPP and Static IP + Addresses, with the following change: + + 17 set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 + + Again, do not include the line number, it is just for + reference. Indentation of at least one space is + required. + + + + Line 17: + + + The number after the / character + is the number of bits of the address that ppp will + insist on. You may wish to use IP numbers more + appropriate to your circumstances, but the above example + will always work. + + The last argument (0.0.0.0) tells + PPP to start negotiations using address 0.0.0.0 rather than 10.0.0.1 and is necessary for some + ISPs. Do not use 0.0.0.0 as the first + argument to set ifaddr as it prevents + PPP from setting up an initial route in + mode. + + + + + If you are not running in mode, you + will need to create an entry in + /etc/ppp/ppp.linkup. + ppp.linkup is used after a connection has + been established. At this point, ppp will + have assigned the interface addresses and it will now be + possible to add the routing table entries: + + 1 provider: +2 add default HISADDR + + + + Line 1: + + + On establishing a connection, + ppp will look for an entry in + ppp.linkup according to the + following rules: First, try to match the same label + as we used in ppp.conf. If + that fails, look for an entry for the IP address of + our gateway. This entry is a four-octet IP style + label. If we still have not found an entry, look + for the MYADDR entry. + + + + + Line 2: + + + This line tells ppp to add a + default route that points to + HISADDR. + HISADDR will be replaced with the + IP number of the gateway as negotiated by the + IPCP. + + + - + See the pmdemand entry in the files + /usr/share/examples/ppp/ppp.conf.sample + and + /usr/share/examples/ppp/ppp.linkup.sample + for a detailed example. - * Inkomende telefoontjes ontvangen + Receiving Incoming Calls + + + PPP + receiving incoming calls + + + When you configure ppp to + receive incoming calls on a machine connected to a LAN, you + must decide if you wish to forward packets to the LAN. If you + do, you should allocate the peer an IP number from your LAN's + subnet, and use the command enable proxy in + your /etc/ppp/ppp.conf file. You should + also confirm that the /etc/rc.conf file + contains the following: - + gateway_enable="YES" - - * Welke getty? + + Which getty? + + Configuring FreeBSD for Dial-up + Services provides a good description on enabling + dial-up services using &man.getty.8;. + + An alternative to getty is mgetty, + a smarter version of getty designed + with dial-up lines in mind. + + The advantages of using mgetty is + that it actively talks to modems, + meaning if port is turned off in + /etc/ttys then your modem will not answer + the phone. + + Later versions of mgetty (from + 0.99beta onwards) also support the automatic detection of + PPP streams, allowing your clients script-less access to + your server. + + Refer to Mgetty and + AutoPPP for more information on + mgetty. + + + + <application>PPP</application> Permissions + + The ppp command must normally be + run as the root user. If however, + you wish to allow ppp to run in + server mode as a normal user by executing + ppp as described below, that user + must be given permission to run ppp + by adding them to the network group + in /etc/group. + + You will also need to give them access to one or more + sections of the configuration file using the + allow command: + + allow users fred mary + + If this command is used in the default + section, it gives the specified users access to + everything. + + + + PPP Shells for Dynamic-IP Users + + + PPP shells + + + Create a file called + /etc/ppp/ppp-shell containing the + following: + + #!/bin/sh +IDENT=`echo $0 | sed -e 's/^.*-\(.*\)$/\1/'` +CALLEDAS="$IDENT" +TTY=`tty` + +if [ x$IDENT = xdialup ]; then + IDENT=`basename $TTY` +fi + +echo "PPP for $CALLEDAS on $TTY" +echo "Starting PPP for $IDENT" + +exec /usr/sbin/ppp -direct $IDENT + + This script should be executable. Now make a symbolic + link called ppp-dialup to this script + using the following commands: + + &prompt.root; ln -s ppp-shell /etc/ppp/ppp-dialup + + You should use this script as the + shell for all of your dialup users. + This is an example from /etc/passwd + for a dialup PPP user with username + pchilds (remember do not directly edit + the password file, use &man.vipw.8;). + + pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup + + Create a /home/ppp directory that + is world readable containing the following 0 byte + files: + + -r--r--r-- 1 root wheel 0 May 27 02:23 .hushlogin +-r--r--r-- 1 root wheel 0 May 27 02:22 .rhosts + + which prevents /etc/motd from being + displayed. + + + + PPP Shells for Static-IP Users + + + PPP shells + + + Create the ppp-shell file as above, + and for each account with statically assigned IPs create a + symbolic link to ppp-shell. + + For example, if you have three dialup customers, + fred, sam, and + mary, that you route /24 CIDR networks + for, you would type the following: + + &prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred +&prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam +&prompt.root; ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-mary + + Each of these users dialup accounts should have their + shell set to the symbolic link created above (for example, + mary's shell should be + /etc/ppp/ppp-mary). + + + + Setting Up <filename>ppp.conf</filename> for Dynamic-IP + Users + + The /etc/ppp/ppp.conf file should + contain something along the lines of: + + default: + set debug phase lcp chat + set timeout 0 + +ttyd0: + set ifaddr 203.14.100.1 203.14.100.20 255.255.255.255 + enable proxy + +ttyd1: + set ifaddr 203.14.100.1 203.14.100.21 255.255.255.255 + enable proxy + + + The indenting is important. + + + The default: section is loaded for + each session. For each dialup line enabled in + /etc/ttys create an entry similar to + the one for ttyd0: above. Each line + should get a unique IP address from your pool of IP + addresses for dynamic users. + + + + Setting Up <filename>ppp.conf</filename> for Static-IP + Users + + Along with the contents of the sample + /usr/share/examples/ppp/ppp.conf + above you should add a section for each of the + statically assigned dialup users. We will continue with + our fred, sam, + and mary example. + + fred: + set ifaddr 203.14.100.1 203.14.101.1 255.255.255.255 + +sam: + set ifaddr 203.14.100.1 203.14.102.1 255.255.255.255 + +mary: + set ifaddr 203.14.100.1 203.14.103.1 255.255.255.255 + + The file /etc/ppp/ppp.linkup + should also contain routing information for each static + IP user if required. The line below would add a route + for the 203.14.101.0/24 + network via the client's ppp link. + + fred: + add 203.14.101.0 netmask 255.255.255.0 HISADDR + +sam: + add 203.14.102.0 netmask 255.255.255.0 HISADDR - +mary: + add 203.14.103.0 netmask 255.255.255.0 HISADDR - - * <application>PPP</application> permissies + + <command>mgetty</command> and AutoPPP + + + mgetty + + + + AutoPPP + + + + LCP + + + Configuring and compiling mgetty + with the AUTO_PPP option enabled + allows mgetty to detect the LCP phase + of PPP connections and automatically spawn off a ppp + shell. However, since the default login/password + sequence does not occur it is necessary to authenticate + users using either PAP or CHAP. + + This section assumes the user has successfully + configured, compiled, and installed a version of + mgetty with the + AUTO_PPP option (v0.99beta or + later). + + Make sure your + /usr/local/etc/mgetty+sendfax/login.config + file has the following in it: + + /AutoPPP/ - - /etc/ppp/ppp-pap-dialup + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 14:01:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 768AD1065674; Fri, 15 Aug 2008 14:01:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2ED501065671 for ; Fri, 15 Aug 2008 14:01:20 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E740C8FC0A for ; Fri, 15 Aug 2008 14:01:19 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FE1JvV094491 for ; Fri, 15 Aug 2008 14:01:19 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FE1JWX094489 for perforce@freebsd.org; Fri, 15 Aug 2008 14:01:19 GMT (envelope-from strauss@FreeBSD.org) Date: Fri, 15 Aug 2008 14:01:19 GMT Message-Id: <200808151401.m7FE1JWX094489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 14:01:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147451 Change 147451 by strauss@strauss_marvelman on 2008/08/15 14:00:38 Test script for ZIP writer. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/GSOC2008#4 edit .. //depot/projects/soc2008/strauss_libarchive/tests/test_zip_writer.sh#1 add Differences ... ==== //depot/projects/soc2008/strauss_libarchive/GSOC2008#4 (text+ko) ==== @@ -4,6 +4,7 @@ * TODO: for todos management * Stuff in misc/ * libarchive/archive_write_set_format_zip.c + * test scripts in tests/ Removed: From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:11:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F72C1065694; Fri, 15 Aug 2008 15:11:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4E46106567F for ; Fri, 15 Aug 2008 15:11:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFBE18FC1A for ; Fri, 15 Aug 2008 15:11:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFBVcB002670 for ; Fri, 15 Aug 2008 15:11:31 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFBVVa002668 for perforce@freebsd.org; Fri, 15 Aug 2008 15:11:31 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 15:11:31 GMT Message-Id: <200808151511.m7FFBVVa002668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147455 Change 147455 by zec@zec_tpx32 on 2008/08/15 15:11:11 IFC @ 147453 Affected files ... .. //depot/projects/vimage/src/sys/Makefile#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/vimage/src/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/intr.c#6 integrate .. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/vimage/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/vimage/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/vimage/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#29 integrate .. //depot/projects/vimage/src/sys/conf/files#34 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#12 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#15 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/vimage/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/vimage/src/sys/dev/age/if_age.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aha/aha.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/vimage/src/sys/dev/bktr/bktr_i2c.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/vimage/src/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#12 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_lro.c#5 delete .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#13 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/vimage/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vimage/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vimage/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vimage/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/vimage/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vimage/src/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicbus.h#3 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vimage/src/sys/dev/led/led.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/vimage/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vimage/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#17 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vimage/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/vimage/src/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc_cbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vimage/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/vimage/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vimage/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/umass.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/vimage/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vimage/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vimage/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vimage/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/vimage/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/vimage/src/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.c#5 integrate .. //depot/projects/vimage/src/sys/geom/geom_kern.c#3 integrate .. //depot/projects/vimage/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#9 integrate .. //depot/projects/vimage/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#20 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/smist.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/vimage/src/sys/i386/i386/support.s#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#11 integrate .. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#4 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vimage/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vimage/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/vimage/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/vimage/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_kthread.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#13 integrate .. //depot/projects/vimage/src/sys/kern/link_elf.c#9 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#9 integrate .. //depot/projects/vimage/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/vimage/src/sys/kern/tty_pty.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/vimage/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/vimage/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#25 integrate .. //depot/projects/vimage/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/vimage/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#23 integrate .. //depot/projects/vimage/src/sys/net/if_enc.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_enc.h#1 branch .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#32 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#13 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#13 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#17 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#7 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/vimage/src/sys/pci/if_pcn.c#4 delete .. //depot/projects/vimage/src/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#13 integrate .. //depot/projects/vimage/src/sys/pci/if_sis.c#4 delete .. //depot/projects/vimage/src/sys/pci/if_sisreg.h#3 delete .. //depot/projects/vimage/src/sys/pci/if_ste.c#5 delete .. //depot/projects/vimage/src/sys/pci/if_stereg.h#3 delete .. //depot/projects/vimage/src/sys/pci/if_tl.c#4 delete .. //depot/projects/vimage/src/sys/pci/if_tlreg.h#2 delete .. //depot/projects/vimage/src/sys/pci/if_wb.c#5 delete .. //depot/projects/vimage/src/sys/pci/if_wbreg.h#2 delete .. //depot/projects/vimage/src/sys/pci/if_xl.c#9 delete .. //depot/projects/vimage/src/sys/pci/if_xlreg.h#5 delete .. //depot/projects/vimage/src/sys/pci/viapm.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/vimage/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/vmparam.h#7 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/clock.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#12 integrate .. //depot/projects/vimage/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/vimage/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/vimage/src/sys/sys/libkern.h#4 integrate .. //depot/projects/vimage/src/sys/sys/lock.h#8 integrate .. //depot/projects/vimage/src/sys/sys/param.h#23 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#10 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#20 integrate .. //depot/projects/vimage/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/vimage/src/sys/sys/socket.h#9 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#9 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/vimage/src/sys/vm/redzone.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#9 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#9 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage/src/sys/xen/gnttab.c#1 branch .. //depot/projects/vimage/src/sys/xen/gnttab.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/COPYING#1 branch .. //depot/projects/vimage/src/sys/xen/interface/acm.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/callback.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/features.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vimage/src/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vimage/src/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vimage/src/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vimage/src/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vimage/src/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/memory.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/platform.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/sched.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/trace.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/version.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/xen.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vimage/src/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/vimage/src/sys/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -376,11 +363,11 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); - JNEb(5); + TESTrd(EDX, EDX); + JNEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVrd(EDX, ECX); ZEROrd(EDX); DIVrd(ECX); @@ -466,7 +453,7 @@ stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); } /* @@ -490,5 +477,5 @@ */ free(stream.refs, M_BPFJIT); - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/vimage/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.5 2008/06/24 20:12:12 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -125,6 +141,20 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* movq sr64,dr64 */ #define MOVrq(sr64, dr64) do { \ emitm(&stream, 0x8948, 2); \ @@ -132,20 +162,18 @@ (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl off(sr64),dr32 */ -#define MOVoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x8b, 1); \ +/* movq sr64,dr64 (dr64 = %r8-15) */ +#define MOVrq2(sr64, dr64) do { \ + emitm(&stream, 0x8949, 2); \ emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl sr32,off(dr64) */ -#define MOVdoq(sr32, off, dr64) do { \ - emitm(&stream, 0x89, 1); \ +/* movq sr64,dr64 (sr64 = %r8-15) */ +#define MOVrq3(sr64, dr64) do { \ + emitm(&stream, 0x894c, 2); \ emitm(&stream, \ - (1 << 6) | ((sr32 & 0x7) << 3) | (dr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) /* movl (sr64,or64,1),dr32 */ @@ -187,21 +215,11 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* pushq r64 */ -#define PUSH(r64) do { \ - emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +/* ret */ +#define RET() do { \ + emitm(&stream, 0xc3, 1); \ } while (0) -/* popq r64 */ -#define POP(r64) do { \ - emitm(&stream, (5 << 4) | (1 << 3) | (r64 & 0x7), 1); \ -} while (0) - -/* leaveq/retq */ -#define LEAVE_RET() do { \ - emitm(&stream, 0xc3c9, 2); \ -} while (0) - /* addl sr32,dr32 */ #define ADDrd(sr32, dr32) do { \ emitm(&stream, 0x01, 1); \ @@ -215,13 +233,6 @@ emitm(&stream, i32, 4); \ } while (0) -/* addl i32,r32 */ -#define ADDid(i32, r32) do { \ - emitm(&stream, 0x81, 1); \ - emitm(&stream, (24 << 3) | r32, 1); \ - emitm(&stream, i32, 4); \ -} while (0) - /* addl i8,r32 */ #define ADDib(i8, r32) do { \ emitm(&stream, 0x83, 1); \ @@ -283,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -333,14 +362,6 @@ emitm(&stream, (27 << 3) | (r32 & 0x7), 1); \ } while (0) -/* cmpl off(sr64),dr32 */ -#define CMPoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x3b, 1); \ - emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ -} while (0) - /* cmpl sr32,dr32 */ #define CMPrd(sr32, dr32) do { \ emitm(&stream, 0x39, 1); \ @@ -366,48 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off32 */ -#define JLE(off32) do { \ - emitm(&stream, 0x8e0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -420,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/vimage/src/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $"); /* * Instruction disassembler. @@ -164,15 +164,37 @@ "" }; +static const char * const db_Grp15[] = { + "fxsave", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:31:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13685106566C; Fri, 15 Aug 2008 15:31:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAFA51065672 for ; Fri, 15 Aug 2008 15:31:52 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9ABE8FC18 for ; Fri, 15 Aug 2008 15:31:52 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFVqjl004891 for ; Fri, 15 Aug 2008 15:31:52 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFVqpY004889 for perforce@freebsd.org; Fri, 15 Aug 2008 15:31:52 GMT (envelope-from strauss@FreeBSD.org) Date: Fri, 15 Aug 2008 15:31:52 GMT Message-Id: <200808151531.m7FFVqpY004889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=147457 Change 147457 by strauss@strauss_marvelman on 2008/08/15 15:31:44 New test from Tim, not all assertion tests do yet pass ... Affected files ... .. //depot/projects/soc2008/strauss_libarchive/Makefile.am#10 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/Makefile.am#10 (text+ko) ==== @@ -234,6 +234,7 @@ libarchive/test/test_write_format_tar_ustar.c \ libarchive/test/test_write_format_zip_empty.c \ libarchive/test/test_write_format_zip_no_compression.c \ + libarchive/test/test_write_format_zip.c \ libarchive/test/test_write_open_memory.c libarchive_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:36:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C601065685; Fri, 15 Aug 2008 15:36:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B748106567F for ; Fri, 15 Aug 2008 15:36:02 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4F498FC26 for ; Fri, 15 Aug 2008 15:36:01 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFZu3B005252 for ; Fri, 15 Aug 2008 15:35:56 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFZulW005250 for perforce@freebsd.org; Fri, 15 Aug 2008 15:35:56 GMT (envelope-from strauss@FreeBSD.org) Date: Fri, 15 Aug 2008 15:35:56 GMT Message-Id: <200808151535.m7FFZulW005250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:36:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=147458 Change 147458 by strauss@strauss_marvelman on 2008/08/15 15:35:53 Forgot to add file in last submit. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:36:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 354FE1065675; Fri, 15 Aug 2008 15:36:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECB481065670 for ; Fri, 15 Aug 2008 15:36:58 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9B498FC19 for ; Fri, 15 Aug 2008 15:36:58 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFawSS005337 for ; Fri, 15 Aug 2008 15:36:58 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFawQe005331 for perforce@freebsd.org; Fri, 15 Aug 2008 15:36:58 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 15:36:58 GMT Message-Id: <200808151536.m7FFawQe005331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147460 Change 147460 by zec@zec_tpx32 on 2008/08/15 15:36:27 Intergate from vimage branch. Affected files ... .. //depot/projects/vimage-devel/src/sys/Makefile#4 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/vimage-devel/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/vimage-devel/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/vimage-devel/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/vimage-devel/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/vimage-devel/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/vimage-devel/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/vimage-devel/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/vimage-devel/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/vimage-devel/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/NOTES#6 integrate .. //depot/projects/vimage-devel/src/sys/conf/files#8 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.amd64#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.i386#4 integrate .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/vimage-devel/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/led/led.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/vimage-devel/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vimage-devel/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vimage-devel/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/vimage-devel/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/vimage-devel/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/vimage-devel/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-devel/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/vimage-devel/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/vimage-devel/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/vimage-devel/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vimage-devel/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vimage-devel/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/vimage-devel/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/vimage-devel/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/Makefile#7 integrate .. //depot/projects/vimage-devel/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/vimage-devel/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vimage-devel/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vimage-devel/src/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/vimage-devel/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/vimage-devel/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/net/bpf.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net/if_enc.c#2 integrate .. //depot/projects/vimage-devel/src/sys/net/if_enc.h#1 branch .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/vimage-devel/src/sys/netipsec/key.c#4 integrate .. //depot/projects/vimage-devel/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/vimage-devel/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/vimage-devel/src/sys/pci/if_pcn.c#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/vimage-devel/src/sys/pci/if_sis.c#3 delete .. //depot/projects/vimage-devel/src/sys/pci/if_sisreg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_ste.c#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_stereg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_tl.c#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_tlreg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_wb.c#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_wbreg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_xl.c#2 delete .. //depot/projects/vimage-devel/src/sys/pci/if_xlreg.h#2 delete .. //depot/projects/vimage-devel/src/sys/pci/viapm.c#3 integrate .. //depot/projects/vimage-devel/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/vimage-devel/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vimage-devel/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/vimage-devel/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/vimage-devel/src/sys/sys/libkern.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/lock.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/param.h#6 integrate .. //depot/projects/vimage-devel/src/sys/sys/priv.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/proc.h#4 integrate .. //depot/projects/vimage-devel/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/vimage-devel/src/sys/sys/socket.h#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/sx.h#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/vimage-devel/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/redzone.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/vimage-devel/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/vimage-devel/src/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/gnttab.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/gnttab.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/COPYING#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/acm.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/callback.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/features.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/memory.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/platform.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/sched.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/trace.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/version.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/xen.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vimage-devel/src/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/vimage-devel/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -376,11 +363,11 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); - JNEb(5); + TESTrd(EDX, EDX); + JNEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVrd(EDX, ECX); ZEROrd(EDX); DIVrd(ECX); @@ -466,7 +453,7 @@ stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); } /* @@ -490,5 +477,5 @@ */ free(stream.refs, M_BPFJIT); - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.5 2008/06/24 20:12:12 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -125,6 +141,20 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* movq sr64,dr64 */ #define MOVrq(sr64, dr64) do { \ emitm(&stream, 0x8948, 2); \ @@ -132,20 +162,18 @@ (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl off(sr64),dr32 */ -#define MOVoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x8b, 1); \ +/* movq sr64,dr64 (dr64 = %r8-15) */ +#define MOVrq2(sr64, dr64) do { \ + emitm(&stream, 0x8949, 2); \ emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl sr32,off(dr64) */ -#define MOVdoq(sr32, off, dr64) do { \ - emitm(&stream, 0x89, 1); \ +/* movq sr64,dr64 (sr64 = %r8-15) */ +#define MOVrq3(sr64, dr64) do { \ + emitm(&stream, 0x894c, 2); \ emitm(&stream, \ - (1 << 6) | ((sr32 & 0x7) << 3) | (dr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) /* movl (sr64,or64,1),dr32 */ @@ -187,21 +215,11 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* pushq r64 */ -#define PUSH(r64) do { \ - emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +/* ret */ +#define RET() do { \ + emitm(&stream, 0xc3, 1); \ } while (0) -/* popq r64 */ -#define POP(r64) do { \ - emitm(&stream, (5 << 4) | (1 << 3) | (r64 & 0x7), 1); \ -} while (0) - -/* leaveq/retq */ -#define LEAVE_RET() do { \ - emitm(&stream, 0xc3c9, 2); \ -} while (0) - /* addl sr32,dr32 */ #define ADDrd(sr32, dr32) do { \ emitm(&stream, 0x01, 1); \ @@ -215,13 +233,6 @@ emitm(&stream, i32, 4); \ } while (0) -/* addl i32,r32 */ -#define ADDid(i32, r32) do { \ - emitm(&stream, 0x81, 1); \ - emitm(&stream, (24 << 3) | r32, 1); \ - emitm(&stream, i32, 4); \ -} while (0) - /* addl i8,r32 */ #define ADDib(i8, r32) do { \ emitm(&stream, 0x83, 1); \ @@ -283,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -333,14 +362,6 @@ emitm(&stream, (27 << 3) | (r32 & 0x7), 1); \ } while (0) -/* cmpl off(sr64),dr32 */ -#define CMPoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x3b, 1); \ - emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ -} while (0) - /* cmpl sr32,dr32 */ #define CMPrd(sr32, dr32) do { \ emitm(&stream, 0x39, 1); \ @@ -366,48 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off32 */ -#define JLE(off32) do { \ - emitm(&stream, 0x8e0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -420,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $"); /* * Instruction disassembler. @@ -164,15 +164,37 @@ "" }; +static const char * const db_Grp15[] = { + "fxsave", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:39:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD2D10656C1; Fri, 15 Aug 2008 15:39:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80F8D1065674 for ; Fri, 15 Aug 2008 15:39:48 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 600F88FC08 for ; Fri, 15 Aug 2008 15:39:48 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFdmeS005530 for ; Fri, 15 Aug 2008 15:39:48 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFdmqF005528 for perforce@freebsd.org; Fri, 15 Aug 2008 15:39:48 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 15 Aug 2008 15:39:48 GMT Message-Id: <200808151539.m7FFdmqF005528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:39:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147462 Change 147462 by rpaulo@rpaulo_epsilon on 2008/08/15 15:39:19 Add missing break. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#10 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#9 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#10 $ */ #include @@ -394,6 +394,7 @@ tp->t_state = TCPS_TIME_WAIT; DPRINTF(DEBUG_FSM, "FSM transition: %p " "CLOSING -> TIME_WAIT\n", tp); + break; case TCPS_LAST_ACK: tp->t_state = TCPS_CLOSED; DPRINTF(DEBUG_FSM, "FSM transition: %p " From owner-p4-projects@FreeBSD.ORG Fri Aug 15 15:47:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BF351065685; Fri, 15 Aug 2008 15:47:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2048106567D for ; Fri, 15 Aug 2008 15:47:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FCA08FC1E for ; Fri, 15 Aug 2008 15:47:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FFlutF006179 for ; Fri, 15 Aug 2008 15:47:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FFlu3s006177 for perforce@freebsd.org; Fri, 15 Aug 2008 15:47:56 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 15:47:56 GMT Message-Id: <200808151547.m7FFlu3s006177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 15:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=147463 Change 147463 by julian@julian_trafmon1 on 2008/08/15 15:47:26 save stuff marko pointed out Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/in.h#4 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#6 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#4 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#8 edit .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#5 edit .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#7 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/in.h#4 (text+ko) ==== @@ -742,322 +742,5 @@ #include #undef __KAME_NETINET_IN_H_INCLUDED_ #endif - -/*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation - * - * This software was developed by the University of Zagreb and the - * FreeBSD Foundation under sponsorship by the Stichting NLnet and the - * FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * - * XXX RCS tag goes here - */ - -#ifndef _NETINET_VINET_H_ -#define _NETINET_VINET_H_ - -#ifdef XVIMAGE -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct vnet_inet { - struct in_ifaddrhashhead *_in_ifaddrhashtbl; - struct in_ifaddrhead _in_ifaddrhead; - u_long _in_ifaddrhmask; - struct in_multihead _in_multihead; - - int _arpt_keep; - int _arp_maxtries; - int _useloopback; - int _arp_proxyall; - int _subnetsarelocal; - int _sameprefixcarponly; - - int _ipforwarding; - int _ipfastforward_active; - int _ipsendredirects; - int _ip_defttl; - int _ip_keepfaith; - int _ip_sendsourcequench; - int _ip_do_randomid; - int _ip_checkinterface; - u_short _ip_id; - - uma_zone_t _ipq_zone; - int _nipq; /* Total # of reass queues */ - int _maxnipq; /* Admin. limit on # reass queues. */ - int _maxfragsperpacket; - TAILQ_HEAD(ipqhead, ipq) _ipq[IPREASS_NHASH]; - - struct inpcbhead _tcb; /* head of queue of active tcpcb's */ - struct inpcbinfo _tcbinfo; - struct tcpstat _tcpstat; /* tcp statistics */ - struct tcp_hostcache _tcp_hostcache; - struct callout _tcp_hc_callout; - struct tcp_syncache _tcp_syncache; - struct inpcbhead _divcb; - struct inpcbinfo _divcbinfo; - TAILQ_HEAD(, tcptw) _twq_2msl; - - int _tcp_sc_rst_sock_fail; - int _tcp_mssdflt; - int _tcp_v6mssdflt; - int _tcp_minmss; - int _tcp_do_rfc1323; - int _icmp_may_rst; - int _tcp_isn_reseed_interval; - int _tcp_inflight_enable; - int _tcp_inflight_rttthresh; - int _tcp_inflight_min; - int _tcp_inflight_max; - int _tcp_inflight_stab; - int _nolocaltimewait; - int _path_mtu_discovery; - int _ss_fltsz; - int _ss_fltsz_local; - int _tcp_do_newreno; - int _tcp_do_tso; - int _tcp_do_autosndbuf; - int _tcp_autosndbuf_inc; - int _tcp_autosndbuf_max; - int _tcp_do_sack; - int _tcp_sack_maxholes; - int _tcp_sack_globalmaxholes; - int _tcp_sack_globalholes; - int _blackhole; - int _tcp_delack_enabled; - int _drop_synfin; - int _tcp_do_rfc3042; - int _tcp_do_rfc3390; - int _tcp_insecure_rst; - int _tcp_do_autorcvbuf; - int _tcp_autorcvbuf_inc; - int _tcp_autorcvbuf_max; - int _tcp_reass_maxseg; - int _tcp_reass_qsize; - int _tcp_reass_maxqlen; - int _tcp_reass_overflows; - - u_char _isn_secret[32]; - int _isn_last_reseed; - u_int32_t _isn_offset; - u_int32_t _isn_offset_old; - MD5_CTX _isn_ctx; - - struct inpcbhead _udb; - struct inpcbinfo _udbinfo; - struct udpstat _udpstat; - - struct inpcbhead _ripcb; - struct inpcbinfo _ripcbinfo; - struct socket *_ip_mrouter; - - struct socket *_ip_rsvpd; - int _ip_rsvp_on; - int _rsvp_on; - - struct icmpstat _icmpstat; - struct ipstat _ipstat; - struct igmpstat _igmpstat; - - SLIST_HEAD(, router_info) _router_info_head; - - int _rtq_timeout; - int _rtq_reallyold; - int _rtq_minreallyold; - int _rtq_toomany; - struct callout _rtq_timer; - - int _ipport_lowfirstauto; - int _ipport_lowlastauto; - int _ipport_firstauto; - int _ipport_lastauto; - int _ipport_hifirstauto; - int _ipport_hilastauto; - int _ipport_reservedhigh; - int _ipport_reservedlow; - int _ipport_randomized; - int _ipport_randomcps; - int _ipport_randomtime; - int _ipport_stoprandom; - int _ipport_tcpallocs; - int _ipport_tcplastcount; -}; -#endif - - -/* - * Symbol translation macros - */ -#define INIT_VNET_INET(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_INET, struct vnet_inet, vnet_inet) - -#define VNET_INET(sym) VSYM(vnet_inet, sym) - -#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) -#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) -#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) -#define V_in_multihead VNET_INET(in_multihead) - -#define V_llinfo_arp VNET_INET(llinfo_arp) -#define V_arpt_prune VNET_INET(arpt_prune) -#define V_arpt_keep VNET_INET(arpt_keep) -#define V_arp_maxtries VNET_INET(arp_maxtries) -#define V_useloopback VNET_INET(useloopback) -#define V_arp_proxyall VNET_INET(arp_proxyall) -#define V_subnetsarelocal VNET_INET(subnetsarelocal) -#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) - -#define V_ipforwarding VNET_INET(ipforwarding) -#define V_ipfastforward_active VNET_INET(ipfastforward_active) -#define V_ipsendredirects VNET_INET(ipsendredirects) -#define V_ip_defttl VNET_INET(ip_defttl) -#define V_ip_keepfaith VNET_INET(ip_keepfaith) -#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) -#define V_ip_id VNET_INET(ip_id) -#define V_ip_do_randomid VNET_INET(ip_do_randomid) -#define V_ip_checkinterface VNET_INET(ip_checkinterface) - -#define V_ipq VNET_INET(ipq) -#define V_ipq_zone VNET_INET(ipq_zone) -#define V_nipq VNET_INET(nipq) -#define V_maxnipq VNET_INET(maxnipq) -#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) - -#define V_tcb VNET_INET(tcb) -#define V_tcbinfo VNET_INET(tcbinfo) -#define V_tcpstat VNET_INET(tcpstat) -#define V_twq_2msl VNET_INET(twq_2msl) -#define V_tcp_hostcache VNET_INET(tcp_hostcache) -#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) -#define V_tcp_syncache VNET_INET(tcp_syncache) -#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) - -#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) -#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) -#define V_tcp_minmss VNET_INET(tcp_minmss) -#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) -#define V_icmp_may_rst VNET_INET(icmp_may_rst) -#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) -#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) -#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) -#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) -#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) -#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) -#define V_nolocaltimewait VNET_INET(nolocaltimewait) -#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) -#define V_ss_fltsz VNET_INET(ss_fltsz) -#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) -#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) -#define V_tcp_do_tso VNET_INET(tcp_do_tso) -#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) -#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) -#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) -#define V_tcp_do_sack VNET_INET(tcp_do_sack) -#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) -#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) -#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) -#define V_blackhole VNET_INET(blackhole) -#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) -#define V_drop_synfin VNET_INET(drop_synfin) -#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) -#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) -#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) -#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) -#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) -#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) -#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) -#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) -#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) -#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) -#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) - -#define V_isn_secret VNET_INET(isn_secret) -#define V_isn_last_reseed VNET_INET(isn_last_reseed) -#define V_isn_offset VNET_INET(isn_offset) -#define V_isn_offset_old VNET_INET(isn_offset_old) -#define V_isn_ctx VNET_INET(isn_ctx) - -#define V_udb VNET_INET(udb) -#define V_udbinfo VNET_INET(udbinfo) -#define V_udpstat VNET_INET(udpstat) - -#define V_ripcb VNET_INET(ripcb) -#define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ip_mrouter VNET_INET(ip_mrouter) - -#define V_rsvp_on VNET_INET(rsvp_on) -#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) -#define V_ip_rsvpd VNET_INET(ip_rsvpd) - -#define V_icmpstat VNET_INET(icmpstat) -#define V_ipstat VNET_INET(ipstat) -#define V_igmpstat VNET_INET(igmpstat) - -#define V_router_info_head VNET_INET(router_info_head) - -#define V_rtq_timeout VNET_INET(rtq_timeout) -#define V_rtq_reallyold VNET_INET(rtq_reallyold) -#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) -#define V_rtq_toomany VNET_INET(rtq_toomany) -#define V_rtq_timer VNET_INET(rtq_timer) - -#define V_ipport_lowfirstauto VNET_INET(ipport_lowfirstauto) -#define V_ipport_lowlastauto VNET_INET(ipport_lowlastauto) -#define V_ipport_firstauto VNET_INET(ipport_firstauto) -#define V_ipport_lastauto VNET_INET(ipport_lastauto) -#define V_ipport_hifirstauto VNET_INET(ipport_hifirstauto) -#define V_ipport_hilastauto VNET_INET(ipport_hilastauto) -#define V_ipport_reservedhigh VNET_INET(ipport_reservedhigh) -#define V_ipport_reservedlow VNET_INET(ipport_reservedlow) -#define V_ipport_randomized VNET_INET(ipport_randomized) -#define V_ipport_randomcps VNET_INET(ipport_randomcps) -#define V_ipport_randomtime VNET_INET(ipport_randomtime) -#define V_ipport_stoprandom VNET_INET(ipport_stoprandom) -#define V_ipport_tcpallocs VNET_INET(ipport_tcpallocs) -#define V_ipport_tcplastcount VNET_INET(ipport_tcplastcount) - -#define V_divcb VNET_INET(divcb) -#define V_divcbinfo VNET_INET(divcbinfo) -#endif /* !_NETINET_VINET_H_ */ +#include #endif /* !_NETINET_IN_H_*/ ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#6 (text+ko) ==== @@ -133,11 +133,11 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); -int tcp_do_ecn = 0; -int tcp_ecn_maxretries = 1; +int tcp_do_ecn = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); +int tcp_ecn_maxretries = 1; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#4 (text+ko) ==== @@ -130,17 +130,17 @@ SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_RW, tcp_do_sack, 0, "Enable/Disable TCP SACK support"); -static int tcp_sack_maxholes = 128; +int tcp_sack_maxholes = 128; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, maxholes, CTLFLAG_RW, tcp_sack_maxholes, 0, "Maximum number of TCP SACK holes allowed per connection"); -static int tcp_sack_globalmaxholes = 65536; +int tcp_sack_globalmaxholes = 65536; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, globalmaxholes, CTLFLAG_RW, tcp_sack_globalmaxholes, 0, "Global maximum number of TCP SACK holes"); -static int tcp_sack_globalholes = 0; +int tcp_sack_globalholes = 0; SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_sack, OID_AUTO, globalholes, CTLFLAG_RD, tcp_sack_globalholes, 0, "Global number of TCP SACK holes currently allocated"); ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#8 (text+ko) ==== @@ -116,6 +116,7 @@ struct in_conninfo sc_inc; /* addresses */ int sc_rxttime; /* retransmit time */ u_int16_t sc_rxmits; /* retransmit counter */ + u_int16_t sc_flags; u_int32_t sc_tsreflect; /* timestamp to reflect */ u_int32_t sc_ts; /* our timestamp to send */ @@ -131,7 +132,6 @@ u_int8_t sc_ip_tos; /* IPv4 TOS */ u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; - u_int8_t sc_flags; #define SCF_NOOPT 0x01 /* no TCP options */ #define SCF_WINSCALE 0x02 /* negotiated window scaling */ #define SCF_TIMESTAMP 0x04 /* negotiated timestamps */ ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.h#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#7 (text+ko) ==== @@ -112,7 +112,7 @@ struct icmp6stat icmp6stat; -#ifndef VIMAGE + extern struct inpcbinfo ripcbinfo; extern struct inpcbhead ripcb; extern int icmp6errppslim; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:14:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A1C51065672; Fri, 15 Aug 2008 16:14:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA521106564A for ; Fri, 15 Aug 2008 16:14:24 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 872098FC14 for ; Fri, 15 Aug 2008 16:14:24 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGEOQx009667 for ; Fri, 15 Aug 2008 16:14:24 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGEN9c009665 for perforce@freebsd.org; Fri, 15 Aug 2008 16:14:23 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 16:14:23 GMT Message-Id: <200808151614.m7FGEN9c009665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147464 Change 147464 by julian@julian_trafmon1 on 2008/08/15 16:14:23 IFC@147453 Affected files ... .. //depot/projects/vimage-commit/src/sys/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/vimage-commit/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#7 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/led/led.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/vimage-commit/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/vimage-commit/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#8 integrate .. //depot/projects/vimage-commit/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_enc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_enc.h#1 branch .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_pcn.c#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_sis.c#3 delete .. //depot/projects/vimage-commit/src/sys/pci/if_sisreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_ste.c#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_stereg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_tl.c#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_tlreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_wb.c#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_wbreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_xl.c#2 delete .. //depot/projects/vimage-commit/src/sys/pci/if_xlreg.h#2 delete .. //depot/projects/vimage-commit/src/sys/pci/viapm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/vimage-commit/src/sys/sys/libkern.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/lock.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/priv.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/proc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/vimage-commit/src/sys/sys/socket.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/sx.h#2 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/redzone.c#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/gnttab.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/gnttab.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/COPYING#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/acm.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/callback.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/features.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/memory.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/platform.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/sched.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/trace.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/version.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/xen.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vimage-commit/src/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/vimage-commit/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -376,11 +363,11 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); - JNEb(5); + TESTrd(EDX, EDX); + JNEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVrd(EDX, ECX); ZEROrd(EDX); DIVrd(ECX); @@ -466,7 +453,7 @@ stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); } /* @@ -490,5 +477,5 @@ */ free(stream.refs, M_BPFJIT); - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.5 2008/06/24 20:12:12 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -125,6 +141,20 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* movq sr64,dr64 */ #define MOVrq(sr64, dr64) do { \ emitm(&stream, 0x8948, 2); \ @@ -132,20 +162,18 @@ (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl off(sr64),dr32 */ -#define MOVoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x8b, 1); \ +/* movq sr64,dr64 (dr64 = %r8-15) */ +#define MOVrq2(sr64, dr64) do { \ + emitm(&stream, 0x8949, 2); \ emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl sr32,off(dr64) */ -#define MOVdoq(sr32, off, dr64) do { \ - emitm(&stream, 0x89, 1); \ +/* movq sr64,dr64 (sr64 = %r8-15) */ +#define MOVrq3(sr64, dr64) do { \ + emitm(&stream, 0x894c, 2); \ emitm(&stream, \ - (1 << 6) | ((sr32 & 0x7) << 3) | (dr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) /* movl (sr64,or64,1),dr32 */ @@ -187,21 +215,11 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* pushq r64 */ -#define PUSH(r64) do { \ - emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +/* ret */ +#define RET() do { \ + emitm(&stream, 0xc3, 1); \ } while (0) -/* popq r64 */ -#define POP(r64) do { \ - emitm(&stream, (5 << 4) | (1 << 3) | (r64 & 0x7), 1); \ -} while (0) - -/* leaveq/retq */ -#define LEAVE_RET() do { \ - emitm(&stream, 0xc3c9, 2); \ -} while (0) - /* addl sr32,dr32 */ #define ADDrd(sr32, dr32) do { \ emitm(&stream, 0x01, 1); \ @@ -215,13 +233,6 @@ emitm(&stream, i32, 4); \ } while (0) -/* addl i32,r32 */ -#define ADDid(i32, r32) do { \ - emitm(&stream, 0x81, 1); \ - emitm(&stream, (24 << 3) | r32, 1); \ - emitm(&stream, i32, 4); \ -} while (0) - /* addl i8,r32 */ #define ADDib(i8, r32) do { \ emitm(&stream, 0x83, 1); \ @@ -283,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -333,14 +362,6 @@ emitm(&stream, (27 << 3) | (r32 & 0x7), 1); \ } while (0) -/* cmpl off(sr64),dr32 */ -#define CMPoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x3b, 1); \ - emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ -} while (0) - /* cmpl sr32,dr32 */ #define CMPrd(sr32, dr32) do { \ emitm(&stream, 0x39, 1); \ @@ -366,48 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off32 */ -#define JLE(off32) do { \ - emitm(&stream, 0x8e0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -420,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $"); /* * Instruction disassembler. @@ -164,15 +164,37 @@ "" }; +static const char * const db_Grp15[] = { + "fxsave", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:17:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDB45106567B; Fri, 15 Aug 2008 16:17:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F8D21065678 for ; Fri, 15 Aug 2008 16:17:28 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CA208FC18 for ; Fri, 15 Aug 2008 16:17:28 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGHSHh009943 for ; Fri, 15 Aug 2008 16:17:28 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGHRF5009941 for perforce@freebsd.org; Fri, 15 Aug 2008 16:17:27 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 16:17:27 GMT Message-Id: <200808151617.m7FGHRF5009941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=147465 Change 147465 by julian@julian_trafmon1 on 2008/08/15 16:16:29 IFC@147453 Affected files ... .. //depot/projects/vimage-commit2/src/sys/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#4 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/led/led.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snp/snp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_enc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_pcn.c#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_sis.c#3 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_sisreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_ste.c#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_stereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_tl.c#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_tlreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_wb.c#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_wbreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_xl.c#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/if_xlreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/pci/viapm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/libkern.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lock.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/socket.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/redzone.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/COPYING#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/acm.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/callback.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/features.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/memory.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/platform.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/sched.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/trace.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/version.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/xen.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/vimage-commit2/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -376,11 +363,11 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); - JNEb(5); + TESTrd(EDX, EDX); + JNEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVrd(EDX, ECX); ZEROrd(EDX); DIVrd(ECX); @@ -466,7 +453,7 @@ stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); } /* @@ -490,5 +477,5 @@ */ free(stream.refs, M_BPFJIT); - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.5 2008/06/24 20:12:12 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -125,6 +141,20 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* movq sr64,dr64 */ #define MOVrq(sr64, dr64) do { \ emitm(&stream, 0x8948, 2); \ @@ -132,20 +162,18 @@ (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl off(sr64),dr32 */ -#define MOVoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x8b, 1); \ +/* movq sr64,dr64 (dr64 = %r8-15) */ +#define MOVrq2(sr64, dr64) do { \ + emitm(&stream, 0x8949, 2); \ emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl sr32,off(dr64) */ -#define MOVdoq(sr32, off, dr64) do { \ - emitm(&stream, 0x89, 1); \ +/* movq sr64,dr64 (sr64 = %r8-15) */ +#define MOVrq3(sr64, dr64) do { \ + emitm(&stream, 0x894c, 2); \ emitm(&stream, \ - (1 << 6) | ((sr32 & 0x7) << 3) | (dr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) /* movl (sr64,or64,1),dr32 */ @@ -187,21 +215,11 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* pushq r64 */ -#define PUSH(r64) do { \ - emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +/* ret */ +#define RET() do { \ + emitm(&stream, 0xc3, 1); \ } while (0) -/* popq r64 */ -#define POP(r64) do { \ - emitm(&stream, (5 << 4) | (1 << 3) | (r64 & 0x7), 1); \ -} while (0) - -/* leaveq/retq */ -#define LEAVE_RET() do { \ - emitm(&stream, 0xc3c9, 2); \ -} while (0) - /* addl sr32,dr32 */ #define ADDrd(sr32, dr32) do { \ emitm(&stream, 0x01, 1); \ @@ -215,13 +233,6 @@ emitm(&stream, i32, 4); \ } while (0) -/* addl i32,r32 */ -#define ADDid(i32, r32) do { \ - emitm(&stream, 0x81, 1); \ - emitm(&stream, (24 << 3) | r32, 1); \ - emitm(&stream, i32, 4); \ -} while (0) - /* addl i8,r32 */ #define ADDib(i8, r32) do { \ emitm(&stream, 0x83, 1); \ @@ -283,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -333,14 +362,6 @@ emitm(&stream, (27 << 3) | (r32 & 0x7), 1); \ } while (0) -/* cmpl off(sr64),dr32 */ -#define CMPoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x3b, 1); \ - emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ -} while (0) - /* cmpl sr32,dr32 */ #define CMPrd(sr32, dr32) do { \ emitm(&stream, 0x39, 1); \ @@ -366,48 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off32 */ -#define JLE(off32) do { \ - emitm(&stream, 0x8e0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -420,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $"); /* * Instruction disassembler. @@ -164,15 +164,37 @@ "" }; +static const char * const db_Grp15[] = { + "fxsave", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:20:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A13D1065674; Fri, 15 Aug 2008 16:20:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C28471065673 for ; Fri, 15 Aug 2008 16:20:31 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A17538FC19 for ; Fri, 15 Aug 2008 16:20:31 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGKVJa010224 for ; Fri, 15 Aug 2008 16:20:31 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGKVol010222 for perforce@freebsd.org; Fri, 15 Aug 2008 16:20:31 GMT (envelope-from konrad@FreeBSD.org) Date: Fri, 15 Aug 2008 16:20:31 GMT Message-Id: <200808151620.m7FGKVol010222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:20:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147466 Change 147466 by konrad@vspredator on 2008/08/15 16:20:14 Fix things identified by Diomidis. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/sort/sort.c#2 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/sort/sort.c#2 (text+ko) ==== @@ -3,19 +3,19 @@ #include #include #include +#include #include #define MAXSIZE 10000 -struct line { +static struct line { char *sline; char *trans; } *lines[MAXSIZE]; -int max_lines; /* Numer of lines read from input. */ -int xfrm; /* Do we use strxfrm? */ +static int max_lines; /* Numer of lines read from input. */ -void +static void read_input(void) { char buf[1000]; @@ -24,10 +24,13 @@ while (fgets(buf, sizeof(buf), stdin) != NULL) { buf[strlen(buf) - 1] = 0; - line = malloc(sizeof(struct line)); - line->sline = strdup(buf); + if ((line = malloc(sizeof(struct line))) == NULL) + err(1, "malloc"); + if ((line->sline = strdup(buf)) == NULL) + err(1, "strdup"); len = strxfrm(NULL, buf, 0); - line->trans = malloc(len + 1); + if ((line->trans = malloc(len + 1)) == NULL) + err(1, "malloc"); strxfrm(line->trans, buf, len); lines[i] = line; i++; @@ -35,18 +38,24 @@ max_lines = i; } -int -sort_fun(const void *a, const void *b) +static int +strcmp_compare(const void *a, const void *b) { struct line **l1 = (void *)a, **l2 = (void *)b; - if (xfrm) - return strcmp((*l1)->trans, (*l2)->trans); + return strcmp((*l1)->trans, (*l2)->trans); + +} + +static int +strcoll_compare(const void *a, const void *b) +{ + struct line **l1 = (void *)a, **l2 = (void *)b; return strcoll((*l1)->sline, (*l2)->sline); } -void +static void write_output(void) { int i; @@ -61,20 +70,32 @@ { char *p; int ch; + int xfrm; /* Do we use strxfrm? */ while ((ch = getopt(argc, argv, "x")) != -1) { switch (ch) { case 'x': - fprintf(stderr, "strxfrm mode enabled!\n"); xfrm = 1; - break; + break; + case '?': default: + printf( "usage: " + "%s [-x]\n" + "\tsort lines in standard input according to the " + "current collation\n" + "\t-x use strxfrm and strcmp instead of strcoll\n" + , argv[0]); + return EX_USAGE; + break; } } if ((p = setlocale(LC_ALL, "")) == NULL) errx(1, "setlocale"); read_input(); fprintf(stderr, "setlocale: %s\n", p); - qsort(lines, max_lines, sizeof(struct line *), sort_fun); + if (xfrm) + qsort(lines, max_lines, sizeof(struct line *), strcmp_compare); + else + qsort(lines, max_lines, sizeof(struct line *), strcoll_compare); write_output(); return 0; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:24:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C38F1065677; Fri, 15 Aug 2008 16:24:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1D29106567A for ; Fri, 15 Aug 2008 16:24:37 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FCB38FC1A for ; Fri, 15 Aug 2008 16:24:36 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGOaUU010548 for ; Fri, 15 Aug 2008 16:24:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGOZlT010546 for perforce@freebsd.org; Fri, 15 Aug 2008 16:24:35 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 16:24:35 GMT Message-Id: <200808151624.m7FGOZlT010546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=147467 Change 147467 by julian@julian_trafmon1 on 2008/08/15 16:23:57 IFC@147453 Affected files ... .. //depot/projects/vimage-commit3/src/sys/Makefile#3 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/vimage-commit3/src/sys/bsm/audit.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/NOTES#4 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files#4 integrate .. //depot/projects/vimage-commit3/src/sys/conf/kern.mk#3 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ddb/db_run.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/e1000/LICENSE#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/README#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_api.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_api.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/if_em.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/if_em.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/if_igb.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/e1000/if_igb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/em/LICENSE#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/README#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_80003es2lan.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_80003es2lan.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82540.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82541.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82541.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82542.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82543.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82543.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82571.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_82571.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_api.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_api.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_defines.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_hw.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_ich8lan.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_ich8lan.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_mac.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_mac.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_manage.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_manage.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_nvm.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_nvm.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_osdep.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_osdep.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_phy.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_phy.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/e1000_regs.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/if_em.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/em/if_em.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_82575.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_82575.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_api.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_api.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_defines.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_hw.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_mac.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_mac.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_manage.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_manage.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_osdep.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_osdep.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_phy.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_phy.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/e1000_regs.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/if_igb.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/igb/if_igb.h#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/ds1339.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/profile.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_clist.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_lock.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_info.c#1 branch .. //depot/projects/vimage-commit3/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/libkern/arc4random.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/Makefile#4 integrate .. //depot/projects/vimage-commit3/src/sys/modules/accf_dns/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/et/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/igb/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/mem/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/bpf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_gre.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_loop.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_media.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/route.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/accf_dns.c#1 branch .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_offload.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/toedev.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/pci/if_sis.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/auth_unix.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/callout.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/kernel.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/param.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/proc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/procfs.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/refcount.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sockbuf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/socket.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sockio.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sockopt.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/sockstate.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vnode.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_kern.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.50 2008/07/10 16:03:24 obrien Exp $ +# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ .include @@ -8,13 +8,13 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu isa kern libkern modules net net80211 netatalk \ +CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ + geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ - pci rpc security sys ufs vm ${CSCOPE_ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) -CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips powerpc sparc64 +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else CSCOPE_ARCHDIR ?= ${MACHINE} .endif ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/cpu_switch.S#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/sys/amd64/amd64/cpu_switch.S,v 1.161 2008/03/23 23:09:06 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.162 2008/07/30 11:30:55 kib Exp $ */ #include @@ -113,8 +113,8 @@ movq PCB_GSBASE(%r8),%r10 testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz store_gs /* static predict not taken */ -done_store_gs: + jnz store_seg +done_store_seg: testl $PCB_DBREGS,PCB_FLAGS(%r8) jnz store_dr /* static predict not taken */ @@ -176,6 +176,10 @@ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) jnz do_kthread + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz load_seg +done_load_seg: + cmpq PCB_FSBASE(%r8),%r9 jz 1f /* Restore userland %fs */ @@ -184,7 +188,6 @@ movl PCB_FSBASE+4(%r8),%edx wrmsr 1: - cmpq PCB_GSBASE(%r8),%r10 jz 2f /* Restore userland %gs */ @@ -193,8 +196,8 @@ movl PCB_GSBASE+4(%r8),%edx wrmsr 2: + do_tss: - /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax movq %r8, PCPU(RSP0) @@ -208,10 +211,6 @@ jnz load_dr /* static predict not taken */ done_load_dr: - testl $PCB_32BIT,PCB_FLAGS(%r8) - jnz load_gs /* static predict not taken */ -done_load_gs: - /* Restore context. */ movq PCB_R15(%r8),%r15 movq PCB_R14(%r8),%r14 @@ -243,23 +242,35 @@ movq %r10,PCB_GSBASE(%r8) jmp do_tss -store_gs: +store_seg: movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl %ds,PCB_DS(%r8) + movl %es,PCB_ES(%r8) + movl %fs,PCB_FS(%r8) + jmp done_store_seg +2: movq PCB_GS32P(%r8),%rax movq (%rax),%rax movq %rax,PCB_GS32SD(%r8) - jmp done_store_gs + jmp 1b -load_gs: +load_seg: + testl $PCB_GS32BIT,PCB_FLAGS(%r8) + jnz 2f +1: movl $MSR_GSBASE,%ecx + rdmsr + movl PCB_GS(%r8),%gs + wrmsr + movl PCB_DS(%r8),%ds + movl PCB_ES(%r8),%es + movl PCB_FS(%r8),%fs + jmp done_load_seg /* Restore userland %gs while preserving kernel gsbase */ - movq PCB_GS32P(%r8),%rax +2: movq PCB_GS32P(%r8),%rax movq PCB_GS32SD(%r8),%rcx movq %rcx,(%rax) - movl $MSR_GSBASE,%ecx - rdmsr - movl PCB_GS(%r8),%gs - wrmsr - jmp done_load_gs + jmp 1b store_dr: movq %dr7,%rax /* yes, do the save */ ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.169 2008/07/30 11:30:55 kib Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -140,6 +140,7 @@ ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); ASSYM(PCB_DBREGS, PCB_DBREGS); ASSYM(PCB_32BIT, PCB_32BIT); +ASSYM(PCB_GS32BIT, PCB_GS32BIT); ASSYM(PCB_FULLCTX, PCB_FULLCTX); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.632 2008/07/13 18:19:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.642 2008/08/02 03:43:54 alc Exp $"); /* * Manages physical address maps. @@ -222,6 +222,8 @@ static int pmap_pvh_wired_mappings(struct md_page *pvh, int count); static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, + vm_offset_t va); static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, @@ -230,9 +232,11 @@ static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); static boolean_t pmap_is_modified_pvh(struct md_page *pvh); static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); +static void pmap_pde_attr(pd_entry_t *pde, int cache_bits); static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); +static void pmap_pte_attr(pt_entry_t *pte, int cache_bits); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, vm_page_t *free); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, @@ -739,7 +743,14 @@ SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD, &pmap_pde_promotions, 0, "2MB page promotions"); +SYSCTL_NODE(_vm_pmap, OID_AUTO, pdpe, CTLFLAG_RD, 0, + "1GB page mapping counters"); +static u_long pmap_pdpe_demotions; +SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, demotions, CTLFLAG_RD, + &pmap_pdpe_demotions, 0, "1GB page demotions"); + + /*************************************************** * Low level helper routines..... ***************************************************/ @@ -986,13 +997,12 @@ if (pdep != NULL) { pde = *pdep; if (pde) { - if ((pde & PG_PS) != 0) { + if ((pde & PG_PS) != 0) rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); - PMAP_UNLOCK(pmap); - return rtval; + else { + pte = pmap_pde_to_pte(pdep, va); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } - pte = pmap_pde_to_pte(pdep, va); - rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } } PMAP_UNLOCK(pmap); @@ -3351,9 +3361,8 @@ * are taken, but the code works. */ void -pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, - vm_object_t object, vm_pindex_t pindex, - vm_size_t size) +pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, + vm_pindex_t pindex, vm_size_t size) { vm_offset_t va; vm_page_t p, pdpg; @@ -3501,7 +3510,7 @@ void pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len, - vm_offset_t src_addr) + vm_offset_t src_addr) { vm_page_t free; vm_offset_t addr; @@ -4252,41 +4261,35 @@ /* Adjust the cache mode for a 4KB page mapped via a PTE. */ static __inline void -pmap_pte_attr(vm_offset_t va, int mode) +pmap_pte_attr(pt_entry_t *pte, int cache_bits) { - pt_entry_t *pte; u_int opte, npte; - pte = vtopte(va); - /* * The cache mode bits are all in the low 32-bits of the * PTE, so we can just spin on updating the low 32-bits. */ do { opte = *(u_int *)pte; - npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); - npte |= pmap_cache_bits(mode, 0); + npte = opte & ~PG_PTE_CACHE; + npte |= cache_bits; } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); } /* Adjust the cache mode for a 2MB page mapped via a PDE. */ static __inline void -pmap_pde_attr(vm_offset_t va, int mode) +pmap_pde_attr(pd_entry_t *pde, int cache_bits) { - pd_entry_t *pde; u_int opde, npde; - pde = pmap_pde(kernel_pmap, va); - /* * The cache mode bits are all in the low 32-bits of the * PDE, so we can just spin on updating the low 32-bits. */ do { opde = *(u_int *)pde; - npde = opde & ~(PG_PDE_PAT | PG_NC_PCD | PG_NC_PWT); - npde |= pmap_cache_bits(mode, 1); + npde = opde & ~PG_PDE_CACHE; + npde |= cache_bits; } while (npde != opde && !atomic_cmpset_int((u_int *)pde, opde, npde)); } @@ -4302,11 +4305,14 @@ vm_offset_t va, tmpva, offset; /* - * If this fits within the direct map window and use WB caching - * mode, use the direct map. + * If the specified range of physical addresses fits within the direct + * map window, use the direct map. */ - if (pa < dmaplimit && (pa + size) < dmaplimit && mode == PAT_WRITE_BACK) - return ((void *)PHYS_TO_DMAP(pa)); + if (pa < dmaplimit && pa + size < dmaplimit) { + va = PHYS_TO_DMAP(pa); + if (!pmap_change_attr(va, size, mode)) + return ((void *)va); + } offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); va = kmem_alloc_nofault(kernel_map, size); @@ -4355,70 +4361,213 @@ kmem_free(kernel_map, base, size); } +/* + * Tries to demote a 1GB page mapping. + */ +static boolean_t +pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) +{ + pdp_entry_t newpdpe, oldpdpe; + pd_entry_t *firstpde, newpde, *pde; + vm_paddr_t mpdepa; + vm_page_t mpde; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + oldpdpe = *pdpe; + KASSERT((oldpdpe & (PG_PS | PG_V)) == (PG_PS | PG_V), + ("pmap_demote_pdpe: oldpdpe is missing PG_PS and/or PG_V")); + if ((mpde = vm_page_alloc(NULL, va >> PDPSHIFT, VM_ALLOC_INTERRUPT | + VM_ALLOC_NOOBJ | VM_ALLOC_WIRED)) == NULL) { + CTR2(KTR_PMAP, "pmap_demote_pdpe: failure for va %#lx" + " in pmap %p", va, pmap); + return (FALSE); + } + mpdepa = VM_PAGE_TO_PHYS(mpde); + firstpde = (pd_entry_t *)PHYS_TO_DMAP(mpdepa); + newpdpe = mpdepa | PG_M | PG_A | (oldpdpe & PG_U) | PG_RW | PG_V; + KASSERT((oldpdpe & PG_A) != 0, + ("pmap_demote_pdpe: oldpdpe is missing PG_A")); + KASSERT((oldpdpe & (PG_M | PG_RW)) != PG_RW, + ("pmap_demote_pdpe: oldpdpe is missing PG_M")); + newpde = oldpdpe; + + /* + * Initialize the page directory page. + */ + for (pde = firstpde; pde < firstpde + NPDEPG; pde++) { + *pde = newpde; + newpde += NBPDR; + } + + /* + * Demote the mapping. + */ + *pdpe = newpdpe; + + /* + * Invalidate a stale recursive mapping of the page directory page. + */ + pmap_invalidate_page(pmap, (vm_offset_t)vtopde(va)); + + pmap_pdpe_demotions++; + CTR2(KTR_PMAP, "pmap_demote_pdpe: success for va %#lx" + " in pmap %p", va, pmap); + return (TRUE); +} + int -pmap_change_attr(va, size, mode) - vm_offset_t va; - vm_size_t size; - int mode; +pmap_change_attr(vm_offset_t va, vm_size_t size, int mode) { vm_offset_t base, offset, tmpva; + pdp_entry_t *pdpe; pd_entry_t *pde; pt_entry_t *pte; + int cache_bits_pte, cache_bits_pde; + boolean_t changed; base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); - /* Only supported on kernel virtual addresses. */ - if (base <= VM_MAXUSER_ADDRESS) + /* + * Only supported on kernel virtual addresses, including the direct + * map but excluding the recursive map. + */ + if (base < DMAP_MIN_ADDRESS) return (EINVAL); + cache_bits_pde = cache_bits_pte = -1; + changed = FALSE; + /* - * XXX: We have to support tearing 2MB pages down into 4k pages if - * needed here. + * Pages that aren't mapped aren't supported. Also break down 2MB pages + * into 4KB pages if required. */ - /* Pages that aren't mapped aren't supported. */ - for (tmpva = base; tmpva < (base + size); ) { - pde = pmap_pde(kernel_pmap, tmpva); - if (*pde == 0) + PMAP_LOCK(kernel_pmap); + for (tmpva = base; tmpva < base + size; ) { + pdpe = pmap_pdpe(kernel_pmap, tmpva); + if (*pdpe == 0) { + PMAP_UNLOCK(kernel_pmap); + return (EINVAL); + } + if (*pdpe & PG_PS) { + /* + * If the current 1GB page already has the required + * memory type, then we need not demote this page. Just + * increment tmpva to the next 1GB page frame. + */ + if (cache_bits_pde < 0) + cache_bits_pde = pmap_cache_bits(mode, 1); + if ((*pdpe & PG_PDE_CACHE) == cache_bits_pde) { + tmpva = trunc_1gpage(tmpva) + NBPDP; + continue; + } + + /* + * If the current offset aligns with a 1GB page frame + * and there is at least 1GB left within the range, then + * we need not break down this page into 2MB pages. + */ + if ((tmpva & PDPMASK) == 0 && + tmpva + PDPMASK < base + size) { + tmpva += NBPDP; + continue; + } + if (!pmap_demote_pdpe(kernel_pmap, pdpe, tmpva)) { + PMAP_UNLOCK(kernel_pmap); + return (ENOMEM); + } + } + pde = pmap_pdpe_to_pde(pdpe, tmpva); + if (*pde == 0) { + PMAP_UNLOCK(kernel_pmap); return (EINVAL); + } if (*pde & PG_PS) { - /* Handle 2MB pages that are completely contained. */ - if (size >= NBPDR) { + /* + * If the current 2MB page already has the required + * memory type, then we need not demote this page. Just + * increment tmpva to the next 2MB page frame. + */ + if (cache_bits_pde < 0) + cache_bits_pde = pmap_cache_bits(mode, 1); + if ((*pde & PG_PDE_CACHE) == cache_bits_pde) { + tmpva = trunc_2mpage(tmpva) + NBPDR; + continue; + } + + /* + * If the current offset aligns with a 2MB page frame + * and there is at least 2MB left within the range, then + * we need not break down this page into 4KB pages. + */ + if ((tmpva & PDRMASK) == 0 && + tmpva + PDRMASK < base + size) { tmpva += NBPDR; continue; } + if (!pmap_demote_pde(kernel_pmap, pde, tmpva)) { + PMAP_UNLOCK(kernel_pmap); + return (ENOMEM); + } + } + pte = vtopte(tmpva); + if (*pte == 0) { + PMAP_UNLOCK(kernel_pmap); return (EINVAL); } - pte = vtopte(va); - if (*pte == 0) - return (EINVAL); tmpva += PAGE_SIZE; } + PMAP_UNLOCK(kernel_pmap); /* * Ok, all the pages exist, so run through them updating their - * cache mode. + * cache mode if required. */ - for (tmpva = base; size > 0; ) { - pde = pmap_pde(kernel_pmap, tmpva); + for (tmpva = base; tmpva < base + size; ) { + pdpe = pmap_pdpe(kernel_pmap, tmpva); + if (*pdpe & PG_PS) { + if (cache_bits_pde < 0) + cache_bits_pde = pmap_cache_bits(mode, 1); + if ((*pdpe & PG_PDE_CACHE) != cache_bits_pde) { + pmap_pde_attr(pdpe, cache_bits_pde); + if (!changed) + changed = TRUE; + } + tmpva = trunc_1gpage(tmpva) + NBPDP; + continue; + } + pde = pmap_pdpe_to_pde(pdpe, tmpva); if (*pde & PG_PS) { - pmap_pde_attr(tmpva, mode); - tmpva += NBPDR; - size -= NBPDR; + if (cache_bits_pde < 0) + cache_bits_pde = pmap_cache_bits(mode, 1); + if ((*pde & PG_PDE_CACHE) != cache_bits_pde) { + pmap_pde_attr(pde, cache_bits_pde); + if (!changed) + changed = TRUE; + } + tmpva = trunc_2mpage(tmpva) + NBPDR; } else { - pmap_pte_attr(tmpva, mode); + if (cache_bits_pte < 0) + cache_bits_pte = pmap_cache_bits(mode, 0); + pte = vtopte(tmpva); + if ((*pte & PG_PTE_CACHE) != cache_bits_pte) { + pmap_pte_attr(pte, cache_bits_pte); + if (!changed) + changed = TRUE; + } tmpva += PAGE_SIZE; - size -= PAGE_SIZE; } } /* - * Flush CPU caches to make sure any data isn't cached that shouldn't - * be, etc. - */ - pmap_invalidate_range(kernel_pmap, base, tmpva); - pmap_invalidate_cache(); + * Flush CPU caches if required to make sure any data isn't cached that + * shouldn't be, etc. + */ + if (changed) { + pmap_invalidate_range(kernel_pmap, base, tmpva); + pmap_invalidate_cache(); + } return (0); } ==== //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.504 2008/07/13 07:20:14 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.505 2008/07/30 22:27:38 jfv Exp $ cpu HAMMER ident GENERIC @@ -189,7 +189,8 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device em # Intel PRO/1000 Gigabit Ethernet Family +device igb # Intel PRO/1000 PCIE Server Gigabit Family device ixgb # Intel PRO/10GbE Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet ==== //depot/projects/vimage-commit3/src/sys/amd64/ia32/ia32_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.17 2008/03/23 22:44:56 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.18 2008/07/30 11:30:55 kib Exp $"); #include "opt_compat.h" @@ -741,6 +741,6 @@ fpstate_drop(td); /* Return via doreti so that we can change to a different %cs */ - pcb->pcb_flags |= PCB_FULLCTX; + pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; td->td_retval[1] = 0; } ==== //depot/projects/vimage-commit3/src/sys/amd64/include/param.h#2 (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.21 2008/03/27 05:03:24 jb Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.23 2008/08/01 04:55:38 alc Exp $ */ /* @@ -136,7 +136,7 @@ * the kern.maxbcache /boot/loader.conf variable. */ #ifndef VM_BCACHE_SIZE_MAX -#define VM_BCACHE_SIZE_MAX (400 * 1024 * 1024) +#define VM_BCACHE_SIZE_MAX (1024 * 1024 * 1024) #endif /* @@ -146,6 +146,7 @@ #define trunc_page(x) ((unsigned long)(x) & ~(PAGE_MASK)) #define trunc_2mpage(x) ((unsigned long)(x) & ~PDRMASK) #define round_2mpage(x) ((((unsigned long)(x)) + PDRMASK) & ~PDRMASK) +#define trunc_1gpage(x) ((unsigned long)(x) & ~PDPMASK) #define atop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define ptoa(x) ((unsigned long)(x) << PAGE_SHIFT) ==== //depot/projects/vimage-commit3/src/sys/amd64/include/pcb.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.64 2008/03/23 22:45:51 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.65 2008/07/30 11:30:55 kib Exp $ */ #ifndef _AMD64_PCB_H_ @@ -70,6 +70,7 @@ struct savefpu pcb_save; #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ +#define PCB_GS32BIT 0x20 /* linux gs switch */ #define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ #define PCB_FULLCTX 0x80 /* full context restore on sysret */ ==== //depot/projects/vimage-commit3/src/sys/amd64/include/pmap.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.146 2008/07/08 22:59:17 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.147 2008/07/31 22:45:28 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -75,6 +75,10 @@ #define PG_PROT (PG_RW|PG_U) /* all protection bits . */ #define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:24:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D017106572D; Fri, 15 Aug 2008 16:24:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F409A106567B for ; Fri, 15 Aug 2008 16:24:37 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C128D8FC1E for ; Fri, 15 Aug 2008 16:24:36 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGOaAJ010553 for ; Fri, 15 Aug 2008 16:24:36 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGOa7u010551 for perforce@freebsd.org; Fri, 15 Aug 2008 16:24:36 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 15 Aug 2008 16:24:36 GMT Message-Id: <200808151624.m7FGOa7u010551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=147468 Change 147468 by zec@zec_tpx32 on 2008/08/15 16:24:23 Attempt to unbreak build. Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/tty_info.c#2 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/tty_info.c#2 (text+ko) ==== @@ -43,6 +43,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/tty_info.c,v 1.1 2008/07/25 14:31:00 ed Exp $"); +#include "opt_vimage.h" + #include #include #include @@ -51,6 +53,7 @@ #include #include #include +#include #include #include @@ -213,6 +216,7 @@ void ttyinfo(struct tty *tp) { + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct timeval utime, stime; struct proc *p, *pick; struct thread *td, *picktd; @@ -227,7 +231,7 @@ return; /* Print load average. */ - load = (averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT; + load = (V_averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT; ttyprintf(tp, "load: %d.%02d ", load / 100, load % 100); /* From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:35:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD9E91065671; Fri, 15 Aug 2008 16:35:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E5901065697 for ; Fri, 15 Aug 2008 16:35:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DE348FC13 for ; Fri, 15 Aug 2008 16:35:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGZmbW011546 for ; Fri, 15 Aug 2008 16:35:48 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGZmDh011544 for perforce@freebsd.org; Fri, 15 Aug 2008 16:35:48 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 16:35:48 GMT Message-Id: <200808151635.m7FGZmDh011544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:35:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147470 Change 147470 by julian@julian_trafmon1 on 2008/08/15 16:34:55 Add two new globals Affected files ... .. //depot/projects/vimage-commit3/src/sys/netinet/vinet.h#3 edit Differences ... ==== //depot/projects/vimage-commit3/src/sys/netinet/vinet.h#3 (text+ko) ==== @@ -122,6 +122,8 @@ int _drop_synfin; int _tcp_do_rfc3042; int _tcp_do_rfc3390; + int _tcp_do_ecn; + int _tcp_ecn_maxretries; int _tcp_insecure_rst; int _tcp_do_autorcvbuf; int _tcp_autorcvbuf_inc; @@ -256,6 +258,8 @@ #define V_drop_synfin VNET_INET(drop_synfin) #define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) #define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) +#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) +#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) #define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) #define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) #define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) From owner-p4-projects@FreeBSD.ORG Fri Aug 15 16:44:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F540106566C; Fri, 15 Aug 2008 16:44:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03161106564A for ; Fri, 15 Aug 2008 16:44:59 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D713E8FC20 for ; Fri, 15 Aug 2008 16:44:58 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FGiwoW012304 for ; Fri, 15 Aug 2008 16:44:58 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FGiwFN012302 for perforce@freebsd.org; Fri, 15 Aug 2008 16:44:58 GMT (envelope-from konrad@FreeBSD.org) Date: Fri, 15 Aug 2008 16:44:58 GMT Message-Id: <200808151644.m7FGiwFN012302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 16:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147472 Change 147472 by konrad@vspredator on 2008/08/15 16:44:48 Get rid of the global variables. Affected files ... .. //depot/projects/soc2008/konrad_collation/test/sort/sort.c#3 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/test/sort/sort.c#3 (text+ko) ==== @@ -13,9 +13,7 @@ char *trans; } *lines[MAXSIZE]; -static int max_lines; /* Numer of lines read from input. */ - -static void +static int read_input(void) { char buf[1000]; @@ -35,7 +33,7 @@ lines[i] = line; i++; } - max_lines = i; + return i; } static int @@ -56,11 +54,11 @@ } static void -write_output(void) +write_output(int num_lines) { int i; - for (i = 0; i < max_lines; i++) { + for (i = 0; i < num_lines; i++) { printf("%s\n", lines[i]->sline); } } @@ -70,19 +68,22 @@ { char *p; int ch; + int num_lines; /* Number of lines read from input. */ int xfrm; /* Do we use strxfrm? */ - while ((ch = getopt(argc, argv, "x")) != -1) { + while ((ch = getopt(argc, argv, "xh")) != -1) { switch (ch) { case 'x': xfrm = 1; break; case '?': default: printf( "usage: " - "%s [-x]\n" - "\tsort lines in standard input according to the " - "current collation\n" - "\t-x use strxfrm and strcmp instead of strcoll\n" + "%s [-h] [-x]\n" + "\tsort lines in standard input according " + "to the current collation\n" + "\t-h this help message\n" + "\t-x use strxfrm and strcmp instead of " + "strcoll\n" , argv[0]); return EX_USAGE; break; @@ -90,13 +91,13 @@ } if ((p = setlocale(LC_ALL, "")) == NULL) errx(1, "setlocale"); - read_input(); + num_lines = read_input(); fprintf(stderr, "setlocale: %s\n", p); if (xfrm) - qsort(lines, max_lines, sizeof(struct line *), strcmp_compare); + qsort(lines, num_lines, sizeof(struct line *), strcmp_compare); else - qsort(lines, max_lines, sizeof(struct line *), strcoll_compare); - write_output(); + qsort(lines, num_lines, sizeof(struct line *), strcoll_compare); + write_output(num_lines); return 0; } From owner-p4-projects@FreeBSD.ORG Fri Aug 15 17:06:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF9131065672; Fri, 15 Aug 2008 17:06:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B394F106566C for ; Fri, 15 Aug 2008 17:06:20 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9306D8FC0C for ; Fri, 15 Aug 2008 17:06:20 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FH6KmK024369 for ; Fri, 15 Aug 2008 17:06:20 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FH6KQg024367 for perforce@freebsd.org; Fri, 15 Aug 2008 17:06:20 GMT (envelope-from konrad@FreeBSD.org) Date: Fri, 15 Aug 2008 17:06:20 GMT Message-Id: <200808151706.m7FH6KQg024367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 17:06:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=147473 Change 147473 by konrad@vspredator on 2008/08/15 17:05:56 Integrate (sync) with vendor libc. Affected files ... .. //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.c#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/sys/setfib.2#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/uuid/Makefile.inc#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/uuid/uuid.3#5 integrate .. //depot/projects/soc2008/konrad_collation/libc/uuid/uuid_stream.c#1 branch Differences ... ==== //depot/projects/soc2008/konrad_collation/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -128,7 +128,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.173 2008/07/18 19:35:44 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1012,10 +1012,11 @@ /* Exponentially back off. */ for (i = 1; i <= SPIN_LIMIT_2POW; i++) { - for (j = 0; j < (1U << i); j++) + for (j = 0; j < (1U << i); j++) { ret++; + CPU_SPINWAIT; + } - CPU_SPINWAIT; if (_pthread_mutex_trylock(lock) == 0) return (ret); } @@ -2209,8 +2210,8 @@ */ regind = diff / size; } - } else if (size <= ((sizeof(size_invs) / sizeof(unsigned)) - << QUANTUM_2POW_MIN) + 2) { + } else if (size <= (((sizeof(size_invs) / sizeof(unsigned)) + 2) + << QUANTUM_2POW_MIN)) { regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; regind >>= SIZE_INV_SHIFT; } else { @@ -2312,7 +2313,6 @@ arena_chunk_alloc(arena_t *arena) { arena_chunk_t *chunk; - arena_run_t *run; size_t i; if (arena->spare != NULL) { @@ -2337,8 +2337,6 @@ /* * Initialize the map to contain one maximal free untouched run. */ - run = (arena_run_t *)((uintptr_t)chunk + - (arena_chunk_header_npages << pagesize_2pow)); for (i = 0; i < arena_chunk_header_npages; i++) chunk->map[i].bits = 0; chunk->map[i].bits = arena_maxclass | CHUNK_MAP_ZEROED; @@ -3536,7 +3534,7 @@ { unsigned i; arena_bin_t *bin; - size_t pow2_size, prev_run_size; + size_t prev_run_size; if (malloc_spin_init(&arena->lock)) return (true); @@ -3583,7 +3581,6 @@ bin->reg_size = quantum * (i - ntbins + 1); - pow2_size = pow2_ceil(quantum * (i - ntbins + 1)); prev_run_size = arena_bin_run_size_calc(bin, prev_run_size); #ifdef MALLOC_STATS ==== //depot/projects/soc2008/konrad_collation/libc/sys/setfib.2#5 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/setfib.2,v 1.3 2008/07/25 01:09:36 julian Exp $ +.\" $FreeBSD: src/lib/libc/sys/setfib.2,v 1.4 2008/08/08 22:40:04 delphij Exp $ .\" -.Dd May 9, 2008 +.Dd August 8, 2008 .Dt SETFIB 2 .Os .Sh NAME @@ -33,6 +33,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.In sys/socket.h .Ft int .Fn setfib "int fib" .Sh DESCRIPTION ==== //depot/projects/soc2008/konrad_collation/libc/uuid/Makefile.inc#5 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $ +# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.5 2008/08/14 22:23:16 emax Exp $ # DCE 1.1 UUID implementation sources .PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ - uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c + uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \ + uuid_to_string.c SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map MAN+= uuid.3 @@ -16,4 +17,8 @@ MLINKS+=uuid.3 uuid_from_string.3 MLINKS+=uuid.3 uuid_hash.3 MLINKS+=uuid.3 uuid_is_nil.3 +MLINKS+=uuid.3 uuid_enc_le.3 +MLINKS+=uuid.3 uuid_dec_le.3 +MLINKS+=uuid.3 uuid_enc_be.3 +MLINKS+=uuid.3 uuid_dec_be.3 MLINKS+=uuid.3 uuid_to_string.3 ==== //depot/projects/soc2008/konrad_collation/libc/uuid/uuid.3#5 (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/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $ +.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.7 2008/08/14 22:23:16 emax Exp $ .\" -.Dd January 3, 2005 +.Dd August 13, 2008 .Dt UUID 3 .Os .Sh NAME @@ -52,6 +52,14 @@ .Fn uuid_is_nil "const uuid_t *uuid" "uint32_t *status" .Ft void .Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status" +.Ft void +.Fn uuid_enc_le "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_le "const void *buf" "uuid_t *" +.Ft void +.Fn uuid_enc_be "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_be "const void *buf" "uuid_t *" .Sh DESCRIPTION The family of DCE 1.1 compliant UUID functions allow applications to operate on universally unique identifiers, or UUIDs. @@ -74,6 +82,26 @@ respectively. A 16-bit hash value can be obtained by calling .Fn uuid_hash . +.Pp +The +.Fn uuid_enc_le +and +.Fn uuid_enc_be +functions encode a binary representation of a UUID into an octet stream +in little-endian and big-endian byte-order, respectively. +The destination buffer must be pre-allocated by the caller, and must be +large enough to hold the 16-octet binary UUID. +These routines are not part of the DCE RPC API. +They are provided for convenience. +.Pp +The +.Fn uuid_dec_le +and +.Fn uuid_dec_be +functions decode a UUID from an octet stream in little-endian and +big-endian byte-order, respectively. +These routines are not part of the DCE RPC API. +They are provided for convenience. .Sh RETURN VALUES The successful or unsuccessful completion of the function is returned in the From owner-p4-projects@FreeBSD.ORG Fri Aug 15 17:27:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA4D81065678; Fri, 15 Aug 2008 17:27:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E86E1065676 for ; Fri, 15 Aug 2008 17:27:42 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 642808FC1D for ; Fri, 15 Aug 2008 17:27:42 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FHRgXF026017 for ; Fri, 15 Aug 2008 17:27:42 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FHRgrw026015 for perforce@freebsd.org; Fri, 15 Aug 2008 17:27:42 GMT (envelope-from rpaulo@FreeBSD.org) Date: Fri, 15 Aug 2008 17:27:42 GMT Message-Id: <200808151727.m7FHRgrw026015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 17:27:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147475 Change 147475 by rpaulo@rpaulo_epsilon on 2008/08/15 17:27:41 Don't crash too often. ;-) Fill rcvtime on SYN. Implement more timers so that connections don't stay up forever. Cope with some rxmits. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/dumper.c#12 edit .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#15 edit .. //depot/projects/soc2008/rpaulo-tcpad/timer.c#10 edit .. //depot/projects/soc2008/rpaulo-tcpad/verify.c#11 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/dumper.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#11 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/dumper.c#12 $ */ #include @@ -188,4 +188,5 @@ p1 = p2; } free(head); + cp->pktshead = NULL; } ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#15 (text+ko) ==== @@ -23,14 +23,16 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#14 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#15 $ */ #ifndef _TCPAD_H_ #define _TCPAD_H_ #define TCPAD_VERSION "0.1" -#define TCPAD_MSL 30 /* sec. */ +#define TCPAD_TCPMSL 30 /* sec. */ +#define TCPAD_TCPETO 900 /* ESTABLISHED timeout */ +#define TCPAD_TCPTO 240 /* other states timeout */ /* Globals */ pcap_t *p; ==== //depot/projects/soc2008/rpaulo-tcpad/timer.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#9 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/timer.c#10 $ */ #include @@ -83,14 +83,29 @@ { struct tcpc *cp, *cp_t; int nc; + unsigned int maxtime; static int prevnc; + struct tcpcb *tp; nc = 0; LIST_FOREACH_SAFE(cp, &tcpchead, entries, cp_t) { nc++; - if (cp->tcb.t_state == TCPS_TIME_WAIT && - (time(NULL) - cp->tcb.t_rcvtime >= 2 * TCPAD_MSL)) { - DPRINTF(DEBUG_TIMER, "2 MSL timer went off: %p\n", + if (cp == NULL) + break; + tp = &cp->tcb; + switch (tp->t_state) { + case TCPS_TIME_WAIT: + maxtime = 2 * TCPAD_TCPMSL; + break; + case TCPS_ESTABLISHED: + maxtime = TCPAD_TCPETO; + break; + default: + maxtime = TCPAD_TCPTO; + break; + } + if (tp->t_rcvtime && (time(NULL) - tp->t_rcvtime) >= maxtime) { + DPRINTF(DEBUG_TIMER, "timer went off: %p\n", cp); LIST_REMOVE(cp, entries); if (cp->pktshead) ==== //depot/projects/soc2008/rpaulo-tcpad/verify.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#10 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/verify.c#11 $ */ #include @@ -117,6 +117,7 @@ tp->snd_wnd = th->th_win; tp->snd_wl1 = th->th_seq; tp->snd_wl2 = th->th_ack; + tp->t_rcvtime = time(NULL); tcpad_verify_topts(topts, tp, th->th_flags, TCPAD_VERIFY_DIRECTION_OUT); } @@ -259,6 +260,7 @@ tp->irs = th->th_seq; tp->rcv_nxt = tp->irs + 1; tp->rcv_wnd = th->th_win; + tp->t_rcvtime = time(NULL); tcpad_verify_topts(topts, tp, th->th_flags, TCPAD_VERIFY_DIRECTION_IN); } @@ -446,7 +448,8 @@ SEQ_GEQ(th->th_seq + tlen, tp->rcv_nxt + tp->rcv_wnd)) printf("strange seq\n"); - else + /* cope with retransmissions */ + else if (SEQ_GT(th->th_seq, tp->rcv_nxt)) tp->rcv_nxt += tlen; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 17:48:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B83B106567A; Fri, 15 Aug 2008 17:48:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EA34106566C for ; Fri, 15 Aug 2008 17:48:03 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30B848FC18 for ; Fri, 15 Aug 2008 17:48:03 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FHm3vI027648 for ; Fri, 15 Aug 2008 17:48:03 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FHm3bB027646 for perforce@freebsd.org; Fri, 15 Aug 2008 17:48:03 GMT (envelope-from konrad@FreeBSD.org) Date: Fri, 15 Aug 2008 17:48:03 GMT Message-Id: <200808151748.m7FHm3bB027646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 17:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=147477 Change 147477 by konrad@vspredator on 2008/08/15 17:47:05 Optimize getting the line numbers from source file, as suggested by Diomidis. Affected files ... .. //depot/projects/soc2008/konrad_collation/scripts/localedef.sh#3 edit .. //depot/projects/soc2008/konrad_collation/scripts/posix.sh#4 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/scripts/localedef.sh#3 (text+ko) ==== @@ -14,11 +14,11 @@ OUTFILE=collate_in.src # Get the line numbers of starting and ending of the collation definition. -LINE1=`grep -n ^LC_COLLATE $SRC | awk -F : ' { print $1 } '` -LINE2=`grep -n "^END LC_COLLATE" $SRC | awk -F : ' { print $1 } '` +LINE1=`awk '/^LC_COLLATE/ { print FNR}' $SRC` +LINE2=`awk '/^END LC_COLLATE/ { print FNR}' $SRC` -# Process the input file with sed and save the output compressing spaces. -# Basically, just cut out the collation data. +# Cut out the collation data. Erase carriage return. +# Comment out lines starting with "*"; sed -n -e "$LINE1,${LINE2}p" $SRC | tr -d '\r$' | sed -e 's/^*/#/g' > $OUTFILE #printf "1a\ncharmap /usr/home/versus/colldef.apple/data2/UTF-8.cm.new\n.\nwq\n" | ed -s $OUTFILE ==== //depot/projects/soc2008/konrad_collation/scripts/posix.sh#4 (text+ko) ==== @@ -14,8 +14,8 @@ OUTFILE=colldef_in.src # Get the line numbers of starting and ending of the collation definition. -LINE1=`grep -n ^LC_COLLATE $SRC | awk -F : ' { print $1 } '` -LINE2=`grep -n "^END LC_COLLATE" $SRC | awk -F : ' { print $1 } '` +LINE1=`awk '/^LC_COLLATE/ { print FNR}' $SRC` +LINE2=`awk '/^END LC_COLLATE/ { print FNR}' $SRC` # Process the input file with ed and save the output compressing spaces. # Basically, just cut out the collation data. From owner-p4-projects@FreeBSD.ORG Fri Aug 15 17:48:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78EDC1065675; Fri, 15 Aug 2008 17:48:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C5B8106564A for ; Fri, 15 Aug 2008 17:48:33 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outR.internet-mail-service.net (outr.internet-mail-service.net [216.240.47.241]) by mx1.freebsd.org (Postfix) with ESMTP id 15C3A8FC08 for ; Fri, 15 Aug 2008 17:48:33 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 0801E23F9; Fri, 15 Aug 2008 10:48:33 -0700 (PDT) Received: from julian-mac.elischer.org (localhost [127.0.0.1]) by idiom.com (Postfix) with ESMTP id 414822D60E8; Fri, 15 Aug 2008 10:48:31 -0700 (PDT) Message-ID: <48A5C16F.2070306@elischer.org> Date: Fri, 15 Aug 2008 10:48:31 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Marko Zec References: <200808150806.m7F86mA0039023@repoman.freebsd.org> In-Reply-To: <200808150806.m7F86mA0039023@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 17:48:33 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=147425 > > Change 147425 by zec@zec_tpx32 on 2008/08/15 08:06:14 > > Add an intro section to the document, clarify a few issues, > randomly s/virtual machine/virtual environment/ or vimage or > vnet where appropriate. THANKYOU! > > Affected files ... > > .. //depot/projects/vimage/porting_to_vimage.txt#6 edit > > Differences ... > > ==== //depot/projects/vimage/porting_to_vimage.txt#6 (text+ko) ==== > > @@ -6,21 +6,94 @@ > =================== > > Vimage is a framework in the BSD kernel which allows a co-operating module > -to present multiple instances of itself so that it can participate > -in a virtual machine scenario. > +to operate on multiple independent instances of its state so that it can > +participate in a virtual machine / virtual environment scenario. > + > +The implementation approach taken by the vimage framwork is a replacement > +of selected global state variables with constructs that allow for the > +virtualized state to be stored and resolved in appropriate instances of > +module-specific container structures. The code operating on virtualized state > +has to conform to a set of rules described further bellow, among other things > +in order to allow for all the changes to be conditionally compilable, i.e. > +permitting the virtualized code to fall back to operation on global state. > + > +The most visible change throughout the existing code is typically replacement > +of direct references to global variables with macros; foo_var thus becomes > +V_foo_var. V_foo_bar macros will resolve back to foo_bar global in default > +kernel builds, and alternatively to some_base_pointer->_foo_bar for "options > +VIMAGE" kernel configs. Prepending of "V_" prefixes to variable references > +helps in visual discrimination between global and virtualized state. The > +framework extends the sysctl infrastructure to support access to virtualized > +state through introduction of the SYSCTL_V family of macros; those also > +automatically fall back to their standard SYSCTL counterparts in default > +kernel builds. Transparent kldsym(2) lookups are provided to virtualized > +variables explicitly marked for visibility to kldsym interface, which permits > +userland binaries such as netstat to operate unmodified on "options VIMAGE" > +kernels, though this may have wide security implications. > + > +The vimage struct is currently primarily a placeholder for pointers to > +module-specific struct instances; currently V_NET (networking), V_CPU > +(CPU scheduling), and V_PROCG (jail-style interprocess protection) major > +module classes are defined. Each vimage module may or may not be further > +split into minor or submodules; the networking subsystem (vimage id V_NET; > +struct vnet) in particular is organized in submodules such as VNET_MOD_NET > +(mandatory shared infrastructure: routing tables, interface lists etc.); > +VNET_MOD_INET (IPv4 state including transport protocols); VNET_MOD_INET6, > +VNET_MOD_IPSEC, VNET_MOD_IPFW, VNET_MOD_NETGRAPH etc. The speciality of > +VNET submodules is in that they not only provide storage for virtualized > +data, but also enforce ordering of initialization and cleanup. Hence, not > +all submodules must necessarily allocate private storage for their specific > +data; they may be defined solely for to support proper initialization > +ordering. > + > +Each process is associated with a vimage, and vimages currently hang off of > +ucred-s. This relationship defines a process's administrative affinity > +to a vimage and thus indirectly to all of its modules (NET, CPU, PROCG) > +as well as to any submodules. All network interfaces and sockets hold > +pointers back to their parent vnets; this relationship is obviously entirely > +independent from proc->ucred->vimage bindings. Hence, when a process > +opens a socket, the socket will get bound to a vnet instance hanging off of > +proc->ucred->vimage->vnet, but once such a socket->vnet binding gets > +established, it cannot be changed for the entire socket lifetime. Certain > +classes of network interfaces (Ethernet in particular) can be assigned > +from one vnet to another at any time. By definition all vnets are > +are independent and can communicate only if they are explicitly provided > +with communication paths; currently only netgraph can be used to establish > +inter-vnet datapaths. > + > +In network traffic processing the vnet affinity is defined either by the > +inbound interface or by the socket / pcb -> vnet binding. However, there > +are many functions in the network stack that cannot implicitly fetch > +the vnet context from their standard arguments. Instead of explicitly > +extending argument lists of such functions with a struct vnet *, > +a per-thread variable td_vnet was introduced, which can be fetched via > +the curvnet macro (#define curvnet curthread->td_vnet). The curvnet > +context has to be set on entry to the network stack (socket operations, > +packet reception, or timer-driven functions) and cleared on exit. This > +must be done via provided CURVNET_SET() / CURVNET_RESTORE() family of > +macros, which allow for "stacking" of curvnet context setting and provide > +additional debugging info in INVARIANTS kernel configs. In most cases > +however a developer writing virtualized code will not have to set / > +restore the curvnet context unless the code would include timer-driven > +events, given that those are inherently vnet-contextless on entry. > + > + > +Converting / virtualizing existing code > +======================================= > > There are several steps need in virtualisation. > + > 1/ decide whether the module needs to be virtualised. > > if the module is a driver for specific hardware, it makes sense that > there be only one instance of the driver as there is only one piece of > physical hardware. There are changes in the networking code to allow > - physical (or virtual) interfaces to be moved between virtual machines. > - This generally requires NO changes to the network drivers of the classes > + physical (or virtual) interfaces to be moved between vnets. This > + generally requires NO changes to the network drivers of the classes > covered (e.g. ethernet). > > 2/ decide if your module is part of one of the major module groups. > - These are V_GLOBAL V_NET V_PROCG V_CPU. > + These are currently V_NET V_PROCG V_CPU. > > The reader will note that the descriptions below use the acronym VNET > a lot. The vimage system has been at this time broken into a number of > @@ -32,11 +105,6 @@ > processors to it, but keep the saem filesystem and network setup, or > alternatively to share processors but to have virtualised networking. > > - The current code has a "vnet" pointer in the thread. It could be argued > - that it should actually be a vimage. > - > - [comments from Marko here] > - > 3/ If the module is to be virtualised, decide which attributes of the > module should be virtualised. > > @@ -51,26 +119,28 @@ > achieve the behaviour required for part #2. > > 5/ Work out for all the code paths through the module, how the path entering > - the module can divine which virtual machine it is on. > + the module can divine which virtual environment it is on. > > Some examples: > - * Since interfaces are all assigned to one virtual machine or > - another, an incoming packet has a pointer to the receive interface, > - which in turn has a pointer to the virtual machine instance. > + * Since interfaces are all assigned to one vnet or another, an incoming > + packet has a pointer to the receive interface, which in turn has a > + pointer back to the vnet. > * Similarly, on any request from outside the kernel, (direct or indirect) > - the current thread has a way to get to the current virtual machine > - instance (easily referable as the "curvnet" macro). > + the current thread has a way to get to the current virtual environment > + instance via td->ucred->vimage. For existig sockets the vnet context > + must be used via so->so_vnet since td->ucred->vimage might change after > + socket creation. > * Timer initiated actions usually have a (void *) argument which points to > some private structure for the module. It should be possible to add > - a pointer to the appropriate virtual machine instance into whatever > - structure that points to. > - * Sometimes an action (timer initialted or initialted by module load or > - unload simply has to chack all the virtual machine instances. > - There is a macro (pair) for this which will iterate through all the > - virtual machine instances. > + a pointer to the appropriate module instance into whatever structure > + that points to. > + * Sometimes an action (timer trigerred or trigerred by module load or > + unload simply has to check all the vimage or module instances. > + There are macro (pairs) for this which will iterate through all the > + VNET or VPROCG instances. > > This covers most of the cases, however in some cases it may still be > - required for the module to stash away the virtual machine instance > + required for the module to stash away the virtual environment instance > somewhere, and make associated changes in the code. > > 6/ Add the code described below to the files that make up the module > @@ -80,7 +150,7 @@ > temp. note: for module FOO add a definition for VNET_MOD_FOO in sys/vimage.h. > Thos will eventually be dynamically assigned. > > -For now these instructions refer mainly to VNET and not VCPU etc. > +For now these instructions refer mainly to VNET and not VCPU, VPROCG etc. > > Symbols defined in other modules that have been virtualised will have been > moved to a module-specific virtualisation structure. It will be defined in a > @@ -103,18 +173,19 @@ > When VIMAGE is compiled in, the macro will evaluate to an access to an > element in a structure pointed to by a local varible. > For this reason, it is necessary to also add, at the beginning of > -these functions another MACRO that will instanciate this local variable > +these functions another MACRO that will instantiate this local variable > and point it at the correct place. > -As an example, prior to using the "V_ifnet" structure, we must > -add the following MACRO at the head of a code block enclosing the references. > - INIT_VNET_NET(initial_value); > +As an example, prior to using the "V_ifnet" structure in a program block, > +we must add the following MACRO at the head of a code block enclosing the > +references to set up module-specific base pointer variable: > + INIT_VNET_NET(initial_valu); > > When VIMAGE is not defined, this will evaluate to nothing but when it > IS defined, it will evaluate to: > struct vnet_net *vnet_net = (initial_value); > > The initial value is usually something like "curvnet" which in turn > -is a macro that derives the virtual machine reference from the current thread. > +is a macro that derives the vnet affinity from the current thread. > It could also be (m->m_ifp->if_vnet) if we were receiving an mbuf. > > In the case where it is just one function in a module calling > @@ -125,17 +196,17 @@ > marked as "unused"). > > Usually, when a packet enters the system it is carried through the processing > -path via a single thread, and that thread will set its virtual machine > +path via a single thread, and that thread will set its virtual environment > reference to that indicated by the packet on picking up that new packet. > This means that in the normal inbound processing path as well as the > outgoing process path the current thread can be used to indicate the > -current virtual machine. In the case of timer initiated events, best practice > -would also be to set the current virtual machine reference to that indicated > -calculated by whatever way that would be done, so that any functions called > -could rely on the current thread being a good reference for the correct > -virtual machine. > +current virtual environment. In the case of timer initiated events, best > +practice would also be to set the current virtual module reference to that > +indicated calculated by whatever way that would be done, so that any functions > +called could rely on the current thread being a good reference for the correct > +virtual module. > > -When a new module is defined for virtualisation. The following > +When a new VNET submodule is defined for virtualisation, the following > structure defining macro is used to define it to the framework. > > > @@ -150,17 +221,18 @@ > .vmi_struct_size = \ > sizeof(struct vnet_##m_name_lc), \ > .vmi_symmap = m_symmap \ > + > The ID we allocated in the temporary first step in "Details" is > -the first entry here. Eventually this should be automatically done > +the first entry here; eventually this should be automatically done > by module name. The DEPENDSON field tells us the order that modules > -should be initialised in a new virtual machine. This may later need > +should be initialised in a new virtual environment. This may later need > to be changes to a list of text module names for dynamic calculation. > -The rest of the fields are self explanatory.. > +The rest of the fields are self explanatory. > With the exception of the symmap entry. > The symmap allows us to intercept calls by libkvm to the > linker when it is looking up symbols and to redirect it > dynamically. this allows for example "netstat -r" to find the > -routing tables for THIS virtual machine. (cute eh?) > +routing tables for THIS virtual environment. > (of course that won't work for core dumps). (XXX *needs thought *) > > As example of virtualising a dummy module named the FOO module > @@ -194,11 +266,13 @@ > #endif /* !_FOO_VFOO_H_ */ > ========================================================= > > -For each time the foo module is initiated for a new virtual machine, > +For each time the foo module is initiated for a new virtual environment, > the foo_bar structure must be initiated, so a new foo_creator and destructor > functions are defined for the module. The Module will call these when a new > -virtual machine is created or destroyed. The constructor must be called once > -for the base machine when the system is booted, even when VIMAGE is not defined. > +virtual environment is created or destroyed. The constructor must be called > +once for the base machine when the system is booted, even when options VIMAGE > +is not defined. > + > ==================== in module foo.c ====== > #include "opt_vimage.h" > [...] > @@ -229,7 +303,7 @@ > > #ifdef VIMAGE > /* If we have symbols we need to divert for libkvm > - * then put them in here. We may net need to do anything if > + * then put them in here. We may not need to do anything if > * the symbols are not used by libkvm. > */ > static struct vnet_symmap vnet_net_symmap[] = { > @@ -239,7 +313,7 @@ > }; > /* > * Declare our module and state that we want to be done after the > - * loopback interface is initialised for the virtual machine. > + * loopback interface is initialised for the virtual environment. > */ > VNET_MOD_DECLARE(FOO, foo, vnet_foo_iattach, > vnet_foo_idetach, LOIF, vnet_foo_symmap) > @@ -295,7 +369,7 @@ > /* Initialize everything. */ > /* put your code here */ > #ifdef VIMAGE > - /* This will do the work for each vortual machine. */ > + /* This will do the work for each vortual environment. */ > vnet_mod_register(&vnet_foo_modinfo); > #else /* !VIMAGE */ > #ifdef FUTURE > @@ -309,7 +383,7 @@ > case MOD_UNLOAD: > /* You can't unload it because an interface may be using it. */ > /* this needs work */ > - /* Should refuse to unload if any virtual machines */ > + /* Should refuse to unload if any virtual environment */ > /* are using this still. */ > /* MARKO, fill in here */ > error = EBUSY; From owner-p4-projects@FreeBSD.ORG Fri Aug 15 18:17:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C14610656C3; Fri, 15 Aug 2008 18:17:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FA6E10656C8 for ; Fri, 15 Aug 2008 18:17:33 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 147D18FC14 for ; Fri, 15 Aug 2008 18:17:33 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FIHXcF031072 for ; Fri, 15 Aug 2008 18:17:33 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FIHXfm031070 for perforce@freebsd.org; Fri, 15 Aug 2008 18:17:33 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 18:17:33 GMT Message-Id: <200808151817.m7FIHXfm031070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 18:17:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147478 Change 147478 by julian@julian_trafmon1 on 2008/08/15 18:17:22 Fix nits Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#7 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#7 (text+ko) ==== @@ -13,13 +13,13 @@ of selected global state variables with constructs that allow for the virtualized state to be stored and resolved in appropriate instances of module-specific container structures. The code operating on virtualized state -has to conform to a set of rules described further bellow, among other things +has to conform to a set of rules described further below, among other things in order to allow for all the changes to be conditionally compilable, i.e. permitting the virtualized code to fall back to operation on global state. The most visible change throughout the existing code is typically replacement -of direct references to global variables with macros; foo_var thus becomes -V_foo_var. V_foo_bar macros will resolve back to foo_bar global in default +of direct references to global variables with macros; foo_bar thus becomes +V_foo_bar. V_foo_bar macros will resolve back to foo_bar global in default kernel builds, and alternatively to some_base_pointer->_foo_bar for "options VIMAGE" kernel configs. Prepending of "V_" prefixes to variable references helps in visual discrimination between global and virtualized state. The @@ -102,7 +102,7 @@ virtualizable in a particular virtual machine instance. As an example, in a virtualization, one might to allocate a couple of - processors to it, but keep the saem filesystem and network setup, or + processors to it, but keep the same filesystem and network setup, or alternatively to share processors but to have virtualised networking. 3/ If the module is to be virtualised, decide which attributes of the @@ -116,7 +116,7 @@ on a virtual system by virtual system basis. 4/ Work out what global variables and structures are to be virtualised to - achieve the behaviour required for part #2. + achieve the behaviour required for part #3. 5/ Work out for all the code paths through the module, how the path entering the module can divine which virtual environment it is on. @@ -124,10 +124,11 @@ Some examples: * Since interfaces are all assigned to one vnet or another, an incoming packet has a pointer to the receive interface, which in turn has a - pointer back to the vnet. + pointer back to the vnet. Often "curvnet" will already have been set + by the time your code is called anyhow. * Similarly, on any request from outside the kernel, (direct or indirect) the current thread has a way to get to the current virtual environment - instance via td->ucred->vimage. For existig sockets the vnet context + instance via td->ucred->vimage. For existing sockets the vnet context must be used via so->so_vnet since td->ucred->vimage might change after socket creation. * Timer initiated actions usually have a (void *) argument which points to @@ -148,7 +149,7 @@ Details: temp. note: for module FOO add a definition for VNET_MOD_FOO in sys/vimage.h. -Thos will eventually be dynamically assigned. +This will eventually be dynamically assigned. For now these instructions refer mainly to VNET and not VCPU, VPROCG etc. @@ -157,8 +158,10 @@ .h file for just this purpose. If a module will never export virtualise symbols beyond it's borders, then this structure may well just be in a common include file for that module. As an example, common networking -(but not protocol) variables have been moved to a file called net/vnet.h , -the gre module has simply added the virtualisation structure to if_gre.h. +(but not protocol) variables have been moved to a file called net/vnet.h, but +the gre module has simply added the virtualisation structure to if_gre.h as +no code outside the gre interface will access those values. + Accesses to virtualised symbols are achieved via macros, which generally are of the same name as the original symbol but with a "V_" prepended, thus the head of the interface list, called 'ifnet' is replaced whereever @@ -173,15 +176,17 @@ When VIMAGE is compiled in, the macro will evaluate to an access to an element in a structure pointed to by a local varible. For this reason, it is necessary to also add, at the beginning of -these functions another MACRO that will instantiate this local variable +these functions another macro that will instantiate this local variable and point it at the correct place. As an example, prior to using the "V_ifnet" structure in a program block, -we must add the following MACRO at the head of a code block enclosing the +we must add the following macro at the head of a code block enclosing the references to set up module-specific base pointer variable: - INIT_VNET_NET(initial_valu); + + INIT_VNET_NET(initial_value); /* initial value is usually curvnet */ When VIMAGE is not defined, this will evaluate to nothing but when it IS defined, it will evaluate to: + struct vnet_net *vnet_net = (initial_value); The initial value is usually something like "curvnet" which in turn @@ -226,9 +231,9 @@ the first entry here; eventually this should be automatically done by module name. The DEPENDSON field tells us the order that modules should be initialised in a new virtual environment. This may later need -to be changes to a list of text module names for dynamic calculation. -The rest of the fields are self explanatory. -With the exception of the symmap entry. +to be changed to a list of text module names for dynamic calculation. +The rest of the fields are self explanatory, with the exception of the +symmap entry. The symmap allows us to intercept calls by libkvm to the linker when it is looking up symbols and to redirect it dynamically. this allows for example "netstat -r" to find the From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:17:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34D1B106567A; Fri, 15 Aug 2008 21:17:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC43C1065675 for ; Fri, 15 Aug 2008 21:17:36 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6AF98FC12 for ; Fri, 15 Aug 2008 21:17:36 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLHatQ062163 for ; Fri, 15 Aug 2008 21:17:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLHaKE062161 for perforce@freebsd.org; Fri, 15 Aug 2008 21:17:36 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:17:36 GMT Message-Id: <200808152117.m7FLHaKE062161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=147488 Change 147488 by julian@julian_trafmon1 on 2008/08/15 21:16:58 AS per DES, remove any reference to opt_vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#8 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#4 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#5 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#6 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#4 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#4 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#4 edit .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#4 edit .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#3 edit .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#5 edit .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#5 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#5 edit .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#6 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#5 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#5 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#4 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#4 edit .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#10 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#4 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#6 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#4 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#8 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#5 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#7 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#4 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#9 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#8 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#9 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#8 edit .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#6 edit .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#8 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ */ #include "opt_compat.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_vimage.h" #include "opt_compat.h" #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ -#include "opt_vimage.h" #include "opt_inet6.h" #endif #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if (__FreeBSD_version >= 800000) -# include "opt_vimage.h" # include "opt_inet6.h" # include # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) -# include "opt_vimage.h" # include # include #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 (text+ko) ==== @@ -63,7 +63,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #else #define V_path_mtu_discovery path_mtu_discovery ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#5 (text+ko) ==== @@ -59,7 +59,6 @@ # include #endif #if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#5 (text+ko) ==== @@ -105,7 +105,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 (text+ko) ==== @@ -71,7 +71,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 (text+ko) ==== @@ -50,7 +50,6 @@ # include # include # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#5 (text+ko) ==== @@ -45,7 +45,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_carp.h" #include "opt_bpf.h" #include "opt_pf.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_pf.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $"); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#4 (text+ko) ==== @@ -63,7 +63,6 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#4 (text+ko) ==== @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#6 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#5 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -11,7 +11,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#5 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); #include "opt_device_polling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#6 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit2/src/sys/net/if.c#5 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#6 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_ef.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_ef.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_faith.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_gre.c#6 (text+ko) ==== @@ -51,7 +51,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #endif #ifdef NetBSD1_3 ==== //depot/projects/vimage-commit2/src/sys/net/if_stf.c#4 (text+ko) ==== @@ -76,7 +76,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include "opt_mac.h" #include ==== //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include "opt_vlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/route.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); -#include "opt_vimage.h" #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#5 (text+ko) ==== @@ -58,7 +58,6 @@ * from one port to the other only rarely. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#4 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#5 (text+ko) ==== @@ -56,7 +56,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ * Author: Dave Chapeskie */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $"); ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#6 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#4 (text+ko) ==== @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.104 2008/06/24 13:58:28 gonzo Exp $"); #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_carp.h" #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:19:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0D8B1065671; Fri, 15 Aug 2008 21:19:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 755C11065680 for ; Fri, 15 Aug 2008 21:19:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 583988FC12 for ; Fri, 15 Aug 2008 21:19:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLJcJl062297 for ; Fri, 15 Aug 2008 21:19:38 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLJcal062295 for perforce@freebsd.org; Fri, 15 Aug 2008 21:19:38 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:19:38 GMT Message-Id: <200808152119.m7FLJcal062295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:19:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=147489 Change 147489 by julian@julian_trafmon1 on 2008/08/15 21:18:38 VIMAGE is now global option as per DES Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/options#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/options#4 (text+ko) ==== @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_vimage.h +VIMAGE opt_global.h From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:23:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3845106566C; Fri, 15 Aug 2008 21:23:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5DFD106564A for ; Fri, 15 Aug 2008 21:23:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0AD58FC17 for ; Fri, 15 Aug 2008 21:23:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLNh8m062689 for ; Fri, 15 Aug 2008 21:23:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLNhH2062687 for perforce@freebsd.org; Fri, 15 Aug 2008 21:23:43 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:23:43 GMT Message-Id: <200808152123.m7FLNhH2062687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:23:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147490 Change 147490 by julian@julian_trafmon1 on 2008/08/15 21:23:06 As per DES, remove opt_vimage in favor of opt_global Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#7 edit .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#9 edit .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#6 edit .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#18 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#9 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#19 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#8 edit .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/vimage/src/sys/compat/svr4/svr4_stat.c#4 edit .. //depot/projects/vimage/src/sys/conf/options#27 edit .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#5 edit .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#13 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#8 edit .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#14 edit .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#3 edit .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#12 edit .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#5 edit .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#5 edit .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#9 edit .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#9 edit .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_socksys.c#4 edit .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#6 edit .. //depot/projects/vimage/src/sys/kern/init_main.c#19 edit .. //depot/projects/vimage/src/sys/kern/kern_clock.c#18 edit .. //depot/projects/vimage/src/sys/kern/kern_exit.c#21 edit .. //depot/projects/vimage/src/sys/kern/kern_fork.c#20 edit .. //depot/projects/vimage/src/sys/kern/kern_jail.c#11 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#16 edit .. //depot/projects/vimage/src/sys/kern/kern_mib.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_poll.c#8 edit .. //depot/projects/vimage/src/sys/kern/kern_prot.c#9 edit .. //depot/projects/vimage/src/sys/kern/kern_synch.c#20 edit .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_thread.c#14 edit .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#6 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#65 edit .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#8 edit .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#6 edit .. //depot/projects/vimage/src/sys/kern/sys_socket.c#11 edit .. //depot/projects/vimage/src/sys/kern/tty.c#17 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#13 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#20 edit .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#20 edit .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#17 edit .. //depot/projects/vimage/src/sys/kern/vfs_export.c#11 edit .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#13 edit .. //depot/projects/vimage/src/sys/net/bpf.c#24 edit .. //depot/projects/vimage/src/sys/net/bridgestp.c#10 edit .. //depot/projects/vimage/src/sys/net/if.c#31 edit .. //depot/projects/vimage/src/sys/net/if_bridge.c#14 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#8 edit .. //depot/projects/vimage/src/sys/net/if_ef.c#4 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#21 edit .. //depot/projects/vimage/src/sys/net/if_faith.c#3 edit .. //depot/projects/vimage/src/sys/net/if_gif.c#14 edit .. //depot/projects/vimage/src/sys/net/if_gre.c#8 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#23 edit .. //depot/projects/vimage/src/sys/net/if_mib.c#4 edit .. //depot/projects/vimage/src/sys/net/if_ppp.c#9 edit .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#6 edit .. //depot/projects/vimage/src/sys/net/if_stf.c#9 edit .. //depot/projects/vimage/src/sys/net/if_tap.c#6 edit .. //depot/projects/vimage/src/sys/net/if_tun.c#6 edit .. //depot/projects/vimage/src/sys/net/if_vlan.c#8 edit .. //depot/projects/vimage/src/sys/net/netisr.c#10 edit .. //depot/projects/vimage/src/sys/net/raw_cb.c#6 edit .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#5 edit .. //depot/projects/vimage/src/sys/net/route.c#20 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#13 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#17 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#5 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#12 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#11 edit .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#3 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#31 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#10 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#12 edit .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#4 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#8 edit .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#7 edit .. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#5 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#19 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#13 edit .. //depot/projects/vimage/src/sys/netinet/in.c#13 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#10 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#7 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#27 edit .. //depot/projects/vimage/src/sys/netinet/in_proto.c#14 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#15 edit .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#10 edit .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#12 edit .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#10 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#37 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#4 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#10 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#13 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#28 edit .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#9 edit .. //depot/projects/vimage/src/sys/netinet/ip_options.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_output.c#15 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#24 edit .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#29 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#19 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#29 edit .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#4 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#19 edit .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#5 edit .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#44 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#33 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#18 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#14 edit .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#20 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#28 edit .. //depot/projects/vimage/src/sys/netinet6/dest6.c#6 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/in6.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#10 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#19 edit .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#19 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#12 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#30 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#10 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#17 edit .. //depot/projects/vimage/src/sys/netinet6/mld6.c#11 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#27 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#16 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#21 edit .. //depot/projects/vimage/src/sys/netinet6/route6.c#7 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#13 edit .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#25 edit .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#25 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#24 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#14 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#4 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#14 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#18 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#11 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#13 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#12 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#10 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#14 edit .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#9 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#8 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#12 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#17 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#14 edit .. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#4 edit .. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#5 edit .. //depot/projects/vimage/src/sys/rpc/rpc_generic.c#3 edit .. //depot/projects/vimage/src/sys/rpc/svc_dg.c#3 edit .. //depot/projects/vimage/src/sys/rpc/svc_generic.c#3 edit .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#6 edit .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#9 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#18 (text+ko) ==== @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#9 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_vimage.h" #include "opt_compat.h" #include ==== //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#19 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#8 (text+ko) ==== @@ -32,7 +32,6 @@ /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_stat.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/conf/options#27 (text+ko) ==== @@ -770,4 +770,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_vimage.h +VIMAGE opt_global.h ==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #ifdef __FreeBSD__ #include "opt_inet6.h" #include "opt_inet.h" -#include "opt_vimage.h" #endif #endif /* __FreeBSD__ || __NetBSD__ */ ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 (text+ko) ==== @@ -26,7 +26,6 @@ #endif #include #if __FreeBSD_version > 800000 -# include "opt_vimage.h" #endif #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#13 (text+ko) ==== @@ -39,7 +39,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#8 (text+ko) ==== @@ -35,7 +35,6 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); ==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#14 (text+ko) ==== @@ -38,7 +38,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); ==== //depot/projects/vimage/src/sys/ddb/db_textdump.c#3 (text+ko) ==== @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/dev/firewire/firewire.c#12 (text+ko) ==== @@ -35,7 +35,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#9 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#9 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_socksys.c#4 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/init_main.c#19 (text+ko) ==== @@ -47,7 +47,6 @@ #include "opt_ddb.h" #include "opt_init_path.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#18 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_hwpmc_hooks.h" #include "opt_ntp.h" #include "opt_watchdog.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#21 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_ktrace.h" #include "opt_mac.h" #include "opt_sched.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#20 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_jail.c#11 (text+ko) ==== @@ -11,7 +11,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#16 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_mib.c#12 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#8 (text+ko) ==== @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/kern/kern_prot.c#9 (text+ko) ==== @@ -46,7 +46,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#20 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_ktrace.h" #include "opt_sched.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_sysctl.c#12 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_thread.c#14 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include "opt_witness.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.276 2008/08/13 18:24:22 attilio Exp $"); ==== //depot/projects/vimage/src/sys/kern/kern_uuid.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#65 (text+ko) ==== @@ -29,7 +29,6 @@ */ #include "opt_ddb.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/kern_xxx.c#8 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/subr_pcpu.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.10 2007/11/14 06:21:23 julian Exp $"); #include "opt_ddb.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/sys_socket.c#11 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.76 2008/05/09 23:02:55 julian Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/tty.c#17 (text+ko) ==== @@ -75,7 +75,6 @@ #include "opt_compat.h" #include "opt_tty.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#13 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.52 2008/03/16 10:58:05 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#20 (text+ko) ==== @@ -101,7 +101,6 @@ #include "opt_mac.h" #include "opt_zero.h" #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#20 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_compat.h" #include "opt_ktrace.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#17 (text+ko) ==== @@ -60,7 +60,6 @@ #include "opt_ddb.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/vfs_export.c#11 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#13 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_ktrace.h" #include "opt_mac.h" #include "opt_vfs.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/bpf.c#24 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_bpf.h" #include "opt_mac.h" #include "opt_netgraph.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/bridgestp.c#10 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage/src/sys/net/if.c#31 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_bridge.c#14 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_clone.c#8 (text+ko) ==== @@ -30,7 +30,6 @@ * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_ef.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_ef.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#21 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_faith.c#3 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_gif.c#14 (text+ko) ==== @@ -33,7 +33,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_gre.c#8 (text+ko) ==== @@ -51,7 +51,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_loop.c#23 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_mib.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_ppp.c#9 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_ipx.h" #include "opt_mac.h" #include "opt_ppp.h" -#include "opt_vimage.h" #ifdef INET #define VJC ==== //depot/projects/vimage/src/sys/net/if_spppsubr.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #endif #ifdef NetBSD1_3 ==== //depot/projects/vimage/src/sys/net/if_stf.c#9 (text+ko) ==== @@ -77,7 +77,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_tap.c#6 (text+ko) ==== @@ -37,7 +37,6 @@ #include "opt_compat.h" #include "opt_inet.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_tun.c#6 (text+ko) ==== @@ -21,7 +21,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/if_vlan.c#8 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include "opt_vlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/netisr.c#10 (text+ko) ==== @@ -28,7 +28,6 @@ */ #include "opt_device_polling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/raw_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/route.c#20 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net/rtsock.c#13 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net80211/ieee80211.c#17 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ #include "opt_ddb.h" #include "opt_wlan.h" -#include "opt_vimage.h" #ifdef DDB ==== //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#12 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.20 2008/08/02 18:00:33 sam Exp $"); -#include "opt_vimage.h" /* * IEEE 802.11 support (FreeBSD-specific code) ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#11 (text+ko) ==== @@ -34,7 +34,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ * Netgraph module to connect NATM interfaces to netgraph. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#31 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:32:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 785FE106568C; Fri, 15 Aug 2008 21:32:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B1191065681 for ; Fri, 15 Aug 2008 21:32:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36E778FC0C for ; Fri, 15 Aug 2008 21:32:30 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLWTXv063384 for ; Fri, 15 Aug 2008 21:32:29 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLWT8e063378 for perforce@freebsd.org; Fri, 15 Aug 2008 21:32:29 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:32:29 GMT Message-Id: <200808152132.m7FLWT8e063378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147492 Change 147492 by julian@julian_trafmon1 on 2008/08/15 21:32:27 Integrate change 147490. remove reference to opt_vimage as per DES Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#7 edit .. //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#4 edit .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_ioctl.c#4 edit .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#7 edit .. //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#4 edit .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#5 edit .. //depot/projects/vimage-devel/src/sys/conf/options#4 integrate .. //depot/projects/vimage-devel/src/sys/contrib/altq/altq/altq_subr.c#3 edit .. //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 edit .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf.c#4 edit .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_if.c#3 edit .. //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_ioctl.c#4 edit .. //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#3 edit .. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#3 edit .. //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#5 edit .. //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#4 edit .. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#6 edit .. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#6 edit .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#5 edit .. //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/init_main.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_prot.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#9 edit .. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#7 edit .. //depot/projects/vimage-devel/src/sys/kern/subr_pcpu.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/tty.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#6 edit .. //depot/projects/vimage-devel/src/sys/kern/uipc_syscalls.c#4 edit .. //depot/projects/vimage-devel/src/sys/kern/uipc_usrreq.c#5 edit .. //depot/projects/vimage-devel/src/sys/kern/vfs_export.c#3 edit .. //depot/projects/vimage-devel/src/sys/kern/vfs_lookup.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/bpf.c#8 edit .. //depot/projects/vimage-devel/src/sys/net/bridgestp.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if.c#6 edit .. //depot/projects/vimage-devel/src/sys/net/if_bridge.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/if_clone.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/if_ef.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#5 edit .. //depot/projects/vimage-devel/src/sys/net/if_faith.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_gif.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_gre.c#5 edit .. //depot/projects/vimage-devel/src/sys/net/if_loop.c#6 edit .. //depot/projects/vimage-devel/src/sys/net/if_mib.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_ppp.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/if_spppsubr.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_stf.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_tap.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_tun.c#3 edit .. //depot/projects/vimage-devel/src/sys/net/if_vlan.c#4 edit .. //depot/projects/vimage-devel/src/sys/net/netisr.c#6 edit .. //depot/projects/vimage-devel/src/sys/net/raw_cb.c#5 edit .. //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#5 edit .. //depot/projects/vimage-devel/src/sys/net/route.c#6 edit .. //depot/projects/vimage-devel/src/sys/net/rtsock.c#4 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#6 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#3 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#6 edit .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ioctl.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#3 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#8 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#3 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#5 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_gif.c#3 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_iface.c#4 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_pipe.c#3 edit .. //depot/projects/vimage-devel/src/sys/netgraph/ng_wormhole.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/if_ether.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/igmp.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/in.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_gif.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_mcast.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#12 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_proto.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_carp.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_divert.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fastfwd.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw2.c#7 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_nat.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_fw_pfil.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_icmp.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_input.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_ipsec.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_mroute.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_options.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/ip_output.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/raw_ip.c#7 edit .. //depot/projects/vimage-devel/src/sys/netinet/sctp_output.c#6 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_hostcache.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_input.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_output.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_reass.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_sack.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_subr.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_syncache.c#9 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_timer.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_timewait.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/tcp_usrreq.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#8 edit .. //depot/projects/vimage-devel/src/sys/netinet6/dest6.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/icmp6.c#6 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_gif.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_pcb.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_proto.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/in6_src.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_forward.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_ipsec.c#5 edit .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_mroute.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_output.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/mld6.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/nd6.c#4 edit .. //depot/projects/vimage-devel/src/sys/netinet6/nd6_nbr.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/nd6_rtr.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/raw_ip6.c#6 edit .. //depot/projects/vimage-devel/src/sys/netinet6/route6.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#3 edit .. //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#6 edit .. //depot/projects/vimage-devel/src/sys/netinet6/udp6_usrreq.c#6 edit .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec.c#7 edit .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_input.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_mbuf.c#3 edit .. //depot/projects/vimage-devel/src/sys/netipsec/ipsec_output.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/key.c#5 edit .. //depot/projects/vimage-devel/src/sys/netipsec/keysock.c#6 edit .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ah.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/xform_esp.c#4 edit .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipcomp.c#3 edit .. //depot/projects/vimage-devel/src/sys/netipsec/xform_ipip.c#3 edit .. //depot/projects/vimage-devel/src/sys/nfsclient/bootp_subr.c#5 edit .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_diskless.c#3 edit .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_socket.c#4 edit .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vfsops.c#8 edit .. //depot/projects/vimage-devel/src/sys/nfsclient/nfs_vnops.c#4 edit .. //depot/projects/vimage-devel/src/sys/nlm/nlm_advlock.c#5 edit .. //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#6 edit .. //depot/projects/vimage-devel/src/sys/rpc/rpc_generic.c#3 edit .. //depot/projects/vimage-devel/src/sys/rpc/svc_dg.c#3 edit .. //depot/projects/vimage-devel/src/sys/rpc/svc_generic.c#3 edit .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#5 edit .. //depot/projects/vimage-devel/src/sys/vm/vm_meter.c#4 edit Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#7 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_ioctl.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_vimage.h" #include "opt_compat.h" #include ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); ==== //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/conf/options#4 (text+ko) ==== @@ -770,4 +770,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_vimage.h +VIMAGE opt_global.h ==== //depot/projects/vimage-devel/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ #ifdef __FreeBSD__ #include "opt_inet6.h" #include "opt_inet.h" -#include "opt_vimage.h" #endif #endif /* __FreeBSD__ || __NetBSD__ */ ==== //depot/projects/vimage-devel/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ #endif #include #if __FreeBSD_version > 800000 -# include "opt_vimage.h" #endif #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) ==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $"); ==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_if.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); ==== //depot/projects/vimage-devel/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); ==== //depot/projects/vimage-devel/src/sys/ddb/db_textdump.c#3 (text+ko) ==== @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#6 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#5 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/init_main.c#3 (text+ko) ==== @@ -47,7 +47,6 @@ #include "opt_ddb.h" #include "opt_init_path.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_clock.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_hwpmc_hooks.h" #include "opt_ntp.h" #include "opt_watchdog.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#6 (text+ko) ==== @@ -42,7 +42,6 @@ #include "opt_ktrace.h" #include "opt_mac.h" #include "opt_sched.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#6 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -11,7 +11,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_linker.c#5 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_mib.c#6 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#4 (text+ko) ==== @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/kern/kern_prot.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_ktrace.h" #include "opt_sched.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_sysctl.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_thread.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include "opt_witness.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.276 2008/08/13 18:24:22 attilio Exp $"); ==== //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#6 (text+ko) ==== @@ -29,7 +29,6 @@ */ #include "opt_ddb.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_xxx.c#9 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_hwpmc_hooks.h" #include "opt_sched.h" #include "opt_kdtrace.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/subr_pcpu.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_pcpu.c,v 1.10 2007/11/14 06:21:23 julian Exp $"); #include "opt_ddb.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.76 2008/05/09 23:02:55 julian Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/tty.c#5 (text+ko) ==== @@ -75,7 +75,6 @@ #include "opt_compat.h" #include "opt_tty.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.52 2008/03/16 10:58:05 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/kern/uipc_socket.c#6 (text+ko) ==== @@ -101,7 +101,6 @@ #include "opt_mac.h" #include "opt_zero.h" #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/uipc_syscalls.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_compat.h" #include "opt_ktrace.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/uipc_usrreq.c#5 (text+ko) ==== @@ -60,7 +60,6 @@ #include "opt_ddb.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/vfs_export.c#3 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/kern/vfs_lookup.c#3 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_ktrace.h" #include "opt_mac.h" #include "opt_vfs.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/bpf.c#8 (text+ko) ==== @@ -40,7 +40,6 @@ #include "opt_bpf.h" #include "opt_mac.h" #include "opt_netgraph.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/bridgestp.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-devel/src/sys/net/if.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_bridge.c#4 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_clone.c#4 (text+ko) ==== @@ -30,7 +30,6 @@ * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_ef.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_ef.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_ethersubr.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_faith.c#3 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -33,7 +33,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_gre.c#5 (text+ko) ==== @@ -51,7 +51,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_loop.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_mib.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_ppp.c#4 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_ipx.h" #include "opt_mac.h" #include "opt_ppp.h" -#include "opt_vimage.h" #ifdef INET #define VJC ==== //depot/projects/vimage-devel/src/sys/net/if_spppsubr.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #endif #ifdef NetBSD1_3 ==== //depot/projects/vimage-devel/src/sys/net/if_stf.c#3 (text+ko) ==== @@ -77,7 +77,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_tap.c#3 (text+ko) ==== @@ -37,7 +37,6 @@ #include "opt_compat.h" #include "opt_inet.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_tun.c#3 (text+ko) ==== @@ -21,7 +21,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_vlan.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include "opt_vlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/netisr.c#6 (text+ko) ==== @@ -28,7 +28,6 @@ */ #include "opt_device_polling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/raw_cb.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/route.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net/rtsock.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ #include "opt_ddb.h" #include "opt_wlan.h" -#include "opt_vimage.h" #ifdef DDB ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#6 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.20 2008/08/02 18:00:33 sam Exp $"); -#include "opt_vimage.h" /* * IEEE 802.11 support (FreeBSD-specific code) ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:38:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DB63106566C; Fri, 15 Aug 2008 21:38:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4F461065689 for ; Fri, 15 Aug 2008 21:38:36 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D13168FC1B for ; Fri, 15 Aug 2008 21:38:36 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLca5m063918 for ; Fri, 15 Aug 2008 21:38:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLca1b063916 for perforce@freebsd.org; Fri, 15 Aug 2008 21:38:36 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:38:36 GMT Message-Id: <200808152138.m7FLca1b063916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147494 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=147494 Change 147494 by julian@julian_trafmon1 on 2008/08/15 21:38:34 remove opt_vimage.h as per DES Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#6 edit .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#5 edit .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#4 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#4 edit .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 edit .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/init_main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ef.c#2 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_faith.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gif.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_gre.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if_mib.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_stf.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tap.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_tun.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/if_vlan.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net/route.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_wormhole.c#2 integrate .. //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_offload.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/dest6.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/route6.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/key.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/keysock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#6 integrate .. //depot/projects/vimage-commit/src/sys/rpc/rpc_generic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc_generic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_meter.c#5 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#7 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ==== @@ -40,7 +40,6 @@ */ #include "opt_compat.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_vimage.h" #include "opt_compat.h" #include ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/conf/options#5 (text+ko) ==== @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_vimage.h +VIMAGE opt_global.h ==== //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#4 (text+ko) ==== @@ -32,8 +32,8 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ -#include "opt_vimage.h" #include "opt_inet6.h" +#include "opt_inet.h" #endif #endif #endif /* __FreeBSD__ || __NetBSD__ */ ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if !defined(IPFILTER_LKM) -# include "opt_vimage.h" # include "opt_inet6.h" # include # endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -54,7 +54,6 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) -# include "opt_vimage.h" # include # include #endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 (text+ko) ==== @@ -19,7 +19,6 @@ #if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" -# include "opt_vimage.h" #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) @@ -27,7 +26,6 @@ #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) -# include "opt_vimage.h" #endif #include #if defined(__FreeBSD__) && !defined(__FreeBSD_version) ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 (text+ko) ==== @@ -87,7 +87,6 @@ # include # include # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif # endif ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 (text+ko) ==== @@ -50,7 +50,6 @@ # include # include # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_state.c#4 (text+ko) ==== @@ -45,7 +45,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 (text+ko) ==== @@ -43,7 +43,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#4 (text+ko) ==== @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#5 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#5 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/init_main.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_exit.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_fork.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -11,7 +11,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_linker.c#4 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#5 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_synch.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_thread.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ */ #include "opt_ddb.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#6 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/subr_pcpu.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/sys_socket.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/tty.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include "opt_compat.h" #include "opt_tty.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_socket.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/uipc_usrreq.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/bpf.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/bridgestp.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_bridge.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_clone.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_ef.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_ethersubr.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_faith.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_gif.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_gre.c#5 (text+ko) ==== @@ -51,7 +51,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_loop.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_mib.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_ppp.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_spppsubr.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_stf.c#5 (text+ko) ==== @@ -77,7 +77,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_tap.c#5 (text+ko) ==== @@ -37,7 +37,6 @@ #include "opt_compat.h" #include "opt_inet.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_tun.c#5 (text+ko) ==== @@ -21,7 +21,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/if_vlan.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include "opt_vlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/netisr.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/route.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net/rtsock.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ #include "opt_ddb.h" #include "opt_wlan.h" -#include "opt_vimage.h" #ifdef DDB ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ioctl.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#2 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_iface.c#5 (text+ko) ==== @@ -56,7 +56,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_pipe.c#2 (text+ko) ==== @@ -36,7 +36,6 @@ * both directions can be set separately, except for delay. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_wormhole.c#2 (text+ko) ==== @@ -67,7 +67,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/if_ether.c#5 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/igmp.c#4 (text+ko) ==== @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.104 2008/06/24 13:58:28 gonzo Exp $"); #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in_gif.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#5 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in_proto.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#5 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/ip_carp.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/ip_divert.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fastfwd.c#4 (text+ko) ==== @@ -78,7 +78,6 @@ #include "opt_ipfw.h" #include "opt_ipstealth.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#6 (text+ko) ==== @@ -45,7 +45,6 @@ #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_nat.c#5 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.3 2008/06/01 12:29:23 mav Exp $"); ==== //depot/projects/vimage-commit/src/sys/netinet/ip_fw_pfil.c#4 (text+ko) ==== @@ -36,7 +36,6 @@ #endif /* INET */ #endif /* KLD_MODULE */ #include "opt_inet6.h" -#include "opt_vimage.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 21:44:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C28821065718; Fri, 15 Aug 2008 21:44:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8551F1065712 for ; Fri, 15 Aug 2008 21:44:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 821AF8FC08 for ; Fri, 15 Aug 2008 21:44:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FLihcb064514 for ; Fri, 15 Aug 2008 21:44:43 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FLigdQ064512 for perforce@freebsd.org; Fri, 15 Aug 2008 21:44:42 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 21:44:42 GMT Message-Id: <200808152144.m7FLigdQ064512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 21:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147495 Change 147495 by julian@julian_trafmon1 on 2008/08/15 21:44:14 remove opt_vimage.h as per DES Affected files ... .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#4 edit .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_ef.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_enc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_faith.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_gif.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_gre.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_loop.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_mib.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_stf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net/route.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/rtsock.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/key.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/keysock.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/authunix_prot.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#4 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -40,7 +40,6 @@ */ #include "opt_compat.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_vimage.h" #include "opt_compat.h" #include ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_misc.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_compat.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_socket.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_stat.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/conf/options#3 (text+ko) ==== @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_vimage.h +VIMAGE opt_global.h ==== //depot/projects/vimage-commit3/src/sys/contrib/altq/altq/altq_subr.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ -#include "opt_vimage.h" #include "opt_inet6.h" #endif #endif ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if (__FreeBSD_version >= 800000) -# include "opt_vimage.h" # include "opt_inet6.h" # endif # if (__FreeBSD_version == 400019) @@ -36,7 +35,6 @@ # endif # endif # if (__FreeBSD_version >= 800000) -# include "opt_vimage.h" # include # endif # include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -54,7 +54,6 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) -# include "opt_vimage.h" # include # include #endif ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ==== @@ -63,7 +63,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #else #define V_path_mtu_discovery path_mtu_discovery ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 (text+ko) ==== @@ -59,7 +59,6 @@ # include #endif #if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#2 (text+ko) ==== @@ -105,7 +105,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 (text+ko) ==== @@ -71,7 +71,6 @@ # include #endif #if __FreeBSD_version >= 800000 -# include "opt_vimage.h" # include #endif #include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 (text+ko) ==== @@ -50,7 +50,6 @@ # include # include # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ==== @@ -43,7 +43,6 @@ # include "opt_ipfilter.h" # endif # if (__FreeBSD_version > 800000) -# include "opt_vimage.h" # include # endif #else ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_carp.h" #include "opt_bpf.h" #include "opt_pf.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.36 2007/07/28 07:31:29 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.54 2008/05/09 23:02:55 julian Exp $"); ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_if.c#2 (text+ko) ==== @@ -35,7 +35,6 @@ #if defined(__FreeBSD__) #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $"); ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_ioctl.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $"); ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_pf.h" -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.19 2007/07/03 12:16:07 mlaier Exp $"); ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#2 (text+ko) ==== @@ -63,7 +63,6 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ * */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); ==== //depot/projects/vimage-commit3/src/sys/ddb/db_textdump.c#3 (text+ko) ==== @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $"); #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); ==== //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ * */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#3 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#2 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#2 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#3 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#5 (text+ko) ==== @@ -11,7 +11,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.80 2008/07/07 20:53:49 bz Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_mib.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_poll.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); #include "opt_device_polling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_xxx.c#5 (text+ko) ==== @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.51 2008/07/05 13:10:10 rwatson Exp $"); #include "opt_compat.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit3/src/sys/net/if.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_bridge.c#4 (text+ko) ==== @@ -80,7 +80,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_ef.c#2 (text+ko) ==== @@ -29,7 +29,6 @@ #include "opt_inet.h" #include "opt_ipx.h" #include "opt_ef.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_enc.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_ethersubr.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_faith.c#3 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -33,7 +33,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_gre.c#5 (text+ko) ==== @@ -51,7 +51,6 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_loop.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_mib.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_spppsubr.c#2 (text+ko) ==== @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #endif #ifdef NetBSD1_3 ==== //depot/projects/vimage-commit3/src/sys/net/if_stf.c#3 (text+ko) ==== @@ -76,7 +76,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include "opt_mac.h" #include ==== //depot/projects/vimage-commit3/src/sys/net/if_vlan.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include "opt_vlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/route.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net/rtsock.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include "opt_sctp.h" #include "opt_mpath.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/atm/ng_atm.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); -#include "opt_vimage.h" #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#2 (text+ko) ==== @@ -58,7 +58,6 @@ * from one port to the other only rarely. */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#2 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#2 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_iface.c#4 (text+ko) ==== @@ -56,7 +56,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#2 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#2 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ * Author: Dave Chapeskie */ -#include "opt_vimage.h" #include __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $"); ==== //depot/projects/vimage-commit3/src/sys/netinet/if_ether.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/igmp.c#3 (text+ko) ==== @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.104 2008/06/24 13:58:28 gonzo Exp $"); #include "opt_carp.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); -#include "opt_vimage.h" #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" -#include "opt_vimage.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 15 22:10:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50560106567B; Fri, 15 Aug 2008 22:10:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 135D01065673 for ; Fri, 15 Aug 2008 22:10:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14A5B8FC43 for ; Fri, 15 Aug 2008 22:10:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7FMAIn1068716 for ; Fri, 15 Aug 2008 22:10:18 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7FMAIP0068714 for perforce@freebsd.org; Fri, 15 Aug 2008 22:10:18 GMT (envelope-from julian@freebsd.org) Date: Fri, 15 Aug 2008 22:10:18 GMT Message-Id: <200808152210.m7FMAIP0068714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Aug 2008 22:10:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=147500 Change 147500 by julian@julian_trafmon1 on 2008/08/15 22:09:18 fix a comment as well Affected files ... .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#20 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#20 (text+ko) ==== @@ -144,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_globel.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 00:33:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C2431065675; Sat, 16 Aug 2008 00:33:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FEAA1065672 for ; Sat, 16 Aug 2008 00:33:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26C088FC17 for ; Sat, 16 Aug 2008 00:33:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G0XnHD084538 for ; Sat, 16 Aug 2008 00:33:49 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G0XnuB084536 for perforce@freebsd.org; Sat, 16 Aug 2008 00:33:49 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 Aug 2008 00:33:49 GMT Message-Id: <200808160033.m7G0XnuB084536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 00:33:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147506 Change 147506 by pgj@disznohal on 2008/08/16 00:33:19 Fix mistakes found during review of chapters 3-9 Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#16 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#16 (text+ko) ==== @@ -1470,8 +1470,9 @@ - Milyen állományokat kell letöltenem a - &os; telepítéséhez? + Milyen állományokat kell + letöltenünk a &os; + telepítéséhez? @@ -1648,17 +1649,17 @@ - Jelen pillanatban nincs - egyszerû módja ennek. Minden + Jelen pillanatban ennek nincs + egyszerû módja. Minden egyes kiadáshoz tartoznak - telepítõfloppyk, ezeket - használjuk. + telepítõfloppyk, használjuk + ezeket. - Ha egy módosított kiadás akarunk + Ha egy módosított kiadást akarunk készíteni, kövessük a(z angol - nyelvû) Release - Engineering cikk útmutatásait. + nyelvû) Release Engineering + cikk útmutatásait. @@ -1685,10 +1686,10 @@ - Elõször telepítsük a &windows;-t, + Elõször telepítsük a &windows;t, majd a &os;-t. A &os; boot managere ekkor képes lesz a &windows; és a &os; indítására - is. Vigyázzunk, mert ha a &windows;-t + is. Vigyázzunk, mert ha a &windows;t telepítjük fel másodikként, akkor az minden figyelmeztetés nélkül durván felülírja az aktuális boot @@ -1771,9 +1772,9 @@ Fixit# fdisk -B -b /boot/boot0 eszköz A parancsban az - eszköz annak az - eszköznek a nevét helyettesítsük - be, amelyrõl a rendszert szoktuk indítani, + eszköz helyére + annak az eszköznek a nevét adjuk meg, + amelyrõl a rendszert szoktuk indítani, például ad0 (az elsõ IDE-lemez), ad4 (az elsõ IDE-lemez valamelyik vezérlõn), @@ -1917,11 +1918,11 @@ A megszokott módon telepítsük a - &os;-t a ThinkPadre. Ilyenkor NE + &os;-t a ThinkPadre. Ilyenkor ne használjuk a Veszélyesen dedikált (Dangerously Dedicated) módot. A telepítés - befejezése után NE + befejezése után ne indítsuk újra a gépet. @@ -1997,7 +1998,7 @@ hamarosan tönkremegy (a meghajtó belsõ átképezõ funkciói már képesek megbirkózni a rossz szektorok - növekvõ számával, amire arra enged + növekvõ számával, ami arra enged következtetni, hogy a lemez felülete jelentõs mértékben sérült). Ezért inkább egy új merevlemezes meghajtó @@ -2148,7 +2149,7 @@ megemlítenénk, hogy egy SCSI-lemez fizikai geometriája ebben az esetben teljesen lényegtelen, mivel a &os; - lemezblokkban gondolkozik. Igazából nem + lemezblokkokban gondolkozik. Igazából nem létezik a fizikai geometria fogalma, ugyanis a szektorok sûrûsége a lemezen felületén belül sem állandó. @@ -2185,15 +2186,16 @@ támogatását (extended translation support, amelyet gyakran csak úgy neveznek, hogy Support for DOS disks >1GB vagy ehhez - hasonló módon). Ha ezt letiltottuk, akkor + hasonlóan). Ha ezt letiltottuk, akkor használjuk az N cilinder, - 64 fej és 32 szektor sávonkénti - felírást, ahol N a - lemez MB-okban számított mérete. - Így például egy 2 GB - méretû lemez geometriai - beállítása 2048 cilinder, 64 fej - és 32 szektor sávonként. + 64 fej és 32 szektor + sávonkénti felírást, ahol + N a lemez MB-okban + számított mérete. Így + például egy 2 GB méretû lemez + geometriai beállítása + 2048 cilinder, 64 fej és 32 szektor + sávonként. Ha viszont engedélyeztük (ami gyakran @@ -2207,8 +2209,8 @@ kapacitása osztva 7,844238-al (!). Tehát az iménti példában is említett 2 GB-os meghajtó esetében 261 cilindert, - 255 fejet és 63 szektort kapunk - sávonként. + 255 fejet és sávonként 63 szektort + kapunk. Ha nem lennénk benne biztosak, vagy a &os;-nek a telepítés közben nem sikerül @@ -2278,18 +2280,17 @@ többi disk managert nem támogatja. Ha egyedül csak a &os;-t akarjuk használni, - akkor nincs szükségünk disk manager - használatára. Egyszerûen csak - állítsunk be egy akkora méretû - lemezt, amivel a BIOS képes még - megbirkózni (a határ általában - 504 MB) és majd a &os; kideríti, hogy - valójában mennyi hely áll a - rendelkezésére. Ha régebbi - gyártmányú merevlemezünk van - MFM-vezérlõvel, akkor a &os;-nek - konkrétan meg kell mondanunk, hogy mennyi cilindert - használhat. + akkor nincs szükségünk disk managerre. + Egyszerûen csak állítsunk be egy akkora + méretû lemezt, amivel a BIOS képes + még megbirkózni (a határ + általában 504 MB) és majd a &os; + kideríti, hogy valójában mennyi hely + áll a rendelkezésére. Ha + régebbi gyártmányú + merevlemezünk van MFM-vezérlõvel, akkor a + &os;-nek konkrétan meg kell mondanunk, hogy mennyi + cilindert használhat. Ha a &os; mellett más operációs rendszereket akarunk használni, akkor ezt disk manager @@ -2476,7 +2477,7 @@ A rendszerindító lemez elõször elindul, de aztán miért akad meg a - Probing Devices... + Probing Devices... képernyõn? @@ -2650,7 +2651,7 @@ 4 KB - > 4 TB + > 4 GB 4 TB - 1 @@ -3325,7 +3326,7 @@ Ha az USB billentyûzetet konzolban akarjuk használni, akkor erre figyelmeztetnünk kell a konzolos meghajtót. Ezt úgy tudjuk megtenni, - ha a következõ parancsot lefuttatja a rendszer + ha a következõ parancsot lefuttatjuk a rendszer indítása közben: &prompt.root; kbdcontrol -k /dev/kbd1 < /dev/console > /dev/null @@ -3425,9 +3426,9 @@ Az PS/2 egereket alapból támogatjuk. Az - ehhez szükséges meghajtó - psm meghajtó - megtalálható a rendszermagban. + ehhez szükséges psm + meghajtó megtalálható a + rendszermagban. Ha a saját magunk által összeállított rendszermagunk nem @@ -3580,8 +3581,9 @@ - A Delete billentyû hogyan használható - a sh és csh + A Delete billentyû hogyan + használható a sh és + csh parancsértelmezõkben? @@ -3595,7 +3597,7 @@ bind ^[[3~ ed-delete-next-char # az xtermhez A C Shell esetében a - következõ soronak kell az + következõ soroknak kell az .cshrc állományba kerülnie. Lásd &man.csh.1;. @@ -3639,7 +3641,7 @@ A &os; különbözõ kiegészítõ szoftvereken keresztül - több szoftveres modemet is támogat. Az + több szoftveres modemet is támogat. A comms/ltmdm port például a szélesebb körben elterjedt Lucent LT chipsetes modemekhez ad @@ -3972,7 +3974,7 @@ A hibás szektorok átképezéséhez az eszköz elsõ lapmódját kell átírnunk, - amelyet root + amelyet (root felhasználóként) így tehetünk meg: @@ -4208,10 +4210,13 @@ buildworld parancsot, akkor a fordítás ugyanazon a helyen újból meghiúsul — - frissítsük a forrásainkat és - próbáljuk meg ismét. Ha a - fordítás megint elakad, akkor szinte biztos, - hogy hardverhibával akadtunk össze. + valószínûleg hibás a + forráskód, frissítsük a + forrásainkat és próbáljuk meg + ismét. Ha viszont a fordítás ilyenkor + már egy másik helyen akad el, akkor szinte + biztos, hogy hardverhibával akadtunk + össze. Amit ilyenkor tenni tudunk: @@ -4337,7 +4342,7 @@ egy hibajelentést. A problémáról minden - részletre kiterjedõ módon a A SIG11-es probléma GYIK-ja írásban olvashatunk (angolul). @@ -4385,7 +4390,7 @@ Ez az ATI Mach 64 videokártyák esetében jelentkezõ probléma. Ilyenkor az - a gond, hogy a kártya a 2e8 + a gond, hogy a kártya a 0x2e8 címet használja, akárcsak a negyedik soros port. A &man.sio.4; meghajtóban levõ hiba (vagy netalán beállítás?) miatt @@ -4615,7 +4620,7 @@ kern.maxproc új értékénél eggyel kisebbre. (Ezért kell így csinálni, mert egy - rendszerprogram, a &man.init.8; mindig fut.) + rendszerprogram, az &man.init.8; mindig fut.) A sysctl változók beállításait úgy is tudjuk @@ -4696,8 +4701,8 @@ megfelelõ kábeldetektáló eszköz nélkül a meghajtó gyakran rosszul állapítja meg a - lezárást, ami pedig egy veszélyezteti a - SCSI busz + lezárást, ami pedig így + veszélyezteti a SCSI busz megbízhatóságát. @@ -4737,7 +4742,7 @@ Mikor bejelentkezünk a távoli gépre, állítsuk a TERM - környezeti változót a + környezeti változót az ansi vagy sco értékre, amibõl kiderül, hogy egyáltalán ismeri ezeket a @@ -4917,7 +4922,7 @@ subclass = audio Ebbõl a chip - változót, vagy is a + változót, vagyis a 0x24158086 értéket kell felhasználnunk. @@ -5045,7 +5050,7 @@ szerver, köztük a &os;-ben is megtalálható Telnet és SSH szerver is ezt - csinálja, többek közt azért, hogy el + csinálja, többek közt azért, hogy a rendszergazda számára el tudja tárolni egy naplóban ezt a hálózati nevet. @@ -5140,7 +5145,7 @@ Elviseljük ezeket a figyelmeztetéseket. Megszakítási - kérésenként az elsõ 5 öt + kérésenként az elsõ öt üzenet után amúgy sem jelez többet a rendszer. @@ -5376,11 +5381,10 @@ sávonkénti szektorok számát. Ide perjelekkel elválasztva gépeljük e a BIOS-ban talált értékeket. - Például, ha a merevlemez geometriája - 5000 cilinder, 250 fej és 60 szektor - sávonként, akkor a - 5000/250/60 értéket - kell megadnunk. + Például ha a merevlemez geometriája + 5000 cilinder, 250 fej és sávonként 60 + szektor, akkor a 5000/250/60 + értéket kell megadnunk. Az Enter billentyû lenyomására ezek az értékek @@ -5886,8 +5890,7 @@ található Packages menüpontban tudjuk telepíteni, vagy meghívjuk meg a &man.pkg.add.1; parancsot. A - csomagok leginkább a .tgz - és .tbz + csomagokat leginkább .tbz kiterjesztésükrõl lehet megismerni, valamint a telepítõ CD-ken a packages/All @@ -5941,8 +5944,9 @@ - Hogyan tudom beállítani az INN (Internet - News) szolgáltatást a gépemen? + Hogyan tudjuk beállítani az INN (Internet + News) szolgáltatást a + gépünkön? @@ -5971,7 +5975,7 @@ - Miért nem fordul le egy port a + Miért nem fordul egy port a 6.X-STABLE vagy a 7.X-STABLE változatot futtató gépeken? @@ -6223,11 +6227,11 @@ rosszul mûködik a rendszerünkön. A &netscape; és az Opera is ellenõrzi a - névoldást az indulásakor. Ezért - a böngészõ egészen addig nem jelenik - meg az asztalon, amíg választ nem kap vagy - rá nem jön, hogy nincs aktív - hálózati kapcsolat. + névfeloldást az indulásakor. + Ezért a böngészõ egészen + addig nem jelenik meg az asztalon, amíg + választ nem kap vagy rá nem jön, hogy + nincs aktív hálózati kapcsolat. @@ -6343,7 +6347,7 @@ rendszerünkben nincs matematikai társprocesszor. Az npx0 eszköz jelenléte azonban - KÖTELEZÕ. Valahol a + kötelezõ. Valahol a gépünkben lennie kell olyan eszköznek, amely a lebegõpontos számok hardveres kezelését végzi, annak ellenére, @@ -6649,7 +6653,7 @@ dolgok (például a /dev könyvtárban található eszközleírók, az - állományjelzõk és a linkek, stb.) + állományjelzõk és a linkek stb.) hajlamosak elromlani. Ezért ehhez olyan eszközökre lesz szükségünk, amelyek ismerik ezeket a dolgokat, mint @@ -6895,15 +6899,15 @@ már remekül elboldogul. Miután sikerült egyeztetnünk a BIOS - és a &os; geometriai beállításait, - szinte biztos, hogy nem kell már emiatt - aggódnunk, így a veszélyesen - dedikált módra sincs - szükségünk. Ha viszont mégis egy - read error hibaüzenetet - kapnánk a rendszer indítása - közben, akkor tegyünk egy próbát - és próbáljuk ki. Semmit sem + és a &os; geometriai + beállításait, szinte biztos, hogy nem + kell már emiatt aggódnunk, így a + veszélyesen dedikált + módra sincs szükségünk. Ha viszont + mégis egy read error + hibaüzenetet kapnánk a rendszer + indítása közben, akkor tegyünk egy + próbát. Semmit sem veszíthetünk. Ha a veszélyesen dedikált @@ -7057,7 +7061,7 @@ ccdconfig: ioctl (CCDIOCSET): /dev/ccd0c: Inappropriate file type or format Ez általában olyankor - történik, amikor c + történik, amikor olyan c partíciókat próbálunk meg összefûzni, amelyek alapértelmezés szerint unused (nem @@ -7318,7 +7322,7 @@ partíciós táblában aktívként jelöli meg (ezzel lényegében megjegyzi), majd ezután - beírja magát az MBR-be. Emiatt hogy ha csak + beírja magát az MBR-be. Emiatt, hogy ha csak egyszerûen átmásoljuk a /boot/boot0 állományt a C:\BOOTSECT.BSD @@ -7601,7 +7605,7 @@ Miért ad a rendszer Device not - configured hibaüzenete CD-k + configured hibaüzenetet CD-k csatlakoztatásakor? @@ -7809,7 +7813,7 @@ Most már mindegyik felhasználó - képes csatlakoztatni az + képes csatlakoztatni a /dev/fd0 eszközleírón keresztül elérhetõ lemezt a saját @@ -7885,12 +7889,12 @@ viszont az állomány azonnal eltûnik a könyvtárból. Ezt nagyon könnyen ki is tudjuk próbálni egy olyan programmal, mint - mondjuk a more. Tegyük fel, hogy - van akkora állományunk, amely elég nagy - ahhoz, hogy feltûnjön a du - és a df kimenetében. - (Mivel manapság már nagyok a - tárolóeszközök, ennek egy + például a more. + Tegyük fel, hogy van akkora állományunk, + amely elég nagy ahhoz, hogy feltûnjön a + du és a df + kimenetében. (Mivel manapság már + nagyok a tárolóeszközök, ennek egy igen nagy állománynak kell lennie!) Ha letöröljük ezt az állományt, miközben a @@ -15085,7 +15089,7 @@ újabb számjegyet. Egészen addig csináljuk, amíg nem kapunk valami értékelhetõ eredményt. - Ilyennek tekintjük mondjuk azokat a + Ilyennek tekintjük például azokat a függvényeket, amelyek a hibát okozhatták. Ez ugyan egy nem annyira pontos felderítési eszköz, viszont From owner-p4-projects@FreeBSD.ORG Sat Aug 16 04:27:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 631B01065676; Sat, 16 Aug 2008 04:27:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 191401065675 for ; Sat, 16 Aug 2008 04:27:47 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A5EB8FC17 for ; Sat, 16 Aug 2008 04:27:47 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G4RkKE017402 for ; Sat, 16 Aug 2008 04:27:46 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G4RkAa017400 for perforce@freebsd.org; Sat, 16 Aug 2008 04:27:46 GMT (envelope-from rfrench@FreeBSD.org) Date: Sat, 16 Aug 2008 04:27:46 GMT Message-Id: <200808160427.m7G4RkAa017400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 147507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 04:27:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=147507 Change 147507 by rfrench@rfrench_mpls on 2008/08/16 04:27:26 Pretty much too many changes to list. I have been working very hard on trying to get sending and receiving working before the end of the summer of code on Monday, but it still isnt quite working. Affected files ... .. //depot/projects/soc2008/rfrench_mpls/mpls-needle/readme.txt#1 add .. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#4 edit .. //depot/projects/soc2008/rfrench_mpls/net/netisr.h#3 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#3 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#3 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#3 edit .. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#3 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#4 (text+ko) ==== @@ -832,9 +832,9 @@ } /* XXX handling for simplex devices in case of M/BCAST ?? */ if (m->m_flags && (M_BCAST | M_MCAST)) - etype = htons(ETHERTYPE_MPLS_MCAST); + isr = NETISR_MPLS_MCAST; else - etype = htons(ETHERTYPE_MPLS); + isr = NETISR_MPLS; break; #endif /* MPLS */ default: ==== //depot/projects/soc2008/rfrench_mpls/net/netisr.h#3 (text+ko) ==== @@ -51,6 +51,7 @@ #define NETISR_POLL 0 /* polling callback, must be first */ #define NETISR_IP 2 /* same as AF_INET */ #define NETISR_MPLS 4 /* mpls packet */ +#define NETISR_MPLS_MCAST /* mpls multicase packet */ #define NETISR_ROUTE 14 /* routing socket */ #define NETISR_AARP 15 /* Appletalk ARP */ #define NETISR_ATALK2 16 /* Appletalk phase 2 */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#3 (text+ko) ==== @@ -92,11 +92,11 @@ u_int16_t smpls_out_ifindex; u_int16_t smpls_in_ifindex; u_int32_t smpls_in_label; /* MPLS label 20 bits*/ -#if MPLS_MCAST - u_int8_t smpls_mcexp; - u_int8_t smpls_pad2[2]; - u_int32_t smpls_mclabel; -#endif +//#if MPLS_MCAST +// u_int8_t smpls_mcexp; +// u_int8_t smpls_pad2[2]; +// u_int32_t smpls_mclabel; +//#endif }; #define MPLS_OP_POP 1 @@ -112,9 +112,9 @@ * Names for MPLS sysctl objects */ #define MPLSCTL_ENABLE 1 -#define MPLSCTL_DEFTTL 2 +#define MPLSCTL_DEFTTL 2 #define MPLSCTL_IFQUEUE 3 -#define MPLSCTL_MAXINKLOOP 4 +#define MPLSCTL_MAXINKLOOP 4 #define MPLSCTL_MAXID 5 #define MPLSCTL_NAMES { \ @@ -152,8 +152,7 @@ void mpe_input(struct mbuf *, struct ifnet *, struct sockaddr_mpls *, u_int32_t); -extern int mpls_raw_usrreq(struct socket *, int, struct mbuf *, - struct mbuf *, struct mbuf *, struct proc *); +// extern struct pr_usrreqs mpls_raw_usrreq; extern struct ifqueue mplsintrq; /* MPLS input queue */ extern int mplsqmaxlen; /* MPLS input queue length */ ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#3 (text+ko) ==== @@ -15,8 +15,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "mpe.h" - #include #include #include @@ -24,6 +22,7 @@ #include #include +#include #include #include @@ -41,6 +40,8 @@ mpls_init(void) { mplsintrq.ifq_maxlen = mplsqmaxlen; + netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, 0); + printf("mpls initialised"); } void @@ -68,7 +69,7 @@ mpls_input(struct mbuf *m) { struct ifnet *ifp = m->m_pkthdr.rcvif; - struct sockaddr_mpls *smpls; + struct sockaddr_mpls *smpls = NULL; struct sockaddr_mpls sa_mpls; struct shim_hdr *shim; struct rtentry *rt = NULL; @@ -115,7 +116,7 @@ for (i = 0; i < mpls_inkloop; i++) { bzero(&sa_mpls, sizeof(sa_mpls)); smpls = &sa_mpls; - smpls->smpls_family = AF_MPLS; + smpls->smpls_family = NETISR_MPLS; smpls->smpls_len = sizeof(*smpls); smpls->smpls_in_ifindex = ifp->if_index; smpls->smpls_in_label = shim->shim_label & MPLS_LABEL_MASK; @@ -156,12 +157,12 @@ hasbos = MPLS_BOS_ISSET(shim->shim_label); m = mpls_shim_pop(m); if (hasbos) { -#if NMPE > 0 - if (rt->rt_ifp->if_type == IFT_MPLS) { - mpe_input(m, rt->rt_ifp, smpls, ttl); - goto done; - } -#endif +// #if NMPE > 0 +// if (rt->rt_ifp->if_type == IFT_MPLS) { +// mpe_input(m, rt->rt_ifp, smpls, ttl); +// goto done; +// } +// #endif /* last label but we have no clue so drop */ m_freem(m); goto done; ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#3 (text+ko) ==== @@ -27,15 +27,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include #include +#include #include +#include #include -#include -#include +#include +#include #include #include +#include #include @@ -43,29 +48,35 @@ * MPLS protocol family: */ -extern struct domain mplsdomain; +extern struct domain mplsdomain; +extern struct pr_usrreqs mpls_raw_usrreq; struct protosw mplssw[] = { -{ 0, &mplsdomain, 0, 0, - 0, 0, 0, 0, - 0, - mpls_init, 0, 0, 0, mpls_sysctl -}, -{ SOCK_DGRAM, &mplsdomain, 0, PR_ATOMIC|PR_ADDR, - 0, 0, 0, 0, - mpls_raw_usrreq, - 0, 0, 0, 0, mpls_sysctl, -}, + { + .pr_type = 0, + .pr_domain = &mplsdomain, + .pr_init = mpls_init/*, + .pr_sysctl = mpls_sysctl*/ + }, + { + .pr_type = SOCK_DGRAM, + .pr_domain = &mplsdomain, + .pr_flags = PR_ATOMIC | PR_ADDR, + .pr_usrreqs = &mpls_raw_usrreq/*, + .pr_sysctl = mpls_sysctl*/ + }, /* raw wildcard */ -{ SOCK_RAW, &mplsdomain, 0, PR_ATOMIC|PR_ADDR, - 0, 0, 0, 0, - mpls_raw_usrreq, - 0, 0, 0, 0, mpls_sysctl, -}, + { + .pr_type = SOCK_RAW, + .pr_domain = &mplsdomain, + .pr_flags = PR_ATOMIC | PR_ADDR, + .pr_usrreqs = &mpls_raw_usrreq/*, + .pr_sysctl = mpls_sysctl*/ + }, }; struct domain mplsdomain = { - AF_MPLS, "mpls", mpls_init, 0, 0, + NETISR_MPLS, "mpls", mpls_init, 0, 0, mplssw, &mplssw[sizeof(mplssw)/sizeof(mplssw[0])], 0, rn_inithead, ==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#3 (text+ko) ==== @@ -62,7 +62,8 @@ int *mplsctl_vars[MPLSCTL_MAXID] = MPLSCTL_VARS; -int mpls_control(struct socket *, u_long, caddr_t, struct ifnet *); +int mpls_control(struct socket *, u_long, caddr_t, struct ifnet *, struct thread *); +static int mpls_attach(struct socket *); /* * Generic MPLS control operations (ioctl's). @@ -70,76 +71,109 @@ */ /* ARGSUSED */ int -mpls_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) +mpls_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *mthread) { return (EOPNOTSUPP); } -int -mpls_raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, - struct mbuf *control, struct proc *p) +static int +mpls_attach(struct socket *so) { - int error = 0; - -#ifdef MPLS_DEBUG - printf("mpls_raw_usrreq: called! (reqid=%d).\n", req); -#endif /* MPLS_DEBUG */ - - if (req == PRU_CONTROL) - return (mpls_control(so, (u_long)m, (caddr_t)nam, - (struct ifnet *)control)); - - switch (req) { - case PRU_ATTACH: - if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { - error = soreserve(so, mpls_raw_sendspace, - mpls_raw_recvspace); - if (error) - break; - } - break; - - case PRU_DETACH: - case PRU_BIND: - case PRU_LISTEN: - case PRU_CONNECT: - case PRU_CONNECT2: - case PRU_DISCONNECT: - case PRU_SHUTDOWN: - case PRU_RCVD: - case PRU_SEND: - case PRU_SENSE: - case PRU_RCVOOB: - case PRU_SENDOOB: - case PRU_SOCKADDR: - case PRU_PEERADDR: - error = EOPNOTSUPP; - break; - - default: - panic("rip_usrreq"); - } - - return (error); + int error = 0; + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, mpls_raw_sendspace, mpls_raw_recvspace); + return error; + } + else return EOPNOTSUPP; } -int -mpls_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, - size_t newlen) -{ - if (name[0] >= MPLSCTL_MAXID) - return EOPNOTSUPP; +struct +pr_usrreqs mpls_raw_usrreq = { + .pru_accept = pru_accept_notsupp, + .pru_attach = mpls_attach, + .pru_bind = pru_bind_notsupp, + .pru_connect = pru_connect_notsupp, + .pru_connect2 = pru_connect2_notsupp, + .pru_control = mpls_control, + .pru_disconnect = pru_disconnect_notsupp, + .pru_listen = pru_listen_notsupp, + .pru_peeraddr = pru_peeraddr_notsupp, + .pru_rcvd = pru_rcvd_notsupp, + .pru_rcvoob = pru_rcvoob_notsupp, + .pru_send = pru_send_notsupp, + .pru_sense = pru_sense_null, + .pru_shutdown = pru_shutdown_notsupp, + .pru_sockaddr = pru_sockaddr_notsupp, + .pru_sosend = pru_sosend_notsupp, + .pru_soreceive = pru_soreceive_notsupp, + .pru_sopoll = pru_sopoll_notsupp +}; - /* Almost all sysctl names at this level are terminal. */ - if (namelen != 1 && name[0] != MPLSCTL_IFQUEUE) - return (ENOTDIR); +// int +// mpls_raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, +// struct mbuf *control, struct proc *p) +// { +// int error = 0; +// +// #ifdef MPLS_DEBUG +// printf("mpls_raw_usrreq: called! (reqid=%d).\n", req); +// #endif /* MPLS_DEBUG */ +// +// if (req == PRU_CONTROL) +// return (mpls_control(so, (u_long)m, (caddr_t)nam, +// (struct ifnet *)control)); +// +// switch (req) { +// case PRU_ATTACH: +// if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { +// error = soreserve(so, mpls_raw_sendspace, +// mpls_raw_recvspace); +// if (error) +// break; +// } +// break; +// +// case PRU_DETACH: +// case PRU_BIND: +// case PRU_LISTEN: +// case PRU_CONNECT: +// case PRU_CONNECT2: +// case PRU_DISCONNECT: +// case PRU_SHUTDOWN: +// case PRU_RCVD: +// case PRU_SEND: +// case PRU_SENSE: +// case PRU_RCVOOB: +// case PRU_SENDOOB: +// case PRU_SOCKADDR: +// case PRU_PEERADDR: +// error = EOPNOTSUPP; +// break; +// +// default: +// panic("rip_usrreq"); +// } +// +// return (error); +// } - switch (name[0]) { - case MPLSCTL_IFQUEUE: - return (sysctl_ifq(name + 1, namelen - 1, - oldp, oldlenp, newp, newlen, &mplsintrq)); - default: - return sysctl_int_arr(mplsctl_vars, name, namelen, - oldp, oldlenp, newp, newlen); - } -} +// int +// mpls_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, +// size_t newlen) +// { +// if (name[0] >= MPLSCTL_MAXID) +// return EOPNOTSUPP; +// +// /* Almost all sysctl names at this level are terminal. */ +// if (namelen != 1 && name[0] != MPLSCTL_IFQUEUE) +// return (ENOTDIR); +// +// switch (name[0]) { +// case MPLSCTL_IFQUEUE: +// return (sysctl_ifq(name + 1, namelen - 1, +// oldp, oldlenp, newp, newlen, &mplsintrq)); +// default: +// return sysctl_int_arr(mplsctl_vars, name, namelen, +// oldp, oldlenp, newp, newlen); +// } +// } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 04:41:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF2221065677; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B038106564A for ; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C6A28FC0A for ; Sat, 16 Aug 2008 04:41:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G4f0TF018466 for ; Sat, 16 Aug 2008 04:41:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G4f0gp018464 for perforce@freebsd.org; Sat, 16 Aug 2008 04:41:00 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 04:41:00 GMT Message-Id: <200808160441.m7G4f0gp018464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 04:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147508 Change 147508 by julian@julian_trafmon1 on 2008/08/16 04:40:06 remove opt_vimage from teh same file in 4 branches I wonder how this will work :-) Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 edit .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 edit .. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -144,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" -#include "opt_vimage.h" #include #include #include @@ -145,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" -#include "opt_vimage.h" #include #include #include @@ -145,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -144,8 +144,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_vimage.h - * XXX opt_vimage.h not yet present, more framework to come. + * depending on whether VIMAGE is defined in opt_global.h * XXX so will always evaluate to the global for now (VIMAGE not defined) */ /* first define modules that supply us information */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 08:14:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 046101065677; Sat, 16 Aug 2008 08:14:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC82E106566C for ; Sat, 16 Aug 2008 08:14:36 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B13848FC12 for ; Sat, 16 Aug 2008 08:14:36 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G8EaZY061678 for ; Sat, 16 Aug 2008 08:14:36 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G8EaJh061676 for perforce@freebsd.org; Sat, 16 Aug 2008 08:14:36 GMT (envelope-from mayur@FreeBSD.org) Date: Sat, 16 Aug 2008 08:14:36 GMT Message-Id: <200808160814.m7G8EaJh061676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 147510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 08:14:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=147510 Change 147510 by mayur@mayur_freebsd_vm on 2008/08/16 08:14:23 Performance benchmarking. Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#2 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.c#2 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#3 (text+ko) ==== @@ -205,7 +205,7 @@ slot = get_slot(index,rtree,level); if (tmp->rn_children[slot] != NULL) - printf("radix_tree_insert: value already present in the tree\n"); + if(0) printf("radix_tree_insert: value already present in the tree\n"); else tmp->rn_children_count++; /*we will overwrite the old value with the new value*/ @@ -233,7 +233,7 @@ slot = get_slot(index,rtree,level); if (level == 0){ if (tmp->rn_children[slot] == NULL) - printf("radix_tree_lookup: index %d not present\n" + if(0)printf("radix_tree_lookup: index %d not present\n" ,index); return tmp->rn_children[slot]; ==== //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#2 (text+ko) ==== @@ -6,6 +6,7 @@ #include "radix_tree.h" #define N 0xffff +#define X 0xfff extern int main(void) @@ -13,10 +14,70 @@ unsigned long long splay, radix; struct radix_tree *rtree; int i,j; - int vals[N]; + int vals[N], lookups[N],inserts[N],removes[N]; + unsigned long long t_start, t_end; rtree = create_radix_tree(4); - splay_insert(10); - splay_lookup(10); + for(i = 0; i < N; i++){ + vals[i] = random(); + /* about 50% are hits*/ + lookups[i] = ( i % 2 ? vals[i] : random()); + inserts[i] = random(); + } + + for(i = 0; i < X; i++){ + j = random(); + splay_insert(j); + radix_tree_insert(j, rtree, &i); + } + printf("Measuring time for %d lookup operations on radix tree with" + " %d elements\n", N, X); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + radix_tree_lookup(lookups[i],rtree); + } + t_end = rdtsc(); + printf("TSC difference after lookups: %lld\n", (t_end - t_start)); + printf("\n\n\nMeasuring time for %d lookup operations on splay tree with" + " %d elements\n", N, X); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + splay_lookup(lookups[i]); + } + t_end = rdtsc(); + printf("TSC difference after lookups: %lld\n", (t_end - t_start)); + + printf("\n\n\nMeasuring time for %d inserts on radix tree with" + " %d elements\n", N, X); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + radix_tree_insert(inserts[i],rtree,&inserts[i]); + } + t_end = rdtsc(); + printf("TSC difference after inserts: %lld\n", (t_end - t_start)); + printf("Measuring time for %d inserts on splay tree with" + "%d elements\n", N, X); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + splay_insert(inserts[i]); + } + t_end = rdtsc(); + printf("TSC difference after inserts: %lld\n", (t_end - t_start)); + + + printf("\n\n\nMeasuring time for %d removes on radix tree\n", N); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + radix_tree_remove(inserts[i],rtree); + } + t_end = rdtsc(); + printf("TSC difference after removes: %lld\n", (t_end - t_start)); + printf("Measuring time for %d removes on splay tree\n", N); + t_start = rdtsc(); + for(i = 0; i < N; i++){ + splay_remove(inserts[i]); + } + t_end = rdtsc(); + printf("TSC difference after removes: %lld\n", (t_end - t_start)); } ==== //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.c#2 (text+ko) ==== @@ -38,14 +38,8 @@ unsigned long long splay_lookup(int pindex) { struct stidx *t = (struct stidx *)malloc(sizeof(struct stidx)); - struct stidx *p = NULL; unsigned long long start, end; t->pindex = pindex; - start = rdtsc(); - p = SPLAY_FIND(splay_tree, &stree, t); - end = rdtsc(); - if(p == NULL){ - printf("Bug!\n"); - } + SPLAY_FIND(splay_tree, &stree, t); } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 08:21:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC6F21065693; Sat, 16 Aug 2008 08:21:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 726B9106568F for ; Sat, 16 Aug 2008 08:21:44 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6750D8FC13 for ; Sat, 16 Aug 2008 08:21:44 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G8Liim062312 for ; Sat, 16 Aug 2008 08:21:44 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G8LhpL062310 for perforce@freebsd.org; Sat, 16 Aug 2008 08:21:43 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 08:21:43 GMT Message-Id: <200808160821.m7G8LhpL062310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 08:21:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=147511 Change 147511 by zec@zec_tpx32 on 2008/08/16 08:21:37 Unbreax cxgb build, the joys of option VIMAGE landing in opt_global.h (but it went much smoother than I anticipated!) Affected files ... .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 edit .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 edit Differences ... ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 (text+ko) ==== @@ -53,7 +53,9 @@ #include #include #include +#include +#include #include #include @@ -237,9 +239,12 @@ /* Register existing TOE interfaces by walking the ifnet chain */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + VNET_ITERLOOP_BEGIN(); + INIT_VNET_NET(curvnet); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { (void)ifaddr_event_handler(NULL, ifp); } + VNET_ITERLOOP_END(); IFNET_RUNLOCK(); return 0; } ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 (text+ko) ==== @@ -48,10 +48,12 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -262,6 +264,7 @@ static inline void make_tx_data_wr(struct socket *so, struct mbuf *m, int len, struct mbuf *tail) { + INIT_VNET_INET(so->so_vnet); struct tcpcb *tp = so_sototcpcb(so); struct toepcb *toep = tp->t_toe; struct tx_data_wr *req; @@ -289,8 +292,8 @@ /* Sendbuffer is in units of 32KB. */ - if (tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) - req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15)); + if (V_tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) + req->param |= htonl(V_TX_SNDBUF(V_tcp_autosndbuf_max >> 15)); else { req->param |= htonl(V_TX_SNDBUF(snd->sb_hiwat >> 15)); } @@ -1223,6 +1226,7 @@ static unsigned long select_rcv_wnd(struct toedev *dev, struct socket *so) { + INIT_VNET_INET(so->so_vnet); struct tom_data *d = TOM_DATA(dev); unsigned int wnd; unsigned int max_rcv_wnd; @@ -1230,8 +1234,8 @@ rcv = so_sockbuf_rcv(so); - if (tcp_do_autorcvbuf) - wnd = tcp_autorcvbuf_max; + if (V_tcp_do_autorcvbuf) + wnd = V_tcp_autorcvbuf_max; else wnd = rcv->sb_hiwat; @@ -3768,6 +3772,7 @@ static void socket_act_establish(struct socket *so, struct mbuf *m) { + INIT_VNET_INET(so->so_vnet); struct cpl_act_establish *req = cplhdr(m); u32 rcv_isn = ntohl(req->rcv_isn); /* real RCV_ISN + 1 */ struct tcpcb *tp = so_sototcpcb(so); @@ -3817,7 +3822,7 @@ #endif toep->tp_state = tp->t_state; - tcpstat.tcps_connects++; + V_tcpstat.tcps_connects++; } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 08:23:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC5EC1065672; Sat, 16 Aug 2008 08:23:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FA2C106567F for ; Sat, 16 Aug 2008 08:23:46 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9484F8FC08 for ; Sat, 16 Aug 2008 08:23:46 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G8Nk5a062459 for ; Sat, 16 Aug 2008 08:23:46 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G8Nkj8062457 for perforce@freebsd.org; Sat, 16 Aug 2008 08:23:46 GMT (envelope-from mayur@FreeBSD.org) Date: Sat, 16 Aug 2008 08:23:46 GMT Message-Id: <200808160823.m7G8Nkj8062457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 147512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 08:23:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=147512 Change 147512 by mayur@mayur_freebsd_vm on 2008/08/16 08:22:52 minor change to ignore malloc time in splay_insert Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#3 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.c#3 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ struct radix_tree *rtree; int i,j; int vals[N], lookups[N],inserts[N],removes[N]; - unsigned long long t_start, t_end; + unsigned long long t_start, t_end,t; rtree = create_radix_tree(4); for(i = 0; i < N; i++){ @@ -57,12 +57,11 @@ printf("TSC difference after inserts: %lld\n", (t_end - t_start)); printf("Measuring time for %d inserts on splay tree with" "%d elements\n", N, X); - t_start = rdtsc(); + t = 0; for(i = 0; i < N; i++){ - splay_insert(inserts[i]); + t += splay_insert(inserts[i]); } - t_end = rdtsc(); - printf("TSC difference after inserts: %lld\n", (t_end - t_start)); + printf("TSC difference after inserts: %lld\n", (t)); printf("\n\n\nMeasuring time for %d removes on radix tree\n", N); ==== //depot/projects/soc2008/mayur_vmalgo/uspace/splay_tree.c#3 (text+ko) ==== @@ -41,5 +41,8 @@ unsigned long long start, end; t->pindex = pindex; + start = rdtsc(); SPLAY_FIND(splay_tree, &stree, t); + end = rdtsc(); + return (end - start); } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 09:24:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C28F1065699; Sat, 16 Aug 2008 09:24:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACFA0106567D for ; Sat, 16 Aug 2008 09:24:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FDAB8FC19 for ; Sat, 16 Aug 2008 09:24:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G9OmLK080540 for ; Sat, 16 Aug 2008 09:24:48 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G9OmsN080538 for perforce@freebsd.org; Sat, 16 Aug 2008 09:24:48 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 09:24:48 GMT Message-Id: <200808160924.m7G9OmsN080538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 09:24:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147514 Change 147514 by zec@zec_tpx32 on 2008/08/16 09:24:39 Fix more breakage following the opt_vimage.h -> opt_global.h change. Affected files ... .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#5 edit Differences ... ==== //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -63,7 +64,7 @@ vhdr->config_length = GV_CFG_LEN; mtx_lock(&hostname_mtx); - bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); + bcopy(G_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); mtx_unlock(&hostname_mtx); strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); microtime(&vhdr->label.date_of_birth); From owner-p4-projects@FreeBSD.ORG Sat Aug 16 09:42:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFE86106567E; Sat, 16 Aug 2008 09:42:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B396A1065674 for ; Sat, 16 Aug 2008 09:42:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B7CE8FC18 for ; Sat, 16 Aug 2008 09:42:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7G9g69Q082104 for ; Sat, 16 Aug 2008 09:42:06 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7G9g62E082102 for perforce@freebsd.org; Sat, 16 Aug 2008 09:42:06 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 09:42:06 GMT Message-Id: <200808160942.m7G9g62E082102@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 09:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=147516 Change 147516 by zec@zec_tpx32 on 2008/08/16 09:41:36 More damage control. Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_source.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_source.c#3 (text+ko) ==== @@ -615,7 +615,7 @@ ifp = ifunit(ifname); if (ifp == NULL) { - printf("%s: can't find interface %d\n", __func__, if_index); + printf("%s: can't find interface %s\n", __func__, ifname); return (EINVAL); } sc->output_ifp = ifp; From owner-p4-projects@FreeBSD.ORG Sat Aug 16 10:01:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5E051065688; Sat, 16 Aug 2008 10:01:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 603021065680 for ; Sat, 16 Aug 2008 10:01:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F4638FC16 for ; Sat, 16 Aug 2008 10:01:31 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GA1VnX083666 for ; Sat, 16 Aug 2008 10:01:31 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GA1VJB083664 for perforce@freebsd.org; Sat, 16 Aug 2008 10:01:31 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 16 Aug 2008 10:01:31 GMT Message-Id: <200808161001.m7GA1VJB083664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 10:01:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147517 Change 147517 by ed@ed_dull on 2008/08/16 10:01:07 Style fixes: Fix up the comments in the TTY layer by ending sentences with dots. Requested by: attilio (long time ago - sorry) Affected files ... .. //depot/projects/mpsafetty/lib/libc/stdlib/ptsname.c#2 edit .. //depot/projects/mpsafetty/sys/compat/linux/linux_stats.c#2 edit .. //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#8 edit .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#3 edit .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#2 edit .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#2 edit .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#3 edit .. //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#3 edit .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#2 edit .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#4 edit .. //depot/projects/mpsafetty/sys/kern/tty.c#22 edit .. //depot/projects/mpsafetty/sys/kern/tty_inq.c#3 edit .. //depot/projects/mpsafetty/sys/kern/tty_outq.c#3 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#9 edit .. //depot/projects/mpsafetty/sys/kern/tty_pty.c#7 edit .. //depot/projects/mpsafetty/sys/kern/tty_ttydisc.c#10 edit .. //depot/projects/mpsafetty/sys/sun4v/sun4v/hvcons.c#2 edit .. //depot/projects/mpsafetty/sys/sys/tty.h#10 edit .. //depot/projects/mpsafetty/sys/sys/ttydevsw.h#3 edit .. //depot/projects/mpsafetty/sys/sys/ttydisc.h#3 edit .. //depot/projects/mpsafetty/sys/sys/ttyqueue.h#3 edit .. //depot/projects/mpsafetty/usr.bin/fstat/fstat.c#3 edit .. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#5 edit Differences ... ==== //depot/projects/mpsafetty/lib/libc/stdlib/ptsname.c#2 (text+ko) ==== @@ -83,7 +83,7 @@ if (__isptmaster(fildes) != 0) goto done; - /* Obtain the device name through FIODGNAME */ + /* Obtain the device name through FIODGNAME. */ fgn.len = sizeof pt_slave - (sizeof _PATH_DEV - 1); fgn.buf = pt_slave + (sizeof _PATH_DEV - 1); if (_ioctl(fildes, FIODGNAME, &fgn) == 0) ==== //depot/projects/mpsafetty/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -115,7 +115,7 @@ } else if (fp->f_type == DTYPE_PTS) { struct tty *tp = fp->f_data; - /* Convert the numbers for the slave device */ + /* Convert the numbers for the slave device. */ if (linux_driver_get_major_minor(tp->t_dev->si_name, &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); ==== //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#8 (text+ko) ==== @@ -105,7 +105,7 @@ ns = malloc(sizeof(*ns), M_NMDM, M_WAITOK|M_ZERO); mtx_init(&ns->ns_mtx, "nmdm", NULL, MTX_DEF); - /* Hook the pairs together */ + /* Hook the pairs together. */ ns->ns_part1.np_pair = ns; ns->ns_part1.np_other = &ns->ns_part2; TASK_INIT(&ns->ns_part1.np_task, 0, nmdm_task_tty, &ns->ns_part1); @@ -116,7 +116,7 @@ TASK_INIT(&ns->ns_part2.np_task, 0, nmdm_task_tty, &ns->ns_part2); callout_init(&ns->ns_part2.np_callout, 0); - /* Create device nodes */ + /* Create device nodes. */ tp = ns->ns_part1.np_tty = tty_alloc(&nmdm_class, &ns->ns_part1, &ns->ns_mtx); tty_makedev(tp, NULL, "nmdm%luA", unit); @@ -141,7 +141,7 @@ if (strncmp(name, "nmdm", 4) != 0) return; - /* Device name must be "nmdm%lu%c", where %c is 'A' or 'B' */ + /* Device name must be "nmdm%lu%c", where %c is 'A' or 'B'. */ name += 4; unit = strtoul(name, &end, 10); if (unit == ULONG_MAX || name == end) @@ -325,7 +325,7 @@ { struct nmdmpart *np = tty_softc(tp); - /* We can receive again, so wake up the other side */ + /* We can receive again, so wake up the other side. */ taskqueue_enqueue(taskqueue_swi, &np->np_other->np_task); } @@ -334,7 +334,7 @@ { struct nmdmpart *np = tty_softc(tp); - /* We can transmit again, so wake up our side */ + /* We can transmit again, so wake up our side. */ taskqueue_enqueue(taskqueue_swi, &np->np_task); } ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#3 (text+ko) ==== @@ -338,14 +338,13 @@ va_start(ap, fmt); - /* Allocate TTY object and softc to store unit number */ + /* Allocate TTY object and softc to store unit number. */ stc = malloc(sizeof(struct sc_ttysoftc), M_DEVBUF, M_WAITOK); stc->st_index = index; stc->st_stat = NULL; tp = tty_alloc(&sc_ttydevsw, stc, &Giant); - /* Create device node */ - /* XXX: can't we just pass the varargs? */ + /* Create device node. */ va_start(ap, fmt); vsnrprintf(name, sizeof name, 32, fmt, ap); va_end(ap); @@ -526,9 +525,6 @@ return ENXIO; if (!tty_opened(tp)) { -#if 0 - tp->t_termios = tp->t_init_in; -#endif /* Use the current setting of the <-- key as default VERASE. */ /* If the Delete key is preferable, an stty is necessary */ #ifndef __sparc64__ @@ -538,10 +534,6 @@ tp->t_termios.c_cc[VERASE] = key.key.map[0]; } #endif -#if 0 - scparam(tp, &tp->t_termios); - ttyld_modem(tp, 1); -#endif } scp = sc_get_stat(tp); @@ -602,7 +594,7 @@ } } -#if 0 +#if 0 /* XXX mpsafetty: fix screensaver. What about outwakeup? */ static int scread(struct cdev *dev, struct uio *uio, int flag) { ==== //depot/projects/mpsafetty/sys/dev/syscons/syscons.h#2 (text+ko) ==== @@ -339,7 +339,7 @@ #endif } scr_stat; -/* TTY softc */ +/* TTY softc. */ typedef struct sc_ttysoftc { int st_index; scr_stat *st_stat; ==== //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#2 (text+ko) ==== @@ -174,12 +174,17 @@ * Without hardware support, we need to toggle RTS ourselves. */ if ((tp->t_termios.c_cflag & CRTS_IFLOW) && !sc->sc_hwiflow) { +#if 0 /*if ((tp->t_state & TS_TBLOCK) && (sc->sc_hwsig & SER_RTS)) UART_SETSIG(sc, SER_DRTS); else */ if (/*!(tp->t_state & TS_TBLOCK) &&*/ !(sc->sc_hwsig & SER_RTS)) UART_SETSIG(sc, SER_DRTS|SER_RTS); +#endif + /* XXX: we should use inwakeup to implement this! */ + if (!(sc->sc_hwsig & SER_RTS)) + UART_SETSIG(sc, SER_DRTS|SER_RTS); } if (sc->sc_txbusy) @@ -311,16 +316,8 @@ ttydisc_modem(tp, sig & SER_DCD); if ((sig & SER_DCTS) && (tp->t_termios.c_cflag & CCTS_OFLOW) && !sc->sc_hwoflow) { - if (sig & SER_CTS) { -#if 0 - tp->t_state &= ~TS_TTSTOP; -#endif + if (sig & SER_CTS) uart_tty_outwakeup(tp); - } else { -#if 0 - tp->t_state |= TS_TTSTOP; -#endif - } } } ==== //depot/projects/mpsafetty/sys/dev/usb/ucom.c#3 (text+ko) ==== @@ -554,7 +554,7 @@ if (sc->sc_oxfer == NULL) return; - /* XXX: hardware flow control */ + /* XXX: hardware flow control. We should use inwakeup here. */ #if 0 if (tp->t_state & TS_TBLOCK) { if (ISSET(sc->sc_mcr, SER_RTS) && ==== //depot/projects/mpsafetty/sys/dev/usb/uftdi.c#3 (text+ko) ==== @@ -495,12 +495,12 @@ DPRINTFN(10,("uftdi_write: sc=%p, port=%d tp=%p, count=%u\n", vsc, portno, tp, count)); - /* Leave space for the length tag */ + /* Leave space for the length tag. */ l = ttydisc_getc(tp, to + sc->sc_hdrlen, count - sc->sc_hdrlen); if (l == 0) return (0); - /* Make length tag */ + /* Make length tag. */ if (sc->sc_hdrlen > 0) *to = FTDI_OUT_TAG(l, portno); ==== //depot/projects/mpsafetty/sys/kern/kern_exit.c#2 (text+ko) ==== @@ -350,7 +350,7 @@ sx_xunlock(&proctree_lock); (void)acct_process(td); - /* Release the TTY now we've unlocked everything */ + /* Release the TTY now we've unlocked everything. */ if (ttyvp != NULL) vrele(ttyvp); #ifdef KTRACE ==== //depot/projects/mpsafetty/sys/kern/kern_proc.c#4 (text+ko) ==== @@ -502,7 +502,7 @@ savesess = pgrp->pg_session; PGRP_UNLOCK(pgrp); - /* Remove the reference to the pgrp before deallocating it */ + /* Remove the reference to the pgrp before deallocating it. */ if (tp != NULL) { tty_lock(tp); tty_rel_pgrp(tp, pgrp); ==== //depot/projects/mpsafetty/sys/kern/tty.c#22 (text+ko) ==== @@ -97,18 +97,18 @@ { speed_t sp; - /* Provide an input buffer for 0.2 seconds of data */ + /* Provide an input buffer for 0.2 seconds of data. */ sp = MAX(tp->t_termios.c_ispeed, 0); ttyinq_setsize(&tp->t_inq, tp, sp / 5); - /* Set low watermark at 10% (when 90% is available) */ + /* Set low watermark at 10% (when 90% is available). */ tp->t_inlow = (ttyinq_getsize(&tp->t_inq) * 9) / 10; - /* Provide an ouput buffer for 0.2 seconds of data */ + /* Provide an ouput buffer for 0.2 seconds of data. */ sp = MAX(tp->t_termios.c_ospeed, 0); ttyoutq_setsize(&tp->t_outq, tp, sp / 5); - /* Set low watermark at 10% (when 90% is available) */ + /* Set low watermark at 10% (when 90% is available). */ tp->t_outlow = (ttyoutq_getsize(&tp->t_outq) * 9) / 10; } @@ -116,13 +116,13 @@ tty_freebuffers(struct tty *tp) { - /* Destroy input buffers */ + /* Destroy input buffers. */ ttyinq_flush(&tp->t_inq); ttyinq_setsize(&tp->t_inq, NULL, 0); MPASS(ttyinq_getsize(&tp->t_inq) == 0); tp->t_inlow = 0; - /* Destroy output buffers */ + /* Destroy output buffers. */ ttyoutq_flush(&tp->t_outq); ttyoutq_setsize(&tp->t_outq, NULL, 0); MPASS(ttyoutq_getsize(&tp->t_outq) == 0); @@ -136,11 +136,11 @@ while (ttyoutq_bytesused(&tp->t_outq) > 0) { ttydevsw_outwakeup(tp); - /* Could be handled synchronously */ + /* Could be handled synchronously. */ if (ttyoutq_bytesused(&tp->t_outq) == 0) return (0); - /* Wait for data to be drained */ + /* Wait for data to be drained. */ error = tty_wait(tp, &tp->t_outwait); if (error) return (error); @@ -163,7 +163,7 @@ tty_lock(tp); if (tty_gone(tp) || !tty_opened(tp)) { - /* Device is already gone */ + /* Device is already gone. */ tty_unlock(tp); return (ENXIO); } @@ -177,28 +177,28 @@ tty_lock_assert(tp, MA_OWNED); if (tty_opened(tp) || tp->t_flags & TF_OPENCLOSE) { - /* Device is still opened somewhere */ + /* Device is still opened somewhere. */ tty_unlock(tp); return; } tp->t_flags |= TF_OPENCLOSE; - /* Stop asynchronous I/O */ + /* Stop asynchronous I/O. */ funsetown(&tp->t_sigio); - /* Remove console TTY */ + /* Remove console TTY. */ if (constty == tp) constty_clear(); - /* Drain any output */ + /* Drain any output. */ MPASS((tp->t_flags & TF_STOPPED) == 0); if (!tty_gone(tp)) tty_drain(tp); ttydisc_close(tp); - /* Destroy associated buffers already */ + /* Destroy associated buffers already. */ tty_freebuffers(tp); knlist_clear(&tp->t_inpoll.si_note, 1); @@ -229,7 +229,7 @@ tty_lock(tp); if (tty_gone(tp)) { - /* Device is already gone */ + /* Device is already gone. */ tty_unlock(tp); return (ENXIO); } @@ -265,7 +265,7 @@ } if (!tty_opened(tp)) { - /* Set proper termios flags */ + /* Set proper termios flags. */ if (TTY_CALLOUT(tp, dev)) { tp->t_termios = tp->t_termios_init_out; } else { @@ -283,7 +283,7 @@ tty_watermarks(tp); } - /* Wait for Carrier Detect */ + /* Wait for Carrier Detect. */ if (!TTY_CALLOUT(tp, dev) && (oflags & O_NONBLOCK) == 0 && (tp->t_termios.c_cflag & CLOCAL) == 0) { while ((ttydevsw_modem(tp, 0, 0) & SER_DCD) == 0) { @@ -318,7 +318,7 @@ MPASS((tp->t_flags & TF_OPENED) != TF_OPENED); tp->t_flags &= ~(TF_OPENED|TF_EXCLUDE|TF_STOPPED); - /* Properly wake up threads that are stuck - revoke() */ + /* Properly wake up threads that are stuck - revoke(). */ tp->t_revokecnt++; tty_wakeup(tp, FREAD|FWRITE); cv_broadcast(&tp->t_bgwait); @@ -361,7 +361,7 @@ p->p_pgrp == tp->t_pgrp || p->p_flag & P_PPWAIT || SIGISMEMBER(p->p_sigacts->ps_sigignore, sig) || SIGISMEMBER(td->td_sigmask, sig)) { - /* Allow the action to happen */ + /* Allow the action to happen. */ PROC_UNLOCK(p); return (0); } @@ -506,23 +506,23 @@ error = ttydev_enter(tp); if (error) { - /* Don't return the error here, but the event mask */ + /* Don't return the error here, but the event mask. */ return (events & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); } if (events & (POLLIN|POLLRDNORM)) { - /* See if we can read something */ + /* See if we can read something. */ if (ttydisc_read_poll(tp) > 0) revents |= events & (POLLIN|POLLRDNORM); } if (events & (POLLOUT|POLLWRNORM)) { - /* See if we can write something */ + /* See if we can write something. */ if (ttydisc_write_poll(tp) > 0) revents |= events & (POLLOUT|POLLWRNORM); } if (tp->t_flags & TF_ZOMBIE) - /* Hangup flag on zombie state */ + /* Hangup flag on zombie state. */ revents |= events & POLLHUP; if (revents == 0) { @@ -700,11 +700,11 @@ switch (cmd) { case TIOCGETA: - /* Obtain terminal flags through tcgetattr() */ + /* Obtain terminal flags through tcgetattr(). */ bcopy(dev->si_drv2, data, sizeof(struct termios)); break; case TIOCSETA: - /* Set terminal flags through tcsetattr() */ + /* Set terminal flags through tcsetattr(). */ error = priv_check(td, PRIV_TTY_SETA); if (error) break; @@ -818,7 +818,7 @@ ttydevsw_defmodem(struct tty *tp, int sigon, int sigoff) { - /* Simulate a carrier to make the TTY layer happy */ + /* Simulate a carrier to make the TTY layer happy. */ return (SER_DCD); } @@ -848,7 +848,7 @@ { struct tty *tp; - /* Make sure the driver defines all routines */ + /* Make sure the driver defines all routines. */ #define PATCH_FUNC(x) do { \ if (tsw->tsw_ ## x == NULL) \ tsw->tsw_ ## x = ttydevsw_def ## x; \ @@ -879,7 +879,7 @@ TAILQ_INIT(&tp->t_inq.ti_list); STAILQ_INIT(&tp->t_outq.to_list); - /* Allow drivers to use a custom mutex to lock the TTY */ + /* Allow drivers to use a custom mutex to lock the TTY. */ if (mutex != NULL) { tp->t_mtx = mutex; } else { @@ -931,14 +931,14 @@ if (tp->t_sessioncnt != 0 || (tp->t_flags & (TF_GONE|TF_OPENED)) != TF_GONE) { - /* TTY is still in use */ + /* TTY is still in use. */ tty_unlock(tp); return; } tty_freebuffers(tp); - /* TTY can be deallocated */ + /* TTY can be deallocated. */ dev = tp->t_dev; tp->t_dev = NULL; tty_unlock(tp); @@ -960,7 +960,7 @@ { MPASS(tp->t_sessioncnt > 0); - /* Current session has left */ + /* Current session has left. */ if (tp->t_session == sess) { tp->t_session = NULL; MPASS(tp->t_pgrp == NULL); @@ -974,10 +974,10 @@ { MPASS(!tty_gone(tp)); - /* Simulate carrier removal */ + /* Simulate carrier removal. */ ttydisc_modem(tp, 0); - /* Wake up misc. blocked threads */ + /* Wake up misc. blocked threads. */ cv_broadcast(&tp->t_bgwait); cv_broadcast(&tp->t_dcdwait); @@ -1053,12 +1053,12 @@ va_list ap; struct cdev *dev; const char *prefix = "tty"; - char name[SPECNAMELEN - 3]; /* for "tty" and "cua" */ + char name[SPECNAMELEN - 3]; /* for "tty" and "cua". */ uid_t uid; gid_t gid; mode_t mode; - /* Remove "tty" prefix from devices like PTY's */ + /* Remove "tty" prefix from devices like PTY's. */ if (tp->t_flags & TF_NOPREFIX) prefix = ""; @@ -1067,24 +1067,24 @@ va_end(ap); if (cred == NULL) { - /* System device */ + /* System device. */ uid = UID_ROOT; gid = GID_WHEEL; mode = S_IRUSR|S_IWUSR; } else { - /* User device */ + /* User device. */ uid = cred->cr_ruid; gid = GID_TTY; mode = S_IRUSR|S_IWUSR|S_IWGRP; } - /* Master call-in device */ + /* Master call-in device. */ dev = make_dev_cred(&ttydev_cdevsw, 0, cred, uid, gid, mode, "%s%s", prefix, name); dev->si_drv1 = tp; tp->t_dev = dev; - /* Slave call-in devices */ + /* Slave call-in devices. */ if (tp->t_flags & TF_INITLOCK) { dev = make_dev_cred(&ttyil_cdevsw, 0, cred, uid, gid, mode, "%s%s.init", prefix, name); @@ -1099,14 +1099,14 @@ dev->si_drv2 = &tp->t_termios_lock_in; } - /* Call-out devices */ + /* Call-out devices. */ if (tp->t_flags & TF_CALLOUT) { dev = make_dev_cred(&ttydev_cdevsw, 0, cred, UID_UUCP, GID_DIALER, 0660, "cua%s", name); dev_depends(tp->t_dev, dev); dev->si_drv1 = tp; - /* Slave call-out devices */ + /* Slave call-out devices. */ if (tp->t_flags & TF_INITLOCK) { dev = make_dev_cred(&ttyil_cdevsw, 0, cred, UID_UUCP, GID_DIALER, 0660, "cua%s.init", name); @@ -1135,7 +1135,7 @@ tty_lock_assert(tp, MA_OWNED); MPASS(sig >= 1 && sig < NSIG); - /* Make signals start output again */ + /* Make signals start output again. */ tp->t_flags &= ~TF_STOPPED; if (tp->t_session != NULL && tp->t_session->s_leader != NULL) { @@ -1152,7 +1152,7 @@ tty_lock_assert(tp, MA_OWNED); MPASS(sig >= 1 && sig < NSIG); - /* Make signals start output again */ + /* Make signals start output again. */ tp->t_flags &= ~TF_STOPPED; if (sig == SIGINFO && !(tp->t_termios.c_lflag & NOKERNINFO)) @@ -1189,18 +1189,18 @@ int revokecnt = tp->t_revokecnt; #if 0 - /* XXX: /dev/console also picks up Giant */ + /* XXX: /dev/console also picks up Giant. */ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); #endif tty_lock_assert(tp, MA_OWNED); error = cv_wait_sig(cv, tp->t_mtx); - /* Restart the system call when we may have been revoked */ + /* Restart the system call when we may have been revoked. */ if (tp->t_revokecnt != revokecnt) return (ERESTART); - /* Bail out when the device slipped away */ + /* Bail out when the device slipped away. */ if (tty_gone(tp)) return (ENXIO); @@ -1214,18 +1214,18 @@ int revokecnt = tp->t_revokecnt; #if 0 - /* XXX: /dev/console also picks up Giant */ + /* XXX: /dev/console also picks up Giant. */ tty_lock_assert(tp, MA_OWNED|MA_NOTRECURSED); #endif tty_lock_assert(tp, MA_OWNED); error = cv_timedwait_sig(cv, tp->t_mtx, hz); - /* Restart the system call when we may have been revoked */ + /* Restart the system call when we may have been revoked. */ if (tp->t_revokecnt != revokecnt) return (ERESTART); - /* Bail out when the device slipped away */ + /* Bail out when the device slipped away. */ if (tty_gone(tp)) return (ENXIO); @@ -1292,31 +1292,31 @@ tp->t_flags &= ~TF_ASYNC; return (0); case FIONBIO: - /* This device supports non-blocking operation */ + /* This device supports non-blocking operation. */ return (0); case FIONREAD: *(int *)data = ttyinq_bytescanonicalized(&tp->t_inq); return (0); case FIOSETOWN: if (tp->t_session != NULL && !tty_is_ctty(tp, td->td_proc)) - /* Not allowed to set ownership */ + /* Not allowed to set ownership. */ return (ENOTTY); - /* Temporarily unlock the TTY to set ownership */ + /* Temporarily unlock the TTY to set ownership. */ tty_unlock(tp); error = fsetown(*(int *)data, &tp->t_sigio); tty_lock(tp); return (error); case FIOGETOWN: if (tp->t_session != NULL && !tty_is_ctty(tp, td->td_proc)) - /* Not allowed to set ownership */ + /* Not allowed to set ownership. */ return (ENOTTY); - /* Get ownership */ + /* Get ownership. */ *(int *)data = fgetown(&tp->t_sigio); return (0); case TIOCGETA: - /* Obtain terminal flags through tcgetattr() */ + /* Obtain terminal flags through tcgetattr(). */ bcopy(&tp->t_termios, data, sizeof(struct termios)); return (0); case TIOCSETA: @@ -1332,14 +1332,14 @@ if (t->c_ispeed == 0) t->c_ispeed = t->c_ospeed; - /* Don't allow invalid flags to be set */ + /* Don't allow invalid flags to be set. */ if ((t->c_iflag & ~TTYSUP_IFLAG) != 0 || (t->c_oflag & ~TTYSUP_OFLAG) != 0 || (t->c_lflag & ~TTYSUP_LFLAG) != 0 || (t->c_cflag & ~TTYSUP_CFLAG) != 0) return (EINVAL); - /* Set terminal flags through tcsetattr() */ + /* Set terminal flags through tcsetattr(). */ if (cmd == TIOCSETAW || cmd == TIOCSETAF) { error = tty_drain(tp); if (error) @@ -1365,11 +1365,11 @@ tp->t_termios.c_ispeed = t->c_ispeed; tp->t_termios.c_ospeed = t->c_ospeed; - /* Baud rate has changed - update watermarks */ + /* Baud rate has changed - update watermarks. */ tty_watermarks(tp); } - /* Copy new non-device driver parameters */ + /* Copy new non-device driver parameters. */ tp->t_termios.c_iflag = t->c_iflag; tp->t_termios.c_oflag = t->c_oflag; tp->t_termios.c_lflag = t->c_lflag; @@ -1389,7 +1389,7 @@ return (0); } case TIOCGETD: - /* For compatibility - we only support TTYDISC */ + /* For compatibility - we only support TTYDISC. */ *(int *)data = TTYDISC; return (0); case TIOCGPGRP: @@ -1443,13 +1443,13 @@ return (EPERM); } - /* Connect the session to the TTY */ + /* Connect the session to the TTY. */ tp->t_session = p->p_session; tp->t_session->s_ttyp = tp; tp->t_sessioncnt++; sx_xunlock(&proctree_lock); - /* Assign foreground process group */ + /* Assign foreground process group. */ tp->t_pgrp = p->p_pgrp; PROC_LOCK(p); p->p_flag |= P_CONTROLT; @@ -1488,7 +1488,7 @@ tp->t_pgrp = pg; sx_sunlock(&proctree_lock); - /* Wake up the background process groups */ + /* Wake up the background process groups. */ cv_broadcast(&tp->t_bgwait); return (0); } @@ -1503,10 +1503,10 @@ return (0); } case TIOCDRAIN: - /* Drain TTY output */ + /* Drain TTY output. */ return tty_drain(tp); case TIOCCONS: - /* Set terminal as console TTY */ + /* Set terminal as console TTY. */ if (*(int *)data) { struct nameidata nd; int vfslocked; @@ -1555,11 +1555,11 @@ } return (0); case TIOCGWINSZ: - /* Obtain window size */ + /* Obtain window size. */ bcopy(&tp->t_winsize, data, sizeof(struct winsize)); return (0); case TIOCSWINSZ: - /* Set window size */ + /* Set window size. */ if (bcmp(&tp->t_winsize, data, sizeof(struct winsize)) == 0) return (0); bcopy(data, &tp->t_winsize, sizeof(struct winsize)); @@ -1623,7 +1623,7 @@ tty_checkoutq(struct tty *tp) { - /* 256 bytes should be enough to print a log message */ + /* 256 bytes should be enough to print a log message. */ return (ttyoutq_bytesleft(&tp->t_outq) >= 256); } @@ -1642,7 +1642,7 @@ &tp->t_termios.c_cc[VSTOP], 1) == 0) tp->t_flags |= TF_HIWAT_IN; } else { - /* No input flow control */ + /* No input flow control. */ tp->t_flags |= TF_HIWAT_IN; } } @@ -1662,7 +1662,7 @@ &tp->t_termios.c_cc[VSTART], 1) == 0) tp->t_flags &= ~TF_HIWAT_IN; } else { - /* No input flow control */ + /* No input flow control. */ tp->t_flags &= ~TF_HIWAT_IN; } @@ -1684,7 +1684,7 @@ { TF_INITLOCK, 'I' }, { TF_CALLOUT, 'C' }, - /* Keep these together -> 'Oi' and 'Oo' */ + /* Keep these together -> 'Oi' and 'Oo'. */ { TF_OPENED, 'O' }, { TF_OPENED_IN, 'i' }, { TF_OPENED_OUT,'o' }, @@ -1694,7 +1694,7 @@ { TF_ASYNC, 'Y' }, { TF_LITERAL, 'L' }, - /* Keep these together -> 'Hi' and 'Ho' */ + /* Keep these together -> 'Hi' and 'Ho'. */ { TF_HIWAT, 'H' }, { TF_HIWAT_IN, 'i' }, { TF_HIWAT_OUT, 'o' }, @@ -1707,14 +1707,14 @@ { 0, '\0' }, }; -/* DDB command to show TTY statistics */ +/* DDB command to show TTY statistics. */ DB_SHOW_COMMAND(ttys, db_show_ttys) { struct tty *tp; size_t isiz, osiz; int i, j; - /* Make the output look like `pstat -t' */ + /* Make the output look like `pstat -t'. */ db_printf(" LINE INQ CAN LIN LOW OUTQ USE LOW " "COL SESS PGID STATE\n"); @@ -1735,7 +1735,7 @@ tp->t_session ? tp->t_session->s_sid : 0, tp->t_pgrp ? tp->t_pgrp->pg_id : 0); - /* Flag bits */ + /* Flag bits. */ for (i = j = 0; ttystates[i].flag; i++) if (tp->t_flags & ttystates[i].flag) { db_printf("%c", ttystates[i].val); ==== //depot/projects/mpsafetty/sys/kern/tty_inq.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ * the outq, we'll stick to 128 byte blocks here. */ -/* Statistics */ +/* Statistics. */ static long ttyinq_nfast = 0; SYSCTL_LONG(_kern, OID_AUTO, tty_inq_nfast, CTLFLAG_RD, &ttyinq_nfast, 0, "Unbuffered reads to userspace on input"); @@ -152,7 +152,7 @@ struct ttyinq_block *tib; size_t cbegin, cend, clen; - /* See if there still is data */ + /* See if there still is data. */ if (ti->ti_begin == ti->ti_linestart) return (0); tib = TAILQ_FIRST(&ti->ti_list); @@ -217,11 +217,11 @@ tty_lock(tp); if (tty_gone(tp)) { - /* Something went bad - discard this block */ + /* Something went bad - discard this block. */ uma_zfree(ttyinq_zone, tib); return (ENXIO); } - /* Block can now be readded to the list */ + /* Block can now be readded to the list. */ /* * XXX: we could remove the blocks here when the * queue was shrunk, but still in use. See @@ -242,7 +242,7 @@ ti->ti_begin += clen; MPASS(ti->ti_begin < TTYINQ_DATASIZE); - /* Temporary unlock and copy the data to userspace */ + /* Temporary unlock and copy the data to userspace. */ tty_unlock(tp); error = uiomove(ob, clen - flen, uio); tty_lock(tp); @@ -262,11 +262,11 @@ size_t length, int value) { if (value) { - /* Set the bits */ + /* Set the bits. */ for (; length > 0; length--, offset++) SETBIT(tib, offset); } else { - /* Unset the bits */ + /* Unset the bits. */ for (; length > 0; length--, offset++) CLRBIT(tib, offset); } @@ -285,29 +285,29 @@ boff = ti->ti_end % TTYINQ_DATASIZE; if (ti->ti_end == 0) { - /* First time we're being used or drained */ + /* First time we're being used or drained. */ MPASS(ti->ti_begin == 0); tib = ti->ti_lastblock = TAILQ_FIRST(&ti->ti_list); if (tib == NULL) { - /* Queue has no blocks */ + /* Queue has no blocks. */ break; } } else if (boff == 0) { - /* We reached the end of this block on last write */ + /* We reached the end of this block on last write. */ tib = TAILQ_NEXT(tib, tib_list); if (tib == NULL) { - /* We've reached the watermark */ + /* We've reached the watermark. */ break; } ti->ti_lastblock = tib; } - /* Don't copy more than was requested */ + /* Don't copy more than was requested. */ l = MIN(nbytes, TTYINQ_DATASIZE - boff); MPASS(l > 0); memcpy(tib->tib_data + boff, cbuf, l); - /* Set the quoting bits for the proper region */ + /* Set the quoting bits for the proper region. */ ttyinq_set_quotes(tib, boff, l, quote); cbuf += l; @@ -326,7 +326,7 @@ if (ttyinq_bytesleft(ti) < nbytes) return (-1); - /* We should always be able to write it back */ + /* We should always be able to write it back. */ ret = ttyinq_write(ti, buf, nbytes, quote); MPASS(ret == nbytes); @@ -362,7 +362,7 @@ boff++; } - /* Not found - just process the entire block */ + /* Not found - just process the entire block. */ return (bend - ti->ti_begin); } @@ -399,7 +399,7 @@ MPASS(ti->ti_linestart < ti->ti_end); if (--ti->ti_end % TTYINQ_DATASIZE == 0) { - /* Roll back to the previous block */ + /* Roll back to the previous block. */ ti->ti_lastblock = TAILQ_PREV(ti->ti_lastblock, ttyinq_bhead, tib_list); /* @@ -431,19 +431,19 @@ { unsigned int boff; - /* Use the proper block when we're at the queue head */ + /* Use the proper block when we're at the queue head. */ if (offset == 0) tib = TAILQ_FIRST(&ti->ti_list); - /* Iterate all characters and call the iterator function */ + /* Iterate all characters and call the iterator function. */ for (; offset < ti->ti_end; offset++) { boff = offset % TTYINQ_DATASIZE; MPASS(tib != NULL); - /* Call back the iterator function */ + /* Call back the iterator function. */ iterator(data, tib->tib_data[boff], GETBIT(tib, boff)); - /* Last byte iterated - go to the next block */ + /* Last byte iterated - go to the next block. */ if (boff == TTYINQ_DATASIZE - 1) tib = TAILQ_NEXT(tib, tib_list); MPASS(tib != NULL); ==== //depot/projects/mpsafetty/sys/kern/tty_outq.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ * output. */ -/* Statistics */ +/* Statistics. */ static long ttyoutq_nfast = 0; SYSCTL_LONG(_kern, OID_AUTO, tty_outq_nfast, CTLFLAG_RD, &ttyoutq_nfast, 0, "Unbuffered reads to userspace on output"); @@ -142,7 +142,7 @@ struct ttyoutq_block *tob; size_t cbegin, cend, clen; - /* See if there still is data */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 10:03:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2C23106567D; Sat, 16 Aug 2008 10:03:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6442106567A for ; Sat, 16 Aug 2008 10:03:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 955FA8FC16 for ; Sat, 16 Aug 2008 10:03:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GA3XdP084908 for ; Sat, 16 Aug 2008 10:03:33 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GA3XpZ084906 for perforce@freebsd.org; Sat, 16 Aug 2008 10:03:33 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 16 Aug 2008 10:03:33 GMT Message-Id: <200808161003.m7GA3XpZ084906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 10:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=147518 Change 147518 by ed@ed_dull on 2008/08/16 10:03:26 IFC. Affected files ... .. //depot/projects/mpsafetty/etc/defaults/rc.conf#4 integrate .. //depot/projects/mpsafetty/etc/rc.firewall#4 integrate .. //depot/projects/mpsafetty/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/snp.4#2 integrate .. //depot/projects/mpsafetty/sys/Makefile#5 integrate .. //depot/projects/mpsafetty/sys/conf/files#13 integrate .. //depot/projects/mpsafetty/sys/conf/files.i386#4 integrate .. //depot/projects/mpsafetty/sys/conf/options.i386#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/snp/snp.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/XEN#1 branch .. //depot/projects/mpsafetty/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/support.s#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/trap.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/pmap.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/segments.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/trap.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/isa/npx.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/mpsafetty/sys/xen/features.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/watch/watch.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.339 2008/08/09 01:19:00 obrien Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.341 2008/08/15 19:20:59 jhb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -115,16 +115,27 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file +firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_simple_iif="ed1" # Inside network interface for "simple" + # firewall. +firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" + # firewall. +firewall_simple_oif="ed0" # Outside network interface for "simple" + # firewall. +firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" + # firewall. firewall_myservices="" # List of TCP ports on which this host - # offers services -firewall_allowservices="" # List of IPs which has access to - # $firewall_myservices -firewall_trusted="" # List of IPs which has full access to this host + # offers services for "workstation" firewall. +firewall_allowservices="" # List of IPs which have access to + # $firewall_myservices for "workstation" + # firewall. +firewall_trusted="" # List of IPs which have full access to this + # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming - # packets. + # packets for "workstation" firewall. firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports - # for which denied incoming packets are not - # logged. + # for which denied incoming packets are not + # logged for "workstation" firewall. firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) firewall_nat_interface="" # Public interface or IPaddress to use firewall_nat_flags="" # Additional configuration parameters ==== //depot/projects/mpsafetty/etc/rc.firewall#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.57 2008/08/03 19:01:07 danger Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.60 2008/08/15 19:20:59 jhb Exp $ # # @@ -164,19 +164,20 @@ ############ # This is a prototype setup that will protect your system somewhat # against people from outside your own network. + # + # Configuration: + # firewall_client_net: Network address of local network. ############ - # set these to your network and netmask and ip - net="192.0.2.0" - mask="255.255.255.0" - ip="192.0.2.1" + # set this to your local network + net="$firewall_client_net" # Allow limited broadcast traffic from my own net. - ${fwcmd} add pass all from ${net}:${mask} to 255.255.255.255 + ${fwcmd} add pass all from ${net} to 255.255.255.255 # Allow any traffic to or from my own net. - ${fwcmd} add pass all from ${ip} to ${net}:${mask} - ${fwcmd} add pass all from ${net}:${mask} to ${ip} + ${fwcmd} add pass all from me to ${net} + ${fwcmd} add pass all from ${net} to me # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -209,23 +210,25 @@ # This is a prototype setup for a simple firewall. Configure this # machine as a DNS and NTP server, and point all the machines # on the inside at this machine for those services. + # + # Configuration: + # firewall_simple_iif: Inside network interface. + # firewall_simple_inet: Inside network address. + # firewall_simple_oif: Outside network interface. + # firewall_simple_onet: Outside network address. ############ - # set these to your outside interface network and netmask and ip - oif="ed0" - onet="192.0.2.0" - omask="255.255.255.240" - oip="192.0.2.1" + # set these to your outside interface network + oif="$firewall_simple_oif" + onet="$firewall_simple_onet" - # set these to your inside interface network and netmask and ip - iif="ed1" - inet="192.0.2.16" - imask="255.255.255.240" - iip="192.0.2.17" + # set these to your inside interface network + iif="$firewall_simple_iif" + inet="$firewall_simple_inet" # Stop spoofing - ${fwcmd} add deny all from ${inet}:${imask} to any in via ${oif} - ${fwcmd} add deny all from ${onet}:${omask} to any in via ${iif} + ${fwcmd} add deny all from ${inet} to any in via ${oif} + ${fwcmd} add deny all from ${onet} to any in via ${iif} # Stop RFC1918 nets on the outside interface ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} @@ -277,15 +280,15 @@ ${fwcmd} add pass all from any to any frag # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${oip} 25 setup + ${fwcmd} add pass tcp from any to me 25 setup # Allow access to our DNS - ${fwcmd} add pass tcp from any to ${oip} 53 setup - ${fwcmd} add pass udp from any to ${oip} 53 - ${fwcmd} add pass udp from ${oip} 53 to any + ${fwcmd} add pass tcp from any to me 53 setup + ${fwcmd} add pass udp from any to me 53 + ${fwcmd} add pass udp from me 53 to any # Allow access to our WWW - ${fwcmd} add pass tcp from any to ${oip} 80 setup + ${fwcmd} add pass tcp from any to me 80 setup # Reject&Log all setup of incoming connections from the outside ${fwcmd} add deny log tcp from any to any in via ${oif} setup @@ -294,10 +297,10 @@ ${fwcmd} add pass tcp from any to any setup # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${oip} to any 53 keep-state + ${fwcmd} add pass udp from me to any 53 keep-state # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${oip} to any 123 keep-state + ${fwcmd} add pass udp from me to any 123 keep-state # Everything else is denied by default, unless the # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel ==== //depot/projects/mpsafetty/lib/librt/sigev_thread.c#2 (text) ==== @@ -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/lib/librt/sigev_thread.c,v 1.8 2006/03/29 04:20:53 deischen Exp $ + * $FreeBSD: src/lib/librt/sigev_thread.c,v 1.9 2008/08/15 21:08:48 kmacy Exp $ * */ @@ -51,7 +51,7 @@ static struct sigev_list_head sigev_hash[HASH_QUEUES]; static struct sigev_list_head sigev_all; static LIST_HEAD(,sigev_thread) sigev_threads; -static int sigev_generation; +static unsigned int sigev_generation; static pthread_mutex_t *sigev_list_mtx; static pthread_once_t sigev_once = PTHREAD_ONCE_INIT; static pthread_once_t sigev_once_default = PTHREAD_ONCE_INIT; ==== //depot/projects/mpsafetty/share/man/man4/snp.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/snp.4,v 1.27 2005/09/19 13:48:45 ru Exp $ +.\" $FreeBSD: src/share/man/man4/snp.4,v 1.28 2008/08/15 13:07:07 ed Exp $ .\" .Dd September 18, 2005 .Dt SNP 4 @@ -16,8 +16,8 @@ .Ft int .Fn ioctl fd FIONREAD &result .Sh DESCRIPTION -.Pa /dev/snp? -are snoop devices which allow users to attach to any tty +.Pa /dev/snp +is a snoop device which allows users to attach to any tty and watch activities on it. The kernel must be compiled with .Cd "device snp" , ==== //depot/projects/mpsafetty/sys/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.52 2008/08/08 18:00:33 philip Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -46,6 +46,10 @@ # You need the textproc/glimpse ports for this. glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif cd ${.CURDIR}; glimpseindex -H . -B -f -o . glimpse-clean: ==== //depot/projects/mpsafetty/sys/conf/files#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1727,6 +1727,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2341,3 +2342,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/mpsafetty/sys/conf/files.i386#4 (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.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -277,9 +278,11 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/mpsafetty/sys/conf/options.i386#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/mpsafetty/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.289 2008/06/11 06:44:58 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.290 2008/08/15 10:55:11 philip Exp $"); #include "opt_ata.h" #include @@ -75,6 +75,7 @@ uma_zone_t ata_composite_zone; int ata_wc = 1; int ata_setmax = 0; +int ata_dma_check_80pin = 1; /* local vars */ static int ata_dma = 1; @@ -85,6 +86,10 @@ TUNABLE_INT("hw.ata.ata_dma", &ata_dma); SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0, "ATA disk DMA mode control"); +TUNABLE_INT("hw.ata.ata_dma_check_80pin", &ata_dma_check_80pin); +SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma_check_80pin, + CTLFLAG_RDTUN, &ata_dma_check_80pin, 1, + "Check for 80pin cable before setting ATA DMA mode"); TUNABLE_INT("hw.ata.atapi_dma", &atapi_dma); SYSCTL_INT(_hw_ata, OID_AUTO, atapi_dma, CTLFLAG_RDTUN, &atapi_dma, 0, "ATAPI device DMA mode control"); ==== //depot/projects/mpsafetty/sys/dev/ata/ata-all.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/dev/ata/ata-all.h,v 1.133 2008/04/17 12:29:35 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.134 2008/08/15 10:55:11 philip Exp $ */ /* ATA register defines */ @@ -544,7 +544,8 @@ extern devclass_t ata_devclass; extern int ata_wc; extern int ata_setmax; - +extern int ata_dma_check_80pin; + /* public prototypes */ /* ata-all.c: */ int ata_probe(device_t dev); ==== //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.224 2008/07/10 21:36:53 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.225 2008/08/15 10:55:11 philip Exp $"); #include "opt_ata.h" #include @@ -6392,6 +6392,12 @@ { struct ata_device *atadev = device_get_softc(dev); + if (!ata_dma_check_80pin) { + if (bootverbose) + device_printf(dev, "Skipping 80pin cable check\n"); + return mode; + } + if (mode > ATA_UDMA2 && !(atadev->param.hwres & ATA_CABLE_ID)) { ata_print_cable(dev, "device"); mode = ATA_UDMA2; ==== //depot/projects/mpsafetty/sys/dev/snp/snp.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.108 2008/06/11 18:55:19 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.109 2008/08/15 13:07:07 ed Exp $"); #include #include @@ -36,7 +36,6 @@ static l_close_t snplclose; static l_write_t snplwrite; static d_open_t snpopen; -static d_close_t snpclose; static d_read_t snpread; static d_write_t snpwrite; static d_ioctl_t snpioctl; @@ -46,7 +45,6 @@ .d_version = D_VERSION, .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR, .d_open = snpopen, - .d_close = snpclose, .d_read = snpread, .d_write = snpwrite, .d_ioctl = snpioctl, @@ -70,7 +68,6 @@ */ struct snoop { LIST_ENTRY(snoop) snp_list; /* List glue. */ - int snp_unit; /* Device number. */ struct cdev *snp_target; /* Target tty device. */ struct tty *snp_tty; /* Target tty pointer. */ u_long snp_len; /* Possible length. */ @@ -111,13 +108,11 @@ * module load time. */ static int snooplinedisc; +static struct cdev *snoopdev; static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist); -static struct clonedevs *snpclones; static struct tty *snpdevtotty(struct cdev *dev); -static void snp_clone(void *arg, struct ucred *cred, char *name, - int namelen, struct cdev **dev); static void snp_detach(void *arg); static int snp_down(struct snoop *snp); static int snp_in(struct snoop *snp, char *buf, int n); @@ -220,14 +215,17 @@ int error, i, len; unsigned char c[SNP_INPUT_BUF]; - snp = dev->si_drv1; + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); + tp = snp->snp_tty; if (tp == NULL) return (EIO); if ((tp->t_state & TS_SNOOP) && tp->t_line == snooplinedisc) goto tty_input; - printf("snp%d: attempt to write to bad tty\n", snp->snp_unit); + printf("snp: attempt to write to bad tty\n"); return (EIO); tty_input: @@ -255,7 +253,10 @@ caddr_t from; char *nbuf; - snp = dev->si_drv1; + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); + KASSERT(snp->snp_len + snp->snp_base <= snp->snp_blen, ("snoop buffer error")); @@ -324,12 +325,12 @@ return (0); if (snp->snp_flags & SNOOP_DOWN) { - printf("snp%d: more data to down interface\n", snp->snp_unit); + printf("snp: more data to down interface\n"); return (0); } if (snp->snp_flags & SNOOP_OFLOW) { - printf("snp%d: buffer overflow\n", snp->snp_unit); + printf("snp: buffer overflow\n"); /* * On overflow we just repeat the standart close * procedure...yes , this is waste of space but.. Then next @@ -387,18 +388,30 @@ return (n); } +static void +snp_dtor(void *data) +{ + struct snoop *snp = data; + + snp->snp_blen = 0; + LIST_REMOVE(snp, snp_list); + free(snp->snp_buf, M_SNP); + snp->snp_flags &= ~SNOOP_OPEN; + snp_detach(snp); +} + static int snpopen(struct cdev *dev, int flag, int mode, struct thread *td) { struct snoop *snp; + int error; - if (dev->si_drv1 == NULL) { - dev->si_flags &= ~SI_CHEAPCLONE; - dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP, - M_WAITOK | M_ZERO); - snp->snp_unit = dev2unit(dev); - } else - return (EBUSY); + snp = malloc(sizeof(*snp), M_SNP, M_WAITOK | M_ZERO); + error = devfs_set_cdevpriv(snp, snp_dtor); + if (error != 0) { + free(snp, M_SNP); + return (error); + } /* * We intentionally do not OR flags with SNOOP_OPEN, but set them so @@ -444,7 +457,7 @@ tp->t_state &= ~TS_SNOOP; tp->t_line = snp->snp_olddisc; } else - printf("snp%d: bad attached tty data\n", snp->snp_unit); + printf("snp: bad attached tty data\n"); snp->snp_tty = NULL; snp->snp_target = NULL; @@ -456,23 +469,6 @@ } static int -snpclose(struct cdev *dev, int flags, int fmt, struct thread *td) -{ - struct snoop *snp; - - snp = dev->si_drv1; - snp->snp_blen = 0; - LIST_REMOVE(snp, snp_list); - free(snp->snp_buf, M_SNP); - snp->snp_flags &= ~SNOOP_OPEN; - dev->si_drv1 = NULL; - snp_detach(snp); - destroy_dev_sched(dev); - - return (0); -} - -static int snp_down(struct snoop *snp) { @@ -495,9 +491,12 @@ struct tty *tp; struct cdev *tdev; struct file *fp; - int s; + int error, s; + + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); - snp = dev->si_drv1; switch (cmd) { case SNPSTTY: s = *(int *)data; @@ -587,7 +586,10 @@ struct snoop *snp; int revents; - snp = dev->si_drv1; + if (devfs_get_cdevpriv((void **)&snp) != 0) + return (events & + (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); + revents = 0; /* * If snoop is down, we don't want to poll() forever so we return 1. @@ -603,44 +605,22 @@ return (revents); } -static void -snp_clone(void *arg, struct ucred *cred, char *name, int namelen, - struct cdev **dev) -{ - int u, i; - - if (*dev != NULL) - return; - if (dev_stdclone(name, NULL, "snp", &u) != 1) - return; - i = clone_create(&snpclones, &snp_cdevsw, &u, dev, 0); - if (i) - *dev = make_dev_credf(MAKEDEV_REF, &snp_cdevsw, unit2minor(u), - NULL, UID_ROOT, GID_WHEEL, 0600, "snp%d", u); - if (*dev != NULL) { - (*dev)->si_flags |= SI_CHEAPCLONE; - } -} - static int snp_modevent(module_t mod, int type, void *data) { - static eventhandler_tag eh_tag; switch (type) { case MOD_LOAD: - /* XXX error checking. */ - clone_setup(&snpclones); - eh_tag = EVENTHANDLER_REGISTER(dev_clone, snp_clone, 0, 1000); snooplinedisc = ldisc_register(LDISC_LOAD, &snpdisc); + snoopdev = make_dev(&snp_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "snp"); + /* For compatibility */ + make_dev_alias(snoopdev, "snp0"); break; case MOD_UNLOAD: if (!LIST_EMPTY(&snp_sclist)) return (EBUSY); - EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); - drain_dev_clone_events(); - clone_cleanup(&snpclones); - destroy_dev_drain(&snp_cdevsw); + destroy_dev(snoopdev); ldisc_deregister(snooplinedisc); break; default: ==== //depot/projects/mpsafetty/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.13 2008/03/12 10:11:57 jeff Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.14 2008/08/15 20:58:57 kmacy Exp $ machine i386 @@ -22,3 +22,7 @@ # Default partitioning schemes options GEOM_BSD options GEOM_MBR + +# enable support for native hardware +options NATIVE +device atpic ==== //depot/projects/mpsafetty/sys/i386/i386/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.93 2008/07/15 03:34:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.94 2008/08/15 20:51:31 kmacy Exp $"); #include #include @@ -144,6 +144,11 @@ int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, int flags); +#ifdef XEN +#undef pmap_kextract +#define pmap_kextract pmap_kextract_ma +#endif + /* * Return true if a match is made. * ==== //depot/projects/mpsafetty/sys/i386/i386/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.162 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.163 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -228,3 +228,9 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/mpsafetty/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.670 2008/04/25 05:18:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.671 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -141,6 +141,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include +#include +#include +#include +#include +#include + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +extern unsigned long physfree; +#endif /* XEN */ + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -287,8 +306,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1118,6 +1138,24 @@ return (0); } + +void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ + +#ifdef XEN + +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_hlt(int busy) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1128,8 +1166,6 @@ __asm__ ("hlt"); } -void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ - static void cpu_idle_hlt(int busy) { @@ -1143,6 +1179,7 @@ else __asm __volatile("sti; hlt"); } +#endif static void cpu_idle_acpi(int busy) @@ -1437,10 +1474,16 @@ */ int _default_ldt; + +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1542,6 +1585,7 @@ 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +#ifndef XEN /* GPROC0_SEL 9 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ @@ -1633,6 +1677,7 @@ 0, 0, 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif /* !XEN */ }; static struct soft_segment_descriptor ldt_segs[] = { @@ -1870,7 +1915,16 @@ goto physmap_done; } #endif - +#if defined(XEN) + has_smap = 0; + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; + goto physmap_done; +#endif hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -2032,7 +2086,7 @@ vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#else +#elif !defined(XEN) /* * Prefer the RTC value for extended memory. */ @@ -2123,6 +2177,7 @@ getenv_quad("dcons.size", &dcons_size) == 0) dcons_addr = 0; +#ifndef XEN /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. @@ -2240,7 +2295,11 @@ } *pte = 0; invltlb(); - +#else + phys_avail[0] = physfree; + phys_avail[1] = xen_start_info->nr_pages*PAGE_SIZE; +#endif + /* * XXX * The last chunk must contain at least one page plus the message @@ -2265,6 +2324,246 @@ off); } +#ifdef XEN +#define MTOPSIZE (1<<(14 + PAGE_SHIFT)) + +void +init386(first) + int first; +{ + struct gate_descriptor *gdp; + unsigned long gdtmachpfn; + int error, gsel_tss, metadata_missing, x; + struct pcpu *pc; + struct callback_register event = { + .type = CALLBACKTYPE_event, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)Xhypervisor_callback }, + }; + struct callback_register failsafe = { + .type = CALLBACKTYPE_failsafe, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback }, + }; + + thread0.td_kstack = proc0kstack; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); + + metadata_missing = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 11:26:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ECF91065691; Sat, 16 Aug 2008 11:26:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48BBF1065687 for ; Sat, 16 Aug 2008 11:26:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33D688FC13 for ; Sat, 16 Aug 2008 11:26:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GBQwK2092941 for ; Sat, 16 Aug 2008 11:26:58 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GBQwqm092939 for perforce@freebsd.org; Sat, 16 Aug 2008 11:26:58 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 11:26:58 GMT Message-Id: <200808161126.m7GBQwqm092939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 11:26:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147520 Change 147520 by des@des.at.des.no on 2008/08/16 11:26:26 Reduce diffs against head (mostly whitespace). Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#9 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#5 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#6 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#5 edit .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#4 edit .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#6 edit .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#6 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#6 edit .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#7 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#10 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#9 edit .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#9 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -39,8 +39,6 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ -#include "opt_compat.h" - #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); @@ -91,6 +89,7 @@ #include #endif /* __i386__ || __amd64__ */ +#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_compat.h" - #include #include #include @@ -59,11 +57,12 @@ #include #include #include - #include #include #include +#include "opt_compat.h" + #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#5 (text+ko) ==== @@ -63,7 +63,6 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * */ - #include __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ - #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#7 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#7 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#6 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#7 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include - #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ - #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#6 (text+ko) ==== @@ -58,7 +58,6 @@ * from one port to the other only rarely. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#5 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ * Author: Dave Chapeskie */ - #include __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $"); ==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#5 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#5 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#6 (text+ko) ==== @@ -44,7 +44,6 @@ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE */ - #include __FBSDID("$FreeBSD$"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#5 (text+ko) ==== @@ -74,7 +74,6 @@ * enabled. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#7 (text+ko) ==== @@ -43,8 +43,6 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ - - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#10 (text+ko) ==== @@ -44,7 +44,6 @@ * Biba fixed label mandatory integrity policy. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#9 (text+ko) ==== @@ -45,7 +45,6 @@ * policy entry points. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.9 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.2 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 11:41:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37EED1065671; Sat, 16 Aug 2008 11:41:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFE5D106566B for ; Sat, 16 Aug 2008 11:41:12 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC24F8FC08 for ; Sat, 16 Aug 2008 11:41:12 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GBfCbk095231 for ; Sat, 16 Aug 2008 11:41:12 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GBfCt1095229 for perforce@freebsd.org; Sat, 16 Aug 2008 11:41:12 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 11:41:12 GMT Message-Id: <200808161141.m7GBfCt1095229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 11:41:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=147521 Change 147521 by zec@zec_tpx32 on 2008/08/16 11:41:07 Virtualize accf_http (a single tunable int). Reviewed by: brooks, dwmalone, other lurking in occasionally Obtained from: devsummit08 Affected files ... .. //depot/projects/vimage/src/sys/kern/uipc_accf.c#2 edit .. //depot/projects/vimage/src/sys/netinet/accf_http.c#3 edit .. //depot/projects/vimage/src/sys/sys/socketvar.h#12 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#59 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/uipc_accf.c#2 (text+ko) ==== @@ -58,11 +58,12 @@ MALLOC_DEFINE(M_ACCF, "accf", "accept filter data"); -static int unloadable = 0; +int accf_unloadable = 0; SYSCTL_DECL(_net_inet); /* XXX: some header should do this for me */ SYSCTL_NODE(_net_inet, OID_AUTO, accf, CTLFLAG_RW, 0, "Accept filters"); -SYSCTL_INT(_net_inet_accf, OID_AUTO, unloadable, CTLFLAG_RW, &unloadable, 0, +SYSCTL_INT(_net_inet_accf, OID_AUTO, unloadable, CTLFLAG_RW, + &accf_unloadable, 0, "Allow unload of accept filters (not recommended)"); /* @@ -144,7 +145,7 @@ * having it called is a bad thing. A simple fix would be to * track the refcount in the struct accept_filter. */ - if (unloadable != 0) { + if (accf_unloadable != 0) { error = accept_filt_del(accfp->accf_name); } else error = EOPNOTSUPP; ==== //depot/projects/vimage/src/sys/netinet/accf_http.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* check for GET/HEAD */ static void sohashttpget(struct socket *so, void *arg, int waitflag); @@ -51,6 +52,8 @@ int max, char *cmp); /* socketbuffer is full */ static int sbfull(struct sockbuf *sb); +static int +accept_filt_http_mod_event(module_t mod, int event, void *data); static struct accept_filter accf_http_filter = { "httpready", @@ -61,19 +64,42 @@ static moduledata_t accf_http_mod = { "accf_http", - accept_filt_generic_mod_event, - &accf_http_filter + accept_filt_http_mod_event, + NULL, }; DECLARE_MODULE(accf_http, accf_http_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -static int parse_http_version = 1; +#ifndef VIMAGE +static int parse_http_version; +#endif + +/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ +struct vnet_accf_http { + int _parse_http_version; +}; + +#define INIT_VNET_ACCF_HTTP(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_ACCF_HTTP, struct vnet_accf_http, vnet_accf_http) + +#define VNET_ACCF_HTTP(sym) VSYM(vnet_accf_http, sym) + +#define V_parse_http_version VNET_ACCF_HTTP(parse_http_version) + +#define V_MOD_vnet_accf_http VNET_MOD_ACCF_HTTP + +static vnet_attach_fn vnet_accf_http_iattach; + +VNET_MOD_DECLARE(ACCF_HTTP, accf_http, vnet_accf_http_iattach, + NULL, INET, NULL) + +/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); -SYSCTL_INT(_net_inet_accf_http, OID_AUTO, parsehttpversion, CTLFLAG_RW, -&parse_http_version, 1, -"Parse http version so that non 1.x requests work"); +SYSCTL_V_INT(V_NET, vnet_accf_http, _net_inet_accf_http, OID_AUTO, + parsehttpversion, CTLFLAG_RW, parse_http_version, 1, + "Parse http version so that non 1.x requests work"); #ifdef ACCF_HTTP_DEBUG #define DPRINT(fmt, args...) \ @@ -161,6 +187,7 @@ static void sohashttpget(struct socket *so, void *arg, int waitflag) { + INIT_VNET_ACCF_HTTP(so->so_vnet); if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 && !sbfull(&so->so_rcv)) { struct mbuf *m; @@ -192,7 +219,7 @@ } if (mbufstrcmp(m, m->m_nextpkt, 1, cmp) == 1) { DPRINT("mbufstrcmp ok"); - if (parse_http_version == 0) + if (V_parse_http_version == 0) soishttpconnected(so, arg, waitflag); else soparsehttpvers(so, arg, waitflag); @@ -360,3 +387,58 @@ soisconnected(so); return; } + +static int +accept_filt_http_mod_event(module_t mod, int event, void *data) +{ + struct accept_filter *p; + int error; + + switch (event) { + case MOD_LOAD: +#ifdef VIMAGE + vnet_mod_register(&vnet_accf_http_modinfo); +#else + vnet_accf_http_iattach(NULL); +#endif /* !VIMAGE */ + + MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, + M_WAITOK); + bcopy(&accf_http_filter, p, sizeof(*p)); + error = accept_filt_add(p); + break; + + case MOD_UNLOAD: + /* + * Do not support unloading yet. we don't keep track of + * refcounts and unloading an accept filter callback and then + * having it called is a bad thing. A simple fix would be to + * track the refcount in the struct accept_filter. + */ + if (accf_unloadable != 0) { + error = accept_filt_del(accf_http_filter.accf_name); + } else + error = EOPNOTSUPP; + break; + + case MOD_SHUTDOWN: + error = 0; + break; + + default: + error = EOPNOTSUPP; + break; + } + + return (error); +} + +static int vnet_accf_http_iattach(const void *unused) +{ + INIT_VNET_ACCF_HTTP(curvnet); + + V_parse_http_version = 1; + + return 0; +} + ==== //depot/projects/vimage/src/sys/sys/socketvar.h#12 (text+ko) ==== @@ -295,6 +295,7 @@ MALLOC_DECLARE(M_SONAME); #endif +extern int accf_unloadable; extern int maxsockets; extern u_long sb_max; extern struct uma_zone *socket_zone; ==== //depot/projects/vimage/src/sys/sys/vimage.h#59 (text+ko) ==== @@ -78,6 +78,7 @@ #define VNET_MOD_ALTQ 8 #define VNET_MOD_IPX 9 #define VNET_MOD_ATALK 10 +#define VNET_MOD_ACCF_HTTP 11 /* stateless modules */ #define VNET_MOD_NG_WORMHOLE 19 #define VNET_MOD_NG_ETHER 20 From owner-p4-projects@FreeBSD.ORG Sat Aug 16 11:51:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F49106567A; Sat, 16 Aug 2008 11:51:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C76B1065675 for ; Sat, 16 Aug 2008 11:51:23 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48AEE8FC20 for ; Sat, 16 Aug 2008 11:51:23 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GBpNEJ096491 for ; Sat, 16 Aug 2008 11:51:23 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GBpN6Z096489 for perforce@freebsd.org; Sat, 16 Aug 2008 11:51:23 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 11:51:23 GMT Message-Id: <200808161151.m7GBpN6Z096489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 11:51:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147522 Change 147522 by zec@zec_tpx32 on 2008/08/16 11:51:15 Add copyright note, RCS ID, and commod #ifnef wrapping over machine-generate body of sys/vimage. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#5 (text+ko) ==== @@ -1,3 +1,38 @@ +/*- + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation + * + * This software was developed by the University of Zagreb and the + * FreeBSD Foundation under sponsorship by the Stichting NLnet and the + * FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD: $ + */ + +#ifndef _SYS_VIMAGE_H_ +#define _SYS_VIMAGE_H_ + #define V_hostname hostname #define G_hostname hostname #define V_domainname domainname @@ -308,3 +343,5 @@ #define V_udpstat udpstat #define V_useloopback useloopback #define V_verbose_limit verbose_limit + +#endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 11:53:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E071C106567B; Sat, 16 Aug 2008 11:53:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A48F1106564A for ; Sat, 16 Aug 2008 11:53:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 769A88FC20 for ; Sat, 16 Aug 2008 11:53:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GBrPHg096621 for ; Sat, 16 Aug 2008 11:53:25 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GBrP9h096619 for perforce@freebsd.org; Sat, 16 Aug 2008 11:53:25 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 11:53:25 GMT Message-Id: <200808161153.m7GBrP9h096619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 11:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147523 Change 147523 by zec@zec_tpx32 on 2008/08/16 11:52:26 Adjust #ifdefs -> vimage.h is now in sys/, not in net/. Affected files ... .. //depot/projects/vimage/src/sys/sys/vimage.h#60 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/vimage.h#60 (text+ko) ==== @@ -28,8 +28,8 @@ * SUCH DAMAGE. */ -#ifndef _NET_VIMAGE_H_ -#define _NET_VIMAGE_H_ +#ifndef _SYS_VIMAGE_H_ +#define _SYS_VIMAGE_H_ #include #include @@ -497,4 +497,4 @@ #define VI_SET_CHROOT 0x00200000 -#endif /* _NET_VIMAGE_H_ */ +#endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:03:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BB261065690; Sat, 16 Aug 2008 12:03:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE6101065688 for ; Sat, 16 Aug 2008 12:03:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D99218FC26 for ; Sat, 16 Aug 2008 12:03:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GC3Zbm098538 for ; Sat, 16 Aug 2008 12:03:35 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GC3Zbb098536 for perforce@freebsd.org; Sat, 16 Aug 2008 12:03:35 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 12:03:35 GMT Message-Id: <200808161203.m7GC3Zbb098536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:03:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=147524 Change 147524 by zec@zec_tpx32 on 2008/08/16 12:02:49 Merge vimage -> vimage-devel Affected files ... .. //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate .. //depot/projects/vimage-devel/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/vimage-devel/src/sys/sys/socketvar.h#5 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#10 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 (text+ko) ==== @@ -53,7 +53,9 @@ #include #include #include +#include +#include #include #include @@ -237,9 +239,12 @@ /* Register existing TOE interfaces by walking the ifnet chain */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + VNET_ITERLOOP_BEGIN(); + INIT_VNET_NET(curvnet); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { (void)ifaddr_event_handler(NULL, ifp); } + VNET_ITERLOOP_END(); IFNET_RUNLOCK(); return 0; } ==== //depot/projects/vimage-devel/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 (text+ko) ==== @@ -48,10 +48,12 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -262,6 +264,7 @@ static inline void make_tx_data_wr(struct socket *so, struct mbuf *m, int len, struct mbuf *tail) { + INIT_VNET_INET(so->so_vnet); struct tcpcb *tp = so_sototcpcb(so); struct toepcb *toep = tp->t_toe; struct tx_data_wr *req; @@ -289,8 +292,8 @@ /* Sendbuffer is in units of 32KB. */ - if (tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) - req->param |= htonl(V_TX_SNDBUF(tcp_autosndbuf_max >> 15)); + if (V_tcp_do_autosndbuf && snd->sb_flags & SB_AUTOSIZE) + req->param |= htonl(V_TX_SNDBUF(V_tcp_autosndbuf_max >> 15)); else { req->param |= htonl(V_TX_SNDBUF(snd->sb_hiwat >> 15)); } @@ -1223,6 +1226,7 @@ static unsigned long select_rcv_wnd(struct toedev *dev, struct socket *so) { + INIT_VNET_INET(so->so_vnet); struct tom_data *d = TOM_DATA(dev); unsigned int wnd; unsigned int max_rcv_wnd; @@ -1230,8 +1234,8 @@ rcv = so_sockbuf_rcv(so); - if (tcp_do_autorcvbuf) - wnd = tcp_autorcvbuf_max; + if (V_tcp_do_autorcvbuf) + wnd = V_tcp_autorcvbuf_max; else wnd = rcv->sb_hiwat; @@ -3768,6 +3772,7 @@ static void socket_act_establish(struct socket *so, struct mbuf *m) { + INIT_VNET_INET(so->so_vnet); struct cpl_act_establish *req = cplhdr(m); u32 rcv_isn = ntohl(req->rcv_isn); /* real RCV_ISN + 1 */ struct tcpcb *tp = so_sototcpcb(so); @@ -3817,7 +3822,7 @@ #endif toep->tp_state = tp->t_state; - tcpstat.tcps_connects++; + V_tcpstat.tcps_connects++; } ==== //depot/projects/vimage-devel/src/sys/geom/vinum/geom_vinum_drive.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -63,7 +64,7 @@ vhdr->config_length = GV_CFG_LEN; mtx_lock(&hostname_mtx); - bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); + bcopy(G_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); mtx_unlock(&hostname_mtx); strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); microtime(&vhdr->label.date_of_birth); ==== //depot/projects/vimage-devel/src/sys/kern/uipc_accf.c#2 (text+ko) ==== @@ -58,11 +58,12 @@ MALLOC_DEFINE(M_ACCF, "accf", "accept filter data"); -static int unloadable = 0; +int accf_unloadable = 0; SYSCTL_DECL(_net_inet); /* XXX: some header should do this for me */ SYSCTL_NODE(_net_inet, OID_AUTO, accf, CTLFLAG_RW, 0, "Accept filters"); -SYSCTL_INT(_net_inet_accf, OID_AUTO, unloadable, CTLFLAG_RW, &unloadable, 0, +SYSCTL_INT(_net_inet_accf, OID_AUTO, unloadable, CTLFLAG_RW, + &accf_unloadable, 0, "Allow unload of accept filters (not recommended)"); /* @@ -144,7 +145,7 @@ * having it called is a bad thing. A simple fix would be to * track the refcount in the struct accept_filter. */ - if (unloadable != 0) { + if (accf_unloadable != 0) { error = accept_filt_del(accfp->accf_name); } else error = EOPNOTSUPP; ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_source.c#2 (text+ko) ==== @@ -615,7 +615,7 @@ ifp = ifunit(ifname); if (ifp == NULL) { - printf("%s: can't find interface %d\n", __func__, if_index); + printf("%s: can't find interface %s\n", __func__, ifname); return (EINVAL); } sc->output_ifp = ifp; ==== //depot/projects/vimage-devel/src/sys/netinet/accf_http.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* check for GET/HEAD */ static void sohashttpget(struct socket *so, void *arg, int waitflag); @@ -51,6 +52,8 @@ int max, char *cmp); /* socketbuffer is full */ static int sbfull(struct sockbuf *sb); +static int +accept_filt_http_mod_event(module_t mod, int event, void *data); static struct accept_filter accf_http_filter = { "httpready", @@ -61,19 +64,42 @@ static moduledata_t accf_http_mod = { "accf_http", - accept_filt_generic_mod_event, - &accf_http_filter + accept_filt_http_mod_event, + NULL, }; DECLARE_MODULE(accf_http, accf_http_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -static int parse_http_version = 1; +#ifndef VIMAGE +static int parse_http_version; +#endif + +/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ +struct vnet_accf_http { + int _parse_http_version; +}; + +#define INIT_VNET_ACCF_HTTP(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_ACCF_HTTP, struct vnet_accf_http, vnet_accf_http) + +#define VNET_ACCF_HTTP(sym) VSYM(vnet_accf_http, sym) + +#define V_parse_http_version VNET_ACCF_HTTP(parse_http_version) + +#define V_MOD_vnet_accf_http VNET_MOD_ACCF_HTTP + +static vnet_attach_fn vnet_accf_http_iattach; + +VNET_MOD_DECLARE(ACCF_HTTP, accf_http, vnet_accf_http_iattach, + NULL, INET, NULL) + +/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0, "HTTP accept filter"); -SYSCTL_INT(_net_inet_accf_http, OID_AUTO, parsehttpversion, CTLFLAG_RW, -&parse_http_version, 1, -"Parse http version so that non 1.x requests work"); +SYSCTL_V_INT(V_NET, vnet_accf_http, _net_inet_accf_http, OID_AUTO, + parsehttpversion, CTLFLAG_RW, parse_http_version, 1, + "Parse http version so that non 1.x requests work"); #ifdef ACCF_HTTP_DEBUG #define DPRINT(fmt, args...) \ @@ -161,6 +187,7 @@ static void sohashttpget(struct socket *so, void *arg, int waitflag) { + INIT_VNET_ACCF_HTTP(so->so_vnet); if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 && !sbfull(&so->so_rcv)) { struct mbuf *m; @@ -192,7 +219,7 @@ } if (mbufstrcmp(m, m->m_nextpkt, 1, cmp) == 1) { DPRINT("mbufstrcmp ok"); - if (parse_http_version == 0) + if (V_parse_http_version == 0) soishttpconnected(so, arg, waitflag); else soparsehttpvers(so, arg, waitflag); @@ -360,3 +387,58 @@ soisconnected(so); return; } + +static int +accept_filt_http_mod_event(module_t mod, int event, void *data) +{ + struct accept_filter *p; + int error; + + switch (event) { + case MOD_LOAD: +#ifdef VIMAGE + vnet_mod_register(&vnet_accf_http_modinfo); +#else + vnet_accf_http_iattach(NULL); +#endif /* !VIMAGE */ + + MALLOC(p, struct accept_filter *, sizeof(*p), M_ACCF, + M_WAITOK); + bcopy(&accf_http_filter, p, sizeof(*p)); + error = accept_filt_add(p); + break; + + case MOD_UNLOAD: + /* + * Do not support unloading yet. we don't keep track of + * refcounts and unloading an accept filter callback and then + * having it called is a bad thing. A simple fix would be to + * track the refcount in the struct accept_filter. + */ + if (accf_unloadable != 0) { + error = accept_filt_del(accf_http_filter.accf_name); + } else + error = EOPNOTSUPP; + break; + + case MOD_SHUTDOWN: + error = 0; + break; + + default: + error = EOPNOTSUPP; + break; + } + + return (error); +} + +static int vnet_accf_http_iattach(const void *unused) +{ + INIT_VNET_ACCF_HTTP(curvnet); + + V_parse_http_version = 1; + + return 0; +} + ==== //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#5 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/socketvar.h#5 (text+ko) ==== @@ -295,6 +295,7 @@ MALLOC_DECLARE(M_SONAME); #endif +extern int accf_unloadable; extern int maxsockets; extern u_long sb_max; extern struct uma_zone *socket_zone; ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#10 (text+ko) ==== @@ -28,8 +28,8 @@ * SUCH DAMAGE. */ -#ifndef _NET_VIMAGE_H_ -#define _NET_VIMAGE_H_ +#ifndef _SYS_VIMAGE_H_ +#define _SYS_VIMAGE_H_ #include #include @@ -78,6 +78,7 @@ #define VNET_MOD_ALTQ 8 #define VNET_MOD_IPX 9 #define VNET_MOD_ATALK 10 +#define VNET_MOD_ACCF_HTTP 11 /* stateless modules */ #define VNET_MOD_NG_WORMHOLE 19 #define VNET_MOD_NG_ETHER 20 @@ -501,4 +502,4 @@ #define VI_SET_CHROOT 0x00200000 -#endif /* _NET_VIMAGE_H_ */ +#endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:04:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F2DF1065673; Sat, 16 Aug 2008 12:04:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 236DC106566C for ; Sat, 16 Aug 2008 12:04:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EA228FC08 for ; Sat, 16 Aug 2008 12:04:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GC4ajW098602 for ; Sat, 16 Aug 2008 12:04:41 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GC4aKA098600 for perforce@freebsd.org; Sat, 16 Aug 2008 12:04:36 GMT (envelope-from trasz@freebsd.org) Date: Sat, 16 Aug 2008 12:04:36 GMT Message-Id: <200808161204.m7GC4aKA098600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=147525 Change 147525 by trasz@trasz_traszkan on 2008/08/16 12:04:10 Cosmetic fixes and little change in parameter list of one of the functions. No functional changes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#26 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#22 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#14 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#26 (text+ko) ==== @@ -99,7 +99,8 @@ *denied_explicitly = 0; KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0")); - KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); + KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES, + ("aclp->acl_cnt <= ACL_MAX_ENTRIES")); for (i = 0; i < aclp->acl_cnt; i++) { entry = &(aclp->acl_entry[i]); @@ -330,6 +331,9 @@ struct acl_entry *entry, *copy, *previous, *a1, *a2, *a3, *a4, *a5, *a6; mode_t amode; + const int READ = 04; + const int WRITE = 02; + const int EXEC = 01; /* * NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-03.txt @@ -493,28 +497,28 @@ amode = amode >> 3; if (entry->ae_perm & ACL_READ_DATA) { - if (amode & ACL_READ) + if (amode & READ) previous->ae_perm &= ~ACL_READ_DATA; else previous->ae_perm |= ACL_READ_DATA; } if (entry->ae_perm & ACL_WRITE_DATA) { - if (amode & ACL_WRITE) + if (amode & WRITE) previous->ae_perm &= ~ACL_WRITE_DATA; else previous->ae_perm |= ACL_WRITE_DATA; } if (entry->ae_perm & ACL_APPEND_DATA) { - if (amode & ACL_WRITE) + if (amode & WRITE) previous->ae_perm &= ~ACL_APPEND_DATA; else previous->ae_perm |= ACL_APPEND_DATA; } if (entry->ae_perm & ACL_EXECUTE) { - if (amode & ACL_EXECUTE) + if (amode & EXEC) previous->ae_perm &= ~ACL_EXECUTE; else previous->ae_perm |= ACL_EXECUTE; @@ -537,25 +541,22 @@ extramode &= ~ownermode; if (extramode) { - CTASSERT(ACL_READ == 04); - CTASSERT(ACL_WRITE == 02); - if (extramode & ACL_READ) { + if (extramode & READ) { entry->ae_perm &= ~ACL_READ_DATA; previous->ae_perm &= ~ACL_READ_DATA; } - if (extramode & ACL_WRITE) { + if (extramode & WRITE) { entry->ae_perm &= ~(ACL_WRITE_DATA | ACL_APPEND_DATA); previous->ae_perm &= ~(ACL_WRITE_DATA | ACL_APPEND_DATA); } - } - CTASSERT(ACL_EXECUTE == 01); - if (extramode & ACL_EXECUTE) { - entry->ae_perm &= ~ACL_EXECUTE; - previous->ae_perm &= ~ACL_EXECUTE; + if (extramode & EXEC) { + entry->ae_perm &= ~ACL_EXECUTE; + previous->ae_perm &= ~ACL_EXECUTE; + } } } } @@ -800,8 +801,8 @@ } int -acl_nfs4_compute_inherited_acl(struct acl *child_aclp, - const struct acl *parent_aclp, mode_t mode, int file_owner_id, +acl_nfs4_compute_inherited_acl(const struct acl *parent_aclp, + struct acl *child_aclp, mode_t mode, int file_owner_id, int is_directory) { int i, error, flags; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#22 (text+ko) ==== @@ -270,13 +270,19 @@ mode_t acl_posix1e_newfilemode(mode_t cmode, struct acl *dacl); -int acl_nfs4_sync_acl_from_mode(struct acl *aclp, mode_t mode, int file_owner_id); -void acl_nfs4_sync_mode_from_acl(mode_t *mode, const struct acl *aclp); +int acl_nfs4_sync_acl_from_mode(struct acl *aclp, + mode_t mode, int file_owner_id); +void acl_nfs4_sync_mode_from_acl(mode_t *mode, + const struct acl *aclp); int acl_nfs4_is_trivial(const struct acl *aclp); -int acl_nfs4_compute_inherited_acl(struct acl *child_aclp, const struct acl *parent_aclp, - mode_t mode, int file_owner_id, int is_directory); -int acl_copy_oldacl_into_acl(const struct oldacl *source, struct acl *dest); -int acl_copy_acl_into_oldacl(const struct acl *source, struct oldacl *dest); +int acl_nfs4_compute_inherited_acl( + const struct acl *parent_aclp, + struct acl *child_aclp, mode_t mode, + int file_owner_id, int is_directory); +int acl_copy_oldacl_into_acl(const struct oldacl *source, + struct acl *dest); +int acl_copy_acl_into_oldacl(const struct acl *source, + struct oldacl *dest); /* * File system independent syntax check for a POSIX.1e ACL. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#14 (text+ko) ==== @@ -1422,8 +1422,8 @@ #ifdef UFS_ACL static int -ufs_do_nfs4_acl_inheritance(struct vnode *parentvp, struct vnode *childvp, mode_t child_mode, - int file_owner_id, int is_directory, struct ucred *cred, struct thread *td) +ufs_do_nfs4_acl_inheritance(struct vnode *dvp, struct vnode *tvp, + mode_t child_mode, struct ucred *cred, struct thread *td) { int error; struct acl *parent_aclp, *child_aclp; @@ -1431,16 +1431,16 @@ parent_aclp = acl_alloc(); child_aclp = acl_alloc(); - error = VOP_GETACL(parentvp, ACL_TYPE_NFS4, parent_aclp, cred, td); + error = VOP_GETACL(dvp, ACL_TYPE_NFS4, parent_aclp, cred, td); if (error) goto out; - error = acl_nfs4_compute_inherited_acl(child_aclp, parent_aclp, - child_mode, file_owner_id, is_directory); + error = acl_nfs4_compute_inherited_acl(parent_aclp, child_aclp, + child_mode, VTOI(tvp)->i_uid, tvp->v_type == VDIR); if (error) goto out; - error = VOP_SETACL(childvp, ACL_TYPE_NFS4, child_aclp, cred, td); + error = VOP_SETACL(tvp, ACL_TYPE_NFS4, child_aclp, cred, td); if (error) goto out; @@ -1686,7 +1686,7 @@ if (dvp->v_mount->mnt_flag & MNT_NFS4ACLS) { error = ufs_do_nfs4_acl_inheritance(dvp, tvp, dmode, - ip->i_uid, 1, cnp->cn_cred, cnp->cn_thread); + cnp->cn_cred, cnp->cn_thread); if (error) goto bad; } @@ -2517,7 +2517,7 @@ if (dvp->v_mount->mnt_flag & MNT_NFS4ACLS) { error = ufs_do_nfs4_acl_inheritance(dvp, tvp, mode, - ip->i_uid, 0, cnp->cn_cred, cnp->cn_thread); + cnp->cn_cred, cnp->cn_thread); if (error) goto bad; } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:08:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC60F106567F; Sat, 16 Aug 2008 12:08:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 806F31065675 for ; Sat, 16 Aug 2008 12:08:46 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B12D8FC0C for ; Sat, 16 Aug 2008 12:08:46 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GC8k0F099132 for ; Sat, 16 Aug 2008 12:08:46 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GC8kiI099130 for perforce@freebsd.org; Sat, 16 Aug 2008 12:08:46 GMT (envelope-from strauss@FreeBSD.org) Date: Sat, 16 Aug 2008 12:08:46 GMT Message-Id: <200808161208.m7GC8kiI099130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:08:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=147527 Change 147527 by strauss@strauss_marvelman on 2008/08/16 12:08:40 - Fix: data write function does not write over the limit of the entry size. - Fix: when writing the header for a folder entry the entry size is reset to 0. - Disabled parts in the ZIP writer test, must adapt ZIP reader before the tests will pass. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#37 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#2 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#37 (text+ko) ==== @@ -30,7 +30,7 @@ * - No encryption support. * - No ZIP64 support. * - No support for splitting and spanning. - * - Only writes regular file entries. + * - Only supports regular file and folder entries. * * Note that generally data in ZIP files is little-endian encoded, * with some exceptions. @@ -156,6 +156,7 @@ struct zip_file_header_link *central_directory_end; off_t offset; size_t written_bytes; + size_t remaining_data_bytes; }; struct zip_central_directory_end { @@ -188,6 +189,7 @@ zip->central_directory_end = NULL; zip->offset = 0; zip->written_bytes = 0; + zip->remaining_data_bytes = 0; a->format_data = zip; a->pad_uncompressed = 0; /* Actually not needed for now, since no compression support yet. */ @@ -227,9 +229,14 @@ return ARCHIVE_FAILED; }; + /* Directory entries should have a size of 0. */ + if (type == AE_IFDIR) + archive_entry_set_size(entry, 0); + zip = a->format_data; d = &zip->data_descriptor; size = archive_entry_size(entry); + zip->remaining_data_bytes = size; /* Append archive entry to the central directory data. */ l = (struct zip_file_header_link *) malloc(sizeof(*l)); @@ -310,6 +317,9 @@ struct zip *zip = a->format_data; struct zip_file_header_link *l = zip->central_directory_end; + if (s > zip->remaining_data_bytes) + s = zip->remaining_data_bytes; + ret = (a->compressor.write)(a, buff, s); if (ret >= 0) { zip->written_bytes += s; ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* -* Copyright (c) 2008 Tim Kientzle +/*- +* Copyright (c) 2003-2008 Tim Kientzle * Copyright (c) 2008 Anselm Strauss * All rights reserved. * @@ -61,7 +61,7 @@ assertEqualInt(0, archive_write_header(a, ae)); archive_entry_free(ae); - assertEqualInt(8, archive_write_data(a, "12345678", 8)); + assertEqualInt(8, archive_write_data(a, "12345678", 9)); /* * Write another file to it. @@ -78,7 +78,7 @@ assertEqualInt(ARCHIVE_OK, archive_write_header(a, ae)); archive_entry_free(ae); - assertEqualInt(4, archive_write_data(a, "1234", 4)); + assertEqualInt(4, archive_write_data(a, "1234", 5)); /* * Write a directory to it. @@ -87,13 +87,13 @@ archive_entry_set_mtime(ae, 11, 110); archive_entry_copy_pathname(ae, "dir"); archive_entry_set_mode(ae, S_IFDIR | 0755); - archive_entry_set_size(ae, 0); + archive_entry_set_size(ae, 512); assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); failure("size should be zero so that applications know not to write"); assertEqualInt(0, archive_entry_size(ae)); archive_entry_free(ae); - //assertEqualIntA(a, 0, archive_write_data(a, "12345678", 8)); + assertEqualIntA(a, 0, archive_write_data(a, "12345678", 9)); /* Close out the archive. */ assertEqualInt(ARCHIVE_OK, archive_write_close(a)); @@ -120,18 +120,19 @@ assertEqualInt(0, archive_entry_atime(ae)); assertEqualInt(0, archive_entry_ctime(ae)); assertEqualString("file", archive_entry_pathname(ae)); - /* TODO: ZIP reader does not yet extract permissions. */ - //assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); + /* TODO: reader does not yet restore permissions. */ + /* TODO: reader does not yet respect data descriptors. */ + /*assertEqualInt((S_IFREG | 0755), archive_entry_mode(ae)); assertEqualInt(8, archive_entry_size(ae)); assertEqualIntA(a, archive_entry_size(ae), archive_read_data(a, filedata, sizeof(filedata))); - assertEqualMem(filedata, "12345678", 8); + assertEqualMem(filedata, "12345678", 8);*/ /* * Read the second file back. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + /*assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(1, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_mtime_nsec(ae)); assertEqualInt(0, archive_entry_atime(ae)); @@ -141,12 +142,12 @@ assertEqualInt(4, archive_entry_size(ae)); assertEqualIntA(a, archive_entry_size(ae), archive_read_data(a, filedata, sizeof(filedata))); - assertEqualMem(filedata, "1234", 4); + assertEqualMem(filedata, "1234", 4);*/ /* * Read the dir entry back. */ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + /*assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualInt(11, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_mtime_nsec(ae)); assertEqualInt(0, archive_entry_atime(ae)); @@ -154,11 +155,11 @@ assertEqualString("dir", archive_entry_pathname(ae)); assertEqualInt((S_IFDIR | 0755), archive_entry_mode(ae)); assertEqualInt(0, archive_entry_size(ae)); - assertEqualIntA(a, 0, archive_read_data(a, filedata, 10)); + assertEqualIntA(a, 0, archive_read_data(a, filedata, 10));*/ /* Verify the end of the archive. */ - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + /*assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); - free(buff); + free(buff);*/ } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:09:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CA6C1065685; Sat, 16 Aug 2008 12:09:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C58AC1065674 for ; Sat, 16 Aug 2008 12:09:47 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9722E8FC12 for ; Sat, 16 Aug 2008 12:09:47 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GC9lbZ099403 for ; Sat, 16 Aug 2008 12:09:47 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GC9ljq099399 for perforce@freebsd.org; Sat, 16 Aug 2008 12:09:47 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 12:09:47 GMT Message-Id: <200808161209.m7GC9ljq099399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147528 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=147528 Change 147528 by bz@bz_dumpster on 2008/08/16 12:09:38 We are not interested in commiting those two. bye bye. Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC_NODEBUG#2 delete .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC_NODEBUG#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:44:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 476EA1065684; Sat, 16 Aug 2008 12:44:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AAA1106566C for ; Sat, 16 Aug 2008 12:44:23 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E8C1D8FC19 for ; Sat, 16 Aug 2008 12:44:22 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GCiMLg002625 for ; Sat, 16 Aug 2008 12:44:22 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GCiMOu002623 for perforce@freebsd.org; Sat, 16 Aug 2008 12:44:22 GMT (envelope-from gabor@freebsd.org) Date: Sat, 16 Aug 2008 12:44:22 GMT Message-Id: <200808161244.m7GCiMOu002623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 147530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147530 Change 147530 by gabor@gabor_server on 2008/08/16 12:43:58 IFC Affected files ... .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/Makefile#3 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/fastgrep.c#1 branch .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#5 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.c#3 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.h#3 integrate .. //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/util.c#3 integrate Differences ... ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/Makefile#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ PROG= grep -SRCS= file.c grep.c queue.c util.c +SRCS= fastgrep.c file.c grep.c queue.c util.c LINKS= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep \ ${BINDIR}/grep ${BINDIR}/zgrep \ ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/file.c#5 (text+ko) ==== @@ -119,36 +119,22 @@ { int i = 0; char ch; - size_t size; - wchar_t wbinbuf[BUFSIZ]; - const char *src = binbuf; - mbstate_t mbs; /* Fill in the buffer if it is empty. */ if (binbufptr == NULL) { /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { - for (; i < sizeof(wbinbuf) && !grep_feof(f); i++) { + for (; i < sizeof(binbuf) && !grep_feof(f); i++) { ch = grep_fgetc(f); - binbuf[i] = ch; + if (ch != EOF) + binbuf[i] = ch; + else + break; } - binbufsiz = i; - binbufptr = binbuf; - - /* Convert at most (BUFSIZ * sizeof(wint_t)) characters or - (BUFSIZ - 1) bytes to wide character string. */ - size = mbsnrtowcs(wbinbuf, &src, sizeof(wbinbuf), BUFSIZ - 1, &mbs); - f->binary = 0; - for (; size > 0; size--) - if (iswbinary(wbinbuf[size])) { - f->binary = 1; - break; - } - - } else { - binbufsiz = i; - binbufptr = binbuf; + f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0; } + binbufsiz = i; + binbufptr = binbuf; } /* Read a line whether from the buffer or from the file itself. */ ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.c#3 (text+ko) ==== @@ -95,6 +95,7 @@ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; +fastgrep_t *fg_pattern; #ifdef WITH_PCRE pcre **perl_pattern; #endif @@ -590,14 +591,26 @@ usage(); } if (grepbehave != GREP_PERL) { - /* Compile regexes with regcomp() */ + fg_pattern = grep_calloc(patterns, sizeof(*fg_pattern)); r_pattern = grep_calloc(patterns, sizeof(*r_pattern)); +/* + * XXX: fgrepcomp() and fastcomp() are workarounds for regexec() performance. + * Optimizations should be done there. + */ for (i = 0; i < patterns; ++i) { - c = regcomp(&r_pattern[i], pattern[i], cflags); - if (c != 0) { - regerror(c, &r_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); + /* Check if cheating is allowed (always is for fgrep). */ + if (grepbehave == GREP_FIXED) + fgrepcomp(&fg_pattern[i], pattern[i]); + else { + if (fastcomp(&fg_pattern[i], pattern[i])) { + /* Fall back to full regex library */ + c = regcomp(&r_pattern[i], pattern[i], cflags); + if (c != 0) { + regerror(c, &r_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); + } + } } } } else { ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/grep.h#3 (text+ko) ==== @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -90,6 +91,16 @@ char *dat; }; +typedef struct { + unsigned char *pattern; + int len; + int qsBc[UCHAR_MAX + 1]; + /* flags */ + int bol; + int eol; + int reversed; +} fastgrep_t; + /* Flags passed to regcomp() and regexec() */ extern int cflags, eflags; @@ -105,6 +116,7 @@ extern int first, prev, matchall, patterns, epatterns, tail, notfound; extern char **pattern, **epattern; extern regex_t *r_pattern, *er_pattern; +extern fastgrep_t *fg_pattern; #ifdef WITH_PCRE extern pcre **perl_pattern; @@ -138,3 +150,8 @@ int grep_feof(struct file *f); int grep_fgetc(struct file *f); char *grep_fgetln(struct file *f, size_t *len); + +/* fastgrep.c */ +int fastcomp(fastgrep_t *, const char *); +void fgrepcomp(fastgrep_t *, const char *); +int grep_search(fastgrep_t *, unsigned char *, size_t, regmatch_t *); ==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/grep/util.c#3 (text+ko) ==== @@ -243,14 +243,12 @@ regmatch_t pmatch; regmatch_t matches[MAX_LINE_MATCHES]; regoff_t st = 0; - int c = 0, i, r = 0, m = 0, t; + int c = 0, i, r = 0, m = 0; #ifdef WITH_PCRE int ovector[3]; #endif if (!matchall) { - t = vflag ? REG_NOMATCH : 0; - /* Loop to process the whole line */ while (st <= l->len) { pmatch.rm_so = st; @@ -258,8 +256,18 @@ /* Loop to compare with all the patterns */ for (i = 0; i < patterns; i++) { - if (grepbehave != GREP_PERL) { +/* + * XXX: grep_search() is a workaround for speed up and should be + * removed in the future. See fastgrep.c. + */ + if (fg_pattern[i].pattern) { + r = grep_search(&fg_pattern[i], (unsigned char *)l->dat, + l->len, &pmatch); + r = (r == 0) ? (vflag ? REG_NOMATCH : 0) : (vflag ? 0 : REG_NOMATCH); + st = pmatch.rm_eo; + } else if (grepbehave != GREP_PERL) { r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags); + r = (r == 0) ? (vflag ? REG_NOMATCH : 0) : (vflag ? 0 : REG_NOMATCH); st = pmatch.rm_eo; } else { #ifdef WITH_PCRE @@ -271,7 +279,7 @@ ; #endif } - if (r == REG_NOMATCH && t == 0) + if (r == REG_NOMATCH) continue; /* Check for full match */ if (r == 0 && xflag) @@ -290,7 +298,7 @@ r = REG_NOMATCH; free(wbegin); } - if (r == t) { + if (r == 0) { if (m == 0) c++; if (m < MAX_LINE_MATCHES) @@ -313,7 +321,7 @@ return (c); /* Binary file */ /* Dealing with the context */ - if ((tail || (c && !vflag)) && !cflag && !qflag) { + if ((tail || c) && !cflag && !qflag) { if (c) { if (!first && !prev && !tail && Aflag) printf("--\n"); From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:47:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8075E1065673; Sat, 16 Aug 2008 12:47:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44B05106564A for ; Sat, 16 Aug 2008 12:47:26 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F1CC8FC14 for ; Sat, 16 Aug 2008 12:47:26 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GClQMN012144 for ; Sat, 16 Aug 2008 12:47:26 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GClQgL012142 for perforce@freebsd.org; Sat, 16 Aug 2008 12:47:26 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 12:47:26 GMT Message-Id: <200808161247.m7GClQgL012142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:47:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=147531 Change 147531 by zec@zec_tpx32 on 2008/08/16 12:46:36 Nuke unnecessary #include refernces to sys/vimage.h Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#6 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#8 edit .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#5 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#11 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#9 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#10 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#7 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#8 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#5 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#11 (text+ko) ==== @@ -69,7 +69,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#9 (text+ko) ==== @@ -68,7 +68,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#10 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#10 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include #include -#include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 12:56:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EED2C1065680; Sat, 16 Aug 2008 12:56:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1C79106567A for ; Sat, 16 Aug 2008 12:56:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C3EB8FC12 for ; Sat, 16 Aug 2008 12:56:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GCuZ4L012844 for ; Sat, 16 Aug 2008 12:56:35 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GCuZS9012842 for perforce@freebsd.org; Sat, 16 Aug 2008 12:56:35 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 12:56:35 GMT Message-Id: <200808161256.m7GCuZS9012842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 12:56:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=147532 Change 147532 by zec@zec_tpx32 on 2008/08/16 12:56:28 Looks like I was a bit hasty with change 147531. ip_newid() is an inline defined in ip_var.h, so whereever it is used in the code, definitions from sys/vimage.h are required. So, instead of reverting back to pre-147531, #include sys/vimage.h once from netinet/ip_var.h, instead of having it in included individually from a multitude of affected .c files. of . Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#3 (text+ko) ==== @@ -34,6 +34,7 @@ #define _NETINET_IP_VAR_H_ #include +#include /* * Overlay for ip header used by other protocols (tcp, udp). From owner-p4-projects@FreeBSD.ORG Sat Aug 16 13:37:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86D271065674; Sat, 16 Aug 2008 13:37:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15A27106567D for ; Sat, 16 Aug 2008 13:37:17 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F13B48FC08 for ; Sat, 16 Aug 2008 13:37:16 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GDbGhv017394 for ; Sat, 16 Aug 2008 13:37:16 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GDbGBY017392 for perforce@freebsd.org; Sat, 16 Aug 2008 13:37:16 GMT (envelope-from andenore@FreeBSD.org) Date: Sat, 16 Aug 2008 13:37:16 GMT Message-Id: <200808161337.m7GDbGBY017392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 147533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 13:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=147533 Change 147533 by andenore@andenore_laptop on 2008/08/16 13:36:26 Bugfixing and updating some manpages. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#12 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/Makefile#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/main.c#7 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#6 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/pkg_delete.1#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/main.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/perform.c#11 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#7 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#13 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#16 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/match.c#10 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/pen.c#3 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#11 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/version/perform.c#7 edit Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/CHANGES#12 (text+ko) ==== @@ -1,50 +1,61 @@ Changes made to pkg_install during SoC2008 by Anders Nore (andenore@FreeBSD.org) -Last modified: 2008 08 03 +Last modified: 2008 08 13 Converter: - - Added convert program that indexes information to PKG_DBCACHE_FILE - - Added some features to lookup keys and print them (or print whole db) - - Caches origin, installtime and which-files (files in package to pkgname) + - Added convert program that indexes information to PKG_DBCACHE_FILE + - Added some features to lookup keys and print them (or print whole db) + - Caches origin, installtime and which-files (files in package to pkgname) + - Caches installtime for packages without '@comment DATE:' using ctime for +COMMENT + Info: - - Improved performance for -W option using the dbcache - - Profiling showed that the default behavior for pkg_info was to read plist + - Improved performance for -W option using the dbcache + - Profiling showed that the default behavior for pkg_info was to read plist everytime even though not needed. Added check for this and speed improved significantly. - - Uses human readable output for -s (size option) I'm not sure if this breaks + - Uses human readable output for -s (size option) I'm not sure if this breaks things, but it looks Ok. (The old output is available via the -b option) - - Print installation date with -n (human readable) or -N (seconds since epoch) - - Added installtime comparison with the -M option, e.g, + - Print installation date with -n (human readable) or -N (seconds since epoch) + - Added installtime comparison with the -M option, e.g, "pkg_info -M '*>2008-07-18 18:30:21'" will list all packages installed after the date YYYY-MM-DD hh:mm:ss. Add: - - Indexes information to dbcache according to the add - - Added percentage progress for remote fetching ( -r option ) - - Fixes dependencies when installing (scans installed ports, checks @pkgdep + - Indexes information to dbcache according to the add + - Added percentage progress for remote fetching ( -r option ) + - Fixes dependencies when installing (scans installed ports, checks @pkgdep and adds matching dependency to the installing package's +REQUIRED_BY file) Delete: - - Deindexes information according to the delete - - Now supports range deletion with installdates, e.g., + - Deindexes information according to the delete + - Now supports range deletion with installdates, e.g., pkg_delete -i -M '*>=2008-07-14<2008-08' will delete all packages installed between dates 2008-07-14 and 2008-08, asking for y/n before the deletion. Lib: - - Changed methods in match.c to use cache if available (matchallbyorigin, ispkginstalled) - - Added global variable 'database' of type DB* (the database object) - - Added database helper functions - - Added function to cache a Packagelist (cache_plist()) - - The environment variable PKG_DBCAHE_FILE can be set to make the file + - Changed methods in match.c to use cache if available (matchallbyorigin, ispkginstalled) + - Added global variable 'database' of type DB* (the database object) + - Added database helper functions + - Added function to cache a Packagelist (cache_plist()) + - The environment variable PKG_DBCAHE_FILE can be set to make the file location different than the default /var/db/pkg/pkgcache.db - - pattern_match will compare dates as well as version numbers. + - pattern_match will compare dates as well as version numbers. Create: - - The -O option has been modified to cache information when installing ports + - The -O option has been modified to cache information when installing ports from /usr/ports/ Packinglist: - - A @comment DATE:YYYY-MM-DD hh:mm:ss has been added (affects add/create/info/lib)+ - A @comment DATE:YYYY-MM-DD hh:mm:ss has been added (affects add/create/info/lib) + + +Fixed bugs in -CURRENT: + - Fixed a bug with the oldstyle -W handling of empty @cwd's, which leads to a + number of files installed by packages not beeing recognized. + - pkg_add -r of two packages (or more I assume) where the first depends on + one or more packages which is not installed causes a "fatal error during + execution: getcwd" because it doesn't save previous working directories + correctly. ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#10 (text+ko) ==== @@ -36,6 +36,7 @@ static int sanity_check(char *); static char LogDir[FILENAME_MAX]; static int zapLogDir; /* Should we delete LogDir? */ +char wd[FILENAME_MAX]; int pkg_perform(char **pkgs) @@ -45,6 +46,8 @@ signal(SIGINT, cleanup); signal(SIGHUP, cleanup); + getcwd(wd, sizeof(wd)); + if (AddMode == SLAVE) err_cnt = pkg_do(NULL); else { @@ -89,7 +92,10 @@ strcpy(playpen, FirstPen); inPlace = 0; - /* Are we coming in for a second pass, everything already extracted? */ + /* + * Are we coming in for a second pass, everything already extracted? + * Aka SLAVE mode. + */ if (!pkg) { fgets(playpen, FILENAME_MAX, stdin); playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */ @@ -289,9 +295,14 @@ /* Now check the packing list for dependencies */ for (p = Plist.head; p ; p = p->next) { char *deporigin; - + if (p->type != PLIST_PKGDEP) continue; + + /* We close the db later, and we reopen it here for each package */ + if (!Fake) + openDatabase(O_RDWR); + deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; if (Verbose) { printf("Package '%s' depends on '%s'", Plist.name, p->name); @@ -305,6 +316,12 @@ char path[FILENAME_MAX], *cp = NULL; if (!Fake) { + /* + * We close the database so when calling pkg_add recursively it + * can open it and save to it. If we don't do this only the + * first package will be saved to the database. + */ + closeDatabase(); char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */ if (PrefixRecursive) { strlcpy(prefixArg, "-P", sizeof(prefixArg)); @@ -513,14 +530,17 @@ /* * Read through Plist, then index info to db cache - * And save dependencies + * And update dependendency packages +REQUIRED_BY file */ /* make sure we've opened the database */ if (openDatabase(O_CREAT | O_RDWR)) warn("Could not open database %s, may lead to inconsistency", DBCACHE_FILE); - else + else { + if (Verbose) + printf("Caching the Plist for: %s\n", Plist.name); cache_plist(&Plist, Verbose, FALSE); // cache information + } /* record dependency in the dependents +REQUIRED_BY file */ for (p = Plist.head; p ; p = p->next) { @@ -642,7 +662,6 @@ success: /* delete the packing list contents */ - free_plist(&Plist); leave_playpen(); return code; ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/Makefile#3 (text+ko) ==== @@ -3,7 +3,7 @@ PROG= pkg_delete SRCS= main.c perform.c -CFLAGS+= -I${.CURDIR}/../lib +CFLAGS+= -I${.CURDIR}/../lib -g WARNS?= 6 WFORMAT?= 1 ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/main.c#7 (text+ko) ==== @@ -50,6 +50,7 @@ { "force", no_argument, NULL, 'f' }, { "help", no_argument, NULL, 'h' }, { "interactive",no_argument, NULL, 'i' }, + { "match-date" ,no_argument, NULL, 'M' }, { "prefix", required_argument, NULL, 'p' }, { "recursive", no_argument, NULL, 'r' }, { "regex", no_argument, NULL, 'x' }, @@ -183,6 +184,7 @@ if ((error = pkg_perform(start)) != 0) { if (Verbose) warnx("%d package deletion(s) failed", error); + return error; } else ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/perform.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ struct reqr_by_head *rb_list; if (MatchType != MATCH_EXACT) { - matched = matchinstalled(MatchType * (DateMatch ? 10 : 1), pkgs, &errcode); + matched = matchinstalled(MatchType, pkgs, &errcode); if (errcode != 0) return 1; @@ -72,45 +72,45 @@ } } - err_cnt += sortdeps(pkgs); - for (i = 0; pkgs[i]; i++) { - if (Recursive == TRUE) { - errcode = requiredby(pkgs[i], &rb_list, FALSE, TRUE); + err_cnt += sortdeps(pkgs); + for (i = 0; pkgs[i]; i++) { + if (Recursive == TRUE) { + errcode = requiredby(pkgs[i], &rb_list, FALSE, TRUE); - if (errcode < 0) { - err_cnt++; - } else if (errcode > 0) { + if (errcode < 0) { + err_cnt++; + } else if (errcode > 0) { - /* - * Copy values from the rb_list queue into argv-like NULL - * terminated list because requiredby() uses some static - * storage, while pkg_do() below will call this function, - * thus blowing our rb_list away. - */ - rbtmp = rb = alloca((errcode + 1) * sizeof(*rb)); - if (rb == NULL) { - warnx("%s(): alloca() failed", __func__); - err_cnt++; - continue; - } - STAILQ_FOREACH(rb_entry, rb_list, link) { - *rbtmp = alloca(strlen(rb_entry->pkgname) + 1); - if (*rbtmp == NULL) { - warnx("%s(): alloca() failed", __func__); - err_cnt++; - continue; - } - strcpy(*rbtmp, rb_entry->pkgname); - rbtmp++; - } - *rbtmp = NULL; + /* + * Copy values from the rb_list queue into argv-like NULL + * terminated list because requiredby() uses some static + * storage, while pkg_do() below will call this function, + * thus blowing our rb_list away. + */ + rbtmp = rb = alloca((errcode + 1) * sizeof(*rb)); + if (rb == NULL) { + warnx("%s(): alloca() failed", __func__); + err_cnt++; + continue; + } + STAILQ_FOREACH(rb_entry, rb_list, link) { + *rbtmp = alloca(strlen(rb_entry->pkgname) + 1); + if (*rbtmp == NULL) { + warnx("%s(): alloca() failed", __func__); + err_cnt++; + continue; + } + strcpy(*rbtmp, rb_entry->pkgname); + rbtmp++; + } + *rbtmp = NULL; - err_cnt += sortdeps(rb); - for (j = 0; rb[j]; j++) - err_cnt += pkg_do(rb[j]); - } - } - err_cnt += pkg_do(pkgs[i]); + err_cnt += sortdeps(rb); + for (j = 0; rb[j]; j++) + err_cnt += pkg_do(rb[j]); + } + } + err_cnt += pkg_do(pkgs[i]); } return err_cnt; @@ -135,172 +135,172 @@ struct reqr_by_head *rb_list; - if (!pkg || !(len = strlen(pkg))) - return 1; - if (pkg[len - 1] == '/') - pkg[len - 1] = '\0'; + if (!pkg || !(len = strlen(pkg))) + return 1; + if (pkg[len - 1] == '/') + pkg[len - 1] = '\0'; - /* Reset some state */ - if (Plist.head) - free_plist(&Plist); + /* Reset some state */ + if (Plist.head) + free_plist(&Plist); - sprintf(LogDir, "%s/%s", LOG_DIR, pkg); + sprintf(LogDir, "%s/%s", LOG_DIR, pkg); - isinstalled = isinstalledpkg(pkg); - if (isinstalled == 0) { - warnx("no such package '%s' installed", pkg); - return 1; - } else if (isinstalled < 0) { - warnx("the package info for package '%s' is corrupt%s", - pkg, Force ? - " (but I'll delete it anyway)" : " (use -f to force removal)"); + isinstalled = isinstalledpkg(pkg); + if (isinstalled == 0) { + warnx("no such package '%s' installed", pkg); + return 1; + } else if (isinstalled < 0) { + warnx("the package info for package '%s' is corrupt%s", + pkg, Force ? + " (but I'll delete it anyway)" : " (use -f to force removal)"); - if (!Force) - return 1; + if (!Force) + return 1; - if (!Fake) { - if (vsystem("%s -rf %s", REMOVE_CMD, LogDir)) { - warnx("couldn't remove log entry in %s, deinstall failed", LogDir); - } else { - warnx("couldn't completely deinstall package '%s',\n" - "only the log entry in %s was removed", pkg, LogDir); - } - } - return 0; + if (!Fake) { + if (vsystem("%s -rf %s", REMOVE_CMD, LogDir)) { + warnx("couldn't remove log entry in %s, deinstall failed", LogDir); + } else { + warnx("couldn't completely deinstall package '%s',\n" + "only the log entry in %s was removed", pkg, LogDir); + } } + return 0; + } - if (!getcwd(home, FILENAME_MAX)) { - cleanup(0); - errx(2, "%s: unable to get current working directory!", __func__); - } + if (!getcwd(home, FILENAME_MAX)) { + cleanup(0); + errx(2, "%s: unable to get current working directory!", __func__); + } - if (chdir(LogDir) == FAIL) { - warnx("unable to change directory to %s! deinstall failed", LogDir); - return 1; - } + if (chdir(LogDir) == FAIL) { + warnx("unable to change directory to %s! deinstall failed", LogDir); + return 1; + } - if (Interactive == TRUE) { - int first, ch; + if (Interactive == TRUE) { + int first, ch; - (void)fprintf(stderr, "delete %s? ", pkg); - (void)fflush(stderr); - first = ch = getchar(); + (void)fprintf(stderr, "delete %s? ", pkg); + (void)fflush(stderr); + first = ch = getchar(); - while (ch != '\n' && ch != EOF) - ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); - if (first != 'y' && first != 'Y') - return 0; - } + if (first != 'y' && first != 'Y') + return 0; + } - if (requiredby(pkg, &rb_list, FALSE, TRUE) < 0) - return 1; + if (requiredby(pkg, &rb_list, FALSE, TRUE) < 0) + return 1; - if (!STAILQ_EMPTY(rb_list)) { - warnx("package '%s' is required by these other packages\n" - "and may not be deinstalled%s:", - pkg, Force ? " (but I'll delete it anyway)" : ""); + if (!STAILQ_EMPTY(rb_list)) { + warnx("package '%s' is required by these other packages\n" + "and may not be deinstalled%s:", + pkg, Force ? " (but I'll delete it anyway)" : ""); - STAILQ_FOREACH(rb_entry, rb_list, link) - fprintf(stderr, "\t%s\n", rb_entry->pkgname); + STAILQ_FOREACH(rb_entry, rb_list, link) + fprintf(stderr, "\t%s\n", rb_entry->pkgname); - if (!Force) - return 1; - } + if (!Force) + return 1; + } - sanity_check(LogDir); - cfile = fopen(CONTENTS_FNAME, "r"); + sanity_check(LogDir); + cfile = fopen(CONTENTS_FNAME, "r"); - if (!cfile) { - warnx("unable to open '%s' file", CONTENTS_FNAME); - return 1; - } + if (!cfile) { + warnx("unable to open '%s' file", CONTENTS_FNAME); + return 1; + } - /* If we have a prefix, add it now */ - if (Prefix) - add_plist(&Plist, PLIST_CWD, Prefix); + /* If we have a prefix, add it now */ + if (Prefix) + add_plist(&Plist, PLIST_CWD, Prefix); - read_plist(&Plist, cfile); - fclose(cfile); - p = find_plist(&Plist, PLIST_CWD); + read_plist(&Plist, cfile); + fclose(cfile); + p = find_plist(&Plist, PLIST_CWD); - if (!p) { - warnx("package '%s' doesn't have a prefix", pkg); - return 1; - } + if (!p) { + warnx("package '%s' doesn't have a prefix", pkg); + return 1; + } - setenv(PKG_PREFIX_VNAME, p->name, 1); + setenv(PKG_PREFIX_VNAME, p->name, 1); - if (fexists(REQUIRE_FNAME)) { - if (Verbose) - printf("Executing 'require' script.\n"); + if (fexists(REQUIRE_FNAME)) { + if (Verbose) + printf("Executing 'require' script.\n"); - vsystem("/bin/chmod +x %s", REQUIRE_FNAME); /* be sure */ - if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) { - warnx("package %s fails requirements %s", pkg, - Force ? "" : "- not deleted"); - if (!Force) - return 1; - } + vsystem("/bin/chmod +x %s", REQUIRE_FNAME); /* be sure */ + if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) { + warnx("package %s fails requirements %s", pkg, + Force ? "" : "- not deleted"); + if (!Force) + return 1; } + } - /* - * Test whether to use the old method of passing tokens to deinstallation - * scripts, and set appropriate variables.. - */ + /* + * Test whether to use the old method of passing tokens to deinstallation + * scripts, and set appropriate variables.. + */ - if (fexists(POST_DEINSTALL_FNAME)) { - new_m = 1; - post_script = POST_DEINSTALL_FNAME; - pre_arg = post_arg = ""; - } else if (fexists(DEINSTALL_FNAME)) { - post_script = DEINSTALL_FNAME; - pre_arg = "DEINSTALL"; - post_arg = "POST-DEINSTALL"; - } else { - post_script = pre_arg = post_arg = NULL; - } + if (fexists(POST_DEINSTALL_FNAME)) { + new_m = 1; + post_script = POST_DEINSTALL_FNAME; + pre_arg = post_arg = ""; + } else if (fexists(DEINSTALL_FNAME)) { + post_script = DEINSTALL_FNAME; + pre_arg = "DEINSTALL"; + post_arg = "POST-DEINSTALL"; + } else { + post_script = pre_arg = post_arg = NULL; + } - if (!NoDeInstall && pre_script != NULL && fexists(pre_script)) { - if (Fake) - printf("Would execute de-install script at this point.\n"); - else { - vsystem("/bin/chmod +x %s", pre_script); /* make sure */ - if (vsystem("./%s %s %s", pre_script, pkg, pre_arg)) { - warnx("deinstall script returned error status"); - if (!Force) - return 1; - } - } + if (!NoDeInstall && pre_script != NULL && fexists(pre_script)) { + if (Fake) + printf("Would execute de-install script at this point.\n"); + else { + vsystem("/bin/chmod +x %s", pre_script); /* make sure */ + if (vsystem("./%s %s %s", pre_script, pkg, pre_arg)) { + warnx("deinstall script returned error status"); + if (!Force) + return 1; + } } + } - for (p = Plist.head; p ; p = p->next) { - if (p->type != PLIST_PKGDEP) - continue; + for (p = Plist.head; p ; p = p->next) { + if (p->type != PLIST_PKGDEP) + continue; - deporigin = (p->next != NULL && p->next->type == PLIST_DEPORIGIN) ? p->next->name : + deporigin = (p->next != NULL && p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; - if (Verbose) { - printf("Trying to remove dependency on package '%s'", p->name); - if (deporigin != NULL) - printf(" with '%s' origin", deporigin); - printf(".\n"); - } + if (Verbose) { + printf("Trying to remove dependency on package '%s'", p->name); + if (deporigin != NULL) + printf(" with '%s' origin", deporigin); + printf(".\n"); + } - if (!Fake) { - if (deporigin) { - deporigins = realloc(deporigins, (dep_count + 2) * sizeof(*deporigins)); - depnames = realloc(depnames, (dep_count + 1) * sizeof(*depnames)); - deporigins[dep_count] = deporigin; - deporigins[dep_count + 1] = NULL; - depnames[dep_count] = p->name; - dep_count++; - } else { - undepend(p->name, pkg); - } - } + if (!Fake) { + if (deporigin) { + deporigins = realloc(deporigins, (dep_count + 2) * sizeof(*deporigins)); + depnames = realloc(depnames, (dep_count + 1) * sizeof(*depnames)); + deporigins[dep_count] = deporigin; + deporigins[dep_count + 1] = NULL; + depnames[dep_count] = p->name; + dep_count++; + } else { + undepend(p->name, pkg); + } } + } if (dep_count > 0) { /* Undepend all the dependencies at once */ @@ -320,128 +320,129 @@ } } - if (chdir(home) == FAIL) { - cleanup(0); - errx(2, "%s: unable to return to working directory %s!", __func__, - home); - } + if (chdir(home) == FAIL) { + cleanup(0); + errx(2, "%s: unable to return to working directory %s!", __func__, + home); + } - /* - * Some packages aren't packed right, so we need to just ignore - * delete_package()'s status. Ugh! :-( - */ - if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) - warnx( - "couldn't entirely delete package (perhaps the packing list is\n" - "incorrectly specified?)"); + /* + * Some packages aren't packed right, so we need to just ignore + * delete_package()'s status. Ugh! :-( + */ + if (delete_package(FALSE, CleanDirs, &Plist) == FAIL) + warnx( + "couldn't entirely delete package (perhaps the packing list is\n" + "incorrectly specified?)"); - if (chdir(LogDir) == FAIL) { - warnx("unable to change directory to %s! deinstall failed", LogDir); - return 1; - } + if (chdir(LogDir) == FAIL) { + warnx("unable to change directory to %s! deinstall failed", LogDir); + return 1; + } - if (!NoDeInstall && post_script != NULL && fexists(post_script)) { - if (Fake) - printf("Would execute post-deinstall script at this point.\n"); - else { - vsystem("/bin/chmod +x %s", post_script); /* make sure */ - if (vsystem("./%s %s %s", post_script, pkg, post_arg)) { - warnx("post-deinstall script returned error status"); - if (!Force) - return 1; - } - } + if (!NoDeInstall && post_script != NULL && fexists(post_script)) { + if (Fake) + printf("Would execute post-deinstall script at this point.\n"); + else { + vsystem("/bin/chmod +x %s", post_script); /* make sure */ + if (vsystem("./%s %s %s", post_script, pkg, post_arg)) { + warnx("post-deinstall script returned error status"); + if (!Force) + return 1; + } } + } - if (chdir(home) == FAIL) { - cleanup(0); - errx(2, "%s: unable to return to working directory %s!", __func__, - home); - } + if (chdir(home) == FAIL) { + cleanup(0); + errx(2, "%s: unable to return to working directory %s!", __func__, + home); + } - if (!Fake) { - if (vsystem("%s -r%c %s", REMOVE_CMD, Force ? 'f' : ' ', LogDir)) { - warnx("couldn't remove log entry in %s, deinstall failed", LogDir); + if (!Fake) { + if (vsystem("%s -r%c %s", REMOVE_CMD, Force ? 'f' : ' ', LogDir)) { + warnx("couldn't remove log entry in %s, deinstall failed", LogDir); - if (!Force) - return 1; - } + if (!Force) + return 1; } - return 0; + } + + return 0; } static void sanity_check(char *pkg) { - if (!fexists(CONTENTS_FNAME)) { - cleanup(0); - errx(2, "%s: installed package %s has no %s file!", __func__, - pkg, CONTENTS_FNAME); - } + if (!fexists(CONTENTS_FNAME)) { + cleanup(0); + errx(2, "%s: installed package %s has no %s file!", __func__, + pkg, CONTENTS_FNAME); + } } void cleanup(int sig) { - if (sig) - exit(1); + if (sig) + exit(1); } /* Removes entry in p's +REQUIRED_BY file that equals pkgname */ static void undepend(char *p, char *pkgname) { - char fname[FILENAME_MAX], ftmp[FILENAME_MAX]; - FILE *fpwr; - int s; - struct reqr_by_entry *rb_entry; - struct reqr_by_head *rb_list; + char fname[FILENAME_MAX], ftmp[FILENAME_MAX]; + FILE *fpwr; + int s; + struct reqr_by_entry *rb_entry; + struct reqr_by_head *rb_list; - /* Get list of packages that require p */ - if (requiredby(p, &rb_list, Verbose, FALSE) <= 0) - return; + /* Get list of packages that require p */ + if (requiredby(p, &rb_list, Verbose, FALSE) <= 0) + return; - snprintf(fname, sizeof(fname), "%s/%s/%s", LOG_DIR, p, REQUIRED_BY_FNAME); - snprintf(ftmp, sizeof(ftmp), "%s.XXXXXX", fname); - s = mkstemp(ftmp); - if (s == -1) { - warnx("couldn't open temp file '%s'", ftmp); - return; - } + snprintf(fname, sizeof(fname), "%s/%s/%s", LOG_DIR, p, REQUIRED_BY_FNAME); + snprintf(ftmp, sizeof(ftmp), "%s.XXXXXX", fname); + s = mkstemp(ftmp); + if (s == -1) { + warnx("couldn't open temp file '%s'", ftmp); + return; + } - fpwr = fdopen(s, "w"); - if (fpwr == NULL) { - close(s); - warnx("couldn't fdopen temp file '%s'", ftmp); - goto cleanexit; - } + fpwr = fdopen(s, "w"); + if (fpwr == NULL) { + close(s); + warnx("couldn't fdopen temp file '%s'", ftmp); + goto cleanexit; + } - /* - * For every package that requires p, check if package equals pkgname - * if NOT put the name into the temporary file. This operation makes a - * new +REQUIRED_BY file for package p without pkgname in it, thus - * 'undepending' it. - */ - STAILQ_FOREACH(rb_entry, rb_list, link) - if (strcmp(rb_entry->pkgname, pkgname)) /* no match */ - fputs(rb_entry->pkgname, fpwr), putc('\n', fpwr); + /* + * For every package that requires p, check if package equals pkgname + * if NOT put the name into the temporary file. This operation makes a + * new +REQUIRED_BY file for package p without pkgname in it, thus + * 'undepending' it. + */ + STAILQ_FOREACH(rb_entry, rb_list, link) + if (strcmp(rb_entry->pkgname, pkgname)) /* no match */ + fputs(rb_entry->pkgname, fpwr), putc('\n', fpwr); - if (fchmod(s, 0644) == FAIL) { - warnx("error changing permission of temp file '%s'", ftmp); - fclose(fpwr); - goto cleanexit; - } + if (fchmod(s, 0644) == FAIL) { + warnx("error changing permission of temp file '%s'", ftmp); + fclose(fpwr); + goto cleanexit; + } - if (fclose(fpwr) == EOF) { - warnx("error closing temp file '%s'", ftmp); - goto cleanexit; - } + if (fclose(fpwr) == EOF) { + warnx("error closing temp file '%s'", ftmp); + goto cleanexit; + } - /* Make the temporary file the new +REQUIRED_BY file for package p */ - if (rename(ftmp, fname) == -1) - warnx("error renaming '%s' to '%s'", ftmp, fname); + /* Make the temporary file the new +REQUIRED_BY file for package p */ + if (rename(ftmp, fname) == -1) + warnx("error renaming '%s' to '%s'", ftmp, fname); cleanexit: - remove(ftmp); - return; + remove(ftmp); + return; } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/delete/pkg_delete.1#3 (text+ko) ==== @@ -25,7 +25,7 @@ .Nd a utility for deleting previously installed software package distributions .Sh SYNOPSIS .Nm -.Op Fl dDfGinrvxX +.Op Fl dDfGiMnrvxX .Op Fl p Ar prefix .Ar pkg-name ... .Nm @@ -78,6 +78,16 @@ Request confirmation before attempting to delete each package, regardless whether or not the standard input device is a terminal. +.It Fl M , -match-date +Compare +.Ar pkg-name ... +using installdates instead of version numbers (default). +The format used is 'YYYY-MM-DD hh:mm:ss'. +For example, +.Pp +.Dl "pkg_delete -M '*>2008-08-11'" +.Pp +will match all packages installed after 2008-08-11, and try to delete them. .It Fl v , -verbose Turn on verbose output. .It Fl D , -no-script , -no-scripts ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/main.c#10 (text+ko) ==== @@ -52,6 +52,7 @@ { "extended", no_argument, NULL, 'e' }, { "help", no_argument, NULL, 'h' }, { "keep", no_argument, NULL, 'K' }, + { "match-date", no_argument, NULL, 'M' }, { "no-glob", no_argument, NULL, 'G' }, { "origin", required_argument, NULL, 'O' }, { "quiet", no_argument, NULL, 'q' }, ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/perform.c#11 (text+ko) ==== @@ -338,7 +338,7 @@ } /* - * Look through package dbs in LOG_DIR and find which + * Look through package dbs in LOG_DIR or dbcache and find which * packages installed the files in which_list. */ static int @@ -378,11 +378,12 @@ } /* If cache exists check database for the key (i.e., file absolute path) */ - if (CacheExists == TRUE) { + if (CacheExists) { + DBT tmp; TAILQ_FOREACH(wp, which_list, next) { if (wp->skip == TRUE) continue; - DBT tmp; + if (dbKeyExists(wp->file, &tmp)) strlcpy(wp->package, tmp.data, PATH_MAX); else { @@ -392,9 +393,9 @@ } } } else { -#ifdef DEBUG - printf("debug: not using cache; run pkg_convert\n"); -#endif + /* In case we don't have cache */ + printf("%s: not using cache; you should run pkg_convert(1)\n", __func__); + installed = matchinstalled(MATCH_ALL, NULL, &errcode); if (installed == NULL) return errcode; @@ -403,7 +404,7 @@ FILE *fp; Package pkg; PackingList itr; - char *cwd = NULL; + char *cwd = NULL, *prefix = NULL; char tmp[PATH_MAX]; snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, installed[i], @@ -419,7 +420,10 @@ fclose(fp); for (itr = pkg.head; itr != pkg.tail; itr = itr->next) { if (itr->type == PLIST_CWD) { - cwd = itr->name; + if (!prefix) + prefix = itr->name; + + cwd = itr->name ? itr->name : prefix; } else if (itr->type == PLIST_FILE) { TAILQ_FOREACH(wp, which_list, next) { if (wp->skip == TRUE) @@ -437,7 +441,6 @@ } free_plist(&pkg); } - } TAILQ_FOREACH(wp, which_list, next) { ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/info/pkg_info.1#7 (text+ko) ==== @@ -123,7 +123,7 @@ Show the .Xr mtree 8 file (if any) for each package. -.It Fl M +.It Fl M, -match-date Compare .Ar pkg-name ... using installdates instead of version numbers (default). ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/database.c#13 (text+ko) ==== @@ -17,18 +17,20 @@ * 12 August 2008 * * Various functions for use with berkeley-db (using non-relational btree). + * See also dbopen(3). */ #include "lib.h" #include #include -int compare_func(const DBT *, const DBT *); -DB *opendb(const char *, int); -int closedb(DB *db); -int dbput(const DB *db, DBT *key, DBT *data); -int dbget(const DB *db, DBT *key, DBT *data); -int dbscan(const DB *db, DBT *key, DBT *data); +int compare_func(const DBT *, const DBT *); +DB *opendb(const char *, int); +int closedb(DB *db); +int dbput(const DB *, DBT *, DBT *); +int dbget(const DB *, DBT *, DBT *); +int dbscan(const DB *, DBT *, DBT *); +int dbSync(void); /* * Btree information structure @@ -46,48 +48,50 @@ }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 13:40:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 879351065679; Sat, 16 Aug 2008 13:40:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BFD4106566C for ; Sat, 16 Aug 2008 13:40:20 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B1498FC1A for ; Sat, 16 Aug 2008 13:40:20 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GDeKom017678 for ; Sat, 16 Aug 2008 13:40:20 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GDeJxV017676 for perforce@freebsd.org; Sat, 16 Aug 2008 13:40:19 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 13:40:19 GMT Message-Id: <200808161340.m7GDeJxV017676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 13:40:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147534 Change 147534 by des@des.at.des.no on 2008/08/16 13:39:54 More whitespace. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#6 (text+ko) ==== @@ -26,6 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ + #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); From owner-p4-projects@FreeBSD.ORG Sat Aug 16 13:43:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BED7E1065672; Sat, 16 Aug 2008 13:43:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8336F106564A for ; Sat, 16 Aug 2008 13:43:23 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5237F8FC14 for ; Sat, 16 Aug 2008 13:43:23 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GDhNZZ017888 for ; Sat, 16 Aug 2008 13:43:23 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GDhNbv017886 for perforce@freebsd.org; Sat, 16 Aug 2008 13:43:23 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 13:43:23 GMT Message-Id: <200808161343.m7GDhNbv017886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 13:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147535 Change 147535 by des@des.at.des.no on 2008/08/16 13:43:00 More whitespace. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#9 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" + #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 13:47:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05721106567A; Sat, 16 Aug 2008 13:47:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE2461065675 for ; Sat, 16 Aug 2008 13:47:27 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D2A88FC3A for ; Sat, 16 Aug 2008 13:47:27 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GDlRDZ018210 for ; Sat, 16 Aug 2008 13:47:27 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GDlR6F018208 for perforce@freebsd.org; Sat, 16 Aug 2008 13:47:27 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 13:47:27 GMT Message-Id: <200808161347.m7GDlR6F018208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 13:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=147536 Change 147536 by des@des.at.des.no on 2008/08/16 13:47:23 Whitespace for teh win! Affected files ... .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#7 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include + #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 13:56:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81BDA106566C; Sat, 16 Aug 2008 13:56:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44A9B106567C for ; Sat, 16 Aug 2008 13:56:37 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 139198FC28 for ; Sat, 16 Aug 2008 13:56:37 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GDua39018942 for ; Sat, 16 Aug 2008 13:56:36 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GDuaqW018940 for perforce@freebsd.org; Sat, 16 Aug 2008 13:56:36 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 13:56:36 GMT Message-Id: <200808161356.m7GDuaqW018940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 13:56:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=147538 Change 147538 by des@des.at.des.no on 2008/08/16 13:56:33 opt_global.h is implicit. Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/options#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/options#5 (text+ko) ==== @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_global.h +VIMAGE From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:00:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CD8B10656CA; Sat, 16 Aug 2008 14:00:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB66F10656C3 for ; Sat, 16 Aug 2008 14:00:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93F0D8FC0C for ; Sat, 16 Aug 2008 14:00:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GE0fDQ019273 for ; Sat, 16 Aug 2008 14:00:47 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GE0fNY019271 for perforce@freebsd.org; Sat, 16 Aug 2008 14:00:41 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 14:00:41 GMT Message-Id: <200808161400.m7GE0fNY019271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:00:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=147539 Change 147539 by zec@zec_tpx32 on 2008/08/16 14:00:31 Axe redundand #include lines. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#7 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 (text+ko) ==== @@ -55,7 +55,6 @@ #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) # include -# include #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 (text+ko) ==== @@ -58,9 +58,6 @@ # include # include #endif -#if (__FreeBSD_version > 800000) -# include -#endif #include #ifdef sun # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#6 (text+ko) ==== @@ -104,9 +104,6 @@ #if __FreeBSD_version >= 300000 # include #endif -#if __FreeBSD_version >= 800000 -# include -#endif #include #include #ifdef __sgi ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#7 (text+ko) ==== @@ -70,9 +70,6 @@ #if __FreeBSD_version >= 300000 # include #endif -#if __FreeBSD_version >= 800000 -# include -#endif #include #if __FreeBSD_version >= 300000 # include ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#5 (text+ko) ==== @@ -49,9 +49,6 @@ #if defined(_KERNEL) && (__FreeBSD_version >= 220000) # include # include -# if (__FreeBSD_version > 800000) -# include -# endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#6 (text+ko) ==== @@ -44,9 +44,6 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif -# if (__FreeBSD_version > 800000) -# include -# endif #else # include #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#5 (text+ko) ==== @@ -42,9 +42,6 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif -# if (__FreeBSD_version > 800000) -# include -# endif #else # include #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pfsync.c#5 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include #include -#include #else #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_norm.c#5 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #ifndef __FreeBSD__ #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#3 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#6 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:01:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 459461065687; Sat, 16 Aug 2008 14:01:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 016D0106567C for ; Sat, 16 Aug 2008 14:01:49 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C47458FC0C for ; Sat, 16 Aug 2008 14:01:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GE1mre019358 for ; Sat, 16 Aug 2008 14:01:48 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GE1mRL019356 for perforce@freebsd.org; Sat, 16 Aug 2008 14:01:48 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 14:01:48 GMT Message-Id: <200808161401.m7GE1mRL019356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:01:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=147540 Change 147540 by bz@bz_dumpster on 2008/08/16 14:01:31 remove an unrelated whitespace change. Affected files ... .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#7 (text+ko) ==== @@ -248,7 +248,6 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. -# options DEVICE_POLLING From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:03:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622021065671; Sat, 16 Aug 2008 14:03:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D976106566B for ; Sat, 16 Aug 2008 14:03:51 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 069848FC19 for ; Sat, 16 Aug 2008 14:03:51 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GE3oCa020598 for ; Sat, 16 Aug 2008 14:03:50 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GE3o0q020596 for perforce@freebsd.org; Sat, 16 Aug 2008 14:03:50 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 14:03:50 GMT Message-Id: <200808161403.m7GE3o0q020596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:03:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=147541 Change 147541 by zec@zec_tpx32 on 2008/08/16 14:03:49 Whitespace / #include redux. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#7 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ - #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); @@ -56,7 +55,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:07:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 964A71065671; Sat, 16 Aug 2008 14:07:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A92E106567F for ; Sat, 16 Aug 2008 14:07:55 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 437BF8FC08 for ; Sat, 16 Aug 2008 14:07:55 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GE7tmp020930 for ; Sat, 16 Aug 2008 14:07:55 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GE7t14020928 for perforce@freebsd.org; Sat, 16 Aug 2008 14:07:55 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 14:07:55 GMT Message-Id: <200808161407.m7GE7t14020928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=147542 Change 147542 by zec@zec_tpx32 on 2008/08/16 14:07:48 Diff redux against head. We should separately commit these few lines because if_lmc won't compile with nooptions INET6, regardless on having options VIMAGE on or off. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 (text+ko) ==== @@ -83,12 +83,6 @@ # ifndef NETGRAPH # define NETGRAPH 0 # endif -# ifndef INET -# define INET 0 -# endif -# ifndef INET6 -# define INET6 0 -# endif # define P2P 0 /* not in FreeBSD */ # if (__FreeBSD_version >= 500000) # define NSPPP 1 /* No count devices in FreeBSD 5 */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:12:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F177F1065671; Sat, 16 Aug 2008 14:11:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5025106564A for ; Sat, 16 Aug 2008 14:11:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 832718FC1B for ; Sat, 16 Aug 2008 14:11:59 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GEBxIv021309 for ; Sat, 16 Aug 2008 14:11:59 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GEBxkS021307 for perforce@freebsd.org; Sat, 16 Aug 2008 14:11:59 GMT (envelope-from trasz@freebsd.org) Date: Sat, 16 Aug 2008 14:11:59 GMT Message-Id: <200808161411.m7GEBxkS021307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147543 Change 147543 by trasz@trasz_traszkan on 2008/08/16 14:11:24 Add a test demonstrating problem with moving a non-writable directory. It passes on ZFS and fails on UFS. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/rename/21.t#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:25:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EBB91065679; Sat, 16 Aug 2008 14:25:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C8521065675 for ; Sat, 16 Aug 2008 14:25:13 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 048C38FC1C for ; Sat, 16 Aug 2008 14:25:13 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GEPCL6022386 for ; Sat, 16 Aug 2008 14:25:12 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GEPC4D022384 for perforce@freebsd.org; Sat, 16 Aug 2008 14:25:12 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 14:25:12 GMT Message-Id: <200808161425.m7GEPC4D022384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=147544 Change 147544 by zec@zec_tpx32 on 2008/08/16 14:24:50 More #include axing. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#7 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_gre.c#7 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#6 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $ */ - #include "opt_sctp.h" #include "opt_mpath.h" ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#5 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#5 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#5 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_encap.c#5 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 14:34:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2A93106573C; Sat, 16 Aug 2008 14:34:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75E5A106572D for ; Sat, 16 Aug 2008 14:34:22 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DA1A8FC17 for ; Sat, 16 Aug 2008 14:34:22 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GEYMqe023142 for ; Sat, 16 Aug 2008 14:34:22 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GEYMwV023140 for perforce@freebsd.org; Sat, 16 Aug 2008 14:34:22 GMT (envelope-from zec@tel.fer.hr) Date: Sat, 16 Aug 2008 14:34:22 GMT Message-Id: <200808161434.m7GEYMwV023140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 147545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 14:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147545 Change 147545 by zec@zec_tpx32 on 2008/08/16 14:34:05 More #include axing. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#8 (text+ko) ==== @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#7 (text+ko) ==== @@ -85,7 +85,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#5 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 15:00:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BDAD1065687; Sat, 16 Aug 2008 15:00:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3107106567C for ; Sat, 16 Aug 2008 15:00:49 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B08528FC15 for ; Sat, 16 Aug 2008 15:00:49 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GF0niS025605 for ; Sat, 16 Aug 2008 15:00:49 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GF0nqH025603 for perforce@freebsd.org; Sat, 16 Aug 2008 15:00:49 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 15:00:49 GMT Message-Id: <200808161500.m7GF0nqH025603@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 15:00:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147546 Change 147546 by des@des.at.des.no on 2008/08/16 15:00:25 Bump __FreeBSD_version Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/param.h#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/param.h#7 (text+ko) ==== @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800043 /* Master, propagated to newvers */ +#define __FreeBSD_version 800044 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 15:08:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 638821065681; Sat, 16 Aug 2008 15:08:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 274C61065676 for ; Sat, 16 Aug 2008 15:08:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EEDF8FC1A for ; Sat, 16 Aug 2008 15:08:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GF8vng027295 for ; Sat, 16 Aug 2008 15:08:57 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GF8vAi027293 for perforce@freebsd.org; Sat, 16 Aug 2008 15:08:57 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 15:08:57 GMT Message-Id: <200808161508.m7GF8vAi027293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147547 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 15:08:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147547 Change 147547 by des@des.at.des.no on 2008/08/16 15:08:04 Correct a comment + __FreeBSD_version check Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#4 (text+ko) ==== @@ -34,7 +34,9 @@ #define _NETINET_IP_VAR_H_ #include +#ifdef _KERNEL #include +#endif /* * Overlay for ip header used by other protocols (tcp, udp). ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#10 (text+ko) ==== @@ -145,8 +145,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_global.h - * XXX so will always evaluate to the global for now (VIMAGE not defined) + * depending on whether VIMAGE is defined. */ /* first define modules that supply us information */ #define MOD_NET net @@ -155,7 +154,7 @@ #define MOD_IPSEC ipsec /* then define the macro(s) that hook into the vimage macros */ -#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE) +#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 && defined(VIMAGE) #define VSYMNAME(__MODULE) vnet_ ## __MODULE #define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL) #else From owner-p4-projects@FreeBSD.ORG Sat Aug 16 15:10:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA202106567F; Sat, 16 Aug 2008 15:10:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F1611065675 for ; Sat, 16 Aug 2008 15:10:05 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36A4B8FC15 for ; Sat, 16 Aug 2008 15:10:04 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GF9xdP027365 for ; Sat, 16 Aug 2008 15:09:59 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GF9x3q027363 for perforce@freebsd.org; Sat, 16 Aug 2008 15:09:59 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 15:09:59 GMT Message-Id: <200808161509.m7GF9x3q027363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 15:10:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=147548 Change 147548 by des@des.at.des.no on 2008/08/16 15:09:34 Forced commit: previous commit unbroke use of ip_var.h in userland. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Aug 16 15:14:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEA1E1065675; Sat, 16 Aug 2008 15:14:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 900DD1065673 for ; Sat, 16 Aug 2008 15:14:03 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 779FC8FC0C for ; Sat, 16 Aug 2008 15:14:03 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GFE32B027730 for ; Sat, 16 Aug 2008 15:14:03 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GFE38J027728 for perforce@freebsd.org; Sat, 16 Aug 2008 15:14:03 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 15:14:03 GMT Message-Id: <200808161514.m7GFE38J027728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 15:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=147549 Change 147549 by des@des.at.des.no on 2008/08/16 15:13:07 Fix #include in the wrong place. Update __FreeBSD_version check. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#6 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#6 (text+ko) ==== @@ -27,13 +27,15 @@ #if defined(_KERNEL) && defined(__FreeBSD_version) && \ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) -# if (__FreeBSD_version >= 800000) +# if !defined(IPFILTER_LKM) # include "opt_inet6.h" -# include # endif # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA # endif +# if (__FreeBSD_version >= 800044) +# include +# endif # endif # include #else ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ #else # include #endif -#if __FreeBSD_version >= 800000 +#if __FreeBSD_version >= 800044 # include #else #define V_path_mtu_discovery path_mtu_discovery From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:25:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FAB01065742; Sat, 16 Aug 2008 16:25:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43B3E106567A for ; Sat, 16 Aug 2008 16:25:22 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FE878FC1C for ; Sat, 16 Aug 2008 16:25:22 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGPMue034510 for ; Sat, 16 Aug 2008 16:25:22 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGPL5A034508 for perforce@freebsd.org; Sat, 16 Aug 2008 16:25:21 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 16:25:21 GMT Message-Id: <200808161625.m7GGPL5A034508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147551 Change 147551 by bz@bz_dumpster on 2008/08/16 16:25:20 missed freebsd revision Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#11 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#11 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version > 800000 +#if defined(__FreeBSD__) && __FreeBSD_version > 800044 #include #endif #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:26:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A74201065672; Sat, 16 Aug 2008 16:26:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B4AD106566C for ; Sat, 16 Aug 2008 16:26:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 376428FC0A for ; Sat, 16 Aug 2008 16:26:23 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGQNXX034585 for ; Sat, 16 Aug 2008 16:26:23 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGQN8S034583 for perforce@freebsd.org; Sat, 16 Aug 2008 16:26:23 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 16:26:23 GMT Message-Id: <200808161626.m7GGQN8S034583@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:26:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147552 Change 147552 by bz@bz_dumpster on 2008/08/16 16:26:13 inc p4 submit number and get the compare right... Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#12 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version > 800044 +#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 #include #endif #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:28:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C29A1065684; Sat, 16 Aug 2008 16:28:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4881106568A for ; Sat, 16 Aug 2008 16:28:14 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outU.internet-mail-service.net (outu.internet-mail-service.net [216.240.47.244]) by mx1.freebsd.org (Postfix) with ESMTP id A672F8FC15 for ; Sat, 16 Aug 2008 16:28:14 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id DCF8A2411; Sat, 16 Aug 2008 09:28:14 -0700 (PDT) Received: from julian-mac.elischer.org (localhost [127.0.0.1]) by idiom.com (Postfix) with ESMTP id 222202D6042; Sat, 16 Aug 2008 09:28:14 -0700 (PDT) Message-ID: <48A7001B.5090701@elischer.org> Date: Sat, 16 Aug 2008 09:28:11 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Marko Zec References: <200808160942.m7G9g62E082102@repoman.freebsd.org> In-Reply-To: <200808160942.m7G9g62E082102@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:28:15 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=147516 > > Change 147516 by zec@zec_tpx32 on 2008/08/16 09:41:36 > > More damage control. > > Affected files ... > > .. //depot/projects/vimage/src/sys/netgraph/ng_source.c#3 edit > > Differences ... > > ==== //depot/projects/vimage/src/sys/netgraph/ng_source.c#3 (text+ko) ==== > > @@ -615,7 +615,7 @@ > ifp = ifunit(ifname); > > if (ifp == NULL) { > - printf("%s: can't find interface %d\n", __func__, if_index); > + printf("%s: can't find interface %s\n", __func__, ifname); > return (EINVAL); > } > sc->output_ifp = ifp; I put it that these are newly exposed bugs, and not damage.. From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:35:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F46C1065673; Sat, 16 Aug 2008 16:35:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D77BA1065671 for ; Sat, 16 Aug 2008 16:35:33 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outD.internet-mail-service.net (outd.internet-mail-service.net [216.240.47.227]) by mx1.freebsd.org (Postfix) with ESMTP id B879D8FC14 for ; Sat, 16 Aug 2008 16:35:33 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id EF59B2470; Sat, 16 Aug 2008 09:35:33 -0700 (PDT) Received: from julian-mac.elischer.org (localhost [127.0.0.1]) by idiom.com (Postfix) with ESMTP id 1B2B52D606E; Sat, 16 Aug 2008 09:35:32 -0700 (PDT) Message-ID: <48A701D2.5050004@elischer.org> Date: Sat, 16 Aug 2008 09:35:30 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Marko Zec References: <200808161256.m7GCuZS9012842@repoman.freebsd.org> In-Reply-To: <200808161256.m7GCuZS9012842@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:35:34 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=147532 > > Change 147532 by zec@zec_tpx32 on 2008/08/16 12:56:28 > > Looks like I was a bit hasty with change 147531. ip_newid() > is an inline defined in ip_var.h, so whereever it is used in > the code, definitions from sys/vimage.h are required. So, > instead of reverting back to pre-147531, #include sys/vimage.h > once from netinet/ip_var.h, instead of having it in included > individually from a multitude of affected .c files. > of . > I was considering doing this, or possibly changing ip_newid() to not need it. > Affected files ... > > .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#3 edit > > Differences ... > > ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#3 (text+ko) ==== > > @@ -34,6 +34,7 @@ > #define _NETINET_IP_VAR_H_ > > #include > +#include > > /* > * Overlay for ip header used by other protocols (tcp, udp). From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:37:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97249106566C; Sat, 16 Aug 2008 16:37:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5AD93106564A for ; Sat, 16 Aug 2008 16:37:35 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 412F68FC19 for ; Sat, 16 Aug 2008 16:37:35 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGbZdM035623 for ; Sat, 16 Aug 2008 16:37:35 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGbZR6035621 for perforce@freebsd.org; Sat, 16 Aug 2008 16:37:35 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 16:37:35 GMT Message-Id: <200808161637.m7GGbZR6035621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:37:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=147558 Change 147558 by bz@bz_dumpster on 2008/08/16 16:36:56 Hostname is global in this context. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -352,10 +353,10 @@ { /* XXXRW: Locking -- these can change! */ - messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + + messagelen = strlen(G_hostname) + 3 + strlen(ostype) + 1 + strlen(osrelease); message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK); - sprintf(message, "%s - %s %s", hostname, ostype, osrelease); + sprintf(message, "%s - %s %s", G_hostname, ostype, osrelease); blanked = 0; switch (adp->va_mode) { case M_PC98_80x25: From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:41:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEEF11065679; Sat, 16 Aug 2008 16:41:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 934881065671 for ; Sat, 16 Aug 2008 16:41:14 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outR.internet-mail-service.net (outr.internet-mail-service.net [216.240.47.241]) by mx1.freebsd.org (Postfix) with ESMTP id 74D438FC16 for ; Sat, 16 Aug 2008 16:41:14 +0000 (UTC) (envelope-from julian@elischer.org) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 1B06C2470; Sat, 16 Aug 2008 09:41:14 -0700 (PDT) Received: from julian-mac.elischer.org (localhost [127.0.0.1]) by idiom.com (Postfix) with ESMTP id C856A2D6019; Sat, 16 Aug 2008 09:41:13 -0700 (PDT) Message-ID: <48A70327.9000807@elischer.org> Date: Sat, 16 Aug 2008 09:41:11 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707) MIME-Version: 1.0 To: Marko Zec References: <200808161407.m7GE7t14020928@repoman.freebsd.org> In-Reply-To: <200808161407.m7GE7t14020928@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:41:15 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=147542 > > Change 147542 by zec@zec_tpx32 on 2008/08/16 14:07:48 > > Diff redux against head. > > We should separately commit these few lines because if_lmc > won't compile with nooptions INET6, regardless on having > options VIMAGE on or off. > > Affected files ... > > .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 edit > > Differences ... > > ==== //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 (text+ko) ==== > > @@ -83,12 +83,6 @@ > # ifndef NETGRAPH > # define NETGRAPH 0 > # endif > -# ifndef INET > -# define INET 0 > -# endif > -# ifndef INET6 > -# define INET6 0 > -# endif > # define P2P 0 /* not in FreeBSD */ > # if (__FreeBSD_version >= 500000) > # define NSPPP 1 /* No count devices in FreeBSD 5 */ is someone going to do this? From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:47:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FBB0106566C; Sat, 16 Aug 2008 16:47:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8072106564A for ; Sat, 16 Aug 2008 16:47:45 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A40EC8FC08 for ; Sat, 16 Aug 2008 16:47:45 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGljlj045663 for ; Sat, 16 Aug 2008 16:47:45 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGljnX045661 for perforce@freebsd.org; Sat, 16 Aug 2008 16:47:45 GMT (envelope-from mav@freebsd.org) Date: Sat, 16 Aug 2008 16:47:45 GMT Message-Id: <200808161647.m7GGljnX045661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 147559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:47:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147559 Change 147559 by mav@mav_freefall on 2008/08/16 16:47:36 Remove unused V_ng_nodelist macro. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#6 (text+ko) ==== @@ -253,7 +253,6 @@ #define V_ng_eiface_unit ng_eiface_unit #define V_ng_iface_unit ng_iface_unit #define V_ng_name_hash ng_name_hash -#define V_ng_nodelist ng_nodelist #define V_nipq nipq #define V_nolocaltimewait nolocaltimewait #define V_norule_counter norule_counter From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:51:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CA341065686; Sat, 16 Aug 2008 16:51:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FB471065683 for ; Sat, 16 Aug 2008 16:51:50 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E961F8FC14 for ; Sat, 16 Aug 2008 16:51:49 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGpoSE045997 for ; Sat, 16 Aug 2008 16:51:50 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGpn0C045995 for perforce@freebsd.org; Sat, 16 Aug 2008 16:51:49 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 16:51:49 GMT Message-Id: <200808161651.m7GGpn0C045995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147561 Change 147561 by bz@bz_dumpster on 2008/08/16 16:51:20 style: #define\t Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#7 (text+ko) ==== @@ -30,317 +30,317 @@ * $FreeBSD: $ */ -#ifndef _SYS_VIMAGE_H_ -#define _SYS_VIMAGE_H_ +#ifndef _SYS_VIMAGE_H_ +#define _SYS_VIMAGE_H_ -#define V_hostname hostname -#define G_hostname hostname -#define V_domainname domainname -#define V_acq_seq acq_seq -#define V_acqtree acqtree -#define V_addrsel_policytab addrsel_policytab -#define V_ah_cleartos ah_cleartos -#define V_ah_enable ah_enable -#define V_ahstat ahstat -#define V_arp_maxtries arp_maxtries -#define V_arp_proxyall arp_proxyall -#define V_arpt_keep arpt_keep -#define V_arpt_prune arpt_prune -#define V_autoinc_step autoinc_step -#define V_blackhole blackhole -#define V_crypto_support crypto_support -#define V_curr_dyn_buckets curr_dyn_buckets -#define V_dad_ignore_ns dad_ignore_ns -#define V_dad_init dad_init -#define V_dad_maxtry dad_maxtry -#define V_dadq dadq -#define V_defaultaddrpolicy defaultaddrpolicy -#define V_divcb divcb -#define V_divcbinfo divcbinfo -#define V_drop_synfin drop_synfin -#define V_dyn_ack_lifetime dyn_ack_lifetime -#define V_dyn_buckets dyn_buckets -#define V_dyn_count dyn_count -#define V_dyn_fin_lifetime dyn_fin_lifetime -#define V_dyn_keepalive dyn_keepalive -#define V_dyn_keepalive_interval dyn_keepalive_interval -#define V_dyn_keepalive_period dyn_keepalive_period -#define V_dyn_max dyn_max -#define V_dyn_rst_lifetime dyn_rst_lifetime -#define V_dyn_short_lifetime dyn_short_lifetime -#define V_dyn_syn_lifetime dyn_syn_lifetime -#define V_dyn_udp_lifetime dyn_udp_lifetime -#define V_esp_enable esp_enable -#define V_esp_max_ivlen esp_max_ivlen -#define V_espstat espstat -#define V_ether_ipfw ether_ipfw -#define V_frag6_nfragpackets frag6_nfragpackets -#define V_frag6_nfrags frag6_nfrags -#define V_fw6_enable fw6_enable -#define V_fw_debug fw_debug -#define V_fw_deny_unknown_exthdrs fw_deny_unknown_exthdrs -#define V_fw_enable fw_enable -#define V_fw_one_pass fw_one_pass -#define V_fw_verbose fw_verbose -#define V_gif_softc_list gif_softc_list -#define V_icmp6_nodeinfo icmp6_nodeinfo -#define V_icmp6_rediraccept icmp6_rediraccept -#define V_icmp6_redirtimeout icmp6_redirtimeout -#define V_icmp6errpps_count icmp6errpps_count -#define V_icmp6errppslim icmp6errppslim -#define V_icmp6errppslim_last icmp6errppslim_last -#define V_icmp6stat icmp6stat -#define V_icmp_may_rst icmp_may_rst -#define V_icmpstat icmpstat -#define V_if_index if_index -#define V_if_indexlim if_indexlim -#define V_ifaddr_event_tag ifaddr_event_tag -#define V_ifg_head ifg_head -#define V_ifindex_table ifindex_table -#define V_ifklist ifklist -#define V_ifnet ifnet -#define V_igmpstat igmpstat -#define V_in6_ifaddr in6_ifaddr -#define V_in6_maxmtu in6_maxmtu -#define V_in6_tmpaddrtimer_ch in6_tmpaddrtimer_ch -#define V_in_ifaddrhashtbl in_ifaddrhashtbl -#define V_in_ifaddrhead in_ifaddrhead -#define V_in_ifaddrhmask in_ifaddrhmask -#define V_in_multihead in_multihead -#define V_ip4_ah_net_deflev ip4_ah_net_deflev -#define V_ip4_ah_offsetmask ip4_ah_offsetmask -#define V_ip4_ah_trans_deflev ip4_ah_trans_deflev -#define V_ip4_def_policy ip4_def_policy -#define V_ip4_esp_net_deflev ip4_esp_net_deflev -#define V_ip4_esp_randpad ip4_esp_randpad -#define V_ip4_esp_trans_deflev ip4_esp_trans_deflev -#define V_ip4_ipsec_dfbit ip4_ipsec_dfbit -#define V_ip4_ipsec_ecn ip4_ipsec_ecn -#define V_ip6_accept_rtadv ip6_accept_rtadv -#define V_ip6_ah_net_deflev ip6_ah_net_deflev -#define V_ip6_ah_trans_deflev ip6_ah_trans_deflev -#define V_ip6_auto_flowlabel ip6_auto_flowlabel -#define V_ip6_auto_linklocal ip6_auto_linklocal -#define V_ip6_dad_count ip6_dad_count -#define V_ip6_defhlim ip6_defhlim -#define V_ip6_defmcasthlim ip6_defmcasthlim -#define V_ip6_desync_factor ip6_desync_factor -#define V_ip6_esp_net_deflev ip6_esp_net_deflev -#define V_ip6_esp_randpad ip6_esp_randpad -#define V_ip6_esp_trans_deflev ip6_esp_trans_deflev -#define V_ip6_forward_rt ip6_forward_rt -#define V_ip6_forward_srcrt ip6_forward_srcrt -#define V_ip6_forwarding ip6_forwarding -#define V_ip6_gif_hlim ip6_gif_hlim -#define V_ip6_hdrnestlimit ip6_hdrnestlimit -#define V_ip6_ipsec_ecn ip6_ipsec_ecn -#define V_ip6_keepfaith ip6_keepfaith -#define V_ip6_log_interval ip6_log_interval -#define V_ip6_log_time ip6_log_time -#define V_ip6_maxfragpackets ip6_maxfragpackets -#define V_ip6_maxfrags ip6_maxfrags -#define V_ip6_mcast_pmtu ip6_mcast_pmtu -#define V_ip6_mrouter_ver ip6_mrouter_ver -#define V_ip6_opts ip6_opts -#define V_ip6_ours_check_algorithm ip6_ours_check_algorithm -#define V_ip6_prefer_tempaddr ip6_prefer_tempaddr -#define V_ip6_rr_prune ip6_rr_prune -#define V_ip6_sendredirects ip6_sendredirects -#define V_ip6_sourcecheck ip6_sourcecheck -#define V_ip6_sourcecheck_interval ip6_sourcecheck_interval -#define V_ip6_temp_preferred_lifetime ip6_temp_preferred_lifetime -#define V_ip6_temp_regen_advance ip6_temp_regen_advance -#define V_ip6_temp_valid_lifetime ip6_temp_valid_lifetime -#define V_ip6_use_defzone ip6_use_defzone -#define V_ip6_use_deprecated ip6_use_deprecated -#define V_ip6_use_tempaddr ip6_use_tempaddr -#define V_ip6_v6only ip6_v6only -#define V_ip6q ip6q -#define V_ip6qmaxlen ip6qmaxlen -#define V_ip6stat ip6stat -#define V_ip6stealth ip6stealth -#define V_ip_checkinterface ip_checkinterface -#define V_ip_defttl ip_defttl -#define V_ip_do_randomid ip_do_randomid -#define V_ip_gif_ttl ip_gif_ttl -#define V_ip_keepfaith ip_keepfaith -#define V_ip_mrouter ip_mrouter -#define V_ip_rsvp_on ip_rsvp_on -#define V_ip_rsvpd ip_rsvpd -#define V_ip_sendsourcequench ip_sendsourcequench -#define V_ipcomp_enable ipcomp_enable -#define V_ipcompstat ipcompstat -#define V_ipfastforward_active ipfastforward_active -#define V_ipforwarding ipforwarding -#define V_ipfw_dyn_v ipfw_dyn_v -#define V_ipfw_timeout ipfw_timeout -#define V_ipip_allow ipip_allow -#define V_ipipstat ipipstat -#define V_ipport_firstauto ipport_firstauto -#define V_ipport_hifirstauto ipport_hifirstauto -#define V_ipport_hilastauto ipport_hilastauto -#define V_ipport_lastauto ipport_lastauto -#define V_ipport_lowfirstauto ipport_lowfirstauto -#define V_ipport_lowlastauto ipport_lowlastauto -#define V_ipport_randomcps ipport_randomcps -#define V_ipport_randomized ipport_randomized -#define V_ipport_randomtime ipport_randomtime -#define V_ipport_reservedhigh ipport_reservedhigh -#define V_ipport_reservedlow ipport_reservedlow -#define V_ipport_stoprandom ipport_stoprandom -#define V_ipport_tcpallocs ipport_tcpallocs -#define V_ipport_tcplastcount ipport_tcplastcount -#define V_ipq ipq -#define V_ipq_zone ipq_zone -#define V_ipsec4stat ipsec4stat -#define V_ipsec6stat ipsec6stat -#define V_ipsec_ah_keymin ipsec_ah_keymin -#define V_ipsec_debug ipsec_debug -#define V_ipsec_esp_auth ipsec_esp_auth -#define V_ipsec_esp_keymin ipsec_esp_keymin -#define V_ipsec_integrity ipsec_integrity -#define V_ipsec_replay ipsec_replay -#define V_ipsendredirects ipsendredirects -#define V_ipstat ipstat -#define V_ipstealth ipstealth -#define V_isn_ctx isn_ctx -#define V_isn_last_reseed isn_last_reseed -#define V_isn_offset isn_offset -#define V_isn_offset_old isn_offset_old -#define V_isn_secret isn_secret -#define V_key_blockacq_count key_blockacq_count -#define V_key_blockacq_lifetime key_blockacq_lifetime -#define V_key_cb key_cb -#define V_key_debug_level key_debug_level -#define V_key_dst key_dst -#define V_key_int_random key_int_random -#define V_key_larval_lifetime key_larval_lifetime -#define V_key_preferred_oldsa key_preferred_oldsa -#define V_key_spi_maxval key_spi_maxval -#define V_key_spi_minval key_spi_minval -#define V_key_spi_trycnt key_spi_trycnt -#define V_key_src key_src -#define V_layer3_chain layer3_chain -#define V_llinfo_arp llinfo_arp -#define V_llinfo_nd6 llinfo_nd6 -#define V_lo_list lo_list -#define V_loif loif -#define V_max_gif_nesting max_gif_nesting -#define V_maxfragsperpacket maxfragsperpacket -#define V_maxnipq maxnipq -#define V_mrt6debug mrt6debug -#define V_nd6_allocated nd6_allocated -#define V_nd6_debug nd6_debug -#define V_nd6_defifindex nd6_defifindex -#define V_nd6_defifp nd6_defifp -#define V_nd6_delay nd6_delay -#define V_nd6_gctimer nd6_gctimer -#define V_nd6_inuse nd6_inuse -#define V_nd6_maxndopt nd6_maxndopt -#define V_nd6_maxnudhint nd6_maxnudhint -#define V_nd6_maxqueuelen nd6_maxqueuelen -#define V_nd6_mmaxtries nd6_mmaxtries -#define V_nd6_prune nd6_prune -#define V_nd6_recalc_reachtm_interval nd6_recalc_reachtm_interval -#define V_nd6_slowtimo_ch nd6_slowtimo_ch -#define V_nd6_timer_ch nd6_timer_ch -#define V_nd6_umaxtries nd6_umaxtries -#define V_nd6_useloopback nd6_useloopback -#define V_nd_defrouter nd_defrouter -#define V_nd_prefix nd_prefix -#define V_nextID nextID -#define V_ng_ID_hash ng_ID_hash -#define V_ng_eiface_unit ng_eiface_unit -#define V_ng_iface_unit ng_iface_unit -#define V_ng_name_hash ng_name_hash -#define V_nipq nipq -#define V_nolocaltimewait nolocaltimewait -#define V_norule_counter norule_counter -#define V_parallel_tunnels parallel_tunnels -#define V_path_mtu_discovery path_mtu_discovery -#define V_pfkeystat pfkeystat -#define V_pim6 pim6 -#define V_pmtu_expire pmtu_expire -#define V_pmtu_probe pmtu_probe -#define V_policy_id policy_id -#define V_rawcb_list rawcb_list -#define V_regtree regtree -#define V_rip6_recvspace rip6_recvspace -#define V_rip6_sendspace rip6_sendspace -#define V_rip6stat rip6stat -#define V_ripcb ripcb -#define V_ripcbinfo ripcbinfo -#define V_router_info_head router_info_head -#define V_rsvp_on rsvp_on -#define V_rt_tables rt_tables -#define V_rtq_minreallyold rtq_minreallyold -#define V_rtq_mtutimer rtq_mtutimer -#define V_rtq_reallyold rtq_reallyold -#define V_rtq_timeout rtq_timeout -#define V_rtq_timeout6 rtq_timeout6 -#define V_rtq_timer rtq_timer -#define V_rtq_timer6 rtq_timer6 -#define V_rtq_toomany rtq_toomany -#define V_rtstat rtstat -#define V_rttrash rttrash -#define V_sahtree sahtree -#define V_sameprefixcarponly sameprefixcarponly -#define V_saorder_state_alive saorder_state_alive -#define V_saorder_state_any saorder_state_any -#define V_set_disable set_disable -#define V_sid_default sid_default -#define V_spacqtree spacqtree -#define V_sptree sptree -#define V_ss_fltsz ss_fltsz -#define V_ss_fltsz_local ss_fltsz_local -#define V_static_count static_count -#define V_subnetsarelocal subnetsarelocal -#define V_tcb tcb -#define V_tcbinfo tcbinfo -#define V_tcp_autorcvbuf_inc tcp_autorcvbuf_inc -#define V_tcp_autorcvbuf_max tcp_autorcvbuf_max -#define V_tcp_autosndbuf_inc tcp_autosndbuf_inc -#define V_tcp_autosndbuf_max tcp_autosndbuf_max -#define V_tcp_delack_enabled tcp_delack_enabled -#define V_tcp_do_autorcvbuf tcp_do_autorcvbuf -#define V_tcp_do_autosndbuf tcp_do_autosndbuf -#define V_tcp_do_ecn tcp_do_ecn -#define V_tcp_do_newreno tcp_do_newreno -#define V_tcp_do_rfc1323 tcp_do_rfc1323 -#define V_tcp_do_rfc3042 tcp_do_rfc3042 -#define V_tcp_do_rfc3390 tcp_do_rfc3390 -#define V_tcp_do_sack tcp_do_sack -#define V_tcp_do_tso tcp_do_tso -#define V_tcp_hc_callout tcp_hc_callout -#define V_tcp_ecn_maxretries tcp_ecn_maxretries -#define V_tcp_hostcache tcp_hostcache -#define V_tcp_inflight_enable tcp_inflight_enable -#define V_tcp_inflight_max tcp_inflight_max -#define V_tcp_inflight_min tcp_inflight_min -#define V_tcp_inflight_rttthresh tcp_inflight_rttthresh -#define V_tcp_inflight_stab tcp_inflight_stab -#define V_tcp_insecure_rst tcp_insecure_rst -#define V_tcp_isn_reseed_interval tcp_isn_reseed_interval -#define V_tcp_minmss tcp_minmss -#define V_tcp_mssdflt tcp_mssdflt -#define V_tcp_reass_maxqlen tcp_reass_maxqlen -#define V_tcp_reass_maxseg tcp_reass_maxseg -#define V_tcp_reass_overflows tcp_reass_overflows -#define V_tcp_reass_qsize tcp_reass_qsize -#define V_tcp_sack_globalholes tcp_sack_globalholes -#define V_tcp_sack_globalmaxholes tcp_sack_globalmaxholes -#define V_tcp_sack_maxholes tcp_sack_maxholes -#define V_tcp_sc_rst_sock_fail tcp_sc_rst_sock_fail -#define V_tcp_syncache tcp_syncache -#define V_tcp_v6mssdflt tcp_v6mssdflt -#define V_tcpstat tcpstat -#define V_twq_2msl twq_2msl -#define V_udb udb -#define V_udbinfo udbinfo -#define V_udp6_recvspace udp6_recvspace -#define V_udp6_sendspace udp6_sendspace -#define V_udpstat udpstat -#define V_useloopback useloopback -#define V_verbose_limit verbose_limit +#define V_hostname hostname +#define G_hostname hostname +#define V_domainname domainname +#define V_acq_seq acq_seq +#define V_acqtree acqtree +#define V_addrsel_policytab addrsel_policytab +#define V_ah_cleartos ah_cleartos +#define V_ah_enable ah_enable +#define V_ahstat ahstat +#define V_arp_maxtries arp_maxtries +#define V_arp_proxyall arp_proxyall +#define V_arpt_keep arpt_keep +#define V_arpt_prune arpt_prune +#define V_autoinc_step autoinc_step +#define V_blackhole blackhole +#define V_crypto_support crypto_support +#define V_curr_dyn_buckets curr_dyn_buckets +#define V_dad_ignore_ns dad_ignore_ns +#define V_dad_init dad_init +#define V_dad_maxtry dad_maxtry +#define V_dadq dadq +#define V_defaultaddrpolicy defaultaddrpolicy +#define V_divcb divcb +#define V_divcbinfo divcbinfo +#define V_drop_synfin drop_synfin +#define V_dyn_ack_lifetime dyn_ack_lifetime +#define V_dyn_buckets dyn_buckets +#define V_dyn_count dyn_count +#define V_dyn_fin_lifetime dyn_fin_lifetime +#define V_dyn_keepalive dyn_keepalive +#define V_dyn_keepalive_interval dyn_keepalive_interval +#define V_dyn_keepalive_period dyn_keepalive_period +#define V_dyn_max dyn_max +#define V_dyn_rst_lifetime dyn_rst_lifetime +#define V_dyn_short_lifetime dyn_short_lifetime +#define V_dyn_syn_lifetime dyn_syn_lifetime +#define V_dyn_udp_lifetime dyn_udp_lifetime +#define V_esp_enable esp_enable +#define V_esp_max_ivlen esp_max_ivlen +#define V_espstat espstat +#define V_ether_ipfw ether_ipfw +#define V_frag6_nfragpackets frag6_nfragpackets +#define V_frag6_nfrags frag6_nfrags +#define V_fw6_enable fw6_enable +#define V_fw_debug fw_debug +#define V_fw_deny_unknown_exthdrs fw_deny_unknown_exthdrs +#define V_fw_enable fw_enable +#define V_fw_one_pass fw_one_pass +#define V_fw_verbose fw_verbose +#define V_gif_softc_list gif_softc_list +#define V_icmp6_nodeinfo icmp6_nodeinfo +#define V_icmp6_rediraccept icmp6_rediraccept +#define V_icmp6_redirtimeout icmp6_redirtimeout +#define V_icmp6errpps_count icmp6errpps_count +#define V_icmp6errppslim icmp6errppslim +#define V_icmp6errppslim_last icmp6errppslim_last +#define V_icmp6stat icmp6stat +#define V_icmp_may_rst icmp_may_rst +#define V_icmpstat icmpstat +#define V_if_index if_index +#define V_if_indexlim if_indexlim +#define V_ifaddr_event_tag ifaddr_event_tag +#define V_ifg_head ifg_head +#define V_ifindex_table ifindex_table +#define V_ifklist ifklist +#define V_ifnet ifnet +#define V_igmpstat igmpstat +#define V_in6_ifaddr in6_ifaddr +#define V_in6_maxmtu in6_maxmtu +#define V_in6_tmpaddrtimer_ch in6_tmpaddrtimer_ch +#define V_in_ifaddrhashtbl in_ifaddrhashtbl +#define V_in_ifaddrhead in_ifaddrhead +#define V_in_ifaddrhmask in_ifaddrhmask +#define V_in_multihead in_multihead +#define V_ip4_ah_net_deflev ip4_ah_net_deflev +#define V_ip4_ah_offsetmask ip4_ah_offsetmask +#define V_ip4_ah_trans_deflev ip4_ah_trans_deflev +#define V_ip4_def_policy ip4_def_policy +#define V_ip4_esp_net_deflev ip4_esp_net_deflev +#define V_ip4_esp_randpad ip4_esp_randpad +#define V_ip4_esp_trans_deflev ip4_esp_trans_deflev +#define V_ip4_ipsec_dfbit ip4_ipsec_dfbit +#define V_ip4_ipsec_ecn ip4_ipsec_ecn +#define V_ip6_accept_rtadv ip6_accept_rtadv +#define V_ip6_ah_net_deflev ip6_ah_net_deflev +#define V_ip6_ah_trans_deflev ip6_ah_trans_deflev +#define V_ip6_auto_flowlabel ip6_auto_flowlabel +#define V_ip6_auto_linklocal ip6_auto_linklocal +#define V_ip6_dad_count ip6_dad_count +#define V_ip6_defhlim ip6_defhlim +#define V_ip6_defmcasthlim ip6_defmcasthlim +#define V_ip6_desync_factor ip6_desync_factor +#define V_ip6_esp_net_deflev ip6_esp_net_deflev +#define V_ip6_esp_randpad ip6_esp_randpad +#define V_ip6_esp_trans_deflev ip6_esp_trans_deflev +#define V_ip6_forward_rt ip6_forward_rt +#define V_ip6_forward_srcrt ip6_forward_srcrt +#define V_ip6_forwarding ip6_forwarding +#define V_ip6_gif_hlim ip6_gif_hlim +#define V_ip6_hdrnestlimit ip6_hdrnestlimit +#define V_ip6_ipsec_ecn ip6_ipsec_ecn +#define V_ip6_keepfaith ip6_keepfaith +#define V_ip6_log_interval ip6_log_interval +#define V_ip6_log_time ip6_log_time +#define V_ip6_maxfragpackets ip6_maxfragpackets +#define V_ip6_maxfrags ip6_maxfrags +#define V_ip6_mcast_pmtu ip6_mcast_pmtu +#define V_ip6_mrouter_ver ip6_mrouter_ver +#define V_ip6_opts ip6_opts +#define V_ip6_ours_check_algorithm ip6_ours_check_algorithm +#define V_ip6_prefer_tempaddr ip6_prefer_tempaddr +#define V_ip6_rr_prune ip6_rr_prune +#define V_ip6_sendredirects ip6_sendredirects +#define V_ip6_sourcecheck ip6_sourcecheck +#define V_ip6_sourcecheck_interval ip6_sourcecheck_interval +#define V_ip6_temp_preferred_lifetime ip6_temp_preferred_lifetime +#define V_ip6_temp_regen_advance ip6_temp_regen_advance +#define V_ip6_temp_valid_lifetime ip6_temp_valid_lifetime +#define V_ip6_use_defzone ip6_use_defzone +#define V_ip6_use_deprecated ip6_use_deprecated +#define V_ip6_use_tempaddr ip6_use_tempaddr +#define V_ip6_v6only ip6_v6only +#define V_ip6q ip6q +#define V_ip6qmaxlen ip6qmaxlen +#define V_ip6stat ip6stat +#define V_ip6stealth ip6stealth +#define V_ip_checkinterface ip_checkinterface +#define V_ip_defttl ip_defttl +#define V_ip_do_randomid ip_do_randomid +#define V_ip_gif_ttl ip_gif_ttl +#define V_ip_keepfaith ip_keepfaith +#define V_ip_mrouter ip_mrouter +#define V_ip_rsvp_on ip_rsvp_on +#define V_ip_rsvpd ip_rsvpd +#define V_ip_sendsourcequench ip_sendsourcequench +#define V_ipcomp_enable ipcomp_enable +#define V_ipcompstat ipcompstat +#define V_ipfastforward_active ipfastforward_active +#define V_ipforwarding ipforwarding +#define V_ipfw_dyn_v ipfw_dyn_v +#define V_ipfw_timeout ipfw_timeout +#define V_ipip_allow ipip_allow +#define V_ipipstat ipipstat +#define V_ipport_firstauto ipport_firstauto +#define V_ipport_hifirstauto ipport_hifirstauto +#define V_ipport_hilastauto ipport_hilastauto +#define V_ipport_lastauto ipport_lastauto +#define V_ipport_lowfirstauto ipport_lowfirstauto +#define V_ipport_lowlastauto ipport_lowlastauto +#define V_ipport_randomcps ipport_randomcps +#define V_ipport_randomized ipport_randomized +#define V_ipport_randomtime ipport_randomtime +#define V_ipport_reservedhigh ipport_reservedhigh +#define V_ipport_reservedlow ipport_reservedlow +#define V_ipport_stoprandom ipport_stoprandom +#define V_ipport_tcpallocs ipport_tcpallocs +#define V_ipport_tcplastcount ipport_tcplastcount +#define V_ipq ipq +#define V_ipq_zone ipq_zone +#define V_ipsec4stat ipsec4stat +#define V_ipsec6stat ipsec6stat +#define V_ipsec_ah_keymin ipsec_ah_keymin +#define V_ipsec_debug ipsec_debug +#define V_ipsec_esp_auth ipsec_esp_auth +#define V_ipsec_esp_keymin ipsec_esp_keymin +#define V_ipsec_integrity ipsec_integrity +#define V_ipsec_replay ipsec_replay +#define V_ipsendredirects ipsendredirects +#define V_ipstat ipstat +#define V_ipstealth ipstealth +#define V_isn_ctx isn_ctx +#define V_isn_last_reseed isn_last_reseed +#define V_isn_offset isn_offset +#define V_isn_offset_old isn_offset_old +#define V_isn_secret isn_secret +#define V_key_blockacq_count key_blockacq_count +#define V_key_blockacq_lifetime key_blockacq_lifetime +#define V_key_cb key_cb +#define V_key_debug_level key_debug_level +#define V_key_dst key_dst +#define V_key_int_random key_int_random +#define V_key_larval_lifetime key_larval_lifetime +#define V_key_preferred_oldsa key_preferred_oldsa +#define V_key_spi_maxval key_spi_maxval +#define V_key_spi_minval key_spi_minval +#define V_key_spi_trycnt key_spi_trycnt +#define V_key_src key_src +#define V_layer3_chain layer3_chain +#define V_llinfo_arp llinfo_arp +#define V_llinfo_nd6 llinfo_nd6 +#define V_lo_list lo_list +#define V_loif loif +#define V_max_gif_nesting max_gif_nesting +#define V_maxfragsperpacket maxfragsperpacket +#define V_maxnipq maxnipq +#define V_mrt6debug mrt6debug +#define V_nd6_allocated nd6_allocated +#define V_nd6_debug nd6_debug +#define V_nd6_defifindex nd6_defifindex +#define V_nd6_defifp nd6_defifp +#define V_nd6_delay nd6_delay +#define V_nd6_gctimer nd6_gctimer +#define V_nd6_inuse nd6_inuse +#define V_nd6_maxndopt nd6_maxndopt +#define V_nd6_maxnudhint nd6_maxnudhint +#define V_nd6_maxqueuelen nd6_maxqueuelen +#define V_nd6_mmaxtries nd6_mmaxtries +#define V_nd6_prune nd6_prune +#define V_nd6_recalc_reachtm_interval nd6_recalc_reachtm_interval +#define V_nd6_slowtimo_ch nd6_slowtimo_ch +#define V_nd6_timer_ch nd6_timer_ch +#define V_nd6_umaxtries nd6_umaxtries +#define V_nd6_useloopback nd6_useloopback +#define V_nd_defrouter nd_defrouter +#define V_nd_prefix nd_prefix +#define V_nextID nextID +#define V_ng_ID_hash ng_ID_hash +#define V_ng_eiface_unit ng_eiface_unit +#define V_ng_iface_unit ng_iface_unit +#define V_ng_name_hash ng_name_hash +#define V_nipq nipq +#define V_nolocaltimewait nolocaltimewait +#define V_norule_counter norule_counter +#define V_parallel_tunnels parallel_tunnels +#define V_path_mtu_discovery path_mtu_discovery +#define V_pfkeystat pfkeystat +#define V_pim6 pim6 +#define V_pmtu_expire pmtu_expire +#define V_pmtu_probe pmtu_probe +#define V_policy_id policy_id +#define V_rawcb_list rawcb_list +#define V_regtree regtree +#define V_rip6_recvspace rip6_recvspace +#define V_rip6_sendspace rip6_sendspace +#define V_rip6stat rip6stat +#define V_ripcb ripcb +#define V_ripcbinfo ripcbinfo +#define V_router_info_head router_info_head +#define V_rsvp_on rsvp_on +#define V_rt_tables rt_tables +#define V_rtq_minreallyold rtq_minreallyold +#define V_rtq_mtutimer rtq_mtutimer +#define V_rtq_reallyold rtq_reallyold +#define V_rtq_timeout rtq_timeout +#define V_rtq_timeout6 rtq_timeout6 +#define V_rtq_timer rtq_timer +#define V_rtq_timer6 rtq_timer6 +#define V_rtq_toomany rtq_toomany +#define V_rtstat rtstat +#define V_rttrash rttrash +#define V_sahtree sahtree +#define V_sameprefixcarponly sameprefixcarponly +#define V_saorder_state_alive saorder_state_alive +#define V_saorder_state_any saorder_state_any +#define V_set_disable set_disable +#define V_sid_default sid_default +#define V_spacqtree spacqtree +#define V_sptree sptree +#define V_ss_fltsz ss_fltsz +#define V_ss_fltsz_local ss_fltsz_local +#define V_static_count static_count +#define V_subnetsarelocal subnetsarelocal +#define V_tcb tcb +#define V_tcbinfo tcbinfo +#define V_tcp_autorcvbuf_inc tcp_autorcvbuf_inc +#define V_tcp_autorcvbuf_max tcp_autorcvbuf_max +#define V_tcp_autosndbuf_inc tcp_autosndbuf_inc +#define V_tcp_autosndbuf_max tcp_autosndbuf_max +#define V_tcp_delack_enabled tcp_delack_enabled +#define V_tcp_do_autorcvbuf tcp_do_autorcvbuf +#define V_tcp_do_autosndbuf tcp_do_autosndbuf +#define V_tcp_do_ecn tcp_do_ecn +#define V_tcp_do_newreno tcp_do_newreno +#define V_tcp_do_rfc1323 tcp_do_rfc1323 +#define V_tcp_do_rfc3042 tcp_do_rfc3042 +#define V_tcp_do_rfc3390 tcp_do_rfc3390 +#define V_tcp_do_sack tcp_do_sack +#define V_tcp_do_tso tcp_do_tso +#define V_tcp_hc_callout tcp_hc_callout +#define V_tcp_ecn_maxretries tcp_ecn_maxretries +#define V_tcp_hostcache tcp_hostcache +#define V_tcp_inflight_enable tcp_inflight_enable +#define V_tcp_inflight_max tcp_inflight_max +#define V_tcp_inflight_min tcp_inflight_min +#define V_tcp_inflight_rttthresh tcp_inflight_rttthresh +#define V_tcp_inflight_stab tcp_inflight_stab +#define V_tcp_insecure_rst tcp_insecure_rst +#define V_tcp_isn_reseed_interval tcp_isn_reseed_interval +#define V_tcp_minmss tcp_minmss +#define V_tcp_mssdflt tcp_mssdflt +#define V_tcp_reass_maxqlen tcp_reass_maxqlen +#define V_tcp_reass_maxseg tcp_reass_maxseg +#define V_tcp_reass_overflows tcp_reass_overflows +#define V_tcp_reass_qsize tcp_reass_qsize +#define V_tcp_sack_globalholes tcp_sack_globalholes +#define V_tcp_sack_globalmaxholes tcp_sack_globalmaxholes +#define V_tcp_sack_maxholes tcp_sack_maxholes +#define V_tcp_sc_rst_sock_fail tcp_sc_rst_sock_fail +#define V_tcp_syncache tcp_syncache +#define V_tcp_v6mssdflt tcp_v6mssdflt +#define V_tcpstat tcpstat +#define V_twq_2msl twq_2msl +#define V_udb udb +#define V_udbinfo udbinfo +#define V_udp6_recvspace udp6_recvspace +#define V_udp6_sendspace udp6_sendspace +#define V_udpstat udpstat +#define V_useloopback useloopback +#define V_verbose_limit verbose_limit #endif /* !_SYS_VIMAGE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Aug 16 16:58:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A368106567A; Sat, 16 Aug 2008 16:58:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D0DE1065674 for ; Sat, 16 Aug 2008 16:58:58 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4AB08FC08 for ; Sat, 16 Aug 2008 16:58:57 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GGwv6g046523 for ; Sat, 16 Aug 2008 16:58:57 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GGwvs4046521 for perforce@freebsd.org; Sat, 16 Aug 2008 16:58:57 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 16:58:57 GMT Message-Id: <200808161658.m7GGwvs4046521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 16:58:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147562 Change 147562 by julian@julian_trafmon1 on 2008/08/16 16:58:12 IFC @147495 this branch fell way behind Affected files ... .. //depot/projects/vimage-commit3/src/sys/Makefile#4 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/db_interface.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/intr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/vimage-commit3/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/vimage-commit3/src/sys/arm/include/db_machdep.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/common/misc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/vimage-commit3/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/NOTES#5 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files#5 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files.amd64#2 integrate .. //depot/projects/vimage-commit3/src/sys/conf/files.i386#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/age/if_age.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/aha/aha.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/ds1339.c#2 delete .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/led/led.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/console/console.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/vimage-commit3/src/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/vimage-commit3/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_disk.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_kern.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/vimage-commit3/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/support.s#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/features.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/xen/clock.c#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/xen/exception.s#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/xen/locore.s#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/xen/pmap.c#1 branch .. //depot/projects/vimage-commit3/src/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/vimage-commit3/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/libkern/strcspn.c#1 branch .. //depot/projects/vimage-commit3/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/mips/mips/tick.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/Makefile#5 integrate .. //depot/projects/vimage-commit3/src/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/vimage-commit3/src/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/sis/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/snc/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/ste/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/tl/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/upgt/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/modules/wb/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/modules/xl/Makefile#2 integrate .. //depot/projects/vimage-commit3/src/sys/net/bpf.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_enc.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_enc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/key.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit3/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/vimage-commit3/src/sys/pci/if_pcn.c#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/pci/if_sis.c#3 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_sisreg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_ste.c#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_stereg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_tl.c#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_tlreg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_wb.c#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_wbreg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_xl.c#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/if_xlreg.h#2 delete .. //depot/projects/vimage-commit3/src/sys/pci/viapm.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/audit/audit.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/cpuctl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/sys/libkern.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/lock.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/param.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/sys/priv.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/proc.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sbuf.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/sys/socket.h#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/sx.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/redzone.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/gnttab.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/gnttab.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/COPYING#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/acm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/callback.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/domctl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/features.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/console.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/kexec.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/libelf.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/memory.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/nmi.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/physdev.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/platform.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/sched.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/trace.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/version.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/xen.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/vimage-commit3/src/sys/xen/xenbus/xenbus_xs.c#1 branch Differences ... ==== //depot/projects/vimage-commit3/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.51 2008/07/20 09:16:00 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTid(ins->k, EAX); + JCC(JNE, JE); break; case BPF_JMP|BPF_JGT|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JA(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JAE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_X: + if (ins->jt == 0 && ins->jf == 0) + break; CMPrd(EDX, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_X: - MOVrd(EAX, ECX); - ANDrd(EDX, ECX); - JE(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc]); + if (ins->jt == 0 && ins->jf == 0) + break; + TESTrd(EDX, EAX); + JCC(JNE, JE); break; case BPF_ALU|BPF_ADD|BPF_X: @@ -376,11 +363,11 @@ break; case BPF_ALU|BPF_DIV|BPF_X: - CMPid(0, EDX); - JNEb(5); + TESTrd(EDX, EDX); + JNEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVrd(EDX, ECX); ZEROrd(EDX); DIVrd(ECX); @@ -466,7 +453,7 @@ stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT); if (stream.ibuf == NULL) { free(stream.refs, M_BPFJIT); - return NULL; + return (NULL); } /* @@ -490,5 +477,5 @@ */ free(stream.refs, M_BPFJIT); - return (bpf_filter_func)stream.ibuf; + return ((bpf_filter_func)stream.ibuf); } ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.5 2008/06/24 20:12:12 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $ */ #ifndef _BPF_JIT_MACHDEP_H_ @@ -45,6 +45,14 @@ #define RBP 5 #define RSI 6 #define RDI 7 +#define R8 0 +#define R9 1 +#define R10 2 +#define R11 3 +#define R12 4 +#define R13 5 +#define R14 6 +#define R15 7 #define EAX 0 #define ECX 1 @@ -54,6 +62,14 @@ #define EBP 5 #define ESI 6 #define EDI 7 +#define R8D 0 +#define R9D 1 +#define R10D 2 +#define R11D 3 +#define R12D 4 +#define R13D 5 +#define R14D 6 +#define R15D 7 #define AX 0 #define CX 1 @@ -125,6 +141,20 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* movl sr32,dr32 (dr32 = %r8-15d) */ +#define MOVrd2(sr32, dr32) do { \ + emitm(&stream, 0x8941, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + +/* movl sr32,dr32 (sr32 = %r8-15d) */ +#define MOVrd3(sr32, dr32) do { \ + emitm(&stream, 0x8944, 2); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* movq sr64,dr64 */ #define MOVrq(sr64, dr64) do { \ emitm(&stream, 0x8948, 2); \ @@ -132,20 +162,18 @@ (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl off(sr64),dr32 */ -#define MOVoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x8b, 1); \ +/* movq sr64,dr64 (dr64 = %r8-15) */ +#define MOVrq2(sr64, dr64) do { \ + emitm(&stream, 0x8949, 2); \ emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) -/* movl sr32,off(dr64) */ -#define MOVdoq(sr32, off, dr64) do { \ - emitm(&stream, 0x89, 1); \ +/* movq sr64,dr64 (sr64 = %r8-15) */ +#define MOVrq3(sr64, dr64) do { \ + emitm(&stream, 0x894c, 2); \ emitm(&stream, \ - (1 << 6) | ((sr32 & 0x7) << 3) | (dr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ + (3 << 6) | ((sr64 & 0x7) << 3) | (dr64 & 0x7), 1); \ } while (0) /* movl (sr64,or64,1),dr32 */ @@ -187,21 +215,11 @@ emitm(&stream, 0xc486, 2); \ } while (0) -/* pushq r64 */ -#define PUSH(r64) do { \ - emitm(&stream, (5 << 4) | (0 << 3) | (r64 & 0x7), 1); \ +/* ret */ +#define RET() do { \ + emitm(&stream, 0xc3, 1); \ } while (0) -/* popq r64 */ -#define POP(r64) do { \ - emitm(&stream, (5 << 4) | (1 << 3) | (r64 & 0x7), 1); \ -} while (0) - -/* leaveq/retq */ -#define LEAVE_RET() do { \ - emitm(&stream, 0xc3c9, 2); \ -} while (0) - /* addl sr32,dr32 */ #define ADDrd(sr32, dr32) do { \ emitm(&stream, 0x01, 1); \ @@ -215,13 +233,6 @@ emitm(&stream, i32, 4); \ } while (0) -/* addl i32,r32 */ -#define ADDid(i32, r32) do { \ - emitm(&stream, 0x81, 1); \ - emitm(&stream, (24 << 3) | r32, 1); \ - emitm(&stream, i32, 4); \ -} while (0) - /* addl i8,r32 */ #define ADDib(i8, r32) do { \ emitm(&stream, 0x83, 1); \ @@ -283,6 +294,24 @@ (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ } while (0) +/* testl i32,r32 */ +#define TESTid(i32, r32) do { \ + if (r32 == EAX) { \ + emitm(&stream, 0xa9, 1); \ + } else { \ + emitm(&stream, 0xf7, 1); \ + emitm(&stream, (3 << 6) | r32, 1); \ + } \ + emitm(&stream, i32, 4); \ +} while (0) + +/* testl sr32,dr32 */ +#define TESTrd(sr32, dr32) do { \ + emitm(&stream, 0x85, 1); \ + emitm(&stream, \ + (3 << 6) | ((sr32 & 0x7) << 3) | (dr32 & 0x7), 1); \ +} while (0) + /* orl sr32,dr32 */ #define ORrd(sr32, dr32) do { \ emitm(&stream, 0x09, 1); \ @@ -333,14 +362,6 @@ emitm(&stream, (27 << 3) | (r32 & 0x7), 1); \ } while (0) -/* cmpl off(sr64),dr32 */ -#define CMPoqd(off, sr64, dr32) do { \ - emitm(&stream, 0x3b, 1); \ - emitm(&stream, \ - (1 << 6) | ((dr32 & 0x7) << 3) | (sr64 & 0x7), 1); \ - emitm(&stream, off, 1); \ -} while (0) - /* cmpl sr32,dr32 */ #define CMPrd(sr32, dr32) do { \ emitm(&stream, 0x39, 1); \ @@ -366,48 +387,12 @@ emitm(&stream, off8, 1); \ } while (0) -/* je off32 */ -#define JE(off32) do { \ - emitm(&stream, 0x840f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off32 */ -#define JLE(off32) do { \ - emitm(&stream, 0x8e0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jle off8 */ -#define JLEb(off8) do { \ - emitm(&stream, 0x7e, 1); \ +/* jbe off8 */ +#define JBEb(off8) do { \ + emitm(&stream, 0x76, 1); \ emitm(&stream, off8, 1); \ } while (0) -/* ja off32 */ -#define JA(off32) do { \ - emitm(&stream, 0x870f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jae off32 */ -#define JAE(off32) do { \ - emitm(&stream, 0x830f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jg off32 */ -#define JG(off32) do { \ - emitm(&stream, 0x8f0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - -/* jge off32 */ -#define JGE(off32) do { \ - emitm(&stream, 0x8d0f, 2); \ - emitm(&stream, off32, 4); \ -} while (0) - /* jmp off32 */ #define JMP(off32) do { \ emitm(&stream, 0xe9, 1); \ @@ -420,4 +405,33 @@ emitm(&stream, (3 << 6) | ((r32 & 0x7) << 3) | (r32 & 0x7), 1); \ } while (0) +/* + * Conditional long jumps + */ +#define JB 0x82 +#define JAE 0x83 +#define JE 0x84 +#define JNE 0x85 +#define JBE 0x86 +#define JA 0x87 + +#define JCC(t, f) do { \ + if (ins->jt != 0 && ins->jf != 0) { \ + /* 5 is the size of the following jmp */ \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc] + 5, 4); \ + JMP(stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc]); \ + } else if (ins->jt != 0) { \ + emitm(&stream, ((t) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jt] - \ + stream.refs[stream.bpf_pc], 4); \ + } else { \ + emitm(&stream, ((f) << 8) | 0x0f, 2); \ + emitm(&stream, stream.refs[stream.bpf_pc + ins->jf] - \ + stream.refs[stream.bpf_pc], 4); \ + } \ +} while (0) + #endif /* _BPF_JIT_MACHDEP_H_ */ ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/db_disasm.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.32 2008/08/11 20:19:42 jhb Exp $"); /* * Instruction disassembler. @@ -164,15 +164,37 @@ "" }; +static const char * const db_Grp15[] = { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:03:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83287106567E; Sat, 16 Aug 2008 17:03:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47452106567B for ; Sat, 16 Aug 2008 17:03:02 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D0CB8FC19 for ; Sat, 16 Aug 2008 17:03:02 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GH32DS047629 for ; Sat, 16 Aug 2008 17:03:02 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GH32iM047614 for perforce@freebsd.org; Sat, 16 Aug 2008 17:03:02 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 17:03:02 GMT Message-Id: <200808161703.m7GH32iM047614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=147563 Change 147563 by bz@bz_dumpster on 2008/08/16 17:02:30 3 more V_ Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#5 (text+ko) ==== @@ -598,11 +598,11 @@ hl, (u_long) (authsize + rplen - sizeof (struct ah)), ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi))); - ahstat.ahs_badauthl++; + V_ahstat.ahs_badauthl++; m_freem(m); return EACCES; } - ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl; + V_ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl; /* Get crypto descriptors. */ crp = crypto_getreq(1); @@ -933,7 +933,7 @@ ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi), rplen + authsize + m->m_pkthdr.len, maxpacketsize)); - ahstat.ahs_toobig++; + V_ahstat.ahs_toobig++; error = EMSGSIZE; goto bad; } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:11:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D561065674; Sat, 16 Aug 2008 17:11:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF347106566C for ; Sat, 16 Aug 2008 17:11:10 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A50118FC2A for ; Sat, 16 Aug 2008 17:11:10 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHBAs3048692 for ; Sat, 16 Aug 2008 17:11:10 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHBA9v048690 for perforce@freebsd.org; Sat, 16 Aug 2008 17:11:10 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 17:11:10 GMT Message-Id: <200808161711.m7GHBA9v048690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:11:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=147565 Change 147565 by bz@bz_dumpster on 2008/08/16 17:10:38 remove a dead entry from vimage.h anoterh V_ tp xform_esp Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#5 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#5 (text+ko) ==== @@ -722,7 +722,7 @@ "(len %u, max len %u)\n", __func__, ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi), skip + hlen + rlen + padding + alen, maxpacketsize)); - espstat.esps_toobig++; + V_espstat.esps_toobig++; error = EMSGSIZE; goto bad; } ==== //depot/projects/vimage-commit2/src/sys/sys/vimage.h#8 (text+ko) ==== @@ -45,7 +45,6 @@ #define V_arp_maxtries arp_maxtries #define V_arp_proxyall arp_proxyall #define V_arpt_keep arpt_keep -#define V_arpt_prune arpt_prune #define V_autoinc_step autoinc_step #define V_blackhole blackhole #define V_crypto_support crypto_support From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:12:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B2C01065680; Sat, 16 Aug 2008 17:12:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EB70106567E for ; Sat, 16 Aug 2008 17:12:12 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEA3E8FC12 for ; Sat, 16 Aug 2008 17:12:11 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHCBq0048765 for ; Sat, 16 Aug 2008 17:12:11 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHCBir048763 for perforce@freebsd.org; Sat, 16 Aug 2008 17:12:11 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 17:12:11 GMT Message-Id: <200808161712.m7GHCBir048763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=147566 Change 147566 by bz@bz_dumpster on 2008/08/16 17:12:09 missed V_ Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#6 (text+ko) ==== @@ -2301,7 +2301,7 @@ printf("IPFW2: IPV6 - Unknown Routing " "Header type(%d)\n", ((struct ip6_rthdr *)ulp)->ip6r_type); - if (fw_deny_unknown_exthdrs) + if (V_fw_deny_unknown_exthdrs) return (IP_FW_DENY); break; } From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:15:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91C5A1065677; Sat, 16 Aug 2008 17:15:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 554551065674 for ; Sat, 16 Aug 2008 17:15:15 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AE9B8FC0C for ; Sat, 16 Aug 2008 17:15:15 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHFFN7049006 for ; Sat, 16 Aug 2008 17:15:15 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHFFOa049004 for perforce@freebsd.org; Sat, 16 Aug 2008 17:15:15 GMT (envelope-from bz@freebsd.org) Date: Sat, 16 Aug 2008 17:15:15 GMT Message-Id: <200808161715.m7GHFFOa049004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:15:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=147567 Change 147567 by bz@bz_dumpster on 2008/08/16 17:15:11 V_ for more intializers Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#7 (text+ko) ==== @@ -4566,12 +4566,12 @@ default_rule.cmd[0].opcode == O_ACCEPT ? "accept" : "deny"); #ifdef IPFIREWALL_VERBOSE - fw_verbose = 1; + V_fw_verbose = 1; #endif #ifdef IPFIREWALL_VERBOSE_LIMIT verbose_limit = IPFIREWALL_VERBOSE_LIMIT; #endif - if (fw_verbose == 0) + if (V_fw_verbose == 0) printf("disabled\n"); else if (verbose_limit == 0) printf("unlimited\n"); From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:28:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C9731065673; Sat, 16 Aug 2008 17:28:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F087106566B for ; Sat, 16 Aug 2008 17:28:30 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 423698FC16 for ; Sat, 16 Aug 2008 17:28:30 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHSUXH050048 for ; Sat, 16 Aug 2008 17:28:30 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHSSFM050042 for perforce@freebsd.org; Sat, 16 Aug 2008 17:28:28 GMT (envelope-from snagg@FreeBSD.org) Date: Sat, 16 Aug 2008 17:28:28 GMT Message-Id: <200808161728.m7GHSSFM050042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:28:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147568 Change 147568 by snagg@snagg_macosx on 2008/08/16 17:28:23 IFC Affected files ... .. //depot/projects/soc2008/snagg-audit/sys/Makefile#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/arm/intr.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/conf/NSLU#1 branch .. //depot/projects/soc2008/snagg-audit/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/soc2008/snagg-audit/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/common/misc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/locore.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/NOTES#7 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/files#8 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/files.i386#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/kern.mk#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/options#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/conf/options.i386#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/crypto/via/padlock.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/ddb/db_run.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/age/if_age.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/aha/aha.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cpuctl/cpuctl.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_lro.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/LICENSE#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/README#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_80003es2lan.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_80003es2lan.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82540.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82541.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82541.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82542.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82543.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82543.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82571.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82571.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82575.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_82575.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_api.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_api.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_defines.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_hw.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_ich8lan.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_ich8lan.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_mac.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_mac.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_manage.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_manage.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_nvm.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_nvm.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_osdep.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_osdep.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_phy.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/e1000_regs.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/if_em.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/if_em.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/if_igb.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/e1000/if_igb.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/em/LICENSE#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/README#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_80003es2lan.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_80003es2lan.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82540.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82541.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82541.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82542.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82543.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82543.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82571.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82571.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_api.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_api.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_defines.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_hw.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_ich8lan.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_ich8lan.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_mac.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_mac.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_manage.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_manage.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_nvm.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_nvm.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_osdep.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_osdep.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_phy.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_phy.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_regs.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/if_em.c#4 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/em/if_em.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/glxsb/glxsb.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/glxsb/glxsb.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/glxsb/glxsb_hash.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ie/if_ievar.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_82575.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_82575.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_api.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_api.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_defines.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_hw.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_mac.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_mac.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_manage.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_manage.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_nvm.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_nvm.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_osdep.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_osdep.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_phy.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_phy.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_regs.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/if_igb.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/igb/if_igb.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/ad7418.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/ds133x.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/io/iodev.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/led/led.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/nvram/nvram.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcf/pcf.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcf/pcfvar.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/sis/if_sis.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/sis/if_sisreg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/snp/snp.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_upgt.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/uipaq.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/umass.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/blkback/blkback.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/blkfront/blkfront.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/blkfront/block.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/console/console.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/console/xencons_ring.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/console/xencons_ring.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/netback/netback.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/netfront/mbufq.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/netfront/netfront.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xen/pcifront/pcifront.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xl/if_xl.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/dev/xl/if_xlreg.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_disk.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_kern.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_slice.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/geom_subr.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/conf/NOTES#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/conf/XEN#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/cpufreq/smist.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/bpf_jit_machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/trap.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/pmap.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/profile.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/segments.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/trap.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/evtchn.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/features.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/hypercall.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/hypervisor.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/synch_bitops.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xen-os.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xen_intr.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xenbus.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xenfunc.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xenpmap.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xenstored.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/include/xen/xenvar.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/isa/npx.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/i386/xen/clock.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/xen/exception.s#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/xen/locore.s#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/xen/pmap.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/i386/xen/xen_machdep.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_exec.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_fork.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_intr.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_sig.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_synch.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/link_elf.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/sched_ule.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_clist.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_lock.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/subr_witness.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/tty.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/tty_info.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/tty_pty.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/libkern/arc4random.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/libkern/memset.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/libkern/strcspn.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/mips/mips/tick.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/Makefile#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/accf_dns/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/sys/modules/cpuctl/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/em/Makefile#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/et/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/glxsb/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/sys/modules/igb/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/mem/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/pcn/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/sis/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/snc/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/ste/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/tl/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/upgt/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/sys/modules/wb/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/modules/xl/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/bpf.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/bpf_buffer.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/bpfdesc.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if_enc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if_enc.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/net/if_gre.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if_loop.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if_media.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/if_vlan.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net/route.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/common/ng_bluetooth.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/accf_dns.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/sctputil.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_offload.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_offload.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/toedev.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipsec/key.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/nlm/nlm_prot_impl.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/pci/if_pcn.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_pcnreg.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/pci/if_sis.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_sisreg.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_ste.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_stereg.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_tl.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_tlreg.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_wb.c#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_wbreg.h#2 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_xl.c#3 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/if_xlreg.h#3 delete .. //depot/projects/soc2008/snagg-audit/sys/pci/viapm.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/rpc/auth_unix.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#28 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/clock.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/db_disasm.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sun4v/conf/GENERIC#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/sun4v/include/tte.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/_task.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/callout.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/cpuctl.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/sys/elf_common.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/imgact.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/interrupt.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/kernel.h#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/libkern.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/lock.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/param.h#6 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/priv.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/proc.h#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/procfs.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/refcount.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sbuf.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sockbuf.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/sys/socket.h#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/socketvar.h#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sockio.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sockopt.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/sys/sockstate.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/sys/sx.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/taskqueue.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/termios.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/ttycom.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/redzone.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/swap_pager.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_kern.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_object.c#3 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2008/snagg-audit/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/soc2008/snagg-audit/sys/xen/evtchn/evtchn.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/evtchn/evtchn_dev.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/features.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/gnttab.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/gnttab.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/COPYING#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/acm.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/acm_ops.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-ia64.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-powerpc.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-x86/xen.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-x86_32.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/arch-x86_64.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/callback.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/dom0_ops.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/domctl.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/elfnote.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/elfstructs.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/event_channel.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/features.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/foreign/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/foreign/mkchecker.py#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/foreign/mkheader.py#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/foreign/reference.size#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/foreign/structs.py#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/grant_table.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/e820.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/hvm_info_table.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/hvm_op.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/ioreq.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/params.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/save.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/hvm/vmx_assist.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/blkif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/console.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/fbif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/kbdif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/netif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/pciif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/protocols.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/ring.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/tpmif.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/xenbus.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/io/xs_wire.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/kexec.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/libelf.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/memory.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/nmi.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/physdev.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/platform.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/sched.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/sysctl.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/trace.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/vcpu.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/version.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/xen-compat.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/xen.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/xencomm.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/interface/xenoprof.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/init.txt#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_client.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_comms.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_comms.h#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_dev.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_probe.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_probe_backend.c#1 branch .. //depot/projects/soc2008/snagg-audit/sys/xen/xenbus/xenbus_xs.c#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgroups.c#1 add .. //depot/projects/soc2008/snagg-audit/tools/regression/bin/sh/errors/redirection-error2.2#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/environ/envtest.t#2 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/geom/ConfCmp/ConfCmp.c#2 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/geom/MdLoad/MdLoad.c#2 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/lib/libc/gen/Makefile#2 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/lib/libc/gen/test-fmtcheck.c#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/lib/msun/Makefile#3 integrate .. //depot/projects/soc2008/snagg-audit/tools/regression/lib/msun/test-invtrig.c#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/lib/msun/test-invtrig.t#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/netinet6/icmp6_filter/Makefile#1 branch .. //depot/projects/soc2008/snagg-audit/tools/regression/netinet6/icmp6_filter/icmp6_filter.c#1 branch Differences ... ==== //depot/projects/soc2008/snagg-audit/sys/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.50 2008/07/10 16:03:24 obrien Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -8,13 +8,13 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu isa kern libkern modules net net80211 netatalk \ +CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ + geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ - pci rpc security sys ufs vm ${CSCOPE_ARCHDIR} + netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) -CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips powerpc sparc64 +CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else CSCOPE_ARCHDIR ?= ${MACHINE} .endif @@ -44,4 +44,15 @@ rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files +# You need the textproc/glimpse ports for this. +glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif + cd ${.CURDIR}; glimpseindex -H . -B -f -o . + +glimpse-clean: + cd ${.CURDIR}; rm -f .glimpse_* + .include ==== //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bpf_jit_machdep.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 Jung-uk Kim + * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy) + * Copyright (C) 2005-2008 Jung-uk Kim * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.6 2008/06/24 20:12:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $"); #include "opt_bpf.h" @@ -105,13 +105,13 @@ /* Do not compile an empty filter. */ if (nins == 0) - return NULL; + return (NULL); /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); if (stream.refs == NULL) - return NULL; + return (NULL); /* Reset the reference table */ for (i = 0; i < nins + 1; i++) @@ -131,40 +131,38 @@ ins = prog; /* create the procedure header */ - PUSH(RBP); - MOVrq(RSP, RBP); - MOVdoq(ESI, -8, RBP); - MOVdoq(EDX, -12, RBP); - PUSH(RBX); + MOVrq2(RBX, R8); MOVrq(RDI, RBX); + MOVrd2(ESI, R9D); + MOVrd(EDX, EDI); for (i = 0; i < nins; i++) { stream.bpf_pc++; switch (ins->code) { default: - return NULL; + return (NULL); case BPF_RET|BPF_K: MOVid(ins->k, EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_RET|BPF_A: - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); break; case BPF_LD|BPF_W|BPF_ABS: MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -173,11 +171,11 @@ ZEROrd(EAX); MOVid(ins->k, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -185,31 +183,31 @@ case BPF_LD|BPF_B|BPF_ABS: ZEROrd(EAX); MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LD|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EAX); + MOVrd3(R9D, EAX); break; case BPF_LDX|BPF_W|BPF_LEN: - MOVoqd(-8, RBP, EDX); + MOVrd3(R9D, EDX); break; case BPF_LD|BPF_W|BPF_IND: MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(int), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + ADDib(sizeof(int32_t), ECX); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); MOVobd(RBX, RSI, EAX); BSWAP(EAX); break; @@ -219,11 +217,11 @@ MOVid(ins->k, ECX); ADDrd(EDX, ECX); MOVrd(ECX, ESI); - ADDib(sizeof(short), ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + ADDib(sizeof(int16_t), ECX); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobw(RBX, RSI, AX); SWAP_AX(); break; @@ -232,23 +230,23 @@ ZEROrd(EAX); MOVid(ins->k, ECX); ADDrd(EDX, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(3); - POP(RBX); - LEAVE_RET(); + CMPrd(EDI, ECX); + JBEb(4); + MOVrq3(R8, RBX); + RET(); MOVobb(RBX, RCX, AL); break; case BPF_LDX|BPF_MSH|BPF_B: MOVid(ins->k, ECX); - CMPoqd(-12, RBP, ECX); - JLEb(5); + CMPrd(EDI, ECX); + JBEb(6); ZEROrd(EAX); - POP(RBX); - LEAVE_RET(); + MOVrq3(R8, RBX); + RET(); ZEROrd(EDX); MOVobb(RBX, RCX, DL); - ANDib(0xf, DL); + ANDib(0x0f, DL); SHLib(2, EDX); break; @@ -295,70 +293,59 @@ break; case BPF_JMP|BPF_JGT|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - /* 5 is the size of the following JMP */ - JG(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5 ); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JA, JBE); break; case BPF_JMP|BPF_JGE|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JGE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JAE, JB); break; case BPF_JMP|BPF_JEQ|BPF_K: + if (ins->jt == 0 && ins->jf == 0) + break; CMPid(ins->k, EAX); - JE(stream.refs[stream.bpf_pc + ins->jt] - - stream.refs[stream.bpf_pc] + 5); - JMP(stream.refs[stream.bpf_pc + ins->jf] - - stream.refs[stream.bpf_pc]); + JCC(JE, JNE); break; case BPF_JMP|BPF_JSET|BPF_K: - MOVrd(EAX, ECX); - ANDid(ins->k, ECX); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:31:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 974831065674; Sat, 16 Aug 2008 17:31:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B54E1065672 for ; Sat, 16 Aug 2008 17:31:33 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40BF18FC16 for ; Sat, 16 Aug 2008 17:31:33 +0000 (UTC) (envelope-from konrad@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHVXaS050302 for ; Sat, 16 Aug 2008 17:31:33 GMT (envelope-from konrad@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHVX2a050300 for perforce@freebsd.org; Sat, 16 Aug 2008 17:31:33 GMT (envelope-from konrad@FreeBSD.org) Date: Sat, 16 Aug 2008 17:31:33 GMT Message-Id: <200808161731.m7GHVX2a050300@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to konrad@FreeBSD.org using -f From: Konrad Jankowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 147569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147569 Change 147569 by konrad@vspredator on 2008/08/16 17:31:03 Make sed command less confusing. Affected files ... .. //depot/projects/soc2008/konrad_collation/scripts/localedef.sh#4 edit Differences ... ==== //depot/projects/soc2008/konrad_collation/scripts/localedef.sh#4 (text+ko) ==== @@ -19,7 +19,7 @@ # Cut out the collation data. Erase carriage return. # Comment out lines starting with "*"; -sed -n -e "$LINE1,${LINE2}p" $SRC | tr -d '\r$' | sed -e 's/^*/#/g' > $OUTFILE +sed -n -e "$LINE1,${LINE2}p" $SRC | tr -d '\r$' | sed -e 's/^\*/#/g' > $OUTFILE #printf "1a\ncharmap /usr/home/versus/colldef.apple/data2/UTF-8.cm.new\n.\nwq\n" | ed -s $OUTFILE # insert second line with charmap specification From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:33:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5D871065688; Sat, 16 Aug 2008 17:33:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88D26106567F for ; Sat, 16 Aug 2008 17:33:35 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E5918FC1A for ; Sat, 16 Aug 2008 17:33:35 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHXZCn050477 for ; Sat, 16 Aug 2008 17:33:35 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHXZs0050475 for perforce@freebsd.org; Sat, 16 Aug 2008 17:33:35 GMT (envelope-from snagg@FreeBSD.org) Date: Sat, 16 Aug 2008 17:33:35 GMT Message-Id: <200808161733.m7GHXZs0050475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=147570 Change 147570 by snagg@snagg_macosx on 2008/08/16 17:32:42 Added pid in audit_proc_coredump() needed by audit_pipe_preselect() Affected files ... .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.c#6 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.c#6 (text) ==== @@ -611,7 +611,8 @@ sorf = AU_PRS_SUCCESS; class = au_event_class(AUE_CORE); if (au_preselect(AUE_CORE, class, aumask, sorf) == 0 && - audit_pipe_preselect(auid, AUE_CORE, class, sorf, 0) == 0) + audit_pipe_preselect(auid, AUE_CORE, class, sorf, 0, + td->td_proc->p_pid) == 0) return; /* * If we are interested in seeing this audit record, allocate it. From owner-p4-projects@FreeBSD.ORG Sat Aug 16 17:55:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7E161065678; Sat, 16 Aug 2008 17:55:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC2EF106564A for ; Sat, 16 Aug 2008 17:55:58 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7731B8FC08 for ; Sat, 16 Aug 2008 17:55:58 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GHtwQB052255 for ; Sat, 16 Aug 2008 17:55:58 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GHtwKn052253 for perforce@freebsd.org; Sat, 16 Aug 2008 17:55:58 GMT (envelope-from snagg@FreeBSD.org) Date: Sat, 16 Aug 2008 17:55:58 GMT Message-Id: <200808161755.m7GHtwKn052253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 147573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 17:55:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147573 Change 147573 by snagg@snagg_macosx on 2008/08/16 17:55:52 Modified the patch in order to fit my last commit Affected files ... .. //depot/projects/soc2008/snagg-audit/sys/security/audit/patch#2 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/sys/security/audit/patch#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Aug 16 18:17:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 150A51065671; Sat, 16 Aug 2008 18:17:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C97E0106566C for ; Sat, 16 Aug 2008 18:17:21 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC3098FC21 for ; Sat, 16 Aug 2008 18:17:21 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GIHLeM055194 for ; Sat, 16 Aug 2008 18:17:21 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GIHKEV055192 for perforce@freebsd.org; Sat, 16 Aug 2008 18:17:20 GMT (envelope-from thioretic@FreeBSD.org) Date: Sat, 16 Aug 2008 18:17:20 GMT Message-Id: <200808161817.m7GIHKEV055192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 147578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 18:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=147578 Change 147578 by thioretic@thioretic on 2008/08/16 18:16:53 Integrate from parent. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/machdep.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/clock.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/isa/clock.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/conf/AVILA#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/conf/HL200#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2007/thioretic_gidl/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/i386/loader/main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/soc2007/thioretic_gidl/boot/pc98/loader/main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/cam_periph.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/linux/linux_file.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files#5 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.amd64#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.i386#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/newvers.sh#4 integrate .. //depot/projects/soc2007/thioretic_gidl/conf/options#4 integrate .. //depot/projects/soc2007/thioretic_gidl/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ddb/db_command.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ddb/db_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_debug.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_disk.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aac_pci.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hme.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/jme/if_jme.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/jme/if_jmereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/jme/if_jmevar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/icsphy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mii/icsphyreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/jmphy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mii/jmphyreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/mii/miidevs#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mpt/mpt_user.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/nvram/nvram.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/dev/pci/pci.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/re/if_re.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/sym/sym_defs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/sym/sym_fw.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/umass.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/ums.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/dev/vx/if_vx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/gdb/gdb_main.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/conf/XBOX#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/cpufreq/est.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/i686_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/k6_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/locore.s#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/clock.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/pmap.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/isa/clock.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/init_sysent.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_conf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_resource.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_switch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/link_elf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/sys_process.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/syscalls.master#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/sysv_sem.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/tty.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/kern/vnode_if.src#3 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/Makefile#5 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/bge/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/jme/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/krpc/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/mii/Makefile#3 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/mpt/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl/modules/nfslockd/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/modules/nvram/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl/net/bpf.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bridge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bridgestp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/bridgestp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/ethernet.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_bridge.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_lagg.c#7 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_media.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/net/if_tap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/netgraph.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_base.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_nat.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netgraph/ng_socket.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/in.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_dummynet.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/key.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/netkey/key.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot_server.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/sm_inter.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/agp_nvidia.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_dc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_dcreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_de.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_rl.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_rlreg.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_sis.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_xl.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/pci/if_xlreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/posix4/semaphore.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl/rpc/auth.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/auth_none.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/auth_unix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/authunix_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/clnt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/clnt_dg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/clnt_rc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/clnt_vc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/getnetconfig.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/inet_ntop.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/inet_pton.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/netconfig.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/nettype.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc_callmsg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc_com.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc_generic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpc_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpcb_clnt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpcb_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/rpcb_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_auth.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_auth.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_auth_unix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_dg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_generic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/svc_vc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/types.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/rpc/xdr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/sysarch.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/include/tlb.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/counter.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/aac_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/extattr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/fcntl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/hash.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/lockf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/malloc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/mbuf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/mpt_ioctl.h#1 branch .. //depot/projects/soc2007/thioretic_gidl/sys/param.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/pcpu.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/resource.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/sockio.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/syscall.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/syscall.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/sys/sysproto.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/extattr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/quota.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/memguard.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/memguard.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_kern.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_object.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/vm/vnode_pager.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr_array.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr_mbuf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr_mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr_reference.c#1 branch .. //depot/projects/soc2007/thioretic_gidl/xdr/xdr_sizeof.c#1 branch Differences ... ==== //depot/projects/soc2007/thioretic_gidl/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25.8.3 2008/03/19 16:37:23 jhb Exp $"); #include #include @@ -47,31 +47,31 @@ static char *mem_owner_bios = "BIOS"; -#define MR686_FIXMTRR (1<<0) +#define MR686_FIXMTRR (1<<0) -#define mrwithin(mr, a) \ - (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) -#define mroverlap(mra, mrb) \ - (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) +#define mrwithin(mr, a) \ + (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) +#define mroverlap(mra, mrb) \ + (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) -#define mrvalid(base, len) \ - ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ - ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ - !((base) & ((len) - 1))) /* range is not discontiuous */ +#define mrvalid(base, len) \ + ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ + ((len) >= (1 << 12)) && /* length is >= 4k */ \ + powerof2((len)) && /* ... and power of two */ \ + !((base) & ((len) - 1))) /* range is not discontiuous */ -#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) +#define mrcopyflags(curr, new) \ + (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -static int mtrrs_disabled; +static int mtrrs_disabled; TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled); SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN, - &mtrrs_disabled, 0, "Disable amd64 MTRRs."); + &mtrrs_disabled, 0, "Disable amd64 MTRRs."); -static void amd64_mrinit(struct mem_range_softc *sc); -static int amd64_mrset(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrinit(struct mem_range_softc *sc); +static int amd64_mrset(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static void amd64_mrAPinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, @@ -80,157 +80,159 @@ }; /* XXX for AP startup hook */ -static u_int64_t mtrrcap, mtrrdef; +static u_int64_t mtrrcap, mtrrdef; + +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; -static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, - struct mem_range_desc *mrd); -static void amd64_mrfetch(struct mem_range_softc *sc); -static int amd64_mtrrtype(int flags); -static int amd64_mrt2mtrr(int flags, int oldval); -static int amd64_mtrrconflict(int flag1, int flag2); -static void amd64_mrstore(struct mem_range_softc *sc); -static void amd64_mrstoreone(void *arg); -static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, - u_int64_t addr); -static int amd64_mrsetlow(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static int amd64_mrsetvariable(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); +static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +static void amd64_mrfetch(struct mem_range_softc *sc); +static int amd64_mtrrtype(int flags); +static int amd64_mrt2mtrr(int flags, int oldval); +static int amd64_mtrrconflict(int flag1, int flag2); +static void amd64_mrstore(struct mem_range_softc *sc); +static void amd64_mrstoreone(void *arg); +static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +static int amd64_mrsetlow(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static int amd64_mrsetvariable(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); /* amd64 MTRR type to memory range type conversion */ static int amd64_mtrrtomrt[] = { - MDF_UNCACHEABLE, - MDF_WRITECOMBINE, - MDF_UNKNOWN, - MDF_UNKNOWN, - MDF_WRITETHROUGH, - MDF_WRITEPROTECT, - MDF_WRITEBACK + MDF_UNCACHEABLE, + MDF_WRITECOMBINE, + MDF_UNKNOWN, + MDF_UNKNOWN, + MDF_WRITETHROUGH, + MDF_WRITEPROTECT, + MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) - -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) static int amd64_mtrr2mrt(int val) { + if (val < 0 || val >= MTRRTOMRTLEN) - return MDF_UNKNOWN; - return amd64_mtrrtomrt[val]; + return (MDF_UNKNOWN); + return (amd64_mtrrtomrt[val]); } -/* +/* * amd64 MTRR conflicts. Writeback and uncachable may overlap. */ static int amd64_mtrrconflict(int flag1, int flag2) { + flag1 &= MDF_ATTRMASK; flag2 &= MDF_ATTRMASK; if ((flag1 & MDF_UNKNOWN) || (flag2 & MDF_UNKNOWN)) - return 1; + return (1); if (flag1 == flag2 || (flag1 == MDF_WRITEBACK && flag2 == MDF_UNCACHEABLE) || (flag2 == MDF_WRITEBACK && flag1 == MDF_UNCACHEABLE)) - return 0; - return 1; + return (0); + return (1); } /* * Look for an exactly-matching range. */ static struct mem_range_desc * -mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) +mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) { - struct mem_range_desc *cand; - int i; - - for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) - if ((cand->mr_base == mrd->mr_base) && - (cand->mr_len == mrd->mr_len)) - return(cand); - return(NULL); + struct mem_range_desc *cand; + int i; + + for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) + if ((cand->mr_base == mrd->mr_base) && + (cand->mr_len == mrd->mr_len)) + return (cand); + return (NULL); } /* - * Fetch the current mtrr settings from the current CPU (assumed to all - * be in sync in the SMP case). Note that if we are here, we assume - * that MTRRs are enabled, and we may or may not have fixed MTRRs. + * Fetch the current mtrr settings from the current CPU (assumed to + * all be in sync in the SMP case). Note that if we are here, we + * assume that MTRRs are enabled, and we may or may not have fixed + * MTRRs. */ static void amd64_mrfetch(struct mem_range_softc *sc) { - struct mem_range_desc *mrd; - u_int64_t msrv; - int i, j, msr; + struct mem_range_desc *mrd; + u_int64_t msrv; + int i, j, msr; - mrd = sc->mr_desc; + mrd = sc->mr_desc; - /* Get fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + /* Get fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { + + /* Get remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + amd64_mtrr2mrt(msrv & MTRR_PHYSBASE_TYPE); + mrd->mr_base = msrv & mtrr_physmask; + msrv = rdmsr(msr + 1); + mrd->mr_flags = (msrv & MTRR_PHYSMASK_VALID) ? + (mrd->mr_flags | MDF_ACTIVE) : + (mrd->mr_flags & ~MDF_ACTIVE); + + /* Compute the range from the mask. Ick. */ + mrd->mr_len = (~(msrv & mtrr_physmask) & + (mtrr_physmask | 0xfffL)) + 1; + if (!mrvalid(mrd->mr_base, mrd->mr_len)) + mrd->mr_flags |= MDF_BOGUS; + + /* If unclaimed and active, must be the BIOS. */ + if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) + strcpy(mrd->mr_owner, mem_owner_bios); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } - } - } - - /* Get remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - msrv = rdmsr(msr); - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000000fffffff000L; - msrv = rdmsr(msr + 1); - mrd->mr_flags = (msrv & 0x800) ? - (mrd->mr_flags | MDF_ACTIVE) : - (mrd->mr_flags & ~MDF_ACTIVE); - /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; - if (!mrvalid(mrd->mr_base, mrd->mr_len)) - mrd->mr_flags |= MDF_BOGUS; - /* If unclaimed and active, must be the BIOS */ - if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) - strcpy(mrd->mr_owner, mem_owner_bios); - } } /* @@ -239,17 +241,17 @@ static int amd64_mtrrtype(int flags) { - int i; + int i; - flags &= MDF_ATTRMASK; + flags &= MDF_ATTRMASK; - for (i = 0; i < MTRRTOMRTLEN; i++) { - if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) - continue; - if (flags == amd64_mtrrtomrt[i]) - return(i); - } - return(-1); + for (i = 0; i < MTRRTOMRTLEN; i++) { + if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) + continue; + if (flags == amd64_mtrrtomrt[i]) + return (i); + } + return (-1); } static int @@ -258,8 +260,8 @@ int val; if ((val = amd64_mtrrtype(flags)) == -1) - return oldval & 0xff; - return val & 0xff; + return (oldval & 0xff); + return (val & 0xff); } /* @@ -272,105 +274,124 @@ amd64_mrstore(struct mem_range_softc *sc) { #ifdef SMP - /* - * We should use ipi_all_but_self() to call other CPUs into a - * locking gate, then call a target function to do this work. - * The "proper" solution involves a generalised locking gate - * implementation, not ready yet. - */ - smp_rendezvous(NULL, amd64_mrstoreone, NULL, (void *)sc); + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, amd64_mrstoreone, NULL, sc); #else - disable_intr(); /* disable interrupts */ - amd64_mrstoreone((void *)sc); - enable_intr(); + disable_intr(); /* disable interrupts */ + amd64_mrstoreone(sc); + enable_intr(); #endif } /* * Update the current CPU's MTRRs with those represented in the - * descriptor list. Note that we do this wholesale rather than - * just stuffing one entry; this is simpler (but slower, of course). + * descriptor list. Note that we do this wholesale rather than just + * stuffing one entry; this is simpler (but slower, of course). */ static void amd64_mrstoreone(void *arg) { - struct mem_range_softc *sc = (struct mem_range_softc *)arg; - struct mem_range_desc *mrd; - u_int64_t omsrv, msrv; - int i, j, msr; - u_int cr4save; + struct mem_range_softc *sc = arg; + struct mem_range_desc *mrd; + u_int64_t omsrv, msrv; + int i, j, msr; + u_int cr4save; + + mrd = sc->mr_desc; + + /* Disable PGE. */ + cr4save = rcr4(); + if (cr4save & CR4_PGE) + load_cr4(cr4save & ~CR4_PGE); + + /* Disable caches (CD = 1, NW = 0). */ + load_cr0((rcr0() & ~CR0_NW) | CR0_CD); - mrd = sc->mr_desc; + /* Flushes caches and TLBs. */ + wbinvd(); - cr4save = rcr4(); /* save cr4 */ - if (cr4save & CR4_PGE) - load_cr4(cr4save & ~CR4_PGE); - load_cr0((rcr0() & ~CR0_NW) | CR0_CD); /* disable caches (CD = 1, NW = 0) */ - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~0x800); /* disable MTRRs (E = 0) */ + /* Disable MTRRs (E = 0). */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~MTRR_DEF_ENABLE); - /* Set fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + /* Set fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + + /* Set remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + /* base/type register */ + omsrv = rdmsr(msr); + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = mrd->mr_base & mtrr_physmask; + msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); + } else { + msrv = 0; + } + wrmsr(msr, msrv); + + /* mask/active register */ + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = MTRR_PHYSMASK_VALID | + (~(mrd->mr_len - 1) & mtrr_physmask); + } else { + msrv = 0; + } + wrmsr(msr + 1, msrv); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; - } - } + + /* Flush caches, TLBs. */ + wbinvd(); + + /* Enable MTRRs. */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | MTRR_DEF_ENABLE); + + /* Enable caches (CD = 0, NW = 0). */ + load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); - /* Set remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - /* base/type register */ - omsrv = rdmsr(msr); - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000000fffffff000L; - msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); - } else { - msrv = 0; - } - wrmsr(msr, msrv); - - /* mask/active register */ - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); - } else { - msrv = 0; - } - wrmsr(msr + 1, msrv); - } - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | 0x800); /* restore MTRR state */ - load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); /* enable caches CD = 0 and NW = 0 */ - load_cr4(cr4save); /* restore cr4 */ + /* Restore PGE. */ + load_cr4(cr4save); } /* @@ -379,227 +400,260 @@ static struct mem_range_desc * amd64_mtrrfixsearch(struct mem_range_softc *sc, u_int64_t addr) { - struct mem_range_desc *mrd; - int i; - - for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); i++, mrd++) - if ((addr >= mrd->mr_base) && (addr < (mrd->mr_base + mrd->mr_len))) - return(mrd); - return(NULL); + struct mem_range_desc *mrd; + int i; + + for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); + i++, mrd++) + if ((addr >= mrd->mr_base) && + (addr < (mrd->mr_base + mrd->mr_len))) + return (mrd); + return (NULL); } /* - * Try to satisfy the given range request by manipulating the fixed MTRRs that - * cover low memory. + * Try to satisfy the given range request by manipulating the fixed + * MTRRs that cover low memory. * - * Note that we try to be generous here; we'll bloat the range out to the - * next higher/lower boundary to avoid the consumer having to know too much - * about the mechanisms here. + * Note that we try to be generous here; we'll bloat the range out to + * the next higher/lower boundary to avoid the consumer having to know + * too much about the mechanisms here. * - * XXX note that this will have to be updated when we start supporting "busy" ranges. + * XXX note that this will have to be updated when we start supporting + * "busy" ranges. */ static int amd64_mrsetlow(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { - struct mem_range_desc *first_md, *last_md, *curr_md; + struct mem_range_desc *first_md, *last_md, *curr_md; + + /* Range check. */ + if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || + ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) + return (EINVAL); - /* range check */ - if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || - ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) - return(EINVAL); + /* Check that we aren't doing something risky. */ + if (!(mrd->mr_flags & MDF_FORCE)) + for (curr_md = first_md; curr_md <= last_md; curr_md++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 18:27:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D7C9106567D; Sat, 16 Aug 2008 18:27:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 390481065674 for ; Sat, 16 Aug 2008 18:27:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CC4A8FC2B for ; Sat, 16 Aug 2008 18:27:32 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GIRWhY055975 for ; Sat, 16 Aug 2008 18:27:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GIRWrH055973 for perforce@freebsd.org; Sat, 16 Aug 2008 18:27:32 GMT (envelope-from sam@freebsd.org) Date: Sat, 16 Aug 2008 18:27:32 GMT Message-Id: <200808161827.m7GIRWrH055973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 147579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 18:27:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147579 Change 147579 by sam@sam_ebb on 2008/08/16 18:27:16 IFC @ 147578 Affected files ... .. //depot/projects/vap/etc/defaults/rc.conf#18 integrate .. //depot/projects/vap/etc/rc.firewall#8 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/vap/lib/libc/uuid/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/vap/lib/libc/uuid/uuid_stream.c#1 branch .. //depot/projects/vap/lib/librt/sigev_thread.c#3 integrate .. //depot/projects/vap/share/man/man4/snp.4#3 integrate .. //depot/projects/vap/sys/Makefile#11 integrate .. //depot/projects/vap/sys/conf/files#48 integrate .. //depot/projects/vap/sys/conf/files.i386#16 integrate .. //depot/projects/vap/sys/conf/options.i386#9 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/vap/sys/dev/pcn/if_pcn.c#1 branch .. //depot/projects/vap/sys/dev/pcn/if_pcnreg.h#1 branch .. //depot/projects/vap/sys/dev/snp/snp.c#8 integrate .. //depot/projects/vap/sys/dev/ste/if_ste.c#1 branch .. //depot/projects/vap/sys/dev/ste/if_stereg.h#1 branch .. //depot/projects/vap/sys/dev/tl/if_tl.c#1 branch .. //depot/projects/vap/sys/dev/tl/if_tlreg.h#1 branch .. //depot/projects/vap/sys/dev/wb/if_wb.c#1 branch .. //depot/projects/vap/sys/dev/wb/if_wbreg.h#1 branch .. //depot/projects/vap/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/vap/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/vap/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/vap/sys/i386/conf/XEN#1 branch .. //depot/projects/vap/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/vap/sys/i386/i386/genassym.c#7 integrate .. //depot/projects/vap/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/vap/sys/i386/i386/support.s#7 integrate .. //depot/projects/vap/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#11 integrate .. //depot/projects/vap/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/vap/sys/i386/include/asmacros.h#5 integrate .. //depot/projects/vap/sys/i386/include/cpufunc.h#8 integrate .. //depot/projects/vap/sys/i386/include/pcpu.h#7 integrate .. //depot/projects/vap/sys/i386/include/pmap.h#8 integrate .. //depot/projects/vap/sys/i386/include/segments.h#4 integrate .. //depot/projects/vap/sys/i386/include/trap.h#5 integrate .. //depot/projects/vap/sys/i386/include/vmparam.h#7 integrate .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/vap/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/vap/sys/i386/isa/npx.c#6 integrate .. //depot/projects/vap/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/vap/sys/i386/pci/pci_pir.c#7 integrate .. //depot/projects/vap/sys/i386/xen/clock.c#2 integrate .. //depot/projects/vap/sys/i386/xen/locore.s#2 integrate .. //depot/projects/vap/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/vap/sys/kern/init_main.c#9 integrate .. //depot/projects/vap/sys/libkern/strcspn.c#1 branch .. //depot/projects/vap/sys/modules/pcn/Makefile#5 integrate .. //depot/projects/vap/sys/modules/ste/Makefile#5 integrate .. //depot/projects/vap/sys/modules/tl/Makefile#5 integrate .. //depot/projects/vap/sys/modules/wb/Makefile#5 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/vap/sys/netinet6/ip6_var.h#9 integrate .. //depot/projects/vap/sys/pci/if_pcn.c#6 delete .. //depot/projects/vap/sys/pci/if_pcnreg.h#5 delete .. //depot/projects/vap/sys/pci/if_ste.c#6 delete .. //depot/projects/vap/sys/pci/if_stereg.h#5 delete .. //depot/projects/vap/sys/pci/if_tl.c#6 delete .. //depot/projects/vap/sys/pci/if_tlreg.h#5 delete .. //depot/projects/vap/sys/pci/if_wb.c#7 delete .. //depot/projects/vap/sys/pci/if_wbreg.h#5 delete .. //depot/projects/vap/sys/sys/libkern.h#7 integrate .. //depot/projects/vap/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/vap/sys/xen/features.c#1 branch .. //depot/projects/vap/sys/xen/xenbus/xenbus_client.c#2 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_comms.c#2 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_dev.c#2 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe.c#2 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_probe_backend.c#2 integrate .. //depot/projects/vap/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/vap/usr.bin/tar/test/test_copy.c#3 integrate .. //depot/projects/vap/usr.bin/tar/test/test_option_T.c#3 integrate .. //depot/projects/vap/usr.bin/tar/test/test_patterns.c#2 integrate .. //depot/projects/vap/usr.bin/tar/test/test_patterns.tgz.err.uu#1 branch .. //depot/projects/vap/usr.bin/tar/test/test_patterns.tgz.out.uu#1 branch .. //depot/projects/vap/usr.bin/tar/test/test_patterns.tgz.uu#1 branch .. //depot/projects/vap/usr.bin/units/units.c#3 integrate .. //depot/projects/vap/usr.bin/units/units.lib#4 integrate .. //depot/projects/vap/usr.sbin/pw/pw_user.c#4 integrate .. //depot/projects/vap/usr.sbin/watch/watch.c#4 integrate Differences ... ==== //depot/projects/vap/etc/defaults/rc.conf#18 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.339 2008/08/09 01:19:00 obrien Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.341 2008/08/15 19:20:59 jhb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -115,16 +115,27 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file +firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_simple_iif="ed1" # Inside network interface for "simple" + # firewall. +firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" + # firewall. +firewall_simple_oif="ed0" # Outside network interface for "simple" + # firewall. +firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" + # firewall. firewall_myservices="" # List of TCP ports on which this host - # offers services -firewall_allowservices="" # List of IPs which has access to - # $firewall_myservices -firewall_trusted="" # List of IPs which has full access to this host + # offers services for "workstation" firewall. +firewall_allowservices="" # List of IPs which have access to + # $firewall_myservices for "workstation" + # firewall. +firewall_trusted="" # List of IPs which have full access to this + # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming - # packets. + # packets for "workstation" firewall. firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports - # for which denied incoming packets are not - # logged. + # for which denied incoming packets are not + # logged for "workstation" firewall. firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) firewall_nat_interface="" # Public interface or IPaddress to use firewall_nat_flags="" # Additional configuration parameters ==== //depot/projects/vap/etc/rc.firewall#8 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.57 2008/08/03 19:01:07 danger Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.60 2008/08/15 19:20:59 jhb Exp $ # # @@ -164,19 +164,20 @@ ############ # This is a prototype setup that will protect your system somewhat # against people from outside your own network. + # + # Configuration: + # firewall_client_net: Network address of local network. ############ - # set these to your network and netmask and ip - net="192.0.2.0" - mask="255.255.255.0" - ip="192.0.2.1" + # set this to your local network + net="$firewall_client_net" # Allow limited broadcast traffic from my own net. - ${fwcmd} add pass all from ${net}:${mask} to 255.255.255.255 + ${fwcmd} add pass all from ${net} to 255.255.255.255 # Allow any traffic to or from my own net. - ${fwcmd} add pass all from ${ip} to ${net}:${mask} - ${fwcmd} add pass all from ${net}:${mask} to ${ip} + ${fwcmd} add pass all from me to ${net} + ${fwcmd} add pass all from ${net} to me # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -209,23 +210,25 @@ # This is a prototype setup for a simple firewall. Configure this # machine as a DNS and NTP server, and point all the machines # on the inside at this machine for those services. + # + # Configuration: + # firewall_simple_iif: Inside network interface. + # firewall_simple_inet: Inside network address. + # firewall_simple_oif: Outside network interface. + # firewall_simple_onet: Outside network address. ############ - # set these to your outside interface network and netmask and ip - oif="ed0" - onet="192.0.2.0" - omask="255.255.255.240" - oip="192.0.2.1" + # set these to your outside interface network + oif="$firewall_simple_oif" + onet="$firewall_simple_onet" - # set these to your inside interface network and netmask and ip - iif="ed1" - inet="192.0.2.16" - imask="255.255.255.240" - iip="192.0.2.17" + # set these to your inside interface network + iif="$firewall_simple_iif" + inet="$firewall_simple_inet" # Stop spoofing - ${fwcmd} add deny all from ${inet}:${imask} to any in via ${oif} - ${fwcmd} add deny all from ${onet}:${omask} to any in via ${iif} + ${fwcmd} add deny all from ${inet} to any in via ${oif} + ${fwcmd} add deny all from ${onet} to any in via ${iif} # Stop RFC1918 nets on the outside interface ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} @@ -277,15 +280,15 @@ ${fwcmd} add pass all from any to any frag # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${oip} 25 setup + ${fwcmd} add pass tcp from any to me 25 setup # Allow access to our DNS - ${fwcmd} add pass tcp from any to ${oip} 53 setup - ${fwcmd} add pass udp from any to ${oip} 53 - ${fwcmd} add pass udp from ${oip} 53 to any + ${fwcmd} add pass tcp from any to me 53 setup + ${fwcmd} add pass udp from any to me 53 + ${fwcmd} add pass udp from me 53 to any # Allow access to our WWW - ${fwcmd} add pass tcp from any to ${oip} 80 setup + ${fwcmd} add pass tcp from any to me 80 setup # Reject&Log all setup of incoming connections from the outside ${fwcmd} add deny log tcp from any to any in via ${oif} setup @@ -294,10 +297,10 @@ ${fwcmd} add pass tcp from any to any setup # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${oip} to any 53 keep-state + ${fwcmd} add pass udp from me to any 53 keep-state # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${oip} to any 123 keep-state + ${fwcmd} add pass udp from me to any 123 keep-state # Everything else is denied by default, unless the # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel ==== //depot/projects/vap/lib/libc/stdlib/malloc.c#13 (text+ko) ==== @@ -128,7 +128,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.174 2008/08/08 20:42:42 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.176 2008/08/14 17:31:42 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1012,10 +1012,11 @@ /* Exponentially back off. */ for (i = 1; i <= SPIN_LIMIT_2POW; i++) { - for (j = 0; j < (1U << i); j++) + for (j = 0; j < (1U << i); j++) { ret++; + CPU_SPINWAIT; + } - CPU_SPINWAIT; if (_pthread_mutex_trylock(lock) == 0) return (ret); } @@ -2209,8 +2210,8 @@ */ regind = diff / size; } - } else if (size <= ((sizeof(size_invs) / sizeof(unsigned)) - << QUANTUM_2POW_MIN) + 2) { + } else if (size <= (((sizeof(size_invs) / sizeof(unsigned)) + 2) + << QUANTUM_2POW_MIN)) { regind = size_invs[(size >> QUANTUM_2POW_MIN) - 3] * diff; regind >>= SIZE_INV_SHIFT; } else { ==== //depot/projects/vap/lib/libc/uuid/Makefile.inc#3 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.4 2006/03/13 01:15:01 deischen Exp $ +# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.5 2008/08/14 22:23:16 emax Exp $ # DCE 1.1 UUID implementation sources .PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ - uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c + uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \ + uuid_to_string.c SYM_MAPS+= ${.CURDIR}/uuid/Symbol.map MAN+= uuid.3 @@ -16,4 +17,8 @@ MLINKS+=uuid.3 uuid_from_string.3 MLINKS+=uuid.3 uuid_hash.3 MLINKS+=uuid.3 uuid_is_nil.3 +MLINKS+=uuid.3 uuid_enc_le.3 +MLINKS+=uuid.3 uuid_dec_le.3 +MLINKS+=uuid.3 uuid_enc_be.3 +MLINKS+=uuid.3 uuid_dec_be.3 MLINKS+=uuid.3 uuid_to_string.3 ==== //depot/projects/vap/lib/libc/uuid/uuid.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/libc/uuid/uuid.3,v 1.6 2005/11/24 07:04:20 ru Exp $ +.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.7 2008/08/14 22:23:16 emax Exp $ .\" -.Dd January 3, 2005 +.Dd August 13, 2008 .Dt UUID 3 .Os .Sh NAME @@ -52,6 +52,14 @@ .Fn uuid_is_nil "const uuid_t *uuid" "uint32_t *status" .Ft void .Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status" +.Ft void +.Fn uuid_enc_le "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_le "const void *buf" "uuid_t *" +.Ft void +.Fn uuid_enc_be "void *buf" "const uuid_t *uuid" +.Ft void +.Fn uuid_dec_be "const void *buf" "uuid_t *" .Sh DESCRIPTION The family of DCE 1.1 compliant UUID functions allow applications to operate on universally unique identifiers, or UUIDs. @@ -74,6 +82,26 @@ respectively. A 16-bit hash value can be obtained by calling .Fn uuid_hash . +.Pp +The +.Fn uuid_enc_le +and +.Fn uuid_enc_be +functions encode a binary representation of a UUID into an octet stream +in little-endian and big-endian byte-order, respectively. +The destination buffer must be pre-allocated by the caller, and must be +large enough to hold the 16-octet binary UUID. +These routines are not part of the DCE RPC API. +They are provided for convenience. +.Pp +The +.Fn uuid_dec_le +and +.Fn uuid_dec_be +functions decode a UUID from an octet stream in little-endian and +big-endian byte-order, respectively. +These routines are not part of the DCE RPC API. +They are provided for convenience. .Sh RETURN VALUES The successful or unsuccessful completion of the function is returned in the ==== //depot/projects/vap/lib/librt/sigev_thread.c#3 (text) ==== @@ -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/lib/librt/sigev_thread.c,v 1.8 2006/03/29 04:20:53 deischen Exp $ + * $FreeBSD: src/lib/librt/sigev_thread.c,v 1.9 2008/08/15 21:08:48 kmacy Exp $ * */ @@ -51,7 +51,7 @@ static struct sigev_list_head sigev_hash[HASH_QUEUES]; static struct sigev_list_head sigev_all; static LIST_HEAD(,sigev_thread) sigev_threads; -static int sigev_generation; +static unsigned int sigev_generation; static pthread_mutex_t *sigev_list_mtx; static pthread_once_t sigev_once = PTHREAD_ONCE_INIT; static pthread_once_t sigev_once_default = PTHREAD_ONCE_INIT; ==== //depot/projects/vap/share/man/man4/snp.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/snp.4,v 1.27 2005/09/19 13:48:45 ru Exp $ +.\" $FreeBSD: src/share/man/man4/snp.4,v 1.28 2008/08/15 13:07:07 ed Exp $ .\" .Dd September 18, 2005 .Dt SNP 4 @@ -16,8 +16,8 @@ .Ft int .Fn ioctl fd FIONREAD &result .Sh DESCRIPTION -.Pa /dev/snp? -are snoop devices which allow users to attach to any tty +.Pa /dev/snp +is a snoop device which allows users to attach to any tty and watch activities on it. The kernel must be compiled with .Cd "device snp" , ==== //depot/projects/vap/sys/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.52 2008/08/08 18:00:33 philip Exp $ +# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ .include @@ -46,6 +46,10 @@ # You need the textproc/glimpse ports for this. glimpse: +.if !exists(${.CURDIR}/.glimpse_exclude) + echo .svn > ${.CURDIR}/.glimpse_exclude + echo /compile/ >> ${.CURDIR}/.glimpse_exclude +.endif cd ${.CURDIR}; glimpseindex -H . -B -f -o . glimpse-clean: ==== //depot/projects/vap/sys/conf/files#48 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1325 2008/08/12 00:27:32 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -986,6 +986,7 @@ dev/pci/pci_user.c optional pci dev/pci/pcib_if.m standard dev/pci/vga_pci.c optional pci +dev/pcn/if_pcn.c optional pcn pci dev/pdq/if_fea.c optional fea eisa dev/pdq/if_fpa.c optional fpa pci dev/pdq/pdq.c optional nowerror fea eisa | fpa pci @@ -1202,6 +1203,7 @@ dev/spibus/spibus_if.m optional spibus dev/sr/if_sr.c optional sr dev/sr/if_sr_pci.c optional sr pci +dev/ste/if_ste.c optional ste pci dev/stg/tmc18c30.c optional stg dev/stg/tmc18c30_isa.c optional stg isa dev/stg/tmc18c30_pccard.c optional stg pccard @@ -1233,6 +1235,7 @@ dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux dev/tdfx/tdfx_pci.c optional tdfx pci dev/ti/if_ti.c optional ti pci +dev/tl/if_tl.c optional tl pci dev/trm/trm.c optional trm dev/twa/tw_cl_init.c optional twa \ compile-with "${NORMAL_C} -I$S/dev/twa" @@ -1335,6 +1338,7 @@ dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci dev/watchdog/watchdog.c standard +dev/wb/if_wb.c optional wb pci dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi dev/wi/if_wi_pccard.c optional wi pccard @@ -1731,6 +1735,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2093,11 +2098,7 @@ pci/amdpm.c optional amdpm pci | nfpm pci pci/amdsmb.c optional amdsmb pci pci/if_mn.c optional mn pci -pci/if_pcn.c optional pcn pci pci/if_rl.c optional rl pci -pci/if_ste.c optional ste pci -pci/if_tl.c optional tl pci -pci/if_wb.c optional wb pci pci/intpm.c optional intpm pci pci/ncr.c optional ncr pci pci/nfsmb.c optional nfsmb pci @@ -2349,3 +2350,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vap/sys/conf/files.i386#16 (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.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -277,9 +278,11 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/vap/sys/conf/options.i386#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/vap/sys/dev/ata/ata-all.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.289 2008/06/11 06:44:58 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.290 2008/08/15 10:55:11 philip Exp $"); #include "opt_ata.h" #include @@ -75,6 +75,7 @@ uma_zone_t ata_composite_zone; int ata_wc = 1; int ata_setmax = 0; +int ata_dma_check_80pin = 1; /* local vars */ static int ata_dma = 1; @@ -85,6 +86,10 @@ TUNABLE_INT("hw.ata.ata_dma", &ata_dma); SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0, "ATA disk DMA mode control"); +TUNABLE_INT("hw.ata.ata_dma_check_80pin", &ata_dma_check_80pin); +SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma_check_80pin, + CTLFLAG_RDTUN, &ata_dma_check_80pin, 1, + "Check for 80pin cable before setting ATA DMA mode"); TUNABLE_INT("hw.ata.atapi_dma", &atapi_dma); SYSCTL_INT(_hw_ata, OID_AUTO, atapi_dma, CTLFLAG_RDTUN, &atapi_dma, 0, "ATAPI device DMA mode control"); ==== //depot/projects/vap/sys/dev/ata/ata-all.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.133 2008/04/17 12:29:35 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.134 2008/08/15 10:55:11 philip Exp $ */ /* ATA register defines */ @@ -544,7 +544,8 @@ extern devclass_t ata_devclass; extern int ata_wc; extern int ata_setmax; - +extern int ata_dma_check_80pin; + /* public prototypes */ /* ata-all.c: */ int ata_probe(device_t dev); ==== //depot/projects/vap/sys/dev/ata/ata-chipset.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.224 2008/07/10 21:36:53 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.225 2008/08/15 10:55:11 philip Exp $"); #include "opt_ata.h" #include @@ -6392,6 +6392,12 @@ { struct ata_device *atadev = device_get_softc(dev); + if (!ata_dma_check_80pin) { + if (bootverbose) + device_printf(dev, "Skipping 80pin cable check\n"); + return mode; + } + if (mode > ATA_UDMA2 && !(atadev->param.hwres & ATA_CABLE_ID)) { ata_print_cable(dev, "device"); mode = ATA_UDMA2; ==== //depot/projects/vap/sys/dev/snp/snp.c#8 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.108 2008/06/11 18:55:19 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.109 2008/08/15 13:07:07 ed Exp $"); #include #include @@ -36,7 +36,6 @@ static l_close_t snplclose; static l_write_t snplwrite; static d_open_t snpopen; -static d_close_t snpclose; static d_read_t snpread; static d_write_t snpwrite; static d_ioctl_t snpioctl; @@ -46,7 +45,6 @@ .d_version = D_VERSION, .d_flags = D_PSEUDO | D_NEEDGIANT | D_NEEDMINOR, .d_open = snpopen, - .d_close = snpclose, .d_read = snpread, .d_write = snpwrite, .d_ioctl = snpioctl, @@ -70,7 +68,6 @@ */ struct snoop { LIST_ENTRY(snoop) snp_list; /* List glue. */ - int snp_unit; /* Device number. */ struct cdev *snp_target; /* Target tty device. */ struct tty *snp_tty; /* Target tty pointer. */ u_long snp_len; /* Possible length. */ @@ -111,13 +108,11 @@ * module load time. */ static int snooplinedisc; +static struct cdev *snoopdev; static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist); -static struct clonedevs *snpclones; static struct tty *snpdevtotty(struct cdev *dev); -static void snp_clone(void *arg, struct ucred *cred, char *name, - int namelen, struct cdev **dev); static void snp_detach(void *arg); static int snp_down(struct snoop *snp); static int snp_in(struct snoop *snp, char *buf, int n); @@ -220,14 +215,17 @@ int error, i, len; unsigned char c[SNP_INPUT_BUF]; - snp = dev->si_drv1; + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); + tp = snp->snp_tty; if (tp == NULL) return (EIO); if ((tp->t_state & TS_SNOOP) && tp->t_line == snooplinedisc) goto tty_input; - printf("snp%d: attempt to write to bad tty\n", snp->snp_unit); + printf("snp: attempt to write to bad tty\n"); return (EIO); tty_input: @@ -255,7 +253,10 @@ caddr_t from; char *nbuf; - snp = dev->si_drv1; + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); + KASSERT(snp->snp_len + snp->snp_base <= snp->snp_blen, ("snoop buffer error")); @@ -324,12 +325,12 @@ return (0); if (snp->snp_flags & SNOOP_DOWN) { - printf("snp%d: more data to down interface\n", snp->snp_unit); + printf("snp: more data to down interface\n"); return (0); } if (snp->snp_flags & SNOOP_OFLOW) { - printf("snp%d: buffer overflow\n", snp->snp_unit); + printf("snp: buffer overflow\n"); /* * On overflow we just repeat the standart close * procedure...yes , this is waste of space but.. Then next @@ -387,18 +388,30 @@ return (n); } +static void +snp_dtor(void *data) +{ + struct snoop *snp = data; + + snp->snp_blen = 0; + LIST_REMOVE(snp, snp_list); + free(snp->snp_buf, M_SNP); + snp->snp_flags &= ~SNOOP_OPEN; + snp_detach(snp); +} + static int snpopen(struct cdev *dev, int flag, int mode, struct thread *td) { struct snoop *snp; + int error; - if (dev->si_drv1 == NULL) { - dev->si_flags &= ~SI_CHEAPCLONE; - dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP, - M_WAITOK | M_ZERO); - snp->snp_unit = dev2unit(dev); - } else - return (EBUSY); + snp = malloc(sizeof(*snp), M_SNP, M_WAITOK | M_ZERO); + error = devfs_set_cdevpriv(snp, snp_dtor); + if (error != 0) { + free(snp, M_SNP); + return (error); + } /* * We intentionally do not OR flags with SNOOP_OPEN, but set them so @@ -444,7 +457,7 @@ tp->t_state &= ~TS_SNOOP; tp->t_line = snp->snp_olddisc; } else - printf("snp%d: bad attached tty data\n", snp->snp_unit); + printf("snp: bad attached tty data\n"); snp->snp_tty = NULL; snp->snp_target = NULL; @@ -456,23 +469,6 @@ } static int -snpclose(struct cdev *dev, int flags, int fmt, struct thread *td) -{ - struct snoop *snp; - - snp = dev->si_drv1; - snp->snp_blen = 0; - LIST_REMOVE(snp, snp_list); - free(snp->snp_buf, M_SNP); - snp->snp_flags &= ~SNOOP_OPEN; - dev->si_drv1 = NULL; - snp_detach(snp); - destroy_dev_sched(dev); - - return (0); -} - -static int snp_down(struct snoop *snp) { @@ -495,9 +491,12 @@ struct tty *tp; struct cdev *tdev; struct file *fp; - int s; + int error, s; + + error = devfs_get_cdevpriv((void **)&snp); + if (error != 0) + return (error); - snp = dev->si_drv1; switch (cmd) { case SNPSTTY: s = *(int *)data; @@ -587,7 +586,10 @@ struct snoop *snp; int revents; - snp = dev->si_drv1; + if (devfs_get_cdevpriv((void **)&snp) != 0) + return (events & + (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); + revents = 0; /* * If snoop is down, we don't want to poll() forever so we return 1. @@ -603,44 +605,22 @@ return (revents); } -static void -snp_clone(void *arg, struct ucred *cred, char *name, int namelen, - struct cdev **dev) -{ - int u, i; - - if (*dev != NULL) - return; - if (dev_stdclone(name, NULL, "snp", &u) != 1) - return; - i = clone_create(&snpclones, &snp_cdevsw, &u, dev, 0); - if (i) - *dev = make_dev_credf(MAKEDEV_REF, &snp_cdevsw, unit2minor(u), - NULL, UID_ROOT, GID_WHEEL, 0600, "snp%d", u); - if (*dev != NULL) { - (*dev)->si_flags |= SI_CHEAPCLONE; - } -} - static int snp_modevent(module_t mod, int type, void *data) { - static eventhandler_tag eh_tag; switch (type) { case MOD_LOAD: - /* XXX error checking. */ - clone_setup(&snpclones); - eh_tag = EVENTHANDLER_REGISTER(dev_clone, snp_clone, 0, 1000); snooplinedisc = ldisc_register(LDISC_LOAD, &snpdisc); + snoopdev = make_dev(&snp_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "snp"); + /* For compatibility */ + make_dev_alias(snoopdev, "snp0"); break; case MOD_UNLOAD: if (!LIST_EMPTY(&snp_sclist)) return (EBUSY); - EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); - drain_dev_clone_events(); - clone_cleanup(&snpclones); - destroy_dev_drain(&snp_cdevsw); + destroy_dev(snoopdev); ldisc_deregister(snooplinedisc); break; default: ==== //depot/projects/vap/sys/dev/xen/console/console.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.1 2008/08/12 20:01:57 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/console.c,v 1.2 2008/08/15 04:00:44 kmacy Exp $"); #include #include @@ -276,7 +276,6 @@ NULL, SHUTDOWN_PRI_DEFAULT)) == NULL) printf("xencons: shutdown event registration failed!\n"); - TRACE_EXIT; return (0); } @@ -368,7 +367,6 @@ if (sc == NULL) return (ENXIO); - TRACE_ENTER; tp = dev->si_tty; s = spltty(); if (!ISTTYOPEN(tp)) { @@ -390,7 +388,6 @@ xen_console_up = 1; error = (*linesw[tp->t_line]->l_open)(dev, tp); - TRACE_EXIT; return error; } ==== //depot/projects/vap/sys/dev/xen/console/xencons_ring.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/xen/console/xencons_ring.c,v 1.1 2008/08/12 20:01:57 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xen/console/xencons_ring.c,v 1.2 2008/08/15 04:00:44 kmacy Exp $"); #include #include @@ -119,7 +119,6 @@ "xencons", xencons_handle_input, NULL, INTR_TYPE_MISC | INTR_MPSAFE, NULL); if (err) { - XENPRINTF("XEN console request irq failed %i\n", err); return err; } ==== //depot/projects/vap/sys/i386/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 18:28:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AB741065676; Sat, 16 Aug 2008 18:28:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 606B3106566C for ; Sat, 16 Aug 2008 18:28:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45FA38FC16 for ; Sat, 16 Aug 2008 18:28:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GISXUH056042 for ; Sat, 16 Aug 2008 18:28:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GISXk6056040 for perforce@freebsd.org; Sat, 16 Aug 2008 18:28:33 GMT (envelope-from sam@freebsd.org) Date: Sat, 16 Aug 2008 18:28:33 GMT Message-Id: <200808161828.m7GISXk6056040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 147580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 18:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=147580 Change 147580 by sam@sam_ebb on 2008/08/16 18:27:51 add new stuff Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifgre.c#2 integrate .. //depot/projects/vap/share/man/man4/upgt.4#2 integrate .. //depot/projects/vap/sys/dev/usb/if_upgt.c#3 integrate .. //depot/projects/vap/sys/dev/usb/if_upgtvar.h#2 integrate .. //depot/projects/vap/sys/modules/upgt/Makefile#2 integrate Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifgre.c#2 (text+ko) ==== ==== //depot/projects/vap/share/man/man4/upgt.4#2 (text+ko) ==== ==== //depot/projects/vap/sys/dev/usb/if_upgt.c#3 (text+ko) ==== ==== //depot/projects/vap/sys/dev/usb/if_upgtvar.h#2 (text+ko) ==== ==== //depot/projects/vap/sys/modules/upgt/Makefile#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Aug 16 18:41:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A214C106567E; Sat, 16 Aug 2008 18:41:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65463106567C for ; Sat, 16 Aug 2008 18:41:48 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 496308FC1D for ; Sat, 16 Aug 2008 18:41:48 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GIfmlq057194 for ; Sat, 16 Aug 2008 18:41:48 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GIflQu057192 for perforce@freebsd.org; Sat, 16 Aug 2008 18:41:47 GMT (envelope-from thioretic@FreeBSD.org) Date: Sat, 16 Aug 2008 18:41:47 GMT Message-Id: <200808161841.m7GIflQu057192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 147585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 18:41:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=147585 Change 147585 by thioretic@thioretic on 2008/08/16 18:41:27 Integrate from parent. Affected files ... .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/machdep.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/clock.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/isa/clock.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/conf/AVILA#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/conf/HL200#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/i386/loader/main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/soc2007/thioretic_gidl2/boot/pc98/loader/main.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/cam_periph.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/linux/linux_file.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.amd64#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.i386#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/newvers.sh#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/conf/options#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ddb/db_command.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ddb/db_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_cam.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_debug.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_disk.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aac_pci.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/aac/aacvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hme.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/jme/if_jme.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/jme/if_jmereg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/jme/if_jmevar.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/icsphy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/icsphyreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/jmphy.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/jmphyreg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/miidevs#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mpt/mpt_user.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/nvram/nvram.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/dev/pci/pci.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/re/if_re.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/sym/sym_defs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/sym/sym_fw.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/umass.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/ums.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/dev/vx/if_vx.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/gdb/gdb_main.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/NOTES#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/conf/XBOX#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/cpufreq/est.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/i686_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/k6_mem.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/locore.s#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/clock.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/pc/bios.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/pmap.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/isa/clock.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/init_sysent.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_conf.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_descrip.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_resource.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_switch.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/link_elf.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/sys_process.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/syscalls.master#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/sysv_sem.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/tty.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/uipc_sem.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/kern/vnode_if.src#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/Makefile#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/bge/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/jme/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/krpc/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/mii/Makefile#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/mpt/Makefile#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/modules/nfslockd/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/modules/nvram/Makefile#1 branch .. //depot/projects/soc2007/thioretic_gidl2/net/bpf.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bridge.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bridgestp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/bridgestp.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/ethernet.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_bridge.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_lagg.c#7 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_media.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/net/if_tap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/netgraph.h#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_base.c#6 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_nat.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_nat.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netgraph/ng_socket.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/in.c#4 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_dummynet.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/key.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/netkey/key.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot_clnt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot_impl.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot_server.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot_svc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/nlm_prot_xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/sm_inter.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/nlm/sm_inter_xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/agp_nvidia.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_dc.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_dcreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_de.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_rl.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_rlreg.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_sis.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_xl.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/pci/if_xlreg.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/posix4/semaphore.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/conf/GENERIC#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/rpc/auth.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/auth_none.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/auth_unix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/authunix_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/clnt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/clnt_dg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/clnt_rc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/clnt_vc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/getnetconfig.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/inet_ntop.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/inet_pton.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/netconfig.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/nettype.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc_callmsg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc_com.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc_generic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpc_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpcb_clnt.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpcb_prot.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/rpcb_prot.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_auth.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_auth.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_auth_unix.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_dg.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_generic.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/svc_vc.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/types.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/rpc/xdr.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/md_var.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/sysarch.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/include/tlb.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/ofw_pcib_subr.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/counter.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/in_cksum.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/aac_ioctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/extattr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/fcntl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/hash.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/lockf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/malloc.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/mbuf.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/mpt_ioctl.h#1 branch .. //depot/projects/soc2007/thioretic_gidl2/sys/param.h#5 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/pcpu.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/resource.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/sockio.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/syscall.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/syscall.mk#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/sys/sysproto.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/extattr.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/quota.h#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/memguard.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/memguard.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_kern.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_object.h#2 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/vm/vnode_pager.c#3 integrate .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr_array.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr_mbuf.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr_mem.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr_reference.c#1 branch .. //depot/projects/soc2007/thioretic_gidl2/xdr/xdr_sizeof.c#1 branch Differences ... ==== //depot/projects/soc2007/thioretic_gidl2/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25.8.3 2008/03/19 16:37:23 jhb Exp $"); #include #include @@ -47,31 +47,31 @@ static char *mem_owner_bios = "BIOS"; -#define MR686_FIXMTRR (1<<0) +#define MR686_FIXMTRR (1<<0) -#define mrwithin(mr, a) \ - (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) -#define mroverlap(mra, mrb) \ - (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) +#define mrwithin(mr, a) \ + (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) +#define mroverlap(mra, mrb) \ + (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) -#define mrvalid(base, len) \ - ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ - ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ - !((base) & ((len) - 1))) /* range is not discontiuous */ +#define mrvalid(base, len) \ + ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ + ((len) >= (1 << 12)) && /* length is >= 4k */ \ + powerof2((len)) && /* ... and power of two */ \ + !((base) & ((len) - 1))) /* range is not discontiuous */ -#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) +#define mrcopyflags(curr, new) \ + (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -static int mtrrs_disabled; +static int mtrrs_disabled; TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled); SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN, - &mtrrs_disabled, 0, "Disable amd64 MTRRs."); + &mtrrs_disabled, 0, "Disable amd64 MTRRs."); -static void amd64_mrinit(struct mem_range_softc *sc); -static int amd64_mrset(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrinit(struct mem_range_softc *sc); +static int amd64_mrset(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static void amd64_mrAPinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, @@ -80,157 +80,159 @@ }; /* XXX for AP startup hook */ -static u_int64_t mtrrcap, mtrrdef; +static u_int64_t mtrrcap, mtrrdef; + +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; -static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, - struct mem_range_desc *mrd); -static void amd64_mrfetch(struct mem_range_softc *sc); -static int amd64_mtrrtype(int flags); -static int amd64_mrt2mtrr(int flags, int oldval); -static int amd64_mtrrconflict(int flag1, int flag2); -static void amd64_mrstore(struct mem_range_softc *sc); -static void amd64_mrstoreone(void *arg); -static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, - u_int64_t addr); -static int amd64_mrsetlow(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static int amd64_mrsetvariable(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); +static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +static void amd64_mrfetch(struct mem_range_softc *sc); +static int amd64_mtrrtype(int flags); +static int amd64_mrt2mtrr(int flags, int oldval); +static int amd64_mtrrconflict(int flag1, int flag2); +static void amd64_mrstore(struct mem_range_softc *sc); +static void amd64_mrstoreone(void *arg); +static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +static int amd64_mrsetlow(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static int amd64_mrsetvariable(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); /* amd64 MTRR type to memory range type conversion */ static int amd64_mtrrtomrt[] = { - MDF_UNCACHEABLE, - MDF_WRITECOMBINE, - MDF_UNKNOWN, - MDF_UNKNOWN, - MDF_WRITETHROUGH, - MDF_WRITEPROTECT, - MDF_WRITEBACK + MDF_UNCACHEABLE, + MDF_WRITECOMBINE, + MDF_UNKNOWN, + MDF_UNKNOWN, + MDF_WRITETHROUGH, + MDF_WRITEPROTECT, + MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) - -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) static int amd64_mtrr2mrt(int val) { + if (val < 0 || val >= MTRRTOMRTLEN) - return MDF_UNKNOWN; - return amd64_mtrrtomrt[val]; + return (MDF_UNKNOWN); + return (amd64_mtrrtomrt[val]); } -/* +/* * amd64 MTRR conflicts. Writeback and uncachable may overlap. */ static int amd64_mtrrconflict(int flag1, int flag2) { + flag1 &= MDF_ATTRMASK; flag2 &= MDF_ATTRMASK; if ((flag1 & MDF_UNKNOWN) || (flag2 & MDF_UNKNOWN)) - return 1; + return (1); if (flag1 == flag2 || (flag1 == MDF_WRITEBACK && flag2 == MDF_UNCACHEABLE) || (flag2 == MDF_WRITEBACK && flag1 == MDF_UNCACHEABLE)) - return 0; - return 1; + return (0); + return (1); } /* * Look for an exactly-matching range. */ static struct mem_range_desc * -mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) +mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) { - struct mem_range_desc *cand; - int i; - - for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) - if ((cand->mr_base == mrd->mr_base) && - (cand->mr_len == mrd->mr_len)) - return(cand); - return(NULL); + struct mem_range_desc *cand; + int i; + + for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) + if ((cand->mr_base == mrd->mr_base) && + (cand->mr_len == mrd->mr_len)) + return (cand); + return (NULL); } /* - * Fetch the current mtrr settings from the current CPU (assumed to all - * be in sync in the SMP case). Note that if we are here, we assume - * that MTRRs are enabled, and we may or may not have fixed MTRRs. + * Fetch the current mtrr settings from the current CPU (assumed to + * all be in sync in the SMP case). Note that if we are here, we + * assume that MTRRs are enabled, and we may or may not have fixed + * MTRRs. */ static void amd64_mrfetch(struct mem_range_softc *sc) { - struct mem_range_desc *mrd; - u_int64_t msrv; - int i, j, msr; + struct mem_range_desc *mrd; + u_int64_t msrv; + int i, j, msr; - mrd = sc->mr_desc; + mrd = sc->mr_desc; - /* Get fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + /* Get fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { + + /* Get remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + amd64_mtrr2mrt(msrv & MTRR_PHYSBASE_TYPE); + mrd->mr_base = msrv & mtrr_physmask; + msrv = rdmsr(msr + 1); + mrd->mr_flags = (msrv & MTRR_PHYSMASK_VALID) ? + (mrd->mr_flags | MDF_ACTIVE) : + (mrd->mr_flags & ~MDF_ACTIVE); + + /* Compute the range from the mask. Ick. */ + mrd->mr_len = (~(msrv & mtrr_physmask) & + (mtrr_physmask | 0xfffL)) + 1; + if (!mrvalid(mrd->mr_base, mrd->mr_len)) + mrd->mr_flags |= MDF_BOGUS; + + /* If unclaimed and active, must be the BIOS. */ + if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) + strcpy(mrd->mr_owner, mem_owner_bios); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } - } - } - - /* Get remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - msrv = rdmsr(msr); - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000000fffffff000L; - msrv = rdmsr(msr + 1); - mrd->mr_flags = (msrv & 0x800) ? - (mrd->mr_flags | MDF_ACTIVE) : - (mrd->mr_flags & ~MDF_ACTIVE); - /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; - if (!mrvalid(mrd->mr_base, mrd->mr_len)) - mrd->mr_flags |= MDF_BOGUS; - /* If unclaimed and active, must be the BIOS */ - if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) - strcpy(mrd->mr_owner, mem_owner_bios); - } } /* @@ -239,17 +241,17 @@ static int amd64_mtrrtype(int flags) { - int i; + int i; - flags &= MDF_ATTRMASK; + flags &= MDF_ATTRMASK; - for (i = 0; i < MTRRTOMRTLEN; i++) { - if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) - continue; - if (flags == amd64_mtrrtomrt[i]) - return(i); - } - return(-1); + for (i = 0; i < MTRRTOMRTLEN; i++) { + if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) + continue; + if (flags == amd64_mtrrtomrt[i]) + return (i); + } + return (-1); } static int @@ -258,8 +260,8 @@ int val; if ((val = amd64_mtrrtype(flags)) == -1) - return oldval & 0xff; - return val & 0xff; + return (oldval & 0xff); + return (val & 0xff); } /* @@ -272,105 +274,124 @@ amd64_mrstore(struct mem_range_softc *sc) { #ifdef SMP - /* - * We should use ipi_all_but_self() to call other CPUs into a - * locking gate, then call a target function to do this work. - * The "proper" solution involves a generalised locking gate - * implementation, not ready yet. - */ - smp_rendezvous(NULL, amd64_mrstoreone, NULL, (void *)sc); + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, amd64_mrstoreone, NULL, sc); #else - disable_intr(); /* disable interrupts */ - amd64_mrstoreone((void *)sc); - enable_intr(); + disable_intr(); /* disable interrupts */ + amd64_mrstoreone(sc); + enable_intr(); #endif } /* * Update the current CPU's MTRRs with those represented in the - * descriptor list. Note that we do this wholesale rather than - * just stuffing one entry; this is simpler (but slower, of course). + * descriptor list. Note that we do this wholesale rather than just + * stuffing one entry; this is simpler (but slower, of course). */ static void amd64_mrstoreone(void *arg) { - struct mem_range_softc *sc = (struct mem_range_softc *)arg; - struct mem_range_desc *mrd; - u_int64_t omsrv, msrv; - int i, j, msr; - u_int cr4save; + struct mem_range_softc *sc = arg; + struct mem_range_desc *mrd; + u_int64_t omsrv, msrv; + int i, j, msr; + u_int cr4save; + + mrd = sc->mr_desc; + + /* Disable PGE. */ + cr4save = rcr4(); + if (cr4save & CR4_PGE) + load_cr4(cr4save & ~CR4_PGE); + + /* Disable caches (CD = 1, NW = 0). */ + load_cr0((rcr0() & ~CR0_NW) | CR0_CD); - mrd = sc->mr_desc; + /* Flushes caches and TLBs. */ + wbinvd(); - cr4save = rcr4(); /* save cr4 */ - if (cr4save & CR4_PGE) - load_cr4(cr4save & ~CR4_PGE); - load_cr0((rcr0() & ~CR0_NW) | CR0_CD); /* disable caches (CD = 1, NW = 0) */ - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~0x800); /* disable MTRRs (E = 0) */ + /* Disable MTRRs (E = 0). */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~MTRR_DEF_ENABLE); - /* Set fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + /* Set fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + + /* Set remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + /* base/type register */ + omsrv = rdmsr(msr); + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = mrd->mr_base & mtrr_physmask; + msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); + } else { + msrv = 0; + } + wrmsr(msr, msrv); + + /* mask/active register */ + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = MTRR_PHYSMASK_VALID | + (~(mrd->mr_len - 1) & mtrr_physmask); + } else { + msrv = 0; + } + wrmsr(msr + 1, msrv); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; - } - } + + /* Flush caches, TLBs. */ + wbinvd(); + + /* Enable MTRRs. */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | MTRR_DEF_ENABLE); + + /* Enable caches (CD = 0, NW = 0). */ + load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); - /* Set remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - /* base/type register */ - omsrv = rdmsr(msr); - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000000fffffff000L; - msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); - } else { - msrv = 0; - } - wrmsr(msr, msrv); - - /* mask/active register */ - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); - } else { - msrv = 0; - } - wrmsr(msr + 1, msrv); - } - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | 0x800); /* restore MTRR state */ - load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); /* enable caches CD = 0 and NW = 0 */ - load_cr4(cr4save); /* restore cr4 */ + /* Restore PGE. */ + load_cr4(cr4save); } /* @@ -379,227 +400,260 @@ static struct mem_range_desc * amd64_mtrrfixsearch(struct mem_range_softc *sc, u_int64_t addr) { - struct mem_range_desc *mrd; - int i; - - for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); i++, mrd++) - if ((addr >= mrd->mr_base) && (addr < (mrd->mr_base + mrd->mr_len))) - return(mrd); - return(NULL); + struct mem_range_desc *mrd; + int i; + + for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); + i++, mrd++) + if ((addr >= mrd->mr_base) && + (addr < (mrd->mr_base + mrd->mr_len))) + return (mrd); + return (NULL); } /* - * Try to satisfy the given range request by manipulating the fixed MTRRs that - * cover low memory. + * Try to satisfy the given range request by manipulating the fixed + * MTRRs that cover low memory. * - * Note that we try to be generous here; we'll bloat the range out to the - * next higher/lower boundary to avoid the consumer having to know too much - * about the mechanisms here. + * Note that we try to be generous here; we'll bloat the range out to + * the next higher/lower boundary to avoid the consumer having to know + * too much about the mechanisms here. * - * XXX note that this will have to be updated when we start supporting "busy" ranges. + * XXX note that this will have to be updated when we start supporting + * "busy" ranges. */ static int amd64_mrsetlow(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { - struct mem_range_desc *first_md, *last_md, *curr_md; + struct mem_range_desc *first_md, *last_md, *curr_md; + + /* Range check. */ + if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || + ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) + return (EINVAL); - /* range check */ - if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || - ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) - return(EINVAL); + /* Check that we aren't doing something risky. */ + if (!(mrd->mr_flags & MDF_FORCE)) + for (curr_md = first_md; curr_md <= last_md; curr_md++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 19:50:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6330F1065694; Sat, 16 Aug 2008 19:50:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27447106568B for ; Sat, 16 Aug 2008 19:50:59 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 120B28FC14 for ; Sat, 16 Aug 2008 19:50:59 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GJow87063931 for ; Sat, 16 Aug 2008 19:50:58 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GJowfw063929 for perforce@freebsd.org; Sat, 16 Aug 2008 19:50:58 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 19:50:58 GMT Message-Id: <200808161950.m7GJowfw063929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 19:50:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147586 Change 147586 by julian@julian_trafmon1 on 2008/08/16 19:50:25 IF-commit2@147581 "DES-ification" Affected files ... .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/conf/options#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#2 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#6 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_enc.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_gre.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/net/if_mib.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/net/rtsock.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/ip_var.h#2 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/rpc/authunix_prot.c#6 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/vimage-commit3/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/vimage-commit3/src/sys/sparc64/sparc64/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sun4v/sun4v/dump_machdep.c#3 integrate .. //depot/projects/vimage-commit3/src/sys/sys/param.h#5 integrate .. //depot/projects/vimage-commit3/src/sys/sys/vimage.h#5 integrate Differences ... ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/arm/arm/dump_machdep.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/linprocfs/linprocfs.c#4 (text+ko) ==== @@ -39,8 +39,6 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ -#include "opt_compat.h" - #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); @@ -91,6 +89,7 @@ #include #endif /* __i386__ || __amd64__ */ +#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/vimage-commit3/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ==== @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_compat.h" - #include #include #include @@ -64,6 +62,8 @@ #include #include +#include "opt_compat.h" + #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/vimage-commit3/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/conf/options#4 (text+ko) ==== @@ -768,4 +768,4 @@ TCP_OFFLOAD_DISABLE opt_inet.h # Virtualize the network stack -VIMAGE opt_global.h +VIMAGE ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#5 (text+ko) ==== @@ -27,12 +27,15 @@ #if defined(_KERNEL) && defined(__FreeBSD_version) && \ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) -# if (__FreeBSD_version >= 800000) +# if !defined(IPFILTER_LKM) # include "opt_inet6.h" # endif # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA # endif +# if (__FreeBSD_version >= 800044) +# include +# endif # endif # if (__FreeBSD_version >= 800000) # include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -55,7 +55,6 @@ #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) # include -# include #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 (text+ko) ==== @@ -62,7 +62,7 @@ #else # include #endif -#if __FreeBSD_version >= 800000 +#if __FreeBSD_version >= 800044 # include #else #define V_path_mtu_discovery path_mtu_discovery ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 (text+ko) ==== @@ -58,9 +58,6 @@ # include # include #endif -#if (__FreeBSD_version > 800000) -# include -#endif #include #ifdef sun # include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_log.c#3 (text+ko) ==== @@ -104,9 +104,6 @@ #if __FreeBSD_version >= 300000 # include #endif -#if __FreeBSD_version >= 800000 -# include -#endif #include #include #ifdef __sgi ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 (text+ko) ==== @@ -70,9 +70,6 @@ #if __FreeBSD_version >= 300000 # include #endif -#if __FreeBSD_version >= 800000 -# include -#endif #include #if __FreeBSD_version >= 300000 # include ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 (text+ko) ==== @@ -49,9 +49,6 @@ #if defined(_KERNEL) && (__FreeBSD_version >= 220000) # include # include -# if (__FreeBSD_version > 800000) -# include -# endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_state.c#4 (text+ko) ==== @@ -44,9 +44,6 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif -# if (__FreeBSD_version > 800000) -# include -# endif #else # include #endif ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 (text+ko) ==== @@ -42,9 +42,6 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif -# if (__FreeBSD_version > 800000) -# include -# endif #else # include #endif ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/if_pfsync.c#3 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include #include -#include #else #include #include ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_norm.c#3 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #ifndef __FreeBSD__ #include ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/net/pf_subr.c#2 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit3/src/sys/contrib/pf/netinet/in4_cksum.c#3 (text+ko) ==== @@ -63,11 +63,9 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ - #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/contrib/rdma/rdma_cma.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ * */ - #include __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $"); ==== //depot/projects/vimage-commit3/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ - #include __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $"); @@ -56,7 +55,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/dev/lmc/if_lmc.c#5 (text+ko) ==== @@ -83,12 +83,6 @@ # ifndef NETGRAPH # define NETGRAPH 0 # endif -# ifndef INET -# define INET 0 -# endif -# ifndef INET6 -# define INET6 0 -# endif # define P2P 0 /* not in FreeBSD */ # if (__FreeBSD_version >= 500000) # define NSPPP 1 /* No count devices in FreeBSD 5 */ ==== //depot/projects/vimage-commit3/src/sys/dev/syscons/daemon/daemon_saver.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -352,10 +353,10 @@ { /* XXXRW: Locking -- these can change! */ - messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + + messagelen = strlen(G_hostname) + 3 + strlen(ostype) + 1 + strlen(osrelease); message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK); - sprintf(message, "%s - %s %s", hostname, ostype, osrelease); + sprintf(message, "%s - %s %s", G_hostname, ostype, osrelease); blanked = 0; switch (adp->va_mode) { case M_PC98_80x25: ==== //depot/projects/vimage-commit3/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/geom/vinum/geom_vinum_drive.c#4 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/conf/NOTES#6 (text+ko) ==== @@ -248,7 +248,6 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. -# options DEVICE_POLLING ==== //depot/projects/vimage-commit3/src/sys/i386/i386/dump_machdep.c#3 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/i386/minidump_machdep.c#3 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit3/src/sys/i386/ibcs2/ibcs2_socksys.c#4 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit3/src/sys/ia64/ia64/dump_machdep.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_jail.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include - #include #include ==== //depot/projects/vimage-commit3/src/sys/kern/kern_uuid.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/bridgestp.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ - #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit3/src/sys/net/if_enc.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #include #include #include @@ -39,7 +38,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_gre.c#6 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/if_mib.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/net/rtsock.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $ */ - #include "opt_sctp.h" #include "opt_mpath.h" ==== //depot/projects/vimage-commit3/src/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -32,13 +32,11 @@ */ #include "opt_wlan.h" - #include #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_bridge.c#3 (text+ko) ==== @@ -58,7 +58,6 @@ * from one port to the other only rarely. */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_eiface.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_gif.c#3 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_ipfw.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ - #include #include #include @@ -36,7 +35,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_nat.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ - #include #include #include @@ -35,7 +34,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/netgraph/ng_source.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ * Author: Dave Chapeskie */ - #include __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $"); ==== //depot/projects/vimage-commit3/src/sys/netinet/in_mcast.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in_proto.c#3 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_dummynet.c#3 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_encap.c#3 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#5 (text+ko) ==== @@ -2317,7 +2317,7 @@ printf("IPFW2: IPV6 - Unknown Routing " "Header type(%d)\n", ((struct ip6_rthdr *)ulp)->ip6r_type); - if (fw_deny_unknown_exthdrs) + if (V_fw_deny_unknown_exthdrs) return (IP_FW_DENY); break; } @@ -4588,12 +4588,12 @@ default_rule.cmd[0].opcode == O_ACCEPT ? "accept" : "deny"); #ifdef IPFIREWALL_VERBOSE - fw_verbose = 1; + V_fw_verbose = 1; #endif #ifdef IPFIREWALL_VERBOSE_LIMIT verbose_limit = IPFIREWALL_VERBOSE_LIMIT; #endif - if (fw_verbose == 0) + if (V_fw_verbose == 0) printf("disabled\n"); else if (verbose_limit == 0) printf("unlimited\n"); ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_gre.c#4 (text+ko) ==== @@ -44,7 +44,6 @@ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE */ - #include __FBSDID("$FreeBSD$"); @@ -62,7 +61,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_id.c#3 (text+ko) ==== @@ -74,7 +74,6 @@ * enabled. */ - #include #include #include @@ -86,7 +85,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet/ip_var.h#2 (text+ko) ==== @@ -34,6 +34,9 @@ #define _NETINET_IP_VAR_H_ #include +#ifdef _KERNEL +#include +#endif /* * Overlay for ip header used by other protocols (tcp, udp). ==== //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" + #include #include #include @@ -60,7 +61,7 @@ #include #include #include -#if defined(__FreeBSD__) && __FreeBSD_version > 800000 +#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 #include #endif #include @@ -144,8 +145,7 @@ /* * Macros to expand out globals defined by various modules * to either a real global or a virtualized instance of one, - * depending on whether VIMAGE is defined in opt_global.h - * XXX so will always evaluate to the global for now (VIMAGE not defined) + * depending on whether VIMAGE is defined. */ /* first define modules that supply us information */ #define MOD_NET net @@ -154,7 +154,7 @@ #define MOD_IPSEC ipsec /* then define the macro(s) that hook into the vimage macros */ -#if defined(__FreeBSD__) && __FreeBSD_version > 800000 && defined(VIMAGE) +#if defined(__FreeBSD__) && __FreeBSD_version >= 800044 && defined(VIMAGE) #define VSYMNAME(__MODULE) vnet_ ## __MODULE #define MODULE_GLOBAL(__MODULE, __SYMBOL) VSYM(VSYMNAME(__MODULE), __SYMBOL) #else ==== //depot/projects/vimage-commit3/src/sys/netinet/tcp_debug.c#3 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet6/frag6.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet6/in6_rmx.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netinet6/scope6.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage-commit3/src/sys/netipsec/xform_ah.c#4 (text+ko) ==== @@ -602,11 +602,11 @@ hl, (u_long) (authsize + rplen - sizeof (struct ah)), ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi))); - ahstat.ahs_badauthl++; + V_ahstat.ahs_badauthl++; m_freem(m); return EACCES; } - ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl; + V_ahstat.ahs_ibytes += m->m_pkthdr.len - skip - hl; /* Get crypto descriptors. */ crp = crypto_getreq(1); @@ -939,7 +939,7 @@ ipsec_address(&sav->sah->saidx.dst), (u_long) ntohl(sav->spi), rplen + authsize + m->m_pkthdr.len, maxpacketsize)); - ahstat.ahs_toobig++; + V_ahstat.ahs_toobig++; error = EMSGSIZE; goto bad; } ==== //depot/projects/vimage-commit3/src/sys/netipsec/xform_esp.c#4 (text+ko) ==== @@ -727,7 +727,7 @@ "(len %u, max len %u)\n", __func__, ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi), skip + hlen + rlen + padding + alen, maxpacketsize)); - espstat.esps_toobig++; + V_espstat.esps_toobig++; error = EMSGSIZE; goto bad; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:32:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B7921065689; Sat, 16 Aug 2008 20:32:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FF301065685 for ; Sat, 16 Aug 2008 20:32:43 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6C2F8FC1A for ; Sat, 16 Aug 2008 20:32:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKWfAm068238 for ; Sat, 16 Aug 2008 20:32:41 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKWfRI068236 for perforce@freebsd.org; Sat, 16 Aug 2008 20:32:41 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 20:32:41 GMT Message-Id: <200808162032.m7GKWfRI068236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:32:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=147589 Change 147589 by julian@julian_trafmon1 on 2008/08/16 20:31:56 Use the commit2 label when comparing with -current Affected files ... .. //depot/projects/vimage-commit3/makediff.pl#2 edit Differences ... ==== //depot/projects/vimage-commit3/makediff.pl#2 (text+ko) ==== @@ -4,7 +4,7 @@ $src_base = '//depot/vendor/freebsd/src'; $dst_base = '//depot/projects/vimage-commit3/src'; -$dst_label = '@vimage-commit3-label'; +$dst_label = '@vimage-commit2-label'; $cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; open(P, "$cmd |") || die $!; From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:35:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D29106567F; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A48E106567C for ; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 070518FC0C for ; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) (envelope-from mayur@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKZijU068575 for ; Sat, 16 Aug 2008 20:35:44 GMT (envelope-from mayur@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKZi1x068573 for perforce@freebsd.org; Sat, 16 Aug 2008 20:35:44 GMT (envelope-from mayur@FreeBSD.org) Date: Sat, 16 Aug 2008 20:35:44 GMT Message-Id: <200808162035.m7GKZi1x068573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mayur@FreeBSD.org using -f From: Mayur Shardul To: Perforce Change Reviews Cc: Subject: PERFORCE change 147591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:35:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=147591 Change 147591 by mayur@mayur_freebsd_vm on 2008/08/16 20:35:00 Benchmarking with preallocation Affected files ... .. //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#4 edit .. //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#4 edit Differences ... ==== //depot/projects/soc2008/mayur_vmalgo/uspace/radix_tree.c#4 (text+ko) ==== @@ -24,7 +24,10 @@ /* Default values of the tree parameters */ #define DEFAULT_BITS_PER_LEVEL 8 #define DEFAULT_MAX_HEIGHT 4 +#define RESERVED_NODE_COUNT 0xfffff +SLIST_HEAD(, radix_node) res_rnodes_head = + SLIST_HEAD_INITIALIZER(res_rnodes_head); /* * init_radix_tree: @@ -69,6 +72,7 @@ struct radix_node * get_radix_node(struct radix_tree *rtree) { + /* struct radix_node *rnode; int children_cnt; @@ -82,6 +86,16 @@ bzero(rnode, sizeof(struct radix_node)+ sizeof(void *)*children_cnt); return rnode; + */ + struct radix_node *rnode; + + if(!SLIST_EMPTY(&res_rnodes_head)){ + rnode = SLIST_FIRST(&res_rnodes_head); + SLIST_REMOVE_HEAD(&res_rnodes_head, next); + bzero((void *)rnode, sizeof(struct radix_node)); + return rnode; + } + return NULL; } /* @@ -92,7 +106,8 @@ void put_radix_node( struct radix_node *rnode, struct radix_tree *rtree) { - free(rnode); + //free(rnode); + SLIST_INSERT_HEAD(&res_rnodes_head,rnode,next); } /* @@ -463,3 +478,16 @@ rtree->rt_root = NULL; } } + + +void radix_tree_init(){ + int i; + char *mem = (char *)malloc(RESERVED_NODE_COUNT * + sizeof(struct radix_node)); + for(i = 0; i < RESERVED_NODE_COUNT; i++) + { + SLIST_INSERT_HEAD(&res_rnodes_head, (struct radix_node *)mem, + next); + mem += sizeof(struct radix_node); + } +} ==== //depot/projects/soc2008/mayur_vmalgo/uspace/rtree_stree.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ } t_end = rdtsc(); printf("TSC difference after lookups: %lld\n", (t_end - t_start)); - printf("\n\n\nMeasuring time for %d lookup operations on splay tree with" + printf("Measuring time for %d lookup operations on splay tree with" " %d elements\n", N, X); t_start = rdtsc(); for(i = 0; i < N; i++){ @@ -56,7 +56,7 @@ t_end = rdtsc(); printf("TSC difference after inserts: %lld\n", (t_end - t_start)); printf("Measuring time for %d inserts on splay tree with" - "%d elements\n", N, X); + " %d elements\n", N, X); t = 0; for(i = 0; i < N; i++){ t += splay_insert(inserts[i]); From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:35:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B6AC106573C; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 593B71065681 for ; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B72E8FC12 for ; Sat, 16 Aug 2008 20:35:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKZjax068580 for ; Sat, 16 Aug 2008 20:35:45 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKZj0O068578 for perforce@freebsd.org; Sat, 16 Aug 2008 20:35:45 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 20:35:45 GMT Message-Id: <200808162035.m7GKZj0O068578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=147592 Change 147592 by julian@julian_trafmon1 on 2008/08/16 20:35:25 remove duplicate include Affected files ... .. //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#6 edit Differences ... ==== //depot/projects/vimage-commit3/src/sys/contrib/ipfilter/netinet/fil.c#6 (text+ko) ==== @@ -37,9 +37,6 @@ # include # endif # endif -# if (__FreeBSD_version >= 800000) -# include -# endif # include #else # include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:39:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11D7A1065687; Sat, 16 Aug 2008 20:39:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA02E1065682 for ; Sat, 16 Aug 2008 20:39:49 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C60C8FC0A for ; Sat, 16 Aug 2008 20:39:49 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKdnL8068844 for ; Sat, 16 Aug 2008 20:39:49 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKdnj4068842 for perforce@freebsd.org; Sat, 16 Aug 2008 20:39:49 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 20:39:49 GMT Message-Id: <200808162039.m7GKdnj4068842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:39:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=147593 Change 147593 by julian@julian_trafmon1 on 2008/08/16 20:39:10 make diffs between here at commit2 Affected files ... .. //depot/projects/vimage-commit3/makemeat3.pl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:46:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D8EB1065688; Sat, 16 Aug 2008 20:46:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 105E7106567A for ; Sat, 16 Aug 2008 20:46:59 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2EA58FC08 for ; Sat, 16 Aug 2008 20:46:56 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKkuQK069493 for ; Sat, 16 Aug 2008 20:46:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKku51069491 for perforce@freebsd.org; Sat, 16 Aug 2008 20:46:56 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 20:46:56 GMT Message-Id: <200808162046.m7GKku51069491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=147594 Change 147594 by julian@julian_trafmon1 on 2008/08/16 20:46:43 use correct syntax for p4 diff with a label Affected files ... .. //depot/projects/vimage-commit3/makemeat3.pl#2 edit Differences ... ==== //depot/projects/vimage-commit3/makemeat3.pl#2 (text+ko) ==== @@ -4,7 +4,7 @@ $src_base = '//depot/projects/vimage-commit2/src/sys'; $dst_base = '//depot/projects/vimage-commit3/src/sys'; -$dst_label = 'vimage-commit3-label'; +$dst_label = '@vimage-commit3-label'; $cmd = "p4 diff2 -du $src_base/...$dst_label $dst_base/...#head"; open(P, "$cmd |") || die $!; From owner-p4-projects@FreeBSD.ORG Sat Aug 16 20:58:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8464A106567A; Sat, 16 Aug 2008 20:58:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E90F1065672 for ; Sat, 16 Aug 2008 20:58:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19A718FC23 for ; Sat, 16 Aug 2008 20:58:08 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GKw84o081132 for ; Sat, 16 Aug 2008 20:58:08 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GKw8oP081130 for perforce@freebsd.org; Sat, 16 Aug 2008 20:58:08 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 20:58:08 GMT Message-Id: <200808162058.m7GKw8oP081130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 20:58:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=147595 Change 147595 by julian@julian_trafmon1 on 2008/08/16 20:58:07 IFC@147590 Affected files ... .. //depot/projects/vimage/src/sys/conf/files#35 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#16 integrate .. //depot/projects/vimage/src/sys/conf/options.i386#7 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/XEN#1 branch .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/support.s#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/i386/include/asmacros.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/pcpu.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#8 integrate .. //depot/projects/vimage/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/vmparam.h#8 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#13 integrate .. //depot/projects/vimage/src/sys/xen/features.c#1 branch Differences ... ==== //depot/projects/vimage/src/sys/conf/files#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1726,6 +1726,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2342,3 +2343,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage/src/sys/conf/files.i386#16 (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.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -277,9 +278,11 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/vimage/src/sys/conf/options.i386#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.51 2008/07/23 09:44:36 luoqi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.52 2008/08/16 20:18:40 imp Exp $"); /* * PCI:PCI bridge support. @@ -139,6 +139,8 @@ { struct pcib_softc *sc; uint8_t iolow; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); sc->dev = dev; @@ -148,6 +150,7 @@ */ sc->command = pci_read_config(dev, PCIR_COMMAND, 1); sc->domain = pci_get_domain(dev); + sc->pribus = pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->secstat = pci_read_config(dev, PCIR_SECSTAT_1, 2); @@ -155,6 +158,20 @@ sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); /* + * Setup sysctl reporting nodes + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->domain, 0, "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->pribus, 0, "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->secbus, 0, "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->subbus, 0, "Subordinate bus number"); + + /* * Determine current I/O decode. */ if (sc->command & PCIM_CMD_PORTEN) { ==== //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.14 2008/08/16 20:18:40 imp Exp $ */ #ifndef __PCIB_PRIVATE_H__ @@ -48,9 +48,10 @@ #define PCIB_SUBTRACTIVE 0x1 #define PCIB_DISABLE_MSI 0x2 uint16_t command; /* command register */ - uint32_t domain; /* domain number */ - uint8_t secbus; /* secondary bus number */ - uint8_t subbus; /* subordinate bus number */ + u_int domain; /* domain number */ + u_int pribus; /* primary bus number */ + u_int secbus; /* secondary bus number */ + u_int subbus; /* subordinate bus number */ pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ ==== //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.13 2008/03/12 10:11:57 jeff Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.14 2008/08/15 20:58:57 kmacy Exp $ machine i386 @@ -22,3 +22,7 @@ # Default partitioning schemes options GEOM_BSD options GEOM_MBR + +# enable support for native hardware +options NATIVE +device atpic ==== //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.93 2008/07/15 03:34:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.94 2008/08/15 20:51:31 kmacy Exp $"); #include #include @@ -144,6 +144,11 @@ int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, int flags); +#ifdef XEN +#undef pmap_kextract +#define pmap_kextract pmap_kextract_ma +#endif + /* * Return true if a match is made. * ==== //depot/projects/vimage/src/sys/i386/i386/genassym.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.162 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.163 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -228,3 +228,9 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/vimage/src/sys/i386/i386/machdep.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.670 2008/04/25 05:18:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.671 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -141,6 +141,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include +#include +#include +#include +#include +#include + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +extern unsigned long physfree; +#endif /* XEN */ + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -287,8 +306,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1118,6 +1138,24 @@ return (0); } + +void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ + +#ifdef XEN + +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_hlt(int busy) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1128,8 +1166,6 @@ __asm__ ("hlt"); } -void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ - static void cpu_idle_hlt(int busy) { @@ -1143,6 +1179,7 @@ else __asm __volatile("sti; hlt"); } +#endif static void cpu_idle_acpi(int busy) @@ -1437,10 +1474,16 @@ */ int _default_ldt; + +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1542,6 +1585,7 @@ 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +#ifndef XEN /* GPROC0_SEL 9 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ @@ -1633,6 +1677,7 @@ 0, 0, 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif /* !XEN */ }; static struct soft_segment_descriptor ldt_segs[] = { @@ -1870,7 +1915,16 @@ goto physmap_done; } #endif - +#if defined(XEN) + has_smap = 0; + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; + goto physmap_done; +#endif hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -2032,7 +2086,7 @@ vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#else +#elif !defined(XEN) /* * Prefer the RTC value for extended memory. */ @@ -2123,6 +2177,7 @@ getenv_quad("dcons.size", &dcons_size) == 0) dcons_addr = 0; +#ifndef XEN /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. @@ -2240,7 +2295,11 @@ } *pte = 0; invltlb(); - +#else + phys_avail[0] = physfree; + phys_avail[1] = xen_start_info->nr_pages*PAGE_SIZE; +#endif + /* * XXX * The last chunk must contain at least one page plus the message @@ -2265,6 +2324,246 @@ off); } +#ifdef XEN +#define MTOPSIZE (1<<(14 + PAGE_SHIFT)) + +void +init386(first) + int first; +{ + struct gate_descriptor *gdp; + unsigned long gdtmachpfn; + int error, gsel_tss, metadata_missing, x; + struct pcpu *pc; + struct callback_register event = { + .type = CALLBACKTYPE_event, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)Xhypervisor_callback }, + }; + struct callback_register failsafe = { + .type = CALLBACKTYPE_failsafe, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback }, + }; + + thread0.td_kstack = proc0kstack; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); + + metadata_missing = 0; + if (xen_start_info->mod_start) { + preload_metadata = (caddr_t)xen_start_info->mod_start; + preload_bootstrap_relocate(KERNBASE); + } else { + metadata_missing = 1; + } + if (envmode == 1) + kern_envp = static_env; + else if (bootinfo.bi_envp) + kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE; + + /* Init basic tunables, hz etc */ + init_param1(); + + /* + * XEN occupies a portion of the upper virtual address space + * At its base it manages an array mapping machine page frames + * to physical page frames - hence we need to be able to + * access 4GB - (64MB - 4MB + 64k) + */ + gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUGS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GBIOSLOWMEM_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GDATA_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUCODE_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUDATA_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1); + + pc = &__pcpu[0]; + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; + + PT_SET_MA(gdt, xpmap_ptom(VTOP(gdt)) | PG_V | PG_RW); + bzero(gdt, PAGE_SIZE); + for (x = 0; x < NGDT; x++) + ssdtosd(&gdt_segs[x], &gdt[x].sd); + + mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN); + + gdtmachpfn = vtomach(gdt) >> PAGE_SHIFT; + PT_SET_MA(gdt, *vtopte((unsigned long)gdt) & ~(PG_RW|PG_M|PG_A)); + PANIC_IF(HYPERVISOR_set_gdt(&gdtmachpfn, 512) != 0); + lgdt(&r_gdt); + gdtset = 1; + + if ((error = HYPERVISOR_set_trap_table(trap_table)) != 0) { + panic("set_trap_table failed - error %d\n", error); + } + + error = HYPERVISOR_callback_op(CALLBACKOP_register, &event); + if (error == 0) + error = HYPERVISOR_callback_op(CALLBACKOP_register, &failsafe); +#if CONFIG_XEN_COMPAT <= 0x030002 + if (error == -ENOXENSYS) + HYPERVISOR_set_callbacks(GSEL(GCODE_SEL, SEL_KPL), + (unsigned long)Xhypervisor_callback, + GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback); +#endif + pcpu_init(pc, 0, sizeof(struct pcpu)); + PCPU_SET(prvspace, pc); + PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); + + /* + * Initialize mutexes. + * + * icu_lock: in order to allow an interrupt to occur in a critical + * section, to set pcpu->ipending (etc...) properly, we + * must be able to get the icu lock, so it can't be + * under witness. + */ + mutex_init(); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS | MTX_NOPROFILE); + + /* make ldt memory segments */ + ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1); + ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1); + for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) + ssdtosd(&ldt_segs[x], &ldt[x].sd); + + default_proc_ldt.ldt_base = (caddr_t)ldt; + default_proc_ldt.ldt_len = 6; + _default_ldt = (int)&default_proc_ldt; + PCPU_SET(currentldt, _default_ldt) + PT_SET_MA(ldt, *vtopte((unsigned long)ldt) & ~PG_RW); + xen_set_ldt((unsigned long) ldt, (sizeof ldt_segs / sizeof ldt_segs[0])); + +#if defined(XEN_PRIVILEGED) + /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); +#endif + + /* + * Initialize the console before we print anything out. + */ + cninit(); + + if (metadata_missing) + printf("WARNING: loader(8) metadata is missing!\n"); + +#ifdef DEV_ISA + elcr_probe(); + atpic_startup(); +#endif + +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + + kdb_init(); + +#ifdef KDB + if (boothowto & RB_KDB) + kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); +#endif + + finishidentcpu(); /* Final stage of CPU initialization */ + setidt(IDT_UD, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + setidt(IDT_GP, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + initializecpu(); /* Initialize CPU registers */ + + /* make an initial tss so cpu can get interrupt stack on syscall! */ + /* Note: -16 is so we can grow the trapframe if we came from vm86 */ + PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16); + PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); + gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); + PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd); + PCPU_SET(common_tssd, *PCPU_GET(tss_gdt)); + PCPU_SET(common_tss.tss_ioopt, (sizeof (struct i386tss)) << 16); + ltr(gsel_tss); + + /* pointer to selector slot for %fs/%gs */ + PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd); + + dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 = + dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; + dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = + dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); +#ifdef PAE + dblfault_tss.tss_cr3 = (int)IdlePDPT; +#else + dblfault_tss.tss_cr3 = (int)IdlePTD; +#endif + dblfault_tss.tss_eip = (int)dblfault_handler; + dblfault_tss.tss_eflags = PSL_KERNEL; + dblfault_tss.tss_ds = dblfault_tss.tss_es = + dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); + dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL); + dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); + dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); + + vm86_initialize(); + getmemsize(first); + init_param2(physmem); + + /* now running on new page tables, configured,and u/iom is accessible */ + + msgbufinit(msgbufp, MSGBUF_SIZE); + + /* make a call gate to reenter kernel with */ + gdp = &ldt[LSYS5CALLS_SEL].gd; + + x = (int) &IDTVEC(lcall_syscall); + gdp->gd_looffset = x; + gdp->gd_selector = GSEL(GCODE_SEL,SEL_KPL); + gdp->gd_stkcpy = 1; + gdp->gd_type = SDT_SYS386CGT; + gdp->gd_dpl = SEL_UPL; + gdp->gd_p = 1; + gdp->gd_hioffset = x >> 16; + + /* XXX does this work? */ + /* XXX yes! */ + ldt[LBSDICALLS_SEL] = ldt[LSYS5CALLS_SEL]; + ldt[LSOL26CALLS_SEL] = ldt[LSYS5CALLS_SEL]; + + /* transfer to user mode */ + + _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); + _udatasel = GSEL(GUDATA_SEL, SEL_UPL); + + /* setup proc 0's pcb */ + thread0.td_pcb->pcb_flags = 0; +#ifdef PAE + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; +#else + thread0.td_pcb->pcb_cr3 = (int)IdlePTD; +#endif + thread0.td_pcb->pcb_ext = 0; + thread0.td_frame = &proc0_tf; + thread0.td_pcb->pcb_fsd = PCPU_GET(fsgs_gdt)[0]; + thread0.td_pcb->pcb_gsd = PCPU_GET(fsgs_gdt)[1]; +} + +#else void init386(first) int first; @@ -2527,6 +2826,7 @@ thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } +#endif void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) ==== //depot/projects/vimage/src/sys/i386/i386/support.s#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/support.s,v 1.120 2008/08/08 16:26:53 stas Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.121 2008/08/15 20:51:31 kmacy Exp $ */ #include "opt_npx.h" @@ -1459,10 +1459,12 @@ */ /* void lgdt(struct region_descriptor *rdp); */ ENTRY(lgdt) +#ifndef XEN /* reload the descriptor table */ movl 4(%esp),%eax lgdt (%eax) - +#endif + /* flush the prefetch q */ jmp 1f nop ==== //depot/projects/vimage/src/sys/i386/i386/sys_machdep.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.113 2008/03/12 10:11:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.114 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -58,6 +58,20 @@ #include +#ifdef XEN +#include + +void i386_reset_ldt(struct proc_ldt *pldt); + +void +i386_reset_ldt(struct proc_ldt *pldt) +{ + xen_set_ldt((vm_offset_t)pldt->ldt_base, pldt->ldt_len); +} +#else +#define i386_reset_ldt(x) +#endif + #include /* for kernel_map */ #define MAX_LD 8192 @@ -164,7 +178,12 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; +#ifdef XEN + /* need to do nosegneg like Linux */ + sd.sd_lolimit = (HYPERVISOR_VIRT_START >> 12) & 0xffff; +#else sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -174,7 +193,12 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_fsd = sd; +#ifdef XEN + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[0]), + *(uint64_t *)&sd); +#else PCPU_GET(fsgs_gdt)[0] = sd; +#endif critical_exit(); td->td_frame->tf_fs = GSEL(GUFS_SEL, SEL_UPL); } @@ -194,7 +218,13 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; + +#ifdef XEN + /* need to do nosegneg like Linux */ + sd.sd_lolimit = (HYPERVISOR_VIRT_START >> 12) & 0xffff; +#else sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -204,7 +234,12 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_gsd = sd; +#ifdef XEN + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), + *(uint64_t *)&sd); +#else PCPU_GET(fsgs_gdt)[1] = sd; +#endif critical_exit(); load_gs(GSEL(GUGS_SEL, SEL_UPL)); } @@ -360,6 +395,10 @@ } pldt = mdp->md_ldt; +#ifdef XEN + i386_reset_ldt(pldt); + PCPU_SET(currentldt, (int)pldt); +#else #ifdef SMP gdt[PCPU_GET(cpuid) * NGDT + GUSERLDT_SEL].sd = pldt->ldt_sd; #else @@ -367,6 +406,7 @@ #endif lldt(GSEL(GUSERLDT_SEL, SEL_KPL)); PCPU_SET(currentldt, GSEL(GUSERLDT_SEL, SEL_KPL)); +#endif /* XEN */ if (dtlocked) mtx_unlock_spin(&dt_lock); } @@ -385,6 +425,44 @@ } #endif +#ifdef XEN + +/* + * dt_lock must be held. Returns with dt_lock held. + */ +struct proc_ldt * +user_ldt_alloc(struct mdproc *mdp, int len) +{ + struct proc_ldt *pldt, *new_ldt; + + mtx_assert(&dt_lock, MA_OWNED); + mtx_unlock_spin(&dt_lock); + MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), + M_SUBPROC, M_WAITOK); + + new_ldt->ldt_len = len = NEW_MAX_LD(len); + new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map, + round_page(len * sizeof(union descriptor))); + if (new_ldt->ldt_base == NULL) { + FREE(new_ldt, M_SUBPROC); + return NULL; + } + new_ldt->ldt_refcnt = 1; + new_ldt->ldt_active = 0; + + if ((pldt = mdp->md_ldt)) { + if (len > pldt->ldt_len) + len = pldt->ldt_len; + bcopy(pldt->ldt_base, new_ldt->ldt_base, + len * sizeof(union descriptor)); + } else { + bcopy(ldt, new_ldt->ldt_base, PAGE_SIZE); + } + pmap_map_readonly(kernel_pmap, (vm_offset_t)new_ldt->ldt_base, + new_ldt->ldt_len*sizeof(union descriptor)); + return new_ldt; +} +#else /* * dt_lock must be held. Returns with dt_lock held. */ @@ -423,6 +501,7 @@ return (new_ldt); } +#endif /* !XEN */ /* * Must be called with dt_lock held. Returns with dt_lock unheld. @@ -667,7 +746,23 @@ td->td_retval[0] = uap->start; return (error); } +#ifdef XEN +static int +i386_set_ldt_data(struct thread *td, int start, int num, + union descriptor *descs) +{ + struct mdproc *mdp = &td->td_proc->p_md; + struct proc_ldt *pldt = mdp->md_ldt; + + mtx_assert(&dt_lock, MA_OWNED); + /* Fill in range */ + bcopy(descs, + &((union descriptor *)(pldt->ldt_base))[start], + num * sizeof(union descriptor)); + return (0); +} +#else static int i386_set_ldt_data(struct thread *td, int start, int num, union descriptor *descs) @@ -683,6 +778,7 @@ num * sizeof(union descriptor)); return (0); } +#endif /* !XEN */ static int i386_ldt_grow(struct thread *td, int len) ==== //depot/projects/vimage/src/sys/i386/i386/trap.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.315 2008/08/13 18:29:29 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.316 2008/08/15 20:51:31 kmacy Exp $"); /* * 386 Trap and System call handling @@ -123,6 +123,14 @@ systrace_probe_func_t systrace_probe_func; #endif +#ifdef XEN +#include +#include +#include +#include +#include +#endif + extern void trap(struct trapframe *frame); extern void syscall(struct trapframe *frame); @@ -151,7 +159,11 @@ "alignment fault", /* 14 T_ALIGNFLT */ "", /* 15 unused */ "", /* 16 unused */ +#ifdef XEN + "hypervisor callback", /* 17 T_HYPCALLBACK*/ +#else "", /* 17 unused */ +#endif "integer divide fault", /* 18 T_DIVIDE */ "non-maskable interrupt trap", /* 19 T_NMI */ "overflow trap", /* 20 T_OFLOW */ @@ -258,6 +270,7 @@ goto out; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 21:07:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3EC71065675; Sat, 16 Aug 2008 21:07:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77F1C1065671 for ; Sat, 16 Aug 2008 21:07:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63AA38FC20 for ; Sat, 16 Aug 2008 21:07:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GL7HaL082979 for ; Sat, 16 Aug 2008 21:07:17 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GL7Hjl082977 for perforce@freebsd.org; Sat, 16 Aug 2008 21:07:17 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 Aug 2008 21:07:17 GMT Message-Id: <200808162107.m7GL7Hjl082977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 21:07:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=147596 Change 147596 by pgj@disznohal on 2008/08/16 21:06:36 Review of chapters 10-19 Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#17 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#17 (text+ko) ==== @@ -1657,8 +1657,8 @@ Ha egy módosított kiadást akarunk készíteni, kövessük a(z angol - nyelvû) Release Engineering + nyelvû) Release Engineering cikk útmutatásait. @@ -8330,7 +8330,7 @@ megszakítás-vezérlõ chip és sok más alapvetõ elem a gépünkben. Ezek az erõforrások - nem osztható ki, mivel már valamelyik + nem oszthatóak ki, mivel már valamelyik meghajtó használatba vette ezeket. @@ -8363,7 +8363,7 @@ Az / - állományrendszeren nem + állományrendszeren ne engedélyezzük a kvóták használatát. @@ -8450,7 +8450,7 @@ A Portgyûjteményben több különbözõ levelezõ szerver is - megtalálható, amelyek közül az + megtalálható, amelyek közül a mail/exim, mail/postfix, mail/qmail és a root felhasználó jelszavát kérné, akkor az arra utal, - hogy a konzol az /etc/ttys - állomány szerint insecure - (nem biztonságos) típusú. Ebben az + hogy a konzol (/dev/console) az + /etc/ttys állomány + szerint insecure (nem + biztonságos) típusú. Ebben az esetben szereznünk kell egy &os; telepítõlemezt, elindítanunk róla a rendszert, majd a &man.sysinstall.8; programban a Fixit menüponton keresztül indított parancsértelmezõben kiadni az elõbb - említet parancsokat. + említett parancsokat. @@ -8620,7 +8621,7 @@ - Hogyan lehet futó programok név szerint + Hogyan lehet futó programokat név szerint leállítani? @@ -8877,10 +8878,10 @@ újraindítani, mert csak úgy tudjuk újratelepíteni a rendszermagot. Másik lehetõségünk, ha - átállítjuk a biztonsági szinte + átállítjuk a biztonsági szintet az /etc/rc.conf állományban és úgy - indítjuk újra a rendszerünket. A + indítjuk újra a rendszerünket. Az &man.init.8; man oldalán olvashatunk bõvebben a biztonsági szintek (securelevel) beállításáról, az @@ -8924,7 +8925,7 @@ rendszert egyfelhasználós módban kell indítanunk, vagy az /etc/rc.conf állományban csökkentenünk kell a - biztonsági szintet. A &man.init.8; man oldalon + biztonsági szintet. Az &man.init.8; man oldalon olvashatunk részletesebben a biztonsági szintek mûködésérõl, illetve az /etc/defaults/rc.conf @@ -8991,7 +8992,7 @@ kapcsolatban részletesebb információkat a a biztonsági szintekrõl szóló - kérdésbõl vagy a &man.init.8; man + kérdésbõl vagy az &man.init.8; man oldalról tudhatunk meg. @@ -9031,19 +9032,21 @@ - Ha ideiglenes akarjuk csak javítani, akkor az - /usr/bin/ssh állomány - engedélyeit root + Ha ideiglenesen akarjuk csak javítani, akkor + az /usr/bin/ssh + állomány engedélyeit + root felhasználóként állítsuk a 4555 értékre a chmod 4555 /usr/bin/ssh parancs kiadásával. Ezután vegyük fel az - ENABLE_SUID_SSH= true sort az + ENABLE_SUID_SSH= + true sort az /etc/make.conf állományt, így ez a - változtatás a - make world + változtatás a make + world következõ futtatásakor is megmarad. @@ -9134,7 +9137,7 @@ lemezre (valamilyen VM alrendszerbeli szinkronizáció során), amikor inaktív állapotban vannak, de akár az - aktív lapok is szinkronizálhatóak Ez + aktív lapok is szinkronizálhatóak. Ez attól függ, hogy a processzor képes-e nyomkövetni a lapok módosítását, és @@ -9212,8 +9215,8 @@ A /var/empty - könyvtárat a &man.sshd.8; program használja - a privilégiumok + könyvtárat az &man.sshd.8; program + használja a privilégiumok elkülönítéséhez. A /var/empty könyvtárnak üresnek kell lennie, legyen a @@ -9221,7 +9224,7 @@ legyen rajta a schg állományjelzõ. - Noha nem semmiképpen sem javasoljuk a + Noha semmiképpen sem javasoljuk a könyvtár törlését, úgy tudjuk elvégezni, ha elõször az schg állományjelzõt @@ -9413,7 +9416,7 @@ terjesztés) menüpontokat. Az &xorg; sikeres telepítése után - kövessük a &man.xorgconfig.1; segédprogram + kövessük az &man.xorgconfig.1; segédprogram utasításait. Innen megtudhatjuk, hogy miként kell beállítani az &xorg; szerverét a különbözõ grafikus @@ -9449,7 +9452,7 @@ Ilyenkor az X-et nem tudjuk elindítani, mivel a mûködéséhez szüksége van a &man.io.4; eszköz írására. - Ezzel kapcsolatban a &man.init.8; man oldal ad + Ezzel kapcsolatban az &man.init.8; man oldal ad részletesebb útmutatást. A kérdés tehát az, hogy mit kellene @@ -9644,7 +9647,7 @@ action="simul">AltF1 billentyûkombinációt. - Az frissen telepített &os; rendszerekben + A frissen telepített &os; rendszerekben alapértelmezés szerint nyolc virtuális konzol engedélyezett. Az AltF1, @@ -9680,14 +9683,14 @@ 8 MB memóriánál kevesebbel rendelkezünk. Emellett még érdemes a secure értéket is az - inscure értékre + insecure értékre átállítani. Ha X szervert is akarunk futtatni, akkor legalább egy virtuális konzolt szabadon (vagy kikapcsolva) kell hagynunk a - számára. Így tehát ha mind + számára. Így tehát, ha mind a tizenkét funkcióbillentyûre szeretnénk elindítani egy-egy virtuális konzolt, nos, akkor nincs @@ -9735,7 +9738,7 @@ &prompt.root; kill -HUP 1 Fontos, hogy a parancs végrehajtás - elõtt teljes leállítsuk az X szerver, + elõtt teljesen leállítsuk az X szervert, amennyiben az fut. Ha nem tesszük meg, akkor könnyen elõfordulhat, hogy a kill parancs hatására @@ -9808,7 +9811,7 @@ /etc/ttys állományból (lásd &man.ttys.5;) tudjuk megadni a megadott példa alapján, a - másikban pdig egyszerûen az + másikban pedig egyszerûen az rc.local állományból (lásd &man.rc.8;) vagy a A &man.ttys.5; módszernek van egy olyan elõnye, hogy pontosan megadja, melyik virtuális - terminálon fog futni az X és az X szerver + terminálon fog futni az X és a szerver elindítását az &man.init.8; programra bízza. Az &man.rc.8; használata esetén viszont könnyû leállítani az @@ -10031,7 +10034,7 @@ - Miért mûködnek a MouseSystems + Miért nem mûködnek a MouseSystems által gyártott PS/2-es egerek? @@ -10176,7 +10179,7 @@ 115 — - Windows billentyû, bal oldali + Windows billentyû, a bal oldali Ctrl és Alt billentyûk között @@ -10396,7 +10399,7 @@ másikon pedig a &windows; valamelyik változata fut. A &os; rendszer fog az internethez csatlakozni, és ezen keresztül szeretnénk a - &windows;os géprõl is elérni azt. Ez + windowsos géprõl is elérni azt. Ez tulajdonképpen az elõzõ kérdés egy speciális esete, és remekül megoldható. @@ -10411,7 +10414,7 @@ a gateway_enable beállítást a YES értékre állítjuk. Ezután - állítsuk be a &windows;os gépünket + állítsuk be a windowsos gépünket ennek megfelelõen és minden mûködni fog. A további részletekrõl a &man.ppp.8; man oldalán vagy a Amennyiben az álnév ugyanazon az - álhálózaton található, mint - a hozzátartozó interfész, akkor + alhálózaton található, mint a + hozzátartozó interfész, akkor egyszerûen csak adjuk meg a netmask 0xffffffff paramétert az &man.ifconfig.8; parancs meghívásakor, például @@ -10912,7 +10915,7 @@ foglalkozó GYIK-ban, a &man.natd.8; man oldalán vagy a Portgyûjtemény - valamelyik port-átirányítással + valamelyik port átirányítással foglalkozó portjának dokumentációjában találhatunk. @@ -11064,7 +11067,7 @@ jellegû üzeneteket a naplókban, viszont még továbbra is szükségünk lenne a válaszküldés - korlátozására, az + korlátozására, a net.inet.icmp.icmplim_output sysctl változó segítségével így tudjuk ezt megtenni: @@ -11176,13 +11179,14 @@ - Mi az a járóka? + Mi az a járóka + (sandbox)? - A járóka (sandbox) - alapvetõen egy biztonsági szakkifejezés. - Két dolgot jelenthet: + A járóka alapvetõen egy + biztonsági szakkifejezés. Két dolgot + jelenthet: @@ -11387,7 +11391,7 @@ A biztonsági szintekkel és rájuk vonatkozó információkkal kapcsolatban - olvassuk el a &man.init.8; man oldalt. + olvassuk el az &man.init.8; man oldalt. A biztonsági szintek nem @@ -11541,11 +11545,12 @@ tartalmazza) nem csatlakoztatható valamilyen oknál fogva, akkor a root nem lenne képes bejelentkezni és kijavítani - a problémát. (Noha újraindítjuk - a rendszerünket egyfelhasználós - módban, akkor a rendszer rá fog - kérdezni, hogy melyik parancsértelmezõt - akarjuk használni.) + a problémát. (Noha amikor + újraindítjuk a rendszerünket + egyfelhasználós módban, akkor a + rendszer rá fog kérdezni, hogy melyik + parancsértelmezõt akarjuk + használni.) Egyesek nem szabványos parancsértelmezõn keresztül a @@ -11737,8 +11742,8 @@ átjáró címét. Ha az interaktív módot használjuk, akkor ehhez a következõket kell begépelni - csomag módba lépés - után (a csomag módot a csupa nagybetûs + csomag módba lépés után (a + csomag módot a csupa nagybetûs PPP jelzi a parancssorban): delete ALL @@ -11923,7 +11928,7 @@ internetszolgáltató egyszerûen nem hajlandó segítséget nyújtani abban az esetben, ha nem valamelyik µsoft; - operációs rendszert használjuk. Az + operációs rendszert használjuk. A ppp.conf állományunkban a enable lqr sor megadásával engedélyezni tudjuk a &man.ppp.8; @@ -12035,7 +12040,7 @@ kapcsolatvezérlõ protokoll (Line Control Protocol, LCP) használatát. Sok szolgáltató azonban nem csinál ilyet, - helyett inkább a klienstõl várják + ehelyett inkább a klienstõl várják mindezt. Az LCP kezdeményezését így kényszeríthetjük ki a &man.ppp.8; használata során: @@ -12411,7 +12416,7 @@ - Mit jelentenek ezek a CCP hibák? + Mit jelentenek a CCP hibák? @@ -12569,7 +12574,7 @@ fejezet elejét), akkor a következõt tehetjük: - &prompt.root; cd /usr/src/usr.sbin/ppp + &prompt.root; cd /usr/src/usr.sbin/ppp &prompt.root; echo STRIP= >> /etc/make.conf &prompt.root; echo CFLAGS+= >> /etc/make.conf &prompt.root; make install clean @@ -13088,8 +13093,7 @@ beállítást a Tcpip\Parameters\Interfaces\a hálózati kártya - azonosítója - adapter\MTU helyen kell keresni + azonosítója\MTU helyen kell keresni és típusa duplaszó (DWORD). A &windows; MTU beállításaival @@ -13143,8 +13147,9 @@ - Ezek közül egyik sem segített — - segítség! Mit lehetne még tenni? + Ezek közül egyik sem használt — + segítség! Mit lehetne még + tenni? @@ -13653,7 +13658,7 @@ olvasható Inact, Cache és Buf értékek a lényegében - különbözõ öregési szintek + különbözõ öregedési szintek szerint kategorizált tárazott adatok. A tárazás lényegében arra utal, hogy a rendszernek így nem a lassú @@ -13706,12 +13711,12 @@ Óvatosan bánjunk a könyvtárakkal vagy a könyvtárakra mutató szimbolikus - linkkek a &man.chmod.1; használata során. - Ha egy szimbolikus link által hivatkozott - könyvtár engedélyeit akarjuk - megváltoztatni, akkor a &man.chmod.1; parancsnak - ne adjunk meg semmilyen paramétert és a - nevet zárjuk perjellel (/). Például, ha az ize a mize @@ -14185,8 +14190,8 @@ Kérdés: Mérte már valaki, - hogy a &os; futása közben milyen melengeti meg a - számítógépet? Úgy + hogy a &os; futása közben mennyire melengeti meg + a számítógépet? Úgy hírlik, a &linux; ebben a tekintetben sokkal jobb, mint a DOS, de &os;-rõl még nem ismert ezzel kapcsolatban semmi. Mondjuk, elég tüzesnek @@ -14694,10 +14699,10 @@ - Miért nem forgó - névfeloldással lehet elérni a - CVSup szervereket és - így megosztani köztük a + Miért nem forgó (round + robin) névfeloldással lehet + elérni a CVSup szervereket + és így megosztani köztük a terhelést? @@ -14732,7 +14737,7 @@ - Igen, ezt aIgen, ezt a CTM használatával anélkül is megtudjuk tenni, @@ -14754,7 +14759,7 @@ tetszõleges méretûre fel tudunk darabolni állományokat. - Íme erre egy példa az + Íme erre egy példa a /usr/src/release/Makefile állományból: @@ -15012,7 +15017,7 @@ Általában így néz ki a rendszermag összeomlása: - > Fatal trap 12: page fault while in kernel mode + Fatal trap 12: page fault while in kernel mode fault virtual address = 0x40 fault code = supervisor read, page not present instruction pointer = 0x8:0xf014a7e5 @@ -15231,7 +15236,7 @@ Elõfordulhat, hogy ilyenkor több oldalnyi információ özönlik hirtelen a - képernyõre, ezért javsaolt ezeket + képernyõre, ezért javasolt ezeket lementeni a &man.script.1; programmal. A nyomkövetési szimbólumokat is tartalmazó rendszermag esetén még From owner-p4-projects@FreeBSD.ORG Sat Aug 16 21:14:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E9B51065673; Sat, 16 Aug 2008 21:14:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12CE01065672 for ; Sat, 16 Aug 2008 21:14:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3C5B8FC15 for ; Sat, 16 Aug 2008 21:14:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GLEOJo083645 for ; Sat, 16 Aug 2008 21:14:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GLEOGa083643 for perforce@freebsd.org; Sat, 16 Aug 2008 21:14:24 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 16 Aug 2008 21:14:24 GMT Message-Id: <200808162114.m7GLEOGa083643@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 21:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147598 Change 147598 by pgj@disznohal on 2008/08/16 21:14:15 I am going to commit the translated FAQ in a few days. MFP4 after: 3 days Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#5 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/Makefile#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/Makefile#5 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/faq/Makefile,v 1.12 2004/07/06 15:09:52 hrs Exp $ +# $FreeBSD$ # %SOURCE% en_US.ISO8859-1/books/faq/Makefile # %SRCID% 1.12 # ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#18 (text+ko) ==== ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/bibliography.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -1866,7 +1866,7 @@ BIOS-ok késõbbi változataiban ismét felbukkant ez a típusú hiba. - Ebben az üzenetben Jacques Vidrine a &a.mobile; + Ebben az üzenetben &a.nectar; a &a.mobile; tagjainak egy olyan módszert mutat be, ami segíthet, ha az újabb típusú IBM laptopunk nem tudja elindítani a &os;-t, és From owner-p4-projects@FreeBSD.ORG Sat Aug 16 21:49:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 612131065692; Sat, 16 Aug 2008 21:49:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C1B2106567B for ; Sat, 16 Aug 2008 21:49:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA4B28FC26 for ; Sat, 16 Aug 2008 21:49:00 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GLn0ta086627 for ; Sat, 16 Aug 2008 21:49:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GLn0Sb086623 for perforce@freebsd.org; Sat, 16 Aug 2008 21:49:00 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 21:49:00 GMT Message-Id: <200808162149.m7GLn0Sb086623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 21:49:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=147605 Change 147605 by julian@julian_trafmon1 on 2008/08/16 21:48:17 remove a bunch of whitespace diffs Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#8 edit .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#10 edit .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#7 edit .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#4 edit .. //depot/projects/vimage/src/sys/compat/svr4/svr4_stat.c#5 edit .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#13 edit .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#6 edit .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#6 edit .. //depot/projects/vimage/src/sys/i386/conf/NOTES#21 edit .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#10 edit .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#10 edit .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_socksys.c#5 edit .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#7 edit .. //depot/projects/vimage/src/sys/kern/kern_poll.c#9 edit .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#7 edit .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#14 edit .. //depot/projects/vimage/src/sys/kern/vfs_export.c#12 edit .. //depot/projects/vimage/src/sys/net/bridgestp.c#11 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#9 edit .. //depot/projects/vimage/src/sys/net/if_mib.c#5 edit .. //depot/projects/vimage/src/sys/net/raw_cb.c#7 edit .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#6 edit .. //depot/projects/vimage/src/sys/net/rtsock.c#14 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#18 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#6 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#13 edit .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#4 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#32 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#11 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#13 edit .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#5 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#8 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#16 edit .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#5 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#15 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#15 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#14 edit .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#26 edit .. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#6 edit .. //depot/projects/vimage/src/sys/rpc/svc_dg.c#4 edit .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#7 edit .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#7 edit Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#8 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#10 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_stat.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/dev/firewire/firewire.c#13 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#6 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/i386/conf/NOTES#21 (text+ko) ==== @@ -248,7 +248,6 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. -# options DEVICE_POLLING ==== //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#10 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#10 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_socksys.c#5 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#9 (text+ko) ==== @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/kern/kern_uuid.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/kern/uipc_domain.c#14 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 */ - #include __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.52 2008/03/16 10:58:05 rwatson Exp $"); ==== //depot/projects/vimage/src/sys/kern/vfs_export.c#12 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/net/bridgestp.c#11 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ - #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage/src/sys/net/if_clone.c#9 (text+ko) ==== @@ -30,7 +30,6 @@ * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/net/if_mib.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/net/raw_cb.c#7 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/net/rtsock.c#14 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $ */ - #include "opt_sctp.h" #include "opt_mpath.h" ==== //depot/projects/vimage/src/sys/net80211/ieee80211.c#18 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" - #include #include #include ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#6 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_wlan.h" #ifdef DDB - /* * IEEE 802.11 DDB support */ ==== //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#13 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.20 2008/08/02 18:00:33 sam Exp $"); - /* * IEEE 802.11 support (FreeBSD-specific code) */ ==== //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ * Netgraph module to connect NATM interfaces to netgraph. */ - #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#32 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#11 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#13 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage/src/sys/netgraph/ng_gif.c#5 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#8 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#16 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_offload.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/tcp_offload.c,v 1.4 2008/07/21 21:22:56 kmacy Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/frag6.c#15 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#20 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#15 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/scope6.c#14 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#26 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.46 2008/07/09 16:45:30 rrs Exp $"); - #include #include #include ==== //depot/projects/vimage/src/sys/rpc/authunix_prot.c#6 (text+ko) ==== @@ -43,8 +43,6 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ - - #include #include #include ==== //depot/projects/vimage/src/sys/rpc/svc_dg.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ * svc_dg.c, Server side for connectionless RPC. */ - #include #include #include ==== //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.9 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.2 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 21:53:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4DBD106564A; Sat, 16 Aug 2008 21:53:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 635FF1065676 for ; Sat, 16 Aug 2008 21:53:05 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D7DA8FC17 for ; Sat, 16 Aug 2008 21:53:05 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GLr5sE087000 for ; Sat, 16 Aug 2008 21:53:05 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GLr5Gt086998 for perforce@freebsd.org; Sat, 16 Aug 2008 21:53:05 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 21:53:05 GMT Message-Id: <200808162153.m7GLr5Gt086998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 21:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=147607 Change 147607 by julian@julian_trafmon1 on 2008/08/16 21:52:18 Merge in witespace diff reduction from "vimage" branch Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#6 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#7 integrate .. //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate .. //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#6 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#5 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/bridgestp.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/if_clone.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net/if_mib.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_cb.c#6 integrate .. //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#6 integrate .. //depot/projects/vimage-devel/src/sys/net/rtsock.c#5 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#5 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#7 integrate .. //depot/projects/vimage-devel/src/sys/rpc/svc_dg.c#4 integrate .. //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#6 integrate .. //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#6 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/amd64/amd64/minidump_machdep.c#8 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/arm/arm/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_sockio.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); ==== //depot/projects/vimage-devel/src/sys/compat/svr4/svr4_stat.c#6 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/dev/syscons/daemon/daemon_saver.c#6 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/dev/syscons/daemon/daemon_saver.c,v 1.25 2008/07/05 13:10:10 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/fs/cd9660/cd9660_rrip.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/conf/NOTES#8 (text+ko) ==== @@ -248,7 +248,6 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. -# options DEVICE_POLLING ==== //depot/projects/vimage-devel/src/sys/i386/i386/dump_machdep.c#7 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/i386/minidump_machdep.c#7 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-devel/src/sys/i386/ibcs2/ibcs2_socksys.c#6 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/ia64/ia64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/kern/kern_poll.c#5 (text+ko) ==== @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/kern/kern_poll.c,v 1.33 2008/07/04 00:21:38 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/kern/kern_uuid.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 */ - #include __FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.52 2008/03/16 10:58:05 rwatson Exp $"); ==== //depot/projects/vimage-devel/src/sys/kern/vfs_export.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net/bridgestp.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ - #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-devel/src/sys/net/if_clone.c#5 (text+ko) ==== @@ -30,7 +30,6 @@ * $FreeBSD: src/sys/net/if_clone.c,v 1.11 2006/07/09 06:04:00 sam Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net/if_mib.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net/rtsock.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $ */ - #include "opt_sctp.h" #include "opt_mpath.h" ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" - #include #include #include ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_ddb.c#4 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_wlan.h" #ifdef DDB - /* * IEEE 802.11 DDB support */ ==== //depot/projects/vimage-devel/src/sys/net80211/ieee80211_freebsd.c#7 (text+ko) ==== @@ -26,7 +26,6 @@ #include __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.20 2008/08/02 18:00:33 sam Exp $"); - /* * IEEE 802.11 support (FreeBSD-specific code) */ ==== //depot/projects/vimage-devel/src/sys/netgraph/atm/ng_atm.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ * Netgraph module to connect NATM interfaces to netgraph. */ - #include __FBSDID("$FreeBSD: src/sys/netgraph/atm/ng_atm.c,v 1.15 2005/08/10 06:25:40 obrien Exp $"); ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_base.c#9 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_eiface.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_ether.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netgraph/ng_gif.c#4 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet/in_mcast.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet/tcp_offload.c#6 (text+ko) ==== @@ -28,7 +28,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/tcp_offload.c,v 1.4 2008/07/21 21:22:56 kmacy Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet6/frag6.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_ifattach.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet6/in6_rmx.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet6/scope6.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/netinet6/sctp6_usrreq.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.46 2008/07/09 16:45:30 rrs Exp $"); - #include #include #include ==== //depot/projects/vimage-devel/src/sys/rpc/authunix_prot.c#7 (text+ko) ==== @@ -43,8 +43,6 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ - - #include #include #include ==== //depot/projects/vimage-devel/src/sys/rpc/svc_dg.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ * svc_dg.c, Server side for connectionless RPC. */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/sparc64/sparc64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.9 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-devel/src/sys/sun4v/sun4v/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.2 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:06:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2849106567B; Sat, 16 Aug 2008 22:06:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3971065678 for ; Sat, 16 Aug 2008 22:06:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 373858FC0C for ; Sat, 16 Aug 2008 22:06:19 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GM6JRi089328 for ; Sat, 16 Aug 2008 22:06:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GM6IWM089326 for perforce@freebsd.org; Sat, 16 Aug 2008 22:06:18 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 22:06:18 GMT Message-Id: <200808162206.m7GM6IWM089326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:06:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=147610 Change 147610 by julian@julian_trafmon1 on 2008/08/16 22:05:59 bring in the xen stuff. Affected files ... .. //depot/projects/vimage-devel/src/sys/amd64/conf/GENERIC_NODEBUG#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/VIMAGE#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/VIMAGE_NODEBUG#2 integrate .. //depot/projects/vimage-devel/src/sys/amd64/conf/VLINT#2 integrate .. //depot/projects/vimage-devel/src/sys/conf/files#9 integrate .. //depot/projects/vimage-devel/src/sys/conf/files.i386#5 integrate .. //depot/projects/vimage-devel/src/sys/conf/options.i386#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/.cvsignore#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/GENERIC_NODEBUG#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/MAC#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/Makefile#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE_NODEBUG#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/VLINT#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/conf/XEN#1 branch .. //depot/projects/vimage-devel/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/trap.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage-devel/src/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/init_main.c#4 integrate .. //depot/projects/vimage-devel/src/sys/netinet/udp_usrreq.c#9 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/vimage-devel/src/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/vimage-devel/src/sys/xen/features.c#1 branch Differences ... ==== //depot/projects/vimage-devel/src/sys/amd64/conf/GENERIC_NODEBUG#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/amd64/conf/VIMAGE#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/amd64/conf/VIMAGE_NODEBUG#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/amd64/conf/VLINT#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1329 2008/08/14 21:26:29 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1330 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1726,6 +1726,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2342,3 +2343,18 @@ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" + +xen/gnttab.c optional xen +xen/features.c optional xen +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen +xen/xenbus/xenbus_client.c optional xen +xen/xenbus/xenbus_comms.c optional xen +xen/xenbus/xenbus_dev.c optional xen +xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen +dev/xen/netfront/netfront.c optional xen ==== //depot/projects/vimage-devel/src/sys/conf/files.i386#5 (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.602 2008/08/09 14:52:31 philip Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -254,8 +254,8 @@ i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bios.c optional native +i386/i386/bioscall.s optional native i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/busdma_machdep.c standard i386/i386/db_disasm.c optional ddb @@ -264,7 +264,8 @@ i386/i386/dump_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.s optional native +i386/xen/exception.s optional xen i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem @@ -277,9 +278,11 @@ i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic -i386/i386/locore.s standard no-obj +i386/i386/locore.s optional native no-obj +i386/xen/locore.s optional xen no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard +i386/xen/xen_machdep.c optional xen i386/i386/mem.c optional mem i386/i386/minidump_machdep.c standard i386/i386/mp_clock.c optional smp @@ -291,7 +294,8 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c optional native +i386/xen/pmap.c optional xen i386/i386/ptrace_machdep.c standard i386/i386/stack_machdep.c optional ddb | stack i386/i386/support.s standard @@ -321,9 +325,10 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard -i386/isa/clock.c standard +i386/isa/clock.c optional native +i386/xen/clock.c optional xen i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -346,13 +351,13 @@ i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_pir.c optional pci +i386/pci/pci_pir.c optional pci i386/svr4/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -isa/atrtc.c standard +isa/atrtc.c optional atpic isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout ==== //depot/projects/vimage-devel/src/sys/conf/options.i386#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.242 2008/06/14 12:51:44 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.243 2008/08/15 20:58:57 kmacy Exp $ # Options specific to the i386 platform kernels AUTO_EOI_1 opt_auto_eoi.h @@ -111,3 +111,6 @@ # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +NATIVE opt_global.h +XEN opt_global.h ==== //depot/projects/vimage-devel/src/sys/dev/pci/pci_pci.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.51 2008/07/23 09:44:36 luoqi Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.52 2008/08/16 20:18:40 imp Exp $"); /* * PCI:PCI bridge support. @@ -139,6 +139,8 @@ { struct pcib_softc *sc; uint8_t iolow; + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; sc = device_get_softc(dev); sc->dev = dev; @@ -148,6 +150,7 @@ */ sc->command = pci_read_config(dev, PCIR_COMMAND, 1); sc->domain = pci_get_domain(dev); + sc->pribus = pci_read_config(dev, PCIR_PRIBUS_1, 1); sc->secbus = pci_read_config(dev, PCIR_SECBUS_1, 1); sc->subbus = pci_read_config(dev, PCIR_SUBBUS_1, 1); sc->secstat = pci_read_config(dev, PCIR_SECSTAT_1, 2); @@ -155,6 +158,20 @@ sc->seclat = pci_read_config(dev, PCIR_SECLAT_1, 1); /* + * Setup sysctl reporting nodes + */ + sctx = device_get_sysctl_ctx(dev); + soid = device_get_sysctl_tree(dev); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain", + CTLFLAG_RD, &sc->domain, 0, "Domain number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus", + CTLFLAG_RD, &sc->pribus, 0, "Primary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus", + CTLFLAG_RD, &sc->secbus, 0, "Secondary bus number"); + SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "subbus", + CTLFLAG_RD, &sc->subbus, 0, "Subordinate bus number"); + + /* * Determine current I/O decode. */ if (sc->command & PCIM_CMD_PORTEN) { ==== //depot/projects/vimage-devel/src/sys/dev/pci/pcib_private.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.14 2008/08/16 20:18:40 imp Exp $ */ #ifndef __PCIB_PRIVATE_H__ @@ -48,9 +48,10 @@ #define PCIB_SUBTRACTIVE 0x1 #define PCIB_DISABLE_MSI 0x2 uint16_t command; /* command register */ - uint32_t domain; /* domain number */ - uint8_t secbus; /* secondary bus number */ - uint8_t subbus; /* subordinate bus number */ + u_int domain; /* domain number */ + u_int pribus; /* primary bus number */ + u_int secbus; /* secondary bus number */ + u_int subbus; /* subordinate bus number */ pci_addr_t pmembase; /* base address of prefetchable memory */ pci_addr_t pmemlimit; /* topmost address of prefetchable memory */ pci_addr_t membase; /* base address of memory window */ ==== //depot/projects/vimage-devel/src/sys/i386/conf/.cvsignore#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/DEFAULTS#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.13 2008/03/12 10:11:57 jeff Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.14 2008/08/15 20:58:57 kmacy Exp $ machine i386 @@ -22,3 +22,7 @@ # Default partitioning schemes options GEOM_BSD options GEOM_MBR + +# enable support for native hardware +options NATIVE +device atpic ==== //depot/projects/vimage-devel/src/sys/i386/conf/GENERIC_NODEBUG#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/MAC#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/Makefile#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/VIMAGE_NODEBUG#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/conf/VLINT#2 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/i386/i386/busdma_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.93 2008/07/15 03:34:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.94 2008/08/15 20:51:31 kmacy Exp $"); #include #include @@ -144,6 +144,11 @@ int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, int flags); +#ifdef XEN +#undef pmap_kextract +#define pmap_kextract pmap_kextract_ma +#endif + /* * Return true if a match is made. * ==== //depot/projects/vimage-devel/src/sys/i386/i386/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.162 2008/05/16 13:23:47 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.163 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -228,3 +228,9 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/vimage-devel/src/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.670 2008/04/25 05:18:48 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.671 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -141,6 +141,25 @@ uint32_t arch_i386_xbox_memsize = 0; #endif +#ifdef XEN +/* XEN includes */ +#include +#include +#include +#include +#include +#include + +void Xhypervisor_callback(void); +void failsafe_callback(void); + +extern trap_info_t trap_table[]; +struct proc_ldt default_proc_ldt; +extern int init_first; +int running_xen = 1; +extern unsigned long physfree; +#endif /* XEN */ + /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -287,8 +306,9 @@ */ bufinit(); vm_pager_bufferinit(); - +#ifndef XEN cpu_setregs(); +#endif } /* @@ -1118,6 +1138,24 @@ return (0); } + +void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ + +#ifdef XEN + +void +cpu_halt(void) +{ + HYPERVISOR_shutdown(SHUTDOWN_poweroff); +} + +static void +cpu_idle_hlt(int busy) +{ + idle_block(); +} + +#else /* * Shutdown the CPU as much as possible */ @@ -1128,8 +1166,6 @@ __asm__ ("hlt"); } -void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ - static void cpu_idle_hlt(int busy) { @@ -1143,6 +1179,7 @@ else __asm __volatile("sti; hlt"); } +#endif static void cpu_idle_acpi(int busy) @@ -1437,10 +1474,16 @@ */ int _default_ldt; + +#ifdef XEN +union descriptor *gdt; +union descriptor *ldt; +#else union descriptor gdt[NGDT * MAXCPU]; /* global descriptor table */ +union descriptor ldt[NLDT]; /* local descriptor table */ +#endif static struct gate_descriptor idt0[NIDT]; struct gate_descriptor *idt = &idt0[0]; /* interrupt descriptor table */ -union descriptor ldt[NLDT]; /* local descriptor table */ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ @@ -1542,6 +1585,7 @@ 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +#ifndef XEN /* GPROC0_SEL 9 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ @@ -1633,6 +1677,7 @@ 0, 0, 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +#endif /* !XEN */ }; static struct soft_segment_descriptor ldt_segs[] = { @@ -1870,7 +1915,16 @@ goto physmap_done; } #endif - +#if defined(XEN) + has_smap = 0; + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; + goto physmap_done; +#endif hasbrokenint12 = 0; TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); @@ -2032,7 +2086,7 @@ vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#else +#elif !defined(XEN) /* * Prefer the RTC value for extended memory. */ @@ -2123,6 +2177,7 @@ getenv_quad("dcons.size", &dcons_size) == 0) dcons_addr = 0; +#ifndef XEN /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. @@ -2240,7 +2295,11 @@ } *pte = 0; invltlb(); - +#else + phys_avail[0] = physfree; + phys_avail[1] = xen_start_info->nr_pages*PAGE_SIZE; +#endif + /* * XXX * The last chunk must contain at least one page plus the message @@ -2265,6 +2324,246 @@ off); } +#ifdef XEN +#define MTOPSIZE (1<<(14 + PAGE_SHIFT)) + +void +init386(first) + int first; +{ + struct gate_descriptor *gdp; + unsigned long gdtmachpfn; + int error, gsel_tss, metadata_missing, x; + struct pcpu *pc; + struct callback_register event = { + .type = CALLBACKTYPE_event, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)Xhypervisor_callback }, + }; + struct callback_register failsafe = { + .type = CALLBACKTYPE_failsafe, + .address = {GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback }, + }; + + thread0.td_kstack = proc0kstack; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + + /* + * This may be done better later if it gets more high level + * components in it. If so just link td->td_proc here. + */ + proc_linkup0(&proc0, &thread0); + + metadata_missing = 0; + if (xen_start_info->mod_start) { + preload_metadata = (caddr_t)xen_start_info->mod_start; + preload_bootstrap_relocate(KERNBASE); + } else { + metadata_missing = 1; + } + if (envmode == 1) + kern_envp = static_env; + else if (bootinfo.bi_envp) + kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE; + + /* Init basic tunables, hz etc */ + init_param1(); + + /* + * XEN occupies a portion of the upper virtual address space + * At its base it manages an array mapping machine page frames + * to physical page frames - hence we need to be able to + * access 4GB - (64MB - 4MB + 64k) + */ + gdt_segs[GPRIV_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUFS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUGS_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUCODE_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GUDATA_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GBIOSLOWMEM_SEL].ssd_limit = atop(HYPERVISOR_VIRT_START + MTOPSIZE); + gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GDATA_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUCODE_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUDATA_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1); + gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1); + + pc = &__pcpu[0]; + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; + + PT_SET_MA(gdt, xpmap_ptom(VTOP(gdt)) | PG_V | PG_RW); + bzero(gdt, PAGE_SIZE); + for (x = 0; x < NGDT; x++) + ssdtosd(&gdt_segs[x], &gdt[x].sd); + + mtx_init(&dt_lock, "descriptor tables", NULL, MTX_SPIN); + + gdtmachpfn = vtomach(gdt) >> PAGE_SHIFT; + PT_SET_MA(gdt, *vtopte((unsigned long)gdt) & ~(PG_RW|PG_M|PG_A)); + PANIC_IF(HYPERVISOR_set_gdt(&gdtmachpfn, 512) != 0); + lgdt(&r_gdt); + gdtset = 1; + + if ((error = HYPERVISOR_set_trap_table(trap_table)) != 0) { + panic("set_trap_table failed - error %d\n", error); + } + + error = HYPERVISOR_callback_op(CALLBACKOP_register, &event); + if (error == 0) + error = HYPERVISOR_callback_op(CALLBACKOP_register, &failsafe); +#if CONFIG_XEN_COMPAT <= 0x030002 + if (error == -ENOXENSYS) + HYPERVISOR_set_callbacks(GSEL(GCODE_SEL, SEL_KPL), + (unsigned long)Xhypervisor_callback, + GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback); +#endif + pcpu_init(pc, 0, sizeof(struct pcpu)); + PCPU_SET(prvspace, pc); + PCPU_SET(curthread, &thread0); + PCPU_SET(curpcb, thread0.td_pcb); + + /* + * Initialize mutexes. + * + * icu_lock: in order to allow an interrupt to occur in a critical + * section, to set pcpu->ipending (etc...) properly, we + * must be able to get the icu lock, so it can't be + * under witness. + */ + mutex_init(); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS | MTX_NOPROFILE); + + /* make ldt memory segments */ + ldt_segs[LUCODE_SEL].ssd_limit = atop(0 - 1); + ldt_segs[LUDATA_SEL].ssd_limit = atop(0 - 1); + for (x = 0; x < sizeof ldt_segs / sizeof ldt_segs[0]; x++) + ssdtosd(&ldt_segs[x], &ldt[x].sd); + + default_proc_ldt.ldt_base = (caddr_t)ldt; + default_proc_ldt.ldt_len = 6; + _default_ldt = (int)&default_proc_ldt; + PCPU_SET(currentldt, _default_ldt) + PT_SET_MA(ldt, *vtopte((unsigned long)ldt) & ~PG_RW); + xen_set_ldt((unsigned long) ldt, (sizeof ldt_segs / sizeof ldt_segs[0])); + +#if defined(XEN_PRIVILEGED) + /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); +#endif + + /* + * Initialize the console before we print anything out. + */ + cninit(); + + if (metadata_missing) + printf("WARNING: loader(8) metadata is missing!\n"); + +#ifdef DEV_ISA + elcr_probe(); + atpic_startup(); +#endif + +#ifdef DDB + ksym_start = bootinfo.bi_symtab; + ksym_end = bootinfo.bi_esymtab; +#endif + + kdb_init(); + +#ifdef KDB + if (boothowto & RB_KDB) + kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); +#endif + + finishidentcpu(); /* Final stage of CPU initialization */ + setidt(IDT_UD, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + setidt(IDT_GP, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, + GSEL(GCODE_SEL, SEL_KPL)); + initializecpu(); /* Initialize CPU registers */ + + /* make an initial tss so cpu can get interrupt stack on syscall! */ + /* Note: -16 is so we can grow the trapframe if we came from vm86 */ + PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16); + PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); + gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); + PCPU_SET(tss_gdt, &gdt[GPROC0_SEL].sd); + PCPU_SET(common_tssd, *PCPU_GET(tss_gdt)); + PCPU_SET(common_tss.tss_ioopt, (sizeof (struct i386tss)) << 16); + ltr(gsel_tss); + + /* pointer to selector slot for %fs/%gs */ + PCPU_SET(fsgs_gdt, &gdt[GUFS_SEL].sd); + + dblfault_tss.tss_esp = dblfault_tss.tss_esp0 = dblfault_tss.tss_esp1 = + dblfault_tss.tss_esp2 = (int)&dblfault_stack[sizeof(dblfault_stack)]; + dblfault_tss.tss_ss = dblfault_tss.tss_ss0 = dblfault_tss.tss_ss1 = + dblfault_tss.tss_ss2 = GSEL(GDATA_SEL, SEL_KPL); +#ifdef PAE + dblfault_tss.tss_cr3 = (int)IdlePDPT; +#else + dblfault_tss.tss_cr3 = (int)IdlePTD; +#endif + dblfault_tss.tss_eip = (int)dblfault_handler; + dblfault_tss.tss_eflags = PSL_KERNEL; + dblfault_tss.tss_ds = dblfault_tss.tss_es = + dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); + dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL); + dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); + dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); + + vm86_initialize(); + getmemsize(first); + init_param2(physmem); + + /* now running on new page tables, configured,and u/iom is accessible */ + + msgbufinit(msgbufp, MSGBUF_SIZE); + + /* make a call gate to reenter kernel with */ + gdp = &ldt[LSYS5CALLS_SEL].gd; + + x = (int) &IDTVEC(lcall_syscall); + gdp->gd_looffset = x; + gdp->gd_selector = GSEL(GCODE_SEL,SEL_KPL); + gdp->gd_stkcpy = 1; + gdp->gd_type = SDT_SYS386CGT; + gdp->gd_dpl = SEL_UPL; + gdp->gd_p = 1; + gdp->gd_hioffset = x >> 16; + + /* XXX does this work? */ + /* XXX yes! */ + ldt[LBSDICALLS_SEL] = ldt[LSYS5CALLS_SEL]; + ldt[LSOL26CALLS_SEL] = ldt[LSYS5CALLS_SEL]; + + /* transfer to user mode */ + + _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); + _udatasel = GSEL(GUDATA_SEL, SEL_UPL); + + /* setup proc 0's pcb */ + thread0.td_pcb->pcb_flags = 0; +#ifdef PAE + thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; +#else + thread0.td_pcb->pcb_cr3 = (int)IdlePTD; +#endif + thread0.td_pcb->pcb_ext = 0; + thread0.td_frame = &proc0_tf; + thread0.td_pcb->pcb_fsd = PCPU_GET(fsgs_gdt)[0]; + thread0.td_pcb->pcb_gsd = PCPU_GET(fsgs_gdt)[1]; +} + +#else void init386(first) int first; @@ -2527,6 +2826,7 @@ thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; } +#endif void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size) ==== //depot/projects/vimage-devel/src/sys/i386/i386/support.s#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/i386/i386/support.s,v 1.120 2008/08/08 16:26:53 stas Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.121 2008/08/15 20:51:31 kmacy Exp $ */ #include "opt_npx.h" @@ -1459,10 +1459,12 @@ */ /* void lgdt(struct region_descriptor *rdp); */ ENTRY(lgdt) +#ifndef XEN /* reload the descriptor table */ movl 4(%esp),%eax lgdt (%eax) - +#endif + /* flush the prefetch q */ jmp 1f nop ==== //depot/projects/vimage-devel/src/sys/i386/i386/sys_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.113 2008/03/12 10:11:57 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.114 2008/08/15 20:51:31 kmacy Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -58,6 +58,20 @@ #include +#ifdef XEN +#include + +void i386_reset_ldt(struct proc_ldt *pldt); + +void +i386_reset_ldt(struct proc_ldt *pldt) +{ + xen_set_ldt((vm_offset_t)pldt->ldt_base, pldt->ldt_len); +} +#else +#define i386_reset_ldt(x) +#endif + #include /* for kernel_map */ #define MAX_LD 8192 @@ -164,7 +178,12 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; +#ifdef XEN + /* need to do nosegneg like Linux */ + sd.sd_lolimit = (HYPERVISOR_VIRT_START >> 12) & 0xffff; +#else sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -174,7 +193,12 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_fsd = sd; +#ifdef XEN + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[0]), + *(uint64_t *)&sd); +#else PCPU_GET(fsgs_gdt)[0] = sd; +#endif critical_exit(); td->td_frame->tf_fs = GSEL(GUFS_SEL, SEL_UPL); } @@ -194,7 +218,13 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; + +#ifdef XEN + /* need to do nosegneg like Linux */ + sd.sd_lolimit = (HYPERVISOR_VIRT_START >> 12) & 0xffff; +#else sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -204,7 +234,12 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_gsd = sd; +#ifdef XEN + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), + *(uint64_t *)&sd); +#else PCPU_GET(fsgs_gdt)[1] = sd; +#endif critical_exit(); load_gs(GSEL(GUGS_SEL, SEL_UPL)); } @@ -360,6 +395,10 @@ } pldt = mdp->md_ldt; +#ifdef XEN + i386_reset_ldt(pldt); + PCPU_SET(currentldt, (int)pldt); +#else #ifdef SMP gdt[PCPU_GET(cpuid) * NGDT + GUSERLDT_SEL].sd = pldt->ldt_sd; #else @@ -367,6 +406,7 @@ #endif lldt(GSEL(GUSERLDT_SEL, SEL_KPL)); PCPU_SET(currentldt, GSEL(GUSERLDT_SEL, SEL_KPL)); +#endif /* XEN */ if (dtlocked) mtx_unlock_spin(&dt_lock); } @@ -385,6 +425,44 @@ } #endif +#ifdef XEN + +/* + * dt_lock must be held. Returns with dt_lock held. + */ +struct proc_ldt * +user_ldt_alloc(struct mdproc *mdp, int len) +{ + struct proc_ldt *pldt, *new_ldt; + + mtx_assert(&dt_lock, MA_OWNED); + mtx_unlock_spin(&dt_lock); + MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), + M_SUBPROC, M_WAITOK); + + new_ldt->ldt_len = len = NEW_MAX_LD(len); + new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map, + round_page(len * sizeof(union descriptor))); + if (new_ldt->ldt_base == NULL) { + FREE(new_ldt, M_SUBPROC); + return NULL; + } + new_ldt->ldt_refcnt = 1; + new_ldt->ldt_active = 0; + + if ((pldt = mdp->md_ldt)) { + if (len > pldt->ldt_len) + len = pldt->ldt_len; + bcopy(pldt->ldt_base, new_ldt->ldt_base, + len * sizeof(union descriptor)); + } else { + bcopy(ldt, new_ldt->ldt_base, PAGE_SIZE); + } + pmap_map_readonly(kernel_pmap, (vm_offset_t)new_ldt->ldt_base, + new_ldt->ldt_len*sizeof(union descriptor)); + return new_ldt; +} +#else /* * dt_lock must be held. Returns with dt_lock held. */ @@ -423,6 +501,7 @@ return (new_ldt); } +#endif /* !XEN */ /* * Must be called with dt_lock held. Returns with dt_lock unheld. @@ -667,7 +746,23 @@ td->td_retval[0] = uap->start; return (error); } +#ifdef XEN +static int +i386_set_ldt_data(struct thread *td, int start, int num, + union descriptor *descs) +{ + struct mdproc *mdp = &td->td_proc->p_md; + struct proc_ldt *pldt = mdp->md_ldt; + + mtx_assert(&dt_lock, MA_OWNED); + /* Fill in range */ + bcopy(descs, + &((union descriptor *)(pldt->ldt_base))[start], + num * sizeof(union descriptor)); + return (0); +} +#else static int i386_set_ldt_data(struct thread *td, int start, int num, union descriptor *descs) @@ -683,6 +778,7 @@ num * sizeof(union descriptor)); return (0); } +#endif /* !XEN */ static int i386_ldt_grow(struct thread *td, int len) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:07:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2BC01065687; Sat, 16 Aug 2008 22:07:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 766E31065682 for ; Sat, 16 Aug 2008 22:07:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61FFF8FC13 for ; Sat, 16 Aug 2008 22:07:20 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GM7K0h089397 for ; Sat, 16 Aug 2008 22:07:20 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GM7Ki1089395 for perforce@freebsd.org; Sat, 16 Aug 2008 22:07:20 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 22:07:20 GMT Message-Id: <200808162207.m7GM7Ki1089395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:07:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=147611 Change 147611 by julian@julian_trafmon1 on 2008/08/16 22:07:17 IFC@147609 Affected files ... .. //depot/projects/vimage-devel/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/vimage-devel/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/vimage-devel/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/vimage-devel/src/sys/kern/vfs_cache.c#3 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); #include @@ -65,7 +65,7 @@ #endif /* !_KERNEL */ /* - * This is the default number of seconds we wait for devices to settle + * This is the default number of milliseconds we wait for devices to settle * after a SCSI bus reset. */ #ifndef SCSI_DELAY ==== //depot/projects/vimage-devel/src/sys/dev/pci/pci_pci.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.52 2008/08/16 20:18:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.53 2008/08/16 21:51:54 imp Exp $"); /* * PCI:PCI bridge support. @@ -464,7 +464,6 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ -#if 1 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -477,7 +476,6 @@ end = sc->pmemlimit; } } -#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage-devel/src/sys/i386/i386/swtch.s#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.156 2007/08/22 05:06:14 jkoshy Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.157 2008/08/16 21:38:46 kmacy Exp $ */ #include "opt_npx.h" @@ -88,7 +88,7 @@ movl 8(%esp),%ecx /* New thread */ movl TD_PCB(%ecx),%edx movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* set bit in new pm_active */ movl TD_PROC(%ecx),%eax movl P_VMSPACE(%eax), %ebx @@ -181,10 +181,10 @@ cmpl %eax,IdlePTD /* Kernel address space? */ #endif je sw0 - movl %cr3,%ebx /* The same address space? */ + READ_CR3(%ebx) /* The same address space? */ cmpl %ebx,%eax je sw0 - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* new address space */ movl %esi,%eax movl PCPU(CPUID),%esi SETOP %eax,TD_LOCK(%edi) /* Switchout td_lock */ @@ -211,6 +211,18 @@ SETOP %esi,TD_LOCK(%edi) /* Switchout td_lock */ sw1: BLOCK_SPIN(%ecx) +#ifdef XEN + pushl %eax + pushl %ecx + pushl %edx + call xen_handle_thread_switch + popl %edx + popl %ecx + popl %eax + /* + * XXX set IOPL + */ +#else /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. @@ -259,7 +271,7 @@ movl 12(%esi), %ebx movl %eax, 8(%edi) movl %ebx, 12(%edi) - +#endif /* Restore context. */ movl PCB_EBX(%edx),%ebx movl PCB_ESP(%edx),%esp @@ -285,7 +297,7 @@ movl _default_ldt,%eax cmpl PCPU(CURRENTLDT),%eax je 2f - lldt _default_ldt + LLDT(_default_ldt) movl %eax,PCPU(CURRENTLDT) jmp 2f 1: @@ -389,7 +401,7 @@ * parent's npx state for forks by forgetting to reload. */ pushfl - cli + CLI movl PCPU(FPCURTHREAD),%eax testl %eax,%eax je 1f ==== //depot/projects/vimage-devel/src/sys/kern/vfs_cache.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.122 2008/07/31 16:57:41 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.123 2008/08/16 21:48:10 alfred Exp $"); #include #include @@ -199,10 +199,12 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { + CACHE_LOCK(); count = 0; LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); error = SYSCTL_OUT(req, &count, sizeof(count)); if (error) return (error); @@ -231,9 +233,11 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { count = 0; + CACHE_LOCK(); LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); if (count) used++; if (maxlength < count) From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:09:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07EDC1065674; Sat, 16 Aug 2008 22:09:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7A7C1065676 for ; Sat, 16 Aug 2008 22:09:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 932748FC08 for ; Sat, 16 Aug 2008 22:09:22 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GM9Mq8089535 for ; Sat, 16 Aug 2008 22:09:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GM9MGL089533 for perforce@freebsd.org; Sat, 16 Aug 2008 22:09:22 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 22:09:22 GMT Message-Id: <200808162209.m7GM9MGL089533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:09:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=147612 Change 147612 by julian@julian_trafmon1 on 2008/08/16 22:08:53 IFC@147609 devel an this are now in step again Affected files ... .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/vimage/src/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#10 integrate Differences ... ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_all.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.52 2008/08/07 17:25:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.53 2008/08/16 21:26:58 ken Exp $"); #include @@ -65,7 +65,7 @@ #endif /* !_KERNEL */ /* - * This is the default number of seconds we wait for devices to settle + * This is the default number of milliseconds we wait for devices to settle * after a SCSI bus reset. */ #ifndef SCSI_DELAY ==== //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.52 2008/08/16 20:18:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.53 2008/08/16 21:51:54 imp Exp $"); /* * PCI:PCI bridge support. @@ -464,7 +464,6 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ -#if 1 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->membase && end > sc->memlimit) { start = sc->membase; @@ -477,7 +476,6 @@ end = sc->pmemlimit; } } -#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage/src/sys/i386/i386/swtch.s#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.156 2007/08/22 05:06:14 jkoshy Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.157 2008/08/16 21:38:46 kmacy Exp $ */ #include "opt_npx.h" @@ -88,7 +88,7 @@ movl 8(%esp),%ecx /* New thread */ movl TD_PCB(%ecx),%edx movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* set bit in new pm_active */ movl TD_PROC(%ecx),%eax movl P_VMSPACE(%eax), %ebx @@ -181,10 +181,10 @@ cmpl %eax,IdlePTD /* Kernel address space? */ #endif je sw0 - movl %cr3,%ebx /* The same address space? */ + READ_CR3(%ebx) /* The same address space? */ cmpl %ebx,%eax je sw0 - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* new address space */ movl %esi,%eax movl PCPU(CPUID),%esi SETOP %eax,TD_LOCK(%edi) /* Switchout td_lock */ @@ -211,6 +211,18 @@ SETOP %esi,TD_LOCK(%edi) /* Switchout td_lock */ sw1: BLOCK_SPIN(%ecx) +#ifdef XEN + pushl %eax + pushl %ecx + pushl %edx + call xen_handle_thread_switch + popl %edx + popl %ecx + popl %eax + /* + * XXX set IOPL + */ +#else /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. @@ -259,7 +271,7 @@ movl 12(%esi), %ebx movl %eax, 8(%edi) movl %ebx, 12(%edi) - +#endif /* Restore context. */ movl PCB_EBX(%edx),%ebx movl PCB_ESP(%edx),%esp @@ -285,7 +297,7 @@ movl _default_ldt,%eax cmpl PCPU(CURRENTLDT),%eax je 2f - lldt _default_ldt + LLDT(_default_ldt) movl %eax,PCPU(CURRENTLDT) jmp 2f 1: @@ -389,7 +401,7 @@ * parent's npx state for forks by forgetting to reload. */ pushfl - cli + CLI movl PCPU(FPCURTHREAD),%eax testl %eax,%eax je 1f ==== //depot/projects/vimage/src/sys/kern/vfs_cache.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.122 2008/07/31 16:57:41 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.123 2008/08/16 21:48:10 alfred Exp $"); #include #include @@ -199,10 +199,12 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { + CACHE_LOCK(); count = 0; LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); error = SYSCTL_OUT(req, &count, sizeof(count)); if (error) return (error); @@ -231,9 +233,11 @@ /* Scan hash tables for applicable entries */ for (ncpp = nchashtbl; n_nchash > 0; n_nchash--, ncpp++) { count = 0; + CACHE_LOCK(); LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } + CACHE_UNLOCK(); if (count) used++; if (maxlength < count) From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:10:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42425106566C; Sat, 16 Aug 2008 22:10:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05EE9106566B for ; Sat, 16 Aug 2008 22:10:24 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5D198FC1E for ; Sat, 16 Aug 2008 22:10:23 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GMANYj089688 for ; Sat, 16 Aug 2008 22:10:23 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GMANKO089686 for perforce@freebsd.org; Sat, 16 Aug 2008 22:10:23 GMT (envelope-from strauss@FreeBSD.org) Date: Sat, 16 Aug 2008 22:10:23 GMT Message-Id: <200808162210.m7GMANKO089686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 147613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=147613 Change 147613 by strauss@strauss_marvelman on 2008/08/16 22:10:17 Fix: Did not count written data bytes. Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#38 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#3 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#38 (text+ko) ==== @@ -323,8 +323,9 @@ ret = (a->compressor.write)(a, buff, s); if (ret >= 0) { zip->written_bytes += s; + zip->remaining_data_bytes -= s; l->crc32 = crc32(l->crc32, buff, s); - return s; + return (s); } else { return (ret); } ==== //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_zip.c#3 (text+ko) ==== @@ -62,6 +62,7 @@ assertEqualInt(0, archive_write_header(a, ae)); archive_entry_free(ae); assertEqualInt(8, archive_write_data(a, "12345678", 9)); + assertEqualInt(0, archive_write_data(a, "1", 1)); /* * Write another file to it. From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:15:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60E39106568F; Sat, 16 Aug 2008 22:15:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23D6B106568D for ; Sat, 16 Aug 2008 22:15:49 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id D26A38FC12 for ; Sat, 16 Aug 2008 22:15:48 +0000 (UTC) (envelope-from zec@freebsd.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id BCE4A9B654; Sun, 17 Aug 2008 00:15:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DATE_IN_PAST_06_12 autolearn=ham version=3.1.7 Received: from localhost (imunes.tel.fer.hr [161.53.19.8]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 8E7829B64F; Sun, 17 Aug 2008 00:15:46 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Sat, 16 Aug 2008 17:49:47 +0200 User-Agent: KMail/1.9.7 References: <200808161407.m7GE7t14020928@repoman.freebsd.org> <48A70327.9000807@elischer.org> In-Reply-To: <48A70327.9000807@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200808161749.47669.zec@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 147542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:15:49 -0000 On Saturday 16 August 2008 18:41:11 Julian Elischer wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=147542 > > > > Change 147542 by zec@zec_tpx32 on 2008/08/16 14:07:48 > > > > Diff redux against head. > > > > We should separately commit these few lines because if_lmc > > won't compile with nooptions INET6, regardless on having > > options VIMAGE on or off. > > > > Affected files ... > > > > .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 edit > > > > Differences ... > > > > ==== //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#4 > > (text+ko) ==== > > > > @@ -83,12 +83,6 @@ > > # ifndef NETGRAPH > > # define NETGRAPH 0 > > # endif > > -# ifndef INET > > -# define INET 0 > > -# endif > > -# ifndef INET6 > > -# define INET6 0 > > -# endif > > # define P2P 0 /* not in FreeBSD */ > > # if (__FreeBSD_version >= 500000) > > # define NSPPP 1 /* No count devices in FreeBSD 5 */ > > is someone going to do this? I will do - could be a nice first step into the svn world... Marko From owner-p4-projects@FreeBSD.ORG Sat Aug 16 22:18:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D4C1065673; Sat, 16 Aug 2008 22:18:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D980106566C for ; Sat, 16 Aug 2008 22:18:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57B358FC1D for ; Sat, 16 Aug 2008 22:18:32 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GMIWCt090680 for ; Sat, 16 Aug 2008 22:18:32 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GMIWoW090678 for perforce@freebsd.org; Sat, 16 Aug 2008 22:18:32 GMT (envelope-from julian@freebsd.org) Date: Sat, 16 Aug 2008 22:18:32 GMT Message-Id: <200808162218.m7GMIWoW090678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 147614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2008 22:18:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=147614 Change 147614 by julian@julian_trafmon1 on 2008/08/16 22:17:54 Meergein whitespace fix @147605 from 'vimage' branch Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_mib.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_cb.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net/rtsock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#7 integrate .. //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#6 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#8 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#5 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/conf/NOTES#8 (text+ko) ==== @@ -248,7 +248,6 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. -# options DEVICE_POLLING ==== //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#6 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/kern_uuid.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/kern/uipc_domain.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/bridgestp.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_clone.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/net/if_mib.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/net/raw_cb.c#7 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/net/raw_usrreq.c#7 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/net/rtsock.c#6 (text+ko) ==== @@ -29,7 +29,6 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.148 2008/07/09 15:48:16 rwatson Exp $ */ - #include "opt_sctp.h" #include "opt_mpath.h" ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" - #include #include #include ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#5 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_wlan.h" #ifdef DDB - /* * IEEE 802.11 DDB support */ ==== //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/atm/ng_atm.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_eiface.c#6 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_ether.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netgraph/ng_gif.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet/in_mcast.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/in_rmx.c#6 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet/tcp_offload.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/netinet6/frag6.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet6/in6_rmx.c#7 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet6/scope6.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/netinet6/sctp6_usrreq.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/sctp6_usrreq.c,v 1.46 2008/07/09 16:45:30 rrs Exp $"); - #include #include #include ==== //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#7 (text+ko) ==== @@ -43,8 +43,6 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ - - #include #include #include ==== //depot/projects/vimage-commit/src/sys/rpc/svc_dg.c#4 (text+ko) ==== ==== //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.9 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.2 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include