From owner-p4-projects@FreeBSD.ORG Sun Oct 14 00:52:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D88116A421; Sun, 14 Oct 2007 00:52: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 0051516A419 for ; Sun, 14 Oct 2007 00:52:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C214013C494 for ; Sun, 14 Oct 2007 00:52:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9E0qOSD096665 for ; Sun, 14 Oct 2007 00:52:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9E0qOIl096661 for perforce@freebsd.org; Sun, 14 Oct 2007 00:52:24 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 00:52:24 GMT Message-Id: <200710140052.l9E0qOIl096661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127488 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, 14 Oct 2007 00:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=127488 Change 127488 by kmacy@kmacy:storage:toestack on 2007/10/14 00:51:53 add option to disable offload on a socket Affected files ... .. //depot/projects/toestack/sys/sys/socket.h#3 edit Differences ... ==== //depot/projects/toestack/sys/sys/socket.h#3 (text+ko) ==== @@ -118,6 +118,7 @@ #define SO_ACCEPTFILTER 0x1000 /* there is an accept filter */ #define SO_BINTIME 0x2000 /* timestamp received dgram traffic */ #endif +#define SO_NOOFFLOAD 0x4000 /* socket cannot be offloaded */ /* * Additional options, not kept in so_options. From owner-p4-projects@FreeBSD.ORG Sun Oct 14 00:53:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE31D16A41B; Sun, 14 Oct 2007 00:53: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 73F1A16A417 for ; Sun, 14 Oct 2007 00:53:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ADBF13C4AA for ; Sun, 14 Oct 2007 00:53:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9E0rQOZ096718 for ; Sun, 14 Oct 2007 00:53:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9E0rQI5096715 for perforce@freebsd.org; Sun, 14 Oct 2007 00:53:26 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 00:53:26 GMT Message-Id: <200710140053.l9E0rQI5096715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127489 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, 14 Oct 2007 00:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=127489 Change 127489 by kmacy@kmacy:storage:toestack on 2007/10/14 00:53:15 add extension to mbuf for cpl packets Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#3 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#3 (text+ko) ==== @@ -49,14 +49,13 @@ TOE_RELEASE_ALL, }; - #define TOENAMSIZ 16 /* belongs in linux/netdevice.h */ #define NETIF_F_TCPIP_OFFLOAD (1 << 15) /* Get the toedev associated with a ifnet */ -#define TOEDEV(netdev) (*(struct toedev **)&(netdev)->if_softc) +#define TOEDEV(ifp) ((ifp)->if_spare2) /* offload type ids */ enum { @@ -171,4 +170,28 @@ } #endif /* CONFIG_TCP_OFFLOAD */ + +struct m_toe_ { + void (*mt_arp_fail)(struct toedev *, struct mbuf *); + struct socket *mt_so; +}; + +#define TMLEN (MLEN - sizeof(struct m_toe_)) + +struct toe_mbuf { + struct m_hdr m_hdr; + union { + struct { + struct pkthdr MH_pkthdr; /* M_PKTHDR set */ + union { + struct m_ext_ MH_ext; /* M_EXT set */ + char MH_databuf[MHLEN]; + } MH_dat; + struct m_toe_ MH_toe; /* M_TOE set */ + } MH; + char M_databuf[TMLEN]; /* !M_PKTHDR, !M_EXT */ + } M_dat; +}; + + #endif /* _OFFLOAD_DEV_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Oct 14 00:55:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32D3716A41A; Sun, 14 Oct 2007 00:55: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 DE8EE16A417 for ; Sun, 14 Oct 2007 00:55:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C411313C455 for ; Sun, 14 Oct 2007 00:55:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9E0tTuT096840 for ; Sun, 14 Oct 2007 00:55:29 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9E0tTiv096837 for perforce@freebsd.org; Sun, 14 Oct 2007 00:55:29 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 00:55:29 GMT Message-Id: <200710140055.l9E0tTiv096837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127490 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, 14 Oct 2007 00:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=127490 Change 127490 by kmacy@kmacy:storage:toestack on 2007/10/14 00:55:12 initial tie-in of connect to toecore Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#2 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#2 edit .. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#5 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#2 (text+ko) ==== @@ -1,26 +1,59 @@ #include #include +#include #include #include #include #include +#include +#include + +#include +#include +#include + + #include #include - -#include -#include - +#include #include #include #include +/* :-/ */ +#include + int -ofld_connect(struct tcpcb *tp, struct sockaddr *nam) +ofld_connect(struct socket *so, struct sockaddr *nam) { + struct inpcb *inp = sotoinpcb(so); + struct ifnet *ifp; + struct toedev *tdev; + + if (inp->inp_route.ro_rt == NULL) { + struct sockaddr_in *dst = (struct sockaddr_in *)&inp->inp_route.ro_dst; + + bzero(dst, sizeof(*dst)); + dst->sin_family = AF_INET; + dst->sin_len = sizeof(*dst); + dst->sin_addr.s_addr = *(in_addr_t *)&nam->sa_data; + + rtalloc_ign(&inp->inp_route, 0); + } + + if (inp->inp_route.ro_rt == NULL) + return (0); + ifp = inp->inp_route.ro_rt->rt_ifp; + tdev = TOEDEV(ifp); - return tp->t_tu->tu_connect(tp, nam); + if ((tdev == NULL) || (tdev->can_offload(tdev, so) == 0)) + return (0); + if (tdev->connect(tdev, so, ifp)) + return (1); + + return (0); } int ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#2 (text+ko) ==== @@ -3,8 +3,11 @@ #define tp_offload(tp) ((tp)->t_flags & TF_TOE) +#define SO_OFFLOADABLE(so) ((so->so_options & SO_NOOFFLOAD) == 0) + -int ofld_connect(struct tcpcb *tp, struct sockaddr *nam); +int ofld_connect(struct socket *so, struct sockaddr *nam); +int ofld_can_offload(struct tcpcb *tp, struct sockaddr *nam); int ofld_disconnect(struct tcpcb *tp); int ofld_abort(struct tcpcb *tp); int ofld_send(struct tcpcb *tp); @@ -14,12 +17,13 @@ static __inline int -tcp_gen_connect(struct tcpcb *tp, struct sockaddr *nam) +tcp_gen_connect(struct socket *so, struct sockaddr *nam) { int error; - - if (tp_offload(tp)) - error = ofld_connect(tp, nam); + struct tcpcb *tp = sototcpcb(so); + + if (SO_OFFLOADABLE(so)) + error = ofld_connect(so, nam); else error = tcp_output(tp); ==== //depot/projects/toestack/sys/netinet/tcp_usrreq.c#5 (text+ko) ==== @@ -29,9 +29,11 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.162 2007/09/24 05:26:24 silby Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.163 2007/10/07 20:44:24 silby Exp $"); + #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" @@ -476,7 +478,7 @@ TCPDEBUG1(); if ((error = tcp_connect(tp, nam, td)) != 0) goto out; - error = tcp_gen_connect(tp, nam); + error = tcp_gen_connect(so, nam); out: TCPDEBUG2(PRU_CONNECT); INP_UNLOCK(inp); @@ -528,7 +530,7 @@ inp->inp_vflag &= ~INP_IPV6; if ((error = tcp_connect(tp, (struct sockaddr *)&sin, td)) != 0) goto out; - error = tcp_gen_connect(tp, nam); + error = tcp_gen_connect(so, nam); goto out; } inp->inp_vflag &= ~INP_IPV4; @@ -536,7 +538,7 @@ inp->inp_inc.inc_isipv6 = 1; if ((error = tcp6_connect(tp, nam, td)) != 0) goto out; - error = tcp_gen_connect(tp, nam); + error = tcp_gen_connect(so, nam); out: TCPDEBUG2(PRU_CONNECT); From owner-p4-projects@FreeBSD.ORG Sun Oct 14 15:09:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09D6A16A473; Sun, 14 Oct 2007 15:09: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 B931E16A46B for ; Sun, 14 Oct 2007 15:09:43 +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 818F913C455 for ; Sun, 14 Oct 2007 15:09:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9EF9hc4095076 for ; Sun, 14 Oct 2007 15:09:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9EF9XAg095071 for perforce@freebsd.org; Sun, 14 Oct 2007 15:09:33 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 14 Oct 2007 15:09:33 GMT Message-Id: <200710141509.l9EF9XAg095071@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 127514 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, 14 Oct 2007 15:09:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=127514 Change 127514 by pgj@disznohal on 2007/10/14 15:09:21 Add initial Hungarian translation of Chapter 1: Introduction. I needed to modify "freebsd.ent" too, because of the two dates. So, peace! Affected files ... .. //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#2 edit .. //depot/projects/docproj_hu/share/sgml/freebsd.ent#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -3,114 +3,161 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.120 2007/08/18 23:12:23 bmah Exp $ --> + - + - Jim + Jim Mock - Restructured, reorganized, and parts - rewritten by + Átszerkesztette, átszervezte és + bizonyos részeit újraírta: - Introduction + Bemutatkozás - Synopsis + Áttekintés - Thank you for your interest in FreeBSD! The following chapter - covers various aspects of the FreeBSD Project, such as its history, - goals, development model, and so on. + Köszönjük, hogy érdeklõdik a &os; + iránt! A fejezet a &os; projektet több + különbözõ vonatkozásban mutatja be: a + történetét, a céljait, a + fejlesztési modelljét és így + tovább. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - How FreeBSD relates to other computer operating systems. + Hogyan viszonyul a &os; más operációs + rendszerekhez. - The history of the FreeBSD Project. + A &os; projekt történetét. - The goals of the FreeBSD Project. + A &os; projekt célkitûzéseit. - The basics of the FreeBSD open-source development model. + A &os; nyílt forráskódú + fejlesztési modelljének alapjait. - And of course: where the name FreeBSD comes from. + És természetesen: hogyan is keletkezett a + &os; név. - Welcome to FreeBSD! - 4.4BSD-Lite + Üdvözöljük a &os;-ben! + 4.4BSD-Lite - FreeBSD is a 4.4BSD-Lite based operating system for - Intel (x86 and &itanium;), AMD64, Alpha, Sun - &ultrasparc; computers. Ports to other - architectures are also underway. - You can also - read about the history of FreeBSD, - or the current release. If you - are interested in contributing something to the Project (code, - hardware, funding), see the Contributing to FreeBSD article. + A &os; egy 4.4BSD-Lite alapú operációs + rendszer &intel; (x86 és &itanium;), AMD64, + Alpha, Sun &ultrasparc; + számítógépekre. Jelenleg is + portolás alatt áll további + architektúrákra. Olvashatunk a &os; történetérõl + vagy éppen az aktuális + kiadásáról. Ha szeretnénk adni + valamit a projektnek (forráskód, hardver vagy + pénz), olvassuk el a Hozzájárulás + a &os;-hez c. cikket. - What Can FreeBSD Do? + Mire képes a &os;? - FreeBSD has many noteworthy features. Some of these - are: + A &os; számos figyelemre méltó + tulajdonságot tudhat magáénak. Ezek + közül néhány: - preemptive multitasking + preemptív + ütemezés - Preemptive multitasking with - dynamic priority adjustment to ensure smooth and fair - sharing of the computer between applications and users, even - under the heaviest of loads. + A preemptív + ütemezés dinamikusan + szabályozható prioritások + segítségével biztosítja a + számítógép + felhasználók és alkalmazások + közti finom és igazságos + megosztását, akár a legnagyobb + terhelés esetén is. - multi-user facilities + többfelhasználós + rendszer - Multi-user facilities which allow many - people to use a FreeBSD system simultaneously for a variety - of things. This means, for example, that system peripherals - such as printers and tape drives are properly shared between - all users on the system or the network and that individual - resource limits can be placed on users or groups of users, - protecting critical system resources from over-use. + Többfelhasználós + rendszerként lehetõvé teszi, + hogy sokan tudják a &os;-t egyszerre + többféle dologra is használni. + Például, ez azt jelenti, hogy a rendszerhez + csatlakoztatott különbözõ + perifériák, mint mondjuk a nyomtatók + és szalagos egységek, megfelelõen + szétoszthatóak a felhasználók + között vagy éppen a + hálózaton, és az egyes + erõforrásokhoz a felhasználók vagy + azok egy csoportja csak korlátozott módon + férhetnek hozzájuk, elkerülve ezzel a + rendszer számára + létfontosságú erõforrások + túlterhelését. - - TCP/IP networking + + TCP/IP protokoll - Strong TCP/IP networking with - support for industry standards such as SCTP, DHCP, NFS, - NIS, PPP, SLIP, IPsec, and IPv6. This means that your FreeBSD machine can - interoperate easily with other systems as well as act as an - enterprise server, providing vital functions such as NFS - (remote file access) and email services or putting your - organization on the Internet with WWW, FTP, routing and - firewall (security) services. + A TCP/IP hálózati + protokoll gyors és megbízható + implementációja, ill. a legfontosabb ipari + szabványok, mint az SCTP, DHCP, NFS, NIS, PPP, SLIP, + IPsec és IPv6 támogatása. + Ezáltal egy &os;-s gép könnyedén + képes együttmûködni más + rendszerekkel vagy akár vállalati + szerverként is üzemelni. Megbirkózik az + NFS (távoli + állományelérés) és az + elektronikus levelezés megszervezésével + ugyanúgy, ahogy a szervezetünk Internetes + megjelenésével a WWW, FTP és + forgalomirányítási protokollokon + keresztül és tûzfalazási + (biztonsági) igényeivel is. - memory protection + memóriavédelem - Memory protection ensures that - applications (or users) cannot interfere with each other. One - application crashing will not affect others in any way. + A memóriavédelem + megvalósítása gondoskodik róla, + hogy az alkalmazások (vagy a + felhasználók) ne zavarják + egymást. Az egyik alkalmazás + összeomlása nincs kihatással a + rendszerben futó összes többire. - + - FreeBSD is a 32-bit operating - system (64-bit on the Alpha, &itanium;, AMD64, and &ultrasparc;) and was - designed as such from the ground up. + A &os; egy 32 bites + operációs rendszer (az Alpha, &itanium;, AMD64 + és &ultrasparc; architektúrákon pedig + 64 bites), amelyet már a + kezdetektõl fogva annak terveztek. @@ -119,232 +166,311 @@ - The industry standard X Window System - (X11R7) provides a graphical user interface (GUI) for the cost - of a common VGA card and monitor and comes with full - sources. + A X Window System ipari + szabványa (X11R7) alapján szolgáltatja a + grafikus felhasználói felületet (GUI) + bármelyik VGA-kártyán és + monitoron, ill. annak teljes forráskódja is + elérhetõ. - binary compatibility - Linux + bináris kompatibilitás + &linux; - binary compatibility + bináris kompatibilitás SCO - binary compatibility + bináris kompatibilitás SVR4 - binary compatibility + bináris kompatibilitás BSD/OS - binary compatibility + bináris kompatibilitás NetBSD - Binary compatibility with many - programs built for Linux, SCO, SVR4, BSDI and NetBSD. + Bináris szintû + kompatibilitás a &linux;-ra, SCO-ra, + SVR4-re, BSDI-re és NetBSD-re készített + programok nagy részével. - + - Thousands of ready-to-run - applications are available from the FreeBSD - ports and packages - collection. Why search the net when you can find it all right - here? + Futtatásra kész + alkalmazások ezrei érhetõek el a &os; + port- és + csomaggyûjteményében. + Miért bújnánk a netet + értük, ha mindent egy helyen is + megtalálhatunk? - + - Thousands of additional and - easy-to-port applications are available - on the Internet. FreeBSD is source code compatible with most - popular commercial &unix; systems and thus most applications - require few, if any, changes to compile. + További könnyen + portolható alkalmazások ezrei + állnak rendelkezésre az Interneten. A &os; + forráskódja kompatibilis a legtöbb + elterjedt kereskedelmi &unix; rendszerével, aminek + köszönhetõen az alkalmazások nagy + része csak kevés + módosítást igényel a + fordításhoz, már amennyiben erre + egyáltalán szükség van. - - virtual memory + + virtuális + memória - Demand paged virtual memory and - merged VM/buffer cache design efficiently - satisfies applications with large appetites for memory while - still maintaining interactive response to other users. + Az igény szerinti lapozással + mûködõ virtuális + memória és egyesített + VM/puffer gyorsítótár + úgy lett kialakítva, hogy hatékonyan + kiszolgálja a nagyobb étvágyú + alkalmazásokat, miközben a többi + felhasználó számára + továbbra is reakcióképes marad. - - - Symmetric Multi-Processing (SMP) + + + Többprocesszoros (SMP) rendszerek + támogatása - SMP support for machines with - multiple CPUs. + Az SMP támogatása a + több processzorral rendelkezõ + számítógépek + számára. - compilers + fordítóprogramok C - compilers + fordítóprogramok C++ - compilers + fordítóprogramok FORTRAN - A full complement of C, - C++, and Fortran - development tools. - Many additional languages for advanced research - and development are also available in the ports and packages - collection. + C, C++ + és Fortran fejlesztõi + eszközök széles tárháza + használható. Kutatáshoz és + fejlesztéshez más egyéb + programozási nyelvek is elérhetõek a + portok és csomagok + segítségével. - source code + forráskód - Source code for the entire system - means you have the greatest degree of control over your - environment. Why be locked into a proprietary solution - at the mercy of your vendor when you can have a truly open - system? + Az egész rendszer + forráskódjának + megléte lehetõvé teszi, hogy a legnagyobb + fokú irányítást + élvezhessük a környezetünk felett. + Miért is bíznánk magunkat egy + zárt rendszert fejlesztõ cég kegyeire, + mikor lehetne egy igazán nyílt + rendszerünk? - + - Extensive online - documentation. + Nagy mennyiségû Internetes + dokumentáció. - + - And many more! + És még sok minden + más! - + 4.4BSD-Lite - Computer Systems Research Group (CSRG) + Számítógépes rendszerek + kutatói csoport (CSRG) - U.C. Berkeley - FreeBSD is based on the 4.4BSD-Lite release from Computer - Systems Research Group (CSRG) at the University of California at - Berkeley, and carries on the distinguished tradition of BSD - systems development. In addition to the fine work provided by - CSRG, the FreeBSD Project has put in many thousands of hours in - fine tuning the system for maximum performance and reliability in - real-life load situations. As many of the commercial giants - struggle to field PC operating systems with such features, - performance and reliability, FreeBSD can offer them - now! + Berkeley + A &os; kaliforniai Berkeley Egyetem + Számítógépes rendszerek + kutatócsoportja által fejlesztett 4.4BSD-Lite + kiadásán alapszik, és ápolja a + BSD-rendszerek fejlesztésének jellegzetes + hagyományait. Túl a kutatócsoport + kivételes munkáján, a &os; projekt + több ezernyi órát szentelt arra, hogy a + legtöbbet hozza ki a rendszerbõl mind a + teljesítményt, mind pedig a valós + életben felbukkanó terhelési helyezetekben + történõ helytállást illetõen + egyaránt. Ahogy a legnagyobb piaci óriások + igyekeznek egy hasonló képességû, + teljesítményû és + megbízhatóságó PC-s + operációs rendszert kifejleszteni, úgy a + &os; már most felajánlja + ezeket! + + Kizárólag csak a képzeletünk + szabhat gátat annak, hogy mire is tudjuk használni a + &os;-t. Szoftverfejlesztéstõl kezdve, a + gyári automatizáláson és + készletnyilvántartáson át a + mûholdas antennák tájolásáig + szinte mindenre: ha ezt eddig egy kereskedelmi &unix;-al is meg + tudtuk tenni, akkor nagyon valószínû, hogy a + &os;-vel is képesek leszünk erre! A &os; ezeken + felül nagyban profitál a világban + található különbözõ + kutatóközpontok és egyetemek által + fejlesztett, kiváló minõségû + alkalmazások ezreibõl, melyek gyakorta olcsón + vagy ingyen elérhetõek. Kereskedelmi + alkalmazások is egyre nagyobb számban + képviseltetik magukat minden nap. - The applications to which FreeBSD can be put are truly - limited only by your own imagination. From software development - to factory automation, inventory control to azimuth correction of - remote satellite antennae; if it can be done with a commercial - &unix; product then it is more than likely that you can do it with - FreeBSD too! FreeBSD also benefits significantly from - literally thousands of high quality applications developed by - research centers and universities around the world, often - available at little to no cost. Commercial applications are also - available and appearing in greater numbers every day. + Mivel a &os; forráskódja + általánosan elérhetõ, a rendszer szinte + tetszõleges mértékben testreszabható a + különleges elvárásokat + támasztó alkalmazások vagy projektek + számára. Ez a nagyobb kereskedelmi + fejlesztõk operációs rendszereivel majdnem + teljesen elképzelhetetlen. Íme csupán + néhány példája azon + alkalmazásoknak, melyek jelenleg is &os;-t + használnak: - Because the source code for FreeBSD itself is generally - available, the system can also be customized to an almost unheard - of degree for special applications or projects, and in ways not - generally possible with operating systems from most major - commercial vendors. Here is just a sampling of some of the - applications in which people are currently using FreeBSD: - - Internet Services: The robust TCP/IP - networking built into FreeBSD makes it an ideal platform for a - variety of Internet services such as: + Internetes + szolgáltatások: A &os;-be + épített szilárd TCP/IP alapú + hálózatkezelés + különféle Internetes + szolgáltatások számára teszi + ideális platformmá: - FTP servers + FTP szerverek - FTP servers + FTP szerverek - - web servers + + webszerverek - World Wide Web servers (standard or secure - [SSL]) + World Wide Web szerverek (hagyományos vagy + biztonságos [SSL]) - IPv4 and IPv6 routing + IPv4 és IPv6 + forgalomirányítás - firewall + tûzfal NAT - Firewalls and NAT (IP masquerading) - gateways + Tûzfalak és NAT (IP + maszkolás), + átjárók - + - electronic mail - email + elektronikus levelezés + e-mail - email + e-mail - Electronic Mail servers + Elektronikus levelezõ szerverek - + USENET - USENET News or Bulletin Board Systems + USENET hír- és + hirdetményrendszer - + - And more... + És sok minden más... - With FreeBSD, you can easily start out small with an - inexpensive 386 class PC and upgrade all the way up to a - quad-processor Xeon with RAID storage as your enterprise - grows. + A &os; használatához kezdetben + elegendõ egy olcsó 386-os PC, melyet a + vállalkozásunk fejlõdésével + szépen fel tudunk hozni egy RAID-del ellátott + négyprocesszoros Xeon rendszerig. - + - Education: Are you a student of - computer science or a related engineering field? There is no - better way of learning about operating systems, computer - architecture and networking than the hands on, under the hood - experience that FreeBSD can provide. A number of freely - available CAD, mathematical and graphic design packages also - make it highly useful to those whose primary interest in a - computer is to get other work - done! + Oktatás: Netalán + informatikával vagy mûszaki informatikával + foglalkozik? Nem is lehetne jobban a &os; által + felkínált élményeken + kívül máshogy megismerkedni + elsõkézbõl az operációs + rendszerek, számítógépes + architektúrák és + hálózatok mûködésével. + Rengeteg szabadon használható mûszaki, + matematikai és grafikai tervezõ programcsomag + könnyíti meg azok munkáját is, + akik számára a + számítógép + legfõképpen más + feladatok elvégzésére hivatott! - + - Research: With source code for the - entire system available, FreeBSD is an excellent platform for - research in operating systems as well as other branches of - computer science. FreeBSD's freely available nature also makes - it possible for remote groups to collaborate on ideas or - shared development without having to worry about special - licensing agreements or limitations on what may be discussed - in open forums. + Kutatás: Miután a + teljes &os; rendszer forráskódja bárki + számára elérhetõ, + tökéletes kiindulást ad az + operációs rendszerek + témakörében vagy a + számítástudomány egyéb + ágaiban végzendõ kutatásokhoz. A + &os; nyílt természete ezenkívül + lehetõvé teszi egymástól + távol levõ csoportok közös + együttmûködését is + anélkül, hogy a résztvevõknek + aggódnia kellene a különleges + licenszelési szerzõdések vagy a + nyílt fórumokon felmerülõ + korlátozások miatt. - - router - DNS Server + + forgalomirányító + DNS szerver - Networking: Need a new router? A - name server (DNS)? A firewall to keep people out of your - internal network? FreeBSD can easily turn that unused 386 or - 486 PC sitting in the corner into an advanced router with - sophisticated packet-filtering capabilities. + Hálózatépítés: + Szüksége van egy új routerre? Esetleg egy + névszerverre (DNS)? Egy tûzfalra, mely + távoltartja a nemkívánatos + egyéneket a belsõ + hálózattól? A &os; pillanatok alatt + átváltoztatja a sarokban porosodó + 386-os vagy 486-os PC-nket egy kifinomult + csomagszûrési képességekkel + bíró forgalomirányító + eszközzé. - + X Window System XFree86 @@ -354,46 +480,57 @@ Accelerated-X - X Window workstation: FreeBSD is a - fine choice for an inexpensive X terminal solution, - using the freely available X11 server. - Unlike an - X terminal, FreeBSD allows many applications to be run - locally if desired, thus relieving the burden on a central - server. FreeBSD can even boot diskless, making - individual workstations even cheaper and easier to - administer. + X Window + munkaállomás: A &os; a szabadon + használható X11 szerverrel együtt remek + választás egy olcsó X terminál + kiépítéséhez. + Eltérõen egy szokványos X + termináltól, a &os; azonban igény + szerint sok alkalmazás helyi futtatását + is képes megoldani, ezzel megszabadítva minket + a központi szerver használatának + kényszerétõl. A &os; viszont akár + lemez nélkül is el tud indulni, + aminek révén az egyes + munkaállomások karbantartása még + olcsóbbá és könnyebbé + válik. - + GNU Compiler Collection - Software Development: The basic - FreeBSD system comes with a full complement of development - tools including the renowned GNU C/C++ compiler and - debugger. + Szoftverfejlesztés:Az alap + &os; rendszer fejlesztõeszközök + tömkelegével, többek közt a + híres GNU C/C++ fordítóval és + nyomkövetõvel érkezik. - - FreeBSD is available in both source and binary form on CDROM, - DVD, - and via anonymous FTP. Please see - for more information about obtaining FreeBSD. + + A &os; CD-n, DVD-n és FTP-n keresztül + elérhetõ forráskód és + bináris formátumban is. A &os; + beszerzésével kapcsolatos bõvebb + információkért olvassuk el a t. - Who Uses FreeBSD? + Ki használja a &os;-t? - users - large sites running FreeBSD + felhasználók + &os;-t használó nagy oldalak - FreeBSD is used to power some of the biggest sites on the - Internet, including: + A &os;-t az Interneten található nagyobb + oldalak közül sokan használják, mint + például: - Yahoo! - + Yahoo! + Yahoo! @@ -456,17 +593,19 @@ - and many more. + és még sokan mások. - + - About the FreeBSD Project + A &os; projektrõl - The following section provides some background information on - the project, including a brief history, project goals, and the - development model of the project. + A most következõ rész egy-két + háttérinformációt tár fel a + projektrõl, többek között a + történetét, céljait és a benne + alkalmazott fejlesztési modellt. @@ -474,193 +613,284 @@ Jordan Hubbard - Contributed by + Írta: - A Brief History of FreeBSD + A &os; rövid története 386BSD Patchkit Hubbard, Jordan Williams, Nate Grimes, Rod - FreeBSD Project - history + &os; project + történet - The FreeBSD project had its genesis in the early part of 1993, - partially as an outgrowth of the Unofficial 386BSD - Patchkit by the patchkit's last 3 coordinators: Nate - Williams, Rod Grimes and myself. - + A &os; projekt valamikor 1993 kezdetérõl + eredeztethetõ, és részben a Nem + hivatalos 386BSD Patchkit-bõl nõtt ki, a + patchkit 3 legutolsó koordinátorának, Nate + Williamsnek, Rod Grimesnak és nekem + köszönhetõen. + 386BSD - Our original goal was to produce an intermediate snapshot of - 386BSD in order to fix a number of problems with it that the - patchkit mechanism just was not capable of solving. Some of you - may remember the early working title for the project being - 386BSD 0.5 or 386BSD Interim in - reference to that fact. - + Eredeti célunk a 386BSD köztes + állapotainak rögzítése lett volna, + amitõl olyan problémák + megoldását reméltük, melyeket a + patchkitek gyártása önmagában + egyszerûen nem tudott megoldani. Néhányan + még talán emlékeznek is a projekt kezdeti + munkaneveire: 386BSD 0.5 vagy 386BSD + Interim, melyek pontosan erre a tényre + hivatkoztak. + Jolitz, Bill - 386BSD was Bill Jolitz's operating system, which had been up - to that point suffering rather severely from almost a year's worth - of neglect. As the patchkit swelled ever more uncomfortably with - each passing day, we were in unanimous agreement that something - had to be done and decided to assist Bill by providing - this interim cleanup snapshot. Those plans came to - a rude halt when Bill Jolitz suddenly decided to withdraw his - sanction from the project without any clear indication of what - would be done instead. + A 386BSD Bill Jolitz operációs rendszere volt, + mely ennél a pontnál már közel egy + éve nem került ápolásra. Mivel a a + hozzátartozó patchkit pedig napról napra + duzzadt, egyre kényelmetlenebbé vált a + karbantartása. Ezért egyhangúan úgy + döntöttünk, hogy segítünk Billnek + azzal, hogy létrehozunk idõnként egy + letisztított változatot. Ez a + próbálkozásunk csúnyán + kudarcba fulladt, amikor Bill Jolitz hirtelen meggondolta + magát és visszalépett a projekt + támogatásától. Semmilyen + egyértelmû útmutatást nem adott arra, + hogy mit csináljunk helyette. Greenman, David - Walnut Creek CDROM - It did not take us long to decide that the goal remained - worthwhile, even without Bill's support, and so we adopted the - name FreeBSD, coined by David Greenman. Our initial - objectives were set after consulting with the system's current - users and, once it became clear that the project was on the road - to perhaps even becoming a reality, I contacted Walnut Creek CDROM - with an eye toward improving FreeBSD's distribution channels for - those many unfortunates without easy access to the Internet. - Walnut Creek CDROM not only supported the idea of distributing - FreeBSD on CD but also went so far as to provide the project with a - machine to work on and a fast Internet connection. Without Walnut - Creek CDROM's almost unprecedented degree of faith in what was, at - the time, a completely unknown project, it is quite unlikely that - FreeBSD would have gotten as far, as fast, as it has today. + Walnut Creek + Nem tartott sokáig eldöntenünk, hogy ez a + cél továbbra is megéri a + fáradtságot, még Bill + segítsége nélkül is, ezért + felvettük a &os; nevet, melyet David + Greenmannek köszönhetünk. Kezdeti feladatainkat + a rendszer akkori felhasználóival tartott + egyeztetések után állítottuk fel. + Miután teljesen tisztán + láthatóvá vált, hogy a projekt a + megvalósulás útján van, felvettem a + kapcsolatot a Walnut Creek-kel, terjesztési mód + után nézve azokra számára, akik nem + tudtak akkoriban könnyedén hozzáférni + az Internethez. A Walnut Creek nem csak támogatta a &os; + CD-n történõ terjesztését, hanem + még egy számítógépet + és egy gyors Internet-kapcsolatot is a projekt + számára rendelkezésre bocsátott. A + Walnut Creek szinte példátlan + mértékû, egy akkoriban teljesen ismeretlen + projektbe vetett hitével nagyon nehezen lenne + elképzelhetõ, hogy a &os; olyan messzire jutott + volna el, ahol ma is tart. 4.3BSD-Lite Net/2 - U.C. Berkeley + Berkeley 386BSD - Free Software Foundation - The first CDROM (and general net-wide) distribution was - FreeBSD 1.0, released in December of 1993. This was based on the - 4.3BSD-Lite (Net/2) tape from U.C. Berkeley, with - many components also provided by 386BSD and the Free Software - Foundation. It was a fairly reasonable success for a first - offering, and we followed it with the highly successful FreeBSD - 1.1 release in May of 1994. + Szabad szoftver + alapítvány + Az elsõ CD-s (és általános + széleskörû netes) változat a &os; 1.0 + volt, amely 1993. decemberében jelent meg. A + Berkeley-rõl származó 4.3BSD-Lite + (Net/2) szalagokon található + források alapján készült, + kiegészítve a 386BSD-bõl és a Szabad + szoftver alapítványtól + származó komponensekkel. Elsõ + kiadásként igen méltányos sikert + könyvelhetett el, melyet a még inkább sikeres + &os; 1.1-el folytattunk 1994. + májusában. Novell - U.C. Berkeley + Berkeley Net/2 AT&T - Around this time, some rather unexpected storm clouds formed - on the horizon as Novell and U.C. Berkeley settled their - long-running lawsuit over the legal status of the Berkeley Net/2 - tape. A condition of that settlement was U.C. Berkeley's - concession that large parts of Net/2 were encumbered - code and the property of Novell, who had in turn acquired it from - AT&T some time previously. What Berkeley got in return was - Novell's blessing that the 4.4BSD-Lite release, when - it was finally released, would be declared unencumbered and all - existing Net/2 users would be strongly encouraged to switch. This - included FreeBSD, and the project was given until the end of July - 1994 to stop shipping its own Net/2 based product. Under the - terms of that agreement, the project was allowed one last release - before the deadline, that release being FreeBSD 1.1.5.1. + Nagyjából ekkortájt + néhány váratlan sötét felhõ + bukkant fel az égbolton, ahogy a Novell és a + Berkeley hosszantartó pereskedése lezárult + a Berkeley Net/2 szalagjainak jogi formáját + illetõen. Ennek eredményeképpen a Berkeley + elfogadta, hogy a Net/2 nagy része + jelzáloggalt terhelt és a Novell + tulajdona, aki pedig valamivel korábban az + AT&T-tõl szerezte. Ezért cserébe a + Berkeley megkapta a Novell + áldását a 4.4BSD-Lite + kiadásra, és amikor az véglesen kijön, + megszûnik a rajta levõ jelzálog. Emiatt az + összes Net/2 felhasználónak erõsen + javasolt volt váltani. Ez érintette magát + a &os;-t is, és így a projekt 1994. + júliusáig kapott határidõt, hogy + leállítsa a Net/2 alapú termékeinek + szállítását. A megegyezés + értelmében a projekt kiadhatott még egy + utolsó kiadást a határidõ elõtt, + amely végül a &os; 1.1.5.1 lett. - FreeBSD then set about the arduous task of literally - re-inventing itself from a completely new and rather incomplete - set of 4.4BSD-Lite bits. The Lite releases were - light in part because Berkeley's CSRG had removed large chunks of - code required for actually constructing a bootable running system - (due to various legal requirements) and the fact that the Intel - port of 4.4 was highly incomplete. It took the project until - November of 1994 to make this transition, at which point it >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 14 16:54:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0119016A46C; Sun, 14 Oct 2007 16:54: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 6C66B16A41B for ; Sun, 14 Oct 2007 16:54:39 +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 585FB13C4AA for ; Sun, 14 Oct 2007 16:54:39 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9EGsdCo012550 for ; Sun, 14 Oct 2007 16:54:39 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9EGscP7012547 for perforce@freebsd.org; Sun, 14 Oct 2007 16:54:38 GMT (envelope-from thioretic@FreeBSD.org) Date: Sun, 14 Oct 2007 16:54:38 GMT Message-Id: <200710141654.l9EGscP7012547@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 127518 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, 14 Oct 2007 16:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127518 Change 127518 by thioretic@thioretic_freebox on 2007/10/14 16:54:18 Just some naming stuff Affected files ... .. //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#25 edit .. //depot/projects/soc2007/thioretic_gidl/sys/bus.h#9 edit .. //depot/projects/soc2007/thioretic_gidl2/kern/subr_bus.c#7 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/kern/subr_bus.c#25 (text+ko) ==== @@ -1,5245 +1,5250 @@ -/*- - * Copyright (c) 1997,1998,2003 Doug Rabson - * All rights reserved. - * - * 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. - */ - -#include -__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.5 2006/12/28 22:13:26 jhb Exp $"); - -#include "opt_bus.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW, NULL, NULL); -SYSCTL_NODE(, OID_AUTO, dev, CTLFLAG_RW, NULL, NULL); - -/* - * Used to attach drivers to devclasses. - */ -typedef struct driverlink *driverlink_t; -struct driverlink { - kobj_class_t driver; - TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */ -}; - -typedef struct driverinfo* driverinfo_t; -struct driverinfo { - kobj_class_t driver; /**< kobj class, implementing driver - & bus interface methods (from outer space)*/ - kobj_class_t drvops; /**< kobj class, implementing driverops - interface methods (from outer space)*/ - kobj_t topology_ops; /**< object of class implemented by driver - (deeply internal:))*/ - kobj_t functional_ops; /**< object of class implemented by driverops - (deeply internal:))*/ - uint32_t flags; /**< driver-specific flags (from outer space)*/ - TAILQ_ENTRY(driverinfo) link; -}; - -typedef struct driverinfolink* driverinfolink_t; -struct driverinfolink { - driverinfo_t pdriver; - void *ivars; - void *softc; -#define DF_EXTERNALSOFTC 1 /* softc not allocated by us */ - int flags; - device_state_t state; - TAILQ_ENTRY(driverinfolink) link; -}; - -/* - * Forward declarations - */ -typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; -typedef TAILQ_HEAD(devclasslink_list, devclasslink) devclasslink_list_t; - -typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; - -typedef TAILQ_HEAD(device_list, device) device_list_t; -typedef TAILQ_HEAD(devicelink_list, devicelink) devicelink_list_t; - -typedef TAILQ_HEAD(driverinfo_list, driverinfo) driverinfo_list_t; -typedef TAILQ_HEAD(driverinfolink_list, driverinfolink) driverinfolink_list_t; - -typedef struct devclasslink* devclasslink_t; -struct devclasslink{ - devclass_t devclass_ptr; - TAILQ_ENTRY(devclasslink) link; -}; - -struct devclass { - TAILQ_ENTRY(devclass) link; - devclass_t parent; /* parent in devclass hierarchy */ - devclasslink_list_t filters; /* these are used to hold information, - used for non-DRL_LOWEST drivers' classes */ - driver_list_t drivers; /* bus devclasses store drivers for bus */ - char *name; - device_t *devices; /* array of devices indexed by unit */ - int maxunit; /* size of devices array */ - - struct sysctl_ctx_list sysctl_ctx; +/*- + * Copyright (c) 1997,1998,2003 Doug Rabson + * All rights reserved. + * + * 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. + */ + +#include +__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.184.2.5 2006/12/28 22:13:26 jhb Exp $"); + +#include "opt_bus.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW, NULL, NULL); +SYSCTL_NODE(, OID_AUTO, dev, CTLFLAG_RW, NULL, NULL); + +/* + * Used to attach drivers to devclasses. + */ +typedef struct driverlink *driverlink_t; +struct driverlink { + kobj_class_t driver; + TAILQ_ENTRY(driverlink) link; /* list of drivers in devclass */ +}; + +typedef struct driverinfo* driverinfo_t; +struct driverinfo { + kobj_class_t driver; /**< kobj class, implementing driver + & bus interface methods (from outer space)*/ + kobj_class_t drvops; /**< kobj class, implementing driverops + interface methods (from outer space)*/ + kobj_t topology_ops; /**< object of class implemented by driver + (deeply internal:))*/ + kobj_t functional_ops; /**< object of class implemented by driverops + (deeply internal:))*/ + uint32_t flags; /**< driver-specific flags (from outer space)*/ + TAILQ_ENTRY(driverinfo) link; +}; + +typedef struct driverinfolink* driverinfolink_t; +struct driverinfolink { + driverinfo_t pdriver; + void *ivars; + void *softc; +#define DF_EXTERNALSOFTC 1 /* softc not allocated by us */ + int flags; + device_state_t state; + TAILQ_ENTRY(driverinfolink) link; +}; + +/* + * Forward declarations + */ +typedef TAILQ_HEAD(devclass_list, devclass) devclass_list_t; +typedef TAILQ_HEAD(devclasslink_list, devclasslink) devclasslink_list_t; + +typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t; + +typedef TAILQ_HEAD(device_list, device) device_list_t; +typedef TAILQ_HEAD(devicelink_list, devicelink) devicelink_list_t; + +typedef TAILQ_HEAD(driverinfo_list, driverinfo) driverinfo_list_t; +typedef TAILQ_HEAD(driverinfolink_list, driverinfolink) driverinfolink_list_t; + +typedef struct devclasslink* devclasslink_t; +struct devclasslink{ + devclass_t devclass_ptr; + TAILQ_ENTRY(devclasslink) link; +}; + +struct devclass { + TAILQ_ENTRY(devclass) link; + devclass_t parent; /* parent in devclass hierarchy */ + devclasslink_list_t filters; /* these are used to hold information, + used for non-DRL_LOWEST drivers' classes */ + driver_list_t drivers; /* bus devclasses store drivers for bus */ + char *name; + device_t *devices; /* array of devices indexed by unit */ + int maxunit; /* size of devices array */ + + struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; -}; -/** - * @brief Implementation of device. - */ -struct device { - /* - * A device is a kernel object. The first field must be the - * current ops table for the object. - */ - KOBJ_FIELDS; /**< !TRICK: will init it to drv_compat_ctrl_driver - which gonna work around stacked drivers*/ - - /* - * Device hierarchy. - */ - TAILQ_ENTRY(device) link; /**< list of devices in parent */ - TAILQ_ENTRY(device) devlink; /**< global device list membership */ - devicelink_list_t parents; - devicelink_list_t children; /**< list of child devices */ - - /* - * Details of this device. - */ - driverinfolink_t driver; /**< current driver to be probed/attached/...*/ - int driver_level; - driverinfolink_list_t drivers[DRL_LEVELS]; - int driverinfo_flags; - devclass_t devclass; /**< current device class */ - int unit; /**< current unit number */ - char* nameunit; /**< name+unit e.g. foodev0 */ - char* desc; /**< driver specific description */ - int busy; /**< count of calls to device_busy() */ - device_state_t state; /**< current device state */ - u_int32_t devflags; /**< api level flags for device_get_flags() */ - u_short flags; /**< internal device flags */ -#define DF_ENABLED 1 /* device should be probed/attached */ -#define DF_FIXEDCLASS 2 /* devclass specified at create time */ -#define DF_WILDCARD 4 /* unit was originally wildcard */ -#define DF_DESCMALLOCED 8 /* description was malloced */ -#define DF_QUIET 16 /* don't print verbose attach message */ -#define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH again */ -#define DF_REBID 128 /* Can rebid after attach */ -#define DF_PERSISTENT 256 /* Should not delete when refs == 0*/ - u_char order; /**< order from device_add_child_ordered() */ - u_char pad; - //void *ivars; /**< instance variables */ - //void *softc; /**< current driver's variables */ - u_long refs; - int raw; - - struct sysctl_ctx_list sysctl_ctx; /**< state for sysctl variables */ - struct sysctl_oid *sysctl_tree; /**< state for sysctl variables */ -}; - -typedef struct devicelink* devicelink_t; -struct devicelink { - device_t device_ptr; -#define DLF_ANCHOR 1 - int flags; - TAILQ(devicelink) link; -}; - -static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures"); -static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc"); - -#ifdef BUS_DEBUG - -static int bus_debug = 1; -TUNABLE_INT("bus.debug", &bus_debug); -SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RW, &bus_debug, 0, - "Debug bus code"); - -#define PDEBUG(a) if (bus_debug) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");} -#define DEVICENAME(d) ((d)? device_get_name(d): "no device") -#define DRIVERNAME(d) ((d)? d->name : "no driver") -#define DEVCLANAME(d) ((d)? d->name : "no devclass") - -/** - * Produce the indenting, indent*2 spaces plus a '.' ahead of that to - * prevent syslog from deleting initial spaces - */ -#define indentprintf(p) do { int iJ; printf("."); for (iJ=0; iJparent ? dc->parent->name : ""; - break; - default: - return (EINVAL); - } - return (SYSCTL_OUT(req, value, strlen(value))); -} - -static void -devclass_sysctl_init(devclass_t dc) -{ - - if (dc->sysctl_tree != NULL) - return; - sysctl_ctx_init(&dc->sysctl_ctx); - dc->sysctl_tree = SYSCTL_ADD_NODE(&dc->sysctl_ctx, - SYSCTL_STATIC_CHILDREN(_dev), OID_AUTO, dc->name, - CTLFLAG_RD, 0, ""); - SYSCTL_ADD_PROC(&dc->sysctl_ctx, SYSCTL_CHILDREN(dc->sysctl_tree), - OID_AUTO, "%parent", CTLFLAG_RD, - dc, DEVCLASS_SYSCTL_PARENT, devclass_sysctl_handler, "A", - "parent class"); -} - -enum { - DEVICE_SYSCTL_DESC, - DEVICE_SYSCTL_DRIVER, - DEVICE_SYSCTL_LOCATION, - DEVICE_SYSCTL_PNPINFO, - DEVICE_SYSCTL_PARENT, -}; - -static int -device_sysctl_handler(SYSCTL_HANDLER_ARGS) -{ - device_t dev = (device_t)arg1; - const char *value; - char *buf; - int error; - int level; - driverinfolink_t dil; - - buf = NULL; - switch (arg2) { - case DEVICE_SYSCTL_DESC: - value = dev->desc ? dev->desc : ""; - break; - case DEVICE_SYSCTL_DRIVER: - value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO); - buf[0]='\0'; - for (level=DRL_LOWEST; level<=DRL_TOPMOST; level++){ - switch(level){ - case DRL_LOWEST: tmpbuf="LOWEST:"; break; - case DRL_LOWER: tmpbuf="LOWER:"; break; - case DRL_MIDDLE: tmpbuf="MIDDLE:"; break; - case DRL_UPPER: tmpbuf="UPPER:"; break; - case DRL_TOPMOST: tmpbuf="TOPMOST:"; break; - } - if (strlen(tmpbuf)+strlen(buf)>1023) break; - TAILQ_FOREACH(dil, &((dev->drivers)[level]), link){ - if(strlen(dil->pdriver->driver->name)+strlen(buf)>1022) - break; - strcat(buf,dil->pdriver->driver->name); - strcat(buf,","); - } - buf[strlen(buf)]='\0'; - strcat(buf,"\n"); - } - break; - case DEVICE_SYSCTL_LOCATION: - value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO); - bus_child_location_str(dev, buf, 1024); - break; - case DEVICE_SYSCTL_PNPINFO: - value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO); - bus_child_pnpinfo_str(dev, buf, 1024); - break; - case DEVICE_SYSCTL_PARENT: - value = dev->parent ? dev->parent->nameunit : ""; - break; - default: - return (EINVAL); - } - error = SYSCTL_OUT(req, value, strlen(value)); - if (buf != NULL) - free(buf, M_BUS); - return (error); -} - -static void -device_sysctl_init(device_t dev) -{ - devclass_t dc = dev->devclass; - - if (dev->sysctl_tree != NULL) - return; - devclass_sysctl_init(dc); - sysctl_ctx_init(&dev->sysctl_ctx); - dev->sysctl_tree = SYSCTL_ADD_NODE(&dev->sysctl_ctx, - SYSCTL_CHILDREN(dc->sysctl_tree), OID_AUTO, - dev->nameunit + strlen(dc->name), - CTLFLAG_RD, 0, ""); - SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), - OID_AUTO, "%desc", CTLFLAG_RD, - dev, DEVICE_SYSCTL_DESC, device_sysctl_handler, "A", - "device description"); - SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), - OID_AUTO, "%driver", CTLFLAG_RD, - dev, DEVICE_SYSCTL_DRIVER, device_sysctl_handler, "A", - "device drivers names"); - SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), - OID_AUTO, "%location", CTLFLAG_RD, - dev, DEVICE_SYSCTL_LOCATION, device_sysctl_handler, "A", - "device location relative to parent"); - SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), - OID_AUTO, "%pnpinfo", CTLFLAG_RD, - dev, DEVICE_SYSCTL_PNPINFO, device_sysctl_handler, "A", - "device identification"); - SYSCTL_ADD_PROC(&dev->sysctl_ctx, SYSCTL_CHILDREN(dev->sysctl_tree), - OID_AUTO, "%parent", CTLFLAG_RD, - dev, DEVICE_SYSCTL_PARENT, device_sysctl_handler, "A", - "parent device"); -} - -static void -device_sysctl_fini(device_t dev) -{ - if (dev->sysctl_tree == NULL) - return; - sysctl_ctx_free(&dev->sysctl_ctx); - dev->sysctl_tree = NULL; -} - -/* - * /dev/devctl implementation - */ - -/* - * This design allows only one reader for /dev/devctl. This is not desirable - * in the long run, but will get a lot of hair out of this implementation. - * Maybe we should make this device a clonable device. - * - * Also note: we specifically do not attach a device to the device_t tree - * to avoid potential chicken and egg problems. One could argue that all - * of this belongs to the root node. One could also further argue that the - * sysctl interface that we have not might more properly be an ioctl - * interface, but at this stage of the game, I'm not inclined to rock that - * boat. - * - * I'm also not sure that the SIGIO support is done correctly or not, as - * I copied it from a driver that had SIGIO support that likely hasn't been - * tested since 3.4 or 2.2.8! - */ - -static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS); -static int devctl_disable = 0; -TUNABLE_INT("hw.bus.devctl_disable", &devctl_disable); -SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, 0, 0, - sysctl_devctl_disable, "I", "devctl disable"); - -static d_open_t devopen; -static d_close_t devclose; -static d_read_t devread; -static d_ioctl_t devioctl; -static d_poll_t devpoll; - -static struct cdevsw dev_cdevsw = { - .d_version = D_VERSION, - .d_flags = D_NEEDGIANT, - .d_open = devopen, - .d_close = devclose, - .d_read = devread, - .d_ioctl = devioctl, - .d_poll = devpoll, - .d_name = "devctl", -}; - -struct dev_event_info -{ - char *dei_data; - TAILQ_ENTRY(dev_event_info) dei_link; -}; - -TAILQ_HEAD(devq, dev_event_info); - -static struct dev_softc -{ - int inuse; - int nonblock; - struct mtx mtx; - struct cv cv; - struct selinfo sel; - struct devq devq; - struct proc *async_proc; -} devsoftc; - -static struct cdev *devctl_dev; - -static void -devinit(void) -{ - devctl_dev = make_dev(&dev_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "devctl"); - mtx_init(&devsoftc.mtx, "dev mtx", "devd", MTX_DEF); - cv_init(&devsoftc.cv, "dev cv"); - TAILQ_INIT(&devsoftc.devq); -} - -static int -devopen(struct cdev *dev, int oflags, int devtype, d_thread_t *td) -{ - if (devsoftc.inuse) - return (EBUSY); - /* move to init */ - devsoftc.inuse = 1; - devsoftc.nonblock = 0; - devsoftc.async_proc = NULL; - return (0); -} - -static int -devclose(struct cdev *dev, int fflag, int devtype, d_thread_t *td) -{ - devsoftc.inuse = 0; - mtx_lock(&devsoftc.mtx); - cv_broadcast(&devsoftc.cv); - mtx_unlock(&devsoftc.mtx); - - return (0); -} - -/* - * The read channel for this device is used to report changes to - * userland in realtime. We are required to free the data as well as - * the n1 object because we allocate them separately. Also note that - * we return one record at a time. If you try to read this device a - * character at a time, you will loose the rest of the data. Listening - * programs are expected to cope. - */ -static int -devread(struct cdev *dev, struct uio *uio, int ioflag) -{ - struct dev_event_info *n1; - int rv; - - mtx_lock(&devsoftc.mtx); - while (TAILQ_EMPTY(&devsoftc.devq)) { - if (devsoftc.nonblock) { - mtx_unlock(&devsoftc.mtx); - return (EAGAIN); - } - rv = cv_wait_sig(&devsoftc.cv, &devsoftc.mtx); - if (rv) { - /* - * Need to translate ERESTART to EINTR here? -- jake - */ - mtx_unlock(&devsoftc.mtx); - return (rv); - } - } - n1 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n1, dei_link); - mtx_unlock(&devsoftc.mtx); - rv = uiomove(n1->dei_data, strlen(n1->dei_data), uio); - free(n1->dei_data, M_BUS); - free(n1, M_BUS); - return (rv); -} - -static int -devioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, d_thread_t *td) -{ - switch (cmd) { - - case FIONBIO: - if (*(int*)data) - devsoftc.nonblock = 1; - else - devsoftc.nonblock = 0; - return (0); - case FIOASYNC: - if (*(int*)data) - devsoftc.async_proc = td->td_proc; - else - devsoftc.async_proc = NULL; - return (0); - - /* (un)Support for other fcntl() calls. */ - case FIOCLEX: - case FIONCLEX: - case FIONREAD: - case FIOSETOWN: - case FIOGETOWN: - default: - break; - } - return (ENOTTY); -} - -static int -devpoll(struct cdev *dev, int events, d_thread_t *td) -{ - int revents = 0; - - mtx_lock(&devsoftc.mtx); - if (events & (POLLIN | POLLRDNORM)) { - if (!TAILQ_EMPTY(&devsoftc.devq)) - revents = events & (POLLIN | POLLRDNORM); - else - selrecord(td, &devsoftc.sel); - } - mtx_unlock(&devsoftc.mtx); - - return (revents); -} - -/** - * @brief Queue data to be read from the devctl device - * - * Generic interface to queue data to the devctl device. It is - * assumed that @p data is properly formatted. It is further assumed - * that @p data is allocated using the M_BUS malloc type. - */ -void -devctl_queue_data(char *data) -{ - struct dev_event_info *n1 = NULL; - struct proc *p; - - n1 = malloc(sizeof(*n1), M_BUS, M_NOWAIT); - if (n1 == NULL) - return; - n1->dei_data = data; - mtx_lock(&devsoftc.mtx); - TAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link); - cv_broadcast(&devsoftc.cv); - mtx_unlock(&devsoftc.mtx); - selwakeup(&devsoftc.sel); - p = devsoftc.async_proc; - if (p != NULL) { - PROC_LOCK(p); - psignal(p, SIGIO); - PROC_UNLOCK(p); - } -} - -/** - * @brief Send a 'notification' to userland, using standard ways - */ -void -devctl_notify(const char *system, const char *subsystem, const char *type, - const char *data) -{ - int len = 0; - char *msg; - - if (system == NULL) - return; /* BOGUS! Must specify system. */ - if (subsystem == NULL) - return; /* BOGUS! Must specify subsystem. */ - if (type == NULL) - return; /* BOGUS! Must specify type. */ - len += strlen(" system=") + strlen(system); - len += strlen(" subsystem=") + strlen(subsystem); - len += strlen(" type=") + strlen(type); - /* add in the data message plus newline. */ - if (data != NULL) - len += strlen(data); - len += 3; /* '!', '\n', and NUL */ - msg = malloc(len, M_BUS, M_NOWAIT); - if (msg == NULL) - return; /* Drop it on the floor */ - if (data != NULL) - snprintf(msg, len, "!system=%s subsystem=%s type=%s %s\n", - system, subsystem, type, data); - else - snprintf(msg, len, "!system=%s subsystem=%s type=%s\n", - system, subsystem, type); - devctl_queue_data(msg); -} - -/* - * Common routine that tries to make sending messages as easy as possible. - * We allocate memory for the data, copy strings into that, but do not - * free it unless there's an error. The dequeue part of the driver should - * free the data. We don't send data when the device is disabled. We do - * send data, even when we have no listeners, because we wish to avoid - * races relating to startup and restart of listening applications. - * - * devaddq is designed to string together the type of event, with the - * object of that event, plus the plug and play info and location info - * for that event. This is likely most useful for devices, but less - * useful for other consumers of this interface. Those should use - * the devctl_queue_data() interface instead. - */ -static void -devaddq(const char *type, const char *what, device_t dev) -{ - char *data = NULL; - char *loc = NULL; - char *pnp = NULL; - const char *parstr; - - if (devctl_disable) - return; - data = malloc(1024, M_BUS, M_NOWAIT); - if (data == NULL) - goto bad; - - /* get the bus specific location of this device */ - loc = malloc(1024, M_BUS, M_NOWAIT); - if (loc == NULL) - goto bad; - *loc = '\0'; - bus_child_location_str(dev, loc, 1024); - - /* Get the bus specific pnp info of this device */ - pnp = malloc(1024, M_BUS, M_NOWAIT); - if (pnp == NULL) - goto bad; - *pnp = '\0'; - bus_child_pnpinfo_str(dev, pnp, 1024); - - /* Get the parent of this device, or / if high enough in the tree. */ - if (device_get_parent(dev) == NULL) - parstr = "."; /* Or '/' ? */ - else - parstr = device_get_nameunit(device_get_parent(dev)); - /* String it all together. */ - snprintf(data, 1024, "%s%s at %s %s on %s\n", type, what, loc, pnp, - parstr); - free(loc, M_BUS); - free(pnp, M_BUS); - devctl_queue_data(data); - return; -bad: - free(pnp, M_BUS); - free(loc, M_BUS); - free(data, M_BUS); - return; -} - -/* - * A device was added to the tree. We are called just after it successfully - * attaches (that is, probe and attach success for this device). No call - * is made if a device is merely parented into the tree. See devnomatch - * if probe fails. If attach fails, no notification is sent (but maybe - * we should have a different message for this). - */ -static void -devadded(device_t dev) -{ - char *pnp = NULL; - char *tmp = NULL; - - pnp = malloc(1024, M_BUS, M_NOWAIT); - if (pnp == NULL) - goto fail; - tmp = malloc(1024, M_BUS, M_NOWAIT); - if (tmp == NULL) - goto fail; - *pnp = '\0'; - bus_child_pnpinfo_str(dev, pnp, 1024); - snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp); - devaddq("+", tmp, dev); -fail: - if (pnp != NULL) - free(pnp, M_BUS); - if (tmp != NULL) - free(tmp, M_BUS); - return; -} - -/* - * A device was removed from the tree. We are called just before this - * happens. - */ -static void -devremoved(device_t dev) -{ - char *pnp = NULL; - char *tmp = NULL; - - pnp = malloc(1024, M_BUS, M_NOWAIT); - if (pnp == NULL) - goto fail; - tmp = malloc(1024, M_BUS, M_NOWAIT); - if (tmp == NULL) - goto fail; - *pnp = '\0'; - bus_child_pnpinfo_str(dev, pnp, 1024); - snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp); - devaddq("-", tmp, dev); -fail: - if (pnp != NULL) - free(pnp, M_BUS); - if (tmp != NULL) - free(tmp, M_BUS); - return; -} - -/* - * Called when there's no match for this device. This is only called - * the first time that no match happens, so we don't keep getitng this - * message. Should that prove to be undesirable, we can change it. - * This is called when all drivers that can attach to a given bus - * decline to accept this device. Other errrors may not be detected. - */ -static void -devnomatch(device_t dev) -{ - devaddq("?", "", dev); -} - -static int -sysctl_devctl_disable(SYSCTL_HANDLER_ARGS) -{ - struct dev_event_info *n1; - int dis, error; - - dis = devctl_disable; - error = sysctl_handle_int(oidp, &dis, 0, req); - if (error || !req->newptr) - return (error); - mtx_lock(&devsoftc.mtx); - devctl_disable = dis; - if (dis) { - while (!TAILQ_EMPTY(&devsoftc.devq)) { - n1 = TAILQ_FIRST(&devsoftc.devq); - TAILQ_REMOVE(&devsoftc.devq, n1, dei_link); - free(n1->dei_data, M_BUS); - free(n1, M_BUS); - } - } - mtx_unlock(&devsoftc.mtx); - return (0); -} - -/* End of /dev/devctl code */ - -TAILQ_HEAD(,device) bus_data_devices; -static int bus_data_generation = 1; - -kobj_method_t null_methods[] = { - { 0, 0 } -}; - -DEFINE_CLASS(null, null_methods, 0); - -/* - * Driver compatibility layer implementation - */ - -static driverinfo_list_t driverinfos = TAILQ_HEAD_INITIALIZER(driverinfos); - -/** - * @internal - * - * Is used, when a driver s used in an API function, - * but is not in driverinfos. Eg. may happen, if - * device_set_driver is called by a bus with driver, set - * to kobj_class, which wasn't registered by DRIVER_MODULE(). - */ -static drv_internal_t -driverinfo_create_driver_drv_internal (driver_t *driver){ - drv_internal_t new_drv; - - new_drv = malloc (sizeof(struct drv_internal), M_TEMP, M_NOWAIT|M_ZERO); - if (new_drv){ - new_drv.devops = driver; - new_drv.flags = DR_LOWEST; - } - return (new_drv); -} -/** - * @internal - * @brief Find or add driver compatibility settings - * - * If a driver is already present in compatibility layer - * return it, else, if @p add non-zero, add it. - * - * @param driver the device class and flags - * @param add non-zero to add driver to layer - */ -static driverinfo_t -driverinfo_find_internal (drv_internal_t driver, int add) { - driverinfo_t di; - - PDEBUG(("looking for driver %s to compatibility layer", driver->devops->name)); - if (!driver) - return (NULL); - - TAILQ_FOREACH(di, &driverinfos, link){ - if (driver->devops == di->driver) - break; - } - - if (!di && add){ - PDEBUG(("adding driver %s to compatibility layer", driver->devops->name)); - di = malloc(sizeof(struct driverinfo), M_BUS, M_NOWAIT|M_ZERO); - if (!di) - return (NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 14 20:27:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93E0C16A41A; Sun, 14 Oct 2007 20:27: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 31D9C16A418 for ; Sun, 14 Oct 2007 20:27:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F24CF13C457 for ; Sun, 14 Oct 2007 20:27:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9EKReoL029081 for ; Sun, 14 Oct 2007 20:27:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9EKRebC029078 for perforce@freebsd.org; Sun, 14 Oct 2007 20:27:40 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 20:27:40 GMT Message-Id: <200710142027.l9EKRebC029078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127523 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, 14 Oct 2007 20:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=127523 Change 127523 by kmacy@kmacy_home:ethng on 2007/10/14 20:27:01 initial boiler plate for iWARP support Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#1 add .. //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 14 21:11:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB2E216A421; Sun, 14 Oct 2007 21:11: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 2ACEA16A41A for ; Sun, 14 Oct 2007 21:11:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C54113C447 for ; Sun, 14 Oct 2007 21:11:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ELBUBd041491 for ; Sun, 14 Oct 2007 21:11:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ELBTmg041488 for perforce@freebsd.org; Sun, 14 Oct 2007 21:11:29 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 21:11:29 GMT Message-Id: <200710142111.l9ELBTmg041488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127525 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, 14 Oct 2007 21:11:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127525 Change 127525 by kmacy@kmacy_home:ethng on 2007/10/14 21:10:31 convert low-level driver code over to referencing the t3cdev I was misinformed about the naming of t3cdev - leading me to believe it was meant to be the same thing as toedev which is definitely not the case Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#22 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.c#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.h#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#25 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#5 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#4 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#32 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#22 (text+ko) ==== @@ -55,10 +55,12 @@ #ifdef CONFIG_DEFINED #include +#include #include #include #else #include +#include #include #include #endif @@ -401,7 +403,7 @@ struct port_info port[MAX_NPORTS]; device_t portdev[MAX_NPORTS]; - struct toedev tdev; + struct t3cdev tdev; char fw_version[64]; uint32_t open_device_map; uint32_t registered_device_map; @@ -527,7 +529,7 @@ void t3_os_link_changed(adapter_t *adapter, int port_id, int link_status, int speed, int duplex, int fc); void t3_sge_err_intr_handler(adapter_t *adapter); -int t3_offload_tx(struct toedev *, struct mbuf *); +int t3_offload_tx(struct t3cdev *, struct mbuf *); void t3_os_ext_intr_handler(adapter_t *adapter); void t3_os_set_hw_addr(adapter_t *adapter, int port_idx, u8 hw_addr[]); int t3_mgmt_tx(adapter_t *adap, struct mbuf *m); @@ -587,7 +589,7 @@ } static __inline struct adapter * -tdev2adap(struct toedev *d) +tdev2adap(struct t3cdev *d) { return container_of(d, struct adapter, tdev); } ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.c#3 (text+ko) ==== @@ -117,7 +117,7 @@ * entry locked. */ static int -setup_l2e_send_pending(struct toedev *dev, struct mbuf *m, +setup_l2e_send_pending(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { struct cpl_l2t_write_req *req; @@ -168,7 +168,7 @@ } int -t3_l2t_send_slow(struct toedev *dev, struct mbuf *m, +t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { struct rtentry *rt; @@ -222,7 +222,7 @@ } void -t3_l2t_send_event(struct toedev *dev, struct l2t_entry *e) +t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e) { struct rtentry *rt; struct mbuf *m0; @@ -357,7 +357,7 @@ } struct l2t_entry * -t3_l2t_get(struct toedev *dev, struct rtentry *neigh, +t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, unsigned int smt_idx) { struct l2t_entry *e; @@ -413,7 +413,7 @@ * handler. */ static void -handle_failed_resolution(struct toedev *dev, struct mbuf *arpq) +handle_failed_resolution(struct t3cdev *dev, struct mbuf *arpq) { while (arpq) { @@ -439,7 +439,7 @@ * loaded into the HW L2 table. */ void -t3_l2t_update(struct toedev *dev, struct rtentry *neigh) +t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) { struct l2t_entry *e; struct mbuf *arpq = NULL; @@ -489,7 +489,7 @@ * Called from a kprobe, interrupts are off. */ void -t3_l2t_update(struct toedev *dev, struct rtentry *neigh) +t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) { struct l2t_entry *e; struct l2t_data *d = L2DATA(dev); @@ -519,7 +519,7 @@ struct mbuf *arpq = NULL; struct l2t_entry *e = (struct l2t_entry *)data; struct rtentry *neigh = e->neigh; - struct toedev *dev = e->tdev; + struct t3cdev *dev = e->tdev; barrier(); if (!atomic_load_acq_int(&e->refcnt)) ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.h#3 (text+ko) ==== @@ -79,7 +79,7 @@ #ifndef NETEVENT #ifdef CONFIG_CHELSIO_T3_MODULE struct timer_list update_timer; - struct toedev *tdev; + struct t3cdev *tdev; #endif #endif }; @@ -92,7 +92,7 @@ struct l2t_entry l2tab[0]; }; -typedef void (*arp_failure_handler_func)(struct toedev *dev, +typedef void (*arp_failure_handler_func)(struct t3cdev *dev, struct mbuf *m); /* @@ -123,12 +123,12 @@ #define L2DATA(dev) ((dev)->l2opt) void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e); -void t3_l2t_update(struct toedev *dev, struct rtentry *ifp); -struct l2t_entry *t3_l2t_get(struct toedev *dev, struct rtentry *neigh, +void t3_l2t_update(struct t3cdev *dev, struct rtentry *ifp); +struct l2t_entry *t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, unsigned int smt_idx); -int t3_l2t_send_slow(struct toedev *dev, struct mbuf *m, +int t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e); -void t3_l2t_send_event(struct toedev *dev, struct l2t_entry *e); +void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e); struct l2t_data *t3_init_l2t(unsigned int l2t_capacity); void t3_free_l2t(struct l2t_data *d); @@ -140,9 +140,9 @@ #define l2t_proc_free(dir) #endif -int cxgb_ofld_send(struct toedev *dev, struct mbuf *m); +int cxgb_ofld_send(struct t3cdev *dev, struct mbuf *m); -static inline int l2t_send(struct toedev *dev, struct mbuf *m, +static inline int l2t_send(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { if (__predict_true(e->state == L2T_STATE_VALID)) ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#25 (text+ko) ==== @@ -121,7 +121,7 @@ static void touch_bars(device_t dev); #ifdef notyet -static int offload_close(struct toedev *tdev); +static int offload_close(struct t3cdev *tdev); #endif static device_method_t cxgb_controller_methods[] = { @@ -1284,7 +1284,7 @@ * after dealing with any active network taps. */ static inline int -offload_tx(struct toedev *tdev, struct mbuf *m) +offload_tx(struct t3cdev *tdev, struct mbuf *m) { int ret; @@ -1605,7 +1605,7 @@ offload_open(struct port_info *pi) { struct adapter *adapter = pi->adapter; - struct toedev *tdev = TOEDEV(pi->ifp); + struct t3cdev *tdev = T3CDEV(pi->ifp); int adap_up = adapter->open_device_map & PORT_MASK; int err = 0; @@ -1648,7 +1648,7 @@ } #ifdef notyet static int -offload_close(struct toedev *tdev) +offload_close(struct t3cdev *tdev) { struct adapter *adapter = tdev2adap(tdev); ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#5 (text+ko) ==== @@ -74,7 +74,7 @@ TAILQ_HEAD(, cxgb_client) client_list; -TAILQ_HEAD(, toedev) ofld_dev_list; +TAILQ_HEAD(, t3cdev) ofld_dev_list; TAILQ_HEAD(, adapter) adapter_list; static struct mtx cxgb_db_lock; @@ -86,7 +86,7 @@ static int inited = 0; static inline int -offload_activated(struct toedev *tdev) +offload_activated(struct t3cdev *tdev) { struct adapter *adapter = tdev2adap(tdev); @@ -103,7 +103,7 @@ void cxgb_register_client(struct cxgb_client *client) { - struct toedev *tdev; + struct t3cdev *tdev; mtx_lock(&cxgb_db_lock); TAILQ_INSERT_TAIL(&client_list, client, client_entry); @@ -127,7 +127,7 @@ void cxgb_unregister_client(struct cxgb_client *client) { - struct toedev *tdev; + struct t3cdev *tdev; mtx_lock(&cxgb_db_lock); TAILQ_REMOVE(&client_list, client, client_entry); @@ -148,7 +148,7 @@ * Call backs all registered clients once a offload device is activated */ void -cxgb_add_clients(struct toedev *tdev) +cxgb_add_clients(struct t3cdev *tdev) { struct cxgb_client *client; @@ -167,7 +167,7 @@ * Call backs all registered clients once a offload device is deactivated */ void -cxgb_remove_clients(struct toedev *tdev) +cxgb_remove_clients(struct t3cdev *tdev) { struct cxgb_client *client; @@ -365,7 +365,7 @@ } static int -cxgb_offload_ctl(struct toedev *tdev, unsigned int req, void *data) +cxgb_offload_ctl(struct t3cdev *tdev, unsigned int req, void *data) { struct adapter *adapter = tdev2adap(tdev); struct tid_range *tid; @@ -463,7 +463,7 @@ * normal to get offload packets at this stage. */ static int -rx_offload_blackhole(struct toedev *dev, struct mbuf **m, int n) +rx_offload_blackhole(struct t3cdev *dev, struct mbuf **m, int n) { CH_ERR(tdev2adap(dev), "%d unexpected offload packets, first data 0x%x\n", n, *mtod(m[0], uint32_t *)); @@ -473,12 +473,12 @@ } static void -dummy_neigh_update(struct toedev *dev, struct rtentry *neigh) +dummy_neigh_update(struct t3cdev *dev, struct rtentry *neigh) { } void -cxgb_set_dummy_ops(struct toedev *dev) +cxgb_set_dummy_ops(struct t3cdev *dev) { dev->recv = rx_offload_blackhole; dev->neigh_update = dummy_neigh_update; @@ -488,7 +488,7 @@ * Free an active-open TID. */ void * -cxgb_free_atid(struct toedev *tdev, int atid) +cxgb_free_atid(struct t3cdev *tdev, int atid) { struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; union active_open_entry *p = atid2entry(t, atid); @@ -507,7 +507,7 @@ * Free a server TID and return it to the free pool. */ void -cxgb_free_stid(struct toedev *tdev, int stid) +cxgb_free_stid(struct t3cdev *tdev, int stid) { struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; union listen_entry *p = stid2entry(t, stid); @@ -520,7 +520,7 @@ } void -cxgb_insert_tid(struct toedev *tdev, struct cxgb_client *client, +cxgb_insert_tid(struct t3cdev *tdev, struct cxgb_client *client, void *ctx, unsigned int tid) { struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; @@ -548,7 +548,7 @@ t3_process_tid_release_list(void *data, int pending) { struct mbuf *m; - struct toedev *tdev = data; + struct t3cdev *tdev = data; struct toe_data *td = TOE_DATA(tdev); mtx_lock(&td->tid_release_lock); @@ -568,7 +568,7 @@ /* use ctx as a next pointer in the tid release list */ void -cxgb_queue_tid_release(struct toedev *tdev, unsigned int tid) +cxgb_queue_tid_release(struct t3cdev *tdev, unsigned int tid) { struct toe_data *td = TOE_DATA(tdev); struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid]; @@ -591,7 +591,7 @@ * to the original client context. */ void -cxgb_remove_tid(struct toedev *tdev, void *ctx, unsigned int tid) +cxgb_remove_tid(struct t3cdev *tdev, void *ctx, unsigned int tid) { struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; @@ -613,7 +613,7 @@ } int -cxgb_alloc_atid(struct toedev *tdev, struct cxgb_client *client, +cxgb_alloc_atid(struct t3cdev *tdev, struct cxgb_client *client, void *ctx) { int atid = -1; @@ -634,7 +634,7 @@ } int -cxgb_alloc_stid(struct toedev *tdev, struct cxgb_client *client, +cxgb_alloc_stid(struct t3cdev *tdev, struct cxgb_client *client, void *ctx) { int stid = -1; @@ -655,7 +655,7 @@ } static int -do_smt_write_rpl(struct toedev *dev, struct mbuf *m) +do_smt_write_rpl(struct t3cdev *dev, struct mbuf *m) { struct cpl_smt_write_rpl *rpl = cplhdr(m); @@ -668,7 +668,7 @@ } static int -do_l2t_write_rpl(struct toedev *dev, struct mbuf *m) +do_l2t_write_rpl(struct t3cdev *dev, struct mbuf *m) { struct cpl_l2t_write_rpl *rpl = cplhdr(m); @@ -681,7 +681,7 @@ } static int -do_act_open_rpl(struct toedev *dev, struct mbuf *m) +do_act_open_rpl(struct t3cdev *dev, struct mbuf *m) { struct cpl_act_open_rpl *rpl = cplhdr(m); unsigned int atid = G_TID(ntohl(rpl->atid)); @@ -700,7 +700,7 @@ } static int -do_stid_rpl(struct toedev *dev, struct mbuf *m) +do_stid_rpl(struct t3cdev *dev, struct mbuf *m) { union opcode_tid *p = cplhdr(m); unsigned int stid = G_TID(ntohl(p->opcode_tid)); @@ -718,7 +718,7 @@ } static int -do_hwtid_rpl(struct toedev *dev, struct mbuf *m) +do_hwtid_rpl(struct t3cdev *dev, struct mbuf *m) { union opcode_tid *p = cplhdr(m); unsigned int hwtid; @@ -743,7 +743,7 @@ } static int -do_cr(struct toedev *dev, struct mbuf *m) +do_cr(struct t3cdev *dev, struct mbuf *m) { struct cpl_pass_accept_req *req = cplhdr(m); unsigned int stid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); @@ -762,7 +762,7 @@ } static int -do_abort_req_rss(struct toedev *dev, struct mbuf *m) +do_abort_req_rss(struct t3cdev *dev, struct mbuf *m) { union opcode_tid *p = cplhdr(m); unsigned int hwtid = G_TID(ntohl(p->opcode_tid)); @@ -801,7 +801,7 @@ } static int -do_act_establish(struct toedev *dev, struct mbuf *m) +do_act_establish(struct t3cdev *dev, struct mbuf *m) { struct cpl_act_establish *req = cplhdr(m); unsigned int atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); @@ -820,7 +820,7 @@ } static int -do_set_tcb_rpl(struct toedev *dev, struct mbuf *m) +do_set_tcb_rpl(struct t3cdev *dev, struct mbuf *m) { struct cpl_set_tcb_rpl *rpl = cplhdr(m); @@ -832,7 +832,7 @@ } static int -do_trace(struct toedev *dev, struct mbuf *m) +do_trace(struct t3cdev *dev, struct mbuf *m) { #if 0 struct cpl_trace_pkt *p = cplhdr(m); @@ -848,7 +848,7 @@ } static int -do_term(struct toedev *dev, struct mbuf *m) +do_term(struct t3cdev *dev, struct mbuf *m) { unsigned int hwtid = ntohl(m_get_priority(m)) >> 8 & 0xfffff; unsigned int opcode = G_OPCODE(ntohl(m->m_pkthdr.csum_data)); @@ -1088,7 +1088,7 @@ * Process a received packet with an unknown/unexpected CPL opcode. */ static int -do_bad_cpl(struct toedev *dev, struct mbuf *m) +do_bad_cpl(struct t3cdev *dev, struct mbuf *m) { log(LOG_ERR, "%s: received bad CPL command 0x%x\n", dev->name, *mtod(m, uint32_t *)); @@ -1115,10 +1115,10 @@ } /* - * TOEDEV's receive method. + * T3CDEV's receive method. */ int -process_rx(struct toedev *dev, struct mbuf **m, int n) +process_rx(struct t3cdev *dev, struct mbuf **m, int n) { while (n--) { struct mbuf *m0 = *m++; @@ -1144,7 +1144,7 @@ * Sends an sk_buff to a T3C driver after dealing with any active network taps. */ int -cxgb_ofld_send(struct toedev *dev, struct mbuf *m) +cxgb_ofld_send(struct t3cdev *dev, struct mbuf *m) { int r; @@ -1167,7 +1167,7 @@ * it the whole array at once except when there are active taps. */ int -cxgb_ofld_recv(struct toedev *dev, struct mbuf **m, int n) +cxgb_ofld_recv(struct t3cdev *dev, struct mbuf **m, int n) { #if defined(CONFIG_CHELSIO_T3) @@ -1191,7 +1191,7 @@ { if (is_offloading(rt->rt_ifp)) { - struct toedev *tdev = TOEDEV(rt->rt_ifp); + struct t3cdev *tdev = T3CDEV(rt->rt_ifp); BUG_ON(!tdev); t3_l2t_update(tdev, rt); @@ -1199,7 +1199,7 @@ } static void -set_l2t_ix(struct toedev *tdev, u32 tid, struct l2t_entry *e) +set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) { struct mbuf *m; struct cpl_set_tcb_field *req; @@ -1227,7 +1227,7 @@ { struct ifnet *olddev, *newdev; struct tid_info *ti; - struct toedev *tdev; + struct t3cdev *tdev; u32 tid; int update_tcb; struct l2t_entry *e; @@ -1242,9 +1242,9 @@ "device ignored.\n", __FUNCTION__); return; } - tdev = TOEDEV(olddev); + tdev = T3CDEV(olddev); BUG_ON(!tdev); - if (tdev != TOEDEV(newdev)) { + if (tdev != T3CDEV(newdev)) { log(LOG_WARNING, "%s: Redirect to different " "offload device ignored.\n", __FUNCTION__); return; @@ -1371,7 +1371,7 @@ int cxgb_offload_activate(struct adapter *adapter) { - struct toedev *dev = &adapter->tdev; + struct t3cdev *dev = &adapter->tdev; int natids, err; struct toe_data *t; struct tid_range stid_range, tid_range; @@ -1437,7 +1437,7 @@ void cxgb_offload_deactivate(struct adapter *adapter) { - struct toedev *tdev = &adapter->tdev; + struct t3cdev *tdev = &adapter->tdev; struct toe_data *t = TOE_DATA(tdev); remove_adapter(adapter); @@ -1455,7 +1455,7 @@ static inline void -register_tdev(struct toedev *tdev) +register_tdev(struct t3cdev *tdev) { static int unit; @@ -1466,7 +1466,7 @@ } static inline void -unregister_tdev(struct toedev *tdev) +unregister_tdev(struct t3cdev *tdev) { mtx_lock(&cxgb_db_lock); TAILQ_REMOVE(&ofld_dev_list, tdev, ofld_entry); @@ -1476,7 +1476,7 @@ void cxgb_adapter_ofld(struct adapter *adapter) { - struct toedev *tdev = &adapter->tdev; + struct t3cdev *tdev = &adapter->tdev; cxgb_set_dummy_ops(tdev); tdev->send = t3_offload_tx; @@ -1493,7 +1493,7 @@ void cxgb_adapter_unofld(struct adapter *adapter) { - struct toedev *tdev = &adapter->tdev; + struct t3cdev *tdev = &adapter->tdev; #if 0 offload_proc_dev_cleanup(tdev); offload_proc_dev_exit(tdev); @@ -1615,7 +1615,7 @@ int length, int *eof, void *data) { int len; - struct toedev *dev; + struct t3cdev *dev; struct net_device *ndev; len = sprintf(buf, "Device Interfaces\n"); @@ -1625,7 +1625,7 @@ len += sprintf(buf + len, "%-16s", dev->name); read_lock(&dev_base_lock); for (ndev = dev_base; ndev; ndev = ndev->next) { - if (TOEDEV(ndev) == dev) + if (T3CDEV(ndev) == dev) len += sprintf(buf + len, " %s", ndev->name); } read_unlock(&dev_base_lock); ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#4 (text+ko) ==== @@ -38,11 +38,13 @@ #include #include #include +#include #else #include #include #include #include +#include #endif struct adapter; @@ -55,30 +57,30 @@ void cxgb_adapter_unofld(struct adapter *adapter); int cxgb_offload_activate(struct adapter *adapter); void cxgb_offload_deactivate(struct adapter *adapter); -int cxgb_ofld_recv(struct toedev *dev, struct mbuf **m, int n); +int cxgb_ofld_recv(struct t3cdev *dev, struct mbuf **m, int n); -void cxgb_set_dummy_ops(struct toedev *dev); +void cxgb_set_dummy_ops(struct t3cdev *dev); /* * Client registration. Users of T3 driver must register themselves. * The T3 driver will call the add function of every client for each T3 - * adapter activated, passing up the toedev ptr. Each client fills out an + * adapter activated, passing up the t3cdev ptr. Each client fills out an * array of callback functions to process CPL messages. */ void cxgb_register_client(struct cxgb_client *client); void cxgb_unregister_client(struct cxgb_client *client); -void cxgb_add_clients(struct toedev *tdev); -void cxgb_remove_clients(struct toedev *tdev); +void cxgb_add_clients(struct t3cdev *tdev); +void cxgb_remove_clients(struct t3cdev *tdev); -typedef int (*cxgb_cpl_handler_func)(struct toedev *dev, +typedef int (*cxgb_cpl_handler_func)(struct t3cdev *dev, struct mbuf *m, void *ctx); struct cxgb_client { char *name; - void (*add) (struct toedev *); - void (*remove) (struct toedev *); + void (*add) (struct t3cdev *); + void (*remove) (struct t3cdev *); cxgb_cpl_handler_func *handlers; int (*redirect)(void *ctx, struct rtentry *old, struct rtentry *new, @@ -89,17 +91,17 @@ /* * TID allocation services. */ -int cxgb_alloc_atid(struct toedev *dev, struct cxgb_client *client, +int cxgb_alloc_atid(struct t3cdev *dev, struct cxgb_client *client, void *ctx); -int cxgb_alloc_stid(struct toedev *dev, struct cxgb_client *client, +int cxgb_alloc_stid(struct t3cdev *dev, struct cxgb_client *client, void *ctx); -void *cxgb_free_atid(struct toedev *dev, int atid); -void cxgb_free_stid(struct toedev *dev, int stid); -void cxgb_insert_tid(struct toedev *dev, struct cxgb_client *client, +void *cxgb_free_atid(struct t3cdev *dev, int atid); +void cxgb_free_stid(struct t3cdev *dev, int stid); +void cxgb_insert_tid(struct t3cdev *dev, struct cxgb_client *client, void *ctx, unsigned int tid); -void cxgb_queue_tid_release(struct toedev *dev, unsigned int tid); -void cxgb_remove_tid(struct toedev *dev, void *ctx, unsigned int tid); +void cxgb_queue_tid_release(struct t3cdev *dev, unsigned int tid); +void cxgb_remove_tid(struct t3cdev *dev, void *ctx, unsigned int tid); struct toe_tid_entry { struct cxgb_client *client; @@ -123,7 +125,7 @@ CPL_RET_UNKNOWN_TID = 4 // unexpected unknown TID }; -typedef int (*cpl_handler_func)(struct toedev *dev, struct mbuf *m); +typedef int (*cpl_handler_func)(struct t3cdev *dev, struct mbuf *m); /* * Returns a pointer to the first byte of the CPL header in an sk_buff that @@ -185,7 +187,7 @@ #ifdef notyet struct list_head list_node; #endif - struct toedev *dev; + struct t3cdev *dev; unsigned int tx_max_chunk; /* max payload for TX_DATA */ unsigned int max_wrs; /* max in-flight WRs per connection */ unsigned int nmtus; @@ -198,7 +200,7 @@ }; /* - * toedev -> toe_data accessor + * t3cdev -> toe_data accessor */ #define TOE_DATA(dev) (*(struct toe_data **)&(dev)->l4opt) @@ -253,9 +255,9 @@ void cxgb_free_mem(void *addr); void cxgb_neigh_update(struct rtentry *rt); void cxgb_redirect(struct rtentry *old, struct rtentry *new); -int process_rx(struct toedev *dev, struct mbuf **m, int n); -int attach_toedev(struct toedev *dev); -void detach_toedev(struct toedev *dev); +int process_rx(struct t3cdev *dev, struct mbuf **m, int n); +int attach_t3cdev(struct t3cdev *dev); +void detach_t3cdev(struct t3cdev *dev); #endif ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#32 (text+ko) ==== @@ -2168,7 +2168,7 @@ * should be sent as regular or control, bits 1-3 select the queue set. */ int -t3_offload_tx(struct toedev *tdev, struct mbuf *m) +t3_offload_tx(struct t3cdev *tdev, struct mbuf *m) { adapter_t *adap = tdev2adap(tdev); struct sge_qset *qs = &adap->sge.qs[queue_set(m)]; @@ -2189,7 +2189,7 @@ * Delivers a (partial) bundle of Rx offload packets to an offload device. */ static __inline void -deliver_partial_bundle(struct toedev *tdev, +deliver_partial_bundle(struct t3cdev *tdev, struct sge_rspq *q, struct mbuf *mbufs[], int n) { @@ -2200,7 +2200,7 @@ } static __inline int -rx_offload(struct toedev *tdev, struct sge_rspq *rq, +rx_offload(struct t3cdev *tdev, struct sge_rspq *rq, struct mbuf *m, struct mbuf *rx_gather[], unsigned int gather_idx) { ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 (text+ko) ==== @@ -79,15 +79,8 @@ struct socket; struct mbuf; -enum toetype { - T3A = 0, - T3B -}; - struct toedev { char name[TOENAMSIZ]; /* TOE device name */ - enum toetype type; - struct adapter *adapter; unsigned int ttid; /* TOE type id */ unsigned long flags; /* device flags */ unsigned int mtu; /* max size of TX offloaded data */ From owner-p4-projects@FreeBSD.ORG Sun Oct 14 22:00:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5D316A418; Sun, 14 Oct 2007 22:00: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 D0E3B16A419 for ; Sun, 14 Oct 2007 22:00:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B529813C44B for ; Sun, 14 Oct 2007 22:00:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9EM0Mfp045980 for ; Sun, 14 Oct 2007 22:00:22 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9EM0Mj2045977 for perforce@freebsd.org; Sun, 14 Oct 2007 22:00:22 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 14 Oct 2007 22:00:22 GMT Message-Id: <200710142200.l9EM0Mj2045977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127528 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, 14 Oct 2007 22:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127528 Change 127528 by zec@zec_tpx32 on 2007/10/14 21:59:52 Per-vprocg load average accounting seems to work fine with SCHED_ULE, so remove a stale comment questioning this. Protect reassignment of a loadavg accounting state from one vprocg to another by pinning the thread to current CPU if the kernel was configured to use SCHED_ULE. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_exit.c#11 edit .. //depot/projects/vimage/src/sys/kern/sched_ule.c#14 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#11 (text+ko) ==== @@ -414,7 +414,7 @@ LIST_REMOVE(p, p_list); LIST_INSERT_HEAD(&zombproc, p, p_list); LIST_REMOVE(p, p_hash); -#if defined(VIMAGE) && defined(SCHED_4BSD) /* XXX what about ULE? */ +#if defined(VIMAGE) && defined(SCHED_4BSD) if (p->p_ucred->cr_vimage->v_procg != p->p_pptr->p_ucred->cr_vimage->v_procg) { sched_load_reassign(p->p_ucred->cr_vimage->v_procg, ==== //depot/projects/vimage/src/sys/kern/sched_ule.c#14 (text+ko) ==== @@ -2625,9 +2625,10 @@ void sched_load_reassign(struct vprocg *old, struct vprocg *new) { - /* XXX locking! */ + critical_enter(); old->_tdq_load[curcpu]--; new->_tdq_load[curcpu]++; + critical_exit(); } #endif From owner-p4-projects@FreeBSD.ORG Sun Oct 14 22:33:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19EFB16A421; Sun, 14 Oct 2007 22:33: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 C0C3A16A419 for ; Sun, 14 Oct 2007 22:33:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A554813C4A7 for ; Sun, 14 Oct 2007 22:33:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9EMX1LI050005 for ; Sun, 14 Oct 2007 22:33:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9EMX1Eo050002 for perforce@freebsd.org; Sun, 14 Oct 2007 22:33:01 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 22:33:01 GMT Message-Id: <200710142233.l9EMX1Eo050002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127530 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, 14 Oct 2007 22:33:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=127530 Change 127530 by kmacy@kmacy_home:ethng on 2007/10/14 22:32:53 pull dual-licensed rdma headers into sys/contrib Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_addr.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_cache.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_cm.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_fmr_pool.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_mad.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_marshall.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_pack.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_smi.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_cm.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_mad.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_sa.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_verbs.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/iw_cm.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_cm.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_cm_ib.h#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_user_cm.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 14 23:32:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9652416A421; Sun, 14 Oct 2007 23:32: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 4CD5016A418 for ; Sun, 14 Oct 2007 23:32:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1906F13C459 for ; Sun, 14 Oct 2007 23:32:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ENW4b0054178 for ; Sun, 14 Oct 2007 23:32:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ENW4Bs054175 for perforce@freebsd.org; Sun, 14 Oct 2007 23:32:04 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 23:32:04 GMT Message-Id: <200710142332.l9ENW4Bs054175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127531 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, 14 Oct 2007 23:32:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=127531 Change 127531 by kmacy@kmacy_home:ethng on 2007/10/14 23:31:03 linux compatibility defines Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Oct 14 23:33:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA20A16A41B; Sun, 14 Oct 2007 23:33: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 7EB5B16A417 for ; Sun, 14 Oct 2007 23:33:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 636EA13C447 for ; Sun, 14 Oct 2007 23:33:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ENX6KI054219 for ; Sun, 14 Oct 2007 23:33:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ENX6FL054216 for perforce@freebsd.org; Sun, 14 Oct 2007 23:33:06 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 23:33:06 GMT Message-Id: <200710142333.l9ENX6FL054216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127532 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, 14 Oct 2007 23:33:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=127532 Change 127532 by kmacy@kmacy_home:ethng on 2007/10/14 23:32:13 convert items with linux analogues - ifdef out dma routines Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#2 (text+ko) ==== @@ -38,19 +38,12 @@ * $Id: ib_verbs.h 1349 2004-12-16 21:09:43Z roland $ */ + #if !defined(IB_VERBS_H) #define IB_VERBS_H -#include -#include -#include -#include -#include +#include -#include -#include -#include - union ib_gid { u8 raw[16]; struct { @@ -73,7 +66,7 @@ }; enum rdma_transport_type -rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__; +rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__ ; enum ib_device_cap_flags { IB_DEVICE_RESIZE_MAX_WR = 1, @@ -294,7 +287,7 @@ struct ib_event_handler { struct ib_device *device; void (*handler)(struct ib_event_handler *, struct ib_event *); - struct list_head list; + TAILQ_ENTRY(ib_event_handler) entry; }; #define INIT_IB_EVENT_HANDLER(_ptr, _device, _handler) \ @@ -701,15 +694,19 @@ u8 page_shift; }; +/* + * XXX can this really be on 7 different lists at once? + * + */ struct ib_ucontext { struct ib_device *device; - struct list_head pd_list; - struct list_head mr_list; - struct list_head mw_list; - struct list_head cq_list; - struct list_head qp_list; - struct list_head srq_list; - struct list_head ah_list; + TAILQ_ENTRY(ib_ucontext) pd_list; + TAILQ_ENTRY(ib_ucontext) mr_list; + TAILQ_ENTRY(ib_ucontext) mw_list; + TAILQ_ENTRY(ib_ucontext) cq_list; + TAILQ_ENTRY(ib_ucontext) qp_list; + TAILQ_ENTRY(ib_ucontext) srq_list; + TAILQ_ENTRY(ib_ucontext) ah_list; int closing; }; @@ -717,9 +714,9 @@ u64 user_handle; /* handle given to us by userspace */ struct ib_ucontext *context; /* associated user context */ void *object; /* containing object */ - struct list_head list; /* link to context's list */ + TAILQ_ENTRY(ib_uobject) entry; /* link to context's list */ u32 id; /* index into kernel idr */ - struct kref ref; + atomic_t ref; struct rw_semaphore mutex; /* protects .live */ int live; }; @@ -798,14 +795,17 @@ u32 rkey; }; + struct ib_fmr { struct ib_device *device; struct ib_pd *pd; - struct list_head list; + TAILQ_ENTRY(ib_fmr) entry; u32 lkey; u32 rkey; }; +TAILQ_HEAD(ib_fmr_list_head, ib_fmr); + struct ib_mad; struct ib_grh; @@ -882,11 +882,11 @@ char name[IB_DEVICE_NAME_MAX]; - struct list_head event_handler_list; + TAILQ_ENTRY(ib_device) event_handler_entry; spinlock_t event_handler_lock; - struct list_head core_list; - struct list_head client_data_list; + TAILQ_ENTRY(ib_device) core_entry; + TAILQ_ENTRY(ib_device) client_data_entry; spinlock_t client_data_lock; struct ib_cache cache; @@ -919,7 +919,7 @@ struct ib_udata *udata); int (*dealloc_ucontext)(struct ib_ucontext *context); int (*mmap)(struct ib_ucontext *context, - struct vm_area_struct *vma); + struct vm_object *vma); struct ib_pd * (*alloc_pd)(struct ib_device *device, struct ib_ucontext *context, struct ib_udata *udata); @@ -1009,7 +1009,7 @@ int (*map_phys_fmr)(struct ib_fmr *fmr, u64 *page_list, int list_len, u64 iova); - int (*unmap_fmr)(struct list_head *fmr_list); + int (*unmap_fmr)(struct ib_fmr_list_head *fmr_list); int (*dealloc_fmr)(struct ib_fmr *fmr); int (*attach_mcast)(struct ib_qp *qp, union ib_gid *gid, @@ -1028,10 +1028,11 @@ struct ib_dma_mapping_ops *dma_ops; struct module *owner; +#ifdef notyet struct class_device class_dev; struct kobject ports_parent; struct list_head port_list; - +#endif enum { IB_DEV_UNINITIALIZED, IB_DEV_REGISTERED, @@ -1051,8 +1052,7 @@ char *name; void (*add) (struct ib_device *); void (*remove)(struct ib_device *); - - struct list_head list; + TAILQ_ENTRY(ib_client) entry; }; struct ib_device *ib_alloc_device(size_t size); @@ -1070,12 +1070,12 @@ static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len) { - return copy_from_user(dest, udata->inbuf, len) ? -EFAULT : 0; + return copyin(udata->inbuf, dest, len) ? -EFAULT : 0; } static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len) { - return copy_to_user(udata->outbuf, src, len) ? -EFAULT : 0; + return copyout(src, udata->outbuf, len) ? -EFAULT : 0; } /** @@ -1464,7 +1464,7 @@ * by ib_get_dma_mr(). */ struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags); - +#ifdef notyet /** * ib_dma_mapping_error - check a DMA addr for error * @dev: The device for which the dma_addr was created @@ -1681,7 +1681,7 @@ else dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle); } - +#endif /** * ib_reg_phys_mr - Prepares a virtually addressed memory region for use * by an HCA. @@ -1804,7 +1804,7 @@ * ib_unmap_fmr - Removes the mapping from a list of fast memory regions. * @fmr_list: A linked list of fast memory regions to unmap. */ -int ib_unmap_fmr(struct list_head *fmr_list); +int ib_unmap_fmr(struct ib_fmr_list_head *fmr_list); /** * ib_dealloc_fmr - Deallocates a fast memory region. From owner-p4-projects@FreeBSD.ORG Sun Oct 14 23:35:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A7EC16A41A; Sun, 14 Oct 2007 23:35: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 D585716A421 for ; Sun, 14 Oct 2007 23:35:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA72D13C442 for ; Sun, 14 Oct 2007 23:35:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ENZ8ch054328 for ; Sun, 14 Oct 2007 23:35:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ENZ8lx054325 for perforce@freebsd.org; Sun, 14 Oct 2007 23:35:08 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 14 Oct 2007 23:35:08 GMT Message-Id: <200710142335.l9ENZ8lx054325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127533 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, 14 Oct 2007 23:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=127533 Change 127533 by kmacy@kmacy_home:ethng on 2007/10/14 23:34:09 use shared linux compat header Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#13 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#13 (text+ko) ==== @@ -301,18 +301,7 @@ #define simple_strtoul strtoul /* More types and endian definitions */ -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; - -typedef uint8_t __u8; -typedef uint16_t __u16; -typedef uint32_t __u32; -typedef uint8_t __be8; -typedef uint16_t __be16; -typedef uint32_t __be32; -typedef uint64_t __be64; +#include #if BYTE_ORDER == BIG_ENDIAN #define __BIG_ENDIAN_BITFIELD From owner-p4-projects@FreeBSD.ORG Mon Oct 15 00:20:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EF2816A419; Mon, 15 Oct 2007 00:20: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 E784616A417 for ; Mon, 15 Oct 2007 00:20:01 +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 CB3B613C468 for ; Mon, 15 Oct 2007 00:20:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F0K1lS057745 for ; Mon, 15 Oct 2007 00:20:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F0K1jR057742 for perforce@freebsd.org; Mon, 15 Oct 2007 00:20:01 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 15 Oct 2007 00:20:01 GMT Message-Id: <200710150020.l9F0K1jR057742@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 127534 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, 15 Oct 2007 00:20:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=127534 Change 127534 by pgj@disznohal on 2007/10/15 00:19:17 Add initial Hungarian translation of Chapter 15: Jails. Affected files ... .. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#2 (text+ko) ==== @@ -3,399 +3,582 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.13 2007/05/29 12:10:12 blackend Exp $ --> - + + + Matteo Riondato - Contributed by + Írta: - Jails + Elzárás - jails + elzárás - Synopsis + Áttekintés - This chapter will provide an explanation of what &os; jails - are and how to use them. Jails, sometimes referred to as an - enhanced replacement of chroot environments, - are a very powerful tool for system administrators, but their basic - usage can also be useful for advanced users. + Ez a fejezet a &os;-ben található + elzárási mechanizmust, valamint annak + használatát mutatja be közelebbrõl. Az + elzárás (jail), melyet gyakran csak úgy + emlegetik, mint a chroot környezetek + továbbfejlesztését, a rendszergazdák + számára ajánlott, nagyon sokoldalú + eszköz, de a haladó felhasználók is + hasznosnak találhatják. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - What a jail is, and what purpose it may serve in &os; - installations. + Mi az elzárás, milyen célra + használható a &os;-ben. - How to build, start, and stop a jail. + Hogyan fordítsuk, indítsuk el és + állítsuk le az elzárást. - The basics of jail administration, both from inside - and outside the jail. + A létrehozott elzárások + karbantartásainak alapjait, az elzárásokon + belülrõl és kívülrõl + egyaránt. - Other sources of useful information about jails are: + Az elzárásról még több + hasznos információt a következõ + helyekrõl tudhatunk meg: - The &man.jail.8; manual page. This is the full reference - of the jail utility — the - administrative tool which can be used in &os; to start, stop, - and control &os; jails. + A &man.jail.8; man oldal. Ez tartalmazza a + jail segédprogram teljes + referenciáját — ez az a + karbantartásra használható eszköz, + amellyel el tudjuk indítani, le tudjuk + állítani és vezérelni tudjuk az + elzárásokat a &os;-ben. - The mailing lists and their archives. The archives of the - &a.questions; and other mailing lists hosted by the - &a.mailman.lists; already contain a wealth of material for - jails. It should always be engaging to search the archives, - or post a new question to the &a.questions.name; mailing - list. + A levelezési listák és azok + archívumai. A &a.questions; archívuma és a + &a.mailman.lists;en található többi + levelezési lista halomnyi olvasnivalót tartogat + az elzárásokkal kapcsolatban. Mindig + érdemes keresni ezekben az archívumokban, vagy + beküldeni a kérdésünket a + &a.questions.name; levelezési listára. - Terms Related to Jails + Az elzáráshoz kapcsolódó + fogalmak - To facilitate better understanding of parts of the &os; system - related to jails, their internals and the way they interact with - the rest of &os;, the following terms are used further in this - chapter: + A &os;-ben található elzáráshoz + tartozó részek és azok belsõ + mûködésének, valamint a rendszer + többi részéhez történõ + kapcsolatának minél jobb megértése + érdekében az alábbi fogalmakat fogjuk + innentõl használni a fejezetben: - &man.chroot.2; (command) - - A system call of &os;, which changes the root directory of a - process and all its descendants. + &man.chroot.2; (parancs) + + A &os; azon rendszerhívása, amely egy + program és annak leszármazottjai + futtatása során megváltoztatja a + gyökérkönyvtárat. (change + root) - &man.chroot.2; (environment) - - The environment of processes running in - a chroot. This includes resources such as the part - of the file system which is visible, user and group IDs which are - available, network interfaces and other IPC mechanisms, - etc. + &man.chroot.2; (környezet) + + A chroot módban futó + programok környezete. Olyan erõforrásokat + foglal magában, mint mondjuk az + állományrendszer látható + része, az elérhetõ + felhasználói és csoport + azonosítók, hálózati + csatolók és egyéb folyamatok közti + kommunikációs mechanizmusok stb. - &man.jail.8; (command) - - The system administration utility which allows launching of - processes within a jail environment. + &man.jail.8; (parancs) + + Az a rendszerkarbantartó segédprogram, + amely lehetõvé teszi program + elindítását egy elzárt + környezetben. - host (system, process, user, etc.) - - The controlling system of a jail environment. The host system - has access to all the hardware resources available, and can - control processes both outside of and inside a jail environment. - One of the important differences of the host system from a jail is - that the limitations which apply to superuser processes inside a - jail are not enforced for processes of the host system. + befogadó (rendszer, program, + felhasználó stb.) + + Az elzárt környezetet + irányító rendszer. A befogadó + rendszer hozzá tud férni az összes + elérhetõ hardveres erõforráshoz, + képes az elzárt környezeten + kívül és belül futó + programokat vezérelni. Az egyik legfontosabb + különbség a befogadó és az + elzárt rendszer között, hogy azok a + korlátozások, amelyek az elzárt + környezetben rendszeradminisztrátori jogokkal + futó programokra vonatkoznak, nem + feltétlenül érvényesek a + befogadó rendszerben futóakra. - hosted (system, process, user, etc.) - - A process, user or other entity, whose access to resources is - restricted by an &os; jail. + befogadott (rendszer, program, felhasználó + stb.) + + Olyan program, felhasználó vagy más + egyéb egyed, amely csak egy elzáráson + keresztül, korlátozottan tud + hozzáférni az + erõforrásokhoz. - Introduction + Bevezetés - Since system administration is a difficult and perplexing - task, many powerful tools were developed to make life easier for - the administrator. These tools mostly provide enhancements of some sort - to the way systems are installed, configured and maintained. - Part of the tasks which an administrator is - expected to do is to properly configure the security of a system, - so that it can continue serving its real purpose, without allowing - security violations. + Mivel a rendszeradminisztráció egy nehéz + és zavarba ejtõ feladat, rengeteg komoly eszköz + jött létre a rendszergazdák + életének megkönnyítésére. + Ezek az eszközök többnyire a rendszerek + telepítését, + beállítását és + karbantartását igyekeznek valamilyen módon + jobbítani. A rendszergazdák egyik feladata, hogy a + gondoskodjanak a biztonságról, miközben a + rendszer képes legyen ellátni az eredeti + feladatát. - One of the tools which can be used to enhance the security of - a &os; system are jails. Jails were - introduced in &os; 4.X by &a.phk;, but were greatly improved in - &os; 5.X to make them a powerful and flexible subsystem. Their - development still goes on, enhancing their usefulness, performance, reliability, - and security. + A &os; rendszerek biztonságosságának + növelését hivatott egyik ilyen eszköz az + elzárás (jails). + Elõször a &os; 4.X verziójában + bukkant fel, de jelentõs fejlõdésen ment + keresztül a &os; 5.X verziókban, aminek + köszönhetõen sokkal erõteljesebb és + rugalmasabb alrendszerré vált. A fejlesztése + természetesen most is folytatódik tovább, + állandóan fejlõdik a + használhatósága, teljesítménye, + megbízhatósága és + biztonságossága. - What is a Jail + Mi is egy elzárás - BSD-like operating systems have had &man.chroot.2; since the - time of 4.2BSD. The &man.chroot.8; utility can be used to - change the root directory - of a set of processes, creating a safe environment, separate - from the rest of the system. Processes created in the chrooted - environment can not access files or resources outside of it. - For that reason, compromising a service running in a chrooted - environment should not allow the attacker to compromise the - entire system. The &man.chroot.8; utility is good for easy - tasks, which do not require a lot of flexibility or complex and - advanced features. Since the inception of the - chroot concept, however, many ways have been found to escape from a - chrooted environment and, although they have been fixed in - modern versions of the &os; kernel, it was clear that - &man.chroot.2; was not the ideal solution for securing services. - A new subsystem had to be implemented. + A BSD-szerû operációs rendszerekben + már a 4.2BSD óta megtalálható volt a + &man.chroot.2;. A &man.chroot.8; segédprogrammal tudjuk + megváltoztatni adott programok számára a + gyökérkönyvtárat, és ezzel egy + biztonságos környezetet teremteni, távol a + rendszer többi részétõl. A chroot-tal + kialakított környezetben elinduló programok + nem tudnak hozzáférni a rajta kívül + található állományokhoz és + erõforrásokhoz. Ennek okán, ha egy ilyen + környezetben futó szolgáltatást + megtámadnak, az önmagában még teszi + lehetõvé a támadó + számára, hogy elérhesse az egész + rendszert. A &man.chroot.8; remekül + használható olyan egyszerûbb feladatok + megoldására, amelyek nem igényelnek + túlságosan sok rugalmasságot vagy bonyolult + és fejlett támogatást. Azonban a chroot + ötletének felmerülése óta + számos kiskaput találtak már az + általa létrehozott környezetekben, és + habár ezek mindegyikét javították a + &os; újabb változataiban, teljesen + egyértelmûvé vált, hogy a + &man.chroot.2; nem biztosít járható utat a + szolgáltatások biztonságossá + tételéhez. Erre a feladatra egy új + alrendszert kellett kiépíteni. - This is one of the main reasons why - jails were developed. + Ez az egyik oka annak, amiért az + elzárást + kifejlesztették. - Jails improve on the concept of the traditional - &man.chroot.2; environment, in several ways. In a traditional - &man.chroot.2; environment, processes are only limited in the - part of the file system they can access. The rest of the system - resources (like the set of system users, the running processes, - or the networking subsystem) are shared by the chrooted - processes and the processes of the host system. Jails expand - this model by virtualizing not only access to the file system, - but also the set of users, the networking subsystem of the &os; - kernel and a few other things. A more complete set of - fine-grained controls available for tuning the access of a - jailed environment is described in . + Az elzárás ötlete több + szempontból is a hagyományos &man.chroot.2; + környezet elvén alapszik. Egy hagyományos + &man.chroot.2; környezetben futó programok + korlátozása csupán abban merül ki, + hogy az állományrendszer melyik + részét láthatják. A rendszer + többi erõforrása (mint mondjuk a + felhasználók, futó programok vagy a + hálózati alrendszer) azonban továbbra is + megosztva marad a chroot környezetben és a + befogadó rendszerben futó programok + között. Az elzárás kibõvíti + ezt a modellt, és nem csak az + állományrendszerre vonatkozó + hozzáférést virtualizálja, hanem + több más dolog mellett kiterjeszti ezt a + felhasználókra és a &os; + hálózati alrendszerére is. Az + elzárt környezetek + beállításaihoz elérhetõ + finomhangolási lehetõségekrõl + bõvebben a ban esik + szó. - A jail is characterized by four elements: + Az elzárásokat az alább négy + elem írja le: - A directory subtree — the starting point from - which a jail is entered. Once inside the jail, a process - is not permitted to escape outside of this subtree. - Traditional security issues which plagued the original - &man.chroot.2; design will not affect &os; jails. + A könyvtárszerkezet egy + részfája — attól a + résztõl indulva, ahonnan az elzárás + kezdõdik. Az elzáráson belül + futó programok nem léphetnek ki ebbõl a + részfából. Az eredeti &man.chroot.2; + kialakításában merengõ + biztonsági hibák lehetõségei nem + veszélyeztetik a &os; + elzárásait. - A hostname — the hostname which will be used - within the jail. Jails are mainly used for hosting network - services, therefore having a descriptive hostname for each - jail can really help the system administrator. + A rendszer neve — a név, amelyet az + elzáráson belül használunk. Mivel + az elzárásokat elsõsorban + hálózati szolgáltatások + kordában tartására használjuk, + az elzárásokhoz tartozó beszédes + rendszernevek sokat tudnak segíteni a + rendszergazdák munkájában. - An IP address — this will be - assigned to the jail and cannot be changed in any way during - the jail's life span. The IP address of a jail is usually an alias address - for an existing network interface, but this is not strictly necessary. + Egy IP-cím — ez fog + tartozni az elzáráshoz és nem is + változtatható meg a mûködése + során. Egy elzárás IP-címe + általában egy már létezõ + hálózati csatoló másik + címe, de ez nem szükségszerûen igaz + minden esetben. - A command — the path name of an executable to run - inside the jail. This is relative to the root directory of - the jail environment, and may vary a lot, depending on the - type of the specific jail environment. + Egy parancs — annak a programnak az + elérési útja, amelyet elzártan + kívánunk futtatni. Az elzárt + környezet gyökerétõl mérve + relatívan adjuk meg, és az adott + környezet típusától + függõen eltérõ lehet. - Apart from these, jails can have their own set of users and - their own root user. Naturally, the powers - of the root user are limited within the - jail environment and, from the point of view of the host system, - the jail root user is not an omnipotent user. - In addition, the root user of a jail is not - allowed to perform critical operations to the system outside of - the associated &man.jail.8; environment. More information - about capabilities and restrictions of the - root user will be discussed in below. + Ezektõl eltekintve az elzárások + rendelkezhetnek saját felhasználókkal + és lehetnek saját root + felhasználóik is. Természetesen a + root hatásköre csak az + elzárt környezetre korlátozódik, + és a befogadó rendszer + szemszögébõl az elzárt + root nem mindenható. + Ráadásul az elzárt + root felhasználó nem hajthat + végre semmilyen kritikus mûveletet a saját + &man.jail.8; környezetén kívül. A + root további + képességeirõl és + korlátozásairól lentiekben bõvebben is + említést teszünk a ban. - Creating and Controlling Jails + Az elzárások létrehozása + és vezérlése - Some administrators divide jails into the following two types: - complete jails, which resemble a real &os; system, - and service jails, dedicated to one application or - service, possibly running with privileges. This is only a - conceptual division and the process of building a jail is not - affected by it. The &man.jail.8; manual page is quite clear about - the procedure for building a jail: + Egyes rendszergazdák az elzárásokat a + következõ két típusba sorolják: + teljes elzárás, mely egy + valódi &os; rendszerre emlékeztet, és a + szolgáltatás elzárás, + mely egyetlen, feltehetõen kiemelt jogokkal futó + alkalmazás vagy szolgáltatás + számára van elõkészítve. Ez a + besorolás csupán fogalmi szintû, az + elzárás felépítésének + módját nem befolyásolja. A &man.jail.8; man + oldal vegytisztán ismerteti az elzárások + létrehozását: - &prompt.root; setenv D /here/is/the/jail + &prompt.root; setenv D /itt/lesz/az/elzárás &prompt.root; mkdir -p $D &prompt.root; cd /usr/src &prompt.root; make world DESTDIR=$D -&prompt.root; cd etc/ This step -is not required on &os; 6.0 and later. +&prompt.root; cd etc/ Ez a +lépés nem szükséges a &os; 6.0-ás vagy annál újabb verziójában. &prompt.root; make distribution DESTDIR=$D &prompt.root; mount_devfs devfs $D/dev - Selecting a location for a jail is the best starting point. - This is where the jail will physically reside within the file system of the jail's host. - A good choice can be /usr/jail/jailname, - where jailname is the hostname - identifying the jail. The /usr/ file system usually has - enough space for the jail file system, which for complete jails is, essentially, - a replication of every file present in a default installation - of the &os; base system. + Érdemes elõször az elzárás + helyét megválasztani. Itt fog fizikailag helyet + foglalni a befogadó rendszer + állományrendszerén belül az + elzárás. Jó választás + lehet erre a /usr/jail/elzárás, + ahol a elzárás az + elzárást azonosító + rendszernév. A /usr/ + állományrendszeren általában + elegendõ hely jut az elzárás + állományrendszerének, ami egy + teljes elzárás esetén + lényegében a &os; alaprendszer + alapértelmezett telepítésében + megtalálható összes állomány + másolatát tartalmazza. - This command will populate the directory subtree chosen - as jail's physical location on the file system with the - necessary binaries, libraries, manual pages and so on. - Everything is done in the typical &os; style — first - everything is built/compiled, then installed to the - destination path. + Ez a parancs fogja felmásolni az + elzárás fizikai helyének választott + könyvtár-részfába a + mûködéshez szükséges programokat, + függvénykönyvtárakat, man oldalakat + és így tovább. Minden a &os; megszokott + stílusában történik — + elõször mindent lefordít, majd az + eredményt feltelepíti a célként + megadott könyvtárba. - The distribution target for - make installs every needed - configuration file. In simple words, it installs every installable file of - /usr/src/etc/ to the - /etc directory of the jail - environment: - $D/etc/. + A make + paramétereként megadott + distribution cél gondoskodik + az összes szükséges + konfigurációs állomány + felmásolásáról. Magyarán + szólva, átmásolja az összes + telepíhetõ állományt a /usr/src/etc/ + könyvtárból az elzárás + /etc + alkönyvtárába, vagyis a $D/etc/ + könyvtárba. - Mounting the &man.devfs.8; file system inside a jail is - not required. On the other hand, any, or almost any - application requires access to at least one device, depending - on the purpose of the given application. It is very important - to control access to devices from inside a jail, as improper - settings could permit an attacker to do nasty things in the - jail. Control over &man.devfs.8; is managed through rulesets - which are described in the &man.devfs.8; and - &man.devfs.conf.5; manual pages. + Az elzáráson belül a &man.devfs.8; + csatlakoztatása nem kötelezõ. + Másrészt azonban majdnem mindegyik + alkalmazás, a feladatától + függõen, legalább egy eszközhöz + hozzá akar férni. Nagyon fontos, hogy a + kezünkbe vegyük a eszközök + hozzáférésének + irányítását az + elzáráson belül, mivel a helytelen + beállítások révén a + támadók csúnya dolgokat tudnak majd + mûvelni. A &man.devfs.8; + mûködését a &man.devfs.8; és + &man.devfs.conf.5; man oldalakon is ismertetett + szabályrendszerek + irányítják. - Once a jail is installed, it can be started by using the - &man.jail.8; utility. The &man.jail.8; utility takes four - mandatory arguments which are described in the . Other arguments may be - specified too, e.g., to run the jailed process with the credentials of a specific - user. The argument depends on - the type of the jail; for a virtual system, - /etc/rc is a good choice, since it will - replicate the startup sequence of a real &os; system. For a - service jail, it depends on the service or - application that will run within the jail. + Ahogy az elzárást telepítettük, a + &man.jail.8; segédprogrammal tudjuk elindítani. A + &man.jail.8; négy kötelezõ paramétert + vár, melyekre a ban ki is + térünk. Más paraméterek is + megadhatóak, pl. az elzárt program egy adott + felhasználó jogaival történõ + futtatásához. A + + paraméter használata az elzárás + típusától függ: egy + virtuális rendszer esetében a + /etc/rc jó választásnak + bizonyulhat, mivel ennek segítségével egy + valódi &os; rendszerindítási + folyamatát játszhatjuk le. Amennyiben elzárt + szolgáltatásról van + szól, az adott szolgáltatástól vagy + alkalmazástól függ. - Jails are often started at boot time and the &os; - rc mechanism provides an easy way to do - this. + A elzárásokat gyakran már a + rendszerindítás során elindítják, + amit a &os; rc mechanizmusa nagyban meg is + könnyít. - A list of the jails which are enabled to start at boot - time should be added to the &man.rc.conf.5; file: + A rendszer indítása során + aktiválandó elzárások + listáját vegyük hozzá a + &man.rc.conf.5; állományhoz: - jail_enable="YES" # Set to NO to disable starting of any jails -jail_list="www" # Space separated list of names of jails + jail_enable="YES" # Ide NO-t írjunk, ha ki akarjuk kapcsolni +jail_list="www" # Szóközzel elválasztva soroljuk fel az elzárásokat - For each jail listed in jail_list, a - group of &man.rc.conf.5; settings, which describe the - particular jail, should be added: + A jail_list-ben szereplõ + összes elzárás meg kell adnunk az õket + leíró &man.rc.conf.5;-beli + beállításokat: - jail_www_rootdir="/usr/jail/www" # jail's root directory -jail_www_hostname="www.example.org" # jail's hostname -jail_www_ip="192.168.0.10" # jail's IP address -jail_www_devfs_enable="YES" # mount devfs in the jail -jail_www_devfs_ruleset="www_ruleset" # devfs ruleset to apply to jail + jail_www_rootdir="/usr/jail/www" # az elzárás gyökérkönyvtára +jail_www_hostname="www.example.org" # az elzárás neve +jail_www_ip="192.168.0.10" # az elzárás IP-címe +jail_www_devfs_enable="YES" # legyen-e devfs az elzáráson belül +jail_www_devfs_ruleset="www_ruleset" # az alkalmazott devfs szabályrendszer - The default startup of jails configured in - &man.rc.conf.5;, will run the /etc/rc - script of the jail, which assumes the jail is a complete - virtual system. For service jails, the default startup - command of the jail should be changed, by setting the - jail_jailname_exec_start - option appropriately. + Az &man.rc.conf.5; állományban szereplõ + elzárások esetén a + /etc/rc szkript fut le, tehát + feltételezi, hogy az így megadott + elzárás egy teljes virtuális rendszer. A + szolgáltatások elzárásához + meg kell változtatnunk az elzárás + alapértelmezett parancsát is. Ezt a + jail_elzárás_exec_start + opció megfelelõ + beállításával tudjuk + megtenni. - For a full list of available options, please see the - &man.rc.conf.5; manual page. + Az összes itt elérhetõ opciót a + &man.rc.conf.5; man oldalon találhatjuk meg. - The /etc/rc.d/jail script can be used to - start or stop a jail by hand, if an entry for it exists in - rc.conf: + Ha léteznek a megfelelõ bejegyzések az + rc.conf állományban, az + /etc/rc.d/jail szkript is + használható az elzárások kézzel + történõ elindítására vagy + leállítására: &prompt.root; /etc/rc.d/jail start www &prompt.root; /etc/rc.d/jail stop www - A clean way to shut down a &man.jail.8; is not available at - the moment. This is because commands normally used to accomplish - a clean system shutdown cannot be used inside a jail. The best - way to shut down a jail is to run the following command from - within the jail itself or using the &man.jexec.8; utility from - outside the jail: + A &man.jail.8; leállítására jelen + pillanatban még nem érhetõ el szabályos + módszer. Ez azért van, mert a szabályos + rendszerleállítást elvégzõ + parancsok nem használhatóak az + elzáráson belül. Emiatt az + elzárásokat a legtisztábban úgy tudjuk + leállítani, ha kadjuk az alábbi parancsot + magában az elzárásban vagy pedig a + &man.jexec.8; segédprogrammal az elzáráson + kívülrõl: &prompt.root; sh /etc/rc.shutdown - More information about this can be found in the &man.jail.8; - manual page. + Errõl a témáról többet a + &man.jail.8; man oldalon olvashatunk. - Fine Tuning and Administration + Finomhangolás és karbantartás - There are several options which can be set for any jail, and - various ways of combining a host &os; system with jails, to produce - higher level applications. This section presents: + Számos opció állítható be + az elzárásoknál, és sokféle + módon vegyíthetjük a befogadó &os; + rendszerünket az elzárásokkal, ami által + magasabb szintû alkalmazásokat hozhatunk létre. + Ebben a részben bemutatunk: - Some of the options available for tuning the behavior and - security restrictions implemented by a jail - installation. + Néhány olyan + beállítást, amellyel finomhangolhatjuk a + telepített elzárások által + megvalósított biztonsági + megszorítások viselkedését. - Some of the high-level applications for jail management, - which are available through the &os; Ports Collection, and can - be used to implement overall jail-based solutions. + Az elzárások kezelésére + alkalmas néhány olyan magasabb szintû + alkalmazást, amelyek elérhetõek a &os; + Portgyûjteményén keresztül, és + általános elzárás alapú + megoldások kialakításához + használhatóak. - System tools for jail tuning in &os; + A &os;-ben található finomhangoló + eszközök - Fine tuning of a jail's configuration is mostly done by - setting &man.sysctl.8; variables. A special subtree of sysctl - exists as a basis for organizing all the relevant options: the - security.jail.* hierarchy of &os; kernel - options. Here is a list of the main jail-related sysctls, - complete with their default value. Names should be - self-explanatory, but for more information about them, please - refer to the &man.jail.8; and &man.sysctl.8; manual - pages. + Az elzárások + beállításainak finomhangolását + túlnyomórészt &man.sysctl.8; + változókkal végezhetjük el. A + sysctl-en belül egy speciális + részfában találhatunk erre alkalmas + beállításokat: ez a a &os; rendszermag + opciói között megtalálható + security.jail.*. Itt közüljük + az elzárásokra vonatkozó fontosabb sysctl + változók listáját, az + alapértelmezett értékeikkel együtt. A + nevek minden bizonnyal sokat elárulnak, de ha többet + szeretnénk tudni róluk, lapozzuk fel a + &man.jail.8; és &man.sysctl.8; man oldalakat. @@ -433,40 +616,61 @@ - These variables can be used by the system administrator of - the host system to add or remove some of - the limitations imposed by default on the - root user. Note that there are some - limitations which cannot be removed. The - root user is not allowed to mount or - unmount file systems from within a &man.jail.8;. The - root inside a jail may not load or unload - &man.devfs.8; rulesets, set firewall rules, or do many other - administrative tasks which require modifications of in-kernel - data, such as setting the securelevel of the - kernel. + Ezekkel a változókkal a + befogadó rendszer + rendszergazdája tud hozzátenni vagy elvenni a + root felhasználó + alapértelmezett határaihoz. Vegyük azonban + észre, hogy egyes korlátozások azonban + semmiképpen sem szüntethetõek meg. A + root nem csatlakoztathat és + választhat le állományrendszereket a + &man.jail.8; környezetben. Az elzárt + root nem tölthet be és + törölhet &man.devfs.8; szabályrendszereket, + tûzfal szabályokat sem, ill. nem végezhet + semmilyen olyan bármilyen más karbantartási + feladatot, amely a rendszermag adataiban + módosítást vonna maga után, + például nem állíthatja a rendszermag + securelevel (biztonsági + szintjének) értékét. - The base system of &os; contains a basic set of tools for - viewing information about the active jails, and attaching to a - jail to run administrative commands. The &man.jls.8; and - &man.jexec.8; commands are part of the base &os; system, and can be used - to perform the following simple tasks: + A &os; alaprendszere tartalmazza a rendszerben aktív + elzárások információit + megjelenítõ és a hozzájuk + történõ csatlakozásra + használható segédeszközöket. A + &man.jls.8; és &man.jexec.8; parancsok részei az + alap &os; rendszernek, segítségükkel + elvégezhetõek az alábbi egyszerû + feladatokat: - Print a list of active jails and their corresponding - jail identifier (JID), - IP address, hostname and path. + Ki tudjuk íratni az aktív + elzárásokat és hozzájuk + tartozó azonosítókat + (JID-eket), + IP-címeket, neveket és + útvonalakat. - Attach to a running jail, from its host system, and run - a command inside the jail or perform administrative tasks inside the - jail itself. This is especially useful when the - root user wants to cleanly shut down a - jail. The &man.jexec.8; utility can also be used to start a - shell in a jail to do administration in it; for - example: + A befogadó rendszerbõl hozzá tudunk + csatlakozni egy futó elzáráshoz, + és parancsokat tudunk futtatni az + elzáráson belül vagy karbantartási + feladatokat tudunk elvégezni magán az + elzáráson belül. Ez + különösen hasznosnak bizonyulhat, amikor a + root felhasználó + szabályosan le akarja állítani az + elzárást. A &man.jexec.8; + segédprogrammal el tudunk indítani egy + parancsértelmezõt az elzáráson + belül, amibõl aztán + irányíthatjuk. Példa: &prompt.root; jexec 1 tcsh @@ -474,19 +678,22 @@ - High-level administrative tools in &os; Ports - Collection + Magasszintû karbantartó eszközök a + &os; Portgyûjteményében - Among the many third-party utilities for jail administration, - one of the most complete and useful is sysutils/jailutils. It is a set of - small applications that contribute to &man.jail.8; management. - Please refer to its web page for more information. + A sok külsõs karbantartó eszköz + közül az egyik legteljesebb és leghasznosabb a + sysutils/jailutils. Sok + kisebb alkalmazást tartalmaz, melyek kibõvítik + a &man.jail.8; + irányíthatóságát. Bõvebb + információkért kérjük, + látogassa meg a hozzátartozó honlapot. - Application of Jails + Az elzárások alkalmazása @@ -494,178 +701,248 @@ Daniel Gerzo - Contributed by - + Írta: - Service Jails + Szolgáltatások elzárása - This section is based upon an idea originally presented by - &a.simon; at , and an - updated article written by Ken Tom - locals@gmail.com. This section illustrates how - to set up a &os; system that adds an additional layer of - security, using the &man.jail.8; feature. It is also assumed - that the given system is at least running RELENG_6_0 and the - information provided earlier in this chapter has been well - understood. + Ez a rész eredetileg &a.simon; + írásán, melyet megtalálhatunk a + címen, valamint Ken Tom (locals@gmail.com) + átdolgozott cikkén alapul. Itt + megismerhetjük, hogyan állítsunk a &os; + rendszerünk felé egy biztonsági + réteget a &man.jail.8; + felhasználásával. Továbbá + feltételezzük, hogy ez a rendszer legalább + RELENG_6_0 verziójú és a fejezetben + korábban tárgyaltakat az olvasó teljes + mértékben megértette. - Design + A kialakítás >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 15 03:32:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A96716A41B; Mon, 15 Oct 2007 03:32: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 F239016A419 for ; Mon, 15 Oct 2007 03:32:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA04D13C47E for ; Mon, 15 Oct 2007 03:32:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F3Wd9x080496 for ; Mon, 15 Oct 2007 03:32:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F3Wd5Q080493 for perforce@freebsd.org; Mon, 15 Oct 2007 03:32:39 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 03:32:39 GMT Message-Id: <200710150332.l9F3Wd5Q080493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127541 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, 15 Oct 2007 03:32:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127541 Change 127541 by kmacy@kmacy_home:ethng on 2007/10/15 03:32:10 add endian conversion routines as well as some more type annotations Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_compat.h#2 (text+ko) ==== @@ -1,6 +1,10 @@ -#ifndef _LINUX_COMPAT_H_ -#define _LINUX_COMPAT_H_ +#ifndef _SYS_LINUX_COMPAT_H_ +#define _SYS_LINUX_COMPAT_H_ +#include +#include + + typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; @@ -41,4 +45,18 @@ typedef uint32_t gfp_t; typedef struct mtx spinlock_t; +#define __iomem +#define __init +#define __exit +#define __bitwise + +#define be16_to_cpu be16toh +#define be32_to_cpu be32toh +#define be64_to_cpu be64toh + +#define cpu_to_be16 htobe16 +#define cpu_to_be32 htobe32 +#define cpu_to_be64 htobe64 + +#define container_of(p, stype, field) ((stype *)(((uint8_t *)(p)) - offsetof(stype, field))) #endif From owner-p4-projects@FreeBSD.ORG Mon Oct 15 03:33:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87B5516A421; Mon, 15 Oct 2007 03:33: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 4D82116A41B for ; Mon, 15 Oct 2007 03:33:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34D9413C45D for ; Mon, 15 Oct 2007 03:33:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F3XfNT080584 for ; Mon, 15 Oct 2007 03:33:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F3Xfmh080581 for perforce@freebsd.org; Mon, 15 Oct 2007 03:33:41 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 03:33:41 GMT Message-Id: <200710150333.l9F3Xfmh080581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127542 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, 15 Oct 2007 03:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=127542 Change 127542 by kmacy@kmacy_home:ethng on 2007/10/15 03:32:46 more general build fixes by adjusting the include paths Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_cm.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_mad.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#3 edit .. //depot/projects/ethng/src/sys/contrib/rdma/iw_cm.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_cm.h#2 (text+ko) ==== @@ -37,8 +37,8 @@ #if !defined(IB_CM_H) #define IB_CM_H -#include -#include +#include +#include enum ib_cm_state { IB_CM_IDLE, ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_mad.h#2 (text+ko) ==== @@ -39,7 +39,8 @@ #if !defined( IB_MAD_H ) #define IB_MAD_H -#include + +#include /* Management base version */ #define IB_MGMT_BASE_VERSION 1 @@ -380,7 +381,7 @@ * @mad: References the start of the received MAD. */ struct ib_mad_recv_buf { - struct list_head list; + TAILQ_ENTRY(ib_mad_recv_buf) entry; struct ib_grh *grh; struct ib_mad *mad; }; @@ -398,7 +399,7 @@ struct ib_mad_recv_wc { struct ib_wc *wc; struct ib_mad_recv_buf recv_buf; - struct list_head rmpp_list; + TAILQ_ENTRY(ib_mad_recv_wc) entry; int mad_len; }; @@ -418,7 +419,9 @@ u8 mgmt_class; u8 mgmt_class_version; u8 oui[3]; +#ifdef notyet DECLARE_BITMAP(method_mask, IB_MGMT_MAX_METHODS); +#endif }; /** ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#2 (text+ko) ==== @@ -37,14 +37,11 @@ #ifndef IB_SA_H #define IB_SA_H -#include -#include +#include -#include +#include +#include -#include -#include - enum { IB_SA_CLASS_VERSION = 2, /* IB spec version 1.1/1.2 */ @@ -256,7 +253,9 @@ struct ib_sa_client { atomic_t users; +#ifdef notyet struct completion comp; +#endif }; /** ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#3 (text+ko) ==== @@ -717,7 +717,7 @@ TAILQ_ENTRY(ib_uobject) entry; /* link to context's list */ u32 id; /* index into kernel idr */ atomic_t ref; - struct rw_semaphore mutex; /* protects .live */ + struct rwlock lock; /* protects .live */ int live; }; ==== //depot/projects/ethng/src/sys/contrib/rdma/iw_cm.h#2 (text+ko) ==== @@ -33,8 +33,7 @@ #ifndef IW_CM_H #define IW_CM_H -#include -#include +#include struct iw_cm_id; From owner-p4-projects@FreeBSD.ORG Mon Oct 15 03:34:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E159816A41A; Mon, 15 Oct 2007 03:34: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 9C01516A419 for ; Mon, 15 Oct 2007 03:34:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8363613C458 for ; Mon, 15 Oct 2007 03:34:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F3YgNK080627 for ; Mon, 15 Oct 2007 03:34:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F3Ygoj080624 for perforce@freebsd.org; Mon, 15 Oct 2007 03:34:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 03:34:42 GMT Message-Id: <200710150334.l9F3Ygoj080624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127543 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, 15 Oct 2007 03:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=127543 Change 127543 by kmacy@kmacy_home:ethng on 2007/10/15 03:34:27 bare minimum to get basic part of module to compile Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_wr.h#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#2 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#1 add Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#2 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ - #include __FBSDID("$FreeBSD$"); @@ -43,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -53,8 +53,184 @@ #include #include +#include + +#include +#include + + #ifdef CONFIG_DEFINED #include +#include +#include +#include +#include +#include #else #include +#include +#include +#include +#include +#include +#endif + + + +/* + * XXX :-/ + * + */ + +#define idr_init(x) + +cxgb_cpl_handler_func t3c_handlers[NUM_CPL_CMDS]; + +static void open_rnic_dev(struct t3cdev *); +static void close_rnic_dev(struct t3cdev *); + +struct cxgb_client t3c_client = { + .name = "iw_cxgb3", + .add = open_rnic_dev, + .remove = close_rnic_dev, + .handlers = t3c_handlers, + .redirect = iwch_ep_redirect +}; + +static TAILQ_HEAD( ,iwch_dev) dev_list; +static struct mtx dev_mutex; +static void +rnic_init(struct iwch_dev *rnicp) +{ + static int inited = 0; + + if (inited == 0) { + TAILQ_INIT(&dev_list); + inited = 1; + } + + PDBG("%s iwch_dev %p\n", __FUNCTION__, rnicp); + idr_init(&rnicp->cqidr); + idr_init(&rnicp->qpidr); + idr_init(&rnicp->mmidr); + mtx_init(&rnicp->lock, "iwch lock", NULL, MTX_DEF); + + rnicp->attr.vendor_id = 0x168; + rnicp->attr.vendor_part_id = 7; + rnicp->attr.max_qps = T3_MAX_NUM_QP - 32; + rnicp->attr.max_wrs = (1UL << 24) - 1; + rnicp->attr.max_sge_per_wr = T3_MAX_SGE; + rnicp->attr.max_sge_per_rdma_write_wr = T3_MAX_SGE; + rnicp->attr.max_cqs = T3_MAX_NUM_CQ - 1; + rnicp->attr.max_cqes_per_cq = (1UL << 24) - 1; + rnicp->attr.max_mem_regs = cxio_num_stags(&rnicp->rdev); + rnicp->attr.max_phys_buf_entries = T3_MAX_PBL_SIZE; + rnicp->attr.max_pds = T3_MAX_NUM_PD - 1; + rnicp->attr.mem_pgsizes_bitmask = 0x7FFF; /* 4KB-128MB */ + rnicp->attr.can_resize_wq = 0; + rnicp->attr.max_rdma_reads_per_qp = 8; + rnicp->attr.max_rdma_read_resources = + rnicp->attr.max_rdma_reads_per_qp * rnicp->attr.max_qps; + rnicp->attr.max_rdma_read_qp_depth = 8; /* IRD */ + rnicp->attr.max_rdma_read_depth = + rnicp->attr.max_rdma_read_qp_depth * rnicp->attr.max_qps; + rnicp->attr.rq_overflow_handled = 0; + rnicp->attr.can_modify_ird = 0; + rnicp->attr.can_modify_ord = 0; + rnicp->attr.max_mem_windows = rnicp->attr.max_mem_regs - 1; + rnicp->attr.stag0_value = 1; + rnicp->attr.zbva_support = 1; + rnicp->attr.local_invalidate_fence = 1; + rnicp->attr.cq_overflow_detection = 1; + return; +} + +static void open_rnic_dev(struct t3cdev *tdev) +{ + struct iwch_dev *rnicp; + static int vers_printed; + + PDBG("%s t3cdev %p\n", __FUNCTION__, tdev); + if (!vers_printed++) + printf("Chelsio T3 RDMA Driver - version %s\n", + DRV_VERSION); + rnicp = (struct iwch_dev *)ib_alloc_device(sizeof(*rnicp)); + if (!rnicp) { + printf("Cannot allocate ib device\n"); + return; + } + rnicp->rdev.ulp = rnicp; + rnicp->rdev.t3cdev_p = tdev; + + mtx_lock(&dev_mutex); + + if (cxio_rdev_open(&rnicp->rdev)) { + mtx_unlock(&dev_mutex); + printf("Unable to open CXIO rdev\n"); + ib_dealloc_device(&rnicp->ibdev); + return; + } + + rnic_init(rnicp); + + TAILQ_INSERT_TAIL(&dev_list, rnicp, entry); + mtx_unlock(&dev_mutex); + + if (iwch_register_device(rnicp)) { + printf("Unable to register device\n"); + close_rnic_dev(tdev); + } +#ifdef notyet + printf("Initialized device %s\n", + pci_name(rnicp->rdev.rnic_info.pdev)); +#endif + return; +} + +static void close_rnic_dev(struct t3cdev *tdev) +{ + struct iwch_dev *dev, *tmp; + PDBG("%s t3cdev %p\n", __FUNCTION__, tdev); + mtx_lock(&dev_mutex); + + TAILQ_FOREACH_SAFE(dev, &dev_list, entry, tmp) { + if (dev->rdev.t3cdev_p == tdev) { +#ifdef notyet + list_del(&dev->entry); + iwch_unregister_device(dev); + cxio_rdev_close(&dev->rdev); + idr_destroy(&dev->cqidr); + idr_destroy(&dev->qpidr); + idr_destroy(&dev->mmidr); + ib_dealloc_device(&dev->ibdev); +#endif + break; + } + } + mtx_unlock(&dev_mutex); +} + +#ifdef notyet +static int __init iwch_init_module(void) +{ + int err; + + err = cxio_hal_init(); + if (err) + return err; + err = iwch_cm_init(); + if (err) + return err; + cxio_register_ev_cb(iwch_ev_dispatch); + cxgb_register_client(&t3c_client); + return 0; +} + +static void __exit iwch_exit_module(void) +{ + cxgb_unregister_client(&t3c_client); + cxio_unregister_ev_cb(iwch_ev_dispatch); + iwch_cm_term(); + cxio_hal_exit(); +} #endif From owner-p4-projects@FreeBSD.ORG Mon Oct 15 04:40:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0269516A419; Mon, 15 Oct 2007 04:40: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 49DD816A4D4 for ; Mon, 15 Oct 2007 04:40:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A71913C46E for ; Mon, 15 Oct 2007 04:40:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F4euYl085452 for ; Mon, 15 Oct 2007 04:40:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F4euw8085447 for perforce@freebsd.org; Mon, 15 Oct 2007 04:40:56 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 04:40:56 GMT Message-Id: <200710150440.l9F4euw8085447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127545 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, 15 Oct 2007 04:40:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=127545 Change 127545 by kmacy@kmacy_home:ethng on 2007/10/15 04:40:00 container_of is defined in linux_compat.h now Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#23 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#23 (text+ko) ==== @@ -568,7 +568,6 @@ */ #define desc_reclaimable(q) ((int)((q)->processed - (q)->cleaned - TX_MAX_DESC)) -#define container_of(p, stype, field) ((stype *)(((uint8_t *)(p)) - offsetof(stype, field))) static __inline struct sge_qset * fl_to_qset(struct sge_fl *q, int qidx) From owner-p4-projects@FreeBSD.ORG Mon Oct 15 04:54:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC42D16A421; Mon, 15 Oct 2007 04:54: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 7A47516A417 for ; Mon, 15 Oct 2007 04:54:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60A5213C458 for ; Mon, 15 Oct 2007 04:54:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F4sFEp094912 for ; Mon, 15 Oct 2007 04:54:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F4sEpu094909 for perforce@freebsd.org; Mon, 15 Oct 2007 04:54:14 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 04:54:14 GMT Message-Id: <200710150454.l9F4sEpu094909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127546 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, 15 Oct 2007 04:54:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=127546 Change 127546 by kmacy@kmacy_home:ethng on 2007/10/15 04:53:16 IFC 127524 Affected files ... .. //depot/projects/ethng/src/etc/Makefile#2 integrate .. //depot/projects/ethng/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#5 integrate .. //depot/projects/ethng/src/etc/rc.d/sensorsd#1 branch .. //depot/projects/ethng/src/etc/sensorsd.conf#1 branch .. //depot/projects/ethng/src/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/ethng/src/include/_ctype.h#2 integrate .. //depot/projects/ethng/src/include/ctype.h#2 integrate .. //depot/projects/ethng/src/include/wctype.h#2 integrate .. //depot/projects/ethng/src/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/ethng/src/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/ethng/src/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/ethng/src/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/big5.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/euc.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/ethng/src/lib/libutil/pidfile.3#3 integrate .. //depot/projects/ethng/src/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/ethng/src/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/ethng/src/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/ethng/src/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/ethng/src/share/man/man4/Makefile#4 integrate .. //depot/projects/ethng/src/share/man/man4/coretemp.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/ethng/src/share/man/man4/it.4#1 branch .. //depot/projects/ethng/src/share/man/man4/lm.4#1 branch .. //depot/projects/ethng/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/ethng/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#4 integrate .. //depot/projects/ethng/src/share/man/man9/sensor_attach.9#1 branch .. //depot/projects/ethng/src/share/mklocale/UTF-8.src#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/ethng/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/ethng/src/sys/arm/include/asm.h#2 integrate .. //depot/projects/ethng/src/sys/conf/files#6 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#5 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#3 integrate .. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/ethng/src/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/ethng/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/ethng/src/sys/dev/it/it.c#1 branch .. //depot/projects/ethng/src/sys/dev/it/itvar.h#1 branch .. //depot/projects/ethng/src/sys/dev/lm/lm78.c#1 branch .. //depot/projects/ethng/src/sys/dev/lm/lm78_isa.c#1 branch .. //depot/projects/ethng/src/sys/dev/lm/lm78var.h#1 branch .. //depot/projects/ethng/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/ethng/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/ethng/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_sensors.c#1 branch .. //depot/projects/ethng/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/ethng/src/sys/modules/Makefile#4 integrate .. //depot/projects/ethng/src/sys/modules/it/Makefile#1 branch .. //depot/projects/ethng/src/sys/modules/lm/Makefile#1 branch .. //depot/projects/ethng/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/ethng/src/sys/sys/sensors.h#1 branch .. //depot/projects/ethng/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/ethng/src/sys/sys/systm.h#3 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/ethng/src/usr.bin/id/id.c#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/Makefile#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/cmdtab.c#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/extern.h#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/sensors.c#1 branch .. //depot/projects/ethng/src/usr.bin/systat/systat.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/Makefile#5 integrate .. //depot/projects/ethng/src/usr.sbin/sensorsd/Makefile#1 branch .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.8#1 branch .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.c#1 branch .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.conf.5#1 branch Differences ... ==== //depot/projects/ethng/src/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.360 2007/07/13 14:28:10 imp Exp $ +# $FreeBSD: src/etc/Makefile,v 1.361 2007/10/14 10:45:28 netchild Exp $ .include @@ -17,7 +17,7 @@ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr remote rpc services shells \ + rc.subr remote rpc sensorsd.conf services shells \ snmpd.config sysctl.conf syslog.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ==== //depot/projects/ethng/src/etc/defaults/rc.conf#5 (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.319 2007/10/12 16:35:36 emax Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.320 2007/10/14 10:45:28 netchild Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,6 +40,8 @@ kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). +sensorsd_enable="NO" # Run sensorsd to monitor and log sensor state changes +sensorsd_flags="" # additional flags for sensorsd(8) tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp ==== //depot/projects/ethng/src/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.85 2007/10/14 10:45:28 netchild Exp $ .include @@ -33,7 +33,7 @@ random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ - serial sppp statd swap1 \ + sensorsd serial sppp statd swap1 \ syscons sysctl syslogd \ timed tmp \ ugidfw \ ==== //depot/projects/ethng/src/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.26 2007/10/12 18:14:41 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.27 2007/10/13 05:50:43 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -35,8 +35,8 @@ TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif -BEGINSRC?= ${SRCS:M*.c} -ENDSRC?= ${SRCS:M*.c} +BEGINSRC?= crtstuff.c +ENDSRC?= crtstuff.c all: ${OBJS} ${SOBJS} ${TGTOBJS} ${OBJS} ${SOBJS}: ${SRCS:M*.h} ==== //depot/projects/ethng/src/include/_ctype.h#2 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.30 2004/08/21 07:00:40 tjr Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ */ #ifndef __CTYPE_H_ @@ -87,6 +87,8 @@ #define __inline #endif +extern int __mb_sb_limit; + /* * Use inline functions if we are allowed to and the compiler supports them. */ @@ -103,15 +105,28 @@ } static __inline int +__sbmaskrune(__ct_rune_t _c, unsigned long _f) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + _CurrentRuneLocale->__runetype[_c] & _f; +} + +static __inline int __istype(__ct_rune_t _c, unsigned long _f) { return (!!__maskrune(_c, _f)); } static __inline int +__sbistype(__ct_rune_t _c, unsigned long _f) +{ + return (!!__sbmaskrune(_c, _f)); +} + +static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= _CACHED_RUNES) ? 0 : + return (_c < 0 || _c >= __mb_sb_limit) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } @@ -123,12 +138,26 @@ } static __inline __ct_rune_t +__sbtoupper(__ct_rune_t _c) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? _c : + _CurrentRuneLocale->__mapupper[_c]; +} + +static __inline __ct_rune_t __tolower(__ct_rune_t _c) { return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) : _CurrentRuneLocale->__maplower[_c]; } +static __inline __ct_rune_t +__sbtolower(__ct_rune_t _c) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? _c : + _CurrentRuneLocale->__maplower[_c]; +} + static __inline int __wcwidth(__ct_rune_t _c) { @@ -146,10 +175,14 @@ __BEGIN_DECLS int __maskrune(__ct_rune_t, unsigned long); +int __sbmaskrune(__ct_rune_t, unsigned long); int __istype(__ct_rune_t, unsigned long); +int __sbistype(__ct_rune_t, unsigned long); int __isctype(__ct_rune_t, unsigned long); __ct_rune_t __toupper(__ct_rune_t); +__ct_rune_t __sbtoupper(__ct_rune_t); __ct_rune_t __tolower(__ct_rune_t); +__ct_rune_t __sbtolower(__ct_rune_t); int __wcwidth(__ct_rune_t); __END_DECLS #endif /* using inlines */ ==== //depot/projects/ethng/src/include/ctype.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.28 2004/08/12 09:33:47 tjr Exp $ + * $FreeBSD: src/include/ctype.h,v 1.29 2007/10/13 16:28:21 ache Exp $ */ #ifndef _CTYPE_H_ @@ -86,19 +86,19 @@ #endif __END_DECLS -#define isalnum(c) __istype((c), _CTYPE_A|_CTYPE_D) -#define isalpha(c) __istype((c), _CTYPE_A) -#define iscntrl(c) __istype((c), _CTYPE_C) +#define isalnum(c) __sbistype((c), _CTYPE_A|_CTYPE_D) +#define isalpha(c) __sbistype((c), _CTYPE_A) +#define iscntrl(c) __sbistype((c), _CTYPE_C) #define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */ -#define isgraph(c) __istype((c), _CTYPE_G) -#define islower(c) __istype((c), _CTYPE_L) -#define isprint(c) __istype((c), _CTYPE_R) -#define ispunct(c) __istype((c), _CTYPE_P) -#define isspace(c) __istype((c), _CTYPE_S) -#define isupper(c) __istype((c), _CTYPE_U) +#define isgraph(c) __sbistype((c), _CTYPE_G) +#define islower(c) __sbistype((c), _CTYPE_L) +#define isprint(c) __sbistype((c), _CTYPE_R) +#define ispunct(c) __sbistype((c), _CTYPE_P) +#define isspace(c) __sbistype((c), _CTYPE_S) +#define isupper(c) __sbistype((c), _CTYPE_U) #define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */ -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) +#define tolower(c) __sbtolower(c) +#define toupper(c) __sbtoupper(c) #if __XSI_VISIBLE /* @@ -112,24 +112,24 @@ * * XXX isascii() and toascii() should similarly be undocumented. */ -#define _tolower(c) __tolower(c) -#define _toupper(c) __toupper(c) +#define _tolower(c) __sbtolower(c) +#define _toupper(c) __sbtoupper(c) #define isascii(c) (((c) & ~0x7F) == 0) #define toascii(c) ((c) & 0x7F) #endif #if __ISO_C_VISIBLE >= 1999 -#define isblank(c) __istype((c), _CTYPE_B) +#define isblank(c) __sbistype((c), _CTYPE_B) #endif #if __BSD_VISIBLE -#define digittoint(c) __maskrune((c), 0xFF) -#define ishexnumber(c) __istype((c), _CTYPE_X) -#define isideogram(c) __istype((c), _CTYPE_I) -#define isnumber(c) __istype((c), _CTYPE_D) -#define isphonogram(c) __istype((c), _CTYPE_Q) -#define isrune(c) __istype((c), 0xFFFFFF00L) -#define isspecial(c) __istype((c), _CTYPE_T) +#define digittoint(c) __sbmaskrune((c), 0xFF) +#define ishexnumber(c) __sbistype((c), _CTYPE_X) +#define isideogram(c) __sbistype((c), _CTYPE_I) +#define isnumber(c) __sbistype((c), _CTYPE_D) +#define isphonogram(c) __sbistype((c), _CTYPE_Q) +#define isrune(c) __sbistype((c), 0xFFFFFF00L) +#define isspecial(c) __sbistype((c), _CTYPE_T) #endif #endif /* !_CTYPE_H_ */ ==== //depot/projects/ethng/src/include/wctype.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ - * $FreeBSD: src/include/wctype.h,v 1.13 2004/08/12 10:29:14 tjr Exp $ + * $FreeBSD: src/include/wctype.h,v 1.15 2007/10/14 10:23:54 ache Exp $ */ #ifndef _WCTYPE_H_ ==== //depot/projects/ethng/src/lib/libc/arm/string/ffs.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.4 2007/10/13 12:06:31 cognet Exp $"); /* * ffs - find first set bit, this algorithm isolates the first set @@ -49,7 +49,7 @@ /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ rsb r1, r0, #0 ands r0, r0, r1 -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5 /* * now r0 has at most one set bit, call this X * if X = 0, all further instructions are skipped ==== //depot/projects/ethng/src/lib/libc/arm/string/memcpy.S#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* $NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); -#if !defined(__XSCALE__) || defined(_STANDALONE) +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.2 2007/10/13 12:06:31 cognet Exp $"); +#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE) #include "memcpy_arm.S" #else #include "memcpy_xscale.S" ==== //depot/projects/ethng/src/lib/libc/arm/string/memset.S#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.3 2007/10/13 12:06:31 cognet Exp $"); /* * memset: Sets a block of memory to the specified value @@ -103,15 +103,15 @@ #ifndef _BZERO orr r3, r3, r3, lsl #8 /* Extend value to 16-bits */ #endif -#ifdef __XSCALE__ - tst ip, #0x04 /* Quad-align for Xscale */ +#ifdef _ARM_ARCH_5E + tst ip, #0x04 /* Quad-align for armv5e */ #else cmp r1, #0x10 #endif #ifndef _BZERO orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */ #endif -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E subne r1, r1, #0x04 /* Quad-align if necessary */ strne r3, [ip], #0x04 cmp r1, #0x10 @@ -124,7 +124,7 @@ /* Do 128 bytes at a time */ .Lmemset_loop128: subs r1, r1, #0x80 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -167,7 +167,7 @@ /* Do 32 bytes at a time */ .Lmemset_loop32: subs r1, r1, #0x20 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -184,7 +184,7 @@ adds r1, r1, #0x10 /* Partially adjust for extra sub */ /* Deal with 16 bytes or more */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 #else @@ -202,7 +202,7 @@ bgt .Lmemset_loop4 RETeq /* Zero length so just exit */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 RETeq ==== //depot/projects/ethng/src/lib/libc/gdtoa/Symbol.map#2 (text) ==== @@ -1,42 +1,13 @@ /* - * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.4 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.5 2007/10/13 14:40:16 deischen Exp $ */ FBSD_1.0 { /* * Standard functions from contrib/gdtoa - * (dtoa is renamed to __dtoa and not exported) */ - freedtoa; - g_Qfmt; - g_ddfmt; - g_dfmt; - g_ffmt; - g_xLfmt; - g_xfmt; - gdtoa; - strtoIQ; - strtoId; - strtoIdd; - strtoIf; - strtoIx; - strtoIxL; strtod; - strtodI; - strtodg; strtof; - strtopQ; - strtopd; - strtopdd; - strtopf; - strtopx; - strtopxL; - strtorQ; - strtord; - strtordd; - strtorf; - strtorx; - strtorxL; /* FreeBSD additions */ strtold; ==== //depot/projects/ethng/src/lib/libc/gen/sysctl.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.69 2007/04/10 11:19:52 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.71 2007/10/14 18:57:32 ru Exp $ .\" .Dd April 10, 2007 .Dt SYSCTL 3 @@ -280,10 +280,10 @@ .It "HW_PHYSMEM integer no" .It "HW_USERMEM integer no" .It "HW_PAGESIZE integer no" -.It "HW_FLOATINGPOINT integer no" +.It "HW_FLOATINGPT integer no" .It "HW_MACHINE_ARCH string no" -.\".It "HW_DISKNAMES integer no" -.\".It "HW_DISKSTATS integer no" +.It "HW_REALMEM integer no" +.It "HW_SENSORS node not applicable" .El .Pp .Bl -tag -width 6n @@ -301,12 +301,42 @@ The bytes of non-kernel memory. .It Li HW_PAGESIZE The software page size. -.It Li HW_FLOATINGPOINT +.It Li HW_FLOATINGPT Nonzero if the floating point support is in hardware. .It Li HW_MACHINE_ARCH The machine dependent architecture type. -.\".It Fa HW_DISKNAMES -.\".It Fa HW_DISKSTATS +.It Li HW_REALMEM +The bytes of real memory. +.It Li HW_SENSORS +Third level comprises an array of +.Vt "struct sensordev" +structures containing information about devices +that may attach hardware monitoring sensors. +.Pp +Third, fourth and fifth levels together comprise an array of +.Vt "struct sensor" +structures containing snapshot readings of hardware monitoring sensors. +In such usage, third level indicates the numerical representation +of the sensor device name to which the sensor is attached +(device's +.Va xname +and number shall be matched with the help of +.Vt "struct sensordev" +structure above), +fourth level indicates sensor type and +fifth level is an ordinal sensor number (unique to +the specified sensor type on the specified sensor device). +.Pp +The +.Vt sensordev +and +.Vt sensor +structures +and +.Vt sensor_type +enumeration +are defined in +.In sys/sensors.h . .El .Ss CTL_KERN The string and integer information available for the CTL_KERN level ==== //depot/projects/ethng/src/lib/libc/locale/Symbol.map#2 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.3 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.4 2007/10/13 16:28:21 ache Exp $ */ FBSD_1.0 { @@ -60,12 +60,17 @@ nextwctype; nl_langinfo; __maskrune; + __sbmaskrune; __istype; + __sbistype; __isctype; __toupper; + __sbtoupper; __tolower; + __sbtolower; __wcwidth; __mb_cur_max; + __mb_sb_limit; rpmatch; ___runetype; setlocale; ==== //depot/projects/ethng/src/lib/libc/locale/big5.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.18 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -49,6 +49,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _BIG5_mbsinit(const mbstate_t *); @@ -68,6 +70,7 @@ __mbsinit = _BIG5_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/euc.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.22 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -49,6 +49,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _EUC_mbsinit(const mbstate_t *); @@ -116,6 +118,7 @@ __mbrtowc = _EUC_mbrtowc; __wcrtomb = _EUC_wcrtomb; __mbsinit = _EUC_mbsinit; + __mb_sb_limit = 256; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/gb18030.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.8 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -39,6 +39,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GB18030_mbsinit(const mbstate_t *); @@ -59,6 +61,7 @@ __mbsinit = _GB18030_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 4; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/gb2312.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.10 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -35,6 +35,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GB2312_mbsinit(const mbstate_t *); @@ -55,6 +57,7 @@ __wcrtomb = _GB2312_wcrtomb; __mbsinit = _GB2312_mbsinit; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/gbk.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.13 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.14 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -42,6 +42,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GBK_mbsinit(const mbstate_t *); @@ -61,6 +63,7 @@ __mbsinit = _GBK_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/isctype.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.10 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.11 2007/10/13 16:28:22 ache Exp $"); #include @@ -48,7 +48,7 @@ digittoint(c) int c; { - return (__maskrune(c, 0xFF)); + return (__sbmaskrune(c, 0xFF)); } #undef isalnum @@ -56,7 +56,7 @@ isalnum(c) int c; { - return (__istype(c, _CTYPE_A|_CTYPE_D)); + return (__sbistype(c, _CTYPE_A|_CTYPE_D)); } #undef isalpha @@ -64,7 +64,7 @@ isalpha(c) int c; { - return (__istype(c, _CTYPE_A)); + return (__sbistype(c, _CTYPE_A)); } #undef isascii @@ -80,7 +80,7 @@ isblank(c) int c; { - return (__istype(c, _CTYPE_B)); + return (__sbistype(c, _CTYPE_B)); } #undef iscntrl @@ -88,7 +88,7 @@ iscntrl(c) int c; { - return (__istype(c, _CTYPE_C)); + return (__sbistype(c, _CTYPE_C)); } #undef isdigit @@ -104,7 +104,7 @@ isgraph(c) int c; { - return (__istype(c, _CTYPE_G)); + return (__sbistype(c, _CTYPE_G)); } #undef ishexnumber @@ -112,7 +112,7 @@ ishexnumber(c) int c; { - return (__istype(c, _CTYPE_X)); + return (__sbistype(c, _CTYPE_X)); } #undef isideogram @@ -120,7 +120,7 @@ isideogram(c) int c; { - return (__istype(c, _CTYPE_I)); + return (__sbistype(c, _CTYPE_I)); } #undef islower @@ -128,7 +128,7 @@ islower(c) int c; { - return (__istype(c, _CTYPE_L)); + return (__sbistype(c, _CTYPE_L)); } #undef isnumber @@ -136,7 +136,7 @@ isnumber(c) int c; { - return (__istype(c, _CTYPE_D)); + return (__sbistype(c, _CTYPE_D)); } #undef isphonogram @@ -144,7 +144,7 @@ isphonogram(c) int c; { - return (__istype(c, _CTYPE_Q)); + return (__sbistype(c, _CTYPE_Q)); } #undef isprint @@ -152,7 +152,7 @@ isprint(c) int c; { - return (__istype(c, _CTYPE_R)); + return (__sbistype(c, _CTYPE_R)); } #undef ispunct @@ -160,7 +160,7 @@ ispunct(c) int c; { - return (__istype(c, _CTYPE_P)); + return (__sbistype(c, _CTYPE_P)); } #undef isrune @@ -168,7 +168,7 @@ isrune(c) int c; { - return (__istype(c, 0xFFFFFF00L)); + return (__sbistype(c, 0xFFFFFF00L)); } #undef isspace @@ -176,7 +176,7 @@ isspace(c) int c; { - return (__istype(c, _CTYPE_S)); + return (__sbistype(c, _CTYPE_S)); } #undef isspecial @@ -184,7 +184,7 @@ isspecial(c) int c; { - return (__istype(c, _CTYPE_T)); + return (__sbistype(c, _CTYPE_T)); } #undef isupper @@ -192,7 +192,7 @@ isupper(c) int c; { - return (__istype(c, _CTYPE_U)); + return (__sbistype(c, _CTYPE_U)); } #undef isxdigit @@ -216,7 +216,7 @@ tolower(c) int c; { - return (__tolower(c)); + return (__sbtolower(c)); } #undef toupper @@ -224,6 +224,6 @@ toupper(c) int c; { - return (__toupper(c)); + return (__sbtoupper(c)); } ==== //depot/projects/ethng/src/lib/libc/locale/iswctype.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.7 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $"); #include @@ -61,7 +61,7 @@ iswascii(wc) wint_t wc; { - return ((wc & ~0x7F) == 0); + return (wc < 0x80); } #undef iswblank ==== //depot/projects/ethng/src/lib/libc/locale/mskanji.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.18 2007/10/13 16:28:22 ache Exp $"); #include #include @@ -47,6 +47,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _MSKanji_mbsinit(const mbstate_t *); @@ -66,6 +68,7 @@ __mbsinit = _MSKanji_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 2; + __mb_sb_limit = 256; return (0); } ==== //depot/projects/ethng/src/lib/libc/locale/none.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.14 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.15 2007/10/13 16:28:22 ache Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 15 04:56:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C34A16A41A; Mon, 15 Oct 2007 04:56:18 +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 D84F416A418 for ; Mon, 15 Oct 2007 04:56:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A97AC13C45B for ; Mon, 15 Oct 2007 04:56:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F4uH00095069 for ; Mon, 15 Oct 2007 04:56:17 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F4uHNl095066 for perforce@freebsd.org; Mon, 15 Oct 2007 04:56:17 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 04:56:17 GMT Message-Id: <200710150456.l9F4uHNl095066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127547 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, 15 Oct 2007 04:56:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=127547 Change 127547 by kmacy@kmacy_home:ethng on 2007/10/15 04:56:06 add iw_cxgb to the build Affected files ... .. //depot/projects/ethng/src/sys/modules/cxgb/Makefile#10 edit Differences ... ==== //depot/projects/ethng/src/sys/modules/cxgb/Makefile#10 (text+ko) ==== @@ -1,4 +1,5 @@ # $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $ SUBDIR= cxgb +SUBDIR+= iw_cxgb .include From owner-p4-projects@FreeBSD.ORG Mon Oct 15 05:00:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0258616A41A; Mon, 15 Oct 2007 05:00: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 7764616A417 for ; Mon, 15 Oct 2007 05:00:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60C8F13C457 for ; Mon, 15 Oct 2007 05:00:22 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F50MIK095278 for ; Mon, 15 Oct 2007 05:00:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F50Mhb095275 for perforce@freebsd.org; Mon, 15 Oct 2007 05:00:22 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 05:00:22 GMT Message-Id: <200710150500.l9F50Mhb095275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127548 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, 15 Oct 2007 05:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127548 Change 127548 by kmacy@kmacy_home:ethng on 2007/10/15 05:00:17 add IFNET_MULTIQUEUE to the defaults Affected files ... .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC#5 edit Differences ... ==== //depot/projects/ethng/src/sys/amd64/conf/GENERIC#5 (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.483 2007/07/01 21:47:45 njl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $ cpu HAMMER ident CXGB @@ -32,7 +32,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -options SCTP # Stream Transmission Control Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -69,8 +69,8 @@ options KDB # Enable kernel debugger support. options DDB # Support DDB. options GDB # Support remote GDB. -#options INVARIANTS # Enable calls of extra sanity checking -#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed @@ -212,4 +212,5 @@ device dcons_crom # Configuration ROM for dcons options ALT_BREAK_TO_DEBUGGER +options IFNET_MULTIQUEUE #options BIND_ALL From owner-p4-projects@FreeBSD.ORG Mon Oct 15 16:38:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4117816A418; Mon, 15 Oct 2007 16:38:16 +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 EA31816A469 for ; Mon, 15 Oct 2007 16:38:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D448213C45D for ; Mon, 15 Oct 2007 16:38:15 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9FGcFiG068367 for ; Mon, 15 Oct 2007 16:38:15 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9FGcFcD068364 for perforce@freebsd.org; Mon, 15 Oct 2007 16:38:15 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 15 Oct 2007 16:38:15 GMT Message-Id: <200710151638.l9FGcFcD068364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127558 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, 15 Oct 2007 16:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=127558 Change 127558 by zec@zec_tpx32 on 2007/10/15 16:37:30 Allow for sysctl access to per-vcpu variables. Most probably we won't be virtualizing any existing variables but only introducing new state there. NB I wasn't at school when pointer arithmetic was taught so this quick kludge needs to be revisited and fixed, along a few other places where I do nasty and probably non-portable hacks with pointers. XXX. Affected files ... .. //depot/projects/vimage/src/sys/sys/sysctl.h#10 edit Differences ... ==== //depot/projects/vimage/src/sys/sys/sysctl.h#10 (text+ko) ==== @@ -419,6 +419,10 @@ ptr = curthread->td_ucred->cr_vimage->v_procg; \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ + case V_CPU: \ + ptr = curthread->td_ucred->cr_vimage->v_cpu; \ + arg1 = (void *) ((int) ptr + (int) arg1); \ + break; \ default: \ panic("unsupported module id %d", subs); \ } \ From owner-p4-projects@FreeBSD.ORG Mon Oct 15 20:03:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD3B16A468; Mon, 15 Oct 2007 20:03: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 AD1F916A41B for ; Mon, 15 Oct 2007 20:03:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90DD313C458 for ; Mon, 15 Oct 2007 20:03:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9FK35GH099166 for ; Mon, 15 Oct 2007 20:03:05 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9FK33Fd098911 for perforce@freebsd.org; Mon, 15 Oct 2007 20:03:03 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 20:03:03 GMT Message-Id: <200710152003.l9FK33Fd098911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127562 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, 15 Oct 2007 20:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=127562 Change 127562 by kmacy@kmacy:storage:toestack on 2007/10/15 20:02:23 IFC 127548 Affected files ... .. //depot/projects/toestack/etc/Makefile#2 integrate .. //depot/projects/toestack/etc/defaults/rc.conf#5 integrate .. //depot/projects/toestack/etc/rc.d/Makefile#4 integrate .. //depot/projects/toestack/etc/rc.d/sensorsd#1 branch .. //depot/projects/toestack/etc/sensorsd.conf#1 branch .. //depot/projects/toestack/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/toestack/include/_ctype.h#2 integrate .. //depot/projects/toestack/include/ctype.h#2 integrate .. //depot/projects/toestack/include/wctype.h#2 integrate .. //depot/projects/toestack/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/toestack/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/toestack/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/toestack/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/toestack/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/toestack/lib/libc/locale/Symbol.map#2 integrate .. //depot/projects/toestack/lib/libc/locale/big5.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/euc.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/none.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/toestack/lib/libutil/pidfile.3#3 integrate .. //depot/projects/toestack/sbin/ipfw/ipfw.8#2 integrate .. //depot/projects/toestack/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/toestack/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/toestack/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/toestack/share/man/man4/Makefile#2 integrate .. //depot/projects/toestack/share/man/man4/coretemp.4#2 integrate .. //depot/projects/toestack/share/man/man4/hwpmc.4#2 integrate .. //depot/projects/toestack/share/man/man4/it.4#1 branch .. //depot/projects/toestack/share/man/man4/lm.4#1 branch .. //depot/projects/toestack/share/man/man5/fstab.5#2 integrate .. //depot/projects/toestack/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/toestack/share/man/man9/Makefile#4 integrate .. //depot/projects/toestack/share/man/man9/sensor_attach.9#1 branch .. //depot/projects/toestack/share/mklocale/UTF-8.src#2 integrate .. //depot/projects/toestack/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/toestack/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/toestack/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/toestack/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/toestack/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/toestack/sys/arm/arm/support.S#2 integrate .. //depot/projects/toestack/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/toestack/sys/arm/include/asm.h#2 integrate .. //depot/projects/toestack/sys/conf/files#4 integrate .. //depot/projects/toestack/sys/conf/files.amd64#3 integrate .. //depot/projects/toestack/sys/conf/files.i386#2 integrate .. //depot/projects/toestack/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/toestack/sys/contrib/rdma/ib_addr.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_cache.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_cm.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_fmr_pool.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_mad.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_marshall.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_pack.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_sa.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_smi.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_user_cm.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_user_mad.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_user_sa.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_user_verbs.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/iw_cm.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_cm.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_cm_ib.h#1 branch .. //depot/projects/toestack/sys/contrib/rdma/rdma_user_cm.h#1 branch .. //depot/projects/toestack/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/toestack/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/toestack/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/toestack/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_wr.h#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.c#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch.h#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.h#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#1 branch .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.h#4 integrate .. //depot/projects/toestack/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/toestack/sys/dev/it/it.c#1 branch .. //depot/projects/toestack/sys/dev/it/itvar.h#1 branch .. //depot/projects/toestack/sys/dev/lm/lm78.c#1 branch .. //depot/projects/toestack/sys/dev/lm/lm78_isa.c#1 branch .. //depot/projects/toestack/sys/dev/lm/lm78var.h#1 branch .. //depot/projects/toestack/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/toestack/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/toestack/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/toestack/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/toestack/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/toestack/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/toestack/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/toestack/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/toestack/sys/kern/kern_environment.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_sensors.c#1 branch .. //depot/projects/toestack/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/toestack/sys/modules/Makefile#3 integrate .. //depot/projects/toestack/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/toestack/sys/modules/cxgb/iw_cxgb/Makefile#1 branch .. //depot/projects/toestack/sys/modules/it/Makefile#1 branch .. //depot/projects/toestack/sys/modules/lm/Makefile#1 branch .. //depot/projects/toestack/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/toestack/sys/sys/linux_compat.h#1 branch .. //depot/projects/toestack/sys/sys/sensors.h#1 branch .. //depot/projects/toestack/sys/sys/sysctl.h#2 integrate .. //depot/projects/toestack/sys/sys/systm.h#3 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/toestack/usr.bin/id/id.c#2 integrate .. //depot/projects/toestack/usr.bin/systat/Makefile#2 integrate .. //depot/projects/toestack/usr.bin/systat/cmdtab.c#2 integrate .. //depot/projects/toestack/usr.bin/systat/extern.h#2 integrate .. //depot/projects/toestack/usr.bin/systat/sensors.c#1 branch .. //depot/projects/toestack/usr.bin/systat/systat.1#2 integrate .. //depot/projects/toestack/usr.sbin/Makefile#5 integrate .. //depot/projects/toestack/usr.sbin/sensorsd/Makefile#1 branch .. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.8#1 branch .. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.c#1 branch .. //depot/projects/toestack/usr.sbin/sensorsd/sensorsd.conf.5#1 branch Differences ... ==== //depot/projects/toestack/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.360 2007/07/13 14:28:10 imp Exp $ +# $FreeBSD: src/etc/Makefile,v 1.361 2007/10/14 10:45:28 netchild Exp $ .include @@ -17,7 +17,7 @@ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr remote rpc services shells \ + rc.subr remote rpc sensorsd.conf services shells \ snmpd.config sysctl.conf syslog.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ==== //depot/projects/toestack/etc/defaults/rc.conf#5 (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.319 2007/10/12 16:35:36 emax Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.320 2007/10/14 10:45:28 netchild Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,6 +40,8 @@ kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). +sensorsd_enable="NO" # Run sensorsd to monitor and log sensor state changes +sensorsd_flags="" # additional flags for sensorsd(8) tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp ==== //depot/projects/toestack/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.85 2007/10/14 10:45:28 netchild Exp $ .include @@ -33,7 +33,7 @@ random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ - serial sppp statd swap1 \ + sensorsd serial sppp statd swap1 \ syscons sysctl syslogd \ timed tmp \ ugidfw \ ==== //depot/projects/toestack/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.26 2007/10/12 18:14:41 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.27 2007/10/13 05:50:43 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -35,8 +35,8 @@ TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif -BEGINSRC?= ${SRCS:M*.c} -ENDSRC?= ${SRCS:M*.c} +BEGINSRC?= crtstuff.c +ENDSRC?= crtstuff.c all: ${OBJS} ${SOBJS} ${TGTOBJS} ${OBJS} ${SOBJS}: ${SRCS:M*.h} ==== //depot/projects/toestack/include/_ctype.h#2 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.30 2004/08/21 07:00:40 tjr Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $ */ #ifndef __CTYPE_H_ @@ -87,6 +87,8 @@ #define __inline #endif +extern int __mb_sb_limit; + /* * Use inline functions if we are allowed to and the compiler supports them. */ @@ -103,15 +105,28 @@ } static __inline int +__sbmaskrune(__ct_rune_t _c, unsigned long _f) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? 0 : + _CurrentRuneLocale->__runetype[_c] & _f; +} + +static __inline int __istype(__ct_rune_t _c, unsigned long _f) { return (!!__maskrune(_c, _f)); } static __inline int +__sbistype(__ct_rune_t _c, unsigned long _f) +{ + return (!!__sbmaskrune(_c, _f)); +} + +static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c < 0 || _c >= _CACHED_RUNES) ? 0 : + return (_c < 0 || _c >= __mb_sb_limit) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } @@ -123,12 +138,26 @@ } static __inline __ct_rune_t +__sbtoupper(__ct_rune_t _c) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? _c : + _CurrentRuneLocale->__mapupper[_c]; +} + +static __inline __ct_rune_t __tolower(__ct_rune_t _c) { return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) : _CurrentRuneLocale->__maplower[_c]; } +static __inline __ct_rune_t +__sbtolower(__ct_rune_t _c) +{ + return (_c < 0 || _c >= __mb_sb_limit) ? _c : + _CurrentRuneLocale->__maplower[_c]; +} + static __inline int __wcwidth(__ct_rune_t _c) { @@ -146,10 +175,14 @@ __BEGIN_DECLS int __maskrune(__ct_rune_t, unsigned long); +int __sbmaskrune(__ct_rune_t, unsigned long); int __istype(__ct_rune_t, unsigned long); +int __sbistype(__ct_rune_t, unsigned long); int __isctype(__ct_rune_t, unsigned long); __ct_rune_t __toupper(__ct_rune_t); +__ct_rune_t __sbtoupper(__ct_rune_t); __ct_rune_t __tolower(__ct_rune_t); +__ct_rune_t __sbtolower(__ct_rune_t); int __wcwidth(__ct_rune_t); __END_DECLS #endif /* using inlines */ ==== //depot/projects/toestack/include/ctype.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.28 2004/08/12 09:33:47 tjr Exp $ + * $FreeBSD: src/include/ctype.h,v 1.29 2007/10/13 16:28:21 ache Exp $ */ #ifndef _CTYPE_H_ @@ -86,19 +86,19 @@ #endif __END_DECLS -#define isalnum(c) __istype((c), _CTYPE_A|_CTYPE_D) -#define isalpha(c) __istype((c), _CTYPE_A) -#define iscntrl(c) __istype((c), _CTYPE_C) +#define isalnum(c) __sbistype((c), _CTYPE_A|_CTYPE_D) +#define isalpha(c) __sbistype((c), _CTYPE_A) +#define iscntrl(c) __sbistype((c), _CTYPE_C) #define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */ -#define isgraph(c) __istype((c), _CTYPE_G) -#define islower(c) __istype((c), _CTYPE_L) -#define isprint(c) __istype((c), _CTYPE_R) -#define ispunct(c) __istype((c), _CTYPE_P) -#define isspace(c) __istype((c), _CTYPE_S) -#define isupper(c) __istype((c), _CTYPE_U) +#define isgraph(c) __sbistype((c), _CTYPE_G) +#define islower(c) __sbistype((c), _CTYPE_L) +#define isprint(c) __sbistype((c), _CTYPE_R) +#define ispunct(c) __sbistype((c), _CTYPE_P) +#define isspace(c) __sbistype((c), _CTYPE_S) +#define isupper(c) __sbistype((c), _CTYPE_U) #define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */ -#define tolower(c) __tolower(c) -#define toupper(c) __toupper(c) +#define tolower(c) __sbtolower(c) +#define toupper(c) __sbtoupper(c) #if __XSI_VISIBLE /* @@ -112,24 +112,24 @@ * * XXX isascii() and toascii() should similarly be undocumented. */ -#define _tolower(c) __tolower(c) -#define _toupper(c) __toupper(c) +#define _tolower(c) __sbtolower(c) +#define _toupper(c) __sbtoupper(c) #define isascii(c) (((c) & ~0x7F) == 0) #define toascii(c) ((c) & 0x7F) #endif #if __ISO_C_VISIBLE >= 1999 -#define isblank(c) __istype((c), _CTYPE_B) +#define isblank(c) __sbistype((c), _CTYPE_B) #endif #if __BSD_VISIBLE -#define digittoint(c) __maskrune((c), 0xFF) -#define ishexnumber(c) __istype((c), _CTYPE_X) -#define isideogram(c) __istype((c), _CTYPE_I) -#define isnumber(c) __istype((c), _CTYPE_D) -#define isphonogram(c) __istype((c), _CTYPE_Q) -#define isrune(c) __istype((c), 0xFFFFFF00L) -#define isspecial(c) __istype((c), _CTYPE_T) +#define digittoint(c) __sbmaskrune((c), 0xFF) +#define ishexnumber(c) __sbistype((c), _CTYPE_X) +#define isideogram(c) __sbistype((c), _CTYPE_I) +#define isnumber(c) __sbistype((c), _CTYPE_D) +#define isphonogram(c) __sbistype((c), _CTYPE_Q) +#define isrune(c) __sbistype((c), 0xFFFFFF00L) +#define isspecial(c) __sbistype((c), _CTYPE_T) #endif #endif /* !_CTYPE_H_ */ ==== //depot/projects/toestack/include/wctype.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ - * $FreeBSD: src/include/wctype.h,v 1.13 2004/08/12 10:29:14 tjr Exp $ + * $FreeBSD: src/include/wctype.h,v 1.15 2007/10/14 10:23:54 ache Exp $ */ #ifndef _WCTYPE_H_ ==== //depot/projects/toestack/lib/libc/arm/string/ffs.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.4 2007/10/13 12:06:31 cognet Exp $"); /* * ffs - find first set bit, this algorithm isolates the first set @@ -49,7 +49,7 @@ /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ rsb r1, r0, #0 ands r0, r0, r1 -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5 /* * now r0 has at most one set bit, call this X * if X = 0, all further instructions are skipped ==== //depot/projects/toestack/lib/libc/arm/string/memcpy.S#2 (text+ko) ==== @@ -1,8 +1,8 @@ /* $NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $"); -#if !defined(__XSCALE__) || defined(_STANDALONE) +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.2 2007/10/13 12:06:31 cognet Exp $"); +#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE) #include "memcpy_arm.S" #else #include "memcpy_xscale.S" ==== //depot/projects/toestack/lib/libc/arm/string/memset.S#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.3 2007/10/13 12:06:31 cognet Exp $"); /* * memset: Sets a block of memory to the specified value @@ -103,15 +103,15 @@ #ifndef _BZERO orr r3, r3, r3, lsl #8 /* Extend value to 16-bits */ #endif -#ifdef __XSCALE__ - tst ip, #0x04 /* Quad-align for Xscale */ +#ifdef _ARM_ARCH_5E + tst ip, #0x04 /* Quad-align for armv5e */ #else cmp r1, #0x10 #endif #ifndef _BZERO orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */ #endif -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E subne r1, r1, #0x04 /* Quad-align if necessary */ strne r3, [ip], #0x04 cmp r1, #0x10 @@ -124,7 +124,7 @@ /* Do 128 bytes at a time */ .Lmemset_loop128: subs r1, r1, #0x80 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -167,7 +167,7 @@ /* Do 32 bytes at a time */ .Lmemset_loop32: subs r1, r1, #0x20 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -184,7 +184,7 @@ adds r1, r1, #0x10 /* Partially adjust for extra sub */ /* Deal with 16 bytes or more */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 #else @@ -202,7 +202,7 @@ bgt .Lmemset_loop4 RETeq /* Zero length so just exit */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 RETeq ==== //depot/projects/toestack/lib/libc/gdtoa/Symbol.map#2 (text) ==== @@ -1,42 +1,13 @@ /* - * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.4 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.5 2007/10/13 14:40:16 deischen Exp $ */ FBSD_1.0 { /* * Standard functions from contrib/gdtoa - * (dtoa is renamed to __dtoa and not exported) */ - freedtoa; - g_Qfmt; - g_ddfmt; - g_dfmt; - g_ffmt; - g_xLfmt; - g_xfmt; - gdtoa; - strtoIQ; - strtoId; - strtoIdd; - strtoIf; - strtoIx; - strtoIxL; strtod; - strtodI; - strtodg; strtof; - strtopQ; - strtopd; - strtopdd; - strtopf; - strtopx; - strtopxL; - strtorQ; - strtord; - strtordd; - strtorf; - strtorx; - strtorxL; /* FreeBSD additions */ strtold; ==== //depot/projects/toestack/lib/libc/gen/sysctl.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.69 2007/04/10 11:19:52 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.71 2007/10/14 18:57:32 ru Exp $ .\" .Dd April 10, 2007 .Dt SYSCTL 3 @@ -280,10 +280,10 @@ .It "HW_PHYSMEM integer no" .It "HW_USERMEM integer no" .It "HW_PAGESIZE integer no" -.It "HW_FLOATINGPOINT integer no" +.It "HW_FLOATINGPT integer no" .It "HW_MACHINE_ARCH string no" -.\".It "HW_DISKNAMES integer no" -.\".It "HW_DISKSTATS integer no" +.It "HW_REALMEM integer no" +.It "HW_SENSORS node not applicable" .El .Pp .Bl -tag -width 6n @@ -301,12 +301,42 @@ The bytes of non-kernel memory. .It Li HW_PAGESIZE The software page size. -.It Li HW_FLOATINGPOINT +.It Li HW_FLOATINGPT Nonzero if the floating point support is in hardware. .It Li HW_MACHINE_ARCH The machine dependent architecture type. -.\".It Fa HW_DISKNAMES -.\".It Fa HW_DISKSTATS +.It Li HW_REALMEM +The bytes of real memory. +.It Li HW_SENSORS +Third level comprises an array of +.Vt "struct sensordev" +structures containing information about devices +that may attach hardware monitoring sensors. +.Pp +Third, fourth and fifth levels together comprise an array of +.Vt "struct sensor" +structures containing snapshot readings of hardware monitoring sensors. +In such usage, third level indicates the numerical representation +of the sensor device name to which the sensor is attached +(device's +.Va xname +and number shall be matched with the help of +.Vt "struct sensordev" +structure above), +fourth level indicates sensor type and +fifth level is an ordinal sensor number (unique to +the specified sensor type on the specified sensor device). +.Pp +The +.Vt sensordev +and +.Vt sensor +structures +and +.Vt sensor_type +enumeration +are defined in +.In sys/sensors.h . .El .Ss CTL_KERN The string and integer information available for the CTL_KERN level ==== //depot/projects/toestack/lib/libc/locale/Symbol.map#2 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.3 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.4 2007/10/13 16:28:21 ache Exp $ */ FBSD_1.0 { @@ -60,12 +60,17 @@ nextwctype; nl_langinfo; __maskrune; + __sbmaskrune; __istype; + __sbistype; __isctype; __toupper; + __sbtoupper; __tolower; + __sbtolower; __wcwidth; __mb_cur_max; + __mb_sb_limit; rpmatch; ___runetype; setlocale; ==== //depot/projects/toestack/lib/libc/locale/big5.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.18 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -49,6 +49,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _BIG5_mbsinit(const mbstate_t *); @@ -68,6 +70,7 @@ __mbsinit = _BIG5_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/toestack/lib/libc/locale/euc.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.22 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -49,6 +49,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _EUC_mbsinit(const mbstate_t *); @@ -116,6 +118,7 @@ __mbrtowc = _EUC_mbrtowc; __wcrtomb = _EUC_wcrtomb; __mbsinit = _EUC_mbsinit; + __mb_sb_limit = 256; return (0); } ==== //depot/projects/toestack/lib/libc/locale/gb18030.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.8 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -39,6 +39,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GB18030_mbsinit(const mbstate_t *); @@ -59,6 +61,7 @@ __mbsinit = _GB18030_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 4; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/toestack/lib/libc/locale/gb2312.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.10 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -35,6 +35,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GB2312_mbsinit(const mbstate_t *); @@ -55,6 +57,7 @@ __wcrtomb = _GB2312_wcrtomb; __mbsinit = _GB2312_mbsinit; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/toestack/lib/libc/locale/gbk.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.13 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.14 2007/10/13 16:28:21 ache Exp $"); #include #include @@ -42,6 +42,8 @@ #include #include "mblocal.h" +extern int __mb_sb_limit; + static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); static int _GBK_mbsinit(const mbstate_t *); @@ -61,6 +63,7 @@ __mbsinit = _GBK_mbsinit; _CurrentRuneLocale = rl; __mb_cur_max = 2; + __mb_sb_limit = 128; return (0); } ==== //depot/projects/toestack/lib/libc/locale/isctype.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.10 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.11 2007/10/13 16:28:22 ache Exp $"); #include @@ -48,7 +48,7 @@ digittoint(c) int c; { - return (__maskrune(c, 0xFF)); + return (__sbmaskrune(c, 0xFF)); } #undef isalnum @@ -56,7 +56,7 @@ isalnum(c) int c; { - return (__istype(c, _CTYPE_A|_CTYPE_D)); + return (__sbistype(c, _CTYPE_A|_CTYPE_D)); } #undef isalpha @@ -64,7 +64,7 @@ isalpha(c) int c; { - return (__istype(c, _CTYPE_A)); + return (__sbistype(c, _CTYPE_A)); } #undef isascii @@ -80,7 +80,7 @@ isblank(c) int c; { - return (__istype(c, _CTYPE_B)); + return (__sbistype(c, _CTYPE_B)); } #undef iscntrl @@ -88,7 +88,7 @@ iscntrl(c) int c; { - return (__istype(c, _CTYPE_C)); + return (__sbistype(c, _CTYPE_C)); } #undef isdigit @@ -104,7 +104,7 @@ isgraph(c) int c; { - return (__istype(c, _CTYPE_G)); + return (__sbistype(c, _CTYPE_G)); } #undef ishexnumber @@ -112,7 +112,7 @@ ishexnumber(c) int c; { - return (__istype(c, _CTYPE_X)); + return (__sbistype(c, _CTYPE_X)); } #undef isideogram @@ -120,7 +120,7 @@ isideogram(c) int c; { - return (__istype(c, _CTYPE_I)); + return (__sbistype(c, _CTYPE_I)); } #undef islower @@ -128,7 +128,7 @@ islower(c) int c; { - return (__istype(c, _CTYPE_L)); + return (__sbistype(c, _CTYPE_L)); } #undef isnumber @@ -136,7 +136,7 @@ isnumber(c) int c; { - return (__istype(c, _CTYPE_D)); + return (__sbistype(c, _CTYPE_D)); } #undef isphonogram @@ -144,7 +144,7 @@ isphonogram(c) int c; { - return (__istype(c, _CTYPE_Q)); + return (__sbistype(c, _CTYPE_Q)); } #undef isprint @@ -152,7 +152,7 @@ isprint(c) int c; { - return (__istype(c, _CTYPE_R)); + return (__sbistype(c, _CTYPE_R)); } #undef ispunct @@ -160,7 +160,7 @@ ispunct(c) int c; { - return (__istype(c, _CTYPE_P)); + return (__sbistype(c, _CTYPE_P)); } #undef isrune @@ -168,7 +168,7 @@ isrune(c) int c; { - return (__istype(c, 0xFFFFFF00L)); + return (__sbistype(c, 0xFFFFFF00L)); } #undef isspace @@ -176,7 +176,7 @@ isspace(c) int c; { - return (__istype(c, _CTYPE_S)); + return (__sbistype(c, _CTYPE_S)); } #undef isspecial @@ -184,7 +184,7 @@ isspecial(c) int c; { - return (__istype(c, _CTYPE_T)); + return (__sbistype(c, _CTYPE_T)); } #undef isupper @@ -192,7 +192,7 @@ isupper(c) int c; { - return (__istype(c, _CTYPE_U)); + return (__sbistype(c, _CTYPE_U)); } #undef isxdigit @@ -216,7 +216,7 @@ tolower(c) int c; { - return (__tolower(c)); + return (__sbtolower(c)); } #undef toupper @@ -224,6 +224,6 @@ toupper(c) int c; { - return (__toupper(c)); + return (__sbtoupper(c)); } ==== //depot/projects/toestack/lib/libc/locale/iswctype.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.7 2007/01/09 00:28:00 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $"); #include @@ -61,7 +61,7 @@ iswascii(wc) wint_t wc; { - return ((wc & ~0x7F) == 0); + return (wc < 0x80); } #undef iswblank ==== //depot/projects/toestack/lib/libc/locale/mskanji.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 15 20:41:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A0316A418; Mon, 15 Oct 2007 20:41: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 ABFCC16A41B for ; Mon, 15 Oct 2007 20:41:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8EA0913C448 for ; Mon, 15 Oct 2007 20:41:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9FKfwk4001380 for ; Mon, 15 Oct 2007 20:41:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9FKfwJE001377 for perforce@freebsd.org; Mon, 15 Oct 2007 20:41:58 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 20:41:58 GMT Message-Id: <200710152041.l9FKfwJE001377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127566 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, 15 Oct 2007 20:41:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=127566 Change 127566 by kmacy@freefall_kmacy_iwarp on 2007/10/15 20:41:50 initial integrate 127584 Affected files ... .. //depot/projects/iwarp/COPYRIGHT#1 branch .. //depot/projects/iwarp/LOCKS#1 branch .. //depot/projects/iwarp/MAINTAINERS#1 branch .. //depot/projects/iwarp/Makefile#1 branch .. //depot/projects/iwarp/Makefile.inc1#1 branch .. //depot/projects/iwarp/ObsoleteFiles.inc#1 branch .. //depot/projects/iwarp/README#1 branch .. //depot/projects/iwarp/UPDATING#1 branch .. //depot/projects/iwarp/bin/Makefile#1 branch .. //depot/projects/iwarp/bin/Makefile.inc#1 branch .. //depot/projects/iwarp/bin/cat/Makefile#1 branch .. //depot/projects/iwarp/bin/cat/cat.1#1 branch .. //depot/projects/iwarp/bin/cat/cat.c#1 branch .. //depot/projects/iwarp/bin/chflags/Makefile#1 branch .. //depot/projects/iwarp/bin/chflags/chflags.1#1 branch .. //depot/projects/iwarp/bin/chflags/chflags.c#1 branch .. //depot/projects/iwarp/bin/chio/Makefile#1 branch .. //depot/projects/iwarp/bin/chio/chio.1#1 branch .. //depot/projects/iwarp/bin/chio/chio.c#1 branch .. //depot/projects/iwarp/bin/chio/defs.h#1 branch .. //depot/projects/iwarp/bin/chio/pathnames.h#1 branch .. //depot/projects/iwarp/bin/chmod/Makefile#1 branch .. //depot/projects/iwarp/bin/chmod/chmod.1#1 branch .. //depot/projects/iwarp/bin/chmod/chmod.c#1 branch .. //depot/projects/iwarp/bin/cp/Makefile#1 branch .. //depot/projects/iwarp/bin/cp/cp.1#1 branch .. //depot/projects/iwarp/bin/cp/cp.c#1 branch .. //depot/projects/iwarp/bin/cp/extern.h#1 branch .. //depot/projects/iwarp/bin/cp/utils.c#1 branch .. //depot/projects/iwarp/bin/csh/Makefile#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/iwarp/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/iwarp/bin/csh/config.h#1 branch .. //depot/projects/iwarp/bin/csh/config_p.h#1 branch .. //depot/projects/iwarp/bin/csh/host.defs#1 branch .. //depot/projects/iwarp/bin/csh/iconv.h#1 branch .. //depot/projects/iwarp/bin/csh/iconv_stub.c#1 branch .. //depot/projects/iwarp/bin/date/Makefile#1 branch .. //depot/projects/iwarp/bin/date/date.1#1 branch .. //depot/projects/iwarp/bin/date/date.c#1 branch .. //depot/projects/iwarp/bin/date/extern.h#1 branch .. //depot/projects/iwarp/bin/date/netdate.c#1 branch .. //depot/projects/iwarp/bin/date/vary.c#1 branch .. //depot/projects/iwarp/bin/date/vary.h#1 branch .. //depot/projects/iwarp/bin/dd/Makefile#1 branch .. //depot/projects/iwarp/bin/dd/args.c#1 branch .. //depot/projects/iwarp/bin/dd/conv.c#1 branch .. //depot/projects/iwarp/bin/dd/conv_tab.c#1 branch .. //depot/projects/iwarp/bin/dd/dd.1#1 branch .. //depot/projects/iwarp/bin/dd/dd.c#1 branch .. //depot/projects/iwarp/bin/dd/dd.h#1 branch .. //depot/projects/iwarp/bin/dd/extern.h#1 branch .. //depot/projects/iwarp/bin/dd/gen.c#1 branch .. //depot/projects/iwarp/bin/dd/misc.c#1 branch .. //depot/projects/iwarp/bin/dd/position.c#1 branch .. //depot/projects/iwarp/bin/dd/ref.ascii#1 branch .. //depot/projects/iwarp/bin/dd/ref.ebcdic#1 branch .. //depot/projects/iwarp/bin/dd/ref.ibm#1 branch .. //depot/projects/iwarp/bin/dd/ref.lcase#1 branch .. //depot/projects/iwarp/bin/dd/ref.oldascii#1 branch .. //depot/projects/iwarp/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/iwarp/bin/dd/ref.oldibm#1 branch .. //depot/projects/iwarp/bin/dd/ref.pareven#1 branch .. //depot/projects/iwarp/bin/dd/ref.parnone#1 branch .. //depot/projects/iwarp/bin/dd/ref.parodd#1 branch .. //depot/projects/iwarp/bin/dd/ref.parset#1 branch .. //depot/projects/iwarp/bin/dd/ref.swab#1 branch .. //depot/projects/iwarp/bin/dd/ref.ucase#1 branch .. //depot/projects/iwarp/bin/df/Makefile#1 branch .. //depot/projects/iwarp/bin/df/df.1#1 branch .. //depot/projects/iwarp/bin/df/df.c#1 branch .. //depot/projects/iwarp/bin/domainname/Makefile#1 branch .. //depot/projects/iwarp/bin/domainname/domainname.1#1 branch .. //depot/projects/iwarp/bin/domainname/domainname.c#1 branch .. //depot/projects/iwarp/bin/echo/Makefile#1 branch .. //depot/projects/iwarp/bin/echo/echo.1#1 branch .. //depot/projects/iwarp/bin/echo/echo.c#1 branch .. //depot/projects/iwarp/bin/ed/Makefile#1 branch .. //depot/projects/iwarp/bin/ed/POSIX#1 branch .. //depot/projects/iwarp/bin/ed/README#1 branch .. //depot/projects/iwarp/bin/ed/buf.c#1 branch .. //depot/projects/iwarp/bin/ed/cbc.c#1 branch .. //depot/projects/iwarp/bin/ed/ed.1#1 branch .. //depot/projects/iwarp/bin/ed/ed.h#1 branch .. //depot/projects/iwarp/bin/ed/glbl.c#1 branch .. //depot/projects/iwarp/bin/ed/io.c#1 branch .. //depot/projects/iwarp/bin/ed/main.c#1 branch .. //depot/projects/iwarp/bin/ed/re.c#1 branch .. //depot/projects/iwarp/bin/ed/sub.c#1 branch .. //depot/projects/iwarp/bin/ed/test/=.err#1 branch .. //depot/projects/iwarp/bin/ed/test/Makefile#1 branch .. //depot/projects/iwarp/bin/ed/test/README#1 branch .. //depot/projects/iwarp/bin/ed/test/TODO#1 branch .. //depot/projects/iwarp/bin/ed/test/a.d#1 branch .. //depot/projects/iwarp/bin/ed/test/a.r#1 branch .. //depot/projects/iwarp/bin/ed/test/a.t#1 branch .. //depot/projects/iwarp/bin/ed/test/a1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/a2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/addr.d#1 branch .. //depot/projects/iwarp/bin/ed/test/addr.r#1 branch .. //depot/projects/iwarp/bin/ed/test/addr.t#1 branch .. //depot/projects/iwarp/bin/ed/test/addr1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/addr2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/iwarp/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/iwarp/bin/ed/test/ascii.t#1 branch .. //depot/projects/iwarp/bin/ed/test/bang1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/bang1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/bang1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/bang1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/bang2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/c.d#1 branch .. //depot/projects/iwarp/bin/ed/test/c.r#1 branch .. //depot/projects/iwarp/bin/ed/test/c.t#1 branch .. //depot/projects/iwarp/bin/ed/test/c1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/c2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/iwarp/bin/ed/test/d.d#1 branch .. //depot/projects/iwarp/bin/ed/test/d.err#1 branch .. //depot/projects/iwarp/bin/ed/test/d.r#1 branch .. //depot/projects/iwarp/bin/ed/test/d.t#1 branch .. //depot/projects/iwarp/bin/ed/test/e1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/e1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/e1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/e1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/e2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/e2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/e2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/e2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/e3.d#1 branch .. //depot/projects/iwarp/bin/ed/test/e3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/e3.r#1 branch .. //depot/projects/iwarp/bin/ed/test/e3.t#1 branch .. //depot/projects/iwarp/bin/ed/test/e4.d#1 branch .. //depot/projects/iwarp/bin/ed/test/e4.r#1 branch .. //depot/projects/iwarp/bin/ed/test/e4.t#1 branch .. //depot/projects/iwarp/bin/ed/test/f1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/f2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/g1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/g1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/g1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/g1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/g2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/g2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/g2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/g2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/g3.d#1 branch .. //depot/projects/iwarp/bin/ed/test/g3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/g3.r#1 branch .. //depot/projects/iwarp/bin/ed/test/g3.t#1 branch .. //depot/projects/iwarp/bin/ed/test/g4.d#1 branch .. //depot/projects/iwarp/bin/ed/test/g4.r#1 branch .. //depot/projects/iwarp/bin/ed/test/g4.t#1 branch .. //depot/projects/iwarp/bin/ed/test/g5.d#1 branch .. //depot/projects/iwarp/bin/ed/test/g5.r#1 branch .. //depot/projects/iwarp/bin/ed/test/g5.t#1 branch .. //depot/projects/iwarp/bin/ed/test/h.err#1 branch .. //depot/projects/iwarp/bin/ed/test/i.d#1 branch .. //depot/projects/iwarp/bin/ed/test/i.r#1 branch .. //depot/projects/iwarp/bin/ed/test/i.t#1 branch .. //depot/projects/iwarp/bin/ed/test/i1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/i2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/i3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/j.d#1 branch .. //depot/projects/iwarp/bin/ed/test/j.r#1 branch .. //depot/projects/iwarp/bin/ed/test/j.t#1 branch .. //depot/projects/iwarp/bin/ed/test/k.d#1 branch .. //depot/projects/iwarp/bin/ed/test/k.r#1 branch .. //depot/projects/iwarp/bin/ed/test/k.t#1 branch .. //depot/projects/iwarp/bin/ed/test/k1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/k2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/k3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/k4.err#1 branch .. //depot/projects/iwarp/bin/ed/test/l.d#1 branch .. //depot/projects/iwarp/bin/ed/test/l.r#1 branch .. //depot/projects/iwarp/bin/ed/test/l.t#1 branch .. //depot/projects/iwarp/bin/ed/test/m.d#1 branch .. //depot/projects/iwarp/bin/ed/test/m.err#1 branch .. //depot/projects/iwarp/bin/ed/test/m.r#1 branch .. //depot/projects/iwarp/bin/ed/test/m.t#1 branch .. //depot/projects/iwarp/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/iwarp/bin/ed/test/n.d#1 branch .. //depot/projects/iwarp/bin/ed/test/n.r#1 branch .. //depot/projects/iwarp/bin/ed/test/n.t#1 branch .. //depot/projects/iwarp/bin/ed/test/nl.err#1 branch .. //depot/projects/iwarp/bin/ed/test/nl1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/nl1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/nl1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/nl2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/nl2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/nl2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/p.d#1 branch .. //depot/projects/iwarp/bin/ed/test/p.r#1 branch .. //depot/projects/iwarp/bin/ed/test/p.t#1 branch .. //depot/projects/iwarp/bin/ed/test/q.d#1 branch .. //depot/projects/iwarp/bin/ed/test/q.r#1 branch .. //depot/projects/iwarp/bin/ed/test/q.t#1 branch .. //depot/projects/iwarp/bin/ed/test/q1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/r1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/r1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/r1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/r1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/r2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/r2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/r2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/r2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/r3.d#1 branch .. //depot/projects/iwarp/bin/ed/test/r3.r#1 branch .. //depot/projects/iwarp/bin/ed/test/r3.t#1 branch .. //depot/projects/iwarp/bin/ed/test/s1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/s1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/s1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/s10.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/s2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/s2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/s3.d#1 branch .. //depot/projects/iwarp/bin/ed/test/s3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s3.r#1 branch .. //depot/projects/iwarp/bin/ed/test/s3.t#1 branch .. //depot/projects/iwarp/bin/ed/test/s4.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s5.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s6.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s7.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s8.err#1 branch .. //depot/projects/iwarp/bin/ed/test/s9.err#1 branch .. //depot/projects/iwarp/bin/ed/test/t.d#1 branch .. //depot/projects/iwarp/bin/ed/test/t.r#1 branch .. //depot/projects/iwarp/bin/ed/test/t1.d#1 branch .. //depot/projects/iwarp/bin/ed/test/t1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/t1.r#1 branch .. //depot/projects/iwarp/bin/ed/test/t1.t#1 branch .. //depot/projects/iwarp/bin/ed/test/t2.d#1 branch .. //depot/projects/iwarp/bin/ed/test/t2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/t2.r#1 branch .. //depot/projects/iwarp/bin/ed/test/t2.t#1 branch .. //depot/projects/iwarp/bin/ed/test/u.d#1 branch .. //depot/projects/iwarp/bin/ed/test/u.err#1 branch .. //depot/projects/iwarp/bin/ed/test/u.r#1 branch .. //depot/projects/iwarp/bin/ed/test/u.t#1 branch .. //depot/projects/iwarp/bin/ed/test/v.d#1 branch .. //depot/projects/iwarp/bin/ed/test/v.r#1 branch .. //depot/projects/iwarp/bin/ed/test/v.t#1 branch .. //depot/projects/iwarp/bin/ed/test/w.d#1 branch .. //depot/projects/iwarp/bin/ed/test/w.r#1 branch .. //depot/projects/iwarp/bin/ed/test/w.t#1 branch .. //depot/projects/iwarp/bin/ed/test/w1.err#1 branch .. //depot/projects/iwarp/bin/ed/test/w2.err#1 branch .. //depot/projects/iwarp/bin/ed/test/w3.err#1 branch .. //depot/projects/iwarp/bin/ed/test/x.err#1 branch .. //depot/projects/iwarp/bin/ed/test/z.err#1 branch .. //depot/projects/iwarp/bin/ed/undo.c#1 branch .. //depot/projects/iwarp/bin/expr/Makefile#1 branch .. //depot/projects/iwarp/bin/expr/expr.1#1 branch .. //depot/projects/iwarp/bin/expr/expr.y#1 branch .. //depot/projects/iwarp/bin/getfacl/Makefile#1 branch .. //depot/projects/iwarp/bin/getfacl/getfacl.1#1 branch .. //depot/projects/iwarp/bin/getfacl/getfacl.c#1 branch .. //depot/projects/iwarp/bin/hostname/Makefile#1 branch .. //depot/projects/iwarp/bin/hostname/hostname.1#1 branch .. //depot/projects/iwarp/bin/hostname/hostname.c#1 branch .. //depot/projects/iwarp/bin/kenv/Makefile#1 branch .. //depot/projects/iwarp/bin/kenv/kenv.1#1 branch .. //depot/projects/iwarp/bin/kenv/kenv.c#1 branch .. //depot/projects/iwarp/bin/kill/Makefile#1 branch .. //depot/projects/iwarp/bin/kill/kill.1#1 branch .. //depot/projects/iwarp/bin/kill/kill.c#1 branch .. //depot/projects/iwarp/bin/ln/Makefile#1 branch .. //depot/projects/iwarp/bin/ln/ln.1#1 branch .. //depot/projects/iwarp/bin/ln/ln.c#1 branch .. //depot/projects/iwarp/bin/ln/symlink.7#1 branch .. //depot/projects/iwarp/bin/ls/Makefile#1 branch .. //depot/projects/iwarp/bin/ls/cmp.c#1 branch .. //depot/projects/iwarp/bin/ls/extern.h#1 branch .. //depot/projects/iwarp/bin/ls/ls.1#1 branch .. //depot/projects/iwarp/bin/ls/ls.c#1 branch .. //depot/projects/iwarp/bin/ls/ls.h#1 branch .. //depot/projects/iwarp/bin/ls/print.c#1 branch .. //depot/projects/iwarp/bin/ls/util.c#1 branch .. //depot/projects/iwarp/bin/mkdir/Makefile#1 branch .. //depot/projects/iwarp/bin/mkdir/mkdir.1#1 branch .. //depot/projects/iwarp/bin/mkdir/mkdir.c#1 branch .. //depot/projects/iwarp/bin/mv/Makefile#1 branch .. //depot/projects/iwarp/bin/mv/mv.1#1 branch .. //depot/projects/iwarp/bin/mv/mv.c#1 branch .. //depot/projects/iwarp/bin/pax/Makefile#1 branch .. //depot/projects/iwarp/bin/pax/ar_io.c#1 branch .. //depot/projects/iwarp/bin/pax/ar_subs.c#1 branch .. //depot/projects/iwarp/bin/pax/buf_subs.c#1 branch .. //depot/projects/iwarp/bin/pax/cache.c#1 branch .. //depot/projects/iwarp/bin/pax/cache.h#1 branch .. //depot/projects/iwarp/bin/pax/cpio.1#1 branch .. //depot/projects/iwarp/bin/pax/cpio.c#1 branch .. //depot/projects/iwarp/bin/pax/cpio.h#1 branch .. //depot/projects/iwarp/bin/pax/extern.h#1 branch .. //depot/projects/iwarp/bin/pax/file_subs.c#1 branch .. //depot/projects/iwarp/bin/pax/ftree.c#1 branch .. //depot/projects/iwarp/bin/pax/ftree.h#1 branch .. //depot/projects/iwarp/bin/pax/gen_subs.c#1 branch .. //depot/projects/iwarp/bin/pax/getoldopt.c#1 branch .. //depot/projects/iwarp/bin/pax/options.c#1 branch .. //depot/projects/iwarp/bin/pax/options.h#1 branch .. //depot/projects/iwarp/bin/pax/pat_rep.c#1 branch .. //depot/projects/iwarp/bin/pax/pat_rep.h#1 branch .. //depot/projects/iwarp/bin/pax/pax.1#1 branch .. //depot/projects/iwarp/bin/pax/pax.c#1 branch .. //depot/projects/iwarp/bin/pax/pax.h#1 branch .. //depot/projects/iwarp/bin/pax/sel_subs.c#1 branch .. //depot/projects/iwarp/bin/pax/sel_subs.h#1 branch .. //depot/projects/iwarp/bin/pax/tables.c#1 branch .. //depot/projects/iwarp/bin/pax/tables.h#1 branch .. //depot/projects/iwarp/bin/pax/tar.1#1 branch .. //depot/projects/iwarp/bin/pax/tar.c#1 branch .. //depot/projects/iwarp/bin/pax/tar.h#1 branch .. //depot/projects/iwarp/bin/pax/tty_subs.c#1 branch .. //depot/projects/iwarp/bin/ps/Makefile#1 branch .. //depot/projects/iwarp/bin/ps/extern.h#1 branch .. //depot/projects/iwarp/bin/ps/fmt.c#1 branch .. //depot/projects/iwarp/bin/ps/keyword.c#1 branch .. //depot/projects/iwarp/bin/ps/nlist.c#1 branch .. //depot/projects/iwarp/bin/ps/print.c#1 branch .. //depot/projects/iwarp/bin/ps/ps.1#1 branch .. //depot/projects/iwarp/bin/ps/ps.c#1 branch .. //depot/projects/iwarp/bin/ps/ps.h#1 branch .. //depot/projects/iwarp/bin/pwd/Makefile#1 branch .. //depot/projects/iwarp/bin/pwd/pwd.1#1 branch .. //depot/projects/iwarp/bin/pwd/pwd.c#1 branch .. //depot/projects/iwarp/bin/rcp/Makefile#1 branch .. //depot/projects/iwarp/bin/rcp/extern.h#1 branch .. //depot/projects/iwarp/bin/rcp/rcp.1#1 branch .. //depot/projects/iwarp/bin/rcp/rcp.c#1 branch .. //depot/projects/iwarp/bin/rcp/util.c#1 branch .. //depot/projects/iwarp/bin/realpath/Makefile#1 branch .. //depot/projects/iwarp/bin/realpath/realpath.1#1 branch .. //depot/projects/iwarp/bin/realpath/realpath.c#1 branch .. //depot/projects/iwarp/bin/rm/Makefile#1 branch .. //depot/projects/iwarp/bin/rm/rm.1#1 branch .. //depot/projects/iwarp/bin/rm/rm.c#1 branch .. //depot/projects/iwarp/bin/rmail/Makefile#1 branch .. //depot/projects/iwarp/bin/rmdir/Makefile#1 branch .. //depot/projects/iwarp/bin/rmdir/rmdir.1#1 branch .. //depot/projects/iwarp/bin/rmdir/rmdir.c#1 branch .. //depot/projects/iwarp/bin/setfacl/Makefile#1 branch .. //depot/projects/iwarp/bin/setfacl/file.c#1 branch .. //depot/projects/iwarp/bin/setfacl/mask.c#1 branch .. //depot/projects/iwarp/bin/setfacl/merge.c#1 branch .. //depot/projects/iwarp/bin/setfacl/remove.c#1 branch .. //depot/projects/iwarp/bin/setfacl/setfacl.1#1 branch .. //depot/projects/iwarp/bin/setfacl/setfacl.c#1 branch .. //depot/projects/iwarp/bin/setfacl/setfacl.h#1 branch .. //depot/projects/iwarp/bin/setfacl/util.c#1 branch .. //depot/projects/iwarp/bin/sh/Makefile#1 branch .. //depot/projects/iwarp/bin/sh/TOUR#1 branch .. //depot/projects/iwarp/bin/sh/alias.c#1 branch .. //depot/projects/iwarp/bin/sh/alias.h#1 branch .. //depot/projects/iwarp/bin/sh/arith.h#1 branch .. //depot/projects/iwarp/bin/sh/arith.y#1 branch .. //depot/projects/iwarp/bin/sh/arith_lex.l#1 branch .. //depot/projects/iwarp/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/iwarp/bin/sh/bltin/echo.1#1 branch .. //depot/projects/iwarp/bin/sh/bltin/echo.c#1 branch .. //depot/projects/iwarp/bin/sh/builtins.def#1 branch .. //depot/projects/iwarp/bin/sh/cd.c#1 branch .. //depot/projects/iwarp/bin/sh/cd.h#1 branch .. //depot/projects/iwarp/bin/sh/error.c#1 branch .. //depot/projects/iwarp/bin/sh/error.h#1 branch .. //depot/projects/iwarp/bin/sh/eval.c#1 branch .. //depot/projects/iwarp/bin/sh/eval.h#1 branch .. //depot/projects/iwarp/bin/sh/exec.c#1 branch .. //depot/projects/iwarp/bin/sh/exec.h#1 branch .. //depot/projects/iwarp/bin/sh/expand.c#1 branch .. //depot/projects/iwarp/bin/sh/expand.h#1 branch .. //depot/projects/iwarp/bin/sh/funcs/cmv#1 branch .. //depot/projects/iwarp/bin/sh/funcs/dirs#1 branch .. //depot/projects/iwarp/bin/sh/funcs/kill#1 branch .. //depot/projects/iwarp/bin/sh/funcs/login#1 branch .. //depot/projects/iwarp/bin/sh/funcs/newgrp#1 branch .. //depot/projects/iwarp/bin/sh/funcs/popd#1 branch .. //depot/projects/iwarp/bin/sh/funcs/pushd#1 branch .. //depot/projects/iwarp/bin/sh/funcs/suspend#1 branch .. //depot/projects/iwarp/bin/sh/histedit.c#1 branch .. //depot/projects/iwarp/bin/sh/init.h#1 branch .. //depot/projects/iwarp/bin/sh/input.c#1 branch .. //depot/projects/iwarp/bin/sh/input.h#1 branch .. //depot/projects/iwarp/bin/sh/jobs.c#1 branch .. //depot/projects/iwarp/bin/sh/jobs.h#1 branch .. //depot/projects/iwarp/bin/sh/mail.c#1 branch .. //depot/projects/iwarp/bin/sh/mail.h#1 branch .. //depot/projects/iwarp/bin/sh/main.c#1 branch .. //depot/projects/iwarp/bin/sh/main.h#1 branch .. //depot/projects/iwarp/bin/sh/memalloc.c#1 branch .. //depot/projects/iwarp/bin/sh/memalloc.h#1 branch .. //depot/projects/iwarp/bin/sh/miscbltin.c#1 branch .. //depot/projects/iwarp/bin/sh/mkbuiltins#1 branch .. //depot/projects/iwarp/bin/sh/mkinit.c#1 branch .. //depot/projects/iwarp/bin/sh/mknodes.c#1 branch .. //depot/projects/iwarp/bin/sh/mksyntax.c#1 branch .. //depot/projects/iwarp/bin/sh/mktokens#1 branch .. //depot/projects/iwarp/bin/sh/myhistedit.h#1 branch .. //depot/projects/iwarp/bin/sh/mystring.c#1 branch .. //depot/projects/iwarp/bin/sh/mystring.h#1 branch .. //depot/projects/iwarp/bin/sh/nodes.c.pat#1 branch .. //depot/projects/iwarp/bin/sh/nodetypes#1 branch .. //depot/projects/iwarp/bin/sh/options.c#1 branch .. //depot/projects/iwarp/bin/sh/options.h#1 branch .. //depot/projects/iwarp/bin/sh/output.c#1 branch .. //depot/projects/iwarp/bin/sh/output.h#1 branch .. //depot/projects/iwarp/bin/sh/parser.c#1 branch .. //depot/projects/iwarp/bin/sh/parser.h#1 branch .. //depot/projects/iwarp/bin/sh/redir.c#1 branch .. //depot/projects/iwarp/bin/sh/redir.h#1 branch .. //depot/projects/iwarp/bin/sh/sh.1#1 branch .. //depot/projects/iwarp/bin/sh/shell.h#1 branch .. //depot/projects/iwarp/bin/sh/show.c#1 branch .. //depot/projects/iwarp/bin/sh/show.h#1 branch .. //depot/projects/iwarp/bin/sh/trap.c#1 branch .. //depot/projects/iwarp/bin/sh/trap.h#1 branch .. //depot/projects/iwarp/bin/sh/var.c#1 branch .. //depot/projects/iwarp/bin/sh/var.h#1 branch .. //depot/projects/iwarp/bin/sleep/Makefile#1 branch .. //depot/projects/iwarp/bin/sleep/sleep.1#1 branch .. //depot/projects/iwarp/bin/sleep/sleep.c#1 branch .. //depot/projects/iwarp/bin/stty/Makefile#1 branch .. //depot/projects/iwarp/bin/stty/cchar.c#1 branch .. //depot/projects/iwarp/bin/stty/extern.h#1 branch .. //depot/projects/iwarp/bin/stty/gfmt.c#1 branch .. //depot/projects/iwarp/bin/stty/key.c#1 branch .. //depot/projects/iwarp/bin/stty/modes.c#1 branch .. //depot/projects/iwarp/bin/stty/print.c#1 branch .. //depot/projects/iwarp/bin/stty/stty.1#1 branch .. //depot/projects/iwarp/bin/stty/stty.c#1 branch .. //depot/projects/iwarp/bin/stty/stty.h#1 branch .. //depot/projects/iwarp/bin/stty/util.c#1 branch .. //depot/projects/iwarp/bin/sync/Makefile#1 branch .. //depot/projects/iwarp/bin/sync/sync.8#1 branch .. //depot/projects/iwarp/bin/sync/sync.c#1 branch .. //depot/projects/iwarp/bin/test/Makefile#1 branch .. //depot/projects/iwarp/bin/test/TEST.README#1 branch .. //depot/projects/iwarp/bin/test/TEST.csh#1 branch .. //depot/projects/iwarp/bin/test/TEST.sh#1 branch .. //depot/projects/iwarp/bin/test/test.1#1 branch .. //depot/projects/iwarp/bin/test/test.c#1 branch .. //depot/projects/iwarp/cddl/Makefile#1 branch .. //depot/projects/iwarp/cddl/Makefile.inc#1 branch .. //depot/projects/iwarp/cddl/lib/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/Makefile.inc#1 branch .. //depot/projects/iwarp/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/iwarp/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/iwarp/cddl/sbin/Makefile#1 branch .. //depot/projects/iwarp/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/iwarp/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/iwarp/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/iwarp/cddl/usr.bin/Makefile#1 branch .. //depot/projects/iwarp/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/iwarp/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/iwarp/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/iwarp/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/iwarp/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/iwarp/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/iwarp/contrib/amd/AUTHORS#1 branch .. //depot/projects/iwarp/contrib/amd/BUGS#1 branch .. //depot/projects/iwarp/contrib/amd/COPYING#1 branch .. //depot/projects/iwarp/contrib/amd/ChangeLog#1 branch .. //depot/projects/iwarp/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/iwarp/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/iwarp/contrib/amd/INSTALL#1 branch .. //depot/projects/iwarp/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/iwarp/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/iwarp/contrib/amd/NEWS#1 branch .. //depot/projects/iwarp/contrib/amd/README#1 branch .. //depot/projects/iwarp/contrib/amd/README.ldap#1 branch .. //depot/projects/iwarp/contrib/amd/README.y2k#1 branch .. //depot/projects/iwarp/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amd.8#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amd.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amd.h#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/autil.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/clock.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/conf.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/iwarp/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/iwarp/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/map.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/opts.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/restart.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/sched.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/iwarp/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/amq/amq.8#1 branch .. //depot/projects/iwarp/contrib/amd/amq/amq.c#1 branch .. //depot/projects/iwarp/contrib/amd/amq/amq.h#1 branch .. //depot/projects/iwarp/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/iwarp/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/iwarp/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/iwarp/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/iwarp/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/iwarp/contrib/amd/bootstrap#1 branch .. //depot/projects/iwarp/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/iwarp/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/iwarp/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/iwarp/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/iwarp/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/iwarp/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/iwarp/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/iwarp/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/iwarp/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/iwarp/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/iwarp/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/iwarp/contrib/amd/doc/version.texi#1 branch .. //depot/projects/iwarp/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/iwarp/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/iwarp/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/iwarp/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/iwarp/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/iwarp/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/iwarp/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/iwarp/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/util.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/iwarp/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/iwarp/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/iwarp/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/iwarp/contrib/amd/m4/amindent#1 branch .. //depot/projects/iwarp/contrib/amd/m4/autopat#1 branch .. //depot/projects/iwarp/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/iwarp/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/iwarp/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/iwarp/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/iwarp/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/iwarp/contrib/amd/m4/mkconf#1 branch .. //depot/projects/iwarp/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/iwarp/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/iwarp/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/iwarp/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/iwarp/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/iwarp/contrib/amd/tasks#1 branch .. //depot/projects/iwarp/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/iwarp/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/iwarp/contrib/bc/AUTHORS#1 branch .. //depot/projects/iwarp/contrib/bc/ChangeLog#1 branch .. //depot/projects/iwarp/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/iwarp/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/iwarp/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/iwarp/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/iwarp/contrib/bc/FAQ#1 branch .. //depot/projects/iwarp/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/iwarp/contrib/bc/INSTALL#1 branch .. //depot/projects/iwarp/contrib/bc/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/bc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bc/NEWS#1 branch .. //depot/projects/iwarp/contrib/bc/README#1 branch .. //depot/projects/iwarp/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/iwarp/contrib/bc/Test/array.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/atan.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/div.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/exp.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/fact.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/jn.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/ln.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/mul.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/raise.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/signum#1 branch .. //depot/projects/iwarp/contrib/bc/Test/sine.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/iwarp/contrib/bc/Test/timetest#1 branch .. //depot/projects/iwarp/contrib/bc/acconfig.h#1 branch .. //depot/projects/iwarp/contrib/bc/aclocal.m4#1 branch .. //depot/projects/iwarp/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bc/bc/bc.y#1 branch .. //depot/projects/iwarp/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/const.h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/execute.c#1 branch .. //depot/projects/iwarp/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/global.c#1 branch .. //depot/projects/iwarp/contrib/bc/bc/global.h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/iwarp/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/load.c#1 branch .. //depot/projects/iwarp/contrib/bc/bc/main.c#1 branch .. //depot/projects/iwarp/contrib/bc/bc/proto.h#1 branch .. //depot/projects/iwarp/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/iwarp/contrib/bc/bc/scan.l#1 branch .. //depot/projects/iwarp/contrib/bc/bc/storage.c#1 branch .. //depot/projects/iwarp/contrib/bc/bc/util.c#1 branch .. //depot/projects/iwarp/contrib/bc/config.h.in#1 branch .. //depot/projects/iwarp/contrib/bc/configure#1 branch .. //depot/projects/iwarp/contrib/bc/configure.in#1 branch .. //depot/projects/iwarp/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bc/dc/array.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/iwarp/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/iwarp/contrib/bc/dc/dc.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/dc.h#1 branch .. //depot/projects/iwarp/contrib/bc/dc/eval.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/misc.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/stack.c#1 branch .. //depot/projects/iwarp/contrib/bc/dc/string.c#1 branch .. //depot/projects/iwarp/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bc/doc/bc.1#1 branch .. //depot/projects/iwarp/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/iwarp/contrib/bc/doc/dc.1#1 branch .. //depot/projects/iwarp/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/iwarp/contrib/bc/h/number.h#1 branch .. //depot/projects/iwarp/contrib/bc/install-sh#1 branch .. //depot/projects/iwarp/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/iwarp/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bc/lib/number.c#1 branch .. //depot/projects/iwarp/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/iwarp/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/iwarp/contrib/bc/missing#1 branch .. //depot/projects/iwarp/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/iwarp/contrib/bc/stamp-h.in#1 branch .. //depot/projects/iwarp/contrib/bind9/CHANGES#1 branch .. //depot/projects/iwarp/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/iwarp/contrib/bind9/FAQ#1 branch .. //depot/projects/iwarp/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/iwarp/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/iwarp/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/iwarp/contrib/bind9/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/README#1 branch .. //depot/projects/iwarp/contrib/bind9/README.idnkit#1 branch .. //depot/projects/iwarp/contrib/bind9/acconfig.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/iwarp/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/iwarp/contrib/bind9/config.guess#1 branch .. //depot/projects/iwarp/contrib/bind9/config.sub#1 branch .. //depot/projects/iwarp/contrib/bind9/config.threads.in#1 branch .. //depot/projects/iwarp/contrib/bind9/configure.in#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/iwarp/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 15 22:48:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25BAE16A41B; Mon, 15 Oct 2007 22:48: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 B898516A421 for ; Mon, 15 Oct 2007 22:48:03 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95CF713C455 for ; Mon, 15 Oct 2007 22:48:03 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9FMm3QA021347 for ; Mon, 15 Oct 2007 22:48:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9FMlux1021340 for perforce@freebsd.org; Mon, 15 Oct 2007 22:47:56 GMT (envelope-from peter@freebsd.org) Date: Mon, 15 Oct 2007 22:47:56 GMT Message-Id: <200710152247.l9FMlux1021340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 127570 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, 15 Oct 2007 22:48:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=127570 Change 127570 by peter@peter_daintree on 2007/10/15 22:47:17 IFC @127567 Affected files ... .. //depot/projects/hammer/Makefile.inc1#126 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#35 integrate .. //depot/projects/hammer/UPDATING#107 integrate .. //depot/projects/hammer/bin/sh/eval.c#15 integrate .. //depot/projects/hammer/bin/sh/sh.1#28 integrate .. //depot/projects/hammer/cddl/lib/Makefile#4 integrate .. //depot/projects/hammer/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/hammer/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/hammer/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/hammer/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/hammer/contrib/gcc/opts.c#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#15 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#9 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#13 integrate .. //depot/projects/hammer/contrib/less/NEWS#6 integrate .. //depot/projects/hammer/contrib/less/README#6 integrate .. //depot/projects/hammer/contrib/less/ch.c#5 integrate .. //depot/projects/hammer/contrib/less/charset.c#5 integrate .. //depot/projects/hammer/contrib/less/configure#5 integrate .. //depot/projects/hammer/contrib/less/configure.ac#4 integrate .. //depot/projects/hammer/contrib/less/filename.c#5 integrate .. //depot/projects/hammer/contrib/less/funcs.h#5 integrate .. //depot/projects/hammer/contrib/less/jump.c#5 integrate .. //depot/projects/hammer/contrib/less/less.h#5 integrate .. //depot/projects/hammer/contrib/less/less.man#6 integrate .. //depot/projects/hammer/contrib/less/less.nro#6 integrate .. //depot/projects/hammer/contrib/less/lessecho.man#4 integrate .. //depot/projects/hammer/contrib/less/lessecho.nro#4 integrate .. //depot/projects/hammer/contrib/less/lesskey.man#6 integrate .. //depot/projects/hammer/contrib/less/lesskey.nro#6 integrate .. //depot/projects/hammer/contrib/less/line.c#6 integrate .. //depot/projects/hammer/contrib/less/search.c#6 integrate .. //depot/projects/hammer/contrib/less/signal.c#5 integrate .. //depot/projects/hammer/contrib/less/version.c#6 integrate .. //depot/projects/hammer/contrib/tcsh/sh.c#5 integrate .. //depot/projects/hammer/contrib/tcsh/sh.lex.c#6 integrate .. //depot/projects/hammer/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/hammer/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_lib.c#8 integrate .. //depot/projects/hammer/etc/Makefile#57 integrate .. //depot/projects/hammer/etc/defaults/devfs.rules#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#80 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#49 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#28 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#14 integrate .. //depot/projects/hammer/etc/mtree/README#2 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#56 integrate .. //depot/projects/hammer/etc/rc.d/cached#3 delete .. //depot/projects/hammer/etc/rc.d/early.sh#3 integrate .. //depot/projects/hammer/etc/rc.d/ppp#6 integrate .. //depot/projects/hammer/etc/rc.subr#40 integrate .. //depot/projects/hammer/gnu/lib/csu/Makefile#10 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#18 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#13 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/freebsd-native.h#9 integrate .. //depot/projects/hammer/gnu/usr.bin/diff/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#27 integrate .. //depot/projects/hammer/gnu/usr.bin/sort/Makefile#6 integrate .. //depot/projects/hammer/include/Makefile#71 integrate .. //depot/projects/hammer/include/_ctype.h#3 integrate .. //depot/projects/hammer/include/ctype.h#6 integrate .. //depot/projects/hammer/include/wctype.h#6 integrate .. //depot/projects/hammer/lib/Makefile#63 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/hammer/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/hammer/lib/libc/Makefile#30 integrate .. //depot/projects/hammer/lib/libc/arm/string/ffs.S#4 integrate .. //depot/projects/hammer/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/string/memset.S#3 integrate .. //depot/projects/hammer/lib/libc/gdtoa/Symbol.map#5 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#12 integrate .. //depot/projects/hammer/lib/libc/locale/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libc/locale/big5.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/euc.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/gb18030.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/gb2312.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.c#11 integrate .. //depot/projects/hammer/lib/libc/locale/isctype.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/iswctype.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/mskanji.c#9 integrate .. //depot/projects/hammer/lib/libc/locale/none.c#11 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#20 integrate .. //depot/projects/hammer/lib/libc/locale/utf8.c#13 integrate .. //depot/projects/hammer/lib/libkse/Makefile#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/hammer/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/hammer/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/hammer/lib/libkse/kse.map#1 branch .. //depot/projects/hammer/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/hammer/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/sys/lock.c#1 branch .. //depot/projects/hammer/lib/libkse/sys/lock.h#1 branch .. //depot/projects/hammer/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/hammer/lib/libkse/test/Makefile#1 branch .. //depot/projects/hammer/lib/libkse/test/README#1 branch .. //depot/projects/hammer/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/hammer/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/hammer/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/hammer/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/hammer/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/hammer/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/hammer/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/hammer/lib/libkse/test/verify#1 branch .. //depot/projects/hammer/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/hammer/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/hammer/lib/libpthread/Makefile#26 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/context.S#8 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/enter_uts.S#5 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#5 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/atomic_ops.h#3 delete .. //depot/projects/hammer/lib/libpthread/arch/amd64/include/pthread_md.h#9 delete .. //depot/projects/hammer/lib/libpthread/arch/arm/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/context.S#4 delete .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#5 delete .. //depot/projects/hammer/lib/libpthread/arch/arm/include/atomic_ops.h#4 delete .. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#7 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#13 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#7 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/include/atomic_ops.h#3 delete .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#17 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/Makefile.inc#4 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/context.S#5 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/pthread_md.c#4 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/hammer/lib/libpthread/arch/ia64/include/pthread_md.h#10 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/include/pthread_md.h#4 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/hammer/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#4 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/include/pthread_md.h#5 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#4 delete .. //depot/projects/hammer/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/hammer/lib/libpthread/pthread.map#19 delete .. //depot/projects/hammer/lib/libpthread/support/Makefile.inc#6 delete .. //depot/projects/hammer/lib/libpthread/support/thr_support.c#5 delete .. //depot/projects/hammer/lib/libpthread/sys/Makefile.inc#6 delete .. //depot/projects/hammer/lib/libpthread/sys/lock.c#10 delete .. //depot/projects/hammer/lib/libpthread/sys/lock.h#7 delete .. //depot/projects/hammer/lib/libpthread/sys/thr_error.c#7 delete .. //depot/projects/hammer/lib/libpthread/test/Makefile#5 delete .. //depot/projects/hammer/lib/libpthread/test/README#2 delete .. //depot/projects/hammer/lib/libpthread/test/guard_b.c#3 delete .. //depot/projects/hammer/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/hammer/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/mutex_d.c#4 delete .. //depot/projects/hammer/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/hammer/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#4 delete .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/hammer/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/hammer/lib/libpthread/test/verify#2 delete .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#14 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_accept.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_aio_suspend.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_atfork.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_destroy.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_get_np.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getdetachstate.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getguardsize.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getinheritsched.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedparam.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedpolicy.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getscope.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstack.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstackaddr.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstacksize.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setdetachstate.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setguardsize.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setinheritsched.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedparam.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedpolicy.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setscope.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstack.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstackaddr.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstacksize.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_autoinit.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_barrier.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_barrierattr.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#17 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_clean.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_close.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#9 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#22 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_destroy.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_init.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_connect.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#21 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#8 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_equal.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_execve.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#13 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#8 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#9 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_fsync.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_getschedparam.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#9 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#24 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#11 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#43 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_main_np.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_init.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_kind_np.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_msync.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_multi_np.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#21 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_prioceiling.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_protocol.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_mutexattr_destroy.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#12 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_open.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_pause.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_poll.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_printf.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#40 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_pspinlock.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_raise.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_read.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_readv.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_rtld.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#8 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlockattr.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_self.c#5 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#9 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_seterrno.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_setprio.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_setschedparam.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#29 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#11 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaltstack.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#11 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#9 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#8 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#16 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#14 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_single_np.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_sleep.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#15 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_stack.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_switch_np.c#4 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_symbols.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_system.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_tcdrain.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_vfork.c#3 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_wait.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#7 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_waitpid.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_write.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_writev.c#6 delete .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#9 delete .. //depot/projects/hammer/lib/libstand/Makefile#18 integrate .. //depot/projects/hammer/lib/libthr/Makefile#23 integrate .. //depot/projects/hammer/lib/libutil/pidfile.3#6 integrate .. //depot/projects/hammer/lib/libutil/pidfile.c#6 integrate .. //depot/projects/hammer/libexec/atrun/Makefile#3 integrate .. //depot/projects/hammer/release/Makefile#94 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#20 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#21 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#35 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#60 integrate .. //depot/projects/hammer/sbin/mount_unionfs/mount_unionfs.8#10 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#14 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#23 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#8 integrate .. //depot/projects/hammer/share/man/man3/Makefile#17 integrate .. //depot/projects/hammer/share/man/man4/Makefile#97 integrate .. //depot/projects/hammer/share/man/man4/ata.4#31 integrate .. //depot/projects/hammer/share/man/man4/coretemp.4#2 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#15 integrate .. //depot/projects/hammer/share/man/man4/pci.4#8 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#18 integrate .. //depot/projects/hammer/share/man/man5/fstab.5#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#82 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#12 integrate .. //depot/projects/hammer/share/man/man7/Makefile#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#71 integrate .. //depot/projects/hammer/share/man/man9/pci.9#8 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#5 integrate .. //depot/projects/hammer/share/mk/bsd.compat.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#36 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#19 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#19 integrate .. //depot/projects/hammer/share/mklocale/UTF-8.src#3 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#4 integrate .. //depot/projects/hammer/share/zoneinfo/africa#8 integrate .. //depot/projects/hammer/share/zoneinfo/asia#11 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#22 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#14 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#13 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#38 integrate .. //depot/projects/hammer/sys/arm/arm/bcopy_page.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout.S#9 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum_arm.S#7 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#11 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#19 integrate .. //depot/projects/hammer/sys/arm/include/asm.h#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#11 integrate .. //depot/projects/hammer/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/hammer/sys/boot/common/module.c#5 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#15 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#20 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#6 integrate .. //depot/projects/hammer/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.h#9 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#37 integrate .. //depot/projects/hammer/sys/conf/files#160 integrate .. //depot/projects/hammer/sys/conf/files.amd64#95 integrate .. //depot/projects/hammer/sys/conf/files.i386#81 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#18 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#39 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#29 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#79 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#24 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#55 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#65 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#80 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#49 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#12 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#75 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#27 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#45 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#14 integrate .. //depot/projects/hammer/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#28 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#36 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#30 integrate .. //depot/projects/hammer/sys/dev/idt/idt_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#21 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipwreg.h#3 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipwvar.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#16 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#18 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#27 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis_quirks.c#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#49 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#48 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#14 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#63 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#23 integrate .. //depot/projects/hammer/sys/dev/pci/pci_private.h#17 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#13 integrate .. //depot/projects/hammer/sys/dev/pci/pcib_private.h#9 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#16 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#56 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10kx.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#9 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_init.c#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_intr.c#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_io.c#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_misc.c#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_share.h#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_cam.c#11 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_freebsd.c#8 integrate .. //depot/projects/hammer/sys/dev/twa/tw_osl_share.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#86 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#27 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#17 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#28 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#25 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#11 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#23 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#21 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#32 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC.hints#9 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#14 integrate .. //depot/projects/hammer/sys/i386/include/legacyvar.h#7 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#27 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_avm_a1.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#8 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_isic.c#6 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_itk_ix1.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s016.c#10 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s0163.c#9 integrate .. //depot/projects/hammer/sys/i4b/layer1/isic/i4b_tel_s08.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#62 integrate .. //depot/projects/hammer/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#52 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#83 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#41 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#46 integrate .. //depot/projects/hammer/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/hammer/sys/libkern/arm/ffs.S#5 integrate .. //depot/projects/hammer/sys/modules/Makefile#114 integrate .. //depot/projects/hammer/sys/net/bpf.c#52 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#8 integrate .. //depot/projects/hammer/sys/net/if_lagg.h#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#24 integrate .. //depot/projects/hammer/sys/netinet/accf_data.c#3 integrate .. //depot/projects/hammer/sys/netinet/accf_http.c#5 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#39 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#14 integrate .. //depot/projects/hammer/sys/netinet/in.c#28 integrate .. //depot/projects/hammer/sys/netinet/in_cksum.c#5 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#19 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#50 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#24 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#26 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#39 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#43 integrate .. //depot/projects/hammer/sys/netinet/ip_ecn.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_encap.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#32 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#87 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_id.c#8 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#68 integrate .. //depot/projects/hammer/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#41 integrate .. //depot/projects/hammer/sys/netinet/ip_options.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#65 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#49 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.h#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#14 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#10 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_debug.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#14 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#80 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#44 integrate .. //depot/projects/hammer/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#76 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#49 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#30 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#51 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#51 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#22 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#42 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#29 integrate .. //depot/projects/hammer/sys/nfsclient/nfsmount.h#11 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#24 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#24 integrate .. //depot/projects/hammer/sys/pc98/cbus/sio.c#11 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#45 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#38 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#67 integrate .. //depot/projects/hammer/sys/pci/intpm.c#13 integrate .. //depot/projects/hammer/sys/powerpc/powermac/grackle.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powermac/uninorth.c#14 integrate .. //depot/projects/hammer/sys/security/audit/audit_pipe.c#6 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#11 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#16 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#35 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#46 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/hv_pci.c#3 integrate .. //depot/projects/hammer/sys/sys/ata.h#19 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#62 integrate .. //depot/projects/hammer/sys/sys/param.h#92 integrate .. //depot/projects/hammer/sys/sys/pciio.h#2 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#34 integrate .. //depot/projects/hammer/sys/sys/systm.h#49 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#54 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#49 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#62 integrate .. //depot/projects/hammer/tools/build/make_check/Makefile#3 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBKSE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBPTHREAD#2 integrate .. //depot/projects/hammer/tools/make_libdeps.sh#8 integrate .. //depot/projects/hammer/tools/regression/bin/sh/builtins/case1.0#1 branch .. //depot/projects/hammer/tools/tools/pciroms/pciroms.c#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#54 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.birthday#15 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#56 integrate .. //depot/projects/hammer/usr.bin/id/id.c#10 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.1#8 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.c#4 integrate .. //depot/projects/hammer/usr.bin/systat/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/systat/cmdtab.c#5 integrate .. //depot/projects/hammer/usr.bin/systat/extern.h#5 integrate .. //depot/projects/hammer/usr.bin/systat/systat.1#12 integrate .. //depot/projects/hammer/usr.sbin/Makefile#82 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/cached/Makefile#3 delete .. //depot/projects/hammer/usr.sbin/cached/agent.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/agent.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/Makefile.inc#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/group.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/group.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/passwd.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/passwd.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/agents/services.c#3 delete .. //depot/projects/hammer/usr.sbin/cached/agents/services.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/cached.8#3 delete .. //depot/projects/hammer/usr.sbin/cached/cached.c#3 delete .. //depot/projects/hammer/usr.sbin/cached/cached.conf.5#3 delete .. //depot/projects/hammer/usr.sbin/cached/cachedcli.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/cachedcli.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/cachelib.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/cachelib.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/cacheplcs.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/cacheplcs.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/config.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/config.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/debug.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/debug.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/hashtable.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/log.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/log.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/mp_rs_query.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/mp_rs_query.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/mp_ws_query.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/mp_ws_query.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/parser.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/parser.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/protocol.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/protocol.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/query.c#3 delete .. //depot/projects/hammer/usr.sbin/cached/query.h#2 delete .. //depot/projects/hammer/usr.sbin/cached/singletons.c#2 delete .. //depot/projects/hammer/usr.sbin/cached/singletons.h#2 delete .. //depot/projects/hammer/usr.sbin/config/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/cron/cron/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ipfwpcap/ipfwpcap.c#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/nscd/mp_rs_query.#3 delete .. //depot/projects/hammer/usr.sbin/pciconf/pciconf.8#8 integrate .. //depot/projects/hammer/usr.sbin/pciconf/pciconf.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#19 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/sade/sade.8#3 integrate .. //depot/projects/hammer/usr.sbin/sensorsd/sensorsd.c#1 branch .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#126 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -330,8 +330,7 @@ .endfor .for _dir in \ lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/libexec usr/sbin usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -415,9 +414,7 @@ @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" .for _dir in \ - lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ - usr/libexec usr/sbin usr/share/misc \ - usr/share/snmp/defs usr/share/snmp/mibs + usr/include usr/lib32 usr/share/misc mkdir -p ${LIB32TMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ @@ -593,7 +590,12 @@ date echo egrep find grep install-info \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ - cp `which $$prog` ${INSTALLTMP}; \ + if progpath=`which $$prog`; then \ + cp $$progpath ${INSTALLTMP}; \ + else \ + echo "Required install tool $$prog not found" >&2; \ + exit 1; \ + fi; \ done ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} @@ -1039,12 +1041,20 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ + lib/libopie lib/libpam ${_default_thread_lib} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} +.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" +_default_thread_lib= lib/${DEFAULT_THREAD_LIB} +.elif ${MK_LIBTHR} != "no" +_default_thread_lib= lib/libthr +.elif ${MK_LIBKSE} != "no" +_default_thread_lib= lib/libkse +.endif + _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L ==== //depot/projects/hammer/ObsoleteFiles.inc#35 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070930: rename of cached to nscd +OLD_FILES+=etc/rc.d/cached +OLD_FILES+=usr/sbin/cached +OLD_FILES+=usr/share/man/man5/cached.conf.5.gz +OLD_FILES+=usr/share/man/man8/cached.8.gz # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h ==== //depot/projects/hammer/UPDATING#107 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: - FreeBSD 7.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: + FreeBSD 8.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,20 @@ developers choose to disable these features on build machines to maximize performance. +20071010: + RELENG_7 branched. + +20071009: + Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and + WITHOUT_LIBTHR are set. + +20070930: + The PCI code has been made aware of PCI domains. This means that + the location strings as used by pciconf(8) etc are now in the + following format: pci::[:]. It + also means that consumers of potentially need to + be recompiled; this includes the hal and xorg-server ports. + 20070928: The caching daemon (cached) was renamed to nscd. nscd.conf configuration file should be used instead of cached.conf and @@ -28,6 +42,11 @@ instead of cached_enable, cached_pidfile and cached_flags in rc.conf. +20070921: + The getfacl(1) utility now prints owning user and group name + instead of owning uid and gid in the three line comment header. + This is the same behavior as getfacl(1) on Solaris and Linux. + 20070704: The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel @@ -138,9 +157,9 @@ which previously had symbol dependencies to FBSD_1.0, will fail because the freshly installed libc will not have them. - The default threading library has been changed to libthr. If - you wish to have libpthread as your default, use option - DEFAULT_THREAD_LIB=libpthread for the buildworld. + The default threading library (providing "libpthread") has been + changed to libthr. If you wish to have libkse as your default, + use option DEFAULT_THREAD_LIB=libkse for the buildworld. 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired @@ -894,4 +913,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $ +$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ ==== //depot/projects/hammer/bin/sh/eval.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.53 2006/06/15 07:57:05 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $"); #include #include @@ -367,6 +367,7 @@ setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; + exitstatus = 0; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { ==== //depot/projects/hammer/bin/sh/sh.1#28 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.125 2007/10/04 16:14:48 stefanf Exp $ .\" .Dd October 7, 2006 .Dt SH 1 @@ -861,6 +861,10 @@ separated by .Dq Li \&| characters. +The exit code of the +.Ic case +command is the exit code of the last command executed in the list or +zero if no patterns were matched. .Ss Grouping Commands Together Commands may be grouped by writing either .Bd -literal -offset indent ==== //depot/projects/hammer/cddl/lib/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include @@ -11,7 +11,9 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif +.endif .include ==== //depot/projects/hammer/cddl/sbin/zfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $ +# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs @@ -19,7 +19,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS} -LDADD= -lgeom -lm -lnvpair -luutil -lzfs +DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \ + ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL} +LDADD= -lzfs -lgeom -lbsdxml -lsbuf \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 16 04:21:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5BF16A420; Tue, 16 Oct 2007 04:21: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 7EDAA16A417 for ; Tue, 16 Oct 2007 04:21:49 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7385413C461 for ; Tue, 16 Oct 2007 04:21:49 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9G4LniW062792 for ; Tue, 16 Oct 2007 04:21:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9G4LjDU062788 for perforce@freebsd.org; Tue, 16 Oct 2007 04:21:45 GMT (envelope-from peter@freebsd.org) Date: Tue, 16 Oct 2007 04:21:45 GMT Message-Id: <200710160421.l9G4LjDU062788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 127581 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, 16 Oct 2007 04:21:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=127581 Change 127581 by peter@peter_overcee on 2007/10/16 04:21:32 IFC @127579 (hopefully fix broken build from sensorsd drama) Affected files ... .. //depot/projects/hammer/contrib/libpcap/CHANGES#6 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#6 integrate .. //depot/projects/hammer/contrib/libpcap/FILES#5 integrate .. //depot/projects/hammer/contrib/libpcap/INSTALL#2 delete .. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#5 integrate .. //depot/projects/hammer/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/libpcap/README.dag#3 integrate .. //depot/projects/hammer/contrib/libpcap/TODO#2 integrate .. //depot/projects/hammer/contrib/libpcap/VERSION#7 integrate .. //depot/projects/hammer/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#6 integrate .. //depot/projects/hammer/contrib/libpcap/configure#6 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#6 integrate .. //depot/projects/hammer/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.c#8 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#6 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#6 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#11 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.3#8 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#7 integrate .. //depot/projects/hammer/contrib/libpcap/pf.h#3 delete .. //depot/projects/hammer/contrib/libpcap/savefile.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#7 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#10 integrate .. //depot/projects/hammer/contrib/tcpdump/CHANGES#7 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#7 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#7 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#7 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/tcpdump/README#5 integrate .. //depot/projects/hammer/contrib/tcpdump/VERSION#7 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/af.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/af.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/config.h.in#6 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#7 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#7 integrate .. //depot/projects/hammer/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/interface.h#7 integrate .. //depot/projects/hammer/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/llc.h#6 integrate .. //depot/projects/hammer/contrib/tcpdump/nameser.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/hammer/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/pf.h#3 delete .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#8 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#8 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-dhcp6.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-domain.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fddi.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipfc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#8 integrate .. //depot/projects/hammer/contrib/tcpdump/print-juniper.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-llc.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lmp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lspping.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-null.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pflog.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pim.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rx.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sll.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-smb.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/smbutil.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#5 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#8 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#7 integrate .. //depot/projects/hammer/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/hammer/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/hammer/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/hammer/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/util.c#6 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#13 integrate .. //depot/projects/hammer/lib/libpcap/config.h#5 integrate .. //depot/projects/hammer/sys/ia64/disasm/disasm.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_machdep.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.S#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.S#8 integrate .. //depot/projects/hammer/sys/sys/param.h#93 integrate .. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#83 integrate .. //depot/projects/hammer/usr.sbin/sensorsd/sensorsd.c#2 delete .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#13 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#6 integrate .. //depot/projects/hammer/usr.sbin/wpa/l2_packet.c#5 integrate Differences ... ==== //depot/projects/hammer/contrib/libpcap/CHANGES#6 (text+ko) ==== @@ -1,4 +1,88 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL) + +Mon. September 10, 2007. ken@xelerance.com. Summary for 0.9.8 libpcap release + Change build process to put public libpcap headers into pcap subir + DLT: Add value for IPMI IPMB packets + DLT: Add value for u10 Networks boards + Require for pf definitions - allows reading of pflog formatted + libpcap files on an OS other than where the file was generated + +Wed. July 23, 2007. mcr@xelerance.com. Summary for 0.9.7 libpcap release + + FIXED version file to be 0.9.7 instead of 0.9.5. + added flags/configuration for cloning bpf device. + added DLT_MTP2_WITH_PHDR support (PPI) + "fix" the "memory leak" in icode_to_fcode() -- documentation bug + Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/ + introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS. + Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added. + check for IPv4 and IPv6, even for DLT_RAW + add support for DLT_JUNIPER_ISM + Pick up changes from NetBSD: many from tron, christos, drochner + Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala. + Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header + +Wed. April 25, 2007. ken@xelerance.com. Summary for 0.9.6 libpcap release + + Put the public libpcap headers into a pcap subdirectory in both the + source directory and the target include directory, and have include + files at the top-level directory to include those headers, for + backwards compatibility. + Add Bluetooth support + Add USB capturing support on Linux + Add support for the binary USB sniffing interface in Linux + Add support for new FreeBSD BIOCSDIRECTION ioctl + Add additional filter operations for 802.11 frame types + Add support for filtering on MTP2 frame types + Propagate some changes from the main branch, so the x.9 branch has + all the DLT_ and LINKTYPE_ values that the main branch does + Reserved a DLT_ and SAVEFILE_ value for PPI (Per Packet Info) + encapsulated packets + Add LINKTYPE_ for IEEE 802.15.4, with address fields padded as done + by Linux drivers + Add LINKTYPE_ value corresponding to DLT_IEEE802_16_MAC_CPS. + Add DLT for IEEE 802.16 (WiMAX) MAC Common Part Sublayer + Add DLT for Bluetooth HCI UART transport layer + When building a shared library, build with "-fPIC" on Linux to support x86_64 + Link with "$(CC) -shared" rather than "ld -shared" when building a + ".so" shared library + Add support for autoconf 2.60 + Fixes to discard unread packets when changing filters + Changes to handle name changes in the DAG library resulting from + switching to libtool. + Add support for new DAG ERF types. + Add an explicit "-ldag" when building the shared library, so the DAG + library dependency is explicit. + Mac OSX fixes for dealing with "wlt" devices + Fixes in add_or_find_if() & pcap_findalldevs() to optimize generating + device lists + Fixed a bug in pcap_open_live(). The return value of PacketSetHwFilter + was not checked. + +Tue. September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release + + Support for LAPD frames with vISDN + Support for ERF on channelized T1/E1 cards via DAG API + Fix capitalization that caused issues crossc compiling on Linux + Better failure detection on PacketGetAdapterNames() + Fixes for MPLS packet generation (link layer) + OP_PACKET now matches the beginning of the packet, instead of + beginning+link-layer + Add DLT/LINKTYPE for carrying FRF.16 Multi-link Frame Relay + Fix allocation of buffer for list of link-layer types + Added a new DLT and LINKTYPE value for ARINC 653 Interpartition Communcation Messages + Fixed a typo in a DLT value: it should start with DLT_ and not LINKTYPE_ + Redefined DLT_CAN20B and LINKTYPE_CAN20B as #190 (as this is the right value for CAN). + Added definition for DLT_A429 and LINKTYPE_A429 as #184. + Added a new DLT and LINKTYPE value for CAN v2.0B frames. + Add support for DLT_JUNIPER_VP. + Don't double-count received packets on Linux systems that + support the PACKET_STATISTICS getsockopt() argument on + PF_PACKET sockets. + Add support for DLT_IEEE802_11 and DLT_IEEE802_11_RADIO link + layers in Windows + Add support to build libpcap.lib and wpcap.dll under Cygnus and + MingW32. Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release ==== //depot/projects/hammer/contrib/libpcap/CREDITS#6 (text+ko) ==== @@ -23,6 +23,7 @@ Chris G. Demetriou Chris Lightfoot Chris Pepper + Daniele Orlandi Darren Reed David Kaelbling David Young @@ -31,6 +32,7 @@ Dug Song Eric Anderson Erik de Castro Lopo + Florent Drouin Franz Schaefer Gianluca Varenni Gilbert Hoyek @@ -50,6 +52,7 @@ John Bankier Jon Lindgren Juergen Schoenwaelder + Jung-uk Kim Kazushi Sugyo Klaus Klein Koryn Grant @@ -63,12 +66,14 @@ Mark Pizzolato Martin Husemann Matthew Luckie + Max Laier Mike Kershaw Mike Wiacek Monroe Williams Nicolas Dade Octavian Cerna Olaf Kirch + Ollie Wild Onno van der Linden Patrick Marie Paul Mundt @@ -78,6 +83,7 @@ Peter Jeremy Phil Wood Rafal Maszkowski + Rick Jones Scott Barron Scott Gifford @@ -85,6 +91,7 @@ Shaun Clowes Solomon Peachy Stefan Hudson + Stephen Donnelly Takashi Yamamoto Tanaka Shin-ya Tony Li ==== //depot/projects/hammer/contrib/libpcap/FILES#5 (text+ko) ==== @@ -97,7 +97,6 @@ pcap.3 pcap.c pcap.h -pf.h ppp.h savefile.c scanner.l ==== //depot/projects/hammer/contrib/libpcap/INSTALL.txt#5 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -373,7 +373,6 @@ pcap.3 - manual entry pcap.c - pcap utility routines pcap.h - public libpcap definitions -pf.h - OpenBSD DLT_PFLOG definitions ppp.h - Point to Point Protocol definitions rawss7.h - information on DLT_ types for SS7 savefile.c - offline support ==== //depot/projects/hammer/contrib/libpcap/Makefile.in#4 (text+ko) ==== @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -46,7 +46,9 @@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ LIBS = @V_LIBS@ +DAGLIBS = @DAGLIBS@ DYEXT = @DYEXT@ +PROG=libpcap # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -112,7 +114,7 @@ # libpcap.so: $(OBJ) @rm -f $@ - ld -shared -o $@.`cat VERSION` $(OBJ) + $(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS) # the following rule succeeds, but the result is untested. libpcap.dylib: $(OBJ) @@ -216,19 +218,10 @@ RPMVERSION=`cat VERSION | sed s/-.*//g`; \ sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $< > $@ -tar: Makefile packaging/pcap.spec - @cwd=`pwd` ; dir=`basename $$cwd` ; name=libpcap-`cat VERSION` ; \ - list="" ; tar="tar chf" ; \ - for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \ - echo \ - "rm -f ../$$name; ln -s $$dir ../$$name" ; \ - rm -f ../$$name; ln -s $$dir ../$$name ; \ - echo \ - "(cd .. ; $$tar - [lots of files]) | gzip -c > /tmp/$$name.tar.gz" ; \ - (cd .. ; $$tar - $$list) | gzip -c > /tmp/$$name.tar.gz ; \ - echo \ - "rm -f ../$$name" ; \ - rm -f ../$$name +releasetar: + @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \ + list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \ + tar -c -z -f $$name.tar.gz $$name/. ; depend: $(GENSRC) $(GENHDR) bpf_filter.c ./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) ==== //depot/projects/hammer/contrib/libpcap/README.dag#3 (text+ko) ==== @@ -77,11 +77,32 @@ include packets that would have been dropped by the filter). The RX stream buffer size is user configurable outside libpcap, typically 16-512MB. -pcap_get_selectable_fd() is not supported, DAG cards do not support +pcap_get_selectable_fd() is not supported, as DAG cards do not support poll/select methods. pcap_inject() and pcap_sendpacket() are not supported. +Some DAG cards now support capturing to multiple virtual interfaces, called +streams. Capture streams have even numbers. These are available via libpcap +as separate interfaces, e.g. dag0:0, dag0:2, dag0:4 etc. dag0:0 is the same +as dag0. These are visible via pcap_findalldevs(). + +libpcap now does NOT set the card's hardware snaplen (slen). This must now be +set using the appropriate DAG coniguration program, e.g. dagthree, dagfour, +dagsix, dagconfig. This is because the snaplen is currently shared between +all of the streams. In future this may change if per-stream slen is +implemented. + +DAG cards by default capture entire packets including the L2 +CRC/FCS. If the card is not configured to discard the CRC/FCS, this +can confuse applications that use libpcap if they're not prepared for +packets to have an FCS. Libpcap now reads the environment variable +ERF_FCS_BITS to determine how many bits of CRC/FCS to strip from the +end of the captured frame. This defaults to 32 for use with +Ethernet. If the card is configured to strip the CRC/FCS, then set +ERF_FCS_BITS=0. If used with a HDLC/PoS/PPP/Frame Relay link with 16 +bit CRC/FCS, then set ERF_FCS_BITS=16. + ---------------------------------------------------------------------- Please submit bug reports via . ==== //depot/projects/hammer/contrib/libpcap/TODO#2 (text+ko) ==== @@ -15,13 +15,6 @@ style (okay, you can guess that by looking at the code) and a guide for what needs to be documented. -Linux kernel interface - -- Currently there is a race condition in that a socket is activated at the - same time it is opened - before applying a filter. This has to - be corrected so that capture starts when pcap_read is called for the - first time. - Less urgent items ----------------- ==== //depot/projects/hammer/contrib/libpcap/VERSION#7 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9.4 +0.9.8 ==== //depot/projects/hammer/contrib/libpcap/bpf_image.c#4 (text+ko) ==== @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003/11/15 23:23:57 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26.2.1 2007/06/11 09:52:04 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -43,7 +43,7 @@ int n; { int v; - char *fmt, *op; + const char *fmt, *op; static char image[256]; char operand[64]; ==== //depot/projects/hammer/contrib/libpcap/config.h.in#6 (text+ko) ==== @@ -10,9 +10,15 @@ /* Enable optimizer debugging */ #undef BDEBUG +/* define if you have a cloning BPF device */ +#undef HAVE_CLONING_BPF + /* define if you have the DAG API */ #undef HAVE_DAG_API +/* define if you have dag_get_erf_types() */ +#undef HAVE_DAG_GET_ERF_TYPES + /* define if you have streams capable DAG API */ #undef HAVE_DAG_STREAMS_API @@ -50,9 +56,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_PFVAR_H + /* if there's an os_proto.h */ #undef HAVE_OS_PROTO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + /* define if you have a /proc/net/dev */ #undef HAVE_PROC_NET_DEV ==== //depot/projects/hammer/contrib/libpcap/configure#6 (text+ko) ==== @@ -1,37 +1,101 @@ #! /bin/sh -# From configure.in Revision: 1.120.2.7 . +# From configure.in Revision: 1.120.2.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.61. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -42,21 +106,22 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -64,206 +129,447 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. fi +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +test \$exitcode = 0) || { (exit 1); exit 1; } - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 16 04:56:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 699E316A468; Tue, 16 Oct 2007 04:56: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 729E916A41B; Tue, 16 Oct 2007 04:56:09 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 67B4F13C459; Tue, 16 Oct 2007 04:56:09 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 824691A4D80; Mon, 15 Oct 2007 21:31:33 -0700 (PDT) Date: Mon, 15 Oct 2007 21:31:33 -0700 From: Alfred Perlstein To: Hans Petter Selasky Message-ID: <20071016043133.GW31826@elvis.mu.org> References: <200709231625.l8NGPhaR097038@repoman.freebsd.org> <46F6A3C3.6010408@FreeBSD.org> <200709232113.34718.hselasky@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200709232113.34718.hselasky@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Perforce Change Reviews , "Constantine A. Murenin" Subject: Re: PERFORCE change 126745 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, 16 Oct 2007 04:56:10 -0000 * Hans Petter Selasky [070923 13:13] wrote: > Hi Constantine, > > Thanks for your input and I _know_ that my code is not 100% style compliant. > Most of the style misbehaves are probably there due to the way my "xemacs" > autoformatting behaves. And I love curly brackets and parenthesis, by the > way :-) > > My plan is to clean up all the style stuff by a small C-program in the end, > because doing it by hand is waste of my time. Probably it will take less time > to write that program than the actual manual edit when we are talking about > doing alot of edits. It wonders me if such a tool already exists, because the > code is technically OK. > > Anyone that wants to be a little more constructive and point towards where the > FreeBSD style transformer program is? I assume it would be extremely useful > to everyone that is forced to use multiple different styles depending on what > project they are contributing to, like me. Then before commit I will run that > script and verify the differences. And that's it. > > --HPS Hans, one of the issues with doing such changes at the end is that it effectively obliterates the ability to "cvs annotate" your code. I'm sure perforce has an 'annotate' command as well. I would suggest that you find/fix the style now and apply it now rather than later as the longer you wait, the more history you obliterate. -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Tue Oct 16 05:40:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D65716A41A; Tue, 16 Oct 2007 05:40: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 B487616A418 for ; Tue, 16 Oct 2007 05:40:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF7E913C45A for ; Tue, 16 Oct 2007 05:40:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9G5evNZ076713 for ; Tue, 16 Oct 2007 05:40:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9G5elR5076688 for perforce@freebsd.org; Tue, 16 Oct 2007 05:40:47 GMT (envelope-from imp@freebsd.org) Date: Tue, 16 Oct 2007 05:40:47 GMT Message-Id: <200710160540.l9G5elR5076688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 127585 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, 16 Oct 2007 05:40:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=127585 Change 127585 by imp@imp_paco-paco on 2007/10/16 05:40:18 IFC @127582 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#30 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#29 integrate .. //depot/projects/arm/src/UPDATING#21 integrate .. //depot/projects/arm/src/cddl/lib/Makefile#5 integrate .. //depot/projects/arm/src/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/arm/src/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/arm/src/contrib/less/NEWS#5 integrate .. //depot/projects/arm/src/contrib/less/README#5 integrate .. //depot/projects/arm/src/contrib/less/ch.c#4 integrate .. //depot/projects/arm/src/contrib/less/charset.c#4 integrate .. //depot/projects/arm/src/contrib/less/configure#4 integrate .. //depot/projects/arm/src/contrib/less/configure.ac#4 integrate .. //depot/projects/arm/src/contrib/less/filename.c#4 integrate .. //depot/projects/arm/src/contrib/less/funcs.h#4 integrate .. //depot/projects/arm/src/contrib/less/jump.c#4 integrate .. //depot/projects/arm/src/contrib/less/less.h#4 integrate .. //depot/projects/arm/src/contrib/less/less.man#5 integrate .. //depot/projects/arm/src/contrib/less/less.nro#5 integrate .. //depot/projects/arm/src/contrib/less/lessecho.man#4 integrate .. //depot/projects/arm/src/contrib/less/lessecho.nro#4 integrate .. //depot/projects/arm/src/contrib/less/lesskey.man#5 integrate .. //depot/projects/arm/src/contrib/less/lesskey.nro#5 integrate .. //depot/projects/arm/src/contrib/less/line.c#4 integrate .. //depot/projects/arm/src/contrib/less/search.c#5 integrate .. //depot/projects/arm/src/contrib/less/signal.c#4 integrate .. //depot/projects/arm/src/contrib/less/version.c#5 integrate .. //depot/projects/arm/src/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/arm/src/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/arm/src/contrib/libpcap/FILES#2 integrate .. //depot/projects/arm/src/contrib/libpcap/INSTALL#2 delete .. //depot/projects/arm/src/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/arm/src/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/libpcap/README.dag#3 integrate .. //depot/projects/arm/src/contrib/libpcap/TODO#2 integrate .. //depot/projects/arm/src/contrib/libpcap/VERSION#3 integrate .. //depot/projects/arm/src/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/arm/src/contrib/libpcap/configure#3 integrate .. //depot/projects/arm/src/contrib/libpcap/configure.in#3 integrate .. //depot/projects/arm/src/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/gencode.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/arm/src/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/arm/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/arm/src/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/arm/src/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/arm/src/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.3#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/arm/src/contrib/libpcap/pf.h#2 delete .. //depot/projects/arm/src/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/arm/src/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/arm/src/contrib/pf/pflogd/pflogd.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/FILES#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/README#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/af.c#1 branch .. //depot/projects/arm/src/contrib/tcpdump/af.h#1 branch .. //depot/projects/arm/src/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/configure#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/ieee802_11.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/pf.h#2 delete .. //depot/projects/arm/src/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/arm/src/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump.1#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/arm/src/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/arm/src/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/arm/src/contrib/tcpdump/util.c#2 integrate .. //depot/projects/arm/src/contrib/tcsh/sh.c#3 integrate .. //depot/projects/arm/src/contrib/tcsh/sh.lex.c#4 integrate .. //depot/projects/arm/src/contrib/tcsh/sh.proc.c#3 integrate .. //depot/projects/arm/src/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/arm/src/etc/Makefile#6 integrate .. //depot/projects/arm/src/etc/defaults/devfs.rules#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#19 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#11 integrate .. //depot/projects/arm/src/etc/rc.d/early.sh#2 integrate .. //depot/projects/arm/src/etc/rc.d/ppp#4 integrate .. //depot/projects/arm/src/etc/rc.subr#10 integrate .. //depot/projects/arm/src/gnu/lib/csu/Makefile#3 integrate .. //depot/projects/arm/src/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/diff/Makefile#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate .. //depot/projects/arm/src/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/arm/src/include/_ctype.h#2 integrate .. //depot/projects/arm/src/include/ctype.h#2 integrate .. //depot/projects/arm/src/include/wctype.h#2 integrate .. //depot/projects/arm/src/lib/Makefile#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio.c#7 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/arm/src/lib/libc/arm/string/ffs.S#2 integrate .. //depot/projects/arm/src/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/arm/src/lib/libc/arm/string/memset.S#2 integrate .. //depot/projects/arm/src/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/arm/src/lib/libc/locale/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/locale/big5.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/euc.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/gbk.c#3 integrate .. //depot/projects/arm/src/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/arm/src/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/arm/src/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/arm/src/lib/libc/locale/none.c#3 integrate .. //depot/projects/arm/src/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/arm/src/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/arm/src/lib/libkse/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/arm/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/arm/arm/context.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/enter_uts.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/assym.s#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/context.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/assym.s#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/arm/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#2 integrate .. //depot/projects/arm/src/lib/libkse/kse.map#1 branch .. //depot/projects/arm/src/lib/libkse/pthread.map#2 delete .. //depot/projects/arm/src/lib/libkse/support/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/support/thr_support.c#2 integrate .. //depot/projects/arm/src/lib/libkse/sys/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/arm/src/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/arm/src/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/Makefile#2 integrate .. //depot/projects/arm/src/lib/libkse/test/README#2 integrate .. //depot/projects/arm/src/lib/libkse/test/guard_b.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/guard_b.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/guard_s.pl#2 integrate .. //depot/projects/arm/src/lib/libkse/test/hello_b.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/hello_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/hello_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/hello_s.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/join_leak_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/join_leak_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/mutex_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/mutex_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/propagate_s.pl#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sem_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sem_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sigsuspend_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sigwait_d.c#2 integrate .. //depot/projects/arm/src/lib/libkse/test/sigwait_d.exp#2 integrate .. //depot/projects/arm/src/lib/libkse/test/verify#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_autoinit.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_printf.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/arm/src/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/arm/src/lib/libpcap/Makefile#3 integrate .. //depot/projects/arm/src/lib/libpcap/config.h#2 integrate .. //depot/projects/arm/src/lib/libpthread/Makefile#7 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/amd64/context.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/arm/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/arm/arm/context.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/arm/include/pthread_md.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/i386/include/pthread_md.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/ia64/context.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/ia64/include/pthread_md.h#3 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/include/pthread_md.h#3 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#3 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete .. //depot/projects/arm/src/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/arm/src/lib/libpthread/pthread.map#4 delete .. //depot/projects/arm/src/lib/libpthread/support/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/support/thr_support.c#2 delete .. //depot/projects/arm/src/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/sys/lock.c#2 delete .. //depot/projects/arm/src/lib/libpthread/sys/lock.h#2 delete .. //depot/projects/arm/src/lib/libpthread/sys/thr_error.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/Makefile#2 delete .. //depot/projects/arm/src/lib/libpthread/test/README#2 delete .. //depot/projects/arm/src/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/arm/src/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/arm/src/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/arm/src/lib/libpthread/test/verify#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/Makefile.inc#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_accept.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_aio_suspend.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_atfork.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_destroy.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_get_np.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getdetachstate.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getscope.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getstack.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getstackaddr.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_getstacksize.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_init.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setdetachstate.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setscope.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setstack.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setstackaddr.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_attr_setstacksize.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_autoinit.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_barrier.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_barrierattr.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_cancel.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_clean.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_close.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_concurrency.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_cond.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_condattr_destroy.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_condattr_init.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_connect.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_creat.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_create.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_detach.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_equal.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_execve.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_exit.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_fcntl.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_find_thread.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_fork.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_fsync.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_getprio.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_getschedparam.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_info.c#4 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_init.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_join.c#4 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_kern.c#4 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_kill.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_main_np.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mattr_init.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mattr_kind_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_msync.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_multi_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutex.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutex_protocol.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_mutexattr_destroy.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_nanosleep.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_once.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_open.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_pause.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_poll.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_printf.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_priority_queue.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_private.h#5 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_pselect.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_pspinlock.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_raise.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_read.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_readv.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_resume_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_rtld.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_rwlock.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_rwlockattr.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_select.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_self.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sem.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_seterrno.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_setprio.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_setschedparam.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sig.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigaction.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigaltstack.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigmask.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigpending.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigprocmask.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigsuspend.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sigwait.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_single_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_sleep.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_spec.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_spinlock.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_stack.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_suspend_np.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_switch_np.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_symbols.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_system.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_tcdrain.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_vfork.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_wait.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_wait4.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_waitpid.c#2 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_write.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_writev.c#3 delete .. //depot/projects/arm/src/lib/libpthread/thread/thr_yield.c#3 delete .. //depot/projects/arm/src/lib/libstand/Makefile#4 integrate .. //depot/projects/arm/src/lib/libthr/Makefile#9 integrate .. //depot/projects/arm/src/lib/libutil/pidfile.3#2 integrate .. //depot/projects/arm/src/lib/libutil/pidfile.c#4 integrate .. //depot/projects/arm/src/release/Makefile#13 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 integrate .. //depot/projects/arm/src/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/arm/src/sbin/ggate/Makefile#5 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/arm/src/sbin/mount_unionfs/mount_unionfs.8#4 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/arm/src/share/examples/cvsup/stable-supfile#4 integrate .. //depot/projects/arm/src/share/man/man3/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#20 integrate .. //depot/projects/arm/src/share/man/man4/coretemp.4#2 integrate .. //depot/projects/arm/src/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/arm/src/share/man/man5/fstab.5#2 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/arm/src/share/man/man5/src.conf.5#11 integrate .. //depot/projects/arm/src/share/man/man7/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#15 integrate .. //depot/projects/arm/src/share/mk/bsd.compat.mk#3 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#15 integrate .. //depot/projects/arm/src/share/mklocale/UTF-8.src#3 integrate .. //depot/projects/arm/src/share/zoneinfo/Makefile#2 integrate .. //depot/projects/arm/src/share/zoneinfo/africa#5 integrate .. //depot/projects/arm/src/share/zoneinfo/asia#4 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#4 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/support.S#5 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/arm/src/sys/arm/include/asm.h#4 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#6 integrate .. //depot/projects/arm/src/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#22 integrate .. //depot/projects/arm/src/sys/conf/files#79 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#28 integrate .. //depot/projects/arm/src/sys/conf/files.i386#30 integrate .. //depot/projects/arm/src/sys/conf/newvers.sh#3 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/arm/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_battery.c#7 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#9 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#24 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/sample/sample.c#10 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/arm/src/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/arm/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/arm/src/sys/dev/ctau/if_ct.c#10 integrate .. //depot/projects/arm/src/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/arm/src/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipw.c#14 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipwreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/ipw/if_ipwvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.c#26 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#42 integrate .. //depot/projects/arm/src/sys/dev/my/if_my.c#11 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccard_cis_quirks.c#3 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/sio/sio.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#16 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/sbus/cs4231.c#8 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#7 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_share.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union.h#5 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/arm/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/arm/src/sys/ia64/disasm/disasm.h#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/db_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/arm/src/sys/ia64/ia64/support.S#4 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#23 integrate .. //depot/projects/arm/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#22 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#26 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#13 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#10 integrate .. //depot/projects/arm/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#49 integrate .. //depot/projects/arm/src/sys/net/bpf.c#22 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#10 integrate .. //depot/projects/arm/src/sys/net/if_lagg.h#8 integrate .. //depot/projects/arm/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#22 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#25 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#21 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/arm/src/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#13 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#10 integrate .. //depot/projects/arm/src/sys/pc98/cbus/sio.c#8 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#9 integrate .. //depot/projects/arm/src/sys/pci/if_wb.c#7 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#12 integrate .. //depot/projects/arm/src/sys/pci/intpm.c#9 integrate .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/arm/src/sys/sys/ata.h#8 integrate .. //depot/projects/arm/src/sys/sys/param.h#36 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#15 integrate .. //depot/projects/arm/src/sys/sys/systm.h#27 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#15 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#23 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#34 integrate .. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_LIBKSE#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_LIBPTHREAD#2 integrate .. //depot/projects/arm/src/usr.bin/Makefile#7 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.birthday#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#17 integrate .. //depot/projects/arm/src/usr.bin/id/id.c#5 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/updatedb.sh#2 integrate .. //depot/projects/arm/src/usr.bin/lockf/lockf.1#3 integrate .. //depot/projects/arm/src/usr.bin/lockf/lockf.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/Makefile#4 integrate .. //depot/projects/arm/src/usr.bin/systat/cmdtab.c#2 integrate .. //depot/projects/arm/src/usr.bin/systat/extern.h#2 integrate .. //depot/projects/arm/src/usr.bin/systat/systat.1#3 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#16 integrate .. //depot/projects/arm/src/usr.sbin/ipfwpcap/ipfwpcap.c#3 integrate .. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#6 integrate .. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.#3 delete .. //depot/projects/arm/src/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/arm/src/usr.sbin/sade/sade.8#4 integrate .. //depot/projects/arm/src/usr.sbin/tcpdump/tcpdump/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/tcpdump/tcpdump/config.h#2 integrate .. //depot/projects/arm/src/usr.sbin/wpa/l2_packet.c#3 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#30 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -578,7 +578,12 @@ date echo egrep find grep install-info \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ - cp `which $$prog` ${INSTALLTMP}; \ + if progpath=`which $$prog`; then \ + cp $$progpath ${INSTALLTMP}; \ + else \ + echo "Required install tool $$prog not found" >&2; \ + exit 1; \ + fi; \ done ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} @@ -1030,12 +1035,12 @@ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} .elif ${MK_LIBTHR} != "no" _default_thread_lib= lib/libthr -.elif ${MK_LIBPTHREAD} != "no" -_default_thread_lib= lib/libpthread +.elif ${MK_LIBKSE} != "no" +_default_thread_lib= lib/libkse .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ==== //depot/projects/arm/src/ObsoleteFiles.inc#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.113 2007/10/12 07:58:08 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -17,8 +17,8 @@ # 20070930: rename of cached to nscd OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached -OLD_FILES+=usr/share/man/man5/cached.conf.5 -OLD_FILES+=usr/share/man/man8/cached.8 +OLD_FILES+=usr/share/man/man5/cached.conf.5.gz +OLD_FILES+=usr/share/man/man8/cached.8.gz # 20070807: removal of PowerPC specific header file. .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/machine/interruptvar.h ==== //depot/projects/arm/src/UPDATING#21 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: - FreeBSD 7.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: + FreeBSD 8.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20071010: + RELENG_7 branched. + +20071009: + Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and + WITHOUT_LIBTHR are set. + 20070930: The PCI code has been made aware of PCI domains. This means that the location strings as used by pciconf(8) etc are now in the @@ -35,6 +42,11 @@ instead of cached_enable, cached_pidfile and cached_flags in rc.conf. +20070921: + The getfacl(1) utility now prints owning user and group name + instead of owning uid and gid in the three line comment header. + This is the same behavior as getfacl(1) on Solaris and Linux. + 20070704: The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel @@ -145,9 +157,9 @@ which previously had symbol dependencies to FBSD_1.0, will fail because the freshly installed libc will not have them. - The default threading library has been changed to libthr. If - you wish to have libpthread as your default, use option - DEFAULT_THREAD_LIB=libpthread for the buildworld. + The default threading library (providing "libpthread") has been + changed to libthr. If you wish to have libkse as your default, + use option DEFAULT_THREAD_LIB=libkse for the buildworld. 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired @@ -901,4 +913,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $ +$FreeBSD: src/UPDATING,v 1.509 2007/10/12 04:48:58 kevlo Exp $ ==== //depot/projects/arm/src/cddl/lib/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include @@ -11,7 +11,7 @@ .if ${MK_ZFS} != "no" _libzfs= libzfs -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _libzpool= libzpool .endif .endif ==== //depot/projects/arm/src/cddl/usr.bin/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_ztest} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _ztest= ztest .endif .endif ==== //depot/projects/arm/src/cddl/usr.sbin/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $ .include SUBDIR= ${_zdb} .if ${MK_ZFS} != "no" -.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _zdb= zdb .endif .endif ==== //depot/projects/arm/src/contrib/less/NEWS#5 (text+ko) ==== @@ -13,6 +13,20 @@ ====================================================================== + Major changes between "less" versions 406 and 409 + +* Support CSI escape sequences, like SGR escape sequences. + +* Fix bug which caused screen to fail to repaint when window is resized. + +* Fix bug in using -i and -I flags with non-ASCII text. + +* Fix configure bug on systems which don't support langinfo.h. + +* Fix crash when searching text containing certain invalid UTF-8 sequences. + +====================================================================== + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. @@ -683,3 +697,4 @@ + ==== //depot/projects/arm/src/contrib/less/README#5 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 406 + Less, version 409 - This is the distribution of less, version 406, released 19 Jun 2007. + This is the distribution of less, version 409, released 12 Oct 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/arm/src/contrib/less/ch.c#4 (text+ko) ==== @@ -128,6 +128,9 @@ POSITION pos; POSITION len; + if (thisfile == NULL) + return (EOI); + slept = FALSE; /* @@ -416,6 +419,9 @@ BLOCKNUM new_block; POSITION len; + if (thisfile == NULL) + return (0); + len = ch_length(); if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) return (1); @@ -450,6 +456,9 @@ { POSITION len; + if (thisfile == NULL) + return (0); + if (ch_flags & CH_CANSEEK) ch_fsize = filesize(ch_file); @@ -503,6 +512,8 @@ public POSITION ch_length() { + if (thisfile == NULL) + return (NULL_POSITION); if (ignore_eoi) return (NULL_POSITION); if (ch_flags & CH_HELPFILE) @@ -516,6 +527,8 @@ public POSITION ch_tell() { + if (thisfile == NULL) + return (NULL_POSITION); return (ch_block * LBUFSIZE) + ch_offset; } @@ -527,6 +540,8 @@ { register int c; + if (thisfile == NULL) + return (EOI); c = ch_get(); if (c == EOI) return (EOI); @@ -546,6 +561,8 @@ public int >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 16 10:21:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36C8D16A421; Tue, 16 Oct 2007 10:21: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 A50AC16A41A for ; Tue, 16 Oct 2007 10:21:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC8C913C481 for ; Tue, 16 Oct 2007 10:21:21 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9GALL4A009234 for ; Tue, 16 Oct 2007 10:21:21 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9GALLY5009228 for perforce@freebsd.org; Tue, 16 Oct 2007 10:21:21 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 16 Oct 2007 10:21:21 GMT Message-Id: <200710161021.l9GALLY5009228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127589 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, 16 Oct 2007 10:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=127589 Change 127589 by zec@zec_tpx32 on 2007/10/16 10:20:39 Implement per process group accounting of average CPU usage. Two average values are maintained per process group: avg1 loses half of its value after around 62.5 ms, while for avg2 the same should happen after roughly 0.5 s. Internally the values are maintained in a 16.16 bit fixed point format stored in a uint (portability XXX). Each 62.5 ms the entire list of process group containers is scanned for deccay processing. This is very experimental, needs more thought about locking, as well as more experimentation accross wide variety of HZ values on both UP and SMP machines. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_clock.c#9 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#43 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#42 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#9 (text+ko) ==== @@ -167,6 +167,11 @@ int ticks; int psratio; +#ifdef VIMAGE +u_int tot_acc_statcalls; +int last_acc_ticks; +#endif + /* * Initialize clock frequencies and start both clocks running. */ @@ -416,7 +421,8 @@ td = curthread; p = td->td_proc; #ifdef VIMAGE - INIT_VPROCG(p->p_ucred->cr_vimage->v_procg); + INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VCPU(td->td_ucred->cr_vimage->v_cpu); struct vprocg *vprocg_iter; #endif @@ -468,10 +474,41 @@ #ifdef VIMAGE if (sel != CP_INTR) sel = CP_IDLE; - /* XXX list locking? sched_lock is held here... */ + /* XXX list locking? */ LIST_FOREACH(vprocg_iter, &vprocg_head, vprocg_le) if (vprocg != vprocg_iter) atomic_add_long(&vprocg_iter->_cp_time[sel], 1); + + /* Per-vcpu average accounting */ + /* LOCKING!!!! XXX */ + tot_acc_statcalls++; + if (!TD_IS_IDLETHREAD(td)) + V_acc_statcalls++; + if (last_acc_ticks + (hz >> 4) <= ticks) { + u_int weight_fixp; + u_int avg0; + + last_acc_ticks = ticks; + /* + * 0x10000 == 1.0 in 16:16 fixed point notation; + * a few extra LS bits are added in an attempt to + * compensate for truncation errors. + */ + weight_fixp = 0x010007 / tot_acc_statcalls; + LIST_FOREACH(vcpu, &vcpu_head, vcpu_le) { + avg0 = weight_fixp * V_acc_statcalls; + V_avg1_fixp = (V_avg1_fixp + avg0 + 1) >> 1; + V_avg2_fixp = (15 * V_avg2_fixp + avg0 + 15) >> 4; + V_acc_statcalls = 0; + /* + * Convert fixp notation to percents for export to + * userspace via sysctls - this will go away soon. + */ + V_avg1_uint = (V_avg1_fixp * 100 + 0x8000) >> 16; + V_avg2_uint = (V_avg2_fixp * 100 + 0x8000) >> 16; + } + tot_acc_statcalls = 0; + } #endif /* Update resource usage integrals and maximums. */ ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#43 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #ifdef DDB @@ -130,6 +131,11 @@ static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; +SYSCTL_V_INT(V_CPU, vcpu, _kern, OID_AUTO, avg1_uint, CTLFLAG_RD, + avg1_uint, 0, "Average CPU usage"); +SYSCTL_V_INT(V_CPU, vcpu, _kern, OID_AUTO, avg2_uint, CTLFLAG_RD, + avg2_uint, 0, "Average CPU usage"); + void vnet_mod_register(vmi) const struct vnet_modinfo *vmi; { ==== //depot/projects/vimage/src/sys/sys/vimage.h#42 (text+ko) ==== @@ -104,6 +104,7 @@ #define V_MOD_vnet_ipsec VNET_MOD_IPSEC #define V_MOD_vprocg 0 +#define V_MOD_vcpu 0 struct vnet { void *mod_data[VNET_MOD_MAX]; @@ -272,6 +273,8 @@ #define VPROCG_ITERLOOP_END() \ } \ +#define INIT_VCPU(arg) struct vcpu *vcpu = (arg); + #else /* !VIMAGE */ /* Non-VIMAGE null-macros */ @@ -290,10 +293,13 @@ #define INIT_VPROCG(arg) #define VPROCG_ITERLOOP_BEGIN() #define VPROCG_ITERLOOP_END() +#define INIT_VCPU(arg) #endif /* !VIMAGE */ +/* XXX those defines bellow should probably go into vprocg.h and vcpu.h */ #define VPROCG(sym) VSYM(vprocg, sym) +#define VCPU(sym) VSYM(vcpu, sym) #define V_cp_time VPROCG(cp_time) #define V_hostname VPROCG(hostname) @@ -303,6 +309,12 @@ #define V_sched_tdcnt VPROCG(sched_tdcnt) #define V_tdq_load VPROCG(tdq_load) +#define V_acc_statcalls VCPU(acc_statcalls) +#define V_avg1_fixp VCPU(avg1_fixp) +#define V_avg2_fixp VCPU(avg2_fixp) +#define V_avg1_uint VCPU(avg1_uint) +#define V_avg2_uint VCPU(avg2_uint) + #ifdef VIMAGE void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_deregister(const struct vnet_modinfo *); @@ -408,10 +420,13 @@ u_int vcpu_ref; /* reference count */ u_int vcpu_id; /* ID num */ + u_int _acc_statcalls; /* statclocks since last avg update*/ + u_int _avg1_fixp; /* "fast" avg in 16:16 bit fixedpoint */ + u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */ + u_int _avg1_uint; /* (avg1_fixp * 100) >> 16 */ + u_int _avg2_uint; /* (avg2_fixp * 100) >> 16 */ + #if 0 - u_int cp_time_avg[CPUSTATES]; - u_int cp_time_avg1[CPUSTATES]; - u_int cpu_min; /* Guaranteed CPU share */ u_int cpu_max; /* Maximum average CPU usage */ u_int intr_limit; /* Limit on CPU usage in intr ctx */ From owner-p4-projects@FreeBSD.ORG Tue Oct 16 11:48:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5290E16A475; Tue, 16 Oct 2007 11:48: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 EF40916A468 for ; Tue, 16 Oct 2007 11:48:51 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07B1313C4A6 for ; Tue, 16 Oct 2007 11:48:52 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9GBmpxc015903 for ; Tue, 16 Oct 2007 11:48:51 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9GBmp6l015898 for perforce@freebsd.org; Tue, 16 Oct 2007 11:48:51 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 16 Oct 2007 11:48:51 GMT Message-Id: <200710161148.l9GBmp6l015898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127598 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, 16 Oct 2007 11:48:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127598 Change 127598 by zec@zec_tpx32 on 2007/10/16 11:48:38 Introduce hooks for cleaning up TCP/UDP state. The hooks are largely disfunctional and have yet to be populated with useful code. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_proto.c#9 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#34 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#20 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#7 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#10 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#18 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#19 edit .. //depot/projects/vimage/src/sys/netinet/udp_var.h#6 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_proto.c#9 (text+ko) ==== @@ -119,6 +119,9 @@ .pr_ctlinput = udp_ctlinput, .pr_ctloutput = ip_ctloutput, .pr_init = udp_init, +#ifdef VIMAGE + .pr_destroy = udp_destroy, +#endif .pr_usrreqs = &udp_usrreqs }, { @@ -130,7 +133,9 @@ .pr_ctlinput = tcp_ctlinput, .pr_ctloutput = tcp_ctloutput, .pr_init = tcp_init, +#ifdef VIMAGE .pr_destroy = tcp_destroy, +#endif .pr_slowtimo = tcp_slowtimo, .pr_drain = tcp_drain, .pr_usrreqs = &tcp_usrreqs ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#34 (text+ko) ==== @@ -290,6 +290,7 @@ #ifdef VIMAGE } #endif + tcp_tw_init(); int hashsize = TCBHASHSIZE; @@ -385,11 +386,24 @@ EVENTHANDLER_PRI_ANY); } +#ifdef VIMAGE void tcp_destroy(void) { + INIT_VNET_INET(curvnet); + + tcp_tw_destroy(); tcp_hc_destroy(); + syncache_destroy(); + + /* XXX check that hashes are empty! */ + hashdestroy(V_tcbinfo.ipi_hashbase, M_PCB, + V_tcbinfo.ipi_hashmask); + hashdestroy(V_tcbinfo.ipi_porthashbase, M_PCB, + V_tcbinfo.ipi_porthashmask); + INP_INFO_LOCK_DESTROY(&V_tcbinfo); } +#endif void tcp_fini(void *xtp) ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#20 (text+ko) ==== @@ -265,6 +265,19 @@ uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); } +#ifdef VIMAGE +void +syncache_destroy(void) +{ + INIT_VNET_INET(curvnet); + + /* XXX walk the cache, free remaining objects, stop timers */ + + uma_zdestroy(V_tcp_syncache.zone); + FREE(V_tcp_syncache.hashbase, M_SYNCACHE); +} +#endif + /* * Inserts a syncache entry into the specified bucket row. * Locks and unlocks the syncache_head autonomously. ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#7 (text+ko) ==== @@ -37,6 +37,9 @@ #ifdef _KERNEL void syncache_init(void); +#ifdef VIMAGE +void syncache_destroy(void); +#endif void syncache_unreach(struct in_conninfo *, struct tcphdr *); int syncache_expand(struct in_conninfo *, struct tcpopt *, struct tcphdr *, struct socket **, struct mbuf *); ==== //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#10 (text+ko) ==== @@ -183,6 +183,20 @@ uma_zone_set_max(tcptw_zone, maxtcptw); } +#ifdef VIMAGE +void +tcp_tw_destroy(void) +{ + INIT_VNET_INET(curvnet); + struct tcptw *tw; + + INP_INFO_WLOCK(&V_tcbinfo); + while((tw = TAILQ_FIRST(&V_twq_2msl)) != NULL) + tcp_twclose(tw, 0); + INP_INFO_WUNLOCK(&V_tcbinfo); +} +#endif + /* * Move a TCP connection into TIME_WAIT state. * tcbinfo is locked. ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#18 (text+ko) ==== @@ -564,6 +564,9 @@ void tcp_respond(struct tcpcb *, void *, struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int); void tcp_tw_init(void); +#ifdef VIMAGE +void tcp_tw_destroy(void); +#endif void tcp_tw_zone_change(void); int tcp_twcheck(struct inpcb *, struct tcpopt *, struct tcphdr *, struct mbuf *, int); ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#19 (text+ko) ==== @@ -196,6 +196,20 @@ V_udbinfo.vnet = curvnet; } +#ifdef VIMAGE +void +udp_destroy(void) +{ + INIT_VNET_INET(curvnet); + + hashdestroy(V_udbinfo.ipi_hashbase, M_PCB, + V_udbinfo.ipi_hashmask); + hashdestroy(V_udbinfo.ipi_porthashbase, M_PCB, + V_udbinfo.ipi_porthashmask); + INP_INFO_LOCK_DESTROY(&V_udbinfo); +} +#endif + /* * Subroutine of udp_input(), which appends the provided mbuf chain to the * passed pcb/socket. The caller must provide a sockaddr_in via udp_in that ==== //depot/projects/vimage/src/sys/netinet/udp_var.h#6 (text+ko) ==== @@ -107,6 +107,9 @@ void udp_ctlinput(int, struct sockaddr *, void *); void udp_init(void); +#ifdef VIMAGE +void udp_destroy(void); +#endif void udp_input(struct mbuf *, int); struct inpcb *udp_notify(struct inpcb *inp, int errno); int udp_shutdown(struct socket *so); From owner-p4-projects@FreeBSD.ORG Tue Oct 16 11:53:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE23516A4D8; Tue, 16 Oct 2007 11:52: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 82EFD16A421 for ; Tue, 16 Oct 2007 11:52:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BB1213C465 for ; Tue, 16 Oct 2007 11:52:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9GBqxo9016246 for ; Tue, 16 Oct 2007 11:52:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9GBqwRl016243 for perforce@freebsd.org; Tue, 16 Oct 2007 11:52:58 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 16 Oct 2007 11:52:58 GMT Message-Id: <200710161152.l9GBqwRl016243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127599 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, 16 Oct 2007 11:53:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=127599 Change 127599 by zec@zec_tca51 on 2007/10/16 11:52:06 Rearrange output of "vimage -l" so that less lines are consumed, and reintroduce the output of CPU average use. Affected files ... .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#5 edit Differences ... ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#5 (text+ko) ==== @@ -64,43 +64,39 @@ { double lf = 1.0/vi_req->averunnable.fscale; - printf ("\"%s\":\n", vi_req->vi_name); - printf (" Processes (current/max): %d/%d\n", + printf("\"%s\":\n", vi_req->vi_name); + printf(" Processes (cur/max): %d/%d;", vi_req->vi_proc_count, vi_req->vi_proc_limit); - printf (" load averages: %3.2f, %3.2f, %3.2f\n", + printf(" load averages: %3.2f, %3.2f, %3.2f\n", lf * vi_req->averunnable.ldavg[0], lf * vi_req->averunnable.ldavg[1], lf * vi_req->averunnable.ldavg[2]); + printf(" CPU usage: %3.2f%%\n", 0.01 * vi_req->cp_time_avg); + + printf(" Sockets (cur/max): %d/%d;", vi_req->vi_sock_count, + vi_req->vi_maxsockets); + printf(" %d network interfaces\n", vi_req->vi_if_count); + #if 0 - printf (" CPU usage: %3.2f%% (", - 0.0001 * vi_req->cp_time_avg[CP_ALL]); - printf ("%3.2f%% user, ", 0.0001 * vi_req->cp_time_avg[CP_USER]); - printf ("%3.2f%% nice, ", 0.0001 * vi_req->cp_time_avg[CP_NICE]); - printf ("%3.2f%% sys, ",0.0001 * vi_req->cp_time_avg[CP_SYS]); - printf ("%3.2f%% intr)\n",0.0001 * vi_req->cp_time_avg[CP_INTR]); - - printf (" CPU limits: min %3.2f%%, ", 0.0001 * vi_req->vi_cpu_min); + printf(" CPU limits: min %3.2f%%, ", 0.0001 * vi_req->vi_cpu_min); if (vi_req->vi_cpu_max == 0) vi_req->vi_cpu_max = 1000000; - printf ("max %3.2f%%, ", 0.0001 * vi_req->vi_cpu_max); - printf ("weight %d, ", vi_req->vi_cpu_weight); + printf("max %3.2f%%, ", 0.0001 * vi_req->vi_cpu_max); + printf("weight %d, ", vi_req->vi_cpu_weight); if (vi_req->vi_intr_limit) - printf ("intr limit: %3.2f%%\n", + printf("intr limit: %3.2f%%\n", 0.0001 * vi_req->vi_intr_limit); else - printf ("no intr limit\n"); -#endif + printf("no intr limit\n"); if (vi_req->vi_child_limit) - printf (" child limit: %d\n", vi_req->vi_child_limit); - printf(" Sockets (current/max): %d/%d\n", vi_req->vi_sock_count, - vi_req->vi_maxsockets); - printf (" %d network interfaces\n", vi_req->vi_if_count); + printf(" child limit: %d\n", vi_req->vi_child_limit); if (vi_req->vi_child_count) - printf (" %d child vimages\n", vi_req->vi_child_count); + printf(" %d child vimages\n", vi_req->vi_child_count); if (vi_req->vi_chroot[0]) - printf (" Chroot dir: %s\n", vi_req->vi_chroot); + printf(" Chroot dir: %s\n", vi_req->vi_chroot); +#endif } @@ -124,7 +120,7 @@ if (s == -1) goto abort; - bzero (&vi_req, sizeof (vi_req)); + bzero(&vi_req, sizeof(vi_req)); if (argc == 1) { vi_req.vi_name[0] = 0; cmd = VI_GET; @@ -162,28 +158,28 @@ if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; if (argc==1) - printf ("%s\n", vi_req.vi_name); + printf("%s\n", vi_req.vi_name); else vi_print(&vi_req); - exit (0); + exit(0); case VI_GETNEXT: while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) vi_print(&vi_req); - exit (0); + exit(0); case VI_IFACE: /* here vi_chroot stores the current ifc name */ - strncpy(vi_req.vi_chroot, argv[3], sizeof (vi_req.vi_chroot)); + strncpy(vi_req.vi_chroot, argv[3], sizeof(vi_req.vi_chroot)); if (argc >= 5) strncpy(vi_req.vi_if_xname, argv[4], - sizeof (vi_req.vi_if_xname)); + sizeof(vi_req.vi_if_xname)); else vi_req.vi_if_xname[0] = 0; if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) goto abort; printf("%s@%s\n", vi_req.vi_chroot, vi_req.vi_name); - exit (0); + exit(0); case VI_CREATE: case VI_MODIFY: @@ -198,7 +194,7 @@ * 10000; if (vi_req.vi_cpu_min > 900000) { fprintf(stderr, "error: cpumin must be between 0 and 90\n"); - exit (1); + exit(1); } } if (strcmp(argv[i], "cpumax")==0) { @@ -208,7 +204,7 @@ if (vi_req.vi_cpu_max<10000 || vi_req.vi_cpu_max>1000000) { fprintf(stderr, "error: cpumax must be between 1 and 100\n"); - exit (1); + exit(1); } } if (strcmp(argv[i], "cpuweight")==0) { @@ -217,7 +213,7 @@ if (vi_req.vi_cpu_weight<1 || vi_req.vi_cpu_weight>10) { fprintf(stderr, "error: cpuweight must be between 1 and 10\n"); - exit (1); + exit(1); } } if (strcmp(argv[i], "intr")==0) { @@ -227,7 +223,7 @@ if (vi_req.vi_intr_limit<10000 || vi_req.vi_intr_limit>1000000) { fprintf(stderr, "error: intr limit must be between 1 and 100\n"); - exit (1); + exit(1); } } if (strcmp(argv[i], "child")==0) { @@ -240,13 +236,13 @@ } if (strcmp(argv[i], "chroot")==0) { vi_req.req_action |= VI_SET_CHROOT; - strncpy (vi_req.vi_chroot, argv[i+1], - sizeof (vi_req.vi_chroot)); + strncpy(vi_req.vi_chroot, argv[i+1], + sizeof(vi_req.vi_chroot)); } } if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; - exit (0); + exit(0); case VI_SWITCHTO: strcpy(vi_req.vi_name, argv[1]); @@ -260,26 +256,26 @@ goto abort; close(s); if (argc==2) { - printf ("Switched to vimage %s\n", argv[1]); + printf("Switched to vimage %s\n", argv[1]); if ((shell=getenv("SHELL"))==NULL) - execlp ("/bin/sh",argv[0],NULL); + execlp("/bin/sh",argv[0],NULL); else - execlp (shell,argv[0],NULL); + execlp(shell,argv[0],NULL); } else - execvp (argv[2],&argv[2]); + execvp(argv[2],&argv[2]); break; case VI_DESTROY: if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; - exit (0); + exit(0); default: fprintf(stderr, "usage: %s bla bla\n", argv[0]); - exit (1); + exit(1); } abort: - perror ("Error"); + perror("Error"); exit(1); } From owner-p4-projects@FreeBSD.ORG Tue Oct 16 11:53:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58D2216A474; Tue, 16 Oct 2007 11:53: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 C0DB216A4D6 for ; Tue, 16 Oct 2007 11:52:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBAA213C468 for ; Tue, 16 Oct 2007 11:52:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9GBqxEJ016253 for ; Tue, 16 Oct 2007 11:52:59 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9GBqxbZ016249 for perforce@freebsd.org; Tue, 16 Oct 2007 11:52:59 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 16 Oct 2007 11:52:59 GMT Message-Id: <200710161152.l9GBqxbZ016249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127600 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, 16 Oct 2007 11:53:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=127600 Change 127600 by zec@zec_tca51 on 2007/10/16 11:52:31 Hold a spin mutex when updating CPU usage state and / or traversing through the list of cpu accounting containers (in statclock() we cannot hold a default mutex). This shouldn't be happening more often than ~ 130 * number_of_processors times per second, so hopefully the introduction of this new spin mutex shouldn't choke the system too much. Nuke periodic conversion from fixed point representation of CPU usage averages to integers, together with sysctls that were exposing those ints to userland. We'll be doing the conversion only when requested, and export the state to userland through the vimage API. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_clock.c#10 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#44 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#43 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#10 (text+ko) ==== @@ -480,7 +480,7 @@ atomic_add_long(&vprocg_iter->_cp_time[sel], 1); /* Per-vcpu average accounting */ - /* LOCKING!!!! XXX */ + mtx_lock_spin(&vcpu_list_mtx); tot_acc_statcalls++; if (!TD_IS_IDLETHREAD(td)) V_acc_statcalls++; @@ -500,15 +500,10 @@ V_avg1_fixp = (V_avg1_fixp + avg0 + 1) >> 1; V_avg2_fixp = (15 * V_avg2_fixp + avg0 + 15) >> 4; V_acc_statcalls = 0; - /* - * Convert fixp notation to percents for export to - * userspace via sysctls - this will go away soon. - */ - V_avg1_uint = (V_avg1_fixp * 100 + 0x8000) >> 16; - V_avg2_uint = (V_avg2_fixp * 100 + 0x8000) >> 16; } tot_acc_statcalls = 0; } + mtx_unlock_spin(&vcpu_list_mtx); #endif /* Update resource usage integrals and maximums. */ ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#44 (text+ko) ==== @@ -115,6 +115,8 @@ struct mtx vnet_list_refc_mtx; int vnet_list_refc = 0; +struct mtx vcpu_list_mtx; + #define VNET_LIST_LOCK() \ mtx_lock(&vnet_list_refc_mtx); \ while (vnet_list_refc != 0) \ @@ -131,11 +133,6 @@ static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; -SYSCTL_V_INT(V_CPU, vcpu, _kern, OID_AUTO, avg1_uint, CTLFLAG_RD, - avg1_uint, 0, "Average CPU usage"); -SYSCTL_V_INT(V_CPU, vcpu, _kern, OID_AUTO, avg2_uint, CTLFLAG_RD, - avg2_uint, 0, "Average CPU usage"); - void vnet_mod_register(vmi) const struct vnet_modinfo *vmi; { @@ -501,12 +498,14 @@ case SIOCGPVIMAGE: vi_req->vi_id = vip_r->vi_id; bcopy(&vip_r->vi_name, &vi_req->vi_name, - sizeof (vi_req->vi_name)); + sizeof (vi_req->vi_name)); bcopy(&vip_r->v_procg->_averunnable, &vi_req->averunnable, - sizeof (vi_req->averunnable)); + sizeof (vi_req->averunnable)); vi_req->vi_proc_count = vip_r->v_procg->nprocs; vi_req->vi_if_count = vip_r->v_vnet->ifccnt; vi_req->vi_sock_count = vip_r->v_vnet->sockcnt; + vi_req->cp_time_avg = + (vip_r->v_cpu->_avg2_fixp * 10000 + 0x8000) >> 16; break; case SIOCSPVIMAGE: @@ -644,12 +643,19 @@ vnet_mod_constructor(vml); CURVNET_RESTORE(); - VNET_LIST_LOCK(); /* XXX should lock other lists separately */ + VNET_LIST_LOCK(); LIST_INSERT_HEAD(&vnet_head, vnet, vnet_le); + VNET_LIST_UNLOCK(); + + /* XXX locking */ LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); + + mtx_lock_spin(&vcpu_list_mtx); LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); + mtx_unlock_spin(&vcpu_list_mtx); + + /* XXX locking */ LIST_INSERT_HEAD(&vimage_head, vip, vi_le); - VNET_LIST_UNLOCK(); vi_alloc_done: return (vip); @@ -814,6 +820,8 @@ mtx_init(&vnet_list_refc_mtx, "vnet_list_refc_mtx", NULL, MTX_DEF); cv_init(&vnet_list_condvar, "vnet_list_condvar"); + mtx_init(&vcpu_list_mtx, "vcpu_list_mtx", NULL, MTX_SPIN); + vi_alloc("default", 0); /* We MUST clear curvnet in vi_init_done before going SMP. */ ==== //depot/projects/vimage/src/sys/sys/vimage.h#43 (text+ko) ==== @@ -312,8 +312,6 @@ #define V_acc_statcalls VCPU(acc_statcalls) #define V_avg1_fixp VCPU(avg1_fixp) #define V_avg2_fixp VCPU(avg2_fixp) -#define V_avg1_uint VCPU(avg1_uint) -#define V_avg2_uint VCPU(avg2_uint) #ifdef VIMAGE void vnet_mod_register(const struct vnet_modinfo *); @@ -346,6 +344,7 @@ extern int vnet_list_refc; extern struct mtx vnet_list_refc_mtx; extern struct cv vnet_list_condvar; +extern struct mtx vcpu_list_mtx; #define VNET_LIST_REF() \ mtx_lock(&vnet_list_refc_mtx); \ @@ -423,8 +422,6 @@ u_int _acc_statcalls; /* statclocks since last avg update*/ u_int _avg1_fixp; /* "fast" avg in 16:16 bit fixedpoint */ u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */ - u_int _avg1_uint; /* (avg1_fixp * 100) >> 16 */ - u_int _avg2_uint; /* (avg2_fixp * 100) >> 16 */ #if 0 u_int cpu_min; /* Guaranteed CPU share */ @@ -456,7 +453,7 @@ char vi_name[MAXPATHLEN]; char vi_chroot[MAXPATHLEN]; char vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */ - int cp_time_avg[CPUSTATES]; + u_int cp_time_avg; struct loadavg averunnable; }; From owner-p4-projects@FreeBSD.ORG Tue Oct 16 15:39:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3778B16A421; Tue, 16 Oct 2007 15:39: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 C5A8516A418 for ; Tue, 16 Oct 2007 15:39:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFC5013C465 for ; Tue, 16 Oct 2007 15:39:13 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9GFdDU2046526 for ; Tue, 16 Oct 2007 15:39:13 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9GFdDZ6046523 for perforce@freebsd.org; Tue, 16 Oct 2007 15:39:13 GMT (envelope-from zec@FreeBSD.org) Date: Tue, 16 Oct 2007 15:39:13 GMT Message-Id: <200710161539.l9GFdDZ6046523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127602 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, 16 Oct 2007 15:39:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=127602 Change 127602 by zec@zec_tca51 on 2007/10/16 15:39:07 The vcpu list needs to be protected not only when new items are added to it, but when they get removed as well. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#45 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#45 (text+ko) ==== @@ -721,7 +721,9 @@ LIST_REMOVE(vprocg, vprocg_le); vi_free(vprocg, M_VPROCG); + mtx_lock_spin(&vcpu_list_mtx); LIST_REMOVE(vcpu, vcpu_le); + mtx_unlock_spin(&vcpu_list_mtx); vi_free(vcpu, M_VCPU); LIST_REMOVE(vip, vi_le); From owner-p4-projects@FreeBSD.ORG Tue Oct 16 17:23:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D50316A468; Tue, 16 Oct 2007 17:23: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 E912416A417; Tue, 16 Oct 2007 17:23:36 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe13.swip.net [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id 5B5EC13C465; Tue, 16 Oct 2007 17:23:35 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] Received: from [85.19.218.45] (account mc467741@c2i.net [85.19.218.45] verified) by mailfe13.swip.net (CommuniGate Pro SMTP 5.1.10) with ESMTPA id 260585671; Tue, 16 Oct 2007 18:23:33 +0200 From: Hans Petter Selasky To: Alfred Perlstein Date: Tue, 16 Oct 2007 18:23:59 +0200 User-Agent: KMail/1.9.7 References: <200709231625.l8NGPhaR097038@repoman.freebsd.org> <200709232113.34718.hselasky@freebsd.org> <20071016043133.GW31826@elvis.mu.org> In-Reply-To: <20071016043133.GW31826@elvis.mu.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200710161823.59940.hselasky@freebsd.org> Cc: Perforce Change Reviews , "Constantine A. Murenin" Subject: Re: PERFORCE change 126745 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, 16 Oct 2007 17:23:37 -0000 On Tuesday 16 October 2007, Alfred Perlstein wrote: > * Hans Petter Selasky [070923 13:13] wrote: > > Hi Constantine, > > > > Thanks for your input and I _know_ that my code is not 100% style > > compliant. Most of the style misbehaves are probably there due to the way > > my "xemacs" autoformatting behaves. And I love curly brackets and > > parenthesis, by the way :-) > > > > My plan is to clean up all the style stuff by a small C-program in the > > end, because doing it by hand is waste of my time. Probably it will take > > less time to write that program than the actual manual edit when we are > > talking about doing alot of edits. It wonders me if such a tool already > > exists, because the code is technically OK. > > > > Anyone that wants to be a little more constructive and point towards > > where the FreeBSD style transformer program is? I assume it would be > > extremely useful to everyone that is forced to use multiple different > > styles depending on what project they are contributing to, like me. Then > > before commit I will run that script and verify the differences. And > > that's it. > > > > --HPS > > Hans, one of the issues with doing such changes at the end is that it > effectively obliterates the ability to "cvs annotate" your code. I'm > sure perforce has an 'annotate' command as well. > > I would suggest that you find/fix the style now and apply it now rather > than later as the longer you wait, the more history you obliterate. Hi Alfred, I never heard about the annotate command. Can you explain a little bit how it works? I will do as you want and write that "style converter" first, before any other changes. I expect it might take a little bit time, something like a week. --HPS From owner-p4-projects@FreeBSD.ORG Tue Oct 16 17:56:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F0C716A46D; Tue, 16 Oct 2007 17: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 3721B16A418; Tue, 16 Oct 2007 17:56:36 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from mojo.ru (mojo.ru [84.252.152.63]) by mx1.freebsd.org (Postfix) with ESMTP id 9731D13C455; Tue, 16 Oct 2007 17:56:35 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from [192.168.0.16] (nc-76-6-108-199.dhcp.embarqhsd.net [76.6.108.199]) (authenticated bits=0) by mojo.ru (8.12.11.20060308/8.12.10) with ESMTP id l9GHukSV005492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Oct 2007 21:56:48 +0400 Message-ID: <4714FB43.8000205@FreeBSD.org> Date: Tue, 16 Oct 2007 13:56:19 -0400 From: "Constantine A. Murenin" Organization: Google Summer of Code 2007 Student @ The FreeBSD Project User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.7.5) Gecko/20041217 X-Accept-Language: en-gb, en-gb-oed, en, en-us, ru, ru-ru, ru-su MIME-Version: 1.0 To: Hans Petter Selasky References: <200709231625.l8NGPhaR097038@repoman.freebsd.org> <200709232113.34718.hselasky@freebsd.org> <20071016043133.GW31826@elvis.mu.org> <200710161823.59940.hselasky@freebsd.org> In-Reply-To: <200710161823.59940.hselasky@freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Alfred Perlstein , "Constantine A. Murenin" Subject: Re: PERFORCE change 126745 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, 16 Oct 2007 17:56:37 -0000 On 16/10/2007 12:23, Hans Petter Selasky wrote: > On Tuesday 16 October 2007, Alfred Perlstein wrote: > >>* Hans Petter Selasky [070923 13:13] wrote: >> >>>Hi Constantine, >>> >>>Thanks for your input and I _know_ that my code is not 100% style >>>compliant. Most of the style misbehaves are probably there due to the way >>>my "xemacs" autoformatting behaves. And I love curly brackets and >>>parenthesis, by the way :-) >>> >>>My plan is to clean up all the style stuff by a small C-program in the >>>end, because doing it by hand is waste of my time. Probably it will take >>>less time to write that program than the actual manual edit when we are >>>talking about doing alot of edits. It wonders me if such a tool already >>>exists, because the code is technically OK. >>> >>>Anyone that wants to be a little more constructive and point towards >>>where the FreeBSD style transformer program is? I assume it would be >>>extremely useful to everyone that is forced to use multiple different >>>styles depending on what project they are contributing to, like me. Then >>>before commit I will run that script and verify the differences. And >>>that's it. >>> >>>--HPS >> >>Hans, one of the issues with doing such changes at the end is that it >>effectively obliterates the ability to "cvs annotate" your code. I'm >>sure perforce has an 'annotate' command as well. >> >>I would suggest that you find/fix the style now and apply it now rather >>than later as the longer you wait, the more history you obliterate. > > > Hi Alfred, > > I never heard about the annotate command. Can you explain a little bit how it > works? > > I will do as you want and write that "style converter" first, before any other > changes. I expect it might take a little bit time, something like a week. > > --HPS The cvs annotate command displays which line was introduced in which revision and who introduced it. Just run `cvs annotate` on any file. Sometimes this feature is called CVS Blame in web-interfaces: http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/intl/locale/src/nsScriptableDateFormat.cpp&rev=1.26 Cheers, Constantine. From owner-p4-projects@FreeBSD.ORG Wed Oct 17 01:11:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D9D016A421; Wed, 17 Oct 2007 01:11: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 2308216A41A for ; Wed, 17 Oct 2007 01:11:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10C6813C448 for ; Wed, 17 Oct 2007 01:11:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H1B6gX066219 for ; Wed, 17 Oct 2007 01:11:06 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H1AxGb066196 for perforce@freebsd.org; Wed, 17 Oct 2007 01:10:59 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 17 Oct 2007 01:10:59 GMT Message-Id: <200710170110.l9H1AxGb066196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127616 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: Wed, 17 Oct 2007 01:11:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=127616 Change 127616 by kmacy@kmacy_home:ethng on 2007/10/17 01:10:11 IFC 127611 Affected files ... .. //depot/projects/ethng/src/Makefile.inc1#4 integrate .. //depot/projects/ethng/src/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/FILES#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/INSTALL#2 delete .. //depot/projects/ethng/src/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/README.dag#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/TODO#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/VERSION#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/configure#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/ethng/src/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/ethng/src/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/pf.h#2 delete .. //depot/projects/ethng/src/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/ethng/src/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/ethng/src/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/FILES#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/README#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/af.c#1 branch .. //depot/projects/ethng/src/contrib/tcpdump/af.h#1 branch .. //depot/projects/ethng/src/contrib/tcpdump/bootp.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/configure#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/ieee802_11_radio.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/nameser.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/pf.h#2 delete .. //depot/projects/ethng/src/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/ethng/src/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-ppp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/ethng/src/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/ethng/src/contrib/tcpdump/util.c#2 integrate .. //depot/projects/ethng/src/contrib/tcsh/sh.c#2 integrate .. //depot/projects/ethng/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/ethng/src/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/ethng/src/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/ethng/src/etc/Makefile#3 integrate .. //depot/projects/ethng/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#6 integrate .. //depot/projects/ethng/src/etc/rc.d/sensorsd#2 delete .. //depot/projects/ethng/src/etc/sensorsd.conf#2 delete .. //depot/projects/ethng/src/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/ethng/src/lib/libc/gen/sysctl.3#3 integrate .. //depot/projects/ethng/src/lib/libc/locale/utf8.c#3 integrate .. //depot/projects/ethng/src/lib/libpcap/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libpcap/config.h#2 integrate .. //depot/projects/ethng/src/lib/libstand/Makefile#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/ethng/src/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/ethng/src/sbin/sysctl/sysctl.8#4 integrate .. //depot/projects/ethng/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/ethng/src/share/man/man4/Makefile#5 integrate .. //depot/projects/ethng/src/share/man/man4/coretemp.4#3 integrate .. //depot/projects/ethng/src/share/man/man4/it.4#2 delete .. //depot/projects/ethng/src/share/man/man4/lm.4#2 delete .. //depot/projects/ethng/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/ethng/src/share/man/man9/Makefile#5 integrate .. //depot/projects/ethng/src/share/man/man9/sensor_attach.9#2 delete .. //depot/projects/ethng/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/ethng/src/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/ethng/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/ethng/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/ethng/src/sys/conf/files#7 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#6 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#4 integrate .. //depot/projects/ethng/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/ethng/src/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/ethng/src/sys/dev/it/it.c#2 delete .. //depot/projects/ethng/src/sys/dev/it/itvar.h#2 delete .. //depot/projects/ethng/src/sys/dev/lm/lm78.c#2 delete .. //depot/projects/ethng/src/sys/dev/lm/lm78_isa.c#2 delete .. //depot/projects/ethng/src/sys/dev/lm/lm78var.h#2 delete .. //depot/projects/ethng/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/ethng/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/ethng/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/ethng/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/ethng/src/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/ethng/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/ethng/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_sensors.c#2 delete .. //depot/projects/ethng/src/sys/kern/sched_ule.c#6 integrate .. //depot/projects/ethng/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/ethng/src/sys/modules/Makefile#5 integrate .. //depot/projects/ethng/src/sys/modules/it/Makefile#2 delete .. //depot/projects/ethng/src/sys/modules/lm/Makefile#2 delete .. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/ethng/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/pci/intpm.c#2 integrate .. //depot/projects/ethng/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#5 integrate .. //depot/projects/ethng/src/sys/sys/sensors.h#2 delete .. //depot/projects/ethng/src/sys/sys/sysctl.h#3 integrate .. //depot/projects/ethng/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/ethng/src/sys/vm/vm_param.h#2 integrate .. //depot/projects/ethng/src/usr.bin/locate/locate/updatedb.sh#2 integrate .. //depot/projects/ethng/src/usr.bin/systat/Makefile#3 integrate .. //depot/projects/ethng/src/usr.bin/systat/cmdtab.c#3 integrate .. //depot/projects/ethng/src/usr.bin/systat/extern.h#3 integrate .. //depot/projects/ethng/src/usr.bin/systat/sensors.c#2 delete .. //depot/projects/ethng/src/usr.bin/systat/systat.1#3 integrate .. //depot/projects/ethng/src/usr.sbin/Makefile#6 integrate .. //depot/projects/ethng/src/usr.sbin/sensorsd/Makefile#2 delete .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.8#2 delete .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.c#2 delete .. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.conf.5#2 delete .. //depot/projects/ethng/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate .. //depot/projects/ethng/src/usr.sbin/tcpdump/tcpdump/config.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/wpa/l2_packet.c#2 integrate Differences ... ==== //depot/projects/ethng/src/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.588 2007/10/09 23:31:09 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -578,7 +578,12 @@ date echo egrep find grep install-info \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ - cp `which $$prog` ${INSTALLTMP}; \ + if progpath=`which $$prog`; then \ + cp $$progpath ${INSTALLTMP}; \ + else \ + echo "Required install tool $$prog not found" >&2; \ + exit 1; \ + fi; \ done ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} ==== //depot/projects/ethng/src/contrib/libpcap/CHANGES#2 (text+ko) ==== @@ -1,4 +1,88 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL) + +Mon. September 10, 2007. ken@xelerance.com. Summary for 0.9.8 libpcap release + Change build process to put public libpcap headers into pcap subir + DLT: Add value for IPMI IPMB packets + DLT: Add value for u10 Networks boards + Require for pf definitions - allows reading of pflog formatted + libpcap files on an OS other than where the file was generated + +Wed. July 23, 2007. mcr@xelerance.com. Summary for 0.9.7 libpcap release + + FIXED version file to be 0.9.7 instead of 0.9.5. + added flags/configuration for cloning bpf device. + added DLT_MTP2_WITH_PHDR support (PPI) + "fix" the "memory leak" in icode_to_fcode() -- documentation bug + Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/ + introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS. + Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added. + check for IPv4 and IPv6, even for DLT_RAW + add support for DLT_JUNIPER_ISM + Pick up changes from NetBSD: many from tron, christos, drochner + Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala. + Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header + +Wed. April 25, 2007. ken@xelerance.com. Summary for 0.9.6 libpcap release + + Put the public libpcap headers into a pcap subdirectory in both the + source directory and the target include directory, and have include + files at the top-level directory to include those headers, for + backwards compatibility. + Add Bluetooth support + Add USB capturing support on Linux + Add support for the binary USB sniffing interface in Linux + Add support for new FreeBSD BIOCSDIRECTION ioctl + Add additional filter operations for 802.11 frame types + Add support for filtering on MTP2 frame types + Propagate some changes from the main branch, so the x.9 branch has + all the DLT_ and LINKTYPE_ values that the main branch does + Reserved a DLT_ and SAVEFILE_ value for PPI (Per Packet Info) + encapsulated packets + Add LINKTYPE_ for IEEE 802.15.4, with address fields padded as done + by Linux drivers + Add LINKTYPE_ value corresponding to DLT_IEEE802_16_MAC_CPS. + Add DLT for IEEE 802.16 (WiMAX) MAC Common Part Sublayer + Add DLT for Bluetooth HCI UART transport layer + When building a shared library, build with "-fPIC" on Linux to support x86_64 + Link with "$(CC) -shared" rather than "ld -shared" when building a + ".so" shared library + Add support for autoconf 2.60 + Fixes to discard unread packets when changing filters + Changes to handle name changes in the DAG library resulting from + switching to libtool. + Add support for new DAG ERF types. + Add an explicit "-ldag" when building the shared library, so the DAG + library dependency is explicit. + Mac OSX fixes for dealing with "wlt" devices + Fixes in add_or_find_if() & pcap_findalldevs() to optimize generating + device lists + Fixed a bug in pcap_open_live(). The return value of PacketSetHwFilter + was not checked. + +Tue. September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release + + Support for LAPD frames with vISDN + Support for ERF on channelized T1/E1 cards via DAG API + Fix capitalization that caused issues crossc compiling on Linux + Better failure detection on PacketGetAdapterNames() + Fixes for MPLS packet generation (link layer) + OP_PACKET now matches the beginning of the packet, instead of + beginning+link-layer + Add DLT/LINKTYPE for carrying FRF.16 Multi-link Frame Relay + Fix allocation of buffer for list of link-layer types + Added a new DLT and LINKTYPE value for ARINC 653 Interpartition Communcation Messages + Fixed a typo in a DLT value: it should start with DLT_ and not LINKTYPE_ + Redefined DLT_CAN20B and LINKTYPE_CAN20B as #190 (as this is the right value for CAN). + Added definition for DLT_A429 and LINKTYPE_A429 as #184. + Added a new DLT and LINKTYPE value for CAN v2.0B frames. + Add support for DLT_JUNIPER_VP. + Don't double-count received packets on Linux systems that + support the PACKET_STATISTICS getsockopt() argument on + PF_PACKET sockets. + Add support for DLT_IEEE802_11 and DLT_IEEE802_11_RADIO link + layers in Windows + Add support to build libpcap.lib and wpcap.dll under Cygnus and + MingW32. Mon. September 5, 2005. ken@xelerance.com. Summary for 0.9.4 libpcap release ==== //depot/projects/ethng/src/contrib/libpcap/CREDITS#2 (text+ko) ==== @@ -23,6 +23,7 @@ Chris G. Demetriou Chris Lightfoot Chris Pepper + Daniele Orlandi Darren Reed David Kaelbling David Young @@ -31,6 +32,7 @@ Dug Song Eric Anderson Erik de Castro Lopo + Florent Drouin Franz Schaefer Gianluca Varenni Gilbert Hoyek @@ -50,6 +52,7 @@ John Bankier Jon Lindgren Juergen Schoenwaelder + Jung-uk Kim Kazushi Sugyo Klaus Klein Koryn Grant @@ -63,12 +66,14 @@ Mark Pizzolato Martin Husemann Matthew Luckie + Max Laier Mike Kershaw Mike Wiacek Monroe Williams Nicolas Dade Octavian Cerna Olaf Kirch + Ollie Wild Onno van der Linden Patrick Marie Paul Mundt @@ -78,6 +83,7 @@ Peter Jeremy Phil Wood Rafal Maszkowski + Rick Jones Scott Barron Scott Gifford @@ -85,6 +91,7 @@ Shaun Clowes Solomon Peachy Stefan Hudson + Stephen Donnelly Takashi Yamamoto Tanaka Shin-ya Tony Li ==== //depot/projects/ethng/src/contrib/libpcap/FILES#2 (text+ko) ==== @@ -97,7 +97,6 @@ pcap.3 pcap.c pcap.h -pf.h ppp.h savefile.c scanner.l ==== //depot/projects/ethng/src/contrib/libpcap/INSTALL.txt#2 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -373,7 +373,6 @@ pcap.3 - manual entry pcap.c - pcap utility routines pcap.h - public libpcap definitions -pf.h - OpenBSD DLT_PFLOG definitions ppp.h - Point to Point Protocol definitions rawss7.h - information on DLT_ types for SS7 savefile.c - offline support ==== //depot/projects/ethng/src/contrib/libpcap/Makefile.in#2 (text+ko) ==== @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -46,7 +46,9 @@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ LIBS = @V_LIBS@ +DAGLIBS = @DAGLIBS@ DYEXT = @DYEXT@ +PROG=libpcap # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -112,7 +114,7 @@ # libpcap.so: $(OBJ) @rm -f $@ - ld -shared -o $@.`cat VERSION` $(OBJ) + $(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS) # the following rule succeeds, but the result is untested. libpcap.dylib: $(OBJ) @@ -216,19 +218,10 @@ RPMVERSION=`cat VERSION | sed s/-.*//g`; \ sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $< > $@ -tar: Makefile packaging/pcap.spec - @cwd=`pwd` ; dir=`basename $$cwd` ; name=libpcap-`cat VERSION` ; \ - list="" ; tar="tar chf" ; \ - for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \ - echo \ - "rm -f ../$$name; ln -s $$dir ../$$name" ; \ - rm -f ../$$name; ln -s $$dir ../$$name ; \ - echo \ - "(cd .. ; $$tar - [lots of files]) | gzip -c > /tmp/$$name.tar.gz" ; \ - (cd .. ; $$tar - $$list) | gzip -c > /tmp/$$name.tar.gz ; \ - echo \ - "rm -f ../$$name" ; \ - rm -f ../$$name +releasetar: + @cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \ + list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \ + tar -c -z -f $$name.tar.gz $$name/. ; depend: $(GENSRC) $(GENHDR) bpf_filter.c ./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) ==== //depot/projects/ethng/src/contrib/libpcap/README.dag#2 (text+ko) ==== @@ -77,11 +77,32 @@ include packets that would have been dropped by the filter). The RX stream buffer size is user configurable outside libpcap, typically 16-512MB. -pcap_get_selectable_fd() is not supported, DAG cards do not support +pcap_get_selectable_fd() is not supported, as DAG cards do not support poll/select methods. pcap_inject() and pcap_sendpacket() are not supported. +Some DAG cards now support capturing to multiple virtual interfaces, called +streams. Capture streams have even numbers. These are available via libpcap +as separate interfaces, e.g. dag0:0, dag0:2, dag0:4 etc. dag0:0 is the same +as dag0. These are visible via pcap_findalldevs(). + +libpcap now does NOT set the card's hardware snaplen (slen). This must now be +set using the appropriate DAG coniguration program, e.g. dagthree, dagfour, +dagsix, dagconfig. This is because the snaplen is currently shared between +all of the streams. In future this may change if per-stream slen is +implemented. + +DAG cards by default capture entire packets including the L2 +CRC/FCS. If the card is not configured to discard the CRC/FCS, this +can confuse applications that use libpcap if they're not prepared for +packets to have an FCS. Libpcap now reads the environment variable +ERF_FCS_BITS to determine how many bits of CRC/FCS to strip from the +end of the captured frame. This defaults to 32 for use with +Ethernet. If the card is configured to strip the CRC/FCS, then set +ERF_FCS_BITS=0. If used with a HDLC/PoS/PPP/Frame Relay link with 16 +bit CRC/FCS, then set ERF_FCS_BITS=16. + ---------------------------------------------------------------------- Please submit bug reports via . ==== //depot/projects/ethng/src/contrib/libpcap/TODO#2 (text+ko) ==== @@ -15,13 +15,6 @@ style (okay, you can guess that by looking at the code) and a guide for what needs to be documented. -Linux kernel interface - -- Currently there is a race condition in that a socket is activated at the - same time it is opened - before applying a filter. This has to - be corrected so that capture starts when pcap_read is called for the - first time. - Less urgent items ----------------- ==== //depot/projects/ethng/src/contrib/libpcap/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9.4 +0.9.8 ==== //depot/projects/ethng/src/contrib/libpcap/bpf_image.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003/11/15 23:23:57 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26.2.1 2007/06/11 09:52:04 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -43,7 +43,7 @@ int n; { int v; - char *fmt, *op; + const char *fmt, *op; static char image[256]; char operand[64]; ==== //depot/projects/ethng/src/contrib/libpcap/config.h.in#2 (text+ko) ==== @@ -10,9 +10,15 @@ /* Enable optimizer debugging */ #undef BDEBUG +/* define if you have a cloning BPF device */ +#undef HAVE_CLONING_BPF + /* define if you have the DAG API */ #undef HAVE_DAG_API +/* define if you have dag_get_erf_types() */ +#undef HAVE_DAG_GET_ERF_TYPES + /* define if you have streams capable DAG API */ #undef HAVE_DAG_STREAMS_API @@ -50,9 +56,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NET_PFVAR_H + /* if there's an os_proto.h */ #undef HAVE_OS_PROTO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + /* define if you have a /proc/net/dev */ #undef HAVE_PROC_NET_DEV ==== //depot/projects/ethng/src/contrib/libpcap/configure#2 (text+ko) ==== @@ -1,37 +1,101 @@ #! /bin/sh -# From configure.in Revision: 1.120.2.7 . +# From configure.in Revision: 1.120.2.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.61. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -42,21 +106,22 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -64,206 +129,447 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. fi +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +test \$exitcode = 0) || { (exit 1); exit 1; } - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 17 02:18:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F232B16A420; Wed, 17 Oct 2007 02:18:21 +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 A433D16A41A for ; Wed, 17 Oct 2007 02:18:21 +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 8FC7E13C455 for ; Wed, 17 Oct 2007 02:18:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H2ILac070849 for ; Wed, 17 Oct 2007 02:18:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H2ILn6070846 for perforce@freebsd.org; Wed, 17 Oct 2007 02:18:21 GMT (envelope-from jb@freebsd.org) Date: Wed, 17 Oct 2007 02:18:21 GMT Message-Id: <200710170218.l9H2ILn6070846@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 127617 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: Wed, 17 Oct 2007 02:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=127617 Change 127617 by jb@jb_freebsd1 on 2007/10/17 02:17:51 IFopensolaris Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/cmd/sgs/include/debug.h#4 integrate Differences ... ==== //depot/projects/opensolaris/contrib/opensolaris/cmd/sgs/include/debug.h#4 (text) ==== @@ -86,6 +86,7 @@ #define DBG_DLSYM_DEFAULT 2 #define DBG_DLSYM_SELF 3 #define DBG_DLSYM_PROBE 4 +#define DBG_DLSYM_SINGLETON 5 #define DBG_DLCLOSE_NULL 0 #define DBG_DLCLOSE_IGNORE 1 @@ -141,6 +142,11 @@ #define DBG_NL_STD 0 /* newline controllers - standard and */ #define DBG_NL_FRC 2 /* forced. */ +#define DBG_BNDREJ_NODIR 0 /* bind rejected, direct to nodirect */ +#define DBG_BNDREJ_SINGLE 1 /* bind rejected, singleton without */ + /* default search model */ +#define DBG_BNDREJ_NUM DBG_BNDREJ_SINGLE + /* * Define a debug descriptor, and a user macro that inspects the descriptor as * a means of triggering a class of diagnostic output. @@ -205,6 +211,7 @@ #define Dbg_bind_plt_summary Dbg64_bind_plt_summary #define Dbg_bind_pltpad_from Dbg64_bind_pltpad_from #define Dbg_bind_pltpad_to Dbg64_bind_pltpad_to +#define Dbg_bind_reject Dbg64_bind_reject #define Dbg_bind_weak Dbg64_bind_weak #define Dbg_cap_val_hw1 Dbg64_cap_val_hw1 @@ -403,6 +410,7 @@ #define Dbg_bind_global Dbg32_bind_global #define Dbg_bind_plt_summary Dbg32_bind_plt_summary +#define Dbg_bind_reject Dbg32_bind_reject #define Dbg_bind_weak Dbg32_bind_weak #define Dbg_cap_val_hw1 Dbg32_cap_val_hw1 @@ -621,6 +629,7 @@ extern void Dbg_bind_pltpad_from(Rt_map *, Addr, const char *); extern void Dbg_bind_pltpad_to(Rt_map *, Addr, const char *, const char *); #endif +extern void Dbg_bind_reject(Rt_map *, Rt_map *, const char *, int); extern void Dbg_bind_weak(Rt_map *, Addr, Addr, const char *); extern void Dbg_cap_hw_candidate(Lm_list *, const char *); From owner-p4-projects@FreeBSD.ORG Wed Oct 17 02:19:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2241716A420; Wed, 17 Oct 2007 02:19: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 DB7EE16A417 for ; Wed, 17 Oct 2007 02:19:22 +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 C5CF813C457 for ; Wed, 17 Oct 2007 02:19:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H2JM5t070926 for ; Wed, 17 Oct 2007 02:19:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H2JM3H070923 for perforce@freebsd.org; Wed, 17 Oct 2007 02:19:22 GMT (envelope-from jb@freebsd.org) Date: Wed, 17 Oct 2007 02:19:22 GMT Message-Id: <200710170219.l9H2JM3H070923@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 127618 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: Wed, 17 Oct 2007 02:19:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127618 Change 127618 by jb@jb_freebsd1 on 2007/10/17 02:18:38 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#8 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#8 (text) ==== @@ -86,6 +86,7 @@ #define DBG_DLSYM_DEFAULT 2 #define DBG_DLSYM_SELF 3 #define DBG_DLSYM_PROBE 4 +#define DBG_DLSYM_SINGLETON 5 #define DBG_DLCLOSE_NULL 0 #define DBG_DLCLOSE_IGNORE 1 @@ -141,6 +142,11 @@ #define DBG_NL_STD 0 /* newline controllers - standard and */ #define DBG_NL_FRC 2 /* forced. */ +#define DBG_BNDREJ_NODIR 0 /* bind rejected, direct to nodirect */ +#define DBG_BNDREJ_SINGLE 1 /* bind rejected, singleton without */ + /* default search model */ +#define DBG_BNDREJ_NUM DBG_BNDREJ_SINGLE + /* * Define a debug descriptor, and a user macro that inspects the descriptor as * a means of triggering a class of diagnostic output. @@ -205,6 +211,7 @@ #define Dbg_bind_plt_summary Dbg64_bind_plt_summary #define Dbg_bind_pltpad_from Dbg64_bind_pltpad_from #define Dbg_bind_pltpad_to Dbg64_bind_pltpad_to +#define Dbg_bind_reject Dbg64_bind_reject #define Dbg_bind_weak Dbg64_bind_weak #define Dbg_cap_val_hw1 Dbg64_cap_val_hw1 @@ -403,6 +410,7 @@ #define Dbg_bind_global Dbg32_bind_global #define Dbg_bind_plt_summary Dbg32_bind_plt_summary +#define Dbg_bind_reject Dbg32_bind_reject #define Dbg_bind_weak Dbg32_bind_weak #define Dbg_cap_val_hw1 Dbg32_cap_val_hw1 @@ -621,6 +629,7 @@ extern void Dbg_bind_pltpad_from(Rt_map *, Addr, const char *); extern void Dbg_bind_pltpad_to(Rt_map *, Addr, const char *, const char *); #endif +extern void Dbg_bind_reject(Rt_map *, Rt_map *, const char *, int); extern void Dbg_bind_weak(Rt_map *, Addr, Addr, const char *); extern void Dbg_cap_hw_candidate(Lm_list *, const char *); From owner-p4-projects@FreeBSD.ORG Wed Oct 17 02:33:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D1F216A468; Wed, 17 Oct 2007 02:33: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 502E716A417 for ; Wed, 17 Oct 2007 02:33:48 +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 39B1013C458 for ; Wed, 17 Oct 2007 02:33:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H2XmvP071759 for ; Wed, 17 Oct 2007 02:33:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H2XbpS071756 for perforce@freebsd.org; Wed, 17 Oct 2007 02:33:37 GMT (envelope-from jb@freebsd.org) Date: Wed, 17 Oct 2007 02:33:37 GMT Message-Id: <200710170233.l9H2XbpS071756@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 127619 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: Wed, 17 Oct 2007 02:33:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=127619 Change 127619 by jb@jb_freebsd1 on 2007/10/17 02:33:25 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#45 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#31 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#19 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#40 integrate .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd1.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd10.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd11.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd12.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd13.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd2.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd3.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd4.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd5.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd6.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd7.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd8.png#1 branch .. //depot/projects/dtrace/doc/share/images/books/handbook/virtualization/virtualpc-freebsd9.png#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/Makefile#6 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/book.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/chapters.ent#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/virtualization/Makefile#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/virtualization/chapter.sgml#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/books/porters-handbook/book.sgml#9 integrate .. //depot/projects/dtrace/ports/LEGAL#23 integrate .. //depot/projects/dtrace/ports/MOVED#44 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#13 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#18 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/errorlogs/index.shtml#1 branch .. //depot/projects/dtrace/ports/Tools/portbuild/portbuild.conf#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackagestats#8 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeindex#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/mkbindist#5 integrate .. //depot/projects/dtrace/ports/Tools/scripts/getpr#3 integrate .. //depot/projects/dtrace/ports/UPDATING#36 integrate .. //depot/projects/dtrace/src/Makefile.inc1#30 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#23 integrate .. //depot/projects/dtrace/src/UPDATING#17 integrate .. //depot/projects/dtrace/src/cddl/lib/Makefile#8 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/dtrace/src/contrib/less/NEWS#7 integrate .. //depot/projects/dtrace/src/contrib/less/README#7 integrate .. //depot/projects/dtrace/src/contrib/less/charset.c#7 integrate .. //depot/projects/dtrace/src/contrib/less/less.man#7 integrate .. //depot/projects/dtrace/src/contrib/less/less.nro#7 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.man#5 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.nro#5 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.man#7 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.nro#7 integrate .. //depot/projects/dtrace/src/contrib/less/version.c#7 integrate .. //depot/projects/dtrace/src/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/FILES#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/INSTALL#4 delete .. //depot/projects/dtrace/src/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/README.dag#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/TODO#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/VERSION#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/configure#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/configure.in#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/fad-win32.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/inet.c#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/lbl/gnuc.h#4 delete .. //depot/projects/dtrace/src/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/dtrace/src/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/dtrace/src/contrib/libpcap/pcap-bpf.c#6 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/pf.h#4 delete .. //depot/projects/dtrace/src/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/dtrace/src/contrib/libpcap/scanner.l#5 integrate .. //depot/projects/dtrace/src/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/FILES#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/README#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/af.c#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/af.h#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/bootp.h#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/configure#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/dccp.h#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ieee802_11.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ieee802_11_radio.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/nameser.h#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/netdissect.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/pf.h#4 delete .. //depot/projects/dtrace/src/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-bfd.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-dccp.c#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ipfc.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-juniper.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ldp.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-llc.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-lmp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-lspping.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/print-ospf.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-pflog.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-rsvp.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump-stdinc.h#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-capX.out#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tests/print-capXX.out#3 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/dtrace/src/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/dtrace/src/contrib/tcpdump/util.c#4 integrate .. //depot/projects/dtrace/src/contrib/tcsh/sh.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/dtrace/src/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/dtrace/src/etc/Makefile#8 integrate .. //depot/projects/dtrace/src/etc/defaults/devfs.rules#5 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#24 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#13 integrate .. //depot/projects/dtrace/src/etc/rc.d/early.sh#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ppp#6 integrate .. //depot/projects/dtrace/src/etc/rc.subr#14 integrate .. //depot/projects/dtrace/src/gnu/lib/csu/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/diff/Makefile#5 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#10 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/sort/Makefile#4 integrate .. //depot/projects/dtrace/src/include/_ctype.h#4 integrate .. //depot/projects/dtrace/src/include/ctype.h#4 integrate .. //depot/projects/dtrace/src/include/wctype.h#4 integrate .. //depot/projects/dtrace/src/lib/Makefile#13 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_cpio.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/dtrace/src/lib/libc/arm/string/ffs.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/arm/string/memcpy.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/arm/string/memset.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/Symbol.map#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/sysctl.3#6 integrate .. //depot/projects/dtrace/src/lib/libc/locale/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/big5.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/euc.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/gb18030.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/gb2312.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/gbk.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/isctype.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/iswctype.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/mskanji.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/locale/none.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/setrunelocale.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/utf8.c#4 integrate .. //depot/projects/dtrace/src/lib/libkse/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/context.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/enter_uts.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/arm/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/context.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_getcontext.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/context.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/enter_uts.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.s#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/context.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/assym.s#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#2 integrate .. //depot/projects/dtrace/src/lib/libkse/kse.map#1 branch .. //depot/projects/dtrace/src/lib/libkse/pthread.map#2 delete .. //depot/projects/dtrace/src/lib/libkse/support/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/support/thr_support.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/sys/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/Makefile#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/README#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/guard_b.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/guard_b.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/guard_s.pl#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/hello_b.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/hello_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/hello_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/hello_s.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/propagate_s.pl#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sem_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sem_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.exp#2 integrate .. //depot/projects/dtrace/src/lib/libkse/test/verify#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_autoinit.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_printf.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/dtrace/src/lib/libpcap/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libpcap/config.h#4 integrate .. //depot/projects/dtrace/src/lib/libpthread/Makefile#8 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/amd64/context.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/amd64/enter_uts.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/amd64/include/pthread_md.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/arm/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/arm/arm/context.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/arm/arm/pthread_md.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/arm/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/arm/include/pthread_md.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/i386/pthread_md.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/i386/thr_enter_uts.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/i386/thr_getcontext.S#5 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/i386/include/pthread_md.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/ia64/context.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/ia64/enter_uts.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/ia64/include/pthread_md.h#5 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/include/pthread_md.h#5 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/powerpc/assym.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/powerpc/assym.s#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/powerpc/context.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/include/atomic_ops.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/include/pthread_md.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/sparc64/assym.s#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#4 delete .. //depot/projects/dtrace/src/lib/libpthread/pthread.map#8 delete .. //depot/projects/dtrace/src/lib/libpthread/support/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/support/thr_support.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/sys/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/sys/lock.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/sys/lock.h#4 delete .. //depot/projects/dtrace/src/lib/libpthread/sys/thr_error.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/Makefile#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/README#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/guard_b.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/guard_b.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/guard_s.pl#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/hello_b.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/hello_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/hello_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/hello_s.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/join_leak_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/join_leak_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/mutex_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/mutex_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/propagate_s.pl#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sem_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sem_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sigsuspend_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sigsuspend_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sigwait_d.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/sigwait_d.exp#4 delete .. //depot/projects/dtrace/src/lib/libpthread/test/verify#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/Makefile.inc#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_accept.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_aio_suspend.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_atfork.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_destroy.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_get_np.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getdetachstate.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getguardsize.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getinheritsched.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getschedparam.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getschedpolicy.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getscope.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getstack.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getstackaddr.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_getstacksize.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_init.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setdetachstate.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setguardsize.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setinheritsched.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setschedparam.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setschedpolicy.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setscope.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setstack.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setstackaddr.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_attr_setstacksize.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_autoinit.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_barrier.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_barrierattr.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_cancel.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_clean.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_close.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_concurrency.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_cond.c#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_condattr_destroy.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_condattr_init.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_condattr_pshared.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_connect.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_creat.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_create.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_detach.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_equal.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_execve.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_exit.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_fcntl.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_find_thread.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_fork.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_fsync.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_getprio.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_getschedparam.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_info.c#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_init.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_join.c#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_kern.c#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_kill.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_main_np.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mattr_init.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mattr_kind_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mattr_pshared.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_msync.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_multi_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex.c#9 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex_prioceiling.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutex_protocol.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_mutexattr_destroy.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_nanosleep.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_once.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_open.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_pause.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_poll.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_printf.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_priority_queue.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_private.h#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_pselect.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_pspinlock.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_raise.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_read.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_readv.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_resume_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rtld.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlock.c#7 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_rwlockattr.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_select.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_self.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sem.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_seterrno.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_setprio.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_setschedparam.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sig.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigaction.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigaltstack.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigmask.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigpending.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigprocmask.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigsuspend.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sigwait.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_single_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_sleep.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_spec.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_spinlock.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_stack.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_suspend_np.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_switch_np.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_symbols.c#6 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_system.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_tcdrain.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_vfork.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_wait.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_wait4.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_waitpid.c#4 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_write.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_writev.c#5 delete .. //depot/projects/dtrace/src/lib/libpthread/thread/thr_yield.c#5 delete .. //depot/projects/dtrace/src/lib/libstand/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libthr/Makefile#11 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_once.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_pspinlock.c#7 integrate .. //depot/projects/dtrace/src/lib/libutil/pidfile.3#4 integrate .. //depot/projects/dtrace/src/lib/libutil/pidfile.c#6 integrate .. //depot/projects/dtrace/src/libexec/rtld-elf/sparc64/reloc.c#6 integrate .. //depot/projects/dtrace/src/release/Makefile#12 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/dtrace/src/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/dtrace/src/sbin/ggate/Makefile#8 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#13 integrate .. //depot/projects/dtrace/src/sbin/mount_unionfs/mount_unionfs.8#6 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.8#5 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#13 integrate .. //depot/projects/dtrace/src/share/examples/cvsup/stable-supfile#5 integrate .. //depot/projects/dtrace/src/share/man/man3/Makefile#5 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#21 integrate .. //depot/projects/dtrace/src/share/man/man4/coretemp.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/hwpmc.4#6 integrate .. //depot/projects/dtrace/src/share/man/man5/fstab.5#4 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#8 integrate .. //depot/projects/dtrace/src/share/man/man7/Makefile#5 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#17 integrate .. //depot/projects/dtrace/src/share/mk/bsd.compat.mk#5 integrate .. //depot/projects/dtrace/src/share/mk/bsd.cpu.mk#10 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#15 integrate .. //depot/projects/dtrace/src/share/mklocale/UTF-8.src#5 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC.hints#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/bcopyinout.S#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/in_cksum_arm.S#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#19 integrate .. //depot/projects/dtrace/src/sys/arm/arm/support.S#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/asm.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/ficl/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#7 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/dtrace/src/sys/conf/files#45 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#17 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#21 integrate .. //depot/projects/dtrace/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/dtrace/src/sys/ddb/db_ps.c#13 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/aac/aac_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#15 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ctau/if_ct.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/cx/if_cx.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ipw/if_ipwreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/ipw/if_ipwvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#19 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#26 integrate .. //depot/projects/dtrace/src/sys/dev/my/if_my.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis_quirks.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/dtrace/src/sys/dev/puc/puc_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sio/sio.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/isa/ad1816.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_cl_init.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_cl_intr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_cl_io.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_cl_misc.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_cl_share.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_cam.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_share.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC.hints#6 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_avm_a1.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_isic.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_tel_s016.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 integrate .. //depot/projects/dtrace/src/sys/i4b/layer1/isic/i4b_tel_s08.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/disasm/disasm.h#4 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/db_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/exception.S#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/support.S#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_environment.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/subr_param.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/sys_process.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/dtrace/src/sys/libkern/arm/ffs.S#4 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#24 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#13 integrate .. //depot/projects/dtrace/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/dtrace/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#11 integrate .. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#9 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/dtrace/src/sys/pci/if_vr.c#6 integrate .. //depot/projects/dtrace/src/sys/pci/if_wb.c#6 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#9 integrate .. //depot/projects/dtrace/src/sys/pci/intpm.c#7 integrate .. //depot/projects/dtrace/src/sys/security/audit/audit_pipe.c#8 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/sys/ata.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#19 integrate .. //depot/projects/dtrace/src/sys/sys/sysctl.h#11 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#14 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/dtrace/src/sys/vm/uma_core.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_param.h#5 integrate .. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_LIBKSE#1 branch .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_LIBPTHREAD#3 integrate .. //depot/projects/dtrace/src/usr.bin/Makefile#10 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.birthday#5 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/dtrace/src/usr.bin/id/id.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/locate/locate/updatedb.sh#4 integrate .. //depot/projects/dtrace/src/usr.bin/lockf/lockf.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/lockf/lockf.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/Makefile#6 integrate .. //depot/projects/dtrace/src/usr.bin/systat/cmdtab.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/systat/extern.h#4 integrate .. //depot/projects/dtrace/src/usr.bin/systat/systat.1#7 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#19 integrate .. //depot/projects/dtrace/src/usr.sbin/ipfwpcap/ipfwpcap.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#8 integrate .. //depot/projects/dtrace/src/usr.sbin/nscd/mp_rs_query.#3 delete .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/main.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/sade.8#5 integrate .. //depot/projects/dtrace/src/usr.sbin/tcpdump/tcpdump/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/tcpdump/tcpdump/config.h#4 integrate .. //depot/projects/dtrace/src/usr.sbin/wpa/l2_packet.c#5 integrate .. //depot/projects/dtrace/www/de/developers.sgml#3 integrate .. //depot/projects/dtrace/www/de/ports/categories#2 integrate .. //depot/projects/dtrace/www/de/projects/newbies.sgml#7 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#12 integrate .. //depot/projects/dtrace/www/de/where.sgml#10 integrate .. //depot/projects/dtrace/www/en/administration.sgml#2 integrate .. //depot/projects/dtrace/www/en/developers.sgml#21 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#24 integrate .. //depot/projects/dtrace/www/en/internal/core-vote.sgml#4 integrate .. //depot/projects/dtrace/www/en/internal/machines.sgml#9 integrate .. //depot/projects/dtrace/www/en/news/status/Makefile#9 integrate .. //depot/projects/dtrace/www/en/news/status/report-2007-07-2007-10.xml#1 branch .. //depot/projects/dtrace/www/en/news/status/status.sgml#9 integrate .. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#2 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2007.sgml#2 integrate .. //depot/projects/dtrace/www/en/prstats/index.sgml#5 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#2 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#21 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#17 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#7 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#22 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#14 integrate .. //depot/projects/dtrace/www/share/sgml/usergroups.xml#14 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#14 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.268 2007/08/10 17:58:16 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.269 2007/10/15 13:27:28 marck Exp $ 1999 @@ -114,7 +114,11 @@ Noteworthy CVS Tags - RELENG_5 (5.X-STABLE), RELENG_6 (6.X-STABLE), HEAD (-CURRENT) + RELENG_5 (5.X-STABLE), + RELENG_6 (6.X-STABLE), + RELENG_7 (7.X-STABLE), + HEAD (-CURRENT) + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#45 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.trevor; (2000 - 2007) + + + &a.bsd; (2000 - 2007) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#8 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.22 2007/10/01 05:55:01 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.23 2007/10/16 01:09:50 linimon Exp $ 2003 @@ -47,7 +47,7 @@ be used to specify one of the package architectures (amd64, &i386;, ia64, and &sparc64;), and ${branch} will be used - to specify the build branch (5, 5-exp, 6, 6-exp, 7). + to specify the build branch (5, 5-exp, 6, 6-exp, 7, 7-exp, 8). @@ -204,6 +204,19 @@ a 7.X build + + + dopackages.7-exp - Perform + a 7.X build with experimental patches + (7-exp branch) + + + + + dopackages.8 - Perform + a 8.X build + + @@ -299,7 +312,7 @@ -trybroken - Try to build BROKEN ports (off by default - because the &i386; cluster is fast enough now + because the amd64/&i386; clusters are fast enough now that when doing incremental builds, more time was spent rebuilding things that were going to fail anyway. Conversely, the other clusters @@ -834,6 +847,10 @@ packages-7-current + + + packages-8-current + Some of the directories on ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.107 2007/07/29 11:19:09 blackend Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.108 2007/10/13 12:01:20 chinsan Exp $ # # Build the FreeBSD Handbook. # @@ -146,6 +146,19 @@ IMAGES_EN+= virtualization/parallels-freebsd11.png IMAGES_EN+= virtualization/parallels-freebsd12.png IMAGES_EN+= virtualization/parallels-freebsd13.png +IMAGES_EN+= virtualization/virtualpc-freebsd1.png +IMAGES_EN+= virtualization/virtualpc-freebsd2.png +IMAGES_EN+= virtualization/virtualpc-freebsd3.png +IMAGES_EN+= virtualization/virtualpc-freebsd4.png +IMAGES_EN+= virtualization/virtualpc-freebsd5.png +IMAGES_EN+= virtualization/virtualpc-freebsd6.png +IMAGES_EN+= virtualization/virtualpc-freebsd7.png +IMAGES_EN+= virtualization/virtualpc-freebsd8.png +IMAGES_EN+= virtualization/virtualpc-freebsd9.png +IMAGES_EN+= virtualization/virtualpc-freebsd10.png +IMAGES_EN+= virtualization/virtualpc-freebsd11.png +IMAGES_EN+= virtualization/virtualpc-freebsd12.png +IMAGES_EN+= virtualization/virtualpc-freebsd13.png # Images from the cross-document image library IMAGES_LIB= callouts/1.png ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 17 02:46:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C87FE16A41B; Wed, 17 Oct 2007 02:46: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 634EF16A419 for ; Wed, 17 Oct 2007 02:46:03 +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 4DBD113C469 for ; Wed, 17 Oct 2007 02:46:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9H2k32j072314 for ; Wed, 17 Oct 2007 02:46:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9H2k2hg072311 for perforce@freebsd.org; Wed, 17 Oct 2007 02:46:02 GMT (envelope-from jb@freebsd.org) Date: Wed, 17 Oct 2007 02:46:02 GMT Message-Id: <200710170246.l9H2k2hg072311@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 127620 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: Wed, 17 Oct 2007 02:46:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=127620 Change 127620 by jb@jb_freebsd1 on 2007/10/17 02:45:43 IF6 Affected files ... .. //depot/projects/dtrace6/src/contrib/less/NEWS#2 integrate .. //depot/projects/dtrace6/src/contrib/less/README#2 integrate .. //depot/projects/dtrace6/src/contrib/less/ch.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/charset.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/configure#2 integrate .. //depot/projects/dtrace6/src/contrib/less/configure.ac#2 integrate .. //depot/projects/dtrace6/src/contrib/less/filename.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/funcs.h#2 integrate .. //depot/projects/dtrace6/src/contrib/less/jump.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/less.h#2 integrate .. //depot/projects/dtrace6/src/contrib/less/less.man#2 integrate .. //depot/projects/dtrace6/src/contrib/less/less.nro#2 integrate .. //depot/projects/dtrace6/src/contrib/less/lessecho.man#2 integrate .. //depot/projects/dtrace6/src/contrib/less/lessecho.nro#2 integrate .. //depot/projects/dtrace6/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/dtrace6/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/dtrace6/src/contrib/less/line.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/search.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/signal.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/version.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/awk.h#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/awkgram.y#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/lex.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/maketab.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/proctab.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/dtrace6/src/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/dtrace6/src/include/arpa/tftp.h#2 integrate .. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/dtrace6/src/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/dtrace6/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/dtrace6/src/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/dtrace6/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/dtrace6/src/share/man/man4/lagg.4#2 integrate .. //depot/projects/dtrace6/src/share/zoneinfo/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/dtrace6/src/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/dtrace6/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/dtrace6/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/dtrace6/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/dtrace6/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/dtrace6/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/dtrace6/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/dtrace6/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/dtrace6/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/dtrace6/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/dtrace6/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/dtrace6/src/sys/sys/proc.h#3 integrate .. //depot/projects/dtrace6/src/usr.bin/awk/Makefile#2 integrate .. //depot/projects/dtrace6/src/usr.bin/awk/b.c.diff#2 delete .. //depot/projects/dtrace6/src/usr.bin/awk/lib.c.diff#2 delete .. //depot/projects/dtrace6/src/usr.bin/awk/main.c.diff#2 delete .. //depot/projects/dtrace6/src/usr.bin/awk/run.c.diff#2 delete .. //depot/projects/dtrace6/src/usr.bin/awk/tran.c.diff#2 delete Differences ... ==== //depot/projects/dtrace6/src/contrib/less/NEWS#2 (text+ko) ==== @@ -13,6 +13,20 @@ ====================================================================== + Major changes between "less" versions 406 and 409 + +* Support CSI escape sequences, like SGR escape sequences. + +* Fix bug which caused screen to fail to repaint when window is resized. + +* Fix bug in using -i and -I flags with non-ASCII text. + +* Fix configure bug on systems which don't support langinfo.h. + +* Fix crash when searching text containing certain invalid UTF-8 sequences. + +====================================================================== + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. @@ -683,3 +697,4 @@ + ==== //depot/projects/dtrace6/src/contrib/less/README#2 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 406 + Less, version 409 - This is the distribution of less, version 406, released 19 Jun 2007. + This is the distribution of less, version 409, released 12 Oct 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/dtrace6/src/contrib/less/ch.c#2 (text+ko) ==== @@ -128,6 +128,9 @@ POSITION pos; POSITION len; + if (thisfile == NULL) + return (EOI); + slept = FALSE; /* @@ -416,6 +419,9 @@ BLOCKNUM new_block; POSITION len; + if (thisfile == NULL) + return (0); + len = ch_length(); if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) return (1); @@ -450,6 +456,9 @@ { POSITION len; + if (thisfile == NULL) + return (0); + if (ch_flags & CH_CANSEEK) ch_fsize = filesize(ch_file); @@ -503,6 +512,8 @@ public POSITION ch_length() { + if (thisfile == NULL) + return (NULL_POSITION); if (ignore_eoi) return (NULL_POSITION); if (ch_flags & CH_HELPFILE) @@ -516,6 +527,8 @@ public POSITION ch_tell() { + if (thisfile == NULL) + return (NULL_POSITION); return (ch_block * LBUFSIZE) + ch_offset; } @@ -527,6 +540,8 @@ { register int c; + if (thisfile == NULL) + return (EOI); c = ch_get(); if (c == EOI) return (EOI); @@ -546,6 +561,8 @@ public int ch_back_get() { + if (thisfile == NULL) + return (EOI); if (ch_offset > 0) ch_offset --; else @@ -586,6 +603,9 @@ { register struct buf *bp; + if (thisfile == NULL) + return; + if (!(ch_flags & CH_CANSEEK)) { /* @@ -769,6 +789,9 @@ { int keepstate = FALSE; + if (thisfile == NULL) + return; + if (ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) { /* @@ -807,6 +830,8 @@ public int ch_getflags() { + if (thisfile == NULL) + return (0); return (ch_flags); } ==== //depot/projects/dtrace6/src/contrib/less/charset.c#2 (text+ko) ==== @@ -567,24 +567,29 @@ { case 1: default: + /* 0xxxxxxx */ return (LWCHAR) (p[0] & 0xFF); case 2: + /* 110xxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x1F) << 6) | (p[1] & 0x3F)); case 3: + /* 1110xxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x0F) << 12) | ((p[1] & 0x3F) << 6) | (p[2] & 0x3F)); case 4: + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x07) << 18) | ((p[1] & 0x3F) << 12) | ((p[2] & 0x3F) << 6) | (p[3] & 0x3F)); case 5: + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x03) << 24) | ((p[1] & 0x3F) << 18) | @@ -592,6 +597,7 @@ ((p[3] & 0x3F) << 6) | (p[4] & 0x3F)); case 6: + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x01) << 30) | ((p[1] & 0x3F) << 24) | @@ -603,6 +609,56 @@ } /* + * Store a character into a UTF-8 string. + */ + public void +put_wchar(pp, ch) + char **pp; + LWCHAR ch; +{ + if (!utf_mode || ch < 0x80) + { + /* 0xxxxxxx */ + *(*pp)++ = (char) ch; + } else if (ch < 0x800) + { + /* 110xxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x10000) + { + /* 1110xxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x200000) + { + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x4000000) + { + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else + { + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); + *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } +} + +/* * Step forward or backward one character in a string. */ public LWCHAR @@ -612,6 +668,7 @@ char *limit; { LWCHAR ch; + int len; char *p = *pp; if (!utf_mode) @@ -623,14 +680,15 @@ ch = (LWCHAR) ((p > limit) ? *--p : 0); } else if (dir > 0) { - if (p + utf_len(*p) > limit) + len = utf_len(*p); + if (p + len > limit) + { ch = 0; - else + p = limit; + } else { ch = get_wchar(p); - p++; - while (IS_UTF8_TRAIL(*p)) - p++; + p += len; } } else { ==== //depot/projects/dtrace6/src/contrib/less/configure#2 (text+ko) ==== @@ -6473,6 +6473,7 @@ /* end confdefs.h. */ #include #include +#include int main () { ==== //depot/projects/dtrace6/src/contrib/less/configure.ac#2 (text+ko) ==== @@ -304,7 +304,8 @@ AC_MSG_CHECKING(for locale) AC_TRY_LINK([#include -#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], +#include +#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for ctype functions) AC_TRY_LINK([ ==== //depot/projects/dtrace6/src/contrib/less/filename.c#2 (text+ko) ==== @@ -482,7 +482,7 @@ for (i = 0; i < n; i++) { char c = data[i]; - if (ctldisp == OPT_ONPLUS && c == ESC) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { while (++i < n && is_ansi_middle(data[i])) continue; ==== //depot/projects/dtrace6/src/contrib/less/funcs.h#2 (text+ko) ==== @@ -56,6 +56,7 @@ public int utf_len (); public int is_utf8_well_formed (); public LWCHAR get_wchar (); + public void put_wchar (); public LWCHAR step_char (); public int is_composing_char (); public int is_ubin_char (); ==== //depot/projects/dtrace6/src/contrib/less/jump.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ jump_forw() { POSITION pos; + POSITION end_pos; if (ch_end_seek()) { @@ -42,11 +43,17 @@ * Go back one line from the end of the file * to get to the beginning of the last line. */ - pos = back_line(ch_tell()); + pos_clear(); + end_pos = ch_tell(); + pos = back_line(end_pos); if (pos == NULL_POSITION) jump_loc((POSITION)0, sc_height-1); else + { jump_loc(pos, sc_height-1); + if (position(sc_height-1) != end_pos) + repaint(); + } } /* ==== //depot/projects/dtrace6/src/contrib/less/less.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/less.h,v 1.5.8.2 2007/07/03 05:12:41 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/less.h,v 1.5.8.3 2007/10/11 18:51:44 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -150,6 +150,8 @@ #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') #endif +#define IS_CSI_START(c) ((c) == ESC || ((unsigned char)(c)) == CSI) + #ifndef NULL #define NULL 0 #endif @@ -425,6 +427,7 @@ #endif /* IS_EBCDIC_HOST */ #define ESC CONTROL('[') +#define CSI ((unsigned char)'\233') #if _OSK_MWC32 #define LSIGNAL(sig,func) os9_signal(sig,func) ==== //depot/projects/dtrace6/src/contrib/less/less.man#2 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 406: 19 Jun 2007 LESS(1) + Version 409: 12 Oct 2007 LESS(1) ==== //depot/projects/dtrace6/src/contrib/less/less.nro#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 406: 19 Jun 2007" +.TH LESS 1 "Version 409: 12 Oct 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/dtrace6/src/contrib/less/lessecho.man#2 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 406: 19 Jun 2007 LESSECHO(1) + Version 409: 12 Oct 2007 LESSECHO(1) ==== //depot/projects/dtrace6/src/contrib/less/lessecho.nro#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 406: 19 Jun 2007" +.TH LESSECHO 1 "Version 409: 12 Oct 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/dtrace6/src/contrib/less/lesskey.man#2 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 406: 19 Jun 2007 LESSKEY(1) + Version 409: 12 Oct 2007 LESSKEY(1) ==== //depot/projects/dtrace6/src/contrib/less/lesskey.nro#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 406: 19 Jun 2007" +.TH LESSKEY 1 "Version 409: 12 Oct 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/dtrace6/src/contrib/less/line.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/line.c,v 1.1.1.4.8.3 2007/07/03 05:12:41 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/line.c,v 1.1.1.4.8.4 2007/10/11 18:51:44 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -269,7 +269,7 @@ while (shifted <= shift && from < curr) { c = linebuf[from]; - if (c == ESC && ctldisp == OPT_ONPLUS) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { /* Keep cumulative effect. */ linebuf[to] = c; @@ -524,7 +524,7 @@ for (p = &linebuf[curr]; p > linebuf; ) { LWCHAR ch = step_char(&p, -1, linebuf); - if (ch == ESC) + if (IS_CSI_START(ch)) return (1); if (!is_ansi_middle(ch)) return (0); @@ -603,13 +603,13 @@ /* Remove whole unrecognized sequence. */ do { --curr; - } while (linebuf[curr] != ESC); + } while (!IS_CSI_START(linebuf[curr])); return 0; } a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; } - else if (ctldisp == OPT_ONPLUS && ch == ESC) + else if (ctldisp == OPT_ONPLUS && IS_CSI_START(ch)) { a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; @@ -943,7 +943,7 @@ } else if ((!utf_mode || is_ascii_char(ch)) && control_char((char)ch)) { do_control_char: - if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && ch == ESC)) + if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && IS_CSI_START(ch))) { /* * Output as a normal character. ==== //depot/projects/dtrace6/src/contrib/less/search.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/search.c,v 1.5.8.2 2007/07/03 05:12:41 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/search.c,v 1.5.8.3 2007/10/11 18:51:44 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -16,6 +16,7 @@ #include "less.h" #include "position.h" +#include "charset.h" #define MINPOS(a,b) (((a) < (b)) ? (a) : (b)) #define MAXPOS(a,b) (((a) > (b)) ? (a) : (b)) @@ -120,24 +121,31 @@ int *lenp; int ops; { - register char *dst; - register char *src; + char *dst; + char *src; register char *src_end; + LWCHAR ch; if (lenp != NULL) src_end = osrc + *lenp; else src_end = osrc + strlen(osrc); - for (src = osrc, dst = odst; src < src_end; src++) + for (src = osrc, dst = odst; src < src_end; ) { - if ((ops & CVT_TO_LC) && IS_UPPER(*src)) + ch = step_char(&src, +1, src_end); + if ((ops & CVT_TO_LC) && IS_UPPER(ch)) + { /* Convert uppercase to lowercase. */ - *dst++ = TO_LOWER(*src); - else if ((ops & CVT_BS) && *src == '\b' && dst > odst) + put_wchar(&dst, TO_LOWER(ch)); + } else if ((ops & CVT_BS) && ch == '\b' && dst > odst) + { /* Delete BS and preceding char. */ - dst--; - else if ((ops & CVT_ANSI) && *src == ESC) + do { + dst--; + } while (dst > odst && + !IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst)); + } else if ((ops & CVT_ANSI) && IS_CSI_START(ch)) { /* Skip to end of ANSI escape sequence. */ while (src + 1 != src_end) @@ -145,7 +153,7 @@ break; } else /* Just copy. */ - *dst++ = *src; + put_wchar(&dst, ch); } if ((ops & CVT_CRLF) && dst > odst && dst[-1] == '\r') dst--; @@ -182,14 +190,18 @@ * Are there any uppercase letters in this string? */ static int -is_ucase(s) - char *s; +is_ucase(str) + char *str; { - register char *p; + char *str_end = str + strlen(str); + LWCHAR ch; - for (p = s; *p != '\0'; p++) - if (IS_UPPER(*p)) + while (str < str_end) + { + ch = step_char(&str, +1, str_end); + if (IS_UPPER(ch)) return (1); + } return (0); } @@ -679,7 +691,7 @@ char *line_end = *line + line_len; if (cvt_ops & CVT_ANSI) - while (**line == ESC) + while (IS_CSI_START(**line)) { /* * Found an ESC. The file position moves ==== //depot/projects/dtrace6/src/contrib/less/signal.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ * contact the author, see the README file. */ -/* $FreeBSD: src/contrib/less/signal.c,v 1.3.8.2 2007/07/03 05:12:41 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/signal.c,v 1.3.8.3 2007/10/11 18:51:44 delphij Exp $ */ /* * Routines dealing with signals. @@ -93,6 +93,8 @@ { LSIGNAL(SIGWINCH, winch); sigs |= S_WINCH; + if (reading) + intread(); } #else #ifdef SIGWIND ==== //depot/projects/dtrace6/src/contrib/less/version.c#2 (text+ko) ==== @@ -693,6 +693,9 @@ v404 6/5/07 Fix display bug with F command and long lines. v405 6/17/07 Fix display bug when using -w option. v406 6/17/07 Fix secure build. +v407 8/16/07 Fix bugs; support CSI chars. +v408 10/1/07 Fix bug in -i with non-ASCII chars. +v409 10/12/07 Fix crash when viewing text with invalid UTF-8 sequences. */ -char version[] = "406"; +char version[] = "409"; ==== //depot/projects/dtrace6/src/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,50 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +May 1, 2007: + fiddle in makefile to fix for BSD make; thanks to igor sobrado. + +Mar 31, 2007: + fixed some null pointer refs calling adjbuf. + +Feb 21, 2007: + fixed a bug in matching the null RE in sub and gsub. thanks to al aho + who actually did the fix (in b.c), and to wolfgang seeberg for finding + it and providing a very compact test case. + + fixed quotation in b.c; thanks to Hal Pratt and the Princeton Dante + Project. + + removed some no-effect asserts in run.c. + + fiddled maketab.c to not complain about bison-generated values. + + removed the obsolete -V argument; fixed --version to print the + version and exit. + + fixed wording and an outright error in the usage message; thanks to igor + sobrado and jason mcintyre. + + fixed a bug in -d that caused core dump if no program followed. + +Jan 1, 2007: + dropped mac.code from makefile; there are few non-MacOSX + mac's these days. + +Jan 17, 2006: + system() not flagged as unsafe in the unadvertised -safe option. + found it while enhancing tests before shipping the ;login: article. + practice what you preach. + + removed the 9-years-obsolete -mr and -mf flags. + + added -version and --version options. + + core dump on linux with BEGIN {nextfile}, now fixed. + + removed some #ifdef's in run.c and lex.c that appear to no + longer be necessary. + Apr 24, 2005: modified lib.c so that values of $0 et al are preserved in the END block, apparently as required by posix. thanks to havard eidnes ==== //depot/projects/dtrace6/src/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.9 2005/05/16 19:19:32 ru Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.9.2.1 2007/10/10 00:22:15 obrien Exp $ Import of the 2005/04/24 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, and @@ -6,7 +6,7 @@ Original sources were taken from the Brian Kernighan's home page (http://cm.bell-labs.com/who/bwk/) and include bug fixes up thru -April 24, 2005. +May 01, 2007. The following files were removed for this import: @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20050424 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20070501 ==== //depot/projects/dtrace6/src/contrib/one-true-awk/awk.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ typedef unsigned char uschar; -#define xfree(a) { if ((a) != NULL) { free((char *) a); a = NULL; } } +#define xfree(a) { if ((a) != NULL) { free((void *) (a)); (a) = NULL; } } #define NN(p) ((p) ? (p) : "(null)") /* guaranteed non-null for dprintf */ ==== //depot/projects/dtrace6/src/contrib/one-true-awk/awkgram.y#2 (text+ko) ==== @@ -50,7 +50,7 @@ %token NL ',' '{' '(' '|' ';' '/' ')' '}' '[' ']' %token ARRAY %token MATCH NOTMATCH MATCHOP -%token FINAL DOT ALL CCL NCCL CHAR OR STAR QUEST PLUS +%token FINAL DOT ALL CCL NCCL CHAR OR STAR QUEST PLUS EMPTYRE %token AND BOR APPEND EQ GE GT LE LT NE IN %token ARG BLTIN BREAK CLOSE CONTINUE DELETE DO EXIT FOR FUNC %token SUB GSUB IF INDEX LSUBSTR MATCHFCN NEXT NEXTFILE ==== //depot/projects/dtrace6/src/contrib/one-true-awk/b.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ THIS SOFTWARE. ****************************************************************/ -/* lasciate ogne speranza, voi ch'entrate. */ +/* lasciate ogne speranza, voi ch'intrate. */ #define DEBUG @@ -44,10 +44,11 @@ #define parent(v) (v)->nnext #define LEAF case CCL: case NCCL: case CHAR: case DOT: case FINAL: case ALL: +#define ELEAF case EMPTYRE: /* empty string in regexp */ #define UNARY case STAR: case PLUS: case QUEST: /* encoding in tree Nodes: - leaf (CCL, NCCL, CHAR, DOT, FINAL, ALL): + leaf (CCL, NCCL, CHAR, DOT, FINAL, ALL, EMPTYRE): left is index, right contains value or pointer to value unary (STAR, PLUS, QUEST): left is child, right is null binary (CAT, OR): left and right are children @@ -182,6 +183,7 @@ void penter(Node *p) /* set up parent pointers and leaf indices */ { switch (type(p)) { + ELEAF LEAF info(p) = poscnt; poscnt++; @@ -206,6 +208,7 @@ void freetr(Node *p) /* free parse tree */ { switch (type(p)) { + ELEAF LEAF xfree(p); break; @@ -282,9 +285,21 @@ return c; } +static int collate_range_cmp(int a, int b) +{ + static char s[2][2]; + + if ((uschar)a == (uschar)b) + return 0; + s[0][0] = a; + s[1][0] = b; + return (strcoll(s[0], s[1])); +} + char *cclenter(const char *argp) /* add a character class */ { int i, c, c2; + int j; uschar *p = (uschar *) argp; uschar *op, *bp; static uschar *buf = 0; @@ -303,21 +318,24 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { bp--; i--; continue; } - while (c < c2) { - if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) + for (j = 0; j < NCHARS; j++) { + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; + if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1")) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; } continue; } } - if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) + if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter2")) FATAL("out of space for character class [%.10s...] 3", p); *bp++ = c; i++; @@ -339,6 +357,7 @@ int *p; switch (type(v)) { + ELEAF LEAF f->re[info(v)].ltype = type(v); f->re[info(v)].lval.np = right(v); @@ -375,11 +394,12 @@ } int first(Node *p) /* collects initially active leaves of p into setvec */ - /* returns 1 if p matches empty string */ + /* returns 0 if p matches empty string */ { int b, lp; switch (type(p)) { + ELEAF LEAF lp = info(p); /* look for high-water mark of subscripts */ while (setcnt >= maxsetvec || lp >= maxsetvec) { /* guessing here! */ @@ -389,6 +409,10 @@ if (setvec == 0 || tmpset == 0) overflo("out of space in first()"); } + if (type(p) == EMPTYRE) { + setvec[lp] = 0; + return(0); + } if (setvec[lp] != 1) { setvec[lp] = 1; setcnt++; @@ -465,7 +489,7 @@ if (f->out[s]) return(1); do { - assert(*p < NCHARS); + /* assert(*p < NCHARS); */ if ((ns = f->gototab[s][*p]) != 0) s = ns; else @@ -496,7 +520,7 @@ do { if (f->out[s]) /* final state */ patlen = q-p; - assert(*q < NCHARS); + /* assert(*q < NCHARS); */ if ((ns = f->gototab[s][*q]) != 0) s = ns; else @@ -554,7 +578,7 @@ do { if (f->out[s]) /* final state */ patlen = q-p; - assert(*q < NCHARS); + /* assert(*q < NCHARS); */ if ((ns = f->gototab[s][*q]) != 0) s = ns; else @@ -601,9 +625,10 @@ lastre = prestr = (uschar *) p; /* prestr points to string to be parsed */ rtok = relex(); /* GNU compatibility: an empty regexp matches anything */ - if (rtok == '\0') + if (rtok == '\0') { /* FATAL("empty regular expression"); previous */ - return(op2(ALL, NIL, NIL)); + return(op2(EMPTYRE, NIL, NIL)); + } np = regexp(); if (rtok != '\0') FATAL("syntax error in regular expression %s at %s", lastre, prestr); @@ -627,6 +652,9 @@ case ALL: rtok = relex(); return (unary(op2(ALL, NIL, NIL))); + case EMPTYRE: + rtok = relex(); + return (unary(op2(ALL, NIL, NIL))); case DOT: rtok = relex(); return (unary(op2(DOT, NIL, NIL))); @@ -666,7 +694,7 @@ Node *concat(Node *np) { switch (rtok) { - case CHAR: case DOT: case ALL: case CCL: case NCCL: case '$': case '(': + case CHAR: case DOT: case ALL: case EMPTYRE: case CCL: case NCCL: case '$': case '(': return (concat(op2(CAT, np, primary()))); } return (np); @@ -787,7 +815,7 @@ else cflag = 0; n = 2 * strlen((const char *) prestr)+1; - if (!adjbuf((char **) &buf, &bufsz, n, n, (char **) &bp, 0)) + if (!adjbuf((char **) &buf, &bufsz, n, n, (char **) &bp, "relex1")) FATAL("out of space for reg expr %.10s...", lastre); for (; ; ) { if ((c = *prestr++) == '\\') { @@ -806,7 +834,7 @@ prestr[2 + cc->cc_namelen] == ']') { prestr += cc->cc_namelen + 3; for (i = 0; i < NCHARS; i++) { - if (!adjbuf((char **) &buf, &bufsz, bp-buf+1, 100, (char **) &bp, 0)) + if (!adjbuf((char **) &buf, &bufsz, bp-buf+1, 100, (char **) &bp, "relex2")) FATAL("out of space for reg expr %.10s...", lastre); if (cc->cc_func(i)) { *bp++ = i; @@ -855,6 +883,7 @@ if ((k == CHAR && c == ptoi(f->re[p[i]].lval.np)) || (k == DOT && c != 0 && c != HAT) || (k == ALL && c != 0) + || (k == EMPTYRE && c != 0) || (k == CCL && member(c, (char *) f->re[p[i]].lval.up)) || (k == NCCL && !member(c, (char *) f->re[p[i]].lval.up) && c != 0 && c != HAT)) { q = f->re[p[i]].lfollow; ==== //depot/projects/dtrace6/src/contrib/one-true-awk/lex.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 17 12:05:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F88C16A420; Wed, 17 Oct 2007 12:05: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 1067916A419 for ; Wed, 17 Oct 2007 12:05:59 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBD5A13C480 for ; Wed, 17 Oct 2007 12:05:58 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HC5wkf065177 for ; Wed, 17 Oct 2007 12:05:58 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HC5uPM065174 for perforce@freebsd.org; Wed, 17 Oct 2007 12:05:56 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 17 Oct 2007 12:05:56 GMT Message-Id: <200710171205.l9HC5uPM065174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127627 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: Wed, 17 Oct 2007 12:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=127627 Change 127627 by zec@zec_tpx32 on 2007/10/17 12:05:35 IFC @ 127623 Affected files ... .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/vimage/src/sys/arm/arm/support.S#3 integrate .. //depot/projects/vimage/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/vimage/src/sys/arm/include/asm.h#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/vimage/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/vimage/src/sys/conf/files#20 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#7 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#7 integrate .. //depot/projects/vimage/src/sys/conf/newvers.sh#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/vimage/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/vimage/src/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#10 integrate .. //depot/projects/vimage/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#6 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union.h#4 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/disasm/disasm.h#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_environment.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_switch.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#13 integrate .. //depot/projects/vimage/src/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#15 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/vimage/src/sys/libkern/arm/ffs.S#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#13 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#10 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.h#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#20 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/vimage/src/sys/pci/if_vr.c#5 integrate .. //depot/projects/vimage/src/sys/pci/if_wb.c#3 integrate .. //depot/projects/vimage/src/sys/pci/if_xl.c#5 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#6 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/vimage/src/sys/sys/ata.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#9 integrate .. //depot/projects/vimage/src/sys/sys/param.h#12 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#11 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#8 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/vm/uma_core.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_fault.c#9 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#11 integrate .. //depot/projects/vimage/src/sys/vm/vm_param.h#3 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.18 2007/10/15 20:00:20 netchild Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" ==== //depot/projects/vimage/src/sys/arm/arm/bcopy_page.S#2 (text+ko) ==== @@ -40,11 +40,11 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.4 2005/10/06 11:26:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/bcopy_page.S,v 1.5 2007/10/13 12:05:03 cognet Exp $"); #include "assym.s" -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5E /* #define BIG_LOOPS */ @@ -179,10 +179,10 @@ ldmfd sp!, {r4-r8, pc} -#else /* __XSCALE__ */ +#else /* _ARM_ARCH_5E */ /* - * XSCALE version of bcopy_page + * armv5e version of bcopy_page */ ENTRY(bcopy_page) pld [r0] @@ -248,7 +248,7 @@ RET /* - * XSCALE version of bzero_page + * armv5e version of bzero_page */ ENTRY(bzero_page) mov r1, #PAGE_SIZE @@ -273,4 +273,4 @@ subs r1, r1, #128 bne 1b RET -#endif /* __XSCALE__ */ +#endif /* _ARM_ARCH_5E */ ==== //depot/projects/vimage/src/sys/arm/arm/bcopyinout.S#2 (text+ko) ==== @@ -45,8 +45,8 @@ .L_min_memcpy_size: .word _C_LABEL(_min_memcpy_size) -__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.8 2005/10/23 23:09:14 cognet Exp $"); -#ifdef __XSCALE__ +__FBSDID("$FreeBSD: src/sys/arm/arm/bcopyinout.S,v 1.9 2007/10/13 12:05:03 cognet Exp $"); +#ifdef _ARM_ARCH_5E #include #else @@ -64,7 +64,7 @@ #define SAVE_REGS stmfd sp!, {r4-r11} #define RESTORE_REGS ldmfd sp!, {r4-r11} -#if defined(__XSCALE__) +#if defined(_ARM_ARCH_5E) #define HELLOCPP # #define PREFETCH(rx,o) pld [ rx , HELLOCPP (o) ] #else ==== //depot/projects/vimage/src/sys/arm/arm/in_cksum_arm.S#2 (text+ko) ==== @@ -37,14 +37,14 @@ */ /* - * Hand-optimised in_cksum() and in4_cksum() implementations for ARM/Xscale + * Hand-optimised in_cksum() and in4_cksum() implementations for ARM/armv5e */ #include "opt_inet.h" #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.6 2005/10/03 14:07:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum_arm.S,v 1.7 2007/10/13 12:05:03 cognet Exp $"); /* * int in_cksum(struct mbuf *m, int len) @@ -113,7 +113,7 @@ */ /* LINTSTUB: Ignore */ ASENTRY_NP(L_cksumdata) -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E pld [r0] /* Pre-fetch the start of the buffer */ #endif mov r2, #0 @@ -147,7 +147,7 @@ /* Buffer is now word aligned */ .Lcksumdata_wordaligned: -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E cmp r1, #0x04 /* Less than 4 bytes left? */ blt .Lcksumdata_endgame /* Yup */ @@ -202,7 +202,7 @@ adcs r2, r2, r7 adc r2, r2, #0x00 -#else /* !__XSCALE__ */ +#else /* !_ARM_ARCH_5E */ subs r1, r1, #0x40 blt .Lcksumdata_bigloop_end @@ -238,7 +238,7 @@ RETeq cmp r1, #0x20 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E ldrged r4, [r0], #0x08 /* Avoid stalling pld and result */ blt .Lcksumdata_less_than_32 pld [r0, #0x18] @@ -280,7 +280,7 @@ nop /* - * Note: We use ldm here, even on Xscale, since the combined issue/result + * Note: We use ldm here, even on armv5e, since the combined issue/result * latencies for ldm and ldrd are the same. Using ldm avoids needless #ifdefs. */ /* At least 24 bytes remaining... */ ==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $"); #include #include #include @@ -4114,9 +4114,23 @@ void pmap_zero_page_xscale(vm_paddr_t phys, int off, int size) { +#ifdef ARM_USE_SMALL_ALLOC + char *dstpg; +#endif + if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; +#ifdef ARM_USE_SMALL_ALLOC + dstpg = (char *)arm_ptovirt(phys); + if (off || size != PAGE_SIZE) { + bzero(dstpg + off, size); + cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size); + } else { + bzero_page((vm_offset_t)dstpg); + cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE); + } +#else mtx_lock(&cmtx); /* * Hook in the page, zero it, and purge the cache for that @@ -4134,6 +4148,7 @@ bzero_page(cdstp); mtx_unlock(&cmtx); xscale_cache_clean_minidata(); +#endif } /* ==== //depot/projects/vimage/src/sys/arm/arm/support.S#3 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.12 2007/02/26 02:03:48 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.13 2007/10/13 12:05:03 cognet Exp $"); #include "assym.s" @@ -86,13 +86,13 @@ /* We are now word aligned */ .Lmemset_wordaligned: orr r3, r3, r3, lsl #8 /* Extend value to 16-bits */ -#ifdef __XSCALE__ - tst ip, #0x04 /* Quad-align for Xscale */ +#ifdef _ARM_ARCH_5E + tst ip, #0x04 /* Quad-align for armv5e */ #else cmp r1, #0x10 #endif orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E subne r1, r1, #0x04 /* Quad-align if necessary */ strne r3, [ip], #0x04 cmp r1, #0x10 @@ -105,7 +105,7 @@ /* Do 128 bytes at a time */ .Lmemset_loop128: subs r1, r1, #0x80 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -148,7 +148,7 @@ /* Do 32 bytes at a time */ .Lmemset_loop32: subs r1, r1, #0x20 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -165,7 +165,7 @@ adds r1, r1, #0x10 /* Partially adjust for extra sub */ /* Deal with 16 bytes or more */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 #else @@ -183,7 +183,7 @@ bgt .Lmemset_loop4 RETeq /* Zero length so just exit */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 RETeq @@ -868,7 +868,7 @@ add r1, r1, #1 b .Lmemmove_bl4 -#if !defined(__XSCALE__) +#if !defined(_ARM_ARCH_5E) ENTRY(memcpy) /* save leaf functions having to store this away */ /* Do not check arm_memcpy if we're running from flash */ @@ -2870,7 +2870,7 @@ strh r2, [r0, #0x09] strb r1, [r0, #0x0b] RET -#endif /* __XSCALE__ */ +#endif /* _ARM_ARCH_5E */ #ifdef GPROF ==== //depot/projects/vimage/src/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $"); /* @@ -187,7 +187,7 @@ ldr pc, [r9, #CF_CONTEXT_SWITCH] /* Restore all the save registers */ -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5E add r1, r7, #PCB_R8 ldmia r1, {r8-r13} #else @@ -249,7 +249,7 @@ mov r4, r0 /* Save the old thread. */ /* Save all the registers in the old thread's pcb */ -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5E add r7, r2, #(PCB_R8) stmia r7, {r8-r13} #else @@ -419,7 +419,7 @@ msr cpsr_c, r3 /* Restore the old mode */ /* Restore all the save registers */ -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5E add r7, r9, #PCB_R8 ldmia r7, {r8-r13} sub r7, r7, #PCB_R8 /* restore PCB pointer */ ==== //depot/projects/vimage/src/sys/arm/include/asm.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.7 2007/10/13 12:04:10 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -137,10 +137,15 @@ #if defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5__) || \ defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || \ - defined (__ARM_ARCH_5TEJ__) + defined (__ARM_ARCH_5TEJ__) || defined (__ARM_ARCH_5E__) #define _ARM_ARCH_5 #endif +#if defined (_ARM_ARCH_6) || defined(__ARM_ARCH_5TE__) || \ + defined(__ARM_ARCH_5TEJ__) || defined(__ARM_ARCH_5E__) +#define _ARM_ARCH_5E +#endif + #if defined (_ARM_ARCH_5) || defined (__ARM_ARCH_4T__) #define _ARM_ARCH_4T #endif ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.2 2007/02/25 22:17:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.3 2007/10/12 06:03:42 kevlo Exp $"); /* * Intel XScale Queue Manager support. @@ -341,7 +341,7 @@ */ sc->aqmFreeSramAddress += (qi->qSizeInWords * sizeof(uint32_t)); - /* Set the interupt source if this queue is in the range 0-31 */ + /* Set the interrupt source if this queue is in the range 0-31 */ if (qId < IX_QMGR_MIN_QUEUPP_QID) aqm_srcsel_write(sc, qId, srcSel); @@ -604,7 +604,7 @@ /* Calculate the checkMask and checkValue for this q */ aqm_calc_statuscheck(sc, qId, srcSel); #endif - /* Set the interupt source if this queue is in the range 0-31 */ + /* Set the interrupt source if this queue is in the range 0-31 */ if (qId < IX_QMGR_MIN_QUEUPP_QID) aqm_srcsel_write(sc, qId, srcSel); ==== //depot/projects/vimage/src/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.44 2006/09/28 10:02:03 ru Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.45 2007/10/15 14:20:24 nyan Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -18,7 +18,7 @@ CFLAGS+= -msoft-float .endif .if ${MACHINE} == "pc98" -CFLAGS+= -DPC98 +CFLAGS+= -Os -DPC98 .endif .if HAVE_PNP CFLAGS+= -DHAVE_PNP ==== //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.42 2006/04/11 20:11:30 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.43 2007/10/12 17:09:43 ps Exp $ # LIB= i386 INTERNALLIB= @@ -10,6 +10,13 @@ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ smbios.c time.c vidconsole.c amd64_tramp.S +# Enable PXE TFTP or NFS support, not both. +.if defined(LOADER_TFTP_SUPPORT) +CFLAGS+= -DLOADER_TFTP_SUPPORT +.else +CFLAGS+= -DLOADER_NFS_SUPPORT +.endif + BOOT_COMCONSOLE_PORT?= 0x3f8 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} ==== //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.22 2005/04/17 21:38:22 wollman Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); #include #include @@ -335,8 +335,10 @@ if (pxe_opens > 0) return(0); +#ifdef LOADER_NFS_SUPPORT /* get an NFS filehandle for our root filesystem */ pxe_setnfshandle(rootpath); +#endif if (pxe_sock >= 0) { ==== //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#2 (text+ko) ==== @@ -1,12 +1,13 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.6 2005/09/13 08:27:38 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.7 2007/10/15 14:20:24 nyan Exp $ BINDIR?= /boot LOADER_ADDRESS?=0x100000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ + -Os LDFLAGS+= -nostdlib # BTX components ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#3 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28 2006/12/04 23:04:13 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.29 2007/10/12 22:11:22 scottl Exp $ */ /* @@ -170,8 +170,11 @@ #define SMS_PAGE_CODE 0x3F #define SMS_VENDOR_SPECIFIC_PAGE 0x00 #define SMS_DISCONNECT_RECONNECT_PAGE 0x02 +#define SMS_CACHE_PAGE 0x08 #define SMS_PERIPHERAL_DEVICE_PAGE 0x09 #define SMS_CONTROL_MODE_PAGE 0x0A +#define SMS_PROTO_SPECIFIC_PAGE 0x19 +#define SMS_INFO_EXCEPTIONS_PAGE 0x1C #define SMS_ALL_PAGES_PAGE 0x3F #define SMS_PAGE_CTRL_MASK 0xC0 #define SMS_PAGE_CTRL_CURRENT 0x00 @@ -257,6 +260,8 @@ #define SLS_ERROR_VERIFY_PAGE 0x05 #define SLS_ERROR_NONMEDIUM_PAGE 0x06 #define SLS_ERROR_LASTN_PAGE 0x07 +#define SLS_SELF_TEST_PAGE 0x10 +#define SLS_IE_PAGE 0x2f #define SLS_PAGE_CTRL_MASK 0xC0 #define SLS_PAGE_CTRL_THRESHOLD 0x00 #define SLS_PAGE_CTRL_CUMULATIVE 0x40 @@ -329,6 +334,55 @@ u_int8_t aen_holdoff_period[2]; }; +struct scsi_cache_page { + u_int8_t page_code; +#define SCHP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t cache_flags; +#define SCHP_FLAGS_WCE 0x04 /* Write Cache Enable */ +#define SCHP_FLAGS_MF 0x02 /* Multiplication factor */ +#define SCHP_FLAGS_RCD 0x01 /* Read Cache Disable */ + u_int8_t rw_cache_policy; + u_int8_t dis_prefetch[2]; + u_int8_t min_prefetch[2]; + u_int8_t max_prefetch[2]; + u_int8_t max_prefetch_ceil[2]; +}; + +struct scsi_info_exceptions_page { + u_int8_t page_code; +#define SIEP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t info_flags; +#define SIEP_FLAGS_PERF 0x80 +#define SIEP_FLAGS_EBF 0x20 +#define SIEP_FLAGS_EWASC 0x10 +#define SIEP_FLAGS_DEXCPT 0x08 +#define SIEP_FLAGS_TEST 0x04 +#define SIEP_FLAGS_EBACKERR 0x02 +#define SIEP_FLAGS_LOGERR 0x01 + u_int8_t mrie; + u_int8_t interval_timer[4]; + u_int8_t report_count[4]; +}; + +struct scsi_proto_specific_page { + u_int8_t page_code; +#define SPSP_PAGE_SAVABLE 0x80 /* Page is savable */ + u_int8_t page_length; + u_int8_t protocol; +#define SPSP_PROTO_FC 0x00 +#define SPSP_PROTO_SPI 0x01 +#define SPSP_PROTO_SSA 0x02 +#define SPSP_PROTO_1394 0x03 +#define SPSP_PROTO_RDMA 0x04 +#define SPSP_PROTO_ISCSI 0x05 +#define SPSP_PROTO_SAS 0x06 +#define SPSP_PROTO_ADT 0x07 +#define SPSP_PROTO_ATA 0x08 +#define SPSP_PROTO_NONE 0x0f +}; + struct scsi_reserve { u_int8_t opcode; @@ -468,6 +522,47 @@ u_int8_t control; }; +struct ata_pass_12 { + u_int8_t opcode; + u_int8_t protocol; +#define AP_MULTI 0xe0 + u_int8_t flags; +#define AP_T_LEN 0x03 +#define AP_BB 0x04 +#define AP_T_DIR 0x08 +#define AP_CK_COND 0x20 +#define AP_OFFLINE 0x60 + u_int8_t features; + u_int8_t sector_count; + u_int8_t lba_low; + u_int8_t lba_mid; + u_int8_t lba_high; + u_int8_t device; + u_int8_t command; + u_int8_t reserved; + u_int8_t control; +}; + +struct ata_pass_16 { + u_int8_t opcode; + u_int8_t protocol; +#define AP_EXTEND 0x01 + u_int8_t flags; + u_int8_t features_ext; + u_int8_t features; + u_int8_t sector_count_ext; + u_int8_t sector_count; + u_int8_t lba_low_ext; + u_int8_t lba_low; + u_int8_t lba_mid_ext; + u_int8_t lba_mid; + u_int8_t lba_high_ext; + u_int8_t lba_high; + u_int8_t device; + u_int8_t command; + u_int8_t control; +}; + #define SC_SCSI_1 0x01 #define SC_SCSI_2 0x03 @@ -494,6 +589,7 @@ #define WRITE_10 0x2a #define POSITION_TO_ELEMENT 0x2b #define SYNCHRONIZE_CACHE 0x35 +#define READ_DEFECT_DATA_10 0x37 #define WRITE_BUFFER 0x3b #define READ_BUFFER 0x3c #define CHANGE_DEFINITION 0x40 @@ -501,10 +597,12 @@ #define LOG_SENSE 0x4d #define MODE_SELECT_10 0x55 #define MODE_SENSE_10 0x5A +#define ATA_PASS_16 0x85 #define READ_16 0x88 #define WRITE_16 0x8a #define SERVICE_ACTION_IN 0x9e #define REPORT_LUNS 0xA0 +#define ATA_PASS_12 0xa1 #define MOVE_MEDIUM 0xa5 #define READ_12 0xa8 #define WRITE_12 0xaa @@ -663,6 +761,17 @@ u_int8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE]; }; +struct scsi_vpd_supported_page_list +{ + u_int8_t device; + u_int8_t page_code; +#define SVPD_SUPPORTED_PAGE_LIST 0x00 + u_int8_t reserved; + u_int8_t length; /* number of VPD entries */ +#define SVPD_SUPPORTED_PAGES_SIZE 251 + u_int8_t list[SVPD_SUPPORTED_PAGES_SIZE]; +}; + struct scsi_vpd_unit_serial_number { u_int8_t device; @@ -1231,7 +1340,7 @@ { void *page_start; - page_start = (void *)((u_int8_t *)&mode_header[1] + + page_start = (void *)((u_int8_t *)&mode_header[2] + scsi_2btoul(mode_header->blk_desc_len)); return(page_start); ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.115 2007/06/05 00:00:50 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.116 2007/10/12 06:03:42 kevlo Exp $"); #include "opt_compat.h" #include "opt_vimage.h" @@ -118,7 +118,7 @@ * * The linux procfs state field displays one of the characters RSDZTW to * denote running, sleeping in an interruptible wait, waiting in an - * uninteruptible disk sleep, a zombie process, process is being traced + * uninterruptible disk sleep, a zombie process, process is being traced * or stopped, or process is paging respectively. * * Our struct kinfo_proc contains the variable ki_stat which contains a ==== //depot/projects/vimage/src/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1243 2007/09/23 07:34:22 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1246 2007/10/15 20:00:20 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/vimage/src/sys/conf/files.amd64#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.107 2007/08/15 19:26:01 des Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.109 2007/10/15 20:00:21 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/vimage/src/sys/conf/files.i386#7 (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.580 2007/08/15 19:26:01 des Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.582 2007/10/15 20:00:21 netchild Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/vimage/src/sys/conf/newvers.sh#2 (text+ko) ==== @@ -28,10 +28,10 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.72 2005/08/19 03:56:45 cperciva Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.73 2007/10/11 04:28:07 kensmith Exp $ TYPE="FreeBSD" -REVISION="7.0" +REVISION="8.0" BRANCH="CURRENT" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} ==== //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 (text+ko) ==== @@ -290,6 +290,7 @@ mutex_exit(&spa->spa_errlist_lock); sbuf_finish(&sb); + ZFS_LOG(1, "%s", sbuf_data(&sb)); devctl_notify("ZFS", spa->spa_name, subclass, sbuf_data(&sb)); if (sbuf_overflowed(&sb)) printf("ZFS WARNING: sbuf overflowed\n"); ==== //depot/projects/vimage/src/sys/ddb/db_ps.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $"); #include #include @@ -295,6 +295,8 @@ db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); + db_printf(" stack: %p-%p\n", (void *)td->td_kstack, + (void *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE - 1)); db_printf(" flags: %#x ", td->td_flags); db_printf(" pflags: %#x\n", td->td_pflags); db_printf(" state: "); ==== //depot/projects/vimage/src/sys/dev/aac/aac.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120 2007/02/23 12:18:29 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.121 2007/10/15 17:34:58 emaste Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -1670,14 +1670,12 @@ sc->aac_max_sectors = 128; /* 64KB */ if (sc->flags & AAC_FLAGS_SG_64BIT) sc->aac_sg_tablesize = (AAC_FIB_DATASIZE - - sizeof(struct aac_blockwrite64) - + sizeof(struct aac_sg_table64)) - / sizeof(struct aac_sg_table64); + - sizeof(struct aac_blockwrite64)) + / sizeof(struct aac_sg_entry64); else sc->aac_sg_tablesize = (AAC_FIB_DATASIZE - - sizeof(struct aac_blockwrite) - + sizeof(struct aac_sg_table)) - / sizeof(struct aac_sg_table); + - sizeof(struct aac_blockwrite)) + / sizeof(struct aac_sg_entry); if (!aac_sync_command(sc, AAC_MONKER_GETCOMMPREF, 0, 0, 0, 0, NULL)) { options = AAC_GET_MAILBOX(sc, 1); ==== //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62 2007/08/23 20:12:40 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.63 2007/10/14 19:40:15 emaste Exp $"); /* * PCI bus interface and resource allocation. @@ -176,6 +176,8 @@ "Adaptec SAS RAID 4005SAS"}, {0x9005, 0x0285, 0x1014, 0x02f2, AAC_HWIF_I960RX, 0, "IBM ServeRAID 8i"}, + {0x9005, 0x0285, 0x1014, 0x0312, AAC_HWIF_I960RX, 0, + "IBM ServeRAID 8i"}, {0x9005, 0x0285, 0x9005, 0x0298, AAC_HWIF_I960RX, 0, "Adaptec SAS RAID 4000SAS"}, {0x9005, 0x0285, 0x9005, 0x0299, AAC_HWIF_I960RX, 0, @@ -194,12 +196,52 @@ "ICP ICP9047MA SATA RAID"}, {0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0, "ICP ICP9087MA SATA RAID"}, + {0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0, + "ICP9067MA SATA RAID"}, + {0x9005, 0x0285, 0x9005, 0x02b5, AAC_HWIF_I960RX, 0, + "Adaptec RAID 5445"}, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 17 13:16:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 349B916A46D; Wed, 17 Oct 2007 13:16: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 B633616A469; Wed, 17 Oct 2007 13:16:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 7A68313C48D; Wed, 17 Oct 2007 13:16:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by elvis.mu.org (Postfix) with ESMTP id 2FF211A3C1A; Wed, 17 Oct 2007 06:16:44 -0700 (PDT) From: John Baldwin To: Hans Petter Selasky Date: Wed, 17 Oct 2007 08:44:47 -0400 User-Agent: KMail/1.9.7 References: <200709231625.l8NGPhaR097038@repoman.freebsd.org> <20071016043133.GW31826@elvis.mu.org> <200710161823.59940.hselasky@freebsd.org> In-Reply-To: <200710161823.59940.hselasky@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200710170844.47761.jhb@freebsd.org> Cc: Alfred Perlstein , Perforce Change Reviews , "Constantine A. Murenin" Subject: Re: PERFORCE change 126745 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: Wed, 17 Oct 2007 13:16:45 -0000 On Tuesday 16 October 2007 12:23:59 pm Hans Petter Selasky wrote: > On Tuesday 16 October 2007, Alfred Perlstein wrote: > > * Hans Petter Selasky [070923 13:13] wrote: > > > Hi Constantine, > > > > > > Thanks for your input and I _know_ that my code is not 100% style > > > compliant. Most of the style misbehaves are probably there due to the way > > > my "xemacs" autoformatting behaves. And I love curly brackets and > > > parenthesis, by the way :-) > > > > > > My plan is to clean up all the style stuff by a small C-program in the > > > end, because doing it by hand is waste of my time. Probably it will take > > > less time to write that program than the actual manual edit when we are > > > talking about doing alot of edits. It wonders me if such a tool already > > > exists, because the code is technically OK. > > > > > > Anyone that wants to be a little more constructive and point towards > > > where the FreeBSD style transformer program is? I assume it would be > > > extremely useful to everyone that is forced to use multiple different > > > styles depending on what project they are contributing to, like me. Then > > > before commit I will run that script and verify the differences. And > > > that's it. > > > > > > --HPS > > > > Hans, one of the issues with doing such changes at the end is that it > > effectively obliterates the ability to "cvs annotate" your code. I'm > > sure perforce has an 'annotate' command as well. > > > > I would suggest that you find/fix the style now and apply it now rather > > than later as the longer you wait, the more history you obliterate. > > Hi Alfred, > > I never heard about the annotate command. Can you explain a little bit how it > works? > > I will do as you want and write that "style converter" first, before any other > changes. I expect it might take a little bit time, something like a week. FWIW, p4 does have an annotate via the p4web interface. Also, there are .emacs snippets that (mostly) do style(9). The only thing I know of that they don't quite get right is continuation of nested conditions in a control statement such as the following: if (foo && bar(baz, qux)) Emacs will render this as if (foo && bar(baz, qux)) by default, so I end up manually fixing those up. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Oct 17 13:48:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4958416A46B; Wed, 17 Oct 2007 13:48: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 EECA416A468 for ; Wed, 17 Oct 2007 13:48:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D7AC113C45B for ; Wed, 17 Oct 2007 13:48:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HDmrEw080487 for ; Wed, 17 Oct 2007 13:48:53 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HDmrqt080484 for perforce@freebsd.org; Wed, 17 Oct 2007 13:48:53 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 17 Oct 2007 13:48:53 GMT Message-Id: <200710171348.l9HDmrqt080484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127628 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: Wed, 17 Oct 2007 13:48:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=127628 Change 127628 by zec@zec_tpx32 on 2007/10/17 13:48:29 Improve accuracy of per process group CPU average usage accounting and reporting, and slightly increase deccay periods. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_clock.c#11 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#46 edit .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#6 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#11 (text+ko) ==== @@ -484,21 +484,25 @@ tot_acc_statcalls++; if (!TD_IS_IDLETHREAD(td)) V_acc_statcalls++; + + /* Deccay processing every 1/16 seconds */ if (last_acc_ticks + (hz >> 4) <= ticks) { u_int weight_fixp; u_int avg0; last_acc_ticks = ticks; /* - * 0x10000 == 1.0 in 16:16 fixed point notation; - * a few extra LS bits are added in an attempt to - * compensate for truncation errors. + * avg0, avg1 and avg2 are stored in 16.16 fixed point format. + * weight_fixp is in 1.31 format for better accuracy. + * + * avg1 loses half of its value in roughly 150 ms. + * avg2 loses half of its value in roughly 1350 ms. */ - weight_fixp = 0x010007 / tot_acc_statcalls; + weight_fixp = 0x80000000 / tot_acc_statcalls; LIST_FOREACH(vcpu, &vcpu_head, vcpu_le) { - avg0 = weight_fixp * V_acc_statcalls; - V_avg1_fixp = (V_avg1_fixp + avg0 + 1) >> 1; - V_avg2_fixp = (15 * V_avg2_fixp + avg0 + 15) >> 4; + avg0 = (weight_fixp * V_acc_statcalls) >> 15; + V_avg1_fixp = (3 * V_avg1_fixp + avg0) >> 2; + V_avg2_fixp = (31 * V_avg2_fixp + avg0) >> 5; V_acc_statcalls = 0; } tot_acc_statcalls = 0; ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#46 (text+ko) ==== @@ -504,8 +504,7 @@ vi_req->vi_proc_count = vip_r->v_procg->nprocs; vi_req->vi_if_count = vip_r->v_vnet->ifccnt; vi_req->vi_sock_count = vip_r->v_vnet->sockcnt; - vi_req->cp_time_avg = - (vip_r->v_cpu->_avg2_fixp * 10000 + 0x8000) >> 16; + vi_req->cp_time_avg = vip_r->v_cpu->_avg2_fixp; break; case SIOCSPVIMAGE: ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#6 (text+ko) ==== @@ -72,7 +72,7 @@ lf * vi_req->averunnable.ldavg[1], lf * vi_req->averunnable.ldavg[2]); - printf(" CPU usage: %3.2f%%\n", 0.01 * vi_req->cp_time_avg); + printf(" CPU usage: %3.2f%%\n", vi_req->cp_time_avg / 655.04); printf(" Sockets (cur/max): %d/%d;", vi_req->vi_sock_count, vi_req->vi_maxsockets); From owner-p4-projects@FreeBSD.ORG Wed Oct 17 20:10:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D34E016A41B; Wed, 17 Oct 2007 20:10: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 8CEAE16A46C for ; Wed, 17 Oct 2007 20:10:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F8A413C469 for ; Wed, 17 Oct 2007 20:10:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HKAvDQ034803 for ; Wed, 17 Oct 2007 20:10:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HKAviZ034800 for perforce@freebsd.org; Wed, 17 Oct 2007 20:10:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Oct 2007 20:10:57 GMT Message-Id: <200710172010.l9HKAviZ034800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127634 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: Wed, 17 Oct 2007 20:10:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=127634 Change 127634 by rwatson@rwatson_fledge on 2007/10/17 20:10:23 Add comment on requirement for synchronization between audit include files and audit_event. Assign sysarch to the 'other' rather than 'non-attributable' class; this was probably my error some point in the distant past. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#26 (text+ko) ==== @@ -1,5 +1,11 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#25 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#26 $ +# +# The mapping between event identifiers and values is also hard-codedd in +# audit_kevents.h and audit_uevents.h, so changes must occur in both places, +# and programs, such as the kernel, may need to be recompiled to recognize +# those changes. It is advisable not to change the numbering or naming of +# kernel audit events. # 0:AUE_NULL:indir system call:no 1:AUE_EXIT:exit(2):pc @@ -437,7 +443,7 @@ 43097:AUE_ACL_SET_LINK:acl_set_link(2):fm 43098:AUE_ACL_DELETE_LINK:acl_delete_link(2):fm 43099:AUE_ACL_CHECK_LINK:acl_aclcheck_link(2):fa -43100:AUE_SYSARCH:sysarch(2):na +43100:AUE_SYSARCH:sysarch(2):ot 43101:AUE_EXTATTRCTL:extattrctl(2):fm 43102:AUE_EXTATTR_GET_FILE:extattr_get_file(2):fa 43103:AUE_EXTATTR_SET_FILE:extattr_set_file(2):fm From owner-p4-projects@FreeBSD.ORG Wed Oct 17 22:03:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6566316A469; Wed, 17 Oct 2007 22:03: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 1B63216A421 for ; Wed, 17 Oct 2007 22:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 122B613C46B for ; Wed, 17 Oct 2007 22:03:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HM32iT058365 for ; Wed, 17 Oct 2007 22:03:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HM328r058229 for perforce@freebsd.org; Wed, 17 Oct 2007 22:03:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Oct 2007 22:03:02 GMT Message-Id: <200710172203.l9HM328r058229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127637 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: Wed, 17 Oct 2007 22:03:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127637 Change 127637 by rwatson@rwatson_fledge on 2007/10/17 22:02:42 Remove compile-time audit class constants--audit classes are determined at run-time using the audit_class database. In the one case where the constants were actually used, AU_NULL, simply use 0 to indicate that no flags are set. This change will need to be propagated into the kernel BSM code also. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#57 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#23 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#57 (text+ko) ==== @@ -1,5 +1,9 @@ +OpenBSM 1.0 + - Fix bug in auditreduce(8) which resulted in a memory fault/crash when the user specified an event name with -m. +- Remove AU_.* hard-coded audit class constants, as udit classes are now + entirely dynamically configured using /etc/security/audit_class. OpenBSM 1.0 alpha 15 @@ -298,4 +302,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#56 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#57 $ ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#23 (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/bsm/audit.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#23 $ */ #ifndef _BSM_AUDIT_H @@ -62,44 +62,6 @@ #define AU_DEFAUDITID -1 /* - * Define the masks for the classes of audit events. - */ -#define AU_NULL 0x00000000 -#define AU_FREAD 0x00000001 -#define AU_FWRITE 0x00000002 -#define AU_FACCESS 0x00000004 -#define AU_FMODIFY 0x00000008 -#define AU_FCREATE 0x00000010 -#define AU_FDELETE 0x00000020 -#define AU_CLOSE 0x00000040 -#define AU_PROCESS 0x00000080 -#define AU_NET 0x00000100 -#define AU_IPC 0x00000200 -#define AU_NONAT 0x00000400 -#define AU_ADMIN 0x00000800 -#define AU_LOGIN 0x00001000 -#define AU_TFM 0x00002000 -#define AU_APPL 0x00004000 -#define AU_SETL 0x00008000 -#define AU_IFLOAT 0x00010000 -#define AU_PRIV 0x00020000 -#define AU_MAC_RW 0x00040000 -#define AU_XCONN 0x00080000 -#define AU_XCREATE 0x00100000 -#define AU_XDELETE 0x00200000 -#define AU_XIFLOAT 0x00400000 -#define AU_XPRIVS 0x00800000 -#define AU_XPRIVF 0x01000000 -#define AU_XMOVE 0x02000000 -#define AU_XDACF 0x04000000 -#define AU_XMACF 0x08000000 -#define AU_XSECATTR 0x10000000 -#define AU_IOCTL 0x20000000 -#define AU_EXEC 0x40000000 -#define AU_OTHER 0x80000000 -#define AU_ALL 0xffffffff - -/* * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.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_event.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#13 $ */ #include @@ -83,11 +83,11 @@ */ if (evclass != NULL) { if (getauditflagsbin(evclass, &evmask) != 0) - e->ae_class = AU_NULL; + e->ae_class = 0; else e->ae_class = evmask.am_success; } else - e->ae_class = AU_NULL; + e->ae_class = 0; return (e); } From owner-p4-projects@FreeBSD.ORG Wed Oct 17 22:19:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83A7916A477; Wed, 17 Oct 2007 22:19: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 A0E8B16A41B for ; Wed, 17 Oct 2007 22:19:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C2D7113C508 for ; Wed, 17 Oct 2007 22:19:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HMJLLb059287 for ; Wed, 17 Oct 2007 22:19:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HMJLpB059284 for perforce@freebsd.org; Wed, 17 Oct 2007 22:19:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Oct 2007 22:19:21 GMT Message-Id: <200710172219.l9HMJLpB059284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127638 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: Wed, 17 Oct 2007 22:19:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127638 Change 127638 by rwatson@rwatson_fledge on 2007/10/17 22:18:38 audit_class contents are no longer simultaneously defined in audit.h so they don't need to be in sync. Remove comment to this extent. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_class#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_class#5 (text+ko) ==== @@ -1,7 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#4 $ -# -# This file must match audit.h +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_class#5 $ # 0x00000000:no:invalid class 0x00000001:fr:file read From owner-p4-projects@FreeBSD.ORG Wed Oct 17 22:58:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EC9216A46B; Wed, 17 Oct 2007 22:58: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 B6C1E16A417 for ; Wed, 17 Oct 2007 22:58:04 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAC9613C48D for ; Wed, 17 Oct 2007 22:58:04 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HMw4rx061208 for ; Wed, 17 Oct 2007 22:58:04 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HMw33S061205 for perforce@freebsd.org; Wed, 17 Oct 2007 22:58:03 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 17 Oct 2007 22:58:03 GMT Message-Id: <200710172258.l9HMw33S061205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127639 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: Wed, 17 Oct 2007 22:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=127639 Change 127639 by zec@zec_tpx32 on 2007/10/17 22:57:48 Introduce a few macros for easier and more readable fetching of virtualized resource context from a ptr to a proc or thread. The additional benefit is that if we ever decide not to hang vimage / vnet etc. from struct ucred but use some other method instead, we won't have to change hundreds of lines of code, but only those few new macros... Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#13 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#6 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#11 edit .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#9 edit .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#3 edit .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#4 edit .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#5 edit .. //depot/projects/vimage/src/sys/kern/init_main.c#13 edit .. //depot/projects/vimage/src/sys/kern/kern_clock.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_exit.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_fork.c#12 edit .. //depot/projects/vimage/src/sys/kern/kern_jail.c#5 edit .. //depot/projects/vimage/src/sys/kern/kern_linker.c#10 edit .. //depot/projects/vimage/src/sys/kern/kern_mib.c#7 edit .. //depot/projects/vimage/src/sys/kern/kern_prot.c#6 edit .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#9 edit .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#47 edit .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#4 edit .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#16 edit .. //depot/projects/vimage/src/sys/kern/sched_ule.c#16 edit .. //depot/projects/vimage/src/sys/kern/tty.c#11 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#13 edit .. //depot/projects/vimage/src/sys/kern/vfs_export.c#8 edit .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#9 edit .. //depot/projects/vimage/src/sys/net/bpf.c#14 edit .. //depot/projects/vimage/src/sys/net/if.c#21 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#17 edit .. //depot/projects/vimage/src/sys/netinet6/in6.c#13 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#14 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#8 edit .. //depot/projects/vimage/src/sys/sys/sysctl.h#12 edit .. //depot/projects/vimage/src/sys/sys/ucred.h#5 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#44 edit .. //depot/projects/vimage/src/sys/vm/vm_meter.c#7 edit Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#13 (text+ko) ==== @@ -378,7 +378,7 @@ static int linprocfs_dostat(PFS_FILL_ARGS) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); int i; sbuf_printf(sb, "cpu %ld %ld %ld %ld\n", @@ -415,7 +415,7 @@ static int linprocfs_douptime(PFS_FILL_ARGS) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); struct timeval tv; getmicrouptime(&tv); @@ -502,7 +502,7 @@ static int linprocfs_doloadavg(PFS_FILL_ARGS) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); sbuf_printf(sb, "%d.%02d %d.%02d %d.%02d %d/%d %d\n", @@ -994,7 +994,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { - INIT_VNET_NET(curthread->td_ucred->cr_vimage->v_vnet); + INIT_VNET_NET(TD_TO_VNET(curthread)); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -2075,7 +2075,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { - INIT_VNET_NET(curthread->td_ucred->cr_vimage->v_vnet); + INIT_VNET_NET(TD_TO_VNET(curthread)); struct ifnet *ifp; int len, unit; char *ep; @@ -2116,7 +2116,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { - INIT_VNET_NET(td->td_ucred->cr_vimage->v_vnet); + INIT_VNET_NET(TD_TO_VNET(td)); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else ==== //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#11 (text+ko) ==== @@ -125,7 +125,7 @@ int linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); struct l_sysinfo sysinfo; vm_object_t object; int i, j; @@ -697,7 +697,7 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; ==== //depot/projects/vimage/src/sys/dev/firewire/firewire.c#9 (text+ko) ==== @@ -677,7 +677,7 @@ static void fw_reset_crom(struct firewire_comm *fc) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); /* XXX */ + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; ==== //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#3 (text+ko) ==== @@ -116,7 +116,7 @@ ISO_RRIP_SLINK *p; ISO_RRIP_ANALYZE *ana; { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); ISO_RRIP_SLINK_COMPONENT *pcomp; ISO_RRIP_SLINK_COMPONENT *pcompe; int len, wlen, cont; @@ -226,7 +226,7 @@ ISO_RRIP_ALTNAME *p; ISO_RRIP_ANALYZE *ana; { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); char *inbuf; int wlen; int cont; ==== //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#4 (text+ko) ==== @@ -112,7 +112,7 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); /* XXX */ + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#5 (text) ==== @@ -86,7 +86,7 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage/src/sys/kern/init_main.c#13 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_clock.c#12 (text+ko) ==== @@ -94,7 +94,7 @@ static int sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); int error; #ifdef SCTL_MASK32 @@ -421,8 +421,8 @@ td = curthread; p = td->td_proc; #ifdef VIMAGE - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); - INIT_VCPU(td->td_ucred->cr_vimage->v_cpu); + INIT_VPROCG(TD_TO_VPROCG(td)); + INIT_VCPU(TD_TO_VCPU(td)); struct vprocg *vprocg_iter; #endif ==== //depot/projects/vimage/src/sys/kern/kern_exit.c#12 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_fork.c#12 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_jail.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/kern/kern_linker.c#10 (text+ko) ==== @@ -857,12 +857,12 @@ return (error); #ifdef VIMAGE - if (!IS_DEFAULT_VIMAGE(td->td_ucred->cr_vimage)) + if (!IS_DEFAULT_VIMAGE(TD_TO_VIMAGE(td))) return (EPERM); + + CURVNET_SET(TD_TO_VNET(td)); #endif - CURVNET_SET(td->td_ucred->cr_vimage->v_vnet); - /* * If file does not contain a qualified name or any dot in it * (kldname.ko, or kldname.ver.ko) treat it as an interface @@ -929,9 +929,9 @@ return (error); /* XXX should suser catch this for us? */ - VNET_ASSERT(IS_DEFAULT_VIMAGE(td->td_ucred->cr_vimage)); + VNET_ASSERT(IS_DEFAULT_VIMAGE(TD_TO_VIMAGE(td))); - CURVNET_SET(td->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(td)); KLD_LOCK(); lf = linker_find_file_by_id(fileid); @@ -1176,7 +1176,7 @@ } #ifdef VIMAGE if (lf == NULL) { - CURVNET_SET(td->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(td)); error = vi_symlookup(&lookup, symstr); CURVNET_RESTORE(); if (error == 0) { ==== //depot/projects/vimage/src/sys/kern/kern_mib.c#7 (text+ko) ==== @@ -211,7 +211,7 @@ static int sysctl_hostname(SYSCTL_HANDLER_ARGS) { - INIT_VPROCG(req->td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(req->td)); struct prison *pr; char tmphostname[MAXHOSTNAMELEN]; int error; ==== //depot/projects/vimage/src/sys/kern/kern_prot.c#6 (text+ko) ==== @@ -1723,7 +1723,7 @@ KASSERT(td == curthread, ("%s: td not curthread", __func__)); PROC_LOCK_ASSERT(p, MA_OWNED); #ifdef VIMAGE - if (!vi_child_of(td->td_ucred->cr_vimage, p->p_ucred->cr_vimage)) + if (!vi_child_of(TD_TO_VIMAGE(td), P_TO_VIMAGE(p))) #endif if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); ==== //depot/projects/vimage/src/sys/kern/kern_sysctl.c#9 (text+ko) ==== @@ -1503,8 +1503,7 @@ req.lock = REQ_LOCKED; SYSCTL_LOCK(); - CURVNET_SET(curthread->td_ucred->cr_vimage->v_vnet); - VNET_ASSERT(td == curthread); + CURVNET_SET(TD_TO_VNET(curthread)); do { req.oldidx = 0; ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#47 (text+ko) ==== @@ -450,7 +450,7 @@ struct thread *td; { int error; - struct vimage *vip = td->td_ucred->cr_vimage; + struct vimage *vip = TD_TO_VIMAGE(td); struct vimage *vip_r = NULL; struct vimage *tvip; @@ -533,7 +533,7 @@ PROC_UNLOCK(p); sx_xlock(&allproc_lock); oldcred->cr_vimage->v_procg->nprocs--; - p->p_ucred->cr_vimage->v_procg->nprocs++; + P_TO_VPROCG(p)->nprocs++; sched_load_reassign(oldcred->cr_vimage->v_procg, newcred->cr_vimage->v_procg); sx_xunlock(&allproc_lock); ==== //depot/projects/vimage/src/sys/kern/kern_xxx.c#4 (text+ko) ==== @@ -247,7 +247,7 @@ struct thread *td; struct getdomainname_args *uap; { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); int domainnamelen; int error; @@ -272,7 +272,7 @@ struct thread *td; struct setdomainname_args *uap; { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); int error, domainnamelen; error = priv_check(td, PRIV_SETDOMAINNAME); ==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#16 (text+ko) ==== @@ -236,7 +236,7 @@ static __inline void sched_load_add(struct thread *td) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); V_sched_tdcnt++; CTR1(KTR_SCHED, "global load: %d", V_sched_tdcnt); @@ -245,7 +245,7 @@ static __inline void sched_load_rem(struct thread *td) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); V_sched_tdcnt--; CTR1(KTR_SCHED, "global load: %d", V_sched_tdcnt); @@ -405,7 +405,7 @@ PROC_SLOCK(p); #ifdef VIMAGE if (p->p_ucred != NULL) { - INIT_VPROCG(p->p_ucred->cr_vimage->v_procg); + INIT_VPROCG(P_TO_VPROCG(p)); loadfac = loadfactor(V_averunnable.ldavg[0]); } else loadfac = 0; @@ -516,7 +516,7 @@ static void updatepri(struct thread *td) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); struct td_sched *ts; fixpt_t loadfac; unsigned int newcpu; ==== //depot/projects/vimage/src/sys/kern/sched_ule.c#16 (text+ko) ==== @@ -1356,7 +1356,7 @@ #ifndef VIMAGE tdq_load_add(tdq, &td_sched0); #else - tdq_load_add(tdq, &td_sched0, thread0.td_ucred->cr_vimage->v_procg); + tdq_load_add(tdq, &td_sched0, TD_TO_VPROCG(&thread0)); #endif TDQ_UNLOCK(tdq); } @@ -1893,7 +1893,7 @@ #ifndef VIMAGE tdq_load_rem(tdq, ts); #else - tdq_load_rem(tdq, ts, td->td_ucred->cr_vimage->v_procg); + tdq_load_rem(tdq, ts, TD_TO_VPROCG(td)); #endif srqflag = (flags & SW_PREEMPT) ? SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : @@ -1909,7 +1909,7 @@ #ifndef VIMAGE tdq_load_rem(tdq, ts); #else - tdq_load_rem(tdq, ts, td->td_ucred->cr_vimage->v_procg); + tdq_load_rem(tdq, ts, TD_TO_VPROCG(td)); #endif } /* @@ -2417,7 +2417,7 @@ #ifndef VIMAGE tdq_load_add(tdq, ts); #else - tdq_load_add(tdq, ts, td->td_ucred->cr_vimage->v_procg); + tdq_load_add(tdq, ts, TD_TO_VPROCG(td)); #endif } @@ -2501,7 +2501,7 @@ #ifndef VIMAGE tdq_load_rem(tdq, ts); #else - tdq_load_rem(tdq, ts, td->td_ucred->cr_vimage->v_procg); + tdq_load_rem(tdq, ts, TD_TO_VPROCG(td)); #endif TD_SET_CAN_RUN(td); } @@ -2690,8 +2690,7 @@ #ifndef VIMAGE tdq_load_rem(tdq, td->td_sched); #else - tdq_load_rem(tdq, td->td_sched, - td->td_ucred->cr_vimage->v_procg); + tdq_load_rem(tdq, td->td_sched, TD_TO_VPROCG(td)); #endif } KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); ==== //depot/projects/vimage/src/sys/kern/tty.c#11 (text+ko) ==== @@ -1143,7 +1143,7 @@ if (t == tp->t_line) return (0); s = spltty(); - CURVNET_SET(curthread->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(curthread)); ttyld_close(tp, flag); tp->t_line = t; /* XXX: we should use the correct cdev here */ @@ -2534,7 +2534,7 @@ void ttyinfo(struct tty *tp) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); struct timeval utime, stime; struct proc *p, *pick; struct thread *td, *picktd; @@ -3203,7 +3203,7 @@ goto out; goto open_top; } - CURVNET_SET(curthread->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(curthread)); error = ttyld_open(tp, dev); CURVNET_RESTORE(); ttyldoptim(tp); @@ -3222,7 +3222,7 @@ struct tty *tp; tp = dev->si_tty; - CURVNET_SET(curthread->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(curthread)); ttyld_close(tp, flag); CURVNET_RESTORE(); ttyldoptim(tp); ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#13 (text+ko) ==== @@ -364,7 +364,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); #ifdef VIMAGE - so = soalloc(td->td_ucred->cr_vimage->v_vnet); + so = soalloc(TD_TO_VNET(td)); #else so = soalloc(NULL); #endif ==== //depot/projects/vimage/src/sys/kern/vfs_export.c#8 (text+ko) ==== @@ -138,7 +138,7 @@ } #endif - CURVNET_SET(curthread->td_ucred->cr_vimage->v_vnet); /* XXX MARKO */ + CURVNET_SET(TD_TO_VNET(curthread)); /* XXX MARKO */ i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); ==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#9 (text+ko) ==== @@ -141,7 +141,7 @@ struct proc *p = td->td_proc; int vfslocked; #ifdef IMUNES_SYMLINK_HACK - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); #endif KASSERT((cnp->cn_flags & MPSAFE) != 0 || mtx_owned(&Giant) != 0, @@ -301,7 +301,7 @@ #ifdef IMUNES_SYMLINK_HACK if (V_morphing_symlinks) { char *sp = strchr(cp, '@'); - int vnamelen = strlen(td->td_ucred->cr_vimage->vi_name); + int vnamelen = strlen(TD_TO_VIMAGE(td)->vi_name); if (sp) { if (vnamelen >= auio.uio_resid) { @@ -312,8 +312,7 @@ } bcopy(sp + 1, sp + vnamelen, linklen - (sp - cp)); - bcopy(td->td_ucred->cr_vimage->vi_name, sp, - vnamelen); + bcopy(TD_TO_VIMAGE(td)->vi_name, sp, vnamelen); linklen += (vnamelen - 1); } } ==== //depot/projects/vimage/src/sys/net/bpf.c#14 (text+ko) ==== @@ -767,7 +767,7 @@ return (EPERM); } } - CURVNET_SET(td->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(td)); switch (cmd) { default: ==== //depot/projects/vimage/src/sys/net/if.c#21 (text+ko) ==== @@ -1987,7 +1987,7 @@ error = suser(td); if (error == 0) error = vi_if_move((struct vi_req *) data, NULL, - td->td_ucred->cr_vimage); + TD_TO_VIMAGE(td)); return (error); /* ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#17 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/in6.c#13 (text+ko) ==== @@ -799,8 +799,7 @@ struct in6_ifaddr *ia, int flags) { INIT_VNET_INET6(ifp->if_vnet); - /* XXX this bellow is WRONG - MARKO */ - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */ int error = 0, hostIsNew = 0, plen = -1; struct in6_ifaddr *oia; struct sockaddr_in6 dst6; ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#14 (text+ko) ==== @@ -102,8 +102,7 @@ static int get_rand_ifid(struct ifnet *ifp, struct in6_addr *in6) { - /* XXX this bellow is WRONG - MARKO */ - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX V_hostname needs this */ MD5_CTX ctxt; u_int8_t digest[16]; int hostnamelen = strlen(V_hostname); ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#8 (text+ko) ==== @@ -401,7 +401,7 @@ int nfs_mountroot(struct mount *mp, struct thread *td) { - INIT_VPROCG(td->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(td)); struct nfsv3_diskless *nd = &nfsv3_diskless; struct socket *so; struct vnode *vp; @@ -411,7 +411,7 @@ char buf[128]; char *cp; - CURVNET_SET(td->td_ucred->cr_vimage->v_vnet); + CURVNET_SET(TD_TO_VNET(td)); #if defined(BOOTP_NFSROOT) && defined(BOOTP) bootpc_init(); /* use bootp to get nfs_diskless filled in */ #elif defined(NFS_ROOT) ==== //depot/projects/vimage/src/sys/sys/sysctl.h#12 (text+ko) ==== @@ -412,15 +412,15 @@ void *ptr; \ switch (subs) { \ case V_NET: \ - ptr = curthread->td_ucred->cr_vimage->v_vnet->mod_data[mod]; \ + ptr = TD_TO_VNET(curthread)->mod_data[mod]; \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ case V_PROCG: \ - ptr = curthread->td_ucred->cr_vimage->v_procg; \ + ptr = TD_TO_VPROCG(curthread); \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ case V_CPU: \ - ptr = curthread->td_ucred->cr_vimage->v_cpu; \ + ptr = TD_TO_VCPU(curthread); \ arg1 = (void *) ((int) ptr + (int) arg1); \ break; \ default: \ ==== //depot/projects/vimage/src/sys/sys/ucred.h#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/sys/vimage.h#44 (text+ko) ==== @@ -275,6 +275,15 @@ #define INIT_VCPU(arg) struct vcpu *vcpu = (arg); +#define TD_TO_VIMAGE(td) (td)->td_ucred->cr_vimage +#define TD_TO_VNET(td) (td)->td_ucred->cr_vimage->v_vnet +#define TD_TO_VPROCG(td) (td)->td_ucred->cr_vimage->v_procg +#define TD_TO_VCPU(td) (td)->td_ucred->cr_vimage->v_cpu +#define P_TO_VIMAGE(p) (p)->p_ucred->cr_vimage +#define P_TO_VNET(p) (p)->p_ucred->cr_vimage->v_vnet +#define P_TO_VPROCG(p) (p)->p_ucred->cr_vimage->v_procg +#define P_TO_VCPU(p) (p)->p_ucred->cr_vimage->v_cpu + #else /* !VIMAGE */ /* Non-VIMAGE null-macros */ @@ -294,6 +303,14 @@ #define VPROCG_ITERLOOP_BEGIN() #define VPROCG_ITERLOOP_END() #define INIT_VCPU(arg) +#define TD_TO_VIMAGE(td) +#define TD_TO_VNET(td) +#define TD_TO_VPROCG(td) +#define TD_TO_VCPU(td) +#define P_TO_VIMAGE(p) +#define P_TO_VNET(p) +#define P_TO_VPROCG(p) +#define P_TO_VCPU(p) #endif /* !VIMAGE */ ==== //depot/projects/vimage/src/sys/vm/vm_meter.c#7 (text+ko) ==== @@ -79,7 +79,7 @@ static int sysctl_vm_loadavg(SYSCTL_HANDLER_ARGS) { - INIT_VPROCG(curthread->td_ucred->cr_vimage->v_procg); + INIT_VPROCG(TD_TO_VPROCG(curthread)); #ifdef SCTL_MASK32 u_int32_t la[4]; From owner-p4-projects@FreeBSD.ORG Wed Oct 17 23:58:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6252016A41B; Wed, 17 Oct 2007 23:58: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 17CAB16A419 for ; Wed, 17 Oct 2007 23:58:15 +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 0EC1713C458 for ; Wed, 17 Oct 2007 23:58:15 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9HNwE8c065438 for ; Wed, 17 Oct 2007 23:58:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9HNwEs7065435 for perforce@freebsd.org; Wed, 17 Oct 2007 23:58:14 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 17 Oct 2007 23:58:14 GMT Message-Id: <200710172358.l9HNwEs7065435@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 127642 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: Wed, 17 Oct 2007 23:58:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=127642 Change 127642 by pgj@disznohal on 2007/10/17 23:58:01 Add initial Hungarian translation of Chapter 22: Localization. Affected files ... .. //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/l10n/chapter.sgml#2 (text+ko) ==== @@ -3,152 +3,208 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml,v 1.124 2007/05/27 09:37:10 brueffer Exp $ --> + - + Andrey Chernov - Contributed by + Írta: Michael C. Wu - Rewritten by + Újraírta: - - Localization - I18N/L10N Usage and Setup + Honosítás &mdash Az I18N/L10N használata + és beállítása - Synopsis + Áttekintés - FreeBSD is a very distributed project with users and - contributors located all over the world. This chapter discusses - the internationalization and localization features of FreeBSD - that allow non-English speaking users to get real work done. - There are many aspects of the i18n implementation in both the system - and application levels, so where applicable we refer the reader - to more specific sources of documentation. + A &os; felhasználói és + résztvevõi földrajzi helyét tekintve a + világban nagyon szerteoszlik. Ebben a fejezetben + ismertetjük a &os; honosításához + és idegennyelvre fordításához + alkalmazható eszközöket, amelyek + segítségével az angolt nem, vagy csak + kevébé ismerõ felhasználók is + képesek lesznek komolyabban használni. Az i18n + megvalósítása rengeteg szemszögbõl + megközelíthetõ rendszer és + alkalmazás szintjén egyaránt, ezért + ahol szükséges, hivatkozni fogunk az odaillõ + forrásokra. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - How different languages and locales are encoded - on modern operating systems. - How to set the locale for your login - shell. - How to configure your console for non-English - languages. - How to use X Window System effectively with different - languages. - Where to find more information about writing - i18n-compliant applications. + + Milyen nyelveket és nyelvi + beállításokat találhatunk napjaink + operációs rendszereiben. + + + Hogyan használjuk a nyelvi + beállításokat a saját + shellünkben. + + + Hogyan állítsuk be a konzolt az angolon + kívül más nyelvekhez. + + + Hogyan használjuk ténylegesen az X Window + Systemet a különbözõ nyelvekkel. + + + Hol olvashatunk többet az I18N-kompatibilis + alkalmazások + fejlesztésérõl. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Know how to install additional third-party - applications (). + + Külsõs alkalmazáok + telepítésének ismerete (). + - The Basics + Az alapok - What Is I18N/L10N? + Mi az I18N/L10N? - internationalization - localization + idegennyelvûség + honosítás - localization + honosítás - Developers shortened internationalization into the term I18N, - counting the number of letters between the first and the last - letters of internationalization. L10N uses the same naming - scheme, coming from localization. Combined - together, I18N/L10N methods, protocols, and applications allow - users to use languages of their choice. + A fejlesztõk az I18N elnevezést az angol + internationalization + (idegennyelvûség) szóból + származtatják, amiben a szám az elsõ + és utolsó betû (az I és + N) közt állók + mennyiségére utal. Ehhez hasonlóan + keletkezett az L10N a localization + (honosítás) kifejezésbõl. Ezek + házasságából jöttek + létre az I18N/L10N módszerei, protokolljai + és mindazon alkalmazásai, melyekkel a + felhasználók a választott nyelvüket + használni tudják. - I18N applications are programmed using I18N kits under - libraries. It allows for developers to write a simple file and - translate displayed menus and texts to each language. We strongly - encourage programmers to follow this convention. + Az I18N alkalmazások céljak + eléréséhez + függvénykönyvtárakban implementált + I18N készleteket használnak. Ezzel + lehetõvé válik a fejlesztõik + számára, hogy összegyûjtsék a + programukban megjelenõ összes szöveget egyetlen + állományba, majd azt külön + lefordítsák a különbözõ + nyelvekre. Mi is ezen konvenció + követésére szeretnénk bíztatni + minden programozót. - Why Should I Use I18N/L10N? + Miért használjuk az I18N/L10N-t? - I18N/L10N is used whenever you wish to either view, input, or - process data in non-English languages. + Az I18N/L10N mindenhol jól jöhet, ahol + idegennyelvû adatot akarunk megjeleníteni, + bekérni vagy feldolgozni. - What Languages Are Supported in the I18N Effort? + Milyen nyelveket támogat az I18N? - I18N and L10N are not FreeBSD specific. Currently, one can - choose from most of the major languages of the World, including - but not limited to: Chinese, German, Japanese, Korean, French, - Russian, Vietnamese and others. + Az I18N és L10N nem korlátozódik a &os; + tudására. Jelenleg a világban beszélt + legelterjedtebb nyelvek mindegyikét használhatjuk + bennük. Csak néhányat + megemlítünk közülük: kínai, + német, japán, koreai, francia, orosz, + vietnámi és még sok más. - Using Localization + A honosítás használata - In all its splendor, I18N is not FreeBSD-specific and is a - convention. We encourage you to help FreeBSD in following this - convention. - locale + Az I18N minden pompájával együtt + független a &os;-tõl, egy egyezményes rendszer. + Mindenkit bátorítunk arra, hogy segítse a + &os;-t ennek az egyezménynek a + betartásában. + nyelvi beállítások - Localization settings are based on three main terms: - Language Code, Country Code, and Encoding. Locale names are - constructed from these parts as follows: + A honosítás beállításai + három fõbb részre tagolhatóak: a nyelv + kódja, az ország kódja és a + kódolás. A nyelvi beállítások + nevei is ezekbõl állnak össze, az alábbi + séma szerint: - LanguageCode_CountryCode.Encoding + NyelviKód_OrszágKód.Kódolás - Language and Country Codes - language codes - country codes + A nyelv és az ország kódja + nyelvi kódok + országkódok - In order to localize a FreeBSD system to a specific language - (or any other I18N-supporting &unix; like systems), the user needs to find out - the codes for the specify country and language (country - codes tell applications what variation of given - language to use). In addition, web - browsers, SMTP/POP servers, web servers, etc. make decisions based on - them. The following are examples of language/country codes: + A &os; (vagy bármilyen más, az I18N-t + ismerõ) rendszer adott nyelvre történõ + honosításához a + felhasználónak ismernie kell az adott + országra és nyelvre vonatkozó + kódokat (az országkód fogja elárulni + az alkalmazásnak, hogy a nyelv melyik + változatát használja). + Ezenkívül a böngészõk, SMTP/POP + szerverek és webszerverek stb. is ennek alapján + fognak döntéseket hozni. Íme + néhány nyelv/ország kódja: - Language/Country Code - Description + Nyelv/ország kódja + Leírás en_US - English - United States + Angol - Egyesült Államok ru_RU - Russian for Russia + Orosz - Oroszország zh_TW - Traditional Chinese for Taiwan + Hagyományos kínai - Tajvan @@ -157,136 +213,200 @@ - Encodings - encodings + Kódolások + kódolások ASCII - Some languages use non-ASCII encodings that are 8-bit, wide - or multibyte characters, see &man.multibyte.3; for more - details. Older applications do not recognize them - and mistake them for control characters. Newer applications - usually do recognize 8-bit characters. Depending on the - implementation, users may be required to compile an application - with wide or multibyte characters support, or configure it correctly. - To be able to input and process wide or multibyte characters, the FreeBSD Ports Collection has provided - each language with different programs. Refer to the I18N - documentation in the respective FreeBSD Port. + Bizonyos nyelvek 8 bites, széles vagy több + byte-os, nem ASCII kódolású karaktereket + használnak, melyekrõl a &man.multibyte.3; man + oldalán olvashatunk részletesebben. Ezeket + régebbi alkalmazások egyáltalán nem + ismerik fel, és hibásan + vezérlõkaraktereknek nézik. Az + újabbak általában már felismerik a 8 + bites karaktereket. A felhasználóknak az + alkalmazásokat a széles vagy a több byte-os + karakterek használatához vagy újra kell + fordítaniuk, vagy pedig megfelelõen be kell + állítaniuk, az + implementációtól függõen. A + széles vagy több byte-os karakterek + beolvasásához és + feldolgozásához a &os; + Portgyûjtemény nyelvenként tartalmaz + különféle programokat. A konkrét + részletek megértéséhez olvassuk el + az érintett &os; portok I18N + dokumentációját. - Specifically, the user needs to look at the application - documentation to decide on how to configure it correctly or to - pass correct values into the configure/Makefile/compiler. + Vagyis a felhasználóknak át kell + nézniük az alkalmazáshoz tartozó + dokumentációt, mivel ebbõl tudhatják + meg, hogyan állítsák be õket + megfelelõen vagy milyen értékeket adjanak + át a configure/Makefile/fordító + hármasnak. - Some things to keep in mind are: + Amiket esetleg érdemes lehet ezzel kapcsolatban + észben tartanunk: - Language specific single C chars character sets - (see &man.multibyte.3;), e.g. - ISO8859-1, ISO8859-15, KOI8-R, CP437. + A nyelvfüggõ egyszerû karakteres + készletek (ld. &man.multibyte.3;), pl. ISO8859-1, + ISO8859-15, KOI8-R, CP437. - Wide or multibyte encodings, e.g. EUC, Big5. + A széles vagy több byte-os + kódolások, pl. az EUC, Big5. - You can check the active list of character sets at the - IANA Registry. + A karakterkészletek jelenleg elérhetõ + listáját meg tudjuk tekinteni az IANA + adatbázisában. - &os; use X11-compatible locale encodings instead. + A &os; helyettük X11-kompatibilis nyelvi + kódolásokat használ. - I18N Applications + I18N alkalmazások - In the FreeBSD Ports and Package system, I18N applications - have been named with I18N in their names for - easy identification. However, they do not always support the - language needed. + A &os; port- és csomagrendszerében az I18N + alkalmazások a könnyebb felismerhetõség + érdekében a nevükben tartalmazzák az + I18N megnevezést. Azonban nem minden + esetben támogatják a szükséges + nyelvet. - Setting Locale + A nyelvi beállítások + megadása - Usually it is sufficient to export the value of the locale name - as LANG in the login shell. This could be done in - the user's ~/.login_conf file or in the - startup file of the user's shell (~/.profile, + Általában elegendõ annyi, hogy a + kívánt nyelvi beállítás + nevét exportáljuk az általunk + használt shell LANG környezeti + változójába. Ez megtehetõ a + felhasználói könyvtárunkban + található ~/.login_conf, vagy + a felhasználói shell indító + állományában + (~/.profile, ~/.bashrc, ~/.cshrc). - There is no need to set the locale subsets such as - LC_CTYPE, LC_CTIME. Please - refer to language-specific FreeBSD documentation for more - information. + Nem szükséges a nyelvi + beállítások részleteit, mint mondjuk + az LC_CTYPE, LC_CTIME + változókat, megadni. A pontosabb + részleteket a &os; adott nyelvre vonatkozó + dokumentációjában találjuk + meg. - You should set the following two environment variables in your configuration - files: + A következõ két környezeti + változó kell megadnunk az említett + konfigurációs állományokban: POSIX - - LANG for &posix; &man.setlocale.3; family - functions + + A LANG változót a &posix; + &man.setlocale.3; családjának MIME - MM_CHARSET for applications' MIME character - set + A MM_CHARSET változót az + alkalmazás MIME + karakterkészletéhez - This includes the user shell configuration, the specific application - configuration, and the X11 configuration. + Ez magában foglalja a felhasználói + shell, az adott alkalmazás és az X11 + beállítását. - Setting Locale Methods - locale - login class + A nyelvi beállítások + megadásának módszerei + nyelvi + beállítások + bejelentkezési + osztály - There are two methods for setting locale, and both are - described below. The first (recommended one) is by assigning - the environment variables in login - class, and the second is by adding the environment - variable assignments to the system's shell startup file. + Két módszer létezik a nyelvi + beállítások megadására, ezen + kettõrõl fogunk a továbbiakban + beszélni. Az elsõ (és egyben + ajánlott) ezek közül a bejelentkezési + osztályban levõ környezeti + változók beállítása, a + második pedig környezeti változók + hozzáadása a rendszer shell indító + állományához. - Login Classes Method + Beállítás a bejelentkezési + osztályokkal - This method allows environment variables needed for locale - name and MIME character sets to be assigned once for every - possible shell instead of adding specific shell assignments to - each shell's startup file. User - Level Setup can be done by an user himself and Administrator Level Setup require - superuser privileges. + Ezzel a módszerrel a nyelvi + beállítás nevéhez és a MIME + karakterkészlethez kötõdõ + környezeti változókat az összes + létezõ shell számára csak egyszer + kell megadnunk ahelyett, hogy külön + mindegyikük + indítóállományában + szerepeltetnénk. A felhasználó a saját részét + maga is elvégezheti, míg a rendszer szintjén + adminisztrátori jogosultságokat + igényel. - User Level Setup + Felhasználói szintû + beállítás - Here is a minimal example of a - .login_conf file in user's home - directory which has both variables set for Latin-1 - encoding: + Íme példa gyanánt a + felhasználó könyvtárában + egy egyszerû .login_conf + állomány, amiben mind a két + változót Latin-1 kódolásra + állítottuk: me:\ :charset=ISO-8859-1:\ :lang=de_DE.ISO8859-1: - Traditional ChineseBIG-5 encoding - Here is an example of a - .login_conf that sets the variables - for Traditional Chinese in BIG-5 encoding. Notice the many - more variables set because some software does not respect - locale variables correctly for Chinese, Japanese, and Korean. + hagyományos + kínaiBIG-5 + kódolás + Ebben a .login_conf + példában a változókat BIG-5 + kódolású hagyomános + kínai nyelvre állítjuk. + Észrevehetjük, hogy itt sokkal több + változó + beállítására van + szükségünk, mivel egyes szoftverek nem + kezelik megfelelõen a nyelvi + beállításokat kínai, + japán és koreai nyelvek + esetén. - #Users who do not wish to use monetary units or time formats -#of Taiwan can manually change each variable + # Azok a felhasználók, akik nem kívánnak tajvani pénz- vagy idõ formátumot +# használni, egyenként írják át a változókat me:\ :lang=zh_TW.Big5:\ :setenv=LC_ALL=zh_TW.Big:\ @@ -297,233 +417,323 @@ :setenv=LC_NUMERIC=zh_TW.Big5:\ :setenv=LC_TIME=zh_TW.Big5:\ :charset=big5:\ - :xmodifiers="@im=gcin": #Set gcin as the XIM Input Server + :xmodifiers="@im=gcin": # a gcin beállítása XIM szerverként - See Administrator Level - Setup and &man.login.conf.5; for more details. + A többit ld. a Rendszergazdai szintû + beállítások + résznél és a &man.login.conf.5; man + oldalon. - Administrator Level Setup + Rendszergazdai szintû + beállítás - Verify that the user's login class in - /etc/login.conf sets the correct - language. Make sure these settings - appear in /etc/login.conf: + Ellenõrizzük, hogy a + felhasználó + /etc/login.conf + állományban szereplõ + bejelentkezési osztálya a megfelelõ + nyelvet állítja be. + Gyõzõdjünk meg róla, hogy az + alábbi beállítások helyet + kapnak az /etc/login.conf + állományban: - language_name:accounts_title:\ - :charset=MIME_charset:\ - :lang=locale_name:\ + nyelv_neve:hozzáférés_megnevezése:\ + :charset=MIME_karakterkészlet:\ + :lang=nyelvi_beállítás_neve:\ :tc=default: - So sticking with our previous example using Latin-1, it - would look like this: + Folytassuk tovább az elõbbi Latin-1-es + példánk szerint: - german:German Users Accounts:\ + nemet:Nemet felhasznalok hozzaferesei:\ :charset=ISO-8859-1:\ :lang=de_DE.ISO8859-1:\ :tc=default: - Before changing users Login Classes execute - the following command: + Mielõtt megváltoztatnánk a + felhasználók bejelentkezési + osztályait, adjuk ki a következõ + parancsot: &prompt.root; cap_mkdb /etc/login.conf - to make new configuration in - /etc/login.conf visible to the system. + Ezzel a /etc/login.conf új + tartalma láthatóvá válik a + rendszer számára. - Changing Login Classes with &man.vipw.8; + A bejelentkezési + osztály megváltoztatása a + &man.vipw.8;-vel - vipw - - Use vipw to add new users, and make - the entry look like this: + vipw + + A vipw-et új + felhasználók hozzáadására + használjuk, aminek eredményeképpen + egy ehhez hasonló bejegyzést tudunk + létrehozni: - user:password:1111:11:language:0:0:User Name:/home/user:/bin/sh + felhasznalo:jelszo:1111:11:nyelv:0:0:Felhasznalo neve:/home/felhasznalo:/bin/sh - Changing Login Classes with &man.adduser.8; + A bejelentkezési + osztály megváltoztatása az + &man.adduser.8;-rel - adduser - - login class - Use adduser to add new users, and do - the following: + adduser + + bejelentkezési + osztály + Az adduser-rel az alábbiak + szerint tudunk új felhasználókat + felvenni a rendszerbe: - Set defaultclass = - language in - /etc/adduser.conf. Keep in mind - you must enter a default class for - all users of other languages in this case. + Adjuk hozzá a defaultclass = + nyelv sort az + /etc/adduser.conf-hoz. Ne + felejtsük el, hogy ezután minden olyan + felhasználónál a + default bejelentkezési + osztályt meg kell adni, akik nem ezt a nyelvet + használják. - An alternative variant is answering the specified - language each time that + Egy másik megoldás lehet, hogy a + &man.adduser.8; használata során minden + felhasználó esetén + külön megadjuk a nyelvet az Enter login class: default []: - appears from &man.adduser.8;. + rész megjelenésekor. - Another alternative is to use the following for each - user of a different language that you wish to - add: + Vagy használhatjuk az alábbit az + egyes eltérõ nyelvû + felhasználók + hozzáadásánál: - &prompt.root; adduser -class language + &prompt.root; adduser -class nyelv - Changing Login Classes with &man.pw.8; + A bejelentkezési + osztály megváltoztatása a + &man.pw.8;-vel - pw - - If you use &man.pw.8; for adding new users, call it in - this form: + pw + + Amennyiben a &man.pw.8;-t használjuk új + felhasználók + hozzáadására, így + érdemes meghívnunk: - &prompt.root; pw useradd user_name -L language + &prompt.root; pw useradd felhasznalo_neve -L nyelv - Shell Startup File Method + Beállítás a shell + indító állományával - This method is not recommended because it requires a - different setup for each possible shell program chosen. Use - the Login Class Method - instead. + Ezt a módszert nem javasoljuk, mivel + shellenként eltérõ + beállítást kíván. + Használjuk helyette a bejelentkezési + osztályokkal megvalósított + módszert. MIME - locale - To add the locale name and MIME character set, just set - the two environment variables shown below in the - /etc/profile and/or - /etc/csh.login shell startup files. We - will use the German language as an example below: + + nyelvi + beállítás + + A nyelvi beállítás nevének + és a MIME karakterkészlet + beállításához egyszerûen + csak adjuk meg a lenti /etc/profile + és/vagy /etc/csh.login shell + indító állományokban bemutatott + környezeti változót. Továbbra is + a német nyelvet használjuk a + példánkban: - In /etc/profile: + Az /etc/profile + esetén: LANG=de_DE.ISO8859-1; export LANG MM_CHARSET=ISO-8859-1; export MM_CHARSET - Or in /etc/csh.login: + Vagy a /etc/csh.login + esetén: setenv LANG de_DE.ISO8859-1 setenv MM_CHARSET ISO-8859-1 - Alternatively, you can add the above instructions to - /usr/share/skel/dot.profile (similar to - what was used in /etc/profile above), or - /usr/share/skel/dot.login (similar to - what was used in /etc/csh.login - above). + Úgy is megoldhatjuk ezt a feladatot, ha fenti + utasításokat a + /usr/share/skel/dot.profile + (hasonló a fentebb említett + /etc/profile állományhoz) + vagy /usr/share/skel/dot.login + (hasonló a fentebb említett + /etc/csh.login + állományhoz) esetén hajtjuk + végre. - For X11: + X11 esetén: - In $HOME/.xinitrc: + Adjuk meg a $HOME/.xinitrc + állományban: LANG=de_DE.ISO8859-1; export LANG - Or: + Vagy: setenv LANG de_DE.ISO8859-1 - Depending on your shell (see above). + Attól függõen, milyen shellt + használunk (ld. fentebb). - Console Setup + A konzol beállítása - For all single C chars character sets, set the correct - console fonts in /etc/rc.conf for the - language in question with: + Az összes egyszerû karakteres készlet + esetén a kérdéses nyelvhez megfelelõ + konzolos betûtípust az + /etc/rc.conf állományban + tudjuk beállítani: - font8x16=font_name -font8x14=font_name -font8x8=font_name + font8x16=betûtípus_neve +font8x14=betûtípus_neve +font8x8=betûtípus_neve - The font_name here is taken from - the /usr/share/syscons/fonts directory, - without the .fnt suffix. + Itt a betûtípus_neve + az .fnt kiterjesztés + elhagyásával a + /usr/share/syscons/fonts + könyvtárban található + állományok nevébõl adható + meg. sysinstall - keymap - screenmap - Also be sure to set the correct keymap and screenmap for your - single C chars character set through - sysinstall (/stand/sysinstall - in &os; versions older than 5.2). - Once inside sysinstall, choose Configure, then - Console. Alternatively, you can add the - following to /etc/rc.conf: + billentyûkiosztás + betûkiosztás + Mindezek mellett állítsuk be a megfelelõ + billentyû- és betûkiosztást is a + sysinstall (vagy + /stand/sysinstall a &os; 5.2-nél + régebbi változataiban) + segítségével. Ahogy sikerült + elindítanunk a sysinstallt, + válasszuk a Configure + (Beállítások) pontot, majd a + Console (Konzol)-t! Vagy ehelyett + beírhatjuk az alábbi sorokat a + /etc/rc.conf + állományba: + + scrnmap=betűkiosztás_neve +keymap=billentyûkiosztás_neve +keychange="funkcióbillentyû_sorszáma szekvencia" - scrnmap=screenmap_name -keymap=keymap_name -keychange="fkey_number sequence" - - The screenmap_name here is taken - from the /usr/share/syscons/scrnmaps - directory, without the .scm suffix. A - screenmap with a corresponding mapped font is usually needed as a - workaround for expanding bit 8 to bit 9 on a VGA adapter's font - character matrix in pseudographics area, i.e., to move letters out - of that area if screen font uses a bit 8 column. + Itt a + betûkiosztás_neve a + /usr/share/syscons/scrnmaps + könyvtárban található + állományok nevébõl + származtatható az .scm + kiterjesztés elhagyásával. A + betûkiosztásokat általában a 9 bites + karaktermátrixszal rendelkezõ VGA + megjelenítõk problémáinak + megoldására lehet használni, mivel + így az eredetileg 8 bittel ábrázolt + betûket ki lehet tolni az ilyen típusú + kártyák pszeudografikus + területérõl. - If you have the moused daemon - enabled by setting the following - in your /etc/rc.conf: + Ha aktiváltuk a moused + egérkezelõ daemont az + /etc/rc.conf állományban az + alábbi sor megadásával: moused_enable="YES" - then examine the mouse cursor information in the next - paragraph. + akkor a következõ bekezdésben rá is + térhetünk az egérmutató adatainak + vizsgálatára. moused - By default the mouse cursor of the &man.syscons.4; driver occupies the - 0xd0-0xd3 range in the character set. If your language uses this - range, you need to move the cursor's range outside of it. To enable - the workaround for &os;, add the following line to - /etc/rc.conf: + A &man.syscons.4; meghajtóban található + egérmutató alapértelmezés szerint a + 0xd0 - 0xd3 karaktereket foglalja el a + karakterkészletben. Ha a nyelv ezeket használja, + arrébb kell költöztetnünk ezt az + egérmutató által elfoglalt sávot. A + &os;-ben az /etc/rc.conf + állományon keresztül érhetjük + el: mousechar_start=3 - The keymap_name here is taken from - the /usr/share/syscons/keymaps directory, - without the .kbd suffix. If you are - uncertain which keymap to use, you use can &man.kbdmap.1; to test - keymaps without rebooting. + A + billentyûkiosztás_neve a + /usr/share/syscons/keymaps + könyvtárból, a .kbd + kiterjesztés elhagyásával keletkezik. Ha + nem vagyunk benne biztosak, melyik kiosztást is kellene + használnunk, a &man.kbdmap.1; + segítségével a rendszer + újraindítása nélkül + kipróbálhatjuk a rendelkezésre + álló billentyûkiosztásokat. - The keychange is usually needed to program - function keys to match the selected terminal type because - function key sequences cannot be defined in the key map. + A keychange használatára + többnyire a funkcióbillentyûk adott + termináltípushoz egyeztetéséhez van + szükség, mert a funkcióbillentyûk + szekvenciái nem adhatóak meg a + billentyûkiosztásban. - Also be sure to set the correct console terminal type in - /etc/ttys for all ttyv* - entries. Current pre-defined correspondences are: + Ezeken felül érdemes megbizonyosodnunk + róla, hogy a /etc/ttys + állományban jól állítjuk be a >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 18 00:20:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2237A16A420; Thu, 18 Oct 2007 00:20: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 B270216A41B for ; Thu, 18 Oct 2007 00:20:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A975413C467 for ; Thu, 18 Oct 2007 00:20:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I0KdRQ067817 for ; Thu, 18 Oct 2007 00:20:39 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I0KdXt067814 for perforce@freebsd.org; Thu, 18 Oct 2007 00:20:39 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 18 Oct 2007 00:20:39 GMT Message-Id: <200710180020.l9I0KdXt067814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127644 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, 18 Oct 2007 00:20:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=127644 Change 127644 by zec@zec_tpx32 on 2007/10/18 00:20:05 Cosmetic change: v_vnet -> v_net Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#48 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#45 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#48 (text+ko) ==== @@ -252,7 +252,7 @@ struct vimage *vip; LIST_FOREACH(vip, &vimage_head, vi_le) - if (vip->v_vnet == vnet) + if (vip->v_net == vnet) return(vip); panic("vnet2vimage"); /* must never happen */ @@ -300,13 +300,13 @@ if (vi_req == NULL || strcmp(vi_req->vi_name, "-") == 0) { if (IS_DEFAULT_VIMAGE(vip)) return (ENXIO); - new_vnet = vip->vi_parent->v_vnet; + new_vnet = vip->vi_parent->v_net; } else LIST_FOREACH(new_vip, &vimage_head, vi_le) { if (!vi_child_of(vip, new_vip)) continue; if (strcmp(vi_req->vi_name, new_vip->vi_name) == 0) { - new_vnet = new_vip->v_vnet; + new_vnet = new_vip->v_net; break; } } @@ -502,8 +502,8 @@ bcopy(&vip_r->v_procg->_averunnable, &vi_req->averunnable, sizeof (vi_req->averunnable)); vi_req->vi_proc_count = vip_r->v_procg->nprocs; - vi_req->vi_if_count = vip_r->v_vnet->ifccnt; - vi_req->vi_sock_count = vip_r->v_vnet->sockcnt; + vi_req->vi_if_count = vip_r->v_net->ifccnt; + vi_req->vi_sock_count = vip_r->v_net->sockcnt; vi_req->cp_time_avg = vip_r->v_cpu->_avg2_fixp; break; @@ -614,7 +614,7 @@ vnet = vi_malloc(sizeof(struct vnet), M_VNET, M_NOWAIT | M_ZERO); if (vnet == NULL) panic("vi_alloc: malloc failed for vnet \"%s\"\n", name); - vip->v_vnet = vnet; + vip->v_net = vnet; vnet->vnet_id = last_vnet_id++; vnet->vnet_magic_n = VNET_MAGIC_N; @@ -669,7 +669,7 @@ static int vi_destroy(struct vimage *vip) { - struct vnet *vnet = vip->v_vnet; + struct vnet *vnet = vip->v_net; struct vprocg *vprocg = vip->v_procg; struct vcpu *vcpu = vip->v_cpu; struct ifnet *ifp, *nifp; ==== //depot/projects/vimage/src/sys/sys/vimage.h#45 (text+ko) ==== @@ -276,11 +276,11 @@ #define INIT_VCPU(arg) struct vcpu *vcpu = (arg); #define TD_TO_VIMAGE(td) (td)->td_ucred->cr_vimage -#define TD_TO_VNET(td) (td)->td_ucred->cr_vimage->v_vnet +#define TD_TO_VNET(td) (td)->td_ucred->cr_vimage->v_net #define TD_TO_VPROCG(td) (td)->td_ucred->cr_vimage->v_procg #define TD_TO_VCPU(td) (td)->td_ucred->cr_vimage->v_cpu #define P_TO_VIMAGE(p) (p)->p_ucred->cr_vimage -#define P_TO_VNET(p) (p)->p_ucred->cr_vimage->v_vnet +#define P_TO_VNET(p) (p)->p_ucred->cr_vimage->v_net #define P_TO_VPROCG(p) (p)->p_ucred->cr_vimage->v_procg #define P_TO_VCPU(p) (p)->p_ucred->cr_vimage->v_cpu @@ -388,7 +388,7 @@ struct vprocg *v_procg; struct vcpu *v_cpu; - struct vnet *v_vnet; + struct vnet *v_net; }; struct vprocg { From owner-p4-projects@FreeBSD.ORG Thu Oct 18 01:48:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E525216A421; Thu, 18 Oct 2007 01:48: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 868B716A41A for ; Thu, 18 Oct 2007 01:48:39 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outL.internet-mail-service.net (outL.internet-mail-service.net [216.240.47.235]) by mx1.freebsd.org (Postfix) with ESMTP id 7230113C465 for ; Thu, 18 Oct 2007 01:48:39 +0000 (UTC) (envelope-from julian@elischer.org) Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160) by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP; Wed, 17 Oct 2007 18:48:38 -0700 X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100]) by idiom.com (Postfix) with ESMTP id C565C126729; Wed, 17 Oct 2007 18:48:37 -0700 (PDT) Message-ID: <4716BB87.1040004@elischer.org> Date: Wed, 17 Oct 2007 18:48:55 -0700 From: Julian Elischer User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728) MIME-Version: 1.0 To: Marko Zec References: <200710172258.l9HMw33S061205@repoman.freebsd.org> In-Reply-To: <200710172258.l9HMw33S061205@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 127639 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, 18 Oct 2007 01:48:40 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=127639 > > Change 127639 by zec@zec_tpx32 on 2007/10/17 22:57:48 > > Introduce a few macros for easier and more readable fetching > of virtualized resource context from a ptr to a proc or thread. > > The additional benefit is that if we ever decide not to hang > vimage / vnet etc. from struct ucred but use some other > method instead, we won't have to change hundreds of lines of > code, but only those few new macros... I see this sort of thing many times.. > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > > + INIT_VNET_NET(TD_TO_VNET(curthread)); > + INIT_VNET_NET(TD_TO_VNET(curthread)); > > + INIT_VNET_NET(TD_TO_VNET(td)); > + INIT_VPROCG(TD_TO_VPROCG(td)); > + INIT_VPROCG(TD_TO_VPROCG(td)); > + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > + INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ > > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > might not they be further macroised as: #define VNET_FROM_TD(_td) INIT_VNET_NET(TD_TO_VNET(_td)) #define VPROCG_FROM_TD(_td) INIT_VPROCG(TD_TO_VPROCG(_td)) etc. not a requirement.. just a comment. > From owner-p4-projects@FreeBSD.ORG Thu Oct 18 02:13:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC27516A468; Thu, 18 Oct 2007 02:13: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 99EB316A41B for ; Thu, 18 Oct 2007 02:13:52 +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 7E17F13C474 for ; Thu, 18 Oct 2007 02:13:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I2Dq4T084692 for ; Thu, 18 Oct 2007 02:13:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I2DqkV084689 for perforce@freebsd.org; Thu, 18 Oct 2007 02:13:52 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 02:13:52 GMT Message-Id: <200710180213.l9I2DqkV084689@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 127646 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, 18 Oct 2007 02:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=127646 Change 127646 by jb@jb_freebsd1 on 2007/10/18 02:13:15 The start of a BSD licensed libdwarf. The API differs from the GNU libdwarf (from SGI) which differs from the GNU libdwarf (from Red Hat). The functionality here so far is adequate for DTrace's CTF tools. The client does not need to keep track of allocated memory like the GNU versions do. This code assumes the use of FreeBSD's libelf. In particular it assumes that it is OK to open an ELF file read-only, call elf_getdata() and then modify the in-memory data buffer. This is important because any optimisation level in gcc causes the generation of debug sections with RELA sections. Affected files ... .. //depot/projects/dtrace/src/lib/libdwarf/Makefile#1 add .. //depot/projects/dtrace/src/lib/libdwarf/_libdwarf.h#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf.h#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_abbrev.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attr.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_attrval.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_cu.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_dealloc.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_die.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_dump.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_errmsg.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_errno.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_finish.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_form.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_init.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/dwarf_loc.c#1 add .. //depot/projects/dtrace/src/lib/libdwarf/libdwarf.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 02:14:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 297B016A46D; Thu, 18 Oct 2007 02:14: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 D5A0916A469 for ; Thu, 18 Oct 2007 02:14:53 +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 C668313C458 for ; Thu, 18 Oct 2007 02:14:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I2ErNw084726 for ; Thu, 18 Oct 2007 02:14:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I2ErGa084723 for perforce@freebsd.org; Thu, 18 Oct 2007 02:14:53 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 02:14:53 GMT Message-Id: <200710180214.l9I2ErGa084723@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 127647 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, 18 Oct 2007 02:14:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=127647 Change 127647 by jb@jb_freebsd1 on 2007/10/18 02:14:47 Hook the BSD libdwarf into the build. Affected files ... .. //depot/projects/dtrace/src/lib/Makefile#14 edit Differences ... ==== //depot/projects/dtrace/src/lib/Makefile#14 (text+ko) ==== @@ -30,7 +30,7 @@ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ - libedit libexpat libfetch libftpio libgeom ${_libgpib} \ + libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ libgssapi libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 02:18:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0F9216A41A; Thu, 18 Oct 2007 02:18: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 7F74916A417 for ; Thu, 18 Oct 2007 02:18:58 +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 71E1C13C447 for ; Thu, 18 Oct 2007 02:18:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I2Iw7j084852 for ; Thu, 18 Oct 2007 02:18:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I2IwD6084849 for perforce@freebsd.org; Thu, 18 Oct 2007 02:18:58 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 02:18:58 GMT Message-Id: <200710180218.l9I2IwD6084849@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 127648 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, 18 Oct 2007 02:18:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=127648 Change 127648 by jb@jb_freebsd1 on 2007/10/18 02:18:45 The start of a BSD licensed dwarfdump based on the BSD libdwarf and libelf. This is really just a wrapper around the dump functions that are in libdwarf. Much of the output format is based on the binutils elfdump --debug-dump format. It's debatable whether another tool is required for this, however it is a useful tool to compare the BSD libdwarf behaviour with existing GNU tools. Affected files ... .. //depot/projects/dtrace/src/usr.bin/dwarfdump/Makefile#1 add .. //depot/projects/dtrace/src/usr.bin/dwarfdump/dwarfdump.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 02:20:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B3E16A46B; Thu, 18 Oct 2007 02:20: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 CC23216A41B for ; Thu, 18 Oct 2007 02:19:59 +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 A656813C448 for ; Thu, 18 Oct 2007 02:19:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I2JxTt084891 for ; Thu, 18 Oct 2007 02:19:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I2JxGT084888 for perforce@freebsd.org; Thu, 18 Oct 2007 02:19:59 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 02:19:59 GMT Message-Id: <200710180219.l9I2JxGT084888@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 127649 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, 18 Oct 2007 02:20:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=127649 Change 127649 by jb@jb_freebsd1 on 2007/10/18 02:19:37 Hook the BSD dwarfdump into the build. Affected files ... .. //depot/projects/dtrace/src/usr.bin/Makefile#11 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/Makefile#11 (text+ko) ==== @@ -49,6 +49,7 @@ ${_dig} \ dirname \ du \ + dwarfdump \ ee \ elf2aout \ elfdump \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 02:25:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE73C16A420; Thu, 18 Oct 2007 02:25: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 5E94C16A419 for ; Thu, 18 Oct 2007 02:25:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E6FC13C442 for ; Thu, 18 Oct 2007 02:25:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I2P8dj085332 for ; Thu, 18 Oct 2007 02:25:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I2P7SU085329 for perforce@freebsd.org; Thu, 18 Oct 2007 02:25:07 GMT (envelope-from imp@freebsd.org) Date: Thu, 18 Oct 2007 02:25:07 GMT Message-Id: <200710180225.l9I2P7SU085329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 127651 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, 18 Oct 2007 02:25:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=127651 Change 127651 by imp@imp_paco-paco on 2007/10/18 02:24:37 IFC @127644 Affected files ... .. //depot/projects/arm/src/etc/nscd.conf#1 branch .. //depot/projects/arm/src/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/arm/src/lib/libc/net/nscache.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_once.c#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#5 integrate .. //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#4 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/arm/src/share/mk/version_gen.awk#4 integrate .. //depot/projects/arm/src/share/termcap/termcap.src#2 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#36 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#8 integrate .. //depot/projects/arm/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#8 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#14 integrate .. //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#27 integrate .. //depot/projects/arm/src/sys/kern/subr_param.c#3 integrate .. //depot/projects/arm/src/sys/modules/Makefile#50 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#19 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#22 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#18 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#17 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#23 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#14 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#26 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#16 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/arm/src/sys/vm/vm_param.h#3 integrate .. //depot/projects/arm/src/usr.bin/fmt/fmt.c#2 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/locate.rc#3 integrate .. //depot/projects/arm/src/usr.bin/locate/locate/updatedb.sh#3 integrate .. //depot/projects/arm/src/usr.bin/netstat/sctp.c#5 integrate .. //depot/projects/arm/src/usr.bin/tail/read.c#2 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/lib/lib.h#3 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/gen/sysctl.3#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 -.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.72 2007/10/15 20:00:19 netchild Exp $ +.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.74 2007/10/16 11:29:13 ru Exp $ .\" -.Dd April 10, 2007 +.Dd October 16, 2007 .Dt SYSCTL 3 .Os .Sh NAME @@ -280,10 +280,11 @@ .It "HW_PHYSMEM integer no" .It "HW_USERMEM integer no" .It "HW_PAGESIZE integer no" -.It "HW_FLOATINGPOINT integer no" -.It "HW_MACHINE_ARCH string no" .\".It "HW_DISKNAMES integer no" .\".It "HW_DISKSTATS integer no" +.It "HW_FLOATINGPT integer no" +.It "HW_MACHINE_ARCH string no" +.It "HW_REALMEM integer no" .El .Pp .Bl -tag -width 6n @@ -301,12 +302,14 @@ The bytes of non-kernel memory. .It Li HW_PAGESIZE The software page size. -.It Li HW_FLOATINGPOINT +.\".It Fa HW_DISKNAMES +.\".It Fa HW_DISKSTATS +.It Li HW_FLOATINGPT Nonzero if the floating point support is in hardware. .It Li HW_MACHINE_ARCH The machine dependent architecture type. -.\".It Fa HW_DISKNAMES -.\".It Fa HW_DISKSTATS +.It Li HW_REALMEM +The bytes of real memory. .El .Ss CTL_KERN The string and integer information available for the CTL_KERN level @@ -739,7 +742,7 @@ .Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent .It Sy "Second level name Type Changeable" .It "VM_LOADAVG struct loadavg no" -.It "VM_METER struct vmtotal no" +.It "VM_TOTAL struct vmtotal no" .It "VM_PAGEOUT_ALGORITHM integer yes" .It "VM_SWAPPING_ENABLED integer maybe" .It "VM_V_CACHE_MAX integer yes" @@ -756,7 +759,7 @@ Return the load average history. The returned data consists of a .Va struct loadavg . -.It Li VM_METER +.It Li VM_TOTAL Return the system wide virtual memory statistics. The returned data consists of a .Va struct vmtotal . ==== //depot/projects/arm/src/lib/libc/net/nscache.c#2 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.1 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.2 2007/10/17 23:20:49 tmclaugh Exp $"); #include "namespace.h" #include @@ -42,7 +42,7 @@ #define NSS_CACHE_BUFFER_INITIAL_SIZE (1024) #define NSS_CACHE_BUFFER_SIZE_LIMIT (NSS_CACHE_BUFFER_INITIAL_SIZE << 8) -#define CACHED_SOCKET_PATH "/var/run/cached" +#define CACHED_SOCKET_PATH "/var/run/nscd" int __nss_cache_handler(void *retval, void *mdata, va_list ap) ==== //depot/projects/arm/src/lib/libthr/thread/thr_once.c#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/lib/libthr/thread/thr_once.c,v 1.5 2006/02/15 23:05:03 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_once.c,v 1.6 2007/10/16 07:46:15 davidxu Exp $ * */ @@ -64,6 +64,7 @@ int _pthread_once(pthread_once_t *once_control, void (*init_routine) (void)) { + struct pthread *curthread; int wakeup = 0; if (once_control->state == ONCE_DONE) @@ -78,9 +79,10 @@ if (*(volatile int *)&(once_control->state) == ONCE_NEVER_DONE) { once_control->state = ONCE_IN_PROGRESS; _pthread_mutex_unlock(&_thr_once_lock); - _pthread_cleanup_push(once_cancel_handler, once_control); + curthread = _get_curthread(); + THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control); init_routine(); - _pthread_cleanup_pop(0); + THR_CLEANUP_POP(curthread, 0); _pthread_mutex_lock(&_thr_once_lock); once_control->state = ONCE_DONE; wakeup = 1; ==== //depot/projects/arm/src/lib/libthr/thread/thr_pspinlock.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.5 2006/12/15 11:52:01 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.6 2007/10/16 07:36:02 davidxu Exp $ */ #include "namespace.h" @@ -104,7 +104,7 @@ count = SPIN_COUNT; while ((ret = THR_UMUTEX_TRYLOCK(curthread, &lck->s_lock)) != 0) { while (lck->s_lock.m_owner) { - if (_thr_is_smp) { + if (!_thr_is_smp) { _pthread_yield(); } else { CPU_SPINWAIT; ==== //depot/projects/arm/src/libexec/rtld-elf/sparc64/reloc.c#4 (text+ko) ==== @@ -35,10 +35,11 @@ * 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: src/libexec/rtld-elf/sparc64/reloc.c,v 1.15 2007/07/13 16:18:43 kensmith Exp $ */ +#include +__FBSDID("$FreeBSD: src/libexec/rtld-elf/sparc64/reloc.c,v 1.16 2007/10/16 19:17:48 marius Exp $"); + #include #include @@ -73,7 +74,7 @@ #define _RF_U 0x04000000 /* Unaligned */ #define _RF_SZ(s) (((s) & 0xff) << 8) /* memory target size */ #define _RF_RS(s) ( (s) & 0xff) /* right shift */ -static int reloc_target_flags[] = { +static const int reloc_target_flags[] = { 0, /* NONE */ _RF_S|_RF_A| _RF_SZ(8) | _RF_RS(0), /* RELOC_8 */ _RF_S|_RF_A| _RF_SZ(16) | _RF_RS(0), /* RELOC_16 */ @@ -157,7 +158,7 @@ #define RELOC_TARGET_SIZE(t) ((reloc_target_flags[t] >> 8) & 0xff) #define RELOC_VALUE_RIGHTSHIFT(t) (reloc_target_flags[t] & 0xff) -static long reloc_target_bitmask[] = { +static const long reloc_target_bitmask[] = { #define _BM(x) (~(-(1ULL << (x)))) 0, /* NONE */ _BM(8), _BM(16), _BM(32), /* RELOC_8, _16, _32 */ @@ -173,7 +174,7 @@ _BM(22), _BM(10), /* _HIPLT22, LOPLT10 */ _BM(32), _BM(22), _BM(10), /* _PCPLT32, _PCPLT22, _PCPLT10 */ _BM(10), _BM(11), -1, /* _10, _11, _64 */ - _BM(10), _BM(22), /* _OLO10, _HH22 */ + _BM(13), _BM(22), /* _OLO10, _HH22 */ _BM(10), _BM(22), /* _HM10, _LM22 */ _BM(22), _BM(10), _BM(22), /* _PC_HH22, _PC_HM10, _PC_LM22 */ _BM(16), _BM(19), /* _WDISP16, _WDISP19 */ @@ -296,7 +297,7 @@ defobj = NULL; def = NULL; - type = ELF_R_TYPE(rela->r_info); + type = ELF64_R_TYPE_ID(rela->r_info); if (type == R_SPARC_NONE) return (0); @@ -311,7 +312,8 @@ /* * Note: R_SPARC_UA16 must be numerically largest relocation type. */ - if (type > R_SPARC_UA16) + if (type >= sizeof(reloc_target_bitmask) / + sizeof(*reloc_target_bitmask)) return (-1); value = rela->r_addend; @@ -342,6 +344,9 @@ value += (Elf_Addr)(defobj->relocbase + def->st_value); } + if (type == R_SPARC_OLO10) + value = (value & 0x3ff) + ELF64_R_TYPE_DATA(rela->r_info); + if (RELOC_PC_RELATIVE(type)) value -= (Elf_Addr)where; @@ -411,7 +416,7 @@ for (rela = obj->pltrela; rela < relalim; rela++) { if (rela->r_addend == 0) continue; - assert(ELF_R_TYPE(rela->r_info) == R_SPARC_JMP_SLOT); + assert(ELF64_R_TYPE_ID(rela->r_info) == R_SPARC_JMP_SLOT); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL); @@ -455,7 +460,7 @@ relalim = (const Elf_Rela *)((char *)obj->pltrela + obj->pltrelasize); for (rela = obj->pltrela; rela < relalim; rela++) { - assert(ELF_R_TYPE(rela->r_info) == R_SPARC_JMP_SLOT); + assert(ELF64_R_TYPE_ID(rela->r_info) == R_SPARC_JMP_SLOT); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, true, NULL); ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#23 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1069 2007/10/11 20:44:38 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1070 2007/10/17 17:52:31 delphij Exp $ 2000 @@ -2314,7 +2314,7 @@ 4.1.8 to 4.1.23. less has been updated from v381 - to v408. &merged; + to v409. &merged; libpcap has been updated from 0.9.1 to 0.9.4. &merged; ==== //depot/projects/arm/src/share/mk/bsd.cpu.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.62 2007/05/21 08:39:44 cognet Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.63 2007/10/16 18:32:37 cognet Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -103,7 +103,9 @@ _CPUCFLAGS = -march=${CPUTYPE} . elif ${MACHINE_ARCH} == "arm" . if ${CPUTYPE} == "xscale" -_CPUCFLAGS = -mcpu=xscale +#XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself +#_CPUCFLAGS = -mcpu=xscale +_CPUCFLAGS = -march=armv5te -D__XSCALE__ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif ==== //depot/projects/arm/src/share/mk/version_gen.awk#4 (text) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/mk/version_gen.awk,v 1.3 2007/07/21 20:52:32 kan Exp $ +# $FreeBSD: src/share/mk/version_gen.awk,v 1.4 2007/10/17 20:09:56 yar Exp $ # # @@ -34,6 +34,8 @@ # version name. # symbols[][] - array index by [version name, symbol index], contains # names of symbols defined for each version. +# names[] - array index is symbol name and value is count, +# used to check for duplicate symbols and warn about them. # BEGIN { brackets = 0; @@ -45,10 +47,13 @@ # Strip comments. sub("#.*$", "", $0); - # Strip trailing spaces. - sub(" *$", "", $0); + # Strip leading and trailing whitespace. + sub("^[ \t]+", "", $0); + sub("[ \t]+$", "", $0); - if (/^[ \t]*[a-zA-Z0-9._]+ *{/) { + if (/^[a-zA-Z0-9._]+[ \t]*{$/) { + # Strip brace. + sub("{", "", $1); brackets++; symver = $1; versions[symver] = 1; @@ -56,39 +61,56 @@ generated[symver] = 0; version_count++; } - else if (/^[ \t]*} *[a-zA-Z0-9._]+ *;/) { + else if (/^}[ \t]*[a-zA-Z0-9._]+[ \t]*;$/) { + v = $1 != "}" ? $1 : $2; + # Strip brace. + sub("}", "", v); # Strip semicolon. - gsub(";", "", $2); - if (symver == "") - printf("Unmatched bracket.\n"); - else if (versions[$2] != 1) - printf("File %s: %s has unknown " \ - "successor %s\n", vfile, symver, $2); + sub(";", "", v); + if (symver == "") { + printf("File %s: Unmatched bracket.\n", + vfile) > stderr; + errors++; + } + else if (versions[v] != 1) { + printf("File %s: `%s' has unknown " \ + "successor `%s'.\n", + vfile, symver, v) > stderr; + errors++; + } else - successors[symver] = $2; + successors[symver] = v; brackets--; } - else if (/^[ \t]*};/) { - if (symver == "") + else if (/^}[ \t]*;$/) { + if (symver == "") { printf("File %s: Unmatched bracket.\n", vfile) > stderr; + errors++; + } # No successor brackets--; } - else if (/^[ \t]*}/) { - printf("File %s: Missing ending semi-colon.\n", + else if (/^}$/) { + printf("File %s: Missing final semicolon.\n", vfile) > stderr; + errors++; } else if (/^$/) ; # Ignore blank lines. - else - printf("File %s: Unknown directive: %s\n", + else { + printf("File %s: Unknown directive: `%s'.\n", vfile, $0) > stderr; + errors++; + } } brackets = 0; } -/.*/ { +{ + # Set meaningful filename for diagnostics. + filename = FILENAME != "" ? FILENAME : ""; + # Delete comments, preceding and trailing whitespace, then # consume blank lines. sub("#.*$", "", $0); @@ -98,15 +120,18 @@ next; } -/^[a-zA-Z0-9._]+ +{$/ { +/^[a-zA-Z0-9._]+[ \t]*{$/ { # Strip bracket from version name. sub("{", "", $1); - if (current_version != "") + if (current_version != "") { printf("File %s, line %d: Illegal nesting detected.\n", - FILENAME, FNR) > stderr; + filename, FNR) > stderr; + errors++; + } else if (versions[$1] == 0) { printf("File %s, line %d: Undefined " \ - "library version %s\n", FILENAME, FNR, $1) > stderr; + "library version `%s'.\n", filename, FNR, $1) > stderr; + errors++; # Remove this entry from the versions. delete versions[$1]; } @@ -116,20 +141,34 @@ next; } -/^[a-zA-Z0-9._]+ *;$/ { +/^[a-zA-Z0-9._]+[ \t]*;$/ { + # Strip semicolon. + sub(";", "", $1); if (current_version != "") { count = versions[current_version]; versions[current_version]++; symbols[current_version, count] = $1; + if (names[$1]++) { + printf("File %s, line %d: Duplicated symbol `%s'. " \ + "Did you forget to move it to ObsoleteVersions?\n", + filename, FNR, $1) > stderr; + errors++; + } } + else { + printf("File %s, line %d: Symbol `%s' outside version scope.\n", + filename, FNR, $1) > stderr; + errors++; + } next; } -/^} *;$/ { +/^}[ \t]*;$/ { brackets--; if (brackets < 0) { printf("File %s, line %d: Unmatched bracket.\n", - FILENAME, FNR, $1) > stderr; + filename, FNR, $1) > stderr; + errors++; brackets = 0; # Reset } current_version = ""; @@ -137,9 +176,10 @@ } -/.*/ { - printf("File %s, line %d: Unknown directive: '%s'\n", - FILENAME, FNR, $0) > stderr; +{ + printf("File %s, line %d: Unknown directive: `%s'.\n", + filename, FNR, $0) > stderr; + errors++; } function print_version(v) @@ -162,7 +202,7 @@ for (i = 1; i < versions[v]; i++) { if (i == 1) printf("global:\n"); - printf("\t%s\n", symbols[v, i]); + printf("\t%s;\n", symbols[v, i]); } version_count--; @@ -178,7 +218,13 @@ generated[v] = 1; } + END { + if (errors) { + printf("%d errors total.\n", errors) > stderr; + exit(1); + } + # OK, no errors. for (v in versions) { print_version(v); } ==== //depot/projects/arm/src/share/termcap/termcap.src#2 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.148 2006/04/30 09:05:56 matteo Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.149 2007/10/17 19:58:50 yar Exp $ # Termcap source file # John Kunze, Berkeley @@ -2821,7 +2821,7 @@ :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ - :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\ + :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm: # The xterm-xfree86 description has all of the features, but is not completely # compatible with vt220. If you are using a Sun or PC keyboard, set the ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#36 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $"); #include #include #include @@ -4114,9 +4114,23 @@ void pmap_zero_page_xscale(vm_paddr_t phys, int off, int size) { +#ifdef ARM_USE_SMALL_ALLOC + char *dstpg; +#endif + if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; +#ifdef ARM_USE_SMALL_ALLOC + dstpg = (char *)arm_ptovirt(phys); + if (off || size != PAGE_SIZE) { + bzero(dstpg + off, size); + cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size); + } else { + bzero_page((vm_offset_t)dstpg); + cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE); + } +#else mtx_lock(&cmtx); /* * Hook in the page, zero it, and purge the cache for that @@ -4134,6 +4148,7 @@ bzero_page(cdstp); mtx_unlock(&cmtx); xscale_cache_clean_minidata(); +#endif } /* ==== //depot/projects/arm/src/sys/ddb/db_ps.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $"); #include #include @@ -295,6 +295,8 @@ db_printf(" proc (pid %d): %p\n", td->td_proc->p_pid, td->td_proc); if (td->td_name[0] != '\0') db_printf(" name: %s\n", td->td_name); + db_printf(" stack: %p-%p\n", (void *)td->td_kstack, + (void *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE - 1)); db_printf(" flags: %#x ", td->td_flags); db_printf(" pflags: %#x\n", td->td_pflags); db_printf(" state: "); ==== //depot/projects/arm/src/sys/fs/cd9660/cd9660_vfsops.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vfsops.c,v 1.150 2007/03/13 01:50:22 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_vfsops.c,v 1.151 2007/10/16 10:54:51 alfred Exp $"); #include #include @@ -375,7 +375,7 @@ brelse(pribp); pribp = NULL; - mp->mnt_data = (qaddr_t)isomp; + mp->mnt_data = isomp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; mp->mnt_maxsymlinklen = 0; @@ -488,7 +488,7 @@ } if (isomp) { free((caddr_t)isomp, M_ISOFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return error; } @@ -530,7 +530,7 @@ PICKUP_GIANT(); vrele(isomp->im_devvp); free((caddr_t)isomp, M_ISOFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/coda/coda_vfsops.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.67 2007/07/20 11:14:51 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vfsops.c,v 1.68 2007/10/16 10:54:52 alfred Exp $"); #include #include @@ -168,7 +168,7 @@ } /* No initialization (here) of mi_vcomm! */ - vfsp->mnt_data = (qaddr_t)mi; + vfsp->mnt_data = mi; vfs_getnewfsid (vfsp); mi->mi_vfsp = vfsp; ==== //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vfsops.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.56 2007/04/04 09:11:32 rwatson Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.57 2007/10/16 10:54:52 alfred Exp $ */ /* @@ -96,7 +96,7 @@ fmp->f_root = rvp; /* XXX -- don't mark as local to work around fts() problems */ /*mp->mnt_flag |= MNT_LOCAL;*/ - mp->mnt_data = (qaddr_t) fmp; + mp->mnt_data = fmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, "fdescfs"); ==== //depot/projects/arm/src/sys/fs/hpfs/hpfs_vfsops.c#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/sys/fs/hpfs/hpfs_vfsops.c,v 1.60 2007/03/13 01:50:22 tegge Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.61 2007/10/16 10:54:52 alfred Exp $ */ @@ -281,7 +281,7 @@ goto failed; } - mp->mnt_data = (qaddr_t)hpmp; + mp->mnt_data = hpmp; hpmp->hpm_devvp = devvp; hpmp->hpm_dev = devvp->v_rdev; hpmp->hpm_mp = mp; @@ -322,7 +322,7 @@ failed: if (bp) brelse (bp); - mp->mnt_data = (qaddr_t)NULL; + mp->mnt_data = NULL; g_vfs_close(cp, td); return (error); } @@ -359,7 +359,7 @@ dprintf(("hpfs_umount: freeing memory...\n")); hpfs_cpdeinit(hpmp); hpfs_bmdeinit(hpmp); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vfsops.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.174 2007/08/15 17:40:09 jhb Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vfsops.c,v 1.175 2007/10/16 10:54:52 alfred Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -719,7 +719,7 @@ goto error_exit; pmp->pm_fmod = 1; } - mp->mnt_data = (qaddr_t) pmp; + mp->mnt_data = pmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); @@ -745,7 +745,7 @@ if (pmp->pm_inusemap) free(pmp->pm_inusemap, M_MSDOSFSFAT); free(pmp, M_MSDOSFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; } return (error); } @@ -811,7 +811,7 @@ msdosfs_fileno_free(mp); } free(pmp, M_MSDOSFSMNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/ntfs/ntfs_vfsops.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.88 2007/09/21 23:50:15 rodrigc Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vfsops.c,v 1.89 2007/10/16 10:54:53 alfred Exp $ */ @@ -353,7 +353,7 @@ else ntfs_u28_init(ntmp, ntmp->ntm_82u, cs_local, cs_ntfs); - mp->mnt_data = (qaddr_t)ntmp; + mp->mnt_data = ntmp; dprintf(("ntfs_mountfs(): case-%s,%s uid: %d, gid: %d, mode: %o\n", (ntmp->ntm_flag & NTFS_MFLAG_CASEINS)?"insens.":"sens.", @@ -521,7 +521,7 @@ dprintf(("ntfs_umount: freeing memory...\n")); ntfs_u28_uninit(ntmp); ntfs_82u_uninit(ntmp); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/nullfs/null_vfsops.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.83 2007/05/29 11:28:28 rwatson Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.84 2007/10/16 10:54:53 alfred Exp $ */ /* @@ -185,7 +185,7 @@ MNT_ILOCK(mp); mp->mnt_kern_flag |= lowerrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t) xmp; + mp->mnt_data = xmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, target); ==== //depot/projects/arm/src/sys/fs/nwfs/nwfs_vfsops.c#5 (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/fs/nwfs/nwfs_vfsops.c,v 1.44 2006/09/26 04:12:46 tegge Exp $ + * $FreeBSD: src/sys/fs/nwfs/nwfs_vfsops.c,v 1.45 2007/10/16 10:54:53 alfred Exp $ */ #include @@ -198,7 +198,7 @@ error = ENOMEM; goto bad; } - mp->mnt_data = (qaddr_t)nmp; + mp->mnt_data = nmp; nmp->connh = handle; nmp->n_root = NULL; nmp->n_id = nwfsid++; @@ -263,7 +263,7 @@ if(ncp_conn_free(conn)) ncp_conn_unlock(conn, td); } - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; if (nmp->m.flags & NWFS_MOUNT_HAVE_NLS) free(nmp->m.nls.to_lower, M_NWFSDATA); free(nmp, M_NWFSDATA); ==== //depot/projects/arm/src/sys/fs/portalfs/portal_vfsops.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.60 2007/03/13 01:50:23 tegge Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vfsops.c,v 1.61 2007/10/16 10:54:53 alfred Exp $ */ /* @@ -156,7 +156,7 @@ MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t) fmp; + mp->mnt_data = fmp; vfs_getnewfsid(mp); vfs_mountedfrom(mp, p); ==== //depot/projects/arm/src/sys/fs/pseudofs/pseudofs.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.32 2007/04/15 17:10:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.33 2007/10/16 10:54:53 alfred Exp $"); #include "opt_pseudofs.h" @@ -310,7 +310,7 @@ mp->mnt_flag |= MNT_LOCAL; mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t)pi; + mp->mnt_data = pi; vfs_getnewfsid(mp); sbp = &mp->mnt_stat; ==== //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.41 2006/09/26 04:12:46 tegge Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.42 2007/10/16 10:54:53 alfred Exp $ */ #include @@ -188,7 +188,7 @@ goto bad; } bzero(smp, sizeof(*smp)); - mp->mnt_data = (qaddr_t)smp; + mp->mnt_data = smp; smp->sm_hash = hashinit(desiredvnodes, M_SMBFSHASH, &smp->sm_hashlen); if (smp->sm_hash == NULL) goto bad; @@ -308,7 +308,7 @@ if (error) return error; smb_share_put(smp->sm_share, &scred); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; if (smp->sm_hash) free(smp->sm_hash, M_SMBFSHASH); ==== //depot/projects/arm/src/sys/fs/udf/udf_vfsops.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.48 2007/03/13 01:50:24 tegge Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.49 2007/10/16 10:54:54 alfred Exp $ */ /* udf_vfsops.c */ @@ -339,7 +339,7 @@ goto bail; } - mp->mnt_data = (qaddr_t)udfmp; + mp->mnt_data = udfmp; mp->mnt_stat.f_fsid.val[0] = dev2udev(devvp->v_rdev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; MNT_ILOCK(mp); @@ -534,7 +534,7 @@ FREE(udfmp, M_UDFMOUNT); - mp->mnt_data = (qaddr_t)0; + mp->mnt_data = NULL; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); ==== //depot/projects/arm/src/sys/fs/unionfs/union_vfsops.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.86 2007/10/14 13:55:38 daichi Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.87 2007/10/16 10:54:54 alfred Exp $ */ #include @@ -309,7 +309,7 @@ (upperrootvp->v_mount->mnt_kern_flag & MNTK_MPSAFE)) mp->mnt_kern_flag |= MNTK_MPSAFE; MNT_IUNLOCK(mp); - mp->mnt_data = (qaddr_t)ump; + mp->mnt_data = ump; /* * Copy upper layer's RDONLY flag. ==== //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.165 2007/08/15 17:40:09 jhb Exp $ + * $FreeBSD: src/sys/gnu/fs/ext2fs/ext2_vfsops.c,v 1.166 2007/10/16 10:54:54 alfred Exp $ */ /*- @@ -687,7 +687,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:28:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D769B16A477; Thu, 18 Oct 2007 04:28: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 31C2C16A421 for ; Thu, 18 Oct 2007 04:28:27 +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 F27AA13C4B5 for ; Thu, 18 Oct 2007 04:28:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4SQu5093776 for ; Thu, 18 Oct 2007 04:28:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4SPHp093773 for perforce@freebsd.org; Thu, 18 Oct 2007 04:28:25 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:28:25 GMT Message-Id: <200710180428.l9I4SPHp093773@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 127652 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, 18 Oct 2007 04:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=127652 Change 127652 by jb@jb_freebsd1 on 2007/10/18 04:28:08 I know this code was intended just for the special string section, but there are other sections with data in the same format, so don't barf if sh_type != SHT_STRTAB. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#6 (text+ko) ==== @@ -55,7 +55,7 @@ gelf_getshdr(s, &shdr) == NULL) return (NULL); - if (shdr.sh_type != SHT_STRTAB || + if (/*shdr.sh_type != SHT_STRTAB || */ offset >= shdr.sh_size) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:29:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18E9A16A469; Thu, 18 Oct 2007 04:29: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 D327E16A421 for ; Thu, 18 Oct 2007 04:29:27 +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 A89BA13C447 for ; Thu, 18 Oct 2007 04:29:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4TRBH093800 for ; Thu, 18 Oct 2007 04:29:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4TRtS093797 for perforce@freebsd.org; Thu, 18 Oct 2007 04:29:27 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:29:27 GMT Message-Id: <200710180429.l9I4TRtS093797@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 127653 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, 18 Oct 2007 04:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=127653 Change 127653 by jb@jb_freebsd1 on 2007/10/18 04:28:49 We need to be able to handle sections with zero-length data. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_xlate.c#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_xlate.c#6 (text+ko) ==== @@ -68,8 +68,7 @@ return (NULL); } - if (src->d_buf == NULL || dst->d_buf == NULL || - src->d_size == 0) { + if (src->d_buf == NULL || dst->d_buf == NULL) { LIBELF_SET_ERROR(DATA, 0); return (NULL); } From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:31:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 679B116A41B; Thu, 18 Oct 2007 04:31: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 1682216A417 for ; Thu, 18 Oct 2007 04:31:30 +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 03CD613C457 for ; Thu, 18 Oct 2007 04:31:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4VTdM094080 for ; Thu, 18 Oct 2007 04:31:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4VTCw094077 for perforce@freebsd.org; Thu, 18 Oct 2007 04:31:29 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:31:29 GMT Message-Id: <200710180431.l9I4VTCw094077@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 127654 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, 18 Oct 2007 04:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=127654 Change 127654 by jb@jb_freebsd1 on 2007/10/18 04:31:18 The FreeBSD kernel has note sections which aren't 4-byte aligned. I see that tools on other systems assume that notes have byte alignment even though the natural alignment would be 4 bytes given that's the size of the first field in the notes header. We have to be compatible though, so byte alignment it must be. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_align.c#5 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_align.c#5 (text+ko) ==== @@ -122,7 +122,7 @@ #endif [ELF_T_MOVEP] = UNSUPPORTED(), #if __FreeBSD_version >= 700025 - [ELF_T_NOTE] = FALIGN(4,4), + [ELF_T_NOTE] = FALIGN(1,1), #endif [ELF_T_OFF] = FALIGN(4,8), [ELF_T_PHDR] = FALIGN(4,8), From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:33:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B94A516A41B; Thu, 18 Oct 2007 04:33: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 74AE416A418 for ; Thu, 18 Oct 2007 04:33:32 +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 4A19713C455 for ; Thu, 18 Oct 2007 04:33:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4XWd5094176 for ; Thu, 18 Oct 2007 04:33:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4XWXH094173 for perforce@freebsd.org; Thu, 18 Oct 2007 04:33:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:33:32 GMT Message-Id: <200710180433.l9I4XWXH094173@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 127655 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, 18 Oct 2007 04:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=127655 Change 127655 by jb@jb_freebsd1 on 2007/10/18 04:32:33 Fill in the ELF type for SHT_GNU_versym. I'm not sure why this was XXX. ;-) Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#7 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_data.c#7 (text+ko) ==== @@ -72,7 +72,7 @@ case SHT_GNU_verneed: /* == SHT_SUNW_verneed */ return (ELF_T_VNEED); case SHT_GNU_versym: /* == SHT_SUNW_versym */ - return (-1); /* XXX */ + return (ELF_T_HALF); case SHT_SUNW_move: return (ELF_T_MOVE); case SHT_SUNW_syminfo: From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:43:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84A9016A420; Thu, 18 Oct 2007 04:43: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 38ECA16A419 for ; Thu, 18 Oct 2007 04:43:43 +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 2633C13C465 for ; Thu, 18 Oct 2007 04:43:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4hhfc094619 for ; Thu, 18 Oct 2007 04:43:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4hhYQ094616 for perforce@freebsd.org; Thu, 18 Oct 2007 04:43:43 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:43:43 GMT Message-Id: <200710180443.l9I4hhYQ094616@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 127656 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, 18 Oct 2007 04:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=127656 Change 127656 by jb@jb_freebsd1 on 2007/10/18 04:43:18 Replace references to the GNU libdwarf with the BSD one. Pass VERSION to the lib32 part of the buildworld so that the CTF tools can use it in there too. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#31 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#31 (text+ko) ==== @@ -260,6 +260,7 @@ # Yes, the flags are redundant. LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + VERSION="${VERSION}" \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -893,8 +894,8 @@ .endif .if ${MK_CDDL} != "no" -_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf \ - lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge +_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ + lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif bootstrap-tools: @@ -1054,7 +1055,7 @@ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} gnu/lib/libdwarf + ${_secure_lib_libssl} lib/libdwarf .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" _default_thread_lib= lib/${DEFAULT_THREAD_LIB} From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:59:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBA5A16A419; Thu, 18 Oct 2007 04:59: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 85AD116A418 for ; Thu, 18 Oct 2007 04:59:12 +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 7163213C459 for ; Thu, 18 Oct 2007 04:59:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4xCkY004160 for ; Thu, 18 Oct 2007 04:59:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4xCCk004157 for perforce@freebsd.org; Thu, 18 Oct 2007 04:59:12 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:59:12 GMT Message-Id: <200710180459.l9I4xCCk004157@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 127658 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, 18 Oct 2007 04:59:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=127658 Change 127658 by jb@jb_freebsd1 on 2007/10/18 04:58:59 Fix compiler warnings for WARNS=6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#6 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#6 (text) ==== @@ -287,7 +287,7 @@ int symidx, len, i; char *name = NULL; - for (symidx = -1, i = 0; i < n; i++) { + for (symidx = -1, i = 0; i < (int) n; i++) { int nextsym; if (cd->cd_symdata == NULL || (nextsym = next_sym(cd, @@ -419,7 +419,7 @@ union { const void *ptr; - const ctf_array_t *ap; + ctf_array_t *ap; const ctf_member_t *mp; const ctf_lmember_t *lmp; const ctf_enum_t *ep; @@ -439,7 +439,7 @@ increment = sizeof (ctf_stype_t); size = tp->ctt_size; } - u.ptr = (caddr_t)tp + increment; + u.ptr = (const char *)tp + increment; switch (kind) { case CTF_K_INTEGER: @@ -527,13 +527,13 @@ } if (flags != F_STATS) { - (void) printf(" %s (%d bytes)\n", + (void) printf(" %s (%zd bytes)\n", ref_to_str(tp->ctt_name, hp, cd), size); if (size >= CTF_LSTRUCT_THRESH) { for (i = 0; i < n; i++, u.lmp++) { (void) printf( - "\t%s type=%u off=%llu\n", + "\t%s type=%u off=%lu\n", ref_to_str(u.lmp->ctlm_name, hp, cd), u.lmp->ctlm_type, CTF_LMEM_OFFSET(u.lmp)); @@ -785,7 +785,7 @@ } static Elf_Scn * -findelfscn(Elf *elf, GElf_Ehdr *ehdr, char *secname) +findelfscn(Elf *elf, GElf_Ehdr *ehdr, const char *secname) { GElf_Shdr shdr; Elf_Scn *scn; @@ -811,7 +811,7 @@ ctf_data_t cd; const ctf_preamble_t *pp; - ctf_header_t *hp; + ctf_header_t *hp = NULL; Elf *elf; GElf_Ehdr ehdr; @@ -871,7 +871,7 @@ if ((elf = elf_begin(fd, ELF_C_READ, NULL)) != NULL && gelf_getehdr(elf, &ehdr) != NULL) { - Elf_Data *dp; + Elf_Data *dp = NULL; Elf_Scn *ctfscn = findelfscn(elf, &ehdr, ".SUNW_ctf"); Elf_Scn *symscn; GElf_Shdr ctfshdr; @@ -1012,7 +1012,7 @@ if ((ufd = open(ufile, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0 || write(ufd, &h, sizeof (h)) != sizeof (h) || - write(ufd, cd.cd_ctfdata, cd.cd_ctflen) != cd.cd_ctflen) { + write(ufd, cd.cd_ctfdata, cd.cd_ctflen) != (int) cd.cd_ctflen) { warn("failed to write CTF data to '%s'", ufile); error |= E_ERROR; } From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:03:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F4A816A41B; Thu, 18 Oct 2007 05:03: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 C4EBE16A41A for ; Thu, 18 Oct 2007 05:03:18 +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 B138C13C45A for ; Thu, 18 Oct 2007 05:03:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I53ILU005667 for ; Thu, 18 Oct 2007 05:03:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I53IT2005664 for perforce@freebsd.org; Thu, 18 Oct 2007 05:03:18 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:03:18 GMT Message-Id: <200710180503.l9I53IT2005664@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 127659 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, 18 Oct 2007 05:03:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=127659 Change 127659 by jb@jb_freebsd1 on 2007/10/18 05:02:58 Fix compiler warnings for WARNS=6. Add a couple of porting functions to help detect memory corruption. Sun's OpenSolaris code tends to assume that libelf behaves as theirs does. Heh! Ours behaves just that little bit differently given that we handle cross-targets rather than just the host architecture like Sun does. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#9 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#9 (text) ==== @@ -43,7 +43,7 @@ #include "ctftools.h" #include "memory.h" -static void (*terminate_cleanup)() = NULL; +static void (*terminate_cleanup)(void) = NULL; /* returns 1 if s1 == s2, 0 otherwise */ int @@ -116,7 +116,7 @@ /*PRINTFLIKE2*/ static void -whine(char *type, char *format, va_list ap) +whine(const char *type, const char *format, va_list ap) { int error = errno; @@ -128,14 +128,14 @@ } void -set_terminate_cleanup(void (*cleanup)()) +set_terminate_cleanup(void (*cleanup)(void)) { terminate_cleanup = cleanup; } /*PRINTFLIKE1*/ void -terminate(char *format, ...) +terminate(const char *format, ...) { va_list ap; @@ -163,7 +163,7 @@ /*PRINTFLIKE1*/ void -aborterr(char *format, ...) +aborterr(const char *format, ...) { va_list ap; @@ -180,7 +180,7 @@ /*PRINTFLIKE1*/ void -warning(char *format, ...) +warning(const char *format, ...) { va_list ap; @@ -194,7 +194,7 @@ /*PRINTFLIKE2*/ void -vadebug(int level, char *format, va_list ap) +vadebug(int level, const char *format, va_list ap) { if (level > debug_level) return; @@ -206,7 +206,7 @@ /*PRINTFLIKE2*/ void -debug(int level, char *format, ...) +debug(int level, const char *format, ...) { va_list ap; @@ -248,3 +248,36 @@ { return (tdp->t_name == NULL ? "(anon)" : tdp->t_name); } + +char *watch_address = NULL; +int watch_length = 0; + +void +watch_set(void *addr, int len) +{ + watch_address = addr; + watch_length = len; +} + +void +watch_dump(int v) +{ + char *p = watch_address; + int i; + + if (watch_address == NULL || watch_length == 0) + return; + + printf("%d: watch %p len %d\n",v,watch_address,watch_length); + for (i = 0; i < watch_length; i++) { + if (*p >= 0x20 && *p < 0x7f) { + printf(" %c",*p++ & 0xff); + } else { + printf(" %02x",*p++ & 0xff); + } + } + printf("\n"); + +} + + From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:07:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB8B16A468; Thu, 18 Oct 2007 05:07: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 E434A16A41A for ; Thu, 18 Oct 2007 05:07:23 +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 CEEE713C46B for ; Thu, 18 Oct 2007 05:07:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I57N91005841 for ; Thu, 18 Oct 2007 05:07:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I57Nkj005838 for perforce@freebsd.org; Thu, 18 Oct 2007 05:07:23 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:07:23 GMT Message-Id: <200710180507.l9I57Nkj005838@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 127660 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, 18 Oct 2007 05:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127660 Change 127660 by jb@jb_freebsd1 on 2007/10/18 05:06:49 Fix compiler warnings for WARNS=6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#7 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#5 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#7 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#5 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#7 (text) ==== @@ -88,7 +88,7 @@ int require_ctf) { Elf_Scn *ctfscn; - Elf_Data *ctfdata; + Elf_Data *ctfdata = NULL; symit_data_t *si = NULL; int ctfscnidx; tdata_t *td; @@ -221,7 +221,7 @@ /*ARGSUSED*/ int -read_ctf_save_cb(tdata_t *td, char *name, void *retp) +read_ctf_save_cb(tdata_t *td, char *name __unused, void *retp) { tdata_t **tdp = retp; ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#5 (text) ==== @@ -76,12 +76,11 @@ static char *intrinsic(char *cp, tdesc_t **rtdp); static char *arraydef(char *cp, tdesc_t **rtdp); -extern int debug_level; int debug_parse = DEBUG_PARSE; /*PRINTFLIKE3*/ static void -parse_debug(int level, char *cp, char *fmt, ...) +parse_debug(int level, char *cp, const char *fmt, ...) { va_list ap; char buf[1024]; @@ -113,9 +112,9 @@ /* Report unexpected syntax in stabs. */ static void _expected( - char *who, /* what function, or part thereof, is reporting */ - char *what, /* what was expected */ - char *where, /* where we were in the line of input */ + const char *who, /* what function, or part thereof, is reporting */ + const char *what, /* what was expected */ + const char *where, /* where we were in the line of input */ int line) { fprintf(stderr, "%s, expecting \"%s\" at \"%s\"\n", who, what, where); @@ -126,7 +125,7 @@ /*ARGSUSED*/ void -parse_init(tdata_t *td) +parse_init(tdata_t *td __unused) { int i; @@ -159,7 +158,7 @@ return (tdp); } -char * +static char * read_tid(char *cp, tdesc_t **tdpp) { tdesc_t *tdp; @@ -190,7 +189,7 @@ static iitype_t parse_fun(char *cp, iidesc_t *ii) { - iitype_t iitype; + iitype_t iitype = 0; tdesc_t *tdp; tdesc_t **args = NULL; int nargs = 0; @@ -250,7 +249,7 @@ parse_sym(char *cp, iidesc_t *ii) { tdesc_t *tdp; - iitype_t iitype; + iitype_t iitype = 0; /* * name:G global variable @@ -1038,14 +1037,14 @@ } } -tdesc_t * -lookup_name(tdesc_t **hash, const char *name) +static tdesc_t * +lookup_name(tdesc_t **hash, const char *name1) { - int bucket = compute_sum(name); + int bucket = compute_sum(name1); tdesc_t *tdp, *ttdp = NULL; for (tdp = hash[bucket]; tdp != NULL; tdp = tdp->t_next) { - if (tdp->t_name != NULL && strcmp(tdp->t_name, name) == 0) { + if (tdp->t_name != NULL && strcmp(tdp->t_name, name1) == 0) { if (tdp->t_type == STRUCT || tdp->t_type == UNION || tdp->t_type == ENUM || tdp->t_type == INTRINSIC) return (tdp); @@ -1057,9 +1056,9 @@ } tdesc_t * -lookupname(const char *name) +lookupname(const char *name1) { - return (lookup_name(name_table, name)); + return (lookup_name(name_table, name1)); } /* @@ -1151,8 +1150,9 @@ /*ARGSUSED1*/ static int -resolve_typed_bitfields_cb(mlist_t *ml, void *private) +resolve_typed_bitfields_cb(void *arg, void *private __unused) { + mlist_t *ml = arg; tdesc_t *tdp = ml->ml_type; debug(3, "Resolving typed bitfields (member %s)\n", @@ -1194,5 +1194,5 @@ resolve_typed_bitfields(void) { (void) list_iter(typedbitfldmems, - (int (*)())resolve_typed_bitfields_cb, NULL); + resolve_typed_bitfields_cb, NULL); } ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#6 (text) ==== @@ -47,7 +47,7 @@ #include "memory.h" #include "traverse.h" -const char *curhdr; +char *curhdr; /* * The stabs generator will sometimes reference types before they've been @@ -59,7 +59,7 @@ */ /*ARGSUSED2*/ static int -resolve_tou_node(tdesc_t *node, tdesc_t **nodep, void *private) +resolve_tou_node(tdesc_t *node, tdesc_t **nodep, void *private __unused) { tdesc_t *new; @@ -79,7 +79,7 @@ /*ARGSUSED*/ static int -resolve_fwd_node(tdesc_t *node, tdesc_t **nodep, void *private) +resolve_fwd_node(tdesc_t *node, tdesc_t **nodep, void *private __unused) { tdesc_t *new = lookupname(node->t_name); @@ -174,7 +174,7 @@ * assembled under an iidesc list. */ int -stabs_read(tdata_t *td, Elf *elf, const char *file) +stabs_read(tdata_t *td, Elf *elf, char *file) { Elf_Scn *scn; Elf_Data *data; @@ -200,7 +200,7 @@ file_stack = stack_new(free); - stack_push(file_stack, (void *)file); + stack_push(file_stack, file); curhdr = file; debug(3, "Found stabs in %d, strings in %d\n", stabidx, stabstridx); @@ -255,7 +255,7 @@ if (stab->n_type == N_BINCL) { curhdr = xstrdup(str); - stack_push(file_stack, (void *)curhdr); + stack_push(file_stack, curhdr); continue; } else if (stab->n_type == N_SO) { if (str[strlen(str) - 1] != '/') { ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#7 (text) ==== @@ -205,7 +205,7 @@ ssize_t strtab_write(const strtab_t *sp, - ssize_t (*func)(const void *, size_t, void *), void *priv) + ssize_t (*func)(void *, size_t, void *), void *priv) { ssize_t res, total = 0; ulong_t i; ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#5 (text) ==== @@ -59,7 +59,7 @@ extern size_t strtab_insert(strtab_t *, const char *); extern size_t strtab_size(const strtab_t *); extern ssize_t strtab_write(const strtab_t *, - ssize_t (*)(const void *, size_t, void *), void *); + ssize_t (*)(void *, size_t, void *), void *); extern void strtab_print(const strtab_t *); #ifdef __cplusplus ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#4 (text) ==== @@ -174,9 +174,10 @@ return (!streq(tdp1->t_name, tdp2->t_name)); } +#if defined(sun) /*ARGSUSED1*/ -int -tdesc_print(void *data, void *private) +static int +tdesc_print(void *data, void *private __unused) { tdesc_t *tdp = data; @@ -184,6 +185,7 @@ return (1); } +#endif static void free_intr(tdesc_t *tdp) @@ -247,39 +249,42 @@ }; /*ARGSUSED1*/ -static int -tdesc_free_cb(tdesc_t *tdp, void *private) +static void +tdesc_free_cb(void *arg, void *private __unused) { + tdesc_t *tdp = arg; if (tdp->t_name) free(tdp->t_name); if (free_cbs[tdp->t_type]) free_cbs[tdp->t_type](tdp); free(tdp); - return (1); + return; } void tdesc_free(tdesc_t *tdp) { - (void) tdesc_free_cb(tdp, NULL); + tdesc_free_cb(tdp, NULL); } static int -tdata_label_cmp(labelent_t *le1, labelent_t *le2) +tdata_label_cmp(void *arg1, void *arg2) { + labelent_t *le1 = arg1; + labelent_t *le2 = arg2; return (le1->le_idx - le2->le_idx); } void -tdata_label_add(tdata_t *td, char *label, int idx) +tdata_label_add(tdata_t *td, const char *label, int idx) { labelent_t *le = xmalloc(sizeof (*le)); le->le_name = xstrdup(label); le->le_idx = (idx == -1 ? td->td_nextid - 1 : idx); - slist_add(&td->td_labels, le, (int (*)())tdata_label_cmp); + slist_add(&td->td_labels, le, tdata_label_cmp); } static int @@ -304,8 +309,10 @@ } static int -tdata_label_find_cb(labelent_t *le, labelent_t *tmpl) +tdata_label_find_cb(void *arg1, void *arg2) { + labelent_t *le = arg1; + labelent_t *tmpl = arg2; return (streq(le->le_name, tmpl->le_name)); } @@ -323,7 +330,7 @@ let.le_name = label; if (!(ret = (labelent_t *)list_find(td->td_labels, &let, - (int (*)())tdata_label_find_cb))) + tdata_label_find_cb))) return (-1); return (ret->le_idx); @@ -351,8 +358,9 @@ /*ARGSUSED1*/ static void -tdata_label_free_cb(labelent_t *le, void *private) +tdata_label_free_cb(void *arg, void *private __unused) { + labelent_t *le = arg; if (le->le_name) free(le->le_name); free(le); @@ -361,7 +369,7 @@ void tdata_label_free(tdata_t *td) { - list_free(td->td_labels, (void (*)())tdata_label_free_cb, NULL); + list_free(td->td_labels, tdata_label_free_cb, NULL); td->td_labels = NULL; } @@ -391,8 +399,8 @@ void tdata_free(tdata_t *td) { - hash_free(td->td_iihash, (void (*)())iidesc_free, NULL); - hash_free(td->td_layouthash, (void (*)())tdesc_free_cb, NULL); + hash_free(td->td_iihash, iidesc_free, NULL); + hash_free(td->td_layouthash, tdesc_free_cb, NULL); hash_free(td->td_idhash, NULL, NULL); list_free(td->td_fwdlist, NULL, NULL); @@ -408,7 +416,7 @@ /*ARGSUSED1*/ static int -build_hashes(tdesc_t *ctdp, tdesc_t **ctdpp, void *private) +build_hashes(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private) { tdata_t *td = private; @@ -465,7 +473,7 @@ td2->td_fwdlist = NULL; slist_merge(&td1->td_labels, td2->td_labels, - (int (*)())tdata_label_cmp); + tdata_label_cmp); td2->td_labels = NULL; /* free the td2 hashes (data is now part of td1) */ ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#4 (text) ==== @@ -37,11 +37,9 @@ #include "traverse.h" #include "memory.h" -int (*tddescenders[])(); -int (*tdnops[])(); +int (*tddescenders[])(tdesc_t *, tdtrav_data_t *); +tdtrav_cb_f tdnops[]; -int tdtraverse(tdesc_t *, tdesc_t **, tdtrav_data_t *); - void tdtrav_init(tdtrav_data_t *tdtd, int *vgenp, tdtrav_cb_f *firstops, tdtrav_cb_f *preops, tdtrav_cb_f *postops, void *private) @@ -68,7 +66,7 @@ if ((rc = tdtraverse(fn->fn_ret, &fn->fn_ret, tdtd)) < 0) return (rc); - for (i = 0; i < fn->fn_nargs; i++) { + for (i = 0; i < (int) fn->fn_nargs; i++) { if ((rc = tdtraverse(fn->fn_args[i], &fn->fn_args[i], tdtd)) < 0) return (rc); @@ -106,7 +104,7 @@ /*ARGSUSED*/ int -tdtrav_assert(tdesc_t *node, tdesc_t **nodep, void *private) +tdtrav_assert(tdesc_t *node __unused, tdesc_t **nodep __unused, void *private __unused) { assert(1 == 0); @@ -151,7 +149,7 @@ tdtraverse(tdesc_t *this, tdesc_t **thisp, tdtrav_data_t *tdtd) { tdtrav_cb_f travcb; - int (*descender)(); + int (*descender)(tdesc_t *, tdtrav_data_t *); int descend = 1; int rc; @@ -187,8 +185,10 @@ } int -iitraverse_td(iidesc_t *ii, tdtrav_data_t *tdtd) +iitraverse_td(void *arg1, void *arg2) { + iidesc_t *ii = arg1; + tdtrav_data_t *tdtd = arg2; int i, rc; if ((rc = tdtraverse(ii->ii_dtype, &ii->ii_dtype, tdtd)) < 0) @@ -222,5 +222,5 @@ tdtrav_init(&tdtd, vgenp, firstops, preops, postops, private); - return (hash_iter(iihash, (int (*)())iitraverse_td, &tdtd)); + return (hash_iter(iihash, iitraverse_td, &tdtd)); } ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#3 (text) ==== @@ -60,7 +60,7 @@ void *); int iitraverse_hash(hash_t *, int *, tdtrav_cb_f *, tdtrav_cb_f *, tdtrav_cb_f *, void *); -int iitraverse_td(iidesc_t *ii, tdtrav_data_t *); +int iitraverse_td(void *, void *); int tdtrav_assert(tdesc_t *, tdesc_t **, void *); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:14:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20FA216A421; Thu, 18 Oct 2007 05:14: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 C095816A419 for ; Thu, 18 Oct 2007 05:14:31 +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 AC7A513C45B for ; Thu, 18 Oct 2007 05:14:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5EVSC006363 for ; Thu, 18 Oct 2007 05:14:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5EVCx006360 for perforce@freebsd.org; Thu, 18 Oct 2007 05:14:31 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:14:31 GMT Message-Id: <200710180514.l9I5EVCx006360@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 127662 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, 18 Oct 2007 05:14:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=127662 Change 127662 by jb@jb_freebsd1 on 2007/10/18 05:13:32 Fix compiler warnings for WARNS=6. FreeBSD's libelf has private fields visible in the Elf_Data structure (unfortunately), so it can't just be copied from a read-only source ELF file to write to a destination ELF file. The individual fields need to be copied. Also, in FreeBSD's libelf, a memory buffer must be allocated and attached to an Elf_Data object returned by elf_getdata() rather than just pointing to the source buffer in another ELF file. The timing of when the section headers are updated is important too, because FreeBSD's libelf uses that stuff during calls which need to determine the ELF type. Remember that in FreeBSD the host ELF type need not match the target ELF type. OpenSolaris only supports matching host and target. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#9 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#9 (text) ==== @@ -79,7 +79,7 @@ /*ARGSUSED1*/ static int -save_type_by_id(tdesc_t *tdp, tdesc_t **tdpp, void *private) +save_type_by_id(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private) { iiburst_t *iiburst = private; @@ -159,8 +159,10 @@ * a global type description. */ static int -matching_iidesc(iidesc_t *iidesc, iidesc_match_t *match) +matching_iidesc(void *arg1, void *arg2) { + iidesc_t *iidesc = arg1; + iidesc_match_t *match = arg2; if (streq(iidesc->ii_name, match->iim_name) == 0) return (0); @@ -185,6 +187,8 @@ return (-1); } break; + default: + break; } return (0); } @@ -194,7 +198,7 @@ { match->iim_ret = NULL; iter_iidescs_by_name(td, match->iim_name, - (int (*)())matching_iidesc, match); + matching_iidesc, match); return (match->iim_ret); } @@ -239,10 +243,12 @@ GElf_Sym *retsym, char **curfilep) { char *curfile = NULL; - char *tmpfile; + char *tmpfile1 = NULL; GElf_Sym tmpsym; int candidate = 0; int i; + tmpsym.st_info = 0; + tmpsym.st_name = 0; if (GELF_ST_BIND(weak->st_info) != STB_WEAK) return (0); @@ -276,7 +282,7 @@ (curfile == NULL || weakfile == NULL || strcmp(curfile, weakfile) != 0)) { candidate = 1; - tmpfile = curfile; + tmpfile1 = curfile; tmpsym = sym; continue; } @@ -287,7 +293,7 @@ } if (candidate) { - *curfilep = tmpfile; + *curfilep = tmpfile1; *retsym = tmpsym; return (1); } @@ -496,14 +502,14 @@ secxlate = xmalloc(sizeof (int) * sehdr.e_shnum); for (srcidx = dstidx = 0; srcidx < sehdr.e_shnum; srcidx++) { Elf_Scn *scn = elf_getscn(src, srcidx); - GElf_Shdr shdr; + GElf_Shdr shdr1; char *sname; - gelf_getshdr(scn, &shdr); - sname = elf_strptr(src, sehdr.e_shstrndx, shdr.sh_name); + gelf_getshdr(scn, &shdr1); + sname = elf_strptr(src, sehdr.e_shstrndx, shdr1.sh_name); if (sname == NULL) { elfterminate(srcname, "Can't find string at %u", - shdr.sh_name); + shdr1.sh_name); } if (strcmp(sname, CTF_ELF_SCN_NAME) == 0) { @@ -514,7 +520,7 @@ strncmp(sname, ".rel.debug", 10) == 0 || strncmp(sname, ".rela.debug", 11) == 0)) { secxlate[srcidx] = -1; - } else if (dynsym && shdr.sh_type == SHT_SYMTAB) { + } else if (dynsym && shdr1.sh_type == SHT_SYMTAB) { /* * If we're building CTF against the dynsym, * we'll rip out the symtab so debuggers aren't @@ -567,11 +573,31 @@ elfterminate(srcname, "Can't find string at %u", shdr.sh_name); } + +#if !defined(sun) + if (gelf_update_shdr(dscn, &shdr) == 0) + elfterminate(dstname, "Cannot update sect %s", sname); +#endif + if ((sdata = elf_getdata(sscn, NULL)) == NULL) elfterminate(srcname, "Cannot get sect %s data", sname); if ((ddata = elf_newdata(dscn)) == NULL) elfterminate(dstname, "Can't make sect %s data", sname); +#if defined(sun) bcopy(sdata, ddata, sizeof (Elf_Data)); +#else + /* + * FreeBSD's Elf_Data has private fields which the + * elf_* routines manage. Simply copying the + * entire structure corrupts the data. So we need + * to copy the public fields explictly. + */ + ddata->d_align = sdata->d_align; + ddata->d_off = sdata->d_off; + ddata->d_size = sdata->d_size; + ddata->d_type = sdata->d_type; + ddata->d_version = sdata->d_version; +#endif if (srcidx == sehdr.e_shstrndx) { char seclen = strlen(CTF_ELF_SCN_NAME); @@ -601,7 +627,8 @@ GElf_Sym sym; short newscn; - (void) gelf_getsym(ddata, i, &sym); + if (gelf_getsym(ddata, i, &sym) == NULL) + printf("Could not get symbol %d\n",i); if (sym.st_shndx >= SHN_LORESERVE) continue; @@ -616,6 +643,13 @@ } } +#if !defined(sun) + if (ddata->d_buf == NULL) { + ddata->d_buf = xmalloc(shdr.sh_size); + bcopy(sdata->d_buf, ddata->d_buf, shdr.sh_size); + } +#endif + if (gelf_update_shdr(dscn, &shdr) == 0) elfterminate(dstname, "Cannot update sect %s", sname); @@ -651,6 +685,7 @@ ddata->d_buf = ctfdata; ddata->d_size = ctfsize; ddata->d_align = shdr.sh_addralign; + ddata->d_off = 0; gelf_update_shdr(dscn, &shdr); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:19:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A29716A46C; Thu, 18 Oct 2007 05:19: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 B7BF816A469 for ; Thu, 18 Oct 2007 05:19:37 +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 A2FE513C447 for ; Thu, 18 Oct 2007 05:19:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5JbOl006535 for ; Thu, 18 Oct 2007 05:19:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5JbCr006527 for perforce@freebsd.org; Thu, 18 Oct 2007 05:19:37 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:19:37 GMT Message-Id: <200710180519.l9I5JbCr006527@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 127663 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, 18 Oct 2007 05:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=127663 Change 127663 by jb@jb_freebsd1 on 2007/10/18 05:19:21 Fix compiler warnings for WARNS=6. When reporting DIEs, display the hex value too. readelf from binutils reports DIEs that way (and so does my BSD libdwarf for compatibility), so it's helpful to make the OpenSolaris code do it too. I probably should have just whacked the integer values. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#8 (text) ==== @@ -132,7 +132,7 @@ * own traversal mechanism and ops vector here for those two cases. */ typedef struct tdesc_ops { - char *name; + const char *name; int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); tdesc_t *(*conjure)(tdesc_t *, int, merge_cb_data_t *); } tdesc_ops_t; @@ -179,7 +179,7 @@ static void add_mapping(alist_t *ta, tid_t srcid, tid_t tgtid) { - debug(3, "Adding mapping %u => %u\n", srcid, tgtid); + debug(3, "Adding mapping %u <%x> => %u <%x>\n", srcid, srcid, tgtid, tgtid); assert(!alist_find(ta, (void *)(uintptr_t)srcid, NULL)); assert(srcid != 0 && tgtid != 0); @@ -193,7 +193,7 @@ long ltgtid; if (alist_find(ta, (void *)(uintptr_t)srcid, (void **)<gtid)) - return ((int)ltgtid); + return ((tid_t)ltgtid); else return (0); } @@ -216,7 +216,7 @@ /*ARGSUSED2*/ static int -equiv_intrinsic(tdesc_t *stdp, tdesc_t *ttdp, equiv_data_t *ed) +equiv_intrinsic(tdesc_t *stdp, tdesc_t *ttdp, equiv_data_t *ed __unused) { intr_t *si = stdp->t_intr; intr_t *ti = ttdp->t_intr; @@ -256,7 +256,7 @@ if (!equiv_node(fn1->fn_ret, fn2->fn_ret, ed)) return (0); - for (i = 0; i < fn1->fn_nargs; i++) { + for (i = 0; i < (int) fn1->fn_nargs; i++) { if (!equiv_node(fn1->fn_args[i], fn2->fn_args[i], ed)) return (0); } @@ -313,7 +313,7 @@ /*ARGSUSED2*/ static int -equiv_enum(tdesc_t *stdp, tdesc_t *ttdp, equiv_data_t *ed) +equiv_enum(tdesc_t *stdp, tdesc_t *ttdp, equiv_data_t *ed __unused) { elist_t *el1 = stdp->t_emem; elist_t *el2 = ttdp->t_emem; @@ -335,7 +335,7 @@ /*ARGSUSED*/ static int -equiv_assert(tdesc_t *stdp, tdesc_t *ttdp, equiv_data_t *ed) +equiv_assert(tdesc_t *stdp __unused, tdesc_t *ttdp __unused, equiv_data_t *ed __unused) { /* foul, evil, and very bad - this is a "shouldn't happen" */ assert(1 == 0); @@ -354,7 +354,7 @@ static int equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, equiv_data_t *ed) { - int (*equiv)(); + int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *); int mapping; if (ctdp->t_emark > ed->ed_clear_mark || @@ -418,7 +418,8 @@ ed->ed_cur_mark = ed->ed_clear_mark + 1; if (equiv_node(ctdp, mtdp, ed)) { - debug(3, "equiv_node matched %d %d\n", ctdp->t_id, mtdp->t_id); + debug(3, "equiv_node matched %d <%x> %d <%x>\n", + ctdp->t_id, ctdp->t_id, mtdp->t_id, mtdp->t_id); ed->ed_tgt = mtdp; /* matched. stop looking */ return (-1); @@ -429,7 +430,7 @@ /*ARGSUSED1*/ static int -map_td_tree_pre(tdesc_t *ctdp, tdesc_t **ctdpp, void *private) +map_td_tree_pre(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private) { merge_cb_data_t *mcd = private; @@ -441,7 +442,7 @@ /*ARGSUSED1*/ static int -map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp, void *private) +map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private) { merge_cb_data_t *mcd = private; equiv_data_t ed; @@ -452,7 +453,7 @@ ed.ed_node = ctdp; ed.ed_selfuniquify = 0; - debug(3, "map_td_tree_post on %d %s\n", ctdp->t_id, tdesc_name(ctdp)); + debug(3, "map_td_tree_post on %d <%x> %s\n", ctdp->t_id, ctdp->t_id,tdesc_name(ctdp)); if (hash_find_iter(mcd->md_parent->td_layouthash, ctdp, equiv_cb, &ed) < 0) { @@ -460,7 +461,7 @@ if (ed.ed_tgt->t_type == FORWARD && ctdp->t_type != FORWARD) { int id = mcd->md_tgt->td_nextid++; - debug(3, "Creating new defn type %d\n", id); + debug(3, "Creating new defn type %d <%x>\n", id, id); add_mapping(mcd->md_ta, ctdp->t_id, id); alist_add(mcd->md_fdida, (void *)(ulong_t)ed.ed_tgt, (void *)(ulong_t)id); @@ -481,7 +482,7 @@ } else { int id = mcd->md_tgt->td_nextid++; - debug(3, "Creating new type %d\n", id); + debug(3, "Creating new type %d <%x>\n", id, id); add_mapping(mcd->md_ta, ctdp->t_id, id); hash_add(mcd->md_tdtba, ctdp); } @@ -493,7 +494,7 @@ /*ARGSUSED1*/ static int -map_td_tree_self_post(tdesc_t *ctdp, tdesc_t **ctdpp, void *private) +map_td_tree_self_post(tdesc_t *ctdp, tdesc_t **ctdpp __unused, void *private) { merge_cb_data_t *mcd = private; equiv_data_t ed; @@ -506,8 +507,8 @@ ed.ed_tgt = NULL; if (hash_find_iter(mcd->md_tdtba, ctdp, equiv_cb, &ed) < 0) { - debug(3, "Self check found %d in %d\n", ctdp->t_id, - ed.ed_tgt->t_id); + debug(3, "Self check found %d <%x> in %d <%x>\n", ctdp->t_id, + ctdp->t_id, ed.ed_tgt->t_id, ed.ed_tgt->t_id); add_mapping(mcd->md_ta, ctdp->t_id, get_mapping(mcd->md_ta, ed.ed_tgt->t_id)); } else if (debug_level > 1 && hash_iter(mcd->md_tdtba, @@ -518,12 +519,13 @@ * through the entire hash. This usually means that the hash * function is broken. */ - aborterr("Self-unique second pass for %d (%s) == %d\n", - ctdp->t_id, tdesc_name(ctdp), ed.ed_tgt->t_id); + aborterr("Self-unique second pass for %d <%x> (%s) == %d <%x>\n", + ctdp->t_id, ctdp->t_id, tdesc_name(ctdp), ed.ed_tgt->t_id, + ed.ed_tgt->t_id); } else { int id = mcd->md_tgt->td_nextid++; - debug(3, "Creating new type %d\n", id); + debug(3, "Creating new type %d <%x>\n", id, id); add_mapping(mcd->md_ta, ctdp->t_id, id); hash_add(mcd->md_tdtba, ctdp); } @@ -696,14 +698,14 @@ } if ((template.t_id = get_mapping(mcd->md_ta, oldid)) == 0) - aborterr("failed to get mapping for tid %d\n", oldid); + aborterr("failed to get mapping for tid %d <%x>\n", oldid, oldid); if (!hash_find(mcd->md_parent->td_idhash, (void *)&template, (void *)&tgt) && (!(mcd->md_flags & MCD_F_REFMERGE) || !hash_find(mcd->md_tgt->td_idhash, (void *)&template, (void *)&tgt))) { - debug(3, "Remap couldn't find %d (from %d)\n", template.t_id, - oldid); + debug(3, "Remap couldn't find %d <%x> (from %d <%x>)\n", template.t_id, + template.t_id, oldid, oldid); *tgtp = oldtgt; list_add(mcd->md_tdtbr, tgtp); return (0); @@ -729,7 +731,7 @@ /*ARGSUSED2*/ static tdesc_t * -conjure_intrinsic(tdesc_t *old, int newselfid, merge_cb_data_t *mcd) +conjure_intrinsic(tdesc_t *old, int newselfid, merge_cb_data_t *mcd __unused) { tdesc_t *new = conjure_template(old, newselfid); @@ -765,7 +767,7 @@ if (nfn->fn_nargs > 0) nfn->fn_args = xcalloc(sizeof (tdesc_t *) * ofn->fn_nargs); - for (i = 0; i < ofn->fn_nargs; i++) { + for (i = 0; i < (int) ofn->fn_nargs; i++) { (void) remap_node(&nfn->fn_args[i], ofn->fn_args[i], old->t_id, new, mcd); } @@ -805,7 +807,7 @@ *nmemp = xmalloc(sizeof (mlist_t)); (*nmemp)->ml_offset = omem->ml_offset; (*nmemp)->ml_size = omem->ml_size; - (*nmemp)->ml_name = xstrdup(omem->ml_name); + (*nmemp)->ml_name = xstrdup(omem->ml_name ? omem->ml_name : "empty omem->ml_name"); (void) remap_node(&((*nmemp)->ml_type), omem->ml_type, old->t_id, new, mcd); } @@ -816,7 +818,7 @@ /*ARGSUSED2*/ static tdesc_t * -conjure_enum(tdesc_t *old, int newselfid, merge_cb_data_t *mcd) +conjure_enum(tdesc_t *old, int newselfid, merge_cb_data_t *mcd __unused) { tdesc_t *new = conjure_template(old, newselfid); elist_t *oel, **nelp; @@ -845,7 +847,7 @@ /*ARGSUSED*/ static tdesc_t * -conjure_assert(tdesc_t *old, int newselfid, merge_cb_data_t *mcd) +conjure_assert(tdesc_t *old __unused, int newselfid __unused, merge_cb_data_t *mcd __unused) { assert(1 == 0); return (NULL); @@ -987,8 +989,9 @@ assert(hash_find(mcd->md_parent->td_idhash, (void *)&template, NULL) == 0); - debug(3, "trying to conjure %d %s (%d) as %d\n", - oldtdp->t_type, tdesc_name(oldtdp), oldtdp->t_id, newid); + debug(3, "trying to conjure %d %s (%d, <%x>) as %d, <%x>\n", + oldtdp->t_type, tdesc_name(oldtdp), oldtdp->t_id, + oldtdp->t_id, newid, newid); if ((newtdp = tdesc_ops[oldtdp->t_type].conjure(oldtdp, newid, mcd)) == NULL) @@ -1049,16 +1052,16 @@ (void) hash_iter(src, merge_type_cb, mcd); - tdrc = hash_iter(mcd->md_tdtba, add_tdtba_cb, (void *)mcd); + tdrc = hash_iter(mcd->md_tdtba, add_tdtba_cb, mcd); debug(3, "add_tdtba_cb added %d items\n", tdrc); - iirc = list_iter(*mcd->md_iitba, add_iitba_cb, (void *)mcd); + iirc = list_iter(*mcd->md_iitba, add_iitba_cb, mcd); debug(3, "add_iitba_cb added %d items\n", iirc); assert(list_count(*mcd->md_iitba) == 0 && hash_count(mcd->md_tdtba) == 0); - tdrc = list_iter(*mcd->md_tdtbr, add_tdtbr_cb, (void *)mcd); + tdrc = list_iter(*mcd->md_tdtbr, add_tdtbr_cb, mcd); debug(3, "add_tdtbr_cb added %d items\n", tdrc); if (list_count(*mcd->md_tdtbr) != 0) From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:25:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A9C516A419; Thu, 18 Oct 2007 05:25: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 E285E16A417 for ; Thu, 18 Oct 2007 05:25:44 +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 CDC8313C442 for ; Thu, 18 Oct 2007 05:25:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5PibK007023 for ; Thu, 18 Oct 2007 05:25:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5PiM0007020 for perforce@freebsd.org; Thu, 18 Oct 2007 05:25:44 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:25:44 GMT Message-Id: <200710180525.l9I5PiM0007020@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 127664 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, 18 Oct 2007 05:25:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=127664 Change 127664 by jb@jb_freebsd1 on 2007/10/18 05:25:15 Fix compiler warnings for WARNS=6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#4 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#10 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#3 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#4 (text) ==== @@ -52,16 +52,19 @@ } alist_el_t; static int -alist_hash(int nbuckets, alist_el_t *el) +alist_hash(int nbuckets, void *arg) { + alist_el_t *el = arg; uintptr_t num = (uintptr_t)el->ale_name; return (num % nbuckets); } static int -alist_cmp(alist_el_t *el1, alist_el_t *el2) +alist_cmp(void *arg1, void *arg2) { + alist_el_t *el1 = arg1; + alist_el_t *el2 = arg2; return ((uintptr_t)el1->ale_name != (uintptr_t)el2->ale_name); } @@ -84,12 +87,14 @@ alist_new(void (*namefree)(void *), void (*valfree)(void *)) { return (alist_xnew(ALIST_HASH_SIZE, namefree, valfree, - (int (*)())alist_hash, (int (*)())alist_cmp)); + alist_hash, alist_cmp)); } static void -alist_free_cb(alist_el_t *el, alist_t *alist) +alist_free_cb(void *arg1, void *arg2) { + alist_el_t *el = arg1; + alist_t *alist = arg2; if (alist->al_namefree) alist->al_namefree(el->ale_name); if (alist->al_valfree) @@ -100,7 +105,7 @@ void alist_free(alist_t *alist) { - hash_free(alist->al_elements, (void (*)())alist_free_cb, alist); + hash_free(alist->al_elements, alist_free_cb, alist); free(alist); } @@ -136,8 +141,10 @@ } alist_iter_data_t; static int -alist_iter_cb(alist_el_t *el, alist_iter_data_t *aid) +alist_iter_cb(void *arg1, void *arg2) { + alist_el_t *el = arg1; + alist_iter_data_t *aid = arg2; return (aid->aid_func(el->ale_name, el->ale_value, aid->aid_priv)); } @@ -149,7 +156,7 @@ aid.aid_func = func; aid.aid_priv = private; - return (hash_iter(alist->al_elements, (int (*)())alist_iter_cb, &aid)); + return (hash_iter(alist->al_elements, alist_iter_cb, &aid)); } /* @@ -187,7 +194,7 @@ static int alist_dump_cb(void *node, void *private) { - int (*printer)(void *, void *) = (int (*)())private; + int (*printer)(void *, void *) = private; alist_el_t *el = node; printer(el->ale_name, el->ale_value); ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#10 (text) ==== @@ -66,7 +66,7 @@ /*PRINTFLIKE1*/ static void -parseterminate(char *fmt, ...) +parseterminate(const char *fmt, ...) { static char msgbuf[1024]; /* sigh */ va_list ap; @@ -78,7 +78,7 @@ terminate("%s: %s\n", curfile, msgbuf); } -void +static void ctf_buf_grow(ctf_buf_t *b) { off_t ptroff = b->ctb_ptr - b->ctb_base; @@ -89,7 +89,7 @@ b->ctb_ptr = b->ctb_base + ptroff; } -ctf_buf_t * +static ctf_buf_t * ctf_buf_new(void) { ctf_buf_t *b = xcalloc(sizeof (ctf_buf_t)); @@ -100,7 +100,7 @@ return (b); } -void +static void ctf_buf_free(ctf_buf_t *b) { strtab_destroy(&b->ctb_strtab); @@ -108,14 +108,14 @@ free(b); } -uint_t +static uint_t ctf_buf_cur(ctf_buf_t *b) { return (b->ctb_ptr - b->ctb_base); } -void -ctf_buf_write(ctf_buf_t *b, const void *p, size_t n) +static void +ctf_buf_write(ctf_buf_t *b, void const *p, size_t n) { size_t len; @@ -127,14 +127,16 @@ bcopy(p, b->ctb_ptr, len); b->ctb_ptr += len; - p = (char *)p + len; + p = (char const *)p + len; n -= len; } } static int -write_label(labelent_t *le, ctf_buf_t *b) +write_label(void *arg1, void *arg2) { + labelent_t *le = arg1; + ctf_buf_t *b = arg2; ctf_lblent_t ctl; ctl.ctl_label = strtab_insert(&b->ctb_strtab, le->le_name); @@ -220,8 +222,10 @@ } static int -write_type(tdesc_t *tp, ctf_buf_t *b) +write_type(void *arg1, void *arg2) { + tdesc_t *tp = arg1; + ctf_buf_t *b = arg2; elist_t *ep; mlist_t *mp; intr_t *ip; @@ -392,7 +396,7 @@ ctt.ctt_type = tp->t_fndef->fn_ret->t_id; write_unsized_type_rec(b, &ctt); - for (i = 0; i < tp->t_fndef->fn_nargs; i++) { + for (i = 0; i < (int) tp->t_fndef->fn_nargs; i++) { id = tp->t_fndef->fn_args[i]->t_id; ctf_buf_write(b, &id, sizeof (id)); } @@ -457,14 +461,14 @@ } static ssize_t -compress_buffer(const void *buf, size_t n, void *data) +compress_buffer(void *buf, size_t n, void *data) { resbuf_t *rb = (resbuf_t *)data; int rc; rb->rb_zstr.next_out = (Bytef *)rb->rb_ptr; rb->rb_zstr.avail_out = rb->rb_size - (rb->rb_ptr - rb->rb_base); - rb->rb_zstr.next_in = (Bytef *)buf; + rb->rb_zstr.next_in = buf; rb->rb_zstr.avail_in = n; while (rb->rb_zstr.avail_in) { @@ -526,7 +530,7 @@ } static ssize_t -bcopy_data(const void *buf, size_t n, void *data) +bcopy_data(void *buf, size_t n, void *data) { caddr_t *posp = (caddr_t *)data; bcopy(buf, *posp, n); @@ -601,7 +605,7 @@ iiburst->iib_td->td_parname); h.cth_lbloff = 0; - (void) list_iter(iiburst->iib_td->td_labels, (int (*)())write_label, + (void) list_iter(iiburst->iib_td->td_labels, write_label, buf); pad_buffer(buf, 2); @@ -616,7 +620,7 @@ pad_buffer(buf, 4); h.cth_typeoff = ctf_buf_cur(buf); - (void) list_iter(iiburst->iib_types, (int (*)())write_type, buf); + (void) list_iter(iiburst->iib_types, write_type, buf); debug(2, "CTF wrote %d types\n", list_count(iiburst->iib_types)); @@ -637,7 +641,7 @@ return (outbuf); } -void +static void get_ctt_size(ctf_type_t *ctt, size_t *sizep, size_t *incrementp) { if (ctt->ctt_size == CTF_LSIZE_SENT) { @@ -727,7 +731,7 @@ caddr_t sbuf = ctfdata + h->cth_stroff; size_t bufsz = h->cth_objtoff - h->cth_lbloff; int lastidx = 0, baseidx = -1; - char *baselabel; + char *baselabel = NULL; ctf_lblent_t *ctl; /* LINTED - pointer alignment */ ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#6 (text) ==== @@ -46,7 +46,7 @@ const char *progname; int debug_level = DEBUG_LEVEL; -static const char *infile = NULL; +static char *infile = NULL; static const char *outfile = NULL; static int dynsym; @@ -79,10 +79,10 @@ } static int -file_read(tdata_t *td, const char *filename, int ignore_non_c) +file_read(tdata_t *td, char *filename, int ignore_non_c) { - typedef int (*reader_f)(tdata_t *, Elf *, const char *); - static const reader_f readers[] = { + typedef int (*reader_f)(tdata_t *, Elf *, char *); + static reader_f readers[] = { stabs_read, dw_read, NULL @@ -149,7 +149,7 @@ main(int argc, char **argv) { tdata_t *filetd, *mstrtd; - char *label = NULL; + const char *label = NULL; int verbose = 0; int ignore_non_c = 0; int keep_stabs = 0; @@ -253,7 +253,6 @@ write_ctf(mstrtd, infile, outfile, dynsym | keep_stabs); } else { char *tmpname = mktmpname(infile, ".ctf"); - write_ctf(mstrtd, infile, tmpname, dynsym | keep_stabs); if (rename(tmpname, infile) != 0) terminate("Couldn't rename temp file %s", tmpname); ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#6 (text) ==== @@ -91,7 +91,7 @@ extern const char *progname; extern int debug_level; extern int debug_parse; -extern const char *curhdr; +extern char *curhdr; /* * This is a partial copy of the stab.h that DevPro includes with their @@ -354,11 +354,11 @@ iidesc_t *iidesc_new(char *); int iidesc_hash(int, void *); void iter_iidescs_by_name(tdata_t *, const char *, - int (*)(iidesc_t *, void *), void *); + int (*)(void *, void *), void *); iidesc_t *iidesc_dup(iidesc_t *); iidesc_t *iidesc_dup_rename(iidesc_t *, char const *, char const *); void iidesc_add(hash_t *, iidesc_t *); -void iidesc_free(iidesc_t *, void *); +void iidesc_free(void *, void *); int iidesc_count_type(void *, void *); void iidesc_stats(hash_t *); int iidesc_dump(iidesc_t *); @@ -404,10 +404,10 @@ void resolve_typed_bitfields(void); /* stabs.c */ -int stabs_read(tdata_t *, Elf *, const char *); +int stabs_read(tdata_t *, Elf *, char *); /* dwarf.c */ -int dw_read(tdata_t *, Elf *, const char *); +int dw_read(tdata_t *, Elf *, char *); const char *dw_tag2str(uint_t); /* tdata.c */ @@ -422,7 +422,7 @@ int tdesc_layouthash(int, void *); int tdesc_layoutcmp(void *, void *); void tdesc_free(tdesc_t *); -void tdata_label_add(tdata_t *, char *, int); +void tdata_label_add(tdata_t *, const char *, int); labelent_t *tdata_label_top(tdata_t *); int tdata_label_find(tdata_t *, char *); void tdata_label_free(tdata_t *); @@ -434,13 +434,17 @@ int findelfsecidx(Elf *, const char *, const char *); size_t elf_ptrsz(Elf *); char *mktmpname(const char *, const char *); -void terminate(char *, ...); -void aborterr(char *, ...); -void set_terminate_cleanup(void (*)()); +void terminate(const char *, ...); +void aborterr(const char *, ...); +void set_terminate_cleanup(void (*)(void)); void elfterminate(const char *, const char *, ...); -void warning(char *, ...); -void vadebug(int, char *, va_list); -void debug(int, char *, ...); +void warning(const char *, ...); +void vadebug(int, const char *, va_list); +void debug(int, const char *, ...); + + +void watch_dump(int); +void watch_set(void *, int); #ifdef __cplusplus } ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#3 (text+ko) ==== @@ -52,17 +52,17 @@ static void fix_ptrptr_to_struct(tdata_t *td) { - char *strs[2] = { "as", "fdbuffer" }; - char *mems[2] = { "a_objectdir", "fd_shadow" }; - char *acts[2] = { "vnode", "page" }; - char *tgts[2] = { "vnode_t", "page_t" }; + const char *strs[2] = { "as", "fdbuffer" }; + const char *mems[2] = { "a_objectdir", "fd_shadow" }; + const char *acts[2] = { "vnode", "page" }; + const char *tgts[2] = { "vnode_t", "page_t" }; tdesc_t *str; tdesc_t *act, *tgt; tdesc_t *p1, *p2; mlist_t *ml; int i; - for (i = 0; i < sizeof (strs) / sizeof (strs[0]); i++) { + for (i = 0; i < (int) (sizeof (strs) / sizeof (strs[0])); i++) { if (!(str = lookupname(strs[i])) || str->t_type != STRUCT) continue; @@ -106,8 +106,8 @@ static void fix_ptr_to_struct(tdata_t *td) { - char *strs[2] = { "vmem", "id_space" }; - char *mems[2] = { NULL, "is_vmem" }; + const char *strs[2] = { "vmem", "id_space" }; + const char *mems[2] = { NULL, "is_vmem" }; tdesc_t *ptr = NULL; tdesc_t *str, *vmt; mlist_t *ml; @@ -116,7 +116,7 @@ if ((vmt = lookupname("vmem_t")) == NULL || vmt->t_type != TYPEDEF) return; - for (i = 0; i < sizeof (strs) / sizeof (strs[0]); i++) { + for (i = 0; i < (int) (sizeof (strs) / sizeof (strs[0])); i++) { if (!(str = lookupname(strs[i])) || str->t_type != STRUCT) continue; @@ -163,8 +163,10 @@ }; static int -matching_iidesc(iidesc_t *iidesc, struct match *match) +matching_iidesc(void *arg1, void *arg2) { + iidesc_t *iidesc = arg1; + struct match *match = arg2; if (!streq(iidesc->ii_name, match->m_name)) return (0); @@ -176,10 +178,10 @@ } static tdesc_t * -lookup_tdesc(tdata_t *td, const char *name) +lookup_tdesc(tdata_t *td, char const *name) { struct match match = { NULL, name }; - iter_iidescs_by_name(td, name, (int (*)())matching_iidesc, &match); + iter_iidescs_by_name(td, name, matching_iidesc, &match); return (match.m_ret); } ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#6 (text) ==== @@ -50,7 +50,7 @@ struct hash_data { hash_t *hd_hash; - int (*hd_fun)(); + int (*hd_fun)(void *, void *); void *hd_key; void *hd_private; @@ -58,13 +58,14 @@ }; static int -hash_def_hash(int nbuckets, uintptr_t data) +hash_def_hash(int nbuckets, void *arg) { + uintptr_t data = (uintptr_t) arg; return (data % nbuckets); } static int -hash_def_cmp(uintptr_t d1, uintptr_t d2) +hash_def_cmp(void *d1, void *d2) { return (d1 != d2); } @@ -96,8 +97,8 @@ hash = xmalloc(sizeof (hash_t)); hash->h_buckets = xcalloc(sizeof (list_t *) * nbuckets); hash->h_nbuckets = nbuckets; - hash->h_hashfn = hashfn ? hashfn : (int (*)())hash_def_hash; - hash->h_cmp = cmp ? cmp : (int (*)())hash_def_cmp; + hash->h_hashfn = hashfn ? hashfn : hash_def_hash; + hash->h_cmp = cmp ? cmp : hash_def_cmp; return (hash); } @@ -124,8 +125,9 @@ } static int -hash_remove_cb(void *key1, void *key2, hash_t *hash) +hash_remove_cb(void *key1, void *key2, void *arg) { + hash_t *hash = arg; return (hash->h_cmp(key1, key2)); } @@ -135,7 +137,7 @@ int bucket = hash->h_hashfn(hash->h_nbuckets, key); (void) list_remove(&hash->h_buckets[bucket], key, - (int (*)())hash_remove_cb, hash); + hash_remove_cb, hash); } int @@ -148,8 +150,9 @@ } static int -hash_find_list_cb(void *node, struct hash_data *hd) +hash_find_list_cb(void *node, void *arg) { + struct hash_data *hd = arg; int cbrc; int rc = 0; @@ -174,14 +177,15 @@ hd.hd_key = key; hd.hd_private = private; - return (list_iter(hash->h_buckets[bucket], (int (*)())hash_find_list_cb, + return (list_iter(hash->h_buckets[bucket], hash_find_list_cb, &hd)); } /* stop on first match */ static int -hash_find_first_cb(void *node, struct hash_data *hd) +hash_find_first_cb(void *node, void *arg) { + struct hash_data *hd = arg; if (hd->hd_hash->h_cmp(hd->hd_key, node) == 0) { hd->hd_ret = node; return (-1); @@ -200,7 +204,7 @@ hd.hd_fun = hash_find_first_cb; hd.hd_key = key; - ret = hash_match(hash, key, (int (*)())hash_find_first_cb, &hd); + ret = hash_match(hash, key, hash_find_first_cb, &hd); if (ret && value) *value = hd.hd_ret; ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#4 (text) ==== @@ -68,8 +68,10 @@ } static int -iidesc_cmp(iidesc_t *src, iidesc_find_t *find) +iidesc_cmp(void *arg1, void *arg2) { + iidesc_t *src = arg1; + iidesc_find_t *find = arg2; iidesc_t *tgt = find->iif_tgt; if (src->ii_type != tgt->ii_type || @@ -89,7 +91,7 @@ find.iif_tgt = new; find.iif_ret = NULL; - (void) hash_match(hash, new, (int (*)())iidesc_cmp, &find); + (void) hash_match(hash, new, iidesc_cmp, &find); if (find.iif_ret != NULL) { iidesc_t *old = find.iif_ret; @@ -107,13 +109,14 @@ } void -iter_iidescs_by_name(tdata_t *td, const char *name, - int (*func)(iidesc_t *, void *), void *data) +iter_iidescs_by_name(tdata_t *td, char const *name, + int (*func)(void *, void *), void *data) { iidesc_t tmpdesc; - bzero(&tmpdesc, sizeof (iidesc_t)); - tmpdesc.ii_name = (char *)name; - (void) hash_match(td->td_iihash, &tmpdesc, (int (*)())func, data); + bzero(&tmpdesc, sizeof(tmpdesc)); + tmpdesc.ii_name = xstrdup(name); + (void) hash_match(td->td_iihash, &tmpdesc, func, data); + free(tmpdesc.ii_name); } iidesc_t * @@ -151,8 +154,9 @@ /*ARGSUSED*/ void -iidesc_free(iidesc_t *idp, void *private) +iidesc_free(void *arg, void *private __unused) { + iidesc_t *idp = arg; if (idp->ii_name) free(idp->ii_name); if (idp->ii_nargs) From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:31:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1326116A41A; Thu, 18 Oct 2007 05:31: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 BB6D516A419 for ; Thu, 18 Oct 2007 05:31:51 +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 A1E2913C442 for ; Thu, 18 Oct 2007 05:31:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5VpBT007416 for ; Thu, 18 Oct 2007 05:31:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5VpUr007413 for perforce@freebsd.org; Thu, 18 Oct 2007 05:31:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:31:51 GMT Message-Id: <200710180531.l9I5VpUr007413@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 127665 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, 18 Oct 2007 05:31:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127665 Change 127665 by jb@jb_freebsd1 on 2007/10/18 05:31:15 Fix compiler warnings for WARNS=6. Update to reflect the new BSD libdwarf which doesn't return objects in malloced memory. Our libdwarf API doesn't require looking up an Attribute for a DIE and then going back to trundle trough to get the value. Instead, given a DIE, the attribute value can be obtained directly since the library resolved the AttributeValue (as opposed to the Attribute which is part of the Abbrev) when the DWARF data was initialised. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#8 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#8 (text) ==== @@ -129,7 +129,7 @@ typedef struct dwarf { Dwarf_Debug dw_dw; /* for libdwarf */ Dwarf_Error dw_err; /* for libdwarf */ - Dwarf_Unsigned dw_maxoff; /* highest legal offset in this cu */ + Dwarf_Off dw_maxoff; /* highest legal offset in this cu */ tdata_t *dw_td; /* root of the tdesc/iidesc tree */ hash_t *dw_tidhash; /* hash of tdescs by t_id */ hash_t *dw_fwdhash; /* hash of fwd decls by name */ @@ -272,7 +272,7 @@ return (off); terminate("failed to get offset for die: %s\n", - dwarf_errmsg(dw->dw_err)); + dwarf_errmsg(&dw->dw_err)); /*NOTREACHED*/ return (0); } @@ -290,7 +290,7 @@ return (NULL); terminate("die %llu: failed to find type sibling: %s\n", - die_off(dw, die), dwarf_errmsg(dw->dw_err)); + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); /*NOTREACHED*/ return (NULL); } @@ -307,7 +307,7 @@ return (NULL); terminate("die %llu: failed to find type child: %s\n", - die_off(dw, die), dwarf_errmsg(dw->dw_err)); + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); /*NOTREACHED*/ return (NULL); } @@ -321,7 +321,7 @@ return (tag); terminate("die %llu: failed to get tag for type: %s\n", - die_off(dw, die), dwarf_errmsg(dw->dw_err)); + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); /*NOTREACHED*/ return (0); } @@ -344,43 +344,21 @@ } terminate("die %llu: failed to get attribute for type: %s\n", - die_off(dw, die), dwarf_errmsg(dw->dw_err)); + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); /*NOTREACHED*/ return (NULL); } -static Dwarf_Half -die_attr_form(dwarf_t *dw, Dwarf_Attribute attr) -{ - Dwarf_Half form; - - if (dwarf_whatform(attr, &form, &dw->dw_err) == DW_DLV_OK) - return (form); - - terminate("failed to get attribute form for type: %s\n", - dwarf_errmsg(dw->dw_err)); - /*NOTREACHED*/ - return (0); -} - static int die_signed(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Signed *valp, int req) { - Dwarf_Attribute attr; - Dwarf_Signed val; - - if ((attr = die_attr(dw, die, name, req)) == NULL) - return (0); /* die_attr will terminate for us if necessary */ - - if (dwarf_formsdata(attr, &val, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get signed (form 0x%x)\n", - die_off(dw, die), die_attr_form(dw, attr)); + if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (req) + terminate("die %llu: failed to get unsigned: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); } - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); - - *valp = val; return (1); } @@ -388,78 +366,55 @@ die_unsigned(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Unsigned *valp, int req) { - Dwarf_Attribute attr; - Dwarf_Unsigned val; - - if ((attr = die_attr(dw, die, name, req)) == NULL) - return (0); /* die_attr will terminate for us if necessary */ - - if (dwarf_formudata(attr, &val, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get unsigned (form 0x%x)\n", - die_off(dw, die), die_attr_form(dw, attr)); + if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (req) + terminate("die %llu: failed to get unsigned: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); } - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); - - *valp = val; return (1); } static int die_bool(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Bool *valp, int req) { - Dwarf_Attribute attr; - Dwarf_Bool val; - - if ((attr = die_attr(dw, die, name, req)) == NULL) - return (0); /* die_attr will terminate for us if necessary */ - - if (dwarf_formflag(attr, &val, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get bool (form 0x%x)\n", - die_off(dw, die), die_attr_form(dw, attr)); + if (dwarf_attrval_flag(die, name, valp, &dw->dw_err) != DWARF_E_NONE) { + if (req) + terminate("die %llu: failed to get flag: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); } - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); - - *valp = val; return (1); } static int die_string(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, char **strp, int req) { - Dwarf_Attribute attr; - char *str; + const char *str = NULL; - if ((attr = die_attr(dw, die, name, req)) == NULL) - return (0); /* die_attr will terminate for us if necessary */ - - if (dwarf_formstring(attr, &str, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get string (form 0x%x)\n", - die_off(dw, die), die_attr_form(dw, attr)); - } + if (dwarf_attrval_string(die, name, &str, &dw->dw_err) != DWARF_E_NONE || + str == NULL) { + if (req) + terminate("die %llu: failed to get string: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); + else + *strp = NULL; + } else + *strp = xstrdup(str); - *strp = xstrdup(str); - dwarf_dealloc(dw->dw_dw, str, DW_DLA_STRING); - return (1); } static Dwarf_Off die_attr_ref(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name) { - Dwarf_Attribute attr; Dwarf_Off off; - attr = die_attr(dw, die, name, DW_ATTR_REQ); - - if (dwarf_formref(attr, &off, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get ref (form 0x%x)\n", - die_off(dw, die), die_attr_form(dw, attr)); + if (dwarf_attrval_unsigned(die, name, &off, &dw->dw_err) != DWARF_E_NONE) { + terminate("die %llu: failed to get ref: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); } - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); - return (off); } @@ -523,21 +478,13 @@ static int die_mem_offset(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, - Dwarf_Unsigned *valp, int req) + Dwarf_Unsigned *valp, int req __unused) { - Dwarf_Attribute attr; - Dwarf_Locdesc *loc; - Dwarf_Signed locnum; + Dwarf_Locdesc *loc = NULL; + Dwarf_Signed locnum = 0; - if ((attr = die_attr(dw, die, name, req)) == NULL) - return (0); /* die_attr will terminate for us if necessary */ - - if (dwarf_loclist(attr, &loc, &locnum, &dw->dw_err) != DW_DLV_OK) { - terminate("die %llu: failed to get mem offset location list\n", - die_off(dw, die)); - } - - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); + if (dwarf_locdesc(die, name, &loc, &locnum, &dw->dw_err) != DW_DLV_OK) + return (0); if (locnum != 1 || loc->ld_s->lr_atom != DW_OP_plus_uconst) { terminate("die %llu: cannot parse member offset\n", @@ -546,8 +493,10 @@ *valp = loc->ld_s->lr_number; - dwarf_dealloc(dw->dw_dw, loc->ld_s, DW_DLA_LOC_BLOCK); - dwarf_dealloc(dw->dw_dw, loc, DW_DLA_LOCDESC); + if (loc != NULL) + if (dwarf_locdesc_free(loc, &dw->dw_err) != DW_DLV_OK) + terminate("die %llu: cannot free location descriptor: %s\n", + die_off(dw, die), dwarf_errmsg(&dw->dw_err)); return (1); } @@ -641,7 +590,7 @@ { Dwarf_Unsigned uval; Dwarf_Signed sval; - tdesc_t *ctdp; + tdesc_t *ctdp = NULL; Dwarf_Die dim2; ardef_t *ar; @@ -741,7 +690,7 @@ /*ARGSUSED1*/ static int -die_array_resolve(tdesc_t *tdp, tdesc_t **tdpp, void *private) +die_array_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private) { dwarf_t *dw = private; size_t sz; @@ -771,7 +720,7 @@ /*ARGSUSED1*/ static int -die_array_failed(tdesc_t *tdp, tdesc_t **tdpp, void *private) +die_array_failed(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private __unused) { tdesc_t *cont = tdp->t_ardef->ad_contents; @@ -867,7 +816,7 @@ /*ARGSUSED1*/ static int -die_enum_resolve(tdesc_t *tdp, tdesc_t **tdpp, void *private) +die_enum_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private) { dwarf_t *dw = private; tdesc_t *full = NULL; @@ -939,8 +888,9 @@ /* * GCC allows empty SOUs as an extension. */ - if ((mem = die_child(dw, str)) == NULL) + if ((mem = die_child(dw, str)) == NULL) { goto out; + } mlastp = &tdp->t_members; @@ -967,7 +917,7 @@ * bug 11816). */ if ((ml->ml_name = die_name(dw, mem)) == NULL) - ml->ml_name = ""; + ml->ml_name = NULL; ml->ml_type = die_lookup_pass1(dw, mem, DW_AT_type); @@ -984,7 +934,7 @@ ml->ml_size = tdesc_bitsize(ml->ml_type); if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) { -#ifdef _BIG_ENDIAN +#ifdef FROGFACE_BIG_ENDIAN ml->ml_offset += bitoff; #else ml->ml_offset += tdesc_bitsize(ml->ml_type) - bitoff - @@ -1058,7 +1008,7 @@ /*ARGSUSED1*/ static int -die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp, void *private) +die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private) { dwarf_t *dw = private; mlist_t *ml; @@ -1117,7 +1067,7 @@ /*ARGSUSED1*/ static int -die_sou_failed(tdesc_t *tdp, tdesc_t **tdpp, void *private) +die_sou_failed(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private __unused) { const char *typename = (tdp->t_type == STRUCT ? "struct" : "union"); mlist_t *ml; @@ -1146,7 +1096,7 @@ fndef_t *fn; int i; - debug(3, "die %llu: creating function pointer\n", off); + debug(3, "die %llu <%llx>: creating function pointer\n", off, off); /* * We'll begin by processing any type definition nodes that may be @@ -1176,7 +1126,6 @@ tdp->t_type = FUNCTION; if ((attr = die_attr(dw, die, DW_AT_type, 0)) != NULL) { - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); fn->fn_ret = die_lookup_pass1(dw, die, DW_AT_type); } else { fn->fn_ret = tdesc_intr_void(dw); @@ -1200,7 +1149,7 @@ fn->fn_args = xcalloc(sizeof (tdesc_t *) * fn->fn_nargs); for (i = 0, arg = die_child(dw, die); - arg != NULL && i < fn->fn_nargs; + arg != NULL && i < (int) fn->fn_nargs; arg = die_sibling(dw, arg)) { if (die_tag(dw, arg) != DW_TAG_formal_parameter) continue; @@ -1225,7 +1174,8 @@ die_base_name_parse(const char *name, char **newp) { char buf[100]; - char *base, *c; + char const *base; + char *c; int nlong = 0, nshort = 0, nchar = 0, nint = 0; int sign = 1; char fmt = '\0'; @@ -1309,7 +1259,7 @@ #else { { 12, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } }, #endif - { { 0, 0 } } + { { 0, 0 }, { 0, 0, 0 } } }; static uint_t @@ -1410,8 +1360,13 @@ */ (void) die_unsigned(dw, base, DW_AT_byte_size, &sz, DW_ATTR_REQ); - if (tdp->t_name == NULL) - terminate("die %llu: base type without name\n", off); + if (tdp->t_name == NULL) { + /* terminate("die %llu: base type without name\n", off); */ + char dummy_name[64]; + snprintf(dummy_name, sizeof(dummy_name), "die%lx", (u_long) off); + debug(1, "die %llu: has no name. Using a dummy one: '%s'\n", off, dummy_name); + tdp->t_name = xstrdup(dummy_name); + } /* XXX make a name parser for float too */ if ((intr = die_base_name_parse(tdp->t_name, &new)) != NULL) { @@ -1452,7 +1407,6 @@ tdp->t_type = type; if ((attr = die_attr(dw, die, DW_AT_type, 0)) != NULL) { - dwarf_dealloc(dw->dw_dw, attr, DW_DLA_ATTR); tdp->t_tdesc = die_lookup_pass1(dw, die, DW_AT_type); } else { tdp->t_tdesc = tdesc_intr_void(dw); @@ -1505,14 +1459,14 @@ /*ARGSUSED3*/ static void -die_function_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp) +die_function_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp __unused) { Dwarf_Die arg; Dwarf_Half tag; iidesc_t *ii; char *name; - debug(3, "die %llu: creating function definition\n", off); + debug(3, "die %llu: creating function definition '%s'\n", off); /* * We'll begin by processing any type definition nodes that may be @@ -1551,7 +1505,7 @@ for (arg = die_child(dw, die); arg != NULL; arg = die_sibling(dw, arg)) { - char *name; + char *name1; debug(3, "die %llu: looking at sub member at %llu\n", off, die_off(dw, die)); @@ -1559,13 +1513,13 @@ if (die_tag(dw, arg) != DW_TAG_formal_parameter) continue; - if ((name = die_name(dw, arg)) == NULL) { + if ((name1 = die_name(dw, arg)) == NULL) { terminate("die %llu: func arg %d has no name\n", off, ii->ii_nargs + 1); } - if (strcmp(name, "...") == 0) { - free(name); + if (strcmp(name1, "...") == 0) { + free(name1); ii->ii_vargs = 1; continue; } @@ -1597,7 +1551,7 @@ /*ARGSUSED3*/ static void -die_variable_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp) +die_variable_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp __unused) { iidesc_t *ii; char *name; @@ -1619,7 +1573,7 @@ /*ARGSUSED2*/ static int -die_fwd_resolve(tdesc_t *fwd, tdesc_t **fwdp, void *private) +die_fwd_resolve(tdesc_t *fwd, tdesc_t **fwdp, void *private __unused) { if (fwd->t_flags & TDESC_F_RESOLVED) return (1); @@ -1637,7 +1591,7 @@ /*ARGSUSED*/ static void -die_lexblk_descend(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp) +die_lexblk_descend(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off __unused, tdesc_t *tdp __unused) { Dwarf_Die child = die_child(dw, die); @@ -1720,8 +1674,14 @@ tdesc_add(dw, tdp); } - if (tdp != NULL) + if (tdp != NULL) { tdp->t_name = die_name(dw, die); + if (tdp->t_name == NULL) { + char dummy_name[64]; + snprintf(dummy_name, sizeof(dummy_name), "die%lx", (u_long) off); + tdp->t_name = xstrdup(dummy_name); + } + } dc->dc_create(dw, die, off, tdp); } @@ -1783,7 +1743,7 @@ debug(3, "resolve: pass %d, %u left\n", pass, dw->dw_nunres); - if (dw->dw_nunres == last) { + if ((int) dw->dw_nunres == last) { fprintf(stderr, "%s: failed to resolve the following " "types:\n", progname); @@ -1801,11 +1761,12 @@ /*ARGSUSED*/ int -dw_read(tdata_t *td, Elf *elf, const char *filename) +dw_read(tdata_t *td, Elf *elf, char *filename __unused) { Dwarf_Unsigned abboff, hdrlen, nxthdr; Dwarf_Half vers, addrsz; - Dwarf_Die cu, child; + Dwarf_Die cu = 0; + Dwarf_Die child = 0; dwarf_t dw; char *prod = NULL; int rc; @@ -1820,12 +1781,12 @@ dw.dw_enumhash = hash_new(TDESC_HASH_BUCKETS, tdesc_namehash, tdesc_namecmp); - if ((rc = dwarf_elf_init(elf, DW_DLC_READ, NULL, NULL, &dw.dw_dw, + if ((rc = dwarf_elf_init(elf, DW_DLC_READ, &dw.dw_dw, &dw.dw_err)) == DW_DLV_NO_ENTRY) { errno = ENOENT; return (-1); } else if (rc != DW_DLV_OK) { - if (dwarf_errno(dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { + if (dwarf_errno(&dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) { /* * There's no type data in the DWARF section, but * libdwarf is too clever to handle that properly. @@ -1834,13 +1795,14 @@ } terminate("failed to initialize DWARF: %s\n", - dwarf_errmsg(dw.dw_err)); + dwarf_errmsg(&dw.dw_err)); } if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff, - &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK || - (cu = die_sibling(&dw, NULL)) == NULL || - (child = die_child(&dw, cu)) == NULL) + &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_OK) + terminate("rc = %d %s\n", rc, dwarf_errmsg(&dw.dw_err)); + + if ((cu = die_sibling(&dw, NULL)) == NULL) terminate("file does not contain dwarf type data " "(try compiling with -g)\n"); @@ -1868,13 +1830,14 @@ debug(1, "CU name: %s\n", dw.dw_cuname); } - die_create(&dw, child); + if ((child = die_child(&dw, cu)) != NULL) + die_create(&dw, child); if ((rc = dwarf_next_cu_header(dw.dw_dw, &hdrlen, &vers, &abboff, &addrsz, &nxthdr, &dw.dw_err)) != DW_DLV_NO_ENTRY) terminate("multiple compilation units not supported\n"); - (void) dwarf_finish(dw.dw_dw, &dw.dw_err); + (void) dwarf_finish(&dw.dw_dw, &dw.dw_err); die_resolve(&dw); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:34:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88A9A16A41A; Thu, 18 Oct 2007 05:34: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 3A36816A417 for ; Thu, 18 Oct 2007 05:34:55 +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 0E12E13C478 for ; Thu, 18 Oct 2007 05:34:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5YsU2007625 for ; Thu, 18 Oct 2007 05:34:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5YsYZ007622 for perforce@freebsd.org; Thu, 18 Oct 2007 05:34:54 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:34:54 GMT Message-Id: <200710180534.l9I5YsYZ007622@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 127666 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, 18 Oct 2007 05:34:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=127666 Change 127666 by jb@jb_freebsd1 on 2007/10/18 05:34:27 Let the compiler check the prototypes. Sigh. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.c#3 (text) ==== @@ -35,6 +35,7 @@ #include #include #include +#include "memory.h" static void memory_bailout(void) From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:36:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCE3D16A46C; Thu, 18 Oct 2007 05:36: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 9215A16A41B for ; Thu, 18 Oct 2007 05:36:57 +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 65EFB13C46E for ; Thu, 18 Oct 2007 05:36:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5av02007769 for ; Thu, 18 Oct 2007 05:36:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5avjq007766 for perforce@freebsd.org; Thu, 18 Oct 2007 05:36:57 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:36:57 GMT Message-Id: <200710180536.l9I5avjq007766@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 127668 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, 18 Oct 2007 05:36:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=127668 Change 127668 by jb@jb_freebsd1 on 2007/10/18 05:36:34 We got compatibility for open64() so ZFS doesn't have to hack it. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 (text+ko) ==== @@ -470,7 +470,6 @@ #define gethrestime_sec() time(NULL) -#define open64(...) open(__VA_ARGS__) #define pread64(d, p, n, o) pread(d, p, n, o) #define pwrite64(d, p, n, o) pwrite(d, p, n, o) #define readdir64(d) readdir(d) From owner-p4-projects@FreeBSD.ORG Thu Oct 18 05:37:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3752F16A469; Thu, 18 Oct 2007 05:37: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 E520C16A421 for ; Thu, 18 Oct 2007 05:37:58 +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 D122213C442 for ; Thu, 18 Oct 2007 05:37:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I5bws0007796 for ; Thu, 18 Oct 2007 05:37:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I5bwRn007793 for perforce@freebsd.org; Thu, 18 Oct 2007 05:37:58 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 05:37:58 GMT Message-Id: <200710180537.l9I5bwRn007793@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 127669 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, 18 Oct 2007 05:37:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=127669 Change 127669 by jb@jb_freebsd1 on 2007/10/18 05:37:47 Fix compiler warnings for WARNS=6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#13 edit .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#6 edit .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#13 (text) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #endif #include #include ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#6 (text) ==== @@ -375,7 +375,7 @@ * provide the compiler-generated aggregation information. */ if (dtp->dt_options[DTRACEOPT_GRABANON] == DTRACEOPT_UNSET && - agg->dtagd_rec[0].dtrd_uarg != NULL) { + agg->dtagd_rec[0].dtrd_uarg != 0) { dtrace_stmtdesc_t *sdp; dt_ident_t *aid; ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.c#3 (text) ==== @@ -70,7 +70,7 @@ /*ARGSUSED2*/ static int -list_defcmp(void *d1, void *d2, void *private) +list_defcmp(void *d1, void *d2, void *private __unused) { return (d1 != d2); } @@ -135,7 +135,7 @@ /*ARGSUSED*/ static int -list_count_cb(void *data, void *private) +list_count_cb(void *data __unused, void *private __unused) { return (1); } From owner-p4-projects@FreeBSD.ORG Thu Oct 18 08:58:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ADBA16A419; Thu, 18 Oct 2007 08:58: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 1A59716A418 for ; Thu, 18 Oct 2007 08:58:52 +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 05E0413C44B for ; Thu, 18 Oct 2007 08:58:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I8wpEH031759 for ; Thu, 18 Oct 2007 08:58:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I8wp34031756 for perforce@freebsd.org; Thu, 18 Oct 2007 08:58:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 08:58:51 GMT Message-Id: <200710180858.l9I8wp34031756@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 127677 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, 18 Oct 2007 08:58:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127677 Change 127677 by jb@jb_freebsd1 on 2007/10/18 08:58:20 IFC Affected files ... .. //depot/projects/dtrace/ports/MOVED#45 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#13 integrate .. //depot/projects/dtrace/src/etc/Makefile#9 integrate .. //depot/projects/dtrace/src/etc/nscd.conf#1 branch .. //depot/projects/dtrace/src/lib/libc/net/nscache.c#3 integrate .. //depot/projects/dtrace/src/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/dtrace/src/share/mk/version_gen.awk#4 integrate .. //depot/projects/dtrace/src/share/termcap/termcap.src#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/dtrace/src/sys/arm/arm/identcpu.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/dtrace/src/sys/arm/include/armreg.h#7 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#7 integrate .. //depot/projects/dtrace/src/sys/boot/ofw/libofw/openfirm_mmu.c#4 delete .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/usr.bin/fmt/fmt.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/locate/locate/locate.rc#5 integrate .. //depot/projects/dtrace/src/usr.bin/locate/locate/updatedb.sh#5 integrate .. //depot/projects/dtrace/src/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/tail/read.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/dtrace/www/en/ports/Makefile#4 integrate Differences ... ==== //depot/projects/dtrace/ports/MOVED#45 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1501 2007/10/16 21:12:31 beech Exp $ +# $FreeBSD: ports/MOVED,v 1.1502 2007/10/17 10:12:24 ade Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3316,3 +3316,4 @@ security/p5-Digest-SHA2||2007-10-16|Has expired: Has numerious known bugs, deprecated in favor of Digest::SHA devel/p5-Devel-Peek||2007-10-16|Has expired: depends on antique versions of perl net/skype-devel||2007-10-16|No longer needed: Please update to net/skype +devel/bison2|devel/bison|2007-10-17|Bison 1.x to 2.x conversion ==== //depot/projects/dtrace/ports/Mk/bsd.port.mk#13 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.588 2007/10/03 22:24:59 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.589 2007/10/17 10:12:24 ade Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -362,7 +362,10 @@ # - If set, this port uses the GNU version of the ghostscript # software instead of the GPL version, which is used otherwise. ## -# USE_BISON - If set, this port uses bison for building. +# USE_BISON - Implies that the port uses bison in one way or another: +# 'yes' (backwards compatibility) - use bison for building +# new features: 'build', 'run', 'both', implying build, +# runtime, and both build/run dependencies ## # USE_IMAKE - If set, this port uses imake. Implies USE_X_PREFIX. # XMKMF - Set to path of `xmkmf' if not in $PATH @@ -1926,7 +1929,26 @@ .endif .if defined(USE_BISON) -BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison +_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison + +# XXX: backwards compatibility +. if ${USE_BISON:L} == "yes" +USE_BISON= build +pre-everything:: + @${ECHO_MSG} "WARNING: USE_BISON=yes deprecated, use build/run/both" +. endif + +. if ${USE_BISON:L} == "build" +BUILD_DEPENDS+= ${_BISON_DEPENDS} +. elif ${USE_BISON:L} == "run" +RUN_DEPENDS+= ${_BISON_DEPENDS} +. elif ${USE_BISON:L} == "both" +BUILD_DEPENDS+= ${_BISON_DEPENDS} +RUN_DEPENDS+= ${_BISON_DEPENDS} +. else +IGNORE= uses unknown USE_BISON construct +. endif + .endif .if !defined(_PERL_REFACTORING_COMPLETE) ==== //depot/projects/dtrace/src/etc/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.362 2007/10/15 20:00:18 netchild Exp $ +# $FreeBSD: src/etc/Makefile,v 1.363 2007/10/18 08:26:20 bushman Exp $ .include @@ -37,7 +37,7 @@ .endif .if ${MK_NS_CACHING} != "no" -BIN1+= cached.conf +BIN1+= nscd.conf .endif .if ${MK_OPENSSH} != "no" ==== //depot/projects/dtrace/src/lib/libc/net/nscache.c#3 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.1 2006/04/28 12:03:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/nscache.c,v 1.2 2007/10/17 23:20:49 tmclaugh Exp $"); #include "namespace.h" #include @@ -42,7 +42,7 @@ #define NSS_CACHE_BUFFER_INITIAL_SIZE (1024) #define NSS_CACHE_BUFFER_SIZE_LIMIT (NSS_CACHE_BUFFER_INITIAL_SIZE << 8) -#define CACHED_SOCKET_PATH "/var/run/cached" +#define CACHED_SOCKET_PATH "/var/run/nscd" int __nss_cache_handler(void *retval, void *mdata, va_list ap) ==== //depot/projects/dtrace/src/lib/libc/powerpc/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.5 2007/05/31 13:01:34 deischen Exp $ + * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.6 2007/10/18 07:23:31 grehan Exp $ */ /* @@ -35,7 +35,6 @@ ntohs; brk; exect; - pipe; sbrk; vfork; }; @@ -52,7 +51,7 @@ __longjmp; signalcontext; __signalcontext; - __syncicache;; + __syncicache; _end; .curbrk; .minbrk; ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ==== @@ -20,7 +20,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1069 2007/10/11 20:44:38 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1070 2007/10/17 17:52:31 delphij Exp $ 2000 @@ -2314,7 +2314,7 @@ 4.1.8 to 4.1.23. less has been updated from v381 - to v408. &merged; + to v409. &merged; libpcap has been updated from 0.9.1 to 0.9.4. &merged; ==== //depot/projects/dtrace/src/share/mk/version_gen.awk#4 (text) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/mk/version_gen.awk,v 1.3 2007/07/21 20:52:32 kan Exp $ +# $FreeBSD: src/share/mk/version_gen.awk,v 1.4 2007/10/17 20:09:56 yar Exp $ # # @@ -34,6 +34,8 @@ # version name. # symbols[][] - array index by [version name, symbol index], contains # names of symbols defined for each version. +# names[] - array index is symbol name and value is count, +# used to check for duplicate symbols and warn about them. # BEGIN { brackets = 0; @@ -45,10 +47,13 @@ # Strip comments. sub("#.*$", "", $0); - # Strip trailing spaces. - sub(" *$", "", $0); + # Strip leading and trailing whitespace. + sub("^[ \t]+", "", $0); + sub("[ \t]+$", "", $0); - if (/^[ \t]*[a-zA-Z0-9._]+ *{/) { + if (/^[a-zA-Z0-9._]+[ \t]*{$/) { + # Strip brace. + sub("{", "", $1); brackets++; symver = $1; versions[symver] = 1; @@ -56,39 +61,56 @@ generated[symver] = 0; version_count++; } - else if (/^[ \t]*} *[a-zA-Z0-9._]+ *;/) { + else if (/^}[ \t]*[a-zA-Z0-9._]+[ \t]*;$/) { + v = $1 != "}" ? $1 : $2; + # Strip brace. + sub("}", "", v); # Strip semicolon. - gsub(";", "", $2); - if (symver == "") - printf("Unmatched bracket.\n"); - else if (versions[$2] != 1) - printf("File %s: %s has unknown " \ - "successor %s\n", vfile, symver, $2); + sub(";", "", v); + if (symver == "") { + printf("File %s: Unmatched bracket.\n", + vfile) > stderr; + errors++; + } + else if (versions[v] != 1) { + printf("File %s: `%s' has unknown " \ + "successor `%s'.\n", + vfile, symver, v) > stderr; + errors++; + } else - successors[symver] = $2; + successors[symver] = v; brackets--; } - else if (/^[ \t]*};/) { - if (symver == "") + else if (/^}[ \t]*;$/) { + if (symver == "") { printf("File %s: Unmatched bracket.\n", vfile) > stderr; + errors++; + } # No successor brackets--; } - else if (/^[ \t]*}/) { - printf("File %s: Missing ending semi-colon.\n", + else if (/^}$/) { + printf("File %s: Missing final semicolon.\n", vfile) > stderr; + errors++; } else if (/^$/) ; # Ignore blank lines. - else - printf("File %s: Unknown directive: %s\n", + else { + printf("File %s: Unknown directive: `%s'.\n", vfile, $0) > stderr; + errors++; + } } brackets = 0; } -/.*/ { +{ + # Set meaningful filename for diagnostics. + filename = FILENAME != "" ? FILENAME : ""; + # Delete comments, preceding and trailing whitespace, then # consume blank lines. sub("#.*$", "", $0); @@ -98,15 +120,18 @@ next; } -/^[a-zA-Z0-9._]+ +{$/ { +/^[a-zA-Z0-9._]+[ \t]*{$/ { # Strip bracket from version name. sub("{", "", $1); - if (current_version != "") + if (current_version != "") { printf("File %s, line %d: Illegal nesting detected.\n", - FILENAME, FNR) > stderr; + filename, FNR) > stderr; + errors++; + } else if (versions[$1] == 0) { printf("File %s, line %d: Undefined " \ - "library version %s\n", FILENAME, FNR, $1) > stderr; + "library version `%s'.\n", filename, FNR, $1) > stderr; + errors++; # Remove this entry from the versions. delete versions[$1]; } @@ -116,20 +141,34 @@ next; } -/^[a-zA-Z0-9._]+ *;$/ { +/^[a-zA-Z0-9._]+[ \t]*;$/ { + # Strip semicolon. + sub(";", "", $1); if (current_version != "") { count = versions[current_version]; versions[current_version]++; symbols[current_version, count] = $1; + if (names[$1]++) { + printf("File %s, line %d: Duplicated symbol `%s'. " \ + "Did you forget to move it to ObsoleteVersions?\n", + filename, FNR, $1) > stderr; + errors++; + } } + else { + printf("File %s, line %d: Symbol `%s' outside version scope.\n", + filename, FNR, $1) > stderr; + errors++; + } next; } -/^} *;$/ { +/^}[ \t]*;$/ { brackets--; if (brackets < 0) { printf("File %s, line %d: Unmatched bracket.\n", - FILENAME, FNR, $1) > stderr; + filename, FNR, $1) > stderr; + errors++; brackets = 0; # Reset } current_version = ""; @@ -137,9 +176,10 @@ } -/.*/ { - printf("File %s, line %d: Unknown directive: '%s'\n", - FILENAME, FNR, $0) > stderr; +{ + printf("File %s, line %d: Unknown directive: `%s'.\n", + filename, FNR, $0) > stderr; + errors++; } function print_version(v) @@ -162,7 +202,7 @@ for (i = 1; i < versions[v]; i++) { if (i == 1) printf("global:\n"); - printf("\t%s\n", symbols[v, i]); + printf("\t%s;\n", symbols[v, i]); } version_count--; @@ -178,7 +218,13 @@ generated[v] = 1; } + END { + if (errors) { + printf("%d errors total.\n", errors) > stderr; + exit(1); + } + # OK, no errors. for (v in versions) { print_version(v); } ==== //depot/projects/dtrace/src/share/termcap/termcap.src#6 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.148 2006/04/30 09:05:56 matteo Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.149 2007/10/17 19:58:50 yar Exp $ # Termcap source file # John Kunze, Berkeley @@ -2821,7 +2821,7 @@ :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ - :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\ + :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm: # The xterm-xfree86 description has all of the features, but is not completely # compatible with vt220. If you are using a Sun or PC keyboard, set the ==== //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#10 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.19 2007/10/18 05:33:05 imp Exp $"); #include #include @@ -296,6 +296,64 @@ }; #endif /* CPU_ARM9 */ +#if defined(CPU_ARM9E) || defined(CPU_ARM10) +struct cpu_functions armv5_ec_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + cpufunc_nullop, /* cpwait */ + + /* MMU functions */ + + cpufunc_control, /* control */ + cpufunc_domains, /* Domain */ + armv5_ec_setttb, /* Setttb */ + cpufunc_faultstatus, /* Faultstatus */ + cpufunc_faultaddress, /* Faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + arm10_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + arm10_tlb_flushI_SE, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + armv5_ec_icache_sync_all, /* icache_sync_all */ + armv5_ec_icache_sync_range, /* icache_sync_range */ + + armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ + armv5_ec_dcache_wbinv_range, /* dcache_wbinv_range */ +/*XXX*/ armv5_ec_dcache_wbinv_range, /* dcache_inv_range */ + armv5_ec_dcache_wb_range, /* dcache_wb_range */ + + armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ + armv5_ec_idcache_wbinv_range, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + (void *)cpufunc_nullop, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + arm10_context_switch, /* context_switch */ + + arm10_setup /* cpu setup */ + +}; +#endif /* CPU_ARM9E || CPU_ARM10 */ + #ifdef CPU_ARM10 struct cpu_functions arm10_cpufuncs = { /* CPU functions */ @@ -869,6 +927,16 @@ goto out; } #endif /* CPU_ARM9 */ +#if defined(CPU_ARM9E) || defined(CPU_ARM10) + if (cputype == CPU_ID_ARM926EJS || + cputype == CPU_ID_ARM1026EJS) { + cpufuncs = armv5_ec_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ + get_cachetype_cp15(); + pmap_pte_init_generic(); + return 0; + } +#endif /* CPU_ARM9E || CPU_ARM10 */ #ifdef CPU_ARM10 if (/* cputype == CPU_ID_ARM1020T || */ cputype == CPU_ID_ARM1020E) { @@ -1434,10 +1502,12 @@ */ #if defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined (CPU_ARM9) || \ + defined(CPU_ARM9E) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ + defined(CPU_ARM10) || defined(CPU_ARM11) #define IGN 0 #define OR 1 @@ -1679,7 +1749,7 @@ } #endif /* CPU_ARM9 */ -#ifdef CPU_ARM10 +#if defined(CPU_ARM9E) || defined(CPU_ARM10) struct cpu_option arm10_options[] = { { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, @@ -1722,7 +1792,7 @@ cpu_idcache_wbinv_all(); /* Now really make sure they are clean. */ - asm volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); + __asm __volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); /* Set the control register */ ctrl = cpuctrl; @@ -1731,7 +1801,57 @@ /* And again. */ cpu_idcache_wbinv_all(); } -#endif /* CPU_ARM10 */ +#endif /* CPU_ARM9E || CPU_ARM10 */ + +#ifdef CPU_ARM11 +struct cpu_option arm11_options[] = { + { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "arm11.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "arm11.icache", BIC, OR, CPU_CONTROL_IC_ENABLE }, + { "arm11.dcache", BIC, OR, CPU_CONTROL_DC_ENABLE }, + { NULL, IGN, IGN, 0 } +}; + +void +arm11_setup(args) + char *args; +{ + int cpuctrl, cpuctrlmask; + + cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + /* | CPU_CONTROL_BPRD_ENABLE */; + cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE + | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK; + +#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS + cpuctrl |= CPU_CONTROL_AFLT_ENABLE; +#endif + + cpuctrl = parse_cpu_options(args, arm11_options, cpuctrl); + +#ifdef __ARMEB__ + cpuctrl |= CPU_CONTROL_BEND_ENABLE; +#endif + + /* Clear out the cache */ + cpu_idcache_wbinv_all(); + + /* Now really make sure they are clean. */ + __asm __volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); + + /* Set the control register */ + curcpu()->ci_ctrl = cpuctrl; + cpu_control(0xffffffff, cpuctrl); + + /* And again. */ + cpu_idcache_wbinv_all(); +} +#endif /* CPU_ARM11 */ #ifdef CPU_SA110 struct cpu_option sa110_options[] = { ==== //depot/projects/dtrace/src/sys/arm/arm/identcpu.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.12 2007/10/18 05:33:05 imp Exp $"); #include #include #include @@ -70,9 +70,12 @@ CPU_CLASS_ARM8, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, + CPU_CLASS_ARM9EJS, CPU_CLASS_ARM10E, + CPU_CLASS_ARM10EJ, CPU_CLASS_SA1, - CPU_CLASS_XSCALE + CPU_CLASS_XSCALE, + CPU_CLASS_ARM11J }; static const char * const generic_steppings[16] = { @@ -119,6 +122,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i80219_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const i80321_steppings[16] = { "step A-0", "step B-0", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", @@ -133,6 +143,7 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +/* Steppings for PXA2[15]0 */ static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -140,6 +151,24 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +/* Steppings for PXA255/26x. + * rev 5: PXA26x B0, rev 6: PXA255 A0 + */ +static const char * const pxa255_steppings[16] = { + "rev 0", "rev 1", "rev 2", "step A-0", + "rev 4", "step B-0", "step A-0", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +/* Stepping for PXA27x */ +static const char * const pxa27x_steppings[16] = { + "step A-0", "step A-1", "step B-0", "step B-1", + "step C-0", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const ixp425_steppings[16] = { "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", @@ -198,6 +227,8 @@ generic_steppings }, { CPU_ID_ARM922T, CPU_CLASS_ARM9TDMI, "ARM922T", generic_steppings }, + { CPU_ID_ARM926EJS, CPU_CLASS_ARM9EJS, "ARM926EJ-S", + generic_steppings }, { CPU_ID_ARM940T, CPU_CLASS_ARM9TDMI, "ARM940T", generic_steppings }, { CPU_ID_ARM946ES, CPU_CLASS_ARM9ES, "ARM946E-S", @@ -213,6 +244,8 @@ generic_steppings }, { CPU_ID_ARM1022ES, CPU_CLASS_ARM10E, "ARM1022E-S", generic_steppings }, + { CPU_ID_ARM1026EJS, CPU_CLASS_ARM10EJ, "ARM1026EJ-S", + generic_steppings }, { CPU_ID_SA110, CPU_CLASS_SA1, "SA-110", sa110_steppings }, @@ -240,11 +273,12 @@ i81342_steppings }, { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", - xscale_steppings }, - + i80219_steppings }, { CPU_ID_80219_600, CPU_CLASS_XSCALE, "i80219 600MHz", - xscale_steppings }, + i80219_steppings }, + { CPU_ID_PXA27X, CPU_CLASS_XSCALE, "PXA27x", + pxa27x_steppings }, { CPU_ID_PXA250A, CPU_CLASS_XSCALE, "PXA250", pxa2x0_steppings }, { CPU_ID_PXA210A, CPU_CLASS_XSCALE, "PXA210", @@ -253,8 +287,8 @@ pxa2x0_steppings }, { CPU_ID_PXA210B, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, - { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA250", - pxa2x0_steppings }, + { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA255", + pxa255_steppings }, { CPU_ID_PXA210C, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, @@ -265,6 +299,11 @@ { CPU_ID_IXP425_266, CPU_CLASS_XSCALE, "IXP425 266MHz", ixp425_steppings }, + { CPU_ID_ARM1136JS, CPU_CLASS_ARM11J, "ARM1136J-S", + generic_steppings }, + { CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1", + generic_steppings }, + { 0, CPU_CLASS_NONE, NULL, NULL } }; @@ -283,10 +322,13 @@ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ - { "ARM9E-S", NULL }, /* CPU_CLASS_ARM9ES */ + { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ + { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ { "ARM10E", "CPU_ARM10" }, /* CPU_CLASS_ARM10E */ + { "ARM10EJ", "CPU_ARM10" }, /* CPU_CLASS_ARM10EJ */ { "SA-1", "CPU_SA110" }, /* CPU_CLASS_SA1 */ { "XScale", "CPU_XSCALE_..." }, /* CPU_CLASS_XSCALE */ + { "ARM11J", "CPU_ARM11" }, /* CPU_CLASS_ARM11J */ }; /* @@ -310,7 +352,7 @@ "**unknown 11**", "**unknown 12**", "**unknown 13**", - "**unknown 14**", + "write-back-locking-C", "**unknown 15**", }; @@ -363,9 +405,13 @@ printf(" IDC enabled"); break; case CPU_CLASS_ARM9TDMI: + case CPU_CLASS_ARM9ES: + case CPU_CLASS_ARM9EJS: case CPU_CLASS_ARM10E: + case CPU_CLASS_ARM10EJ: case CPU_CLASS_SA1: case CPU_CLASS_XSCALE: + case CPU_CLASS_ARM11J: if ((ctrl & CPU_CONTROL_DC_ENABLE) == 0) printf(" DC disabled"); else ==== //depot/projects/dtrace/src/sys/arm/at91/at91_mcireg.h#2 (text+ko) ==== @@ -23,10 +23,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.1 2006/10/20 06:44:04 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.2 2007/10/18 05:43:44 imp Exp $ */ -#ifndef ARM_AT91_AT91QDMMCREG_H -#define ARM_AT91_AT91QDMMCREG_H +#ifndef ARM_AT91_AT91_MCIREG_H +#define ARM_AT91_AT91_MCIREG_H #define MMC_MAX 30 @@ -125,4 +125,4 @@ #define AT91C_BUS_WIDTH_1BIT 0x00 #define AT91C_BUS_WIDTH_4BITS 0x02 -#endif /* ARM_AT91_AT91QDMMCREG_H */ +#endif /* ARM_AT91_AT91_MCIREG_H */ ==== //depot/projects/dtrace/src/sys/arm/include/armreg.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.28 2003/10/31 16:30:15 scw Exp $ */ +/* $NetBSD: armreg.h,v 1.37 2007/01/06 00:50:54 christos Exp $ */ /*- * Copyright (c) 1998, 2001 Ben Harris @@ -35,11 +35,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.6 2007/07/27 14:54:27 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.7 2007/10/18 05:06:58 imp Exp $ */ #ifndef MACHINE_ARMREG_H #define MACHINE_ARMREG_H + #define INSN_SIZE 4 #define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define PSR_MODE 0x0000001f /* mode mask */ @@ -65,6 +66,7 @@ #define CPU_ID_DEC 0x44000000 /* 'D' */ #define CPU_ID_INTEL 0x69000000 /* 'i' */ #define CPU_ID_TI 0x54000000 /* 'T' */ +#define CPU_ID_FARADAY 0x66000000 /* 'f' */ /* How to decide what format the CPUID is in. */ #define CPU_ID_ISOLD(x) (((x) & 0x0000f000) == 0x00000000) @@ -89,6 +91,8 @@ #define CPU_ID_ARCH_V5 0x00030000 #define CPU_ID_ARCH_V5T 0x00040000 #define CPU_ID_ARCH_V5TE 0x00050000 +#define CPU_ID_ARCH_V5TEJ 0x00060000 +#define CPU_ID_ARCH_V6 0x00070000 #define CPU_ID_VARIANT_MASK 0x00f00000 /* Next three nybbles are part number */ @@ -118,7 +122,7 @@ /* ARM7 CPUs -- [15:12] == 7 */ #define CPU_ID_ARM700 0x41007000 /* XXX This is a guess. */ #define CPU_ID_ARM710 0x41007100 -#define CPU_ID_ARM7500 0x41027100 /* XXX This is a guess. */ +#define CPU_ID_ARM7500 0x41027100 #define CPU_ID_ARM710A 0x41047100 /* inc ARM7100 */ #define CPU_ID_ARM7500FE 0x41077100 #define CPU_ID_ARM710T 0x41807100 @@ -131,15 +135,20 @@ #define CPU_ID_ARM920T 0x41129200 #define CPU_ID_ARM920T_ALT 0x41009200 #define CPU_ID_ARM922T 0x41029220 +#define CPU_ID_ARM926EJS 0x41069260 #define CPU_ID_ARM940T 0x41029400 /* XXX no MMU */ #define CPU_ID_ARM946ES 0x41049460 /* XXX no MMU */ #define CPU_ID_ARM966ES 0x41049660 /* XXX no MMU */ #define CPU_ID_ARM966ESR1 0x41059660 /* XXX no MMU */ #define CPU_ID_ARM1020E 0x4115a200 /* (AKA arm10 rev 1) */ #define CPU_ID_ARM1022ES 0x4105a220 +#define CPU_ID_ARM1026EJS 0x4106a260 +#define CPU_ID_ARM1136JS 0x4107b360 +#define CPU_ID_ARM1136JSR1 0x4117b360 #define CPU_ID_SA110 0x4401a100 #define CPU_ID_SA1100 0x4401a110 #define CPU_ID_TI925T 0x54029250 +#define CPU_ID_FA526 0x66015260 #define CPU_ID_SA1110 0x6901b110 #define CPU_ID_IXP1200 0x6901c120 #define CPU_ID_80200 0x69052000 @@ -151,6 +160,7 @@ #define CPU_ID_PXA210B 0x69052920 /* 3rd version Core */ #define CPU_ID_PXA250C 0x69052d00 /* 4th version Core */ #define CPU_ID_PXA210C 0x69052d20 /* 4th version Core */ +#define CPU_ID_PXA27X 0x69054110 #define CPU_ID_80321_400 0x69052420 #define CPU_ID_80321_600 0x69052430 #define CPU_ID_80321_400_B0 0x69052c20 @@ -305,4 +315,6 @@ #define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define INSN_COND_AL 0xe0000000 /* Always condition */ +#define THUMB_INSN_SIZE 2 /* Some are 4 bytes. */ + #endif /* !MACHINE_ARMREG_H */ ==== //depot/projects/dtrace/src/sys/arm/include/cpuconf.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.10 2006/11/30 23:30:40 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.11 2007/10/18 05:33:06 imp Exp $ * */ @@ -50,12 +50,22 @@ /* * Step 1: Count the number of CPU types configured into the kernel. */ -#define CPU_NTYPES 2 +#define CPU_NTYPES (defined(CPU_ARM7TDMI) + \ + defined(CPU_ARM8) + defined(CPU_ARM9) + \ + defined(CPU_ARM9E) + \ + defined(CPU_ARM10) + \ + defined(CPU_ARM11) + \ + defined(CPU_SA110) + defined(CPU_SA1100) + \ + defined(CPU_SA1110) + \ + defined(CPU_IXP12X0) + \ + defined(CPU_XSCALE_80200) + \ + defined(CPU_XSCALE_80321) + \ + defined(__CPU_XSCALE_PXA2XX) + \ + defined(CPU_XSCALE_IXP425)) /* * Step 2: Determine which ARM architecture versions are configured. */ - #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425)) @@ -64,20 +74,35 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) +#if (defined(CPU_ARM9E) || defined(CPU_ARM10) || \ + defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ + defined(CPU_XSCALE_PXA2X0)) #define ARM_ARCH_5 1 #else #define ARM_ARCH_5 0 #endif -#define ARM_NARCH (ARM_ARCH_4 + ARM_ARCH_5) +#if defined(CPU_ARM11) +#define ARM_ARCH_6 1 +#else +#define ARM_ARCH_6 0 +#endif + +#define ARM_NARCH (ARM_ARCH_4 + ARM_ARCH_5 + ARM_ARCH_6) #if ARM_NARCH == 0 && !defined(KLD_MODULE) && defined(_KERNEL) #error ARM_NARCH is 0 #endif +#if ARM_ARCH_5 || ARM_ARCH_6 /* + * We could support Thumb code on v4T, but the lack of clean interworking + * makes that hard. + */ +#define THUMB_CODE +#endif + +/* * Step 3: Define which MMU classes are configured: * * ARM_MMU_MEMC Prehistoric, external memory controller @@ -99,7 +124,8 @@ #endif #if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \ - defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM10)) + defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM9E) || \ + defined(CPU_ARM10) || defined(CPU_ARM11)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 ==== //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.12 2007/07/27 14:39:41 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.13 2007/10/18 05:33:06 imp Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -351,7 +351,7 @@ extern unsigned arm9_dcache_index_inc; #endif -#ifdef CPU_ARM10 +#if defined(CPU_ARM9E) || defined(CPU_ARM10) void arm10_setttb (u_int); void arm10_tlb_flushID_SE (u_int); @@ -378,8 +378,60 @@ extern unsigned arm10_dcache_index_inc; #endif -#if defined(CPU_ARM9) || defined(CPU_ARM10) || defined(CPU_SA110) || \ - defined(CPU_SA1100) || defined(CPU_SA1110) || \ +#ifdef CPU_ARM11 +void arm11_setttb (u_int); + +void arm11_tlb_flushID_SE (u_int); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:13:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78F7416A418; Thu, 18 Oct 2007 09:13: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 1377D16A41A for ; Thu, 18 Oct 2007 09:13:08 +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 0046513C45D for ; Thu, 18 Oct 2007 09:13:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9D7Aa033839 for ; Thu, 18 Oct 2007 09:13:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9D7Ow033836 for perforce@freebsd.org; Thu, 18 Oct 2007 09:13:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:13:07 GMT Message-Id: <200710180913.l9I9D7Ow033836@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 127678 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, 18 Oct 2007 09:13:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=127678 Change 127678 by jb@jb_freebsd1 on 2007/10/18 09:13:00 Scrap GNU libdwarf now we have a BSD version which, although incomplete, does what DTrace's CTF tools need. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/CHANGES#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/COPYING#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/ChangeLog#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/LIBDWARFCOPYRIGHT#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/Makefile.in#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/NEWS#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/README#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/bldDWindex.sh#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/cmplrs/dwarf_addr_finder.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/config.guess#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/config.h.in#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/config.sub#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/configure#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/configure.in#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf.v2.mm#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf.v2.ps#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_abbrev.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_abbrev.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_addr_finder.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#5 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_arange.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_arange.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_base_types.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_die_deliv.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_die_deliv.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_error.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_error.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_form.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_frame.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_frame.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_funcs.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_funcs.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_global.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_global.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_incl.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#6 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_leb.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_line.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_line.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_loc.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_loc.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_macro.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_macro.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_opaque.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_print_lines.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_query.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#5 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_string.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_stubs.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_types.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_types.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_util.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_util.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_vars.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_vars.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_weaks.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_weaks.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/index.v2.mm#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/index.v2.ps#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/install.sh#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf.h#4 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf2.1.mm#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf2.1.ps#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf2p.1.mm#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf2p.1.ps#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarfdefs.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/mips_extensions.mm#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/mips_extensions.ps#2 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_alloc.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_alloc.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_arange.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_arange.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_die.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_die.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_encode_nm.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_encode_nm.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_error.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_error.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_expr.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_expr.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_finish.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_forms.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_frame.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_frame.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_funcs.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_incl.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_init.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_line.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_line.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_macinfo.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_macinfo.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_opaque.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_pubnames.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_stream.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_stream.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_symbolic.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_reloc_symbolic.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_section.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_section.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_types.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_types.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_util.h#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_vars.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/pro_weaks.c#3 delete .. //depot/projects/dtrace/src/contrib/libdwarf/t.c#2 delete .. //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#5 delete .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#7 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:20:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A54C116A49E; Thu, 18 Oct 2007 09:20:18 +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 C8C8916A494 for ; Thu, 18 Oct 2007 09:20:17 +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 B5D6113C45A for ; Thu, 18 Oct 2007 09:20:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9KH1M034093 for ; Thu, 18 Oct 2007 09:20:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9KHPx034089 for perforce@freebsd.org; Thu, 18 Oct 2007 09:20:17 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:20:17 GMT Message-Id: <200710180920.l9I9KHPx034089@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 127679 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, 18 Oct 2007 09:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=127679 Change 127679 by jb@jb_freebsd1 on 2007/10/18 09:19:16 Merge the DTrace userland libraries and programs back in. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#6 edit .. //depot/projects/dtrace/src/cddl/lib/Makefile#9 edit .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#14 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#2 edit .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#6 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#13 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/xalloc.c#2 delete .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#5 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#10 edit .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile.inc#6 (text+ko) ==== @@ -1,3 +1,8 @@ # $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris + CFLAGS+= -D_SOLARIS_C_SOURCE + +IGNORE_PRAGMA= YES ==== //depot/projects/dtrace/src/cddl/lib/Makefile#9 (text+ko) ==== @@ -3,7 +3,10 @@ .include SUBDIR= libavl \ + libctf \ + libdtrace \ libnvpair \ + libproc \ libumem \ libuutil \ ${_libzfs} \ ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#14 (text+ko) ==== @@ -56,7 +56,7 @@ -I${.CURDIR}/../libproc \ -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ - -I${.CURDIR}/../../../sys \ + -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ ==== //depot/projects/dtrace/src/cddl/lib/libproc/Makefile#2 (text+ko) ==== @@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ -I${.CURDIR}/../../../sys \ + -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#6 (text+ko) ==== @@ -2,7 +2,12 @@ .include -SUBDIR= ${_ztest} +SUBDIR= \ + ctfconvert \ + ctfdump \ + ctfmerge \ + sgsmsg \ + ${_ztest} .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#13 (text+ko) ==== @@ -4,7 +4,7 @@ .include "../../Makefile.inc" -WARNS= 1 +DEBUG_FLAGS= -g PROG= ctfconvert @@ -17,6 +17,7 @@ iidesc.c \ input.c \ list.c \ + memory.c \ merge.c \ output.c \ st_parse.c \ @@ -26,13 +27,13 @@ symbol.c \ tdata.c \ traverse.c \ - util.c \ - xalloc.c + util.c -WARNS?= 1 +WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ -I${.CURDIR}/../../../contrib \ + -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#5 (text+ko) ==== @@ -4,16 +4,17 @@ PROG= ctfdump -SRCS= die.c \ - dump.c \ - symbol.c +SRCS= dump.c \ + symbol.c \ + utils.c -WARNS= 1 +WARNS?= 6 CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ + -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common @@ -22,7 +23,6 @@ LDADD+= -lelf -lz -.PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#10 (text+ko) ==== @@ -17,19 +17,20 @@ iidesc.c \ input.c \ list.c \ + memory.c \ merge.c \ output.c \ strtab.c \ symbol.c \ tdata.c \ traverse.c \ - util.c \ - xalloc.c + util.c -WARNS?= 1 +WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../contrib/libdwarf \ -I${.CURDIR}/../../../contrib \ + -I${.CURDIR}/../../../sys/compat/opensolaris \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ @@ -40,7 +41,6 @@ LDADD+= -lctf -ldwarf -lelf -lz -lthr -.PATH: ${.CURDIR}/../ctfconvert .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt ==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#5 (text+ko) ==== @@ -2,7 +2,8 @@ .include -SUBDIR= ${_zdb} +SUBDIR= dtrace \ + ${_zdb} .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:32:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B16B16A421; Thu, 18 Oct 2007 09:32: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 C616616A419 for ; Thu, 18 Oct 2007 09:32:30 +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 B5A6013C45D for ; Thu, 18 Oct 2007 09:32:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9WUpU034970 for ; Thu, 18 Oct 2007 09:32:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9WUfa034967 for perforce@freebsd.org; Thu, 18 Oct 2007 09:32:30 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:32:30 GMT Message-Id: <200710180932.l9I9WUfa034967@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 127680 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, 18 Oct 2007 09:32:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127680 Change 127680 by jb@jb_freebsd1 on 2007/10/18 09:31:35 Scrap sun4v-specific boot stuff. It was never used. Affected files ... .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile.inc#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/Makefile#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/_start.s#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1.c#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/Makefile#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/hcall.S#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/help.sparc64#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/locore.S#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/main.c#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/metadata.c#2 delete .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/version#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:47:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E5EA16A420; Thu, 18 Oct 2007 09:47: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 77B8E16A417 for ; Thu, 18 Oct 2007 09:47:48 +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 5037313C45B for ; Thu, 18 Oct 2007 09:47:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9lmhh035695 for ; Thu, 18 Oct 2007 09:47:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9lmLS035692 for perforce@freebsd.org; Thu, 18 Oct 2007 09:47:48 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:47:48 GMT Message-Id: <200710180947.l9I9lmLS035692@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 127684 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, 18 Oct 2007 09:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=127684 Change 127684 by jb@jb_freebsd1 on 2007/10/18 09:47:32 Re-enable -Werror again. Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#8 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.sys.mk#8 (text+ko) ==== @@ -8,9 +8,6 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 -# Universally disable -Werror until src/ is in better shape for GCC 4.2 -NO_WERROR= - .if !defined(NO_WARNS) && ${CC} != "icc" . if defined(CSTD) . if ${CSTD} == "k&r" From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:49:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1838516A468; Thu, 18 Oct 2007 09:49: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 D25C016A41B for ; Thu, 18 Oct 2007 09:49:50 +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 AB18013C45B for ; Thu, 18 Oct 2007 09:49:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9noNU035754 for ; Thu, 18 Oct 2007 09:49:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9noeH035750 for perforce@freebsd.org; Thu, 18 Oct 2007 09:49:50 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:49:50 GMT Message-Id: <200710180949.l9I9noeH035750@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 127685 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, 18 Oct 2007 09:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=127685 Change 127685 by jb@jb_freebsd1 on 2007/10/18 09:49:31 Remove -Wno-pointer-sign from CXXFLAGS because gcc 4.2 hates it. Affected files ... .. //depot/projects/dtrace/src/share/mk/sys.mk#9 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/sys.mk#9 (text+ko) ==== @@ -53,10 +53,11 @@ .else DEBUG_FLAGS = -g .endif +AFLAGS += --gdwarf2 .endif CXX ?= c++ -CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} +CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} CPP ?= cpp From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:51:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E30316A41A; Thu, 18 Oct 2007 09:51: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 83FF016A417 for ; Thu, 18 Oct 2007 09:51:54 +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 7462F13C4A5 for ; Thu, 18 Oct 2007 09:51:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9ps57036058 for ; Thu, 18 Oct 2007 09:51:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9psJm036055 for perforce@freebsd.org; Thu, 18 Oct 2007 09:51:54 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:51:54 GMT Message-Id: <200710180951.l9I9psJm036055@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 127686 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, 18 Oct 2007 09:51:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=127686 Change 127686 by jb@jb_freebsd1 on 2007/10/18 09:51:07 Change WARNS to suit gcc 4.2 until the code is in better shape. Affected files ... .. //depot/projects/dtrace/src/usr.bin/tip/tip/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/tip/tip/Makefile#5 (text+ko) ==== @@ -36,7 +36,7 @@ MAN= tip.1 cu.1 CFLAGS+=-I${.CURDIR} -DDEFBR=9600 -DDEFFS=BUFSIZ -DACULOG -DPRISTINE \ -DCONNECT -DV831 -DVENTEL -DHAYES -DCOURIER -DT3000 -WARNS?= 3 +WARNS?= 2 .PATH: ${.CURDIR}/../libacu SRCS= acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \ remote.c tip.c tipout.c uucplock.c value.c vars.c \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:52:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FBFD16A420; Thu, 18 Oct 2007 09:52: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 00D4416A417 for ; Thu, 18 Oct 2007 09:52: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 CE22913C448 for ; Thu, 18 Oct 2007 09:52:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9qtxb036090 for ; Thu, 18 Oct 2007 09:52:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9qtQi036087 for perforce@freebsd.org; Thu, 18 Oct 2007 09:52:55 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:52:55 GMT Message-Id: <200710180952.l9I9qtQi036087@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 127687 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, 18 Oct 2007 09:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=127687 Change 127687 by jb@jb_freebsd1 on 2007/10/18 09:52:29 Change WARNS to suit gcc 4.2 until the code is in better shape. Affected files ... .. //depot/projects/dtrace/src/usr.sbin/arp/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/usr.sbin/arp/Makefile#4 (text+ko) ==== @@ -4,6 +4,6 @@ PROG= arp MAN= arp.4 arp.8 -WARNS?= 3 +WARNS?= 1 .include From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:54:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFBE316A420; Thu, 18 Oct 2007 09:54: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 8C66316A41A for ; Thu, 18 Oct 2007 09:54:58 +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 7DDDF13C4A7 for ; Thu, 18 Oct 2007 09:54:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9swkW036148 for ; Thu, 18 Oct 2007 09:54:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9swtS036145 for perforce@freebsd.org; Thu, 18 Oct 2007 09:54:58 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:54:58 GMT Message-Id: <200710180954.l9I9swtS036145@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 127688 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, 18 Oct 2007 09:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=127688 Change 127688 by jb@jb_freebsd1 on 2007/10/18 09:54:39 Fix compiler warnings so that these pass WARNS. Affected files ... .. //depot/projects/dtrace/src/usr.sbin/IPXrouted/trace.c#4 edit .. //depot/projects/dtrace/src/usr.sbin/acpi/acpidump/acpi.c#5 edit .. //depot/projects/dtrace/src/usr.sbin/ppp/chap.h#4 edit .. //depot/projects/dtrace/src/usr.sbin/ppp/physical.h#4 edit .. //depot/projects/dtrace/src/usr.sbin/sa/db.c#2 edit Differences ... ==== //depot/projects/dtrace/src/usr.sbin/IPXrouted/trace.c#4 (text+ko) ==== @@ -363,8 +363,8 @@ fprintf(fd, "Bad cmd 0x%x %s %s#%x\n", ntohs(msg->rip_cmd), dir, ipxdp_ntoa(&who->sipx_addr), ntohs(who->sipx_addr.x_port)); - fprintf(fd, "size=%d cp=%lx packet=%x\n", size, - (u_long)cp, (u_int)packet); + fprintf(fd, "size=%d cp=%p packet=%p\n", size, + cp, packet); return; } switch (ntohs(msg->rip_cmd)) { @@ -407,8 +407,8 @@ fprintf(fd, "Bad cmd 0x%x %s %s#%x\n", ntohs(msg->sap_cmd), dir, ipxdp_ntoa(&who->sipx_addr), ntohs(who->sipx_addr.x_port)); - fprintf(fd, "size=%d cp=%lx packet=%x\n", size, - (u_long)cp, (u_int)packet); + fprintf(fd, "size=%d cp=%p packet=%p\n", size, + cp, packet); return; } switch (ntohs(msg->sap_cmd)) { ==== //depot/projects/dtrace/src/usr.sbin/acpi/acpidump/acpi.c#5 (text+ko) ==== @@ -821,7 +821,7 @@ close(STDOUT_FILENO); if (vflag == 0) close(STDERR_FILENO); - execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, 0); + execl("/usr/sbin/iasl", "iasl", "-d", tmpstr, NULL); err(1, "exec"); } ==== //depot/projects/dtrace/src/usr.sbin/ppp/chap.h#4 (text+ko) ==== @@ -61,7 +61,7 @@ #define descriptor2chap(d) \ ((d)->type == CHAP_DESCRIPTOR ? (struct chap *)(d) : NULL) #define auth2chap(a) \ - ((struct chap *)((char *)a - (int)&((struct chap *)0)->auth)) + ((struct chap *)((char *)a - (uintptr_t)&((struct chap *)0)->auth)) struct MSCHAPv2_resp { /* rfc2759 */ char PeerChallenge[16]; ==== //depot/projects/dtrace/src/usr.sbin/ppp/physical.h#4 (text+ko) ==== @@ -116,7 +116,7 @@ }; #define field2phys(fp, name) \ - ((struct physical *)((char *)fp - (int)(&((struct physical *)0)->name))) + ((struct physical *)((char *)fp - (uintptr_t)(&((struct physical *)0)->name))) #define link2physical(l) \ ((l)->type == PHYSICAL_LINK ? field2phys(l, link) : NULL) ==== //depot/projects/dtrace/src/usr.sbin/sa/db.c#2 (text+ko) ==== @@ -89,7 +89,7 @@ goto closeout; } else if (rv == 0) { /* It's there; verify version. */ if (data.size != sizeof(version)) { - warnx("invalid version size %d in %s", + warnx("invalid version size %zd in %s", data.size, uname); error = -1; goto closeout; From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:57:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AD7816A469; Thu, 18 Oct 2007 09:57: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 D898E16A41A for ; Thu, 18 Oct 2007 09:57:01 +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 B163213C46A for ; Thu, 18 Oct 2007 09:57:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9v159036276 for ; Thu, 18 Oct 2007 09:57:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9v1uR036271 for perforce@freebsd.org; Thu, 18 Oct 2007 09:57:01 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:57:01 GMT Message-Id: <200710180957.l9I9v1uR036271@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 127689 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, 18 Oct 2007 09:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=127689 Change 127689 by jb@jb_freebsd1 on 2007/10/18 09:57:00 gcc 4.2 hates this code. Affected files ... .. //depot/projects/dtrace/src/sbin/ipf/ipftest/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/sbin/ipf/ipftest/Makefile#5 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD: src/sbin/ipf/ipftest/Makefile,v 1.4 2006/09/10 08:58:46 obrien Exp $ +WARNS=0 + PROG= ipftest SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 09:58:03 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4429D16A41A; Thu, 18 Oct 2007 09:58: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 0A00616A418 for ; Thu, 18 Oct 2007 09:58:03 +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 EF7E313C467 for ; Thu, 18 Oct 2007 09:58:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9w2rb036309 for ; Thu, 18 Oct 2007 09:58:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I9w27v036306 for perforce@freebsd.org; Thu, 18 Oct 2007 09:58:02 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 09:58:02 GMT Message-Id: <200710180958.l9I9w27v036306@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 127690 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, 18 Oct 2007 09:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=127690 Change 127690 by jb@jb_freebsd1 on 2007/10/18 09:57:59 Fix compiler warnings to pass WARS. Affected files ... .. //depot/projects/dtrace/src/sbin/geom/class/virstor/geom_virstor.c#2 edit .. //depot/projects/dtrace/src/sbin/spppcontrol/spppcontrol.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sbin/geom/class/virstor/geom_virstor.c#2 (text+ko) ==== @@ -343,7 +343,7 @@ "%s: %s.", name, strerror(errno)); return; } - if (msize < MAX(md.md_chunk_size*4, map_size)) + if (msize < (off_t) MAX(md.md_chunk_size*4, map_size)) gctl_error(req, "Device %s is too small", name); error = g_metadata_clear(name, NULL); if (error != 0) { @@ -429,7 +429,7 @@ if (verbose) printf("(%u chunks) ", md.chunk_count); /* Check to make sure last sector is unused */ - if ((off_t)(md.chunk_count) * md.md_chunk_size > msize-ssize) + if ((off_t)(md.chunk_count * md.md_chunk_size) > msize-ssize) md.chunk_count--; md.chunk_next = 0; if (i != 1) { ==== //depot/projects/dtrace/src/sbin/spppcontrol/spppcontrol.c#4 (text+ko) ==== @@ -88,7 +88,7 @@ argc--; argv++; - spr.cmd = (int)SPPPIOGDEFS; + spr.cmd = (int)(uintptr_t) SPPPIOGDEFS; ifr.ifr_data = (caddr_t)&spr; if (ioctl(s, SIOCGIFGENERIC, &ifr) == -1) @@ -186,7 +186,7 @@ argc--; } - spr.cmd = (int)SPPPIOSDEFS; + spr.cmd = (int)(uintptr_t)SPPPIOSDEFS; if (ioctl(s, SIOCSIFGENERIC, &ifr) == -1) err(EX_OSERR, "SIOCSIFGENERIC(SPPPIOSDEFS)"); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 10:00:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90C3916A468; Thu, 18 Oct 2007 10:00: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 45C7016A41A for ; Thu, 18 Oct 2007 10:00:08 +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 1B1C013C45B for ; Thu, 18 Oct 2007 10:00:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9IA073B036428 for ; Thu, 18 Oct 2007 10:00:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9IA07Xa036425 for perforce@freebsd.org; Thu, 18 Oct 2007 10:00:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 10:00:07 GMT Message-Id: <200710181000.l9IA07Xa036425@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 127691 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, 18 Oct 2007 10:00:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=127691 Change 127691 by jb@jb_freebsd1 on 2007/10/18 09:59:18 Change WARNS to suit gcc 4.2 until the code is in better state. Affected files ... .. //depot/projects/dtrace/src/bin/sh/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/bin/sh/Makefile#5 (text+ko) ==== @@ -22,7 +22,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 -WARNS?= 3 +WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 10:02:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCFAB16A41B; Thu, 18 Oct 2007 10:02: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 74BDA16A41A for ; Thu, 18 Oct 2007 10:02:10 +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 66A5D13C459 for ; Thu, 18 Oct 2007 10:02:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9IA2AKw036656 for ; Thu, 18 Oct 2007 10:02:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9IA2ADA036653 for perforce@freebsd.org; Thu, 18 Oct 2007 10:02:10 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 10:02:10 GMT Message-Id: <200710181002.l9IA2ADA036653@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 127692 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, 18 Oct 2007 10:02:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=127692 Change 127692 by jb@jb_freebsd1 on 2007/10/18 10:01:16 Const-ify an argument. Affected files ... .. //depot/projects/dtrace/src/lib/libutil/expand_number.3#3 edit .. //depot/projects/dtrace/src/lib/libutil/expand_number.c#2 edit .. //depot/projects/dtrace/src/lib/libutil/libutil.h#5 edit Differences ... ==== //depot/projects/dtrace/src/lib/libutil/expand_number.3#3 (text+ko) ==== @@ -37,7 +37,7 @@ .In libutil.h .Ft int .Fo expand_number -.Fa "char *buf" "int64_t *num" +.Fa "const char *buf" "int64_t *num" .Fc .Sh DESCRIPTION The ==== //depot/projects/dtrace/src/lib/libutil/expand_number.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ * 8) A positive decimal number followed by a 'e' or 'E' (mult by 1 << 60). */ int -expand_number(char *buf, int64_t *num) +expand_number(const char *buf, int64_t *num) { static const char unit[] = "bkmgtpe"; char *endptr, s; ==== //depot/projects/dtrace/src/lib/libutil/libutil.h#5 (text+ko) ==== @@ -82,7 +82,7 @@ struct termios *_termp, struct winsize *_winp); int humanize_number(char *_buf, size_t _len, int64_t _number, const char *_suffix, int _scale, int _flags); -int expand_number(char *_buf, int64_t *_num); +int expand_number(const char *_buf, int64_t *_num); const char *uu_lockerr(int _uu_lockresult); int uu_lock(const char *_ttyname); int uu_unlock(const char *_ttyname); From owner-p4-projects@FreeBSD.ORG Thu Oct 18 11:10:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B29616A41B; Thu, 18 Oct 2007 11:10: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 4EC8016A418 for ; Thu, 18 Oct 2007 11:10:29 +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 4410D13C46B for ; Thu, 18 Oct 2007 11:10:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9IBAT8v043078 for ; Thu, 18 Oct 2007 11:10:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9IBATiI043075 for perforce@freebsd.org; Thu, 18 Oct 2007 11:10:29 GMT (envelope-from gabor@freebsd.org) Date: Thu, 18 Oct 2007 11:10:29 GMT Message-Id: <200710181110.l9IBATiI043075@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 127696 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, 18 Oct 2007 11:10:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=127696 Change 127696 by gabor@gabor_server on 2007/10/18 11:09:59 IFC Affected files ... .. //depot/projects/docproj_hu/books/handbook/Makefile#2 integrate .. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#3 integrate Differences ... ==== //depot/projects/docproj_hu/books/handbook/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.107 2007/07/29 11:19:09 blackend Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.108 2007/10/13 12:01:20 chinsan Exp $ # # Build the FreeBSD Handbook. # @@ -146,6 +146,19 @@ IMAGES_EN+= virtualization/parallels-freebsd11.png IMAGES_EN+= virtualization/parallels-freebsd12.png IMAGES_EN+= virtualization/parallels-freebsd13.png +IMAGES_EN+= virtualization/virtualpc-freebsd1.png +IMAGES_EN+= virtualization/virtualpc-freebsd2.png +IMAGES_EN+= virtualization/virtualpc-freebsd3.png +IMAGES_EN+= virtualization/virtualpc-freebsd4.png +IMAGES_EN+= virtualization/virtualpc-freebsd5.png +IMAGES_EN+= virtualization/virtualpc-freebsd6.png +IMAGES_EN+= virtualization/virtualpc-freebsd7.png +IMAGES_EN+= virtualization/virtualpc-freebsd8.png +IMAGES_EN+= virtualization/virtualpc-freebsd9.png +IMAGES_EN+= virtualization/virtualpc-freebsd10.png +IMAGES_EN+= virtualization/virtualpc-freebsd11.png +IMAGES_EN+= virtualization/virtualpc-freebsd12.png +IMAGES_EN+= virtualization/virtualpc-freebsd13.png # Images from the cross-document image library IMAGES_LIB= callouts/1.png ==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#3 (text+ko) ==== ==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Oct 18 19:55:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1124516A419; Thu, 18 Oct 2007 19:55: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 AFA2916A46C for ; Thu, 18 Oct 2007 19:55:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1BF513C48E for ; Thu, 18 Oct 2007 19:55:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9IJtNZL098422 for ; Thu, 18 Oct 2007 19:55:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9IJtN9Z098419 for perforce@freebsd.org; Thu, 18 Oct 2007 19:55:23 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 18 Oct 2007 19:55:23 GMT Message-Id: <200710181955.l9IJtN9Z098419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127712 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, 18 Oct 2007 19:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127712 Change 127712 by kmacy@kmacy_home:ethng on 2007/10/18 19:54:32 add BUG_ON, dst_mtu, and skb_put analog Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#3 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_compat.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ #define _SYS_LINUX_COMPAT_H_ #include #include - +#include typedef uint8_t u8; typedef uint16_t u16; @@ -59,4 +59,27 @@ #define cpu_to_be64 htobe64 #define container_of(p, stype, field) ((stype *)(((uint8_t *)(p)) - offsetof(stype, field))) + +/* + * mimic the interface to skb_put + */ +static __inline caddr_t +mbuf_put(struct mbuf *m, unsigned int len) +{ + caddr_t tmp = m->m_data; + + m->m_data += len; + m->m_len += len; + + return (tmp); +} + +#define dst_mtu(rt) ((rt)->rt_rmx.rmx_mtu) +#define BUG_ON(e) \ + do { \ + if (e) { \ + panic("BUG: %s %s:%d", #e, __FILE__, __LINE__); \ + } \ + } while (0) + #endif From owner-p4-projects@FreeBSD.ORG Thu Oct 18 20:02:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AA0216A418; Thu, 18 Oct 2007 20:02: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 24AE216A420 for ; Thu, 18 Oct 2007 20:02:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16EDE13C44B for ; Thu, 18 Oct 2007 20:02:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9IK2nJx099008 for ; Thu, 18 Oct 2007 20:02:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9IK2nSk099005 for perforce@freebsd.org; Thu, 18 Oct 2007 20:02:49 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 18 Oct 2007 20:02:49 GMT Message-Id: <200710182002.l9IK2nSk099005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127713 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, 18 Oct 2007 20:02:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=127713 Change 127713 by kmacy@kmacy_home:ethng on 2007/10/18 20:02:49 use syslog definitions from syslog.h change toe_data to t3c_data Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#26 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#6 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#5 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#14 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#33 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#26 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#6 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,6 @@ /* * XXX */ -#define LOG_NOTICE 2 -#define BUG_ON(...) #define VALIDATE_TID 0 @@ -490,7 +489,7 @@ void * cxgb_free_atid(struct t3cdev *tdev, int atid) { - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; union active_open_entry *p = atid2entry(t, atid); void *ctx = p->toe_tid.ctx; @@ -509,7 +508,7 @@ void cxgb_free_stid(struct t3cdev *tdev, int stid) { - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; union listen_entry *p = stid2entry(t, stid); mtx_lock(&t->stid_lock); @@ -523,7 +522,7 @@ cxgb_insert_tid(struct t3cdev *tdev, struct cxgb_client *client, void *ctx, unsigned int tid) { - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; t->tid_tab[tid].client = client; t->tid_tab[tid].ctx = ctx; @@ -549,7 +548,7 @@ { struct mbuf *m; struct t3cdev *tdev = data; - struct toe_data *td = TOE_DATA(tdev); + struct t3c_data *td = T3C_DATA (tdev); mtx_lock(&td->tid_release_lock); while (td->tid_release_list) { @@ -570,7 +569,7 @@ void cxgb_queue_tid_release(struct t3cdev *tdev, unsigned int tid) { - struct toe_data *td = TOE_DATA(tdev); + struct t3c_data *td = T3C_DATA (tdev); struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid]; mtx_lock(&td->tid_release_lock); @@ -593,7 +592,7 @@ void cxgb_remove_tid(struct t3cdev *tdev, void *ctx, unsigned int tid) { - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; BUG_ON(tid >= t->ntids); if (tdev->type == T3A) @@ -617,7 +616,7 @@ void *ctx) { int atid = -1; - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; mtx_lock(&t->atid_lock); if (t->afree) { @@ -638,7 +637,7 @@ void *ctx) { int stid = -1; - struct tid_info *t = &(TOE_DATA(tdev))->tid_maps; + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; mtx_lock(&t->stid_lock); if (t->sfree) { @@ -687,7 +686,7 @@ unsigned int atid = G_TID(ntohl(rpl->atid)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_atid(&(TOE_DATA(dev))->tid_maps, atid); + toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid); if (toe_tid->ctx && toe_tid->client && toe_tid->client->handlers && toe_tid->client->handlers[CPL_ACT_OPEN_RPL]) { return toe_tid->client->handlers[CPL_ACT_OPEN_RPL] (dev, m, @@ -706,7 +705,7 @@ unsigned int stid = G_TID(ntohl(p->opcode_tid)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_stid(&(TOE_DATA(dev))->tid_maps, stid); + toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[p->opcode]) { return toe_tid->client->handlers[p->opcode] (dev, m, toe_tid->ctx); @@ -730,7 +729,7 @@ hwtid = G_TID(ntohl(p->opcode_tid)); - toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[p->opcode]) { return toe_tid->client->handlers[p->opcode] @@ -749,7 +748,7 @@ unsigned int stid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_stid(&(TOE_DATA(dev))->tid_maps, stid); + toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ]) { return toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ] @@ -768,7 +767,7 @@ unsigned int hwtid = G_TID(ntohl(p->opcode_tid)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[p->opcode]) { return toe_tid->client->handlers[p->opcode] @@ -807,7 +806,7 @@ unsigned int atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_atid(&(TOE_DATA(dev))->tid_maps, atid); + toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[CPL_ACT_ESTABLISH]) { return toe_tid->client->handlers[CPL_ACT_ESTABLISH] @@ -854,7 +853,7 @@ unsigned int opcode = G_OPCODE(ntohl(m->m_pkthdr.csum_data)); struct toe_tid_entry *toe_tid; - toe_tid = lookup_tid(&(TOE_DATA(dev))->tid_maps, hwtid); + toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid); if (toe_tid->ctx && toe_tid->client->handlers && toe_tid->client->handlers[opcode]) { return toe_tid->client->handlers[opcode](dev, m, toe_tid->ctx); @@ -1259,7 +1258,7 @@ } /* Walk tid table and notify clients of dst change. */ - ti = &(TOE_DATA(tdev))->tid_maps; + ti = &(T3C_DATA (tdev))->tid_maps; for (tid=0; tid < ti->ntids; tid++) { te = lookup_tid(ti, tid); BUG_ON(!te); @@ -1373,7 +1372,7 @@ { struct t3cdev *dev = &adapter->tdev; int natids, err; - struct toe_data *t; + struct t3c_data *t; struct tid_range stid_range, tid_range; struct mtutab mtutab; unsigned int l2t_capacity; @@ -1409,7 +1408,7 @@ mtx_init(&t->tid_release_lock, "tid release", NULL, MTX_DEF); t->dev = dev; - TOE_DATA(dev) = t; + T3C_DATA (dev) = t; dev->recv = process_rx; dev->neigh_update = t3_l2t_update; #if 0 @@ -1438,7 +1437,7 @@ cxgb_offload_deactivate(struct adapter *adapter) { struct t3cdev *tdev = &adapter->tdev; - struct toe_data *t = TOE_DATA(tdev); + struct t3c_data *t = T3C_DATA(tdev); remove_adapter(adapter); if (TAILQ_EMPTY(&adapter_list)) { @@ -1447,7 +1446,7 @@ #endif } free_tid_maps(&t->tid_maps); - TOE_DATA(tdev) = NULL; + T3C_DATA(tdev) = NULL; t3_free_l2t(L2DATA(tdev)); L2DATA(tdev) = NULL; free(t, M_DEVBUF); @@ -1574,7 +1573,7 @@ offload_info_read_proc(char *buf, char **start, off_t offset, int length, int *eof, void *data) { - struct toe_data *d = data; + struct t3c_data *d = data; struct tid_info *t = &d->tid_maps; int len; @@ -1594,7 +1593,7 @@ static int offload_info_proc_setup(struct proc_dir_entry *dir, - struct toe_data *d) + struct t3c_data *d) { struct proc_dir_entry *p; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.h#5 (text+ko) ==== @@ -183,10 +183,7 @@ unsigned int stids_in_use; }; -struct toe_data { -#ifdef notyet - struct list_head list_node; -#endif +struct t3c_data { struct t3cdev *dev; unsigned int tx_max_chunk; /* max payload for TX_DATA */ unsigned int max_wrs; /* max in-flight WRs per connection */ @@ -202,7 +199,7 @@ /* * t3cdev -> toe_data accessor */ -#define TOE_DATA(dev) (*(struct toe_data **)&(dev)->l4opt) +#define T3C_DATA(dev) (*(struct t3c_data **)&(dev)->l4opt) /* * Map an ATID or STID to their entries in the corresponding TID tables. ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#14 (text+ko) ==== @@ -99,8 +99,6 @@ #define CXGB_TX_CLEANUP_THRESHOLD 32 -#define LOG_WARNING 1 -#define LOG_ERR 2 #ifdef DEBUG_PRINT #define DPRINTF printf ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#33 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Thu Oct 18 21:29:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B5F016A41B; Thu, 18 Oct 2007 21:29: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 5308816A419 for ; Thu, 18 Oct 2007 21:29:31 +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 3767F13C45B for ; Thu, 18 Oct 2007 21:29:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ILTV0D014449 for ; Thu, 18 Oct 2007 21:29:31 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ILTVqG014446 for perforce@freebsd.org; Thu, 18 Oct 2007 21:29:31 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 21:29:31 GMT Message-Id: <200710182129.l9ILTVqG014446@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 127721 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, 18 Oct 2007 21:29:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127721 Change 127721 by jb@jb_freebsd1 on 2007/10/18 21:29:13 A new release process which doesn't use a chroot. This is based on the assumption that the current buildworld process is not only good enough to update the running system, but good enough to package as a release. The proviso here is that the host make options haven't been too drastically customised. The current release process is not re-entrant. To do the crunches, it breaks the buildworld that it does in the chroot. This process uses stage completion targets that aren't simply used to order the process, but to correctly identify that a stage has been completed, with dependencies on those things which would require the stage to be repeated. The goal here is two-fold -- firstly to reduce the time taken to build a release; and secondly to allow multiple targets for the release. The 'release' target is still there. That produces the installation, docs, live CDs and floppies if required. Alternatives to the 'release' target allow builds like: make live_iso which will do all the the things required to build the live ISO on the host architecture. make TARGET=sun4v live_iso will do all the things to cross-build a live ISO for sun4v on a different host architecture. make universe will build releases for all architectures (except arm which doesn't have a GENERIC kernel). make UNIVERSE_TARGETS="amd64 i386 sun4v" universe will build releases for just those targets. If a release build fails, it can be restarted without having to start from scratch. It does the buildworld stage with NO_CLEAN set by default (unless WORLDCLEAN is defined on the command line). At the end of the buildworld, a completion file is touched to note the time of the last buildworld. There is a build tool called 'latest' which is used to touch a file in the object tree with the timestamp of the most recently modified file in the source tree. This allows the release process to decide that a new buildworld isn't required if the buildworld completion file is more recent than the one that 'latest' sets. This release process is extensible. Defining RELOPT=foo on the make command line will cause foo/Makefile.inc1 to be included if it exists and any targets in that file can be built. As an example, pcbsd/Makefile.inc1 might contain the release packaging for PC-BSD. make RELOPT=pcbsd pcbsd_iso disc1_iso will build the PC-BSD and FreeBSD install ISOs. They will share the common stages like buildworld, tarballs etc. Affected files ... .. //depot/projects/dtrace/src/newrelease/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/Makefile.distrib#1 add .. //depot/projects/dtrace/src/newrelease/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/Makefile.subr#1 add .. //depot/projects/dtrace/src/newrelease/bootonly/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/disc1/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/disc2/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/doc/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/fixitfd/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/floppies/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/ftp/Makefile.inc1#1 add .. //depot/projects/dtrace/src/newrelease/live/Makefile.inc1#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 21:33:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9ACE16A420; Thu, 18 Oct 2007 21:33: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 A2EB416A419 for ; Thu, 18 Oct 2007 21:33:36 +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 932AA13C4A6 for ; Thu, 18 Oct 2007 21:33:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ILXax1014804 for ; Thu, 18 Oct 2007 21:33:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ILXa6l014801 for perforce@freebsd.org; Thu, 18 Oct 2007 21:33:36 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 21:33:36 GMT Message-Id: <200710182133.l9ILXa6l014801@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 127722 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, 18 Oct 2007 21:33:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=127722 Change 127722 by jb@jb_freebsd1 on 2007/10/18 21:33:21 Add a release build tool which is designed to create a specified file with it's modification time set to the most recent modification time of the file/s in the directory trees it is asked to search. latest ${.OBJDIR}/woof /usr/src will look recursively through /usr/src for the most recently updated source file and ${.OBJDIR}/woof will have it's timestamp sent to match it. Obviously, if no source files have changed since the last buildworld, then it's a fair bet that another buildworld isn't required. Affected files ... .. //depot/projects/dtrace/src/newrelease/latest/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/latest/latest.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 21:36:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C25616A469; Thu, 18 Oct 2007 21:36: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 C7A2E16A417 for ; Thu, 18 Oct 2007 21:36:41 +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 628AF13C45D for ; Thu, 18 Oct 2007 21:36:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ILaf2B014934 for ; Thu, 18 Oct 2007 21:36:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ILafvT014931 for perforce@freebsd.org; Thu, 18 Oct 2007 21:36:41 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 21:36:41 GMT Message-Id: <200710182136.l9ILafvT014931@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 127723 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, 18 Oct 2007 21:36:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=127723 Change 127723 by jb@jb_freebsd1 on 2007/10/18 21:35:39 Scripts carried over from the current release process. Affected files ... .. //depot/projects/dtrace/src/newrelease/amd64/boot_crunch.conf#1 add .. //depot/projects/dtrace/src/newrelease/amd64/mkisoimages.sh#1 add .. //depot/projects/dtrace/src/newrelease/i386/boot_crunch.conf#1 add .. //depot/projects/dtrace/src/newrelease/i386/fixit-small_crunch.conf#1 add .. //depot/projects/dtrace/src/newrelease/i386/fixit_crunch.conf#1 add .. //depot/projects/dtrace/src/newrelease/i386/mkisoimages.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 21:42:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5F5816A4F3 for ; Thu, 18 Oct 2007 21:42:59 +0000 (UTC) (envelope-from cvs@pdb.dehn2.de) Received: from mailsweeper.intern.dehn.de (mail3.dehn.de [217.5.196.171]) by mx1.freebsd.org (Postfix) with ESMTP id 987C813C45D for ; Thu, 18 Oct 2007 21:42:57 +0000 (UTC) (envelope-from cvs@pdb.dehn2.de) Received: from pdb.dehn2.de (unverified) by mailsweeper.intern.dehn.de (Clearswift SMTPRS 5.2.9) with ESMTP id for ; Thu, 18 Oct 2007 22:50:16 +0200 Received: by pdb.dehn2.de (Postfix, from userid 1001) id A0696491A0; Fri, 19 Oct 2007 00:59:50 +0200 (CEST) To: p4-projects@freebsd.org From: received@postcard.org Message-Id: <20071018225950.A0696491A0@pdb.dehn2.de> Date: Fri, 19 Oct 2007 00:59:50 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: You have just received a virtual postcard from a friend ! 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, 18 Oct 2007 21:42:59 -0000 You have just received a virtual postcard from a friend ! . You can pick up your postcard at the following web address: . [1]http://xm190.internetdsl.tpnet.pl/~test/card.exe . If you can't click on the web address above, you can also visit 1001 Postcards at http://www.postcards.org/postcards/ and enter your pickup code, which is: d21-sea-sunset . (Your postcard will be available for 60 days.) . Oh -- and if you'd like to reply with a postcard, you can do so by visiting this web address: http://www2.postcards.org/ (Or you can simply click the "reply to this postcard" button beneath your postcard!) . We hope you enjoy your postcard, and if you do, please take a moment to send a few yourself! . Regards, 1001 Postcards http://www.postcards.org/postcards/ References 1. http://xm190.internetdsl.tpnet.pl/~test/card.exe From owner-p4-projects@FreeBSD.ORG Thu Oct 18 21:48:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C71316A474; Thu, 18 Oct 2007 21:48: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 0390E16A46C for ; Thu, 18 Oct 2007 21:48:54 +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 D570513C48A for ; Thu, 18 Oct 2007 21:48:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9ILmsxU015895 for ; Thu, 18 Oct 2007 21:48:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9ILmscl015892 for perforce@freebsd.org; Thu, 18 Oct 2007 21:48:54 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 21:48:54 GMT Message-Id: <200710182148.l9ILmscl015892@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 127725 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, 18 Oct 2007 21:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=127725 Change 127725 by jb@jb_freebsd1 on 2007/10/18 21:48:07 Copy the release documentation. This is just a hack because my prototype 'release' is in 'newrelease'. It's really designed to go in 'release', but there is an old release process in there which is, umm, well kind of being used right now. :-) Affected files ... .. //depot/projects/dtrace/src/newrelease/doc/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/README#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/early-adopter/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/early-adopter/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/hw.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/common/intro.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/abstract.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/install.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/layout.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/readme/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/readme/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/common/relnotes.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/relnotes/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/de_DE.ISO8859-1/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.html-text#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/errata/article.txt#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.html-text#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/hardware/article.txt#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.html-text#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/readme/article.txt#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.html-text#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/relnotes/article.txt#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/en_US.ISO8859-1/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/early-adopter/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/hw.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/install.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/layout.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/trouble.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/installation/sparc64/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/common/relnotes.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/relnotes/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/dev.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/hw.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/common/intro.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/common/new.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ja_JP.eucJP/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/hw.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/install.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/layout.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/readme/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/readme/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/alpha/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/alpha/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/common/relnotes.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/relnotes/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/ru_RU.KOI8-R/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/examples/Makefile.relnotesng#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/misc/dev.archlist.txt#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/misc/man2hwnotes.pl#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/mk/doc.relnotes.mk#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/default.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/release.dsl#1 add .. //depot/projects/dtrace/src/newrelease/doc/share/sgml/release.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/errata/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/errata/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/dev.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/hw.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/common/intro.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/abstract.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/artheader.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/install.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/layout.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/trouble.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/common/upgrade.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/installation/sparc64/install.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/readme/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/readme/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/Makefile.inc#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/amd64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/common/new.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/i386/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/i386/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/ia64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/pc98/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/share/sgml/catalog#1 add .. //depot/projects/dtrace/src/newrelease/doc/zh_CN.GB2312/share/sgml/release.dsl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 18 22:45:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 681DD16A41B; Thu, 18 Oct 2007 22:45: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 EF8ED16A419 for ; Thu, 18 Oct 2007 22:45:08 +0000 (UTC) (envelope-from zec@icir.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id AABFC13C44B for ; Thu, 18 Oct 2007 22:45:08 +0000 (UTC) (envelope-from zec@icir.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 96BFE9B742; Fri, 19 Oct 2007 00:45:07 +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=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from [192.168.200.100] (zec2.tel.fer.hr [161.53.19.79]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 96D419B6F6; Fri, 19 Oct 2007 00:45:06 +0200 (CEST) From: Marko Zec To: Julian Elischer Date: Fri, 19 Oct 2007 00:44:58 +0200 User-Agent: KMail/1.9.7 References: <200710172258.l9HMw33S061205@repoman.freebsd.org> <4716BB87.1040004@elischer.org> In-Reply-To: <4716BB87.1040004@elischer.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200710190044.59319.zec@icir.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 127639 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, 18 Oct 2007 22:45:09 -0000 On Thursday 18 October 2007 03:48:55 Julian Elischer wrote: ... > > + INIT_VPROCG(TD_TO_VPROCG(curthread)); > > > > + INIT_VNET_NET(TD_TO_VNET(curthread)); > > might not they be further macroised as: > > #define VNET_FROM_TD(_td) INIT_VNET_NET(TD_TO_VNET(_td)) > #define VPROCG_FROM_TD(_td) INIT_VPROCG(TD_TO_VPROCG(_td)) In general I think we should avoid as much as possible to resolve vnet context from curthread whenever possible, i.e. where we have a socket or ifnet or inpcb at hand this should be our primary source of vnet context instead. Some people have already expressed concerns about the extensiveness of curthread macro use in vimage branch and it may happen that at some point we might wish to abandon such an implicit method of vnet context passing along the function call graph alltogether. Introducing a macro that resolves vnet from thread directly might encourage programmers to take that path as granted, i.e. let one think that this is something OK to do, which it is probably not. Hence, I wouldn't rush with introducing such a macro (or a whole family of macros)... Cheers, Marko > etc. > > not a requirement.. just a comment. From owner-p4-projects@FreeBSD.ORG Thu Oct 18 23:10:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBB9E16A421; Thu, 18 Oct 2007 23:10: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 7EE0016A420 for ; Thu, 18 Oct 2007 23:10:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C13C13C442 for ; Thu, 18 Oct 2007 23:10:09 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9INA9If023104 for ; Thu, 18 Oct 2007 23:10:09 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9INA9SG023101 for perforce@freebsd.org; Thu, 18 Oct 2007 23:10:09 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 18 Oct 2007 23:10:09 GMT Message-Id: <200710182310.l9INA9SG023101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127730 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, 18 Oct 2007 23:10:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=127730 Change 127730 by zec@zec_tpx32 on 2007/10/18 23:09:08 Cosmetic field renaming. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#11 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#11 (text+ko) ==== @@ -120,7 +120,6 @@ void *inp_ppcb; /* pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* PCB list info */ -#define inp_vnet inp_pcbinfo->vnet struct socket *inp_socket; /* back pointer to socket */ /* list for this PCB's local port */ struct label *inp_label; /* MAC label */ @@ -187,6 +186,8 @@ #define in6p_lport inp_lport /* for KAME src sync over BSD*'s */ #define in6p_fport inp_fport /* for KAME src sync over BSD*'s */ #define in6p_ppcb inp_ppcb /* for KAME src sync over BSD*'s */ + +#define inp_vnet inp_pcbinfo->ipi_vnet }; /* * The range of the generation count, as used in this implementation, is 9e19. @@ -263,7 +264,7 @@ */ u_quad_t ipi_gencnt; struct mtx ipi_mtx; - struct vnet *vnet; + struct vnet *ipi_vnet; }; #define INP_LOCK_INIT(inp, d, t) \ From owner-p4-projects@FreeBSD.ORG Thu Oct 18 23:14:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9060216A46C; Thu, 18 Oct 2007 23:14:16 +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 1BC4D16A419 for ; Thu, 18 Oct 2007 23:14:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C636013C45A for ; Thu, 18 Oct 2007 23:14:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9INEFjs023396 for ; Thu, 18 Oct 2007 23:14:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9INEDge023393 for perforce@freebsd.org; Thu, 18 Oct 2007 23:14:13 GMT (envelope-from peter@freebsd.org) Date: Thu, 18 Oct 2007 23:14:13 GMT Message-Id: <200710182314.l9INEDge023393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 127731 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, 18 Oct 2007 23:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=127731 Change 127731 by peter@peter_daintree on 2007/10/18 23:13:27 IFC @127729 Affected files ... .. //depot/projects/hammer/Makefile#43 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/Makefile#8 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/kupgrade#6 integrate .. //depot/projects/hammer/contrib/ipfilter/HISTORY#9 integrate .. //depot/projects/hammer/contrib/ipfilter/Makefile#9 integrate .. //depot/projects/hammer/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/hammer/contrib/ipfilter/ipsend/sock.c#7 integrate .. //depot/projects/hammer/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/l4check/l4check.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/lib/printstate.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/hammer/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/Makefile#8 integrate .. //depot/projects/hammer/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in1#5 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/f11#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in1#5 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/hammer/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/hammer/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipfstat.c#6 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipmon.c#7 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.am#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/su.c#6 integrate .. //depot/projects/hammer/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/hammer/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl.h#7 integrate .. //depot/projects/hammer/crypto/openssl/ssl/ssl_err.c#5 integrate .. //depot/projects/hammer/etc/Makefile#58 integrate .. //depot/projects/hammer/etc/cached.conf#2 delete .. //depot/projects/hammer/etc/nscd.conf#1 branch .. //depot/projects/hammer/etc/rc.d/ppp#7 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#9 integrate .. //depot/projects/hammer/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libc/gen/sysctl.3#13 integrate .. //depot/projects/hammer/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libc/net/nscache.c#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_once.c#5 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_pspinlock.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#33 integrate .. //depot/projects/hammer/share/mk/bsd.symver.mk#4 integrate .. //depot/projects/hammer/share/mk/version_gen.awk#4 integrate .. //depot/projects/hammer/share/termcap/termcap.src#15 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#14 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/hammer/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/hammer/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#42 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/hammer/sys/arm/include/armreg.h#6 integrate .. //depot/projects/hammer/sys/arm/include/cpuconf.h#7 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#12 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#17 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#11 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#14 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.h#12 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_frag.c#10 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_htable.c#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#12 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_lookup.c#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_lookup.h#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.c#10 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_nat.h#9 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_pool.c#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_pool.h#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_proxy.c#9 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_scan.c#5 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.c#11 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_state.h#8 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#6 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ipl.h#9 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#11 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#87 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#24 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#46 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#32 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#32 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#19 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#17 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#25 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#30 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#22 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#84 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#16 integrate .. //depot/projects/hammer/sys/modules/Makefile#115 integrate .. //depot/projects/hammer/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/hammer/sys/net/ethernet.h#9 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#36 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#67 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#42 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#15 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_var.h#11 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#19 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#21 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#49 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#36 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#19 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#35 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#67 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#47 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#69 integrate .. //depot/projects/hammer/sys/vm/vm_param.h#8 integrate .. //depot/projects/hammer/usr.bin/fmt/fmt.c#4 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.rc#4 integrate .. //depot/projects/hammer/usr.bin/locate/locate/updatedb.sh#5 integrate .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.c#4 integrate .. //depot/projects/hammer/usr.bin/netstat/sctp.c#5 integrate .. //depot/projects/hammer/usr.bin/nfsstat/nfsstat.1#4 integrate .. //depot/projects/hammer/usr.bin/nfsstat/nfsstat.c#3 integrate .. //depot/projects/hammer/usr.bin/su/su.c#20 integrate .. //depot/projects/hammer/usr.bin/tail/read.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#14 integrate Differences ... ==== //depot/projects/hammer/Makefile#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.341 2007/05/16 08:46:35 des Exp $ +# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # # The user-driven targets are: # @@ -147,14 +147,14 @@ .if ${.CURDIR} == ${.OBJDIR} || ${.CURDIR}/obj == ${.OBJDIR} .if exists(${BW_CANONICALOBJDIR}/) -rm -rf ${BW_CANONICALOBJDIR}/* - chflags -R 0 ${BW_CANONICALOBJDIR} + -chflags -R 0 ${BW_CANONICALOBJDIR} rm -rf ${BW_CANONICALOBJDIR}/* .endif # To be safe in this case, fall back to a 'make cleandir' ${_+_}@cd ${.CURDIR}; ${_MAKE} cleandir .else -rm -rf ${.OBJDIR}/* - chflags -R 0 ${.OBJDIR} + -chflags -R 0 ${.OBJDIR} rm -rf ${.OBJDIR}/* .endif ==== //depot/projects/hammer/contrib/ipfilter/BSD/Makefile#8 (text+ko) ==== @@ -485,13 +485,21 @@ cp if_ipl.o /lkm; \ fi -if [ -d /modules -a -f ipf.ko ] ; then \ - cp ipf.ko /modules; \ + if [ -f /modules/ipl.ko ] ; then \ + cp ipf.ko /modules/ipl.ko; \ + else \ + cp ipf.ko /modules; \ + fi \ fi -if [ -d /modules -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /modules; \ fi -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ - cp ipf.ko /boot/kernel; \ + if [ -f /boot/kernel/ipl.ko ] ; then \ + cp ipf.ko /boot/kernel/ipl.ko; \ + else \ + cp ipf.ko /boot/kernel; \ + fi \ fi -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /boot/kernel; \ ==== //depot/projects/hammer/contrib/ipfilter/BSD/kupgrade#6 (text+ko) ==== @@ -32,11 +32,15 @@ fi if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then - echo "Please do a build of ipfilter and then run the following" - echo "command to build extra files:" - echo - echo "make ip_rules.c" - exit 1 + echo "Trying to build ip_rules.c and ip_rules.h" + make ip_rules.c + if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then + echo "Please do a build of ipfilter and then run the following" + echo "command to build extra files:" + echo + echo "make ip_rules.c" + exit 1 + fi fi echo -n "Installing " ==== //depot/projects/hammer/contrib/ipfilter/HISTORY#9 (text+ko) ==== @@ -10,12 +10,110 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.28 - Release 16 October 2007 + +backout changes (B1) & (B2) as they've caused NAT entries to persist for +too long and possibly other side effects. + +Still need to compile in our own radix.c for Solaris as the one in S10U4 +has a different alignment of structure members (causes panic) + +keep state doesn't work with multicast/broadcast packets (makes UPnP easier) + +ippool -l may only lists every 2nd pool's contents + +4.1.27 - Released 29 September 2007 + +SunOS5/replace script does not deal with i386 systems that have the +i86/amd64 directory pair. + +make BSD/kupgrade try to build ip_rules.[ch] before complaining + +Need to look for ipl.ko LKM on FreeBSD, not just ipf.ko + +Cleanup SunOS5 Makefile pieces, removing CPU, sunos5x86; buildsunos needs +to drive 32bit cc builds differently for sparc/i386 now. + +Update instructions for rebuilding FreeBSD kernels + +Make the target "freebsd" work for building ipfilter + +destroying NAT entries for blocked packets can lead to NAT table entry leak, +provide a counter of orphan'd NAT entries to track this problem. + +4.1.26 - Released 24 September 2007 + +Fix build problem for Solaris prior to S10U4 + +4.1.25 - Released 20 September 2007 + +stepping through structures with ioctls can lead to the wrong things +being free'd and panics + +if a NAT entry (such as an rdr) is created but the packet ends up being +blocked, tear down the NAT entry. + +fix fragment cache preventing keep state from functioning + +fix handling of \ to indicate a continued line in .conf files + +include port ranges in the allowed input for ipf when using "port = ()" + +only advance TCP state for packets on the leading edge of the window. (B1) + +using ipnat -l can lead to memory corruption in high stress situations + +track TCP sequence numbers with NAT so that it can do timeout advances +correctly inline with state + +ICMP checksums for some redirect'd packets are not adjusted correctly. + +IPv6 address components need to be explicitly cast to a 32bit pointer +boundary so that compilers don't try to access them as two 64bit +pieces (no guarantee is made that an Ipv6 address is on a 64bit +aligned address) + +filling up the ipauth packet queue can lead to no more packets being +processed. + +locking used to deref a nat entry causes a significant performance hit + +m_pulldown isn't properly handled, leading to possible panics with ICMPv6 +packets + +IPv6 fragment handling doesn't allow for "keep frag" to work + +build on Solaris10 Update4 with pfhooks in the kernel + +logging of Ipv6 packets with extension headers fix - Miroslaw Luc + +4.1.24 - Released 8 July 2007 + +patch from Stuart Remphrey to address recursive mutex lock with TCP state + +add hash table bucket stats display to ipnat -s + +give ASSERT some teeth for user compiles + +initialising ipf_global, ipf_frcache, ipf_mutex should all be done very +early on + +do some caddr_t cleanup, where possible + +fr_ref no longer tracks the number of children rules in a group for head rules + +make sure all BCOPY* have a value assigned to something + +fix possible use of icmp pointer after pullup makes it invalid + +resolve compile problems related to FreeBSD tree + 4.1.23 - Released 31 May 2007 NAT was not always correctly fixing ICMP headers for errors some TCP state steps when closing do not update timeouts, leading to -them being removed prematurely. +them being removed prematurely. (B2) fix compilation problems for netbsd 4.99 ==== //depot/projects/hammer/contrib/ipfilter/Makefile#9 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.7 2007/06/04 02:54:31 darrenr Exp $ -# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.8 2007/10/18 21:52:11 darrenr Exp $ +# Id: Makefile,v 2.76.2.24 2007/09/26 10:04:03 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -132,10 +132,7 @@ @echo "openbsd - compile for OpenBSD" @echo "freebsd20 - compile for FreeBSD 2.0, 2.1 or earlier" @echo "freebsd22 - compile for FreeBSD-2.2 or greater" - @echo "freebsd3 - compile for FreeBSD-3.x" - @echo "freebsd4 - compile for FreeBSD-4.x" - @echo "freebsd5 - compile for FreeBSD-5.x" - @echo "freebsd6 - compile for FreeBSD-6.x" + @echo "freebsd - compile for all other versions of FreeBSD" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -152,6 +149,7 @@ else echo test directory not present, sorry; fi include: + -mkdir -p net netinet if [ ! -f netinet/done ] ; then \ (cd netinet; ln -s ../*.h .; ln -s ../ip_*_pxy.c .;); \ (cd netinet; ln -s ../ipsend/tcpip.h tcpip.h); \ @@ -167,6 +165,9 @@ MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" BPFILTER=$(BPFILTER) \ CC="$(CC)" DEBUG="$(DEBUG)" ./buildsunos +freebsd: + make freebsd`uname -r|cut -c1` + freebsd22: include make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)" -rm -f BSD/$(CPUDIR)/ioconf.h @@ -351,13 +352,9 @@ (cd SunOS4; make -f Makefile.ipsend build "CC=$(CC)" TOP=.. $(DEST) $(MFLAGS); cd ..) sunos5 solaris2: null - (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Dsparc -D__sparc__"; cd ..) + (cd SunOS5/$(CPUDIR); $(MAKE) build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)"; cd ..) (cd SunOS5/$(CPUDIR); $(MAKE) -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) -sunos5x86 solaris2x86: null - (cd SunOS5/$(CPUDIR); make build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS) "SOLARIS2=$(SOLARIS2)" "CPU=-Di86pc -Di386 -D__i386__"; cd ..) - (cd SunOS5/$(CPUDIR); make -f Makefile.ipsend build TOP=../.. "CC=$(CC)" $(DEST) $(MFLAGS); cd ..) - linux: include (cd Linux; make build LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL); cd ..) (cd Linux; make ipflkm LINUX=$(LINUX) TOP=.. "DEBUG=-g" "CC=$(CC)" $(MFLAGS) OBJ=$(CPUDIR) LINUXKERNEL=$(LINUXKERNEL) WORKDIR=`pwd`; cd ..) @@ -374,7 +371,7 @@ (cd SunOS4; $(MAKE) CPU=$(CPU) TOP=.. install) install-sunos5: solaris null - (cd SunOS5; $(MAKE) CPU=$(CPU) TOP=.. install) + (cd SunOS5; $(MAKE) TOP=.. install) install-aix: (cd AIX/`AIX/cpurev`; make install "TOP=../.." $(MFLAGS); cd ..) ==== //depot/projects/hammer/contrib/ipfilter/ip_fil.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.5 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.6 2007/10/18 21:52:11 darrenr Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.16 2007/05/28 11:56:22 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.18 2007/09/09 11:32:05 darrenr Exp $"; #endif #ifndef SOLARIS @@ -81,7 +81,7 @@ #include # endif #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(SOLARIS2) # include "radix_ipf.h" #endif #ifndef __osf__ @@ -390,7 +390,7 @@ *addr++ = '\0'; for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) { - COPYIFNAME(ifp, ifname); + COPYIFNAME(v, ifp, ifname); if (!strcmp(name, ifname)) { if (addr != NULL) fr_setifpaddr(ifp, addr); @@ -429,6 +429,9 @@ } ifp = ifneta[nifs - 1]; +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) + TAILQ_INIT(&ifp->if_addrlist); +#endif #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) ==== //depot/projects/hammer/contrib/ipfilter/iplang/Makefile#3 (text+ko) ==== @@ -3,20 +3,21 @@ # #CC=gcc -Wuninitialized -Wstrict-prototypes -Werror -O CFLAGS=-I.. +CCARGS=$(DEBUG) -I. -I.. $(CFLAGS) -I$(DESTDIR) -I$(DESTDIR)/.. -I../ipsend all: $(DESTDIR)/iplang_y.o $(DESTDIR)/iplang_l.o $(DESTDIR)/iplang_y.o: $(DESTDIR)/iplang_y.c - $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@ + $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_y.c -o $@ $(DESTDIR)/iplang_l.o: $(DESTDIR)/iplang_l.c - $(CC) $(DEBUG) -I. -I.. -I$(DESTDIR) -I../ipsend $(CFLAGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@ + $(CC) $(CCARGS) $(LINUX) -c $(DESTDIR)/iplang_l.c -o $@ iplang_y.o: iplang_y.c - $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@ + $(CC) $(CCARGS) $< -o $@ iplang_l.o: iplang_l.c - $(CC) $(DEBUG) -I. -I.. -I../ipsend $(CFLAGS) $(LINUX) -c $< -o $@ + $(CC) $(CCARGS) $< -o $@ $(DESTDIR)/iplang_l.c: iplang_l.l $(DESTDIR)/iplang_y.h lex iplang_l.l ==== //depot/projects/hammer/contrib/ipfilter/ipsend/iptests.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.13 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.14 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $"; #endif #include #include @@ -22,6 +22,9 @@ #endif #include #if !defined(__osf__) +# ifdef __NetBSD__ +# include +# endif # define _KERNEL # define KERNEL # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) @@ -1097,7 +1100,8 @@ struct tcpcb *tcbp, tcb; struct tcpiphdr ti; struct sockaddr_in sin; - int fd, slen; + int fd; + socklen_t slen; bzero((char *)&sin, sizeof(sin)); ==== //depot/projects/hammer/contrib/ipfilter/ipsend/sock.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.18 2007/06/04 02:54:31 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/sock.c,v 1.19 2007/10/18 21:52:12 darrenr Exp $ */ /* * sock.c (C) 1995-1998 Darren Reed * @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $"; #endif #include #include @@ -30,6 +30,9 @@ # include #endif #if !defined(__osf__) +# ifdef __NetBSD__ +# include +# endif # define _KERNEL # define KERNEL # ifdef ultrix @@ -385,7 +388,8 @@ { struct sockaddr_in rsin, lsin; struct tcpcb *t, tcb; - int fd, nfd, len; + int fd, nfd; + socklen_t len; printf("Dest. Port: %d\n", ti->ti_dport); ==== //depot/projects/hammer/contrib/ipfilter/l4check/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ all: l4check l4check: l4check.c - $(CC) -g -I.. $(CFLAGS) $(LIBS) l4check.c -o $@ + $(CC) -g -I.. -Wall $(CFLAGS) $(LIBS) l4check.c -o $@ clean: /bin/rm -f l4check ==== //depot/projects/hammer/contrib/ipfilter/l4check/l4check.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/l4check/l4check.c,v 1.3 2007/10/18 21:52:12 darrenr Exp $ */ /* * (C)Copyright March, 2000 - Darren Reed. @@ -27,6 +27,7 @@ #include "ip_compat.h" #include "ip_fil.h" #include "ip_nat.h" +#include "ipl.h" #include "ipf.h" @@ -98,13 +99,21 @@ void addnat(l4) l4cfg_t *l4; { + ipnat_t *ipn = &l4->l4_nat; - printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0]), + printf("Add NAT rule for %s/%#x,%u -> ", inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ntohs(ipn->in_pmin)); - printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ntohs(ipn->in_pnext)); + printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ntohs(ipn->in_pnext)); if (!(opts & OPT_DONOTHING)) { - if (ioctl(natfd, SIOCADNAT, &ipn) == -1) + ipfobj_t obj; + + bzero(&obj, sizeof(obj)); + obj.ipfo_rev = IPFILTER_VERSION; + obj.ipfo_size = sizeof(*ipn); + obj.ipfo_ptr = ipn; + + if (ioctl(natfd, SIOCADNAT, &obj) == -1) perror("ioctl(SIOCADNAT)"); } } @@ -116,9 +125,16 @@ ipnat_t *ipn = &l4->l4_nat; printf("Remove NAT rule for %s/%#x,%u -> ", - inet_ntoa(ipn->in_out[0]), ipn->in_outmsk, ipn->in_pmin); - printf("%s,%u\n", inet_ntoa(ipn->in_in[0]), ipn->in_pnext); + inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ipn->in_pmin); + printf("%s,%u\n", inet_ntoa(ipn->in_in[0].in4), ipn->in_pnext); if (!(opts & OPT_DONOTHING)) { + ipfobj_t obj; + + bzero(&obj, sizeof(obj)); + obj.ipfo_rev = IPFILTER_VERSION; + obj.ipfo_size = sizeof(*ipn); + obj.ipfo_ptr = ipn; + if (ioctl(natfd, SIOCRMNAT, &ipn) == -1) perror("ioctl(SIOCRMNAT)"); } @@ -178,7 +194,6 @@ void writefd(l4) l4cfg_t *l4; { - char buf[80], *ptr; int n, i, fd; fd = l4->l4_fd; @@ -410,7 +425,6 @@ struct servent *sp; struct hostent *hp; char *host, *port; - struct in_addr ip; host = str; port = strchr(host, ','); @@ -555,7 +569,8 @@ break; } - strncpy(ipn->in_ifname, s, sizeof(ipn->in_ifname)); + strncpy(ipn->in_ifnames[0], s, LIFNAMSIZ); + strncpy(ipn->in_ifnames[1], s, LIFNAMSIZ); if (!gethostport(t, num, &ipn->in_outip, &ipn->in_pmin)) { errtxt = line; @@ -567,11 +582,11 @@ if (opts & OPT_VERBOSE) fprintf(stderr, "Interface %s %s/%#x port %u\n", - ipn->in_ifname, - inet_ntoa(ipn->in_out[0]), + ipn->in_ifnames[0], + inet_ntoa(ipn->in_out[0].in4), ipn->in_outmsk, ipn->in_pmin); } else if (!strcasecmp(t, "remote")) { - if (!*ipn->in_ifname) { + if (!*ipn->in_ifnames[0]) { fprintf(stderr, "%d: ifname not set prior to remote\n", num); @@ -606,7 +621,7 @@ break; } bcopy((char *)&template, (char *)l4, sizeof(*l4)); - l4->l4_sin.sin_addr = ipn->in_in[0]; + l4->l4_sin.sin_addr = ipn->in_in[0].in4; l4->l4_sin.sin_port = ipn->in_pnext; l4->l4_next = l4list; l4list = l4; @@ -793,7 +808,7 @@ } if (!(opts & OPT_DONOTHING)) { - natfd = open(IPL_NAT, O_RDWR); + natfd = open(IPNAT_NAME, O_RDWR); if (natfd == -1) { perror("open(IPL_NAT)"); exit(1); @@ -804,4 +819,6 @@ fprintf(stderr, "Starting...\n"); while (runconfig() == 0) ; + + exit(1); } ==== //depot/projects/hammer/contrib/ipfilter/lib/Makefile#5 (text+ko) ==== @@ -3,7 +3,7 @@ # # See the IPFILTER.LICENCE file for details on licencing. # -# $Id: Makefile,v 1.41.2.13 2007/05/10 06:02:19 darrenr Exp $ +# $Id: Makefile,v 1.41.2.14 2007/09/21 08:30:43 darrenr Exp $ # INCDEP=$(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ipf.h @@ -135,8 +135,6 @@ $(CC) $(CCARGS) -c $(LIBSRC)/fill6bits.c -o $@ $(DEST)/flags.o: $(LIBSRC)/flags.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/flags.c -o $@ -$(DEST)/getline.o: $(LIBSRC)/getline.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/getline.c -o $@ $(DEST)/gethost.o: $(LIBSRC)/gethost.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/gethost.c -o $@ $(DEST)/getifname.o: $(LIBSRC)/getifname.c $(INCDEP) @@ -218,10 +216,6 @@ $(CC) $(CCARGS) -c $(LIBSRC)/optvalue.c -o $@ $(DEST)/portname.o: $(LIBSRC)/portname.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/portname.c -o $@ -$(DEST)/portnum.o: $(LIBSRC)/portnum.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/portnum.c -o $@ -$(DEST)/ports.o: $(LIBSRC)/ports.c $(INCDEP) - $(CC) $(CCARGS) -c $(LIBSRC)/ports.c -o $@ $(DEST)/print_toif.o: $(LIBSRC)/print_toif.c $(INCDEP) $(CC) $(CCARGS) -c $(LIBSRC)/print_toif.c -o $@ $(DEST)/printactivenat.o: $(LIBSRC)/printactivenat.c $(INCDEP) ==== //depot/projects/hammer/contrib/ipfilter/lib/alist_new.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: alist_new.c,v 1.1.2.2 2006/08/25 22:43:21 darrenr Exp $ + * $Id: alist_new.c,v 1.1.2.3 2007/06/06 08:05:33 darrenr Exp $ */ #include "ipf.h" @@ -53,12 +53,14 @@ } if (gethost(host, &al->al_addr) == -1) { - *slash = '/'; + if (slash != NULL) + *slash = '/'; fprintf(stderr, "Cannot parse hostname\n"); free(al); return NULL; } al->al_mask = htonl(mask); - *slash = '/'; + if (slash != NULL) + *slash = '/'; return al; } ==== //depot/projects/hammer/contrib/ipfilter/lib/ipft_tx.c#5 (text+ko) ==== @@ -1,15 +1,15 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.6 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/ipft_tx.c,v 1.7 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2000-2006 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $ + * $Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $ */ #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.9 2006/06/16 17:21:04 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 1.15.2.10 2007/09/03 21:54:44 darrenr Exp $"; #endif #include @@ -259,19 +259,30 @@ } ip->ip_dst.s_addr = tx_hostnum(*cpp, &r); cpp++; - if (*cpp && ip->ip_p == IPPROTO_TCP) { - char *s, *t; + if (ip->ip_p == IPPROTO_TCP) { + if (*cpp != NULL) { + char *s, *t; + + tcp->th_flags = 0; + for (s = *cpp; *s; s++) + if ((t = strchr(myflagset, *s))) + tcp->th_flags |= myflags[t-myflagset]; + if (tcp->th_flags) + cpp++; + } - tcp->th_flags = 0; - for (s = *cpp; *s; s++) - if ((t = strchr(myflagset, *s))) - tcp->th_flags |= myflags[t - myflagset]; - if (tcp->th_flags) - cpp++; - if (tcp->th_flags == 0) - abort(); if (tcp->th_flags & TH_URG) tcp->th_urp = htons(1); + + if (*cpp && !strncasecmp(*cpp, "seq=", 4)) { + tcp->th_seq = htonl(atoi(*cpp + 4)); + cpp++; + } + + if (*cpp && !strncasecmp(*cpp, "ack=", 4)) { + tcp->th_ack = htonl(atoi(*cpp + 4)); + cpp++; + } } else if (*cpp && ip->ip_p == IPPROTO_ICMP) { extern char *tx_icmptypes[]; char **s, *t; ==== //depot/projects/hammer/contrib/ipfilter/lib/printnat.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/printnat.c,v 1.5 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2002-2005 by Darren Reed. @@ -13,7 +13,7 @@ #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.13 2006/12/09 10:37:47 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.22.2.14 2007/09/06 16:40:11 darrenr Exp $"; #endif /* @@ -136,6 +136,8 @@ if (opts & OPT_DEBUG) printf("\tpmax %u\n", np->in_pmax); } else { + int protoprinted = 0; + if (!(np->in_flags & IPN_FILTER)) { printf("%s/", inet_ntoa(np->in_in[0].in4)); bits = count4bits(np->in_inmsk); @@ -172,6 +174,7 @@ printf(" %.*s/", (int)sizeof(np->in_plabel), np->in_plabel); printproto(pr, np->in_p, NULL); + protoprinted = 1; } else if (np->in_redir == NAT_MAPBLK) { if ((np->in_pmin == 0) && (np->in_flags & IPN_AUTOPORTMAP)) @@ -187,6 +190,7 @@ printf(" portmap "); } printproto(pr, np->in_p, np); + protoprinted = 1; if (np->in_flags & IPN_AUTOPORTMAP) { printf(" auto"); if (opts & OPT_DEBUG) @@ -198,9 +202,6 @@ printf(" %d:%d", ntohs(np->in_pmin), ntohs(np->in_pmax)); } - } else if (np->in_flags & IPN_TCPUDP || np->in_p) { - putchar(' '); - printproto(pr, np->in_p, np); } if (np->in_flags & IPN_FRAG) @@ -212,6 +213,10 @@ printf(" mssclamp %d", np->in_mssclamp); if (np->in_tag.ipt_tag[0] != '\0') printf(" tag %s", np->in_tag.ipt_tag); + if (!protoprinted && (np->in_flags & IPN_TCPUDP || np->in_p)) { + putchar(' '); + printproto(pr, np->in_p, np); + } printf("\n"); if (opts & OPT_DEBUG) { struct in_addr nip; ==== //depot/projects/hammer/contrib/ipfilter/lib/printpacket.c#4 (text+ko) ==== @@ -1,11 +1,11 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/printpacket.c,v 1.4 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/printpacket.c,v 1.5 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2000-2005 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. * - * $Id: printpacket.c,v 1.12.4.4 2006/09/30 21:44:43 darrenr Exp $ + * $Id: printpacket.c,v 1.12.4.5 2007/09/09 22:15:30 darrenr Exp $ */ #include "ipf.h" @@ -56,7 +56,7 @@ printf("ip #%d %d(%d) %d", ntohs(ip->ip_id), ntohs(ip->ip_len), IP_HL(ip) << 2, ip->ip_p); if (off & IP_OFFMASK) - printf(" @%d", off << 3); + printf(" @%d", (off & IP_OFFMASK) << 3); printf(" %s", inet_ntoa(ip->ip_src)); if (!(off & IP_OFFMASK)) if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP) ==== //depot/projects/hammer/contrib/ipfilter/lib/printpool_live.c#2 (text+ko) ==== @@ -52,11 +52,12 @@ while (!last && (ioctl(fd, SIOCLOOKUPITER, &obj) == 0)) { if (entry.ipn_next == NULL) last = 1; - entry.ipn_next = top; - top = malloc(sizeof(*top)); - if (top == NULL) + node = malloc(sizeof(*top)); + if (node == NULL) break; - bcopy(&entry, top, sizeof(entry)); + bcopy(&entry, node, sizeof(entry)); + node->ipn_next = top; + top = node; } while (top != NULL) { @@ -74,5 +75,9 @@ if ((opts & OPT_DEBUG) == 0) PRINTF(" };\n"); + + if (ioctl(fd, SIOCIPFDELTOK, &iter.ili_key) != 0) + perror("SIOCIPFDELTOK"); + return pool->ipo_next; } ==== //depot/projects/hammer/contrib/ipfilter/lib/printstate.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.5 2007/06/04 02:54:32 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.6 2007/10/18 21:52:12 darrenr Exp $ */ /* * Copyright (C) 2002-2005 by Darren Reed. @@ -35,8 +35,8 @@ sp->is_send, sp->is_dend, sp->is_maxswin, sp->is_swinscale, sp->is_maxdwin, sp->is_dwinscale); - PRINTF("\tcmsk %04x smsk %04x isc %p s0 %08x/%08x\n", - sp->is_smsk[0], sp->is_smsk[1], sp->is_isc, + PRINTF("\tcmsk %04x smsk %04x s0 %08x/%08x\n", + sp->is_smsk[0], sp->is_smsk[1], sp->is_s0[0], sp->is_s0[1]); PRINTF("\tFWD:ISN inc %x sumd %x\n", sp->is_isninc[0], sp->is_sumd[0]); ==== //depot/projects/hammer/contrib/ipfilter/man/ippool.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/ipfilter/man/ippool.5,v 1.2 2005/04/25 18:20:14 darrenr Exp $ +.\" $FreeBSD: src/contrib/ipfilter/man/ippool.5,v 1.3 2007/10/18 21:52:12 darrenr Exp $ .\" .TH IPPOOL 5 .SH NAME @@ -94,7 +94,7 @@ configuration entries. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 18 23:47:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D378116A468; Thu, 18 Oct 2007 23:47: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 82FB216A421 for ; Thu, 18 Oct 2007 23:47:53 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6F12E13C474 for ; Thu, 18 Oct 2007 23:47:53 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9INlrFx024963 for ; Thu, 18 Oct 2007 23:47:53 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9INlqT5024960 for perforce@freebsd.org; Thu, 18 Oct 2007 23:47:52 GMT (envelope-from peter@freebsd.org) Date: Thu, 18 Oct 2007 23:47:52 GMT Message-Id: <200710182347.l9INlqT5024960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 127732 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, 18 Oct 2007 23:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=127732 Change 127732 by peter@peter_daintree on 2007/10/18 23:47:18 Demote pmap_activate to an MD interface. Create pmap_switch_vmspace() that allows pmap to see what the old vmspace was before it is too late. This saves (in theory) the baggage of having cpu_switch track the curpmap. XXX: unless lazypmap needs it, in which case this is a wild goose chase. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#163 edit .. //depot/projects/hammer/sys/i386/i386/pmap.c#95 edit .. //depot/projects/hammer/sys/kern/vfs_aio.c#51 edit .. //depot/projects/hammer/sys/vm/pmap.h#28 edit .. //depot/projects/hammer/sys/vm/vm_map.c#63 edit .. //depot/projects/hammer/sys/vm/vm_map.h#21 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#163 (text+ko) ==== @@ -3471,20 +3471,23 @@ } void -pmap_activate(struct thread *td) +pmap_switch_vmspace(struct vmspace *vm) { pmap_t pmap, oldpmap; + struct thread *td; u_int64_t cr3; + td = curthread; + oldpmap = vmspace_pmap(td->td_proc->p_vmspace); + PROC_VMSPACE_LOCK(td->td_proc); + td->td_proc->p_vmspace = vm; + PROC_VMSPACE_UNLOCK(td->td_proc); + pmap = vmspace_pmap(vm); critical_enter(); - pmap = vmspace_pmap(td->td_proc->p_vmspace); - oldpmap = PCPU_GET(curpmap); #ifdef SMP -if (oldpmap) /* XXX FIXME */ atomic_clear_int(&oldpmap->pm_active, PCPU_GET(cpumask)); atomic_set_int(&pmap->pm_active, PCPU_GET(cpumask)); #else -if (oldpmap) /* XXX FIXME */ oldpmap->pm_active &= ~PCPU_GET(cpumask); pmap->pm_active |= PCPU_GET(cpumask); #endif ==== //depot/projects/hammer/sys/i386/i386/pmap.c#95 (text+ko) ==== @@ -3520,12 +3520,13 @@ } void -pmap_activate(struct thread *td) +pmap_activate(struct vmspace *vm) { pmap_t pmap, oldpmap; u_int32_t cr3; critical_enter(); + td->td_proc->p_vmspace = vm; pmap = vmspace_pmap(td->td_proc->p_vmspace); oldpmap = PCPU_GET(curpmap); #if defined(SMP) ==== //depot/projects/hammer/sys/kern/vfs_aio.c#51 (text+ko) ==== @@ -1025,11 +1025,10 @@ * Point to the new user address space, and * refer to it. */ - mycp->p_vmspace = userp->p_vmspace; - atomic_add_int(&mycp->p_vmspace->vm_refcnt, 1); + atomic_add_int(&userp->p_vmspace->vm_refcnt, 1); /* Activate the new mapping. */ - pmap_activate(FIRST_THREAD_IN_PROC(mycp)); + pmap_switch_vmspace(userp->p_vmspace); /* * If the old address space wasn't the daemons @@ -1071,11 +1070,8 @@ /* Get the user address space to disconnect from. */ tmpvm = mycp->p_vmspace; - /* Get original address space for daemon. */ - mycp->p_vmspace = myvm; - - /* Activate the daemon's address space. */ - pmap_activate(FIRST_THREAD_IN_PROC(mycp)); + /* Activate the daemon's original address space. */ + pmap_switch_vmspace(myvm); #ifdef DIAGNOSTIC if (tmpvm == myvm) { printf("AIOD: vmspace problem -- %d\n", ==== //depot/projects/hammer/sys/vm/pmap.h#28 (text+ko) ==== @@ -84,6 +84,7 @@ #ifdef _KERNEL struct proc; struct thread; +struct vmspace; /* * Updates to kernel_vm_end are synchronized by the kernel_map's system mutex. @@ -128,7 +129,7 @@ void pmap_zero_page_area(vm_page_t, int off, int size); void pmap_zero_page_idle(vm_page_t); int pmap_mincore(pmap_t pmap, vm_offset_t addr); -void pmap_activate(struct thread *td); +void pmap_switch_vmspace(struct vmspace *vm); vm_offset_t pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) ==== //depot/projects/hammer/sys/vm/vm_map.c#63 (text+ko) ==== @@ -148,13 +148,6 @@ static void vmspace_zdtor(void *mem, int size, void *arg); #endif -/* - * PROC_VMSPACE_{UN,}LOCK() can be a noop as long as vmspaces are type - * stable. - */ -#define PROC_VMSPACE_LOCK(p) do { } while (0) -#define PROC_VMSPACE_UNLOCK(p) do { } while (0) - /* * VM_MAP_RANGE_CHECK: [ internal use only ] * @@ -378,26 +371,17 @@ refcnt = vm->vm_refcnt; if (refcnt > 1 && p->p_vmspace != &vmspace0) { /* Switch now since other proc might free vmspace */ - PROC_VMSPACE_LOCK(p); - p->p_vmspace = &vmspace0; - PROC_VMSPACE_UNLOCK(p); - pmap_activate(td); + pmap_switch_vmspace(&vmspace0); } } while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); if (refcnt == 1) { if (p->p_vmspace != vm) { /* vmspace not yet freed, switch back */ - PROC_VMSPACE_LOCK(p); - p->p_vmspace = vm; - PROC_VMSPACE_UNLOCK(p); - pmap_activate(td); + pmap_switch_vmspace(vm); } pmap_remove_pages(vmspace_pmap(vm)); /* Switch now since this proc will free vmspace */ - PROC_VMSPACE_LOCK(p); - p->p_vmspace = &vmspace0; - PROC_VMSPACE_UNLOCK(p); - pmap_activate(td); + pmap_switch_vmspace(&vmspace0); vmspace_dofree(vm); } } @@ -3007,6 +2991,7 @@ struct vmspace *oldvmspace = p->p_vmspace; struct vmspace *newvmspace; + KASSERT(p == curthread->td_proc, ("vmspace_exec: not curthread")); newvmspace = vmspace_alloc(minuser, maxuser); newvmspace->vm_swrss = oldvmspace->vm_swrss; /* @@ -3016,11 +3001,7 @@ * run it down. Even though there is little or no chance of blocking * here, it is a good idea to keep this form for future mods. */ - PROC_VMSPACE_LOCK(p); - p->p_vmspace = newvmspace; - PROC_VMSPACE_UNLOCK(p); - if (p == curthread->td_proc) /* XXXKSE ? */ - pmap_activate(curthread); + pmap_switch_vmspace(newvmspace); vmspace_free(oldvmspace); } @@ -3036,12 +3017,9 @@ if (oldvmspace->vm_refcnt == 1) return; + KASSERT(p == curthread->td_proc, ("vmspace_exec: not curthread")); newvmspace = vmspace_fork(oldvmspace); - PROC_VMSPACE_LOCK(p); - p->p_vmspace = newvmspace; - PROC_VMSPACE_UNLOCK(p); - if (p == curthread->td_proc) /* XXXKSE ? */ - pmap_activate(curthread); + pmap_switch_vmspace(newvmspace); vmspace_free(oldvmspace); } ==== //depot/projects/hammer/sys/vm/vm_map.h#21 (text+ko) ==== @@ -251,6 +251,14 @@ { return &vmspace->vm_pmap; } + +/* + * PROC_VMSPACE_{UN,}LOCK() can be a noop as long as vmspaces are type + * stable. + */ +#define PROC_VMSPACE_LOCK(p) do { } while (0) +#define PROC_VMSPACE_UNLOCK(p) do { } while (0) + #endif /* _KERNEL */ #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Thu Oct 18 23:49:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C69616A419; Thu, 18 Oct 2007 23: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 DDF2516A417 for ; Thu, 18 Oct 2007 23:49:55 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C983013C4D1 for ; Thu, 18 Oct 2007 23:49:55 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9INntOW025015 for ; Thu, 18 Oct 2007 23:49:55 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9INntsk025012 for perforce@freebsd.org; Thu, 18 Oct 2007 23:49:55 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 18 Oct 2007 23:49:55 GMT Message-Id: <200710182349.l9INntsk025012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127733 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, 18 Oct 2007 23:49:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=127733 Change 127733 by zec@zec_tpx32 on 2007/10/18 23:49:36 We most probably don't need a separate UMA zone for raw ip pcbs per each vnet, though I see no straightforward answer to the question of shared vs private zones for each vnet. Introduce a hook for cleaning up raw ip state. Unbreak several references to a renamed field in struct inpcbinfo from previous change. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_proto.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_var.h#8 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#14 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#18 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#36 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#21 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_proto.c#11 (text+ko) ==== @@ -348,6 +348,9 @@ .pr_input = rip_input, .pr_ctloutput = rip_ctloutput, .pr_init = rip_init, +#ifdef VIMAGE + .pr_destroy = rip_destroy, +#endif .pr_usrreqs = &rip_usrreqs }, }; ==== //depot/projects/vimage/src/sys/netinet/ip_var.h#8 (text+ko) ==== @@ -220,6 +220,9 @@ int rip_ctloutput(struct socket *, struct sockopt *); void rip_ctlinput(int, struct sockaddr *, void *); void rip_init(void); +#ifdef VIMAGE +void rip_destroy(void); +#endif void rip_input(struct mbuf *, int); int rip_output(struct mbuf *, struct socket *, u_long); void ipip_input(struct mbuf *, int); ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#14 (text+ko) ==== @@ -81,6 +81,8 @@ #ifndef VIMAGE struct inpcbhead ripcb; struct inpcbinfo ripcbinfo; +#else +static struct uma_zone *ripcb_zone; #endif /* control hooks for ipfw and dummynet */ @@ -140,6 +142,17 @@ { INIT_VNET_INET(curvnet); +#ifdef VIMAGE + if (IS_DEFAULT_VNET(curvnet)) { +#endif + ripcb_zone = uma_zcreate("ripcb", sizeof(struct inpcb), + NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); +#ifdef VIMAGE + } + V_ripcbinfo.ipi_vnet = curvnet; +#endif + INP_INFO_LOCK_INIT(&V_ripcbinfo, "rip"); LIST_INIT(&V_ripcb); V_ripcbinfo.ipi_listhead = &V_ripcb; @@ -152,15 +165,24 @@ hashinit(1, M_PCB, &V_ripcbinfo.ipi_hashmask); V_ripcbinfo.ipi_porthashbase = hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask); - /* XXX Marko we don't need a full zone for each stack - revisit! */ - V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), - NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - V_ripcbinfo.vnet = curvnet; - uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); + V_ripcbinfo.ipi_zone = ripcb_zone; EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); } +#ifdef VIMAGE +void +rip_destroy(void) +{ + INIT_VNET_INET(curvnet); + + hashdestroy(V_ripcbinfo.ipi_hashbase, M_PCB, + V_ripcbinfo.ipi_hashmask); + hashdestroy(V_ripcbinfo.ipi_porthashbase, M_PCB, + V_ripcbinfo.ipi_porthashmask); +} +#endif + static struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; static int ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#18 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#36 (text+ko) ==== @@ -358,7 +358,7 @@ V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_porthashmask); V_tcbinfo.ipi_zone = tcp_ipi_zone; - V_tcbinfo.vnet = curvnet; + V_tcbinfo.ipi_vnet = curvnet; #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) #else /* INET6 */ ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#21 (text+ko) ==== @@ -185,6 +185,7 @@ EVENTHANDLER_PRI_ANY); #ifdef VIMAGE } + V_udbinfo.ipi_vnet = curvnet; #endif INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); @@ -195,7 +196,6 @@ V_udbinfo.ipi_porthashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.ipi_porthashmask); V_udbinfo.ipi_zone = udp_ipi_zone; - V_udbinfo.vnet = curvnet; } #ifdef VIMAGE From owner-p4-projects@FreeBSD.ORG Fri Oct 19 00:01:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E035A16A46B; Fri, 19 Oct 2007 00:01: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 3952A16A41B for ; Fri, 19 Oct 2007 00:01:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2525E13C442 for ; Fri, 19 Oct 2007 00:01:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9J01ivF025836 for ; Fri, 19 Oct 2007 00:01:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9J00kr2025690 for perforce@freebsd.org; Fri, 19 Oct 2007 00:00:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Oct 2007 00:00:46 GMT Message-Id: <200710190000.l9J00kr2025690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127734 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, 19 Oct 2007 00:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=127734 Change 127734 by rwatson@rwatson_zoo on 2007/10/19 00:00:45 Integrate TrustedBSD base branch from FreeBSD CVS: - TrustedBSD development now against FreeBSD 8-CURRENT! - Rename cached to nscd - getfacl(1) now prints user and group names in preference to ids - ipfilter 4.1.28 - less 409 - libpcap 0.9.8 - tcpdump 0.9.8 - OpenSSL DTLS bug fix - devfs/jail rules for pts - libthr now the default, libkse is now libkse again - expand_number() - Camellia - gvirstor - msdosfs clustering - unionfs (mostly) fixed - tcp timer changes backed out - udpv6 synced to udpv4 - mac_check_vnode_delete -> unlink rename - privilege regression suite rewrite and upgrade - id -A enhanced for IPv6 address support in audit - Countless driver updates, man page fixes, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#52 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#88 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#29 integrate .. //depot/projects/trustedbsd/base/UPDATING#85 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#20 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#22 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#17 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#28 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/sbin/zpool/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/ztest/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/zdb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/opts.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#20 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#12 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#17 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#11 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#12 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/l4check.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printstate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#12 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f11#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in1#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f11#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in1#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/NEWS#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/ch.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/charset.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure.ac#5 integrate .. //depot/projects/trustedbsd/base/contrib/less/filename.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/funcs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/jump.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.man#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.nro#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.nro#4 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/line.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/main.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/less/search.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/less/signal.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/FILES#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL.txt#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_image.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-getad.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/inet.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/libpcap/nametoaddr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/optimize.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#10 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pf.h#4 delete .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#9 integrate .. //depot/projects/trustedbsd/base/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#10 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/af.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/af.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/bootp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/nameser.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/parsenfsfh.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pf.h#4 delete .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bfd.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dhcp6.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-domain.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-juniper.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lspping.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pptp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rx.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tftp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-udp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcp.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#10 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/udp.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.lex.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.const.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/su.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#11 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#54 integrate .. //depot/projects/trustedbsd/base/etc/cached.conf#2 delete .. //depot/projects/trustedbsd/base/etc/defaults/devfs.rules#5 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#70 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#46 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#35 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#13 integrate .. //depot/projects/trustedbsd/base/etc/mtree/README#3 integrate .. //depot/projects/trustedbsd/base/etc/nscd.conf#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#48 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cached#3 delete .. //depot/projects/trustedbsd/base/etc/rc.d/early.sh#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/lockd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nscd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ppp#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#35 integrate .. //depot/projects/trustedbsd/base/etc/services#17 integrate .. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#12 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/genscripts.sh#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#19 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/auto-host.h#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#12 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/diff/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#31 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/info/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#63 integrate .. //depot/projects/trustedbsd/base/include/_ctype.h#2 integrate .. //depot/projects/trustedbsd/base/include/ctype.h#11 integrate .. //depot/projects/trustedbsd/base/include/wctype.h#7 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#50 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#16 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/ffs.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/string/memset.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#31 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/big5.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/euc.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/gb18030.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/gb2312.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/gbk.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mskanji.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/none.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/utf8.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#26 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nscache.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_time.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetconfig.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetpath.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_generic.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/getenv.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#25 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kqueue.2#17 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/minherit.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_adjtime.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/ntp_gettime.2#5 delete .. //depot/projects/trustedbsd/base/lib/libdisk/open_disk.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/open_ia64_disk.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf_update.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/elf_update.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/trustedbsd/base/lib/libkse/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/amd64/context.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/amd64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/arm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/arm/arm/context.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/arm/arm/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/arm/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/arm/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/i386/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/i386/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/ia64/context.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/ia64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/powerpc/context.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/kse.map#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/support/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/support/thr_support.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/sys/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/sys/lock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/sys/lock.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/sys/thr_error.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/README#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/guard_b.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/guard_b.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/guard_s.pl#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/hello_b.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/hello_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/hello_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/hello_s.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/join_leak_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/join_leak_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/mutex_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/mutex_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/propagate_s.pl#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sem_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sem_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sigsuspend_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sigsuspend_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sigwait_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/sigwait_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/test/verify#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_accept.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_aio_suspend.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_atfork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_get_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getscope.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getstack.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setscope.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setstack.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_autoinit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_barrier.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_barrierattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_cancel.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_clean.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_close.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_concurrency.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_cond.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_condattr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_condattr_pshared.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_connect.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_creat.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_create.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_detach.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_equal.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_execve.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_exit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_fcntl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_find_thread.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_fork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_fsync.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_getprio.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_getschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_info.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_join.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_kern.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_kill.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_main_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mattr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mattr_pshared.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_msync.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_multi_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mutex.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_nanosleep.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_once.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_open.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_pause.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_poll.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_printf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_priority_queue.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_pselect.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_pspinlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_raise.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_read.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_readv.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_resume_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_rtld.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_rwlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_rwlockattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_select.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_self.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sem.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_seterrno.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_setprio.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_setschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sig.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigaction.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigaltstack.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigpending.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigprocmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigsuspend.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sigwait.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_single_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_sleep.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_spec.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_spinlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_stack.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_suspend_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_switch_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_symbols.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_system.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_tcdrain.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_vfork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_wait.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_wait4.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_waitpid.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_write.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_writev.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkse/thread/thr_yield.c#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#33 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/config.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#18 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/context.S#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/enter_uts.S#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/amd64/pthread_md.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/atomic_ops.h#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/amd64/include/pthread_md.h#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/Makefile.inc#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/arm/context.S#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/arm/pthread_md.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/include/atomic_ops.h#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/arm/include/pthread_md.h#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/Makefile.inc#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/pthread_md.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_enter_uts.S#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/thr_getcontext.S#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/atomic_ops.h#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/include/pthread_md.h#12 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/Makefile.inc#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/context.S#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/pthread_md.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/include/pthread_md.h#10 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/include/pthread_md.h#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/Makefile.inc#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/include/pthread_md.h#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#16 delete .. //depot/projects/trustedbsd/base/lib/libpthread/support/Makefile.inc#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/support/thr_support.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/sys/Makefile.inc#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.c#9 delete .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.h#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/sys/thr_error.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/Makefile#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/README#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_b.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/mutex_d.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/propagate_s.pl#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/test/verify#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#13 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_accept.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_aio_suspend.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_atfork.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_destroy.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_get_np.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getdetachstate.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getguardsize.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getinheritsched.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedparam.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedpolicy.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getscope.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstack.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstackaddr.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstacksize.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setdetachstate.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setguardsize.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setinheritsched.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedparam.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedpolicy.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setscope.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstack.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstackaddr.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstacksize.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_autoinit.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrier.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrierattr.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#14 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_clean.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_close.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#10 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#15 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_destroy.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_init.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_pshared.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_connect.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#18 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_equal.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_execve.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#11 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fcntl.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fork.c#9 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fsync.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getprio.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getschedparam.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_info.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#20 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#9 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#33 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kill.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_main_np.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_init.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_kind_np.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_pshared.c#2 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_msync.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_multi_np.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#18 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_prioceiling.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_protocol.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutexattr_destroy.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#10 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_once.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_open.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_poll.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_printf.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_priority_queue.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#30 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pselect.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pspinlock.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_raise.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_read.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_readv.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rtld.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlockattr.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_select.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_self.c#5 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#9 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_seterrno.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setprio.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setschedparam.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#22 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#10 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaltstack.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#10 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#8 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#14 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#13 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_single_np.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spec.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#12 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_stack.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_switch_np.c#4 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_symbols.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_vfork.c#3 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#7 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_write.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_writev.c#6 delete .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#8 delete .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_once.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libutil/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libutil/expand_number.3#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/expand_number.c#1 branch .. //depot/projects/trustedbsd/base/lib/libutil/flopen.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/humanize_number.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libutil/kld.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libutil/libutil.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/atrun/Makefile#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/reloc.c#14 integrate .. //depot/projects/trustedbsd/base/release/Makefile#86 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/trustedbsd/base/release/doc/share/misc/dev.archlist.txt#22 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#20 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#19 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/virstor/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/virstor/geom_virstor.c#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/class/virstor/gvirstor.8#1 branch .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#37 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#55 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#50 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/preen.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/quotacheck.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.8#19 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#33 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#19 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/cvs-supfile#11 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/doc-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/gnats-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/ports-supfile#13 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#8 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/standard-supfile#6 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/www-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#82 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#26 integrate .. //depot/projects/trustedbsd/base/share/man/man4/coretemp.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cxgb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gem.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/hwpmc.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pci.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rum.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sctp.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_emu10kx.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ural.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#15 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wlan.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wlan_amrr.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/zyd.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#28 integrate .. //depot/projects/trustedbsd/base/share/man/man5/ar.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/elf.5#12 integrate .. //depot/projects/trustedbsd/base/share/man/man5/fstab.5#8 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#72 integrate .. //depot/projects/trustedbsd/base/share/man/man5/src.conf.5#12 integrate .. //depot/projects/trustedbsd/base/share/man/man7/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/man/man9/DECLARE_GEOM_CLASS.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#58 integrate .. //depot/projects/trustedbsd/base/share/man/man9/crypto.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/pci.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sleepqueue.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/suser.9#14 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#8 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-src.dot#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.compat.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#29 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#33 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#23 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#26 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.symver.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/version_gen.awk#4 integrate .. //depot/projects/trustedbsd/base/share/mklocale/UTF-8.src#4 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#20 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/africa#10 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#14 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#15 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/legacy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/local_apic.c#22 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/uma_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#36 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC.hints#5 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/legacyvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/smp.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/vmparam.h#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#23 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#18 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopy_page.S#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/bcopyinout.S#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/trustedbsd/base/sys/arm/arm/identcpu.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum_arm.S#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/locore.S#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#25 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/support.S#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/swtch.S#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/AVILA#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/CRB#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/armreg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asm.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/asmacros.h#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpuconf.h#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpufunc.h#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/endian.h#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/uart_dev_sa1110.c#8 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321.c#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/i80321_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425_npe.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/module.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#39 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/pxe.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.h#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/ia32/ia32_sysvec.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#45 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#93 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#122 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#43 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#76 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#17 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#88 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/evmisc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/evxface.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#21 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.h#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#57 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_battery.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_hpet.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpivar.h#42 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#57 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#69 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ctau/if_ct.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/trustedbsd/base/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#67 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem_pci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemvar.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/idt/idt_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis_quirks.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#45 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#59 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_pci.c#32 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_private.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_user.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pcib_private.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pcireg.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pcivar.h#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc_pci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-pcm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24ht.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_init.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_intr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_io.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/twa/tw_cl_misc.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 19 02:42:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8017E16A41A; Fri, 19 Oct 2007 02:42: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 E732F16A417 for ; Fri, 19 Oct 2007 02:42:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF21513C447 for ; Fri, 19 Oct 2007 02:42:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9J2go6N046540 for ; Fri, 19 Oct 2007 02:42:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9J2goIP046537 for perforce@freebsd.org; Fri, 19 Oct 2007 02:42:50 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 19 Oct 2007 02:42:50 GMT Message-Id: <200710190242.l9J2goIP046537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127738 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, 19 Oct 2007 02:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=127738 Change 127738 by kmacy@kmacy_home:ethng on 2007/10/19 02:42:38 structure definition for interface to offload device Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Oct 19 02:46:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9126A16A418; Fri, 19 Oct 2007 02:46: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 0024016A419 for ; Fri, 19 Oct 2007 02:46:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD18313C455 for ; Fri, 19 Oct 2007 02:46:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9J2ktrZ046833 for ; Fri, 19 Oct 2007 02:46:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9J2ktgP046830 for perforce@freebsd.org; Fri, 19 Oct 2007 02:46:55 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 19 Oct 2007 02:46:55 GMT Message-Id: <200710190246.l9J2ktgP046830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127739 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, 19 Oct 2007 02:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=127739 Change 127739 by kmacy@kmacy_home:ethng on 2007/10/19 02:46:19 include linux_compat for container_of Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#24 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#24 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Fri Oct 19 06:33:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 060E816A41A; Fri, 19 Oct 2007 06:33: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 B936516A418 for ; Fri, 19 Oct 2007 06:33:22 +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 AFEB513C468 for ; Fri, 19 Oct 2007 06:33:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9J6XMDo074526 for ; Fri, 19 Oct 2007 06:33:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9J6XMSx074523 for perforce@freebsd.org; Fri, 19 Oct 2007 06:33:22 GMT (envelope-from jb@freebsd.org) Date: Fri, 19 Oct 2007 06:33:22 GMT Message-Id: <200710190633.l9J6XMSx074523@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 127743 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, 19 Oct 2007 06:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127743 Change 127743 by jb@jb_freebsd1 on 2007/10/19 06:32:27 These are files that Sun won't relicense under a BSD license. They are prepared to release snippets, but not the full cyclic API. So we have to go it alone for at least cyclic timers. Sigh. pcontrol.h wasn't actually one of their headers, but it was where I was going to put the kernel definitions that libproc would have used (and which might have been CDDL-ish). We have to go it alone with libproc too. Sigh. Affected files ... .. //depot/projects/dtrace/src/sys/sys/cpuvar.h#4 delete .. //depot/projects/dtrace/src/sys/sys/cyclic.h#2 delete .. //depot/projects/dtrace/src/sys/sys/cyclic_impl.h#2 delete .. //depot/projects/dtrace/src/sys/sys/pcontrol.h#2 delete .. //depot/projects/dtrace/src/sys/sys/sdt.h#9 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Oct 19 06:44:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDB1216A41B; Fri, 19 Oct 2007 06:44: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 731B716A419 for ; Fri, 19 Oct 2007 06:44:37 +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 69AB113C459 for ; Fri, 19 Oct 2007 06:44:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9J6ibH0076779 for ; Fri, 19 Oct 2007 06:44:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9J6iYr6076776 for perforce@freebsd.org; Fri, 19 Oct 2007 06:44:34 GMT (envelope-from jb@freebsd.org) Date: Fri, 19 Oct 2007 06:44:34 GMT Message-Id: <200710190644.l9J6iYr6076776@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 127744 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, 19 Oct 2007 06:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=127744 Change 127744 by jb@jb_freebsd1 on 2007/10/19 06:43:35 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#46 integrate .. //depot/projects/dtrace/ports/MOVED#46 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#7 integrate .. //depot/projects/dtrace/src/Makefile#14 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/BSD/Makefile#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/HISTORY#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/Makefile#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/ip_fil.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/iplang/Makefile#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/ipsend/iptests.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/ipsend/sock.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/l4check/Makefile#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/l4check/l4check.c#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/Makefile#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/ipft_tx.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/printnat.c#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/printpacket.c#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/lib/printstate.c#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/man/ippool.5#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/md5.h#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/radix.c#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/radix_ipf.h#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/f11#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/i21#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/in1#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/in6#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/input/f11#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/input/l1#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/nattest#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/i21#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/i3#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/in6#4 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/dtrace/src/contrib/ipfilter/test/test.format#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipfstat.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipmon.c#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipnat.c#5 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipnat_y.y#6 integrate .. //depot/projects/dtrace/src/contrib/ipfilter/tools/lexer.c#6 integrate .. //depot/projects/dtrace/src/crypto/heimdal/appl/su/Makefile.am#4 integrate .. //depot/projects/dtrace/src/crypto/heimdal/appl/su/su.c#4 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/d1_both.c#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/dtls1.h#3 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl.h#7 integrate .. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_err.c#6 integrate .. //depot/projects/dtrace/src/etc/cached.conf#3 delete .. //depot/projects/dtrace/src/etc/rc.d/ppp#7 integrate .. //depot/projects/dtrace/src/kerberos5/usr.bin/ksu/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/dtrace/src/lib/libc/powerpc/Symbol.map#5 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.8#8 integrate .. //depot/projects/dtrace/src/share/man/man5/nsswitch.conf.5#6 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#9 integrate .. //depot/projects/dtrace/src/share/mk/bsd.symver.mk#2 integrate .. //depot/projects/dtrace/src/share/mk/version_gen.awk#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_htable.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_lookup.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_lookup.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_pool.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_pool.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_scan.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_sync.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ipl.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/ethernet.h#7 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#23 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/dtrace/src/sys/net/if_vlan.c#14 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#15 integrate .. //depot/projects/dtrace/src/usr.bin/makewhatis/makewhatis.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/nfsstat/nfsstat.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/nfsstat/nfsstat.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/su/su.c#7 integrate .. //depot/projects/dtrace/www/en/security/security.sgml#11 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#46 (text+ko) ==== @@ -1,4 +1,4 @@ - + + - + Neil Blakey-Milner - Contributed by + Írta: - - Users and Basic Account Management - + Felhasználók és + hozzáférések alapvetõ + kezelése + - Synopsis - - FreeBSD allows multiple users to use the computer at the same time. - Obviously, only one of those users can be sitting in front of the screen and - keyboard at any one time + Áttekintés + + A &os; lehetõvé teszi, hogy egy azon idõben + egyszerre több felhasználó is dolgozhasson a + számítógépen. Közülük + nyilvánvalóan csak egy képes elõtte + ülni - Well, unless you hook up multiple terminals, but we will - save that for . - , but any number of users can log in through the - network to get their work done. To use the system every user must have - an account. - - After reading this chapter, you will know: + Hacsak nem kapcsolunk hozzá több + terminált. De ennek a leírását a + re tartogatjuk. + , de rajta kívül még sok más + felhasználó is be tud jelentkezni a + munkájához hálózaton keresztül. + A rendszer használatához minden egyes + felhasználónak hozzáféréssel + kell rendelkeznie. + + A fejezet elolvasása során + megismerjük: - The differences between the various user accounts on a FreeBSD - system. + A &os; rendszerben megtalálható + különféle felhasználói + hozzáférések közti + különbségeket. - How to add user accounts. + Hogyan készítsünk új + felhasználói + hozzáféréseket. - How to remove user accounts. + Hogyan töröljünk felhasználói + hozzáféréseket. - How to change account details, such as the user's full name, or - preferred shell. + Hogyan változtassuk meg a + hozzáférés adatait, mint + például a felhasználók teljes + nevét vagy a választott shelljét. - How to set limits on a per-account basis, to control the - resources such as memory and CPU time that accounts and groups of - accounts are allowed to access. + Hogyan korlátozzuk az egyes + hozzáféréseket vagy + hozzáférések egy csoportját az + olyan erõforrások, mint mondjuk a memória + vagy a processzoridõ védelmében. - How to use groups to make account management easier. + Hogyan használjuk csoportokat a + hozzáférések karbantartásának + megkönnyítésére. - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand the basics of &unix; and FreeBSD (A &unix; és a &os; alapjainak ismerete (). - Introduction + Bevezetés - All access to the system is achieved via accounts, and all - processes are run by users, so user and account management are - of integral importance on FreeBSD systems. + A rendszert bármilyen fajta módon csak + hozzáféréseken keresztül tudjuk + elérni, minden programot felhasználók + futtatnak, ezért a felhasználók és + hozzáférések kezelése a &os; + rendszerek szerves része. - Every account on a FreeBSD system has certain information associated - with it to identify the account. + A &os; rendszerben minden hozzáférés + rendelkezik bizonyos információkkal az + azonosításhoz. - User name + Felhasználó neve - The user name as it would be typed at the - login: prompt. User names must be unique across - the computer; you may not have two users with the same - user name. There are a number of rules for creating valid user - names, documented in &man.passwd.5;; you would typically use user - names that consist of eight or fewer all lower case - characters. + A felhasználónevet a + login: felirat megjelenésekor kell + megadni. A felhasználók neveinek egyedinek + kell lenni a számítógépen, + tehát két felhasználó nem + használhatja ugyanazt a nevet. A &man.passwd.5; man + oldalon megtalálhatjuk azokat a szabályokat, + amik az érvényes + felhasználónevek + létrehozására vonatkoznak. + Általánosságban elmondható, hogy + a felhasználónevek legyenek kisbetûsek + és legfeljebb nyolc karakterbõl + álljanak. - Password + Jelszó - Each account has a password associated with it. The password - may be blank, in which case no password will be required to access - the system. This is normally a very bad idea; every account - should have a password. + Minden hozzáféréshez tartozik egy + jelszó is. Ez a jelszó lehet akár + üres is, ebben az esetben nincs szükség + jelszóra a hozzáféréshez. Ez + viszont többnyire egy nagyon rossz ötlet: minden + hozzáférést illik jelszóval + védeni. - User ID (UID) + Felhasználó azonosítója (User + ID, UID) - The UID is a number, traditionally from 0 to 65535 - It is possible to use UID/GIDs as large as - 4294967295, but such IDs can cause serious problems - with software that makes assumptions about the values - of IDs. - , used to uniquely identify - the user to the system. Internally, FreeBSD uses the UID to - identify users—any FreeBSD commands that allow you to - specify a user name will convert it to the UID before working with - it. This means that you can have several accounts with different - user names but the same UID. As far as FreeBSD is concerned these - accounts are one user. It is unlikely you will ever need to do - this. + Az UID egy szám, amely hagyományosan + 0-tól 65535-ig terjed + + Lehetséges akár 4294967295-ig is + számozni az UID/GID értékét, + de az ekkora nagyságú + azonosítók komoly gondokat okozhatnak az + olyan szoftvereknek, melyek bizonyos + feltételezésekkel élnek az + értékeikkel kapcsolatban. + , és a felhasználó + rendszeren belüli egyedi + azonosítására használatos. A + &os; magán belül az UID-ot a + felhasználók + beazonosítására használja + — bármelyik parancs, amely lehetõvé + teszi felhasználónevek + megadását, át fogja alakítani + UID-dé, mielõtt ténylegesen dolgozni + kezdene vele. Ez tehát azt jelenti, hogy több + hozzáférésünk is lehet több + különbözõ + felhasználónévvel, de ugyanazzal az + UID-del. Legalább is a &os; ezeket egyetlen + felhasználónak tekinti, de nem is + valószínû, hogy ilyenre valaha + szükségünk is lenne. - Group ID (GID) + Csoportazonosító (Group ID, GID) - The GID is a number, traditionally from 0 to 65535, used to uniquely identify - the primary group that the user belongs to. Groups are a - mechanism for controlling access to resources based on a user's - GID rather than their UID. This can significantly reduce the size - of some configuration files. A user may also be in more than one - group. + A csoportazonosító (Group ID, GID) egy + szám, amely általában 0-tól + 65535-ig terjed , + és azt az elsõdleges csoportot azonosítja + be egyedileg, amihez a felhasználó tartozik. + A csoportok segítségével az + erõforrások hozzáférésnek + vezérlését tudjuk megoldani a + felhasználók GID-jével az UID-dek + helyett. Ezzel jelentõs mértékben + csökkenthetõ egyes konfigurációs + állományok mérete. Egy + felhasználó egyszerre több csoport tagja + is lehet. - Login class + Bejelentkezési osztály - Login classes are an extension to the group mechanism that - provide additional flexibility when tailoring the system to - different users. + A bejelentkezési osztályok a + csoportszervezés kibõvítését + célozzák meg, további + rugalmasságot nyújtanak, amikor a rendszert az + egyes felhasználók igényeihez + szabjuk. - Password change time + Jelszóváltási idõ - By default FreeBSD does not force users to change their - passwords periodically. You can enforce this on a per-user basis, - forcing some or all of your users to change their passwords after - a certain amount of time has elapsed. + Alapértelmezés szerint a &os; nem + kényszeríti rá a + felhasználókat, hogy rendszeresen + megváltoztassák a jelszavukat. Ezt + felhasználónként + kikényszeríthetjük, és így + az egyes, vagy akár az összes + felhasználót kötelezhetjük az adott + idõközönként + jelszóváltásra. - Account expiry time + A hozzáférés lejárati + ideje - By default FreeBSD does not expire accounts. If you are - creating accounts that you know have a limited lifespan, for - example, in a school where you have accounts for the students, - then you can specify when the account expires. After the expiry - time has elapsed the account cannot be used to log in to the - system, although the account's directories and files will - remain. + A &os;-ben alapértelmezés szerint nem + évülnek a hozzáférések. Ha + azonban olyan hozzáféréseket kell + létrehoznunk, például egy + iskolában a diákok számára, + melyeknek korlátoznunk kell az élettartamukat, + meg tudjuk adni a lejáratuk idejét. Ezen + dátum után a + hozzáféréssel már nem lehet + bejelentkezni a rendszerbe, viszont a + hozzátartozó könyvtárban + tárolt állományok továbbra is + megmaradnak. - User's full name + Felhasználó teljes neve - The user name uniquely identifies the account to FreeBSD, but - does not necessarily reflect the user's real name. This - information can be associated with the account. + Míg a felhasználónév + tökéletesen azonosítja a &os; + számára a hozzáférést, + nem feltétlenül tükrözi a + felhasználó valódi nevét. Ezt + az információt is meg lehet adni a + hozzáféréshez. - Home directory + Felhasználói könyvtár - The home directory is the full path to a directory on the - system in which the user will start when logging on to the - system. A common convention is to put all user home directories - under - /home/username - or /usr/home/username. - The user would store their personal files in their home directory, - and any directories they may create in there. + A felhasználói könyvtár a + rendszerben található azon könyvtár + teljes elérési útvonala, ahová a + felhasználó a bejelentkezést + követõen kerül. Elterjedt megszokás, + hogy az összes felhasználó + könyvtárát a + /home/felhasználónév + vagy a + /usr/home/felhasználónév + könyvtárba teszik. A felhasználók + ezekben a könyvtárakban tárolják a + személyes állományaikat, és + tetszõleges könyvtárakat + létrehozhatnak benne. - User shell + Felhasználói shell - The shell provides the default environment users use to - interact with the system. There are many different kinds of - shells, and experienced users will have their own preferences, - which can be reflected in their account settings. + A shell biztosítja azt az alapértelmezett + környezetet, amiben a felhasználó + kapcsolatba tud lépni a rendszerrel. + Többféle shell is akad, és a + tapasztaltabb felhasználók ragaszkodnak is + némelyikükhöz, amely gyakran + látható is a + hozzáférésük + beállításaiban. - There are three main types of accounts: the Superuser, system users, and user accounts. The Superuser - account, usually called root, is used to - manage the system with no limitations on privileges. System - users run services. Finally, user accounts are used by real - people, who log on, read mail, and so forth. + Három fõ típusa van a + hozzáféréseknek: az adminisztrátori, a rendszer- és a felhasználói + hozzáférések. Az adminisztátori + hozzáférés, amelyet gyakran + rootként hivatkoznak, + használatos a rendszer karbantartására, + és semmilyen korlátozás nem + érvényes rá. A + rendszerhozzáférések + szolgáltatásokat futtatnak. Végezetül a + felhasználói hozzáféréseket + használják a valódi emberek, akik + bejelentkeznek, leveleket olvasnak és így + tovább. - + - The Superuser Account - + Az adminisztrátori + hozzáférés + - accounts - superuser (root) + hozzáférések + adminisztrátor (root) - The superuser account, usually called - root, comes preconfigured to facilitate - system administration, and should not be used for day-to-day - tasks like sending and receiving mail, general exploration of - the system, or programming. - - This is because the superuser, unlike normal user accounts, - can operate without limits, and misuse of the superuser account - may result in spectacular disasters. User accounts are unable - to destroy the system by mistake, so it is generally best to use - normal user accounts whenever possible, unless you especially - need the extra privilege. + Az adminisztátori hozzáférés, + amelyet általában csak rootnak + nevezünk, a rendszeradminisztrációs feladatok + elvégzéséhez van igazítva, és + nem ajánlott az olyan hétköznapi + tevékenységek elvégzéséhez, + mint mondjuk a levelek olvasása és + írása, a rendszer bebarangolása vagy a + programozás. + + Ezért az adminisztrátor, eltérõen az + átlagos felhasználói + hozzáférésektõl, képes + mindenféle határok nélkül + ténykedni, és az adminisztrátori + hozzáférés helytelen használata + látványos katasztrófákat + idézhet elõ. A felhasználói + hozzáférések képtelenek merõ + véletlenségbõl tönkretenni a rendszert, + ezért általánosságban véve az a + legjobb, ha egyszerû felhasználói + hozzáféréseket használunk, amint + módunk van rá, hacsak nincs + szükségünk kifejezetten plusz + jogosultságokra. - You should always double and triple-check commands you issue - as the superuser, since an extra space or missing character can - mean irreparable data loss. + Minden esetben érdemes alaposan megfontolni az + adminisztrátorként kiadott parancsokat, mivel + egyetlen hiányzó szóköz vagy más + egyéb karakter helyrehozhatatlan károkat okozhat a + rendszerben. - So, the first thing you should do after reading this - chapter is to create an unprivileged user account for yourself - for general usage if you have not already. This applies equally - whether you are running a multi-user or single-user machine. - Later in this chapter, we discuss how to create additional - accounts, and how to change between the normal user and - superuser. + Ezért, ha még nem tettük volna meg + korábban, legyen az elsõ dolgunk a fejezet + elolvasása után, hogy létrehozunk egy kiemelt + jogosultságokkal nem rendelkezõ + felhasználót saját magunk + számára a hétköznapi feladatok + lebonyolítására. Ez ugyanúgy + vonatkozik a többfelhasználós és az + egyfelhasználós módban futó + rendszerekre is. A fejezet egy késõbbi + részében leírjuk, hogyan lehet további + hozzáféréseket létrehozni és + hogyan kell váltani egy mezei felhasználó + és az adminisztrátor + hozzáférése között. - + - System Accounts + Rendszerhozzáférések - accounts - system + hozzáférések + rendszer - System users are those used to run services such as DNS, - mail, web servers, and so forth. The reason for this is - security; if all services ran as the superuser, they could - act without restriction. + A rendszer által hozzáférések + azok, amelyek olyan szolgáltatások + futtatásáért felelõsek, mint mondjuk a + DNS, levelezés, webszerverek és így + tovább. Ennek oka a biztonság: ha minden + szolgáltatást adminisztrátorként + futtatnánk, bármit meg tudnának tenni a + rendszerben. - accounts + hozzáférések daemon - accounts + hozzáférések operator - Examples of system users are daemon, - operator, bind (for - the Domain Name Service), news, and + Ilyen rendszerfelhasználók a + daemon, operator, + bind (a névfeloldáshoz), + news, és a www. - accounts + hozzáférések nobody - nobody is the generic unprivileged - system user. However, it is important to keep in mind that the - more services that use nobody, the more - files and processes that user will become associated with, and - hence the more privileged that user becomes. + A nobody (senki) egy + általános jogosultságok nélküli + rendszerfelhasználó. Mindazonáltal nem + szabad elfelejtenünk, hogy minél több + szolgáltatást bízunk a + nobody-ra, annál több + állomány és program kerül vele + kapcsolatba és ennélfogva annál + erõsebbé válik a rendszer számára + ez a felhasználó. - User Accounts + Felhasználói + hozzáférések - accounts - user + hozzáférések + felhasználó - User accounts are the primary means of access for real - people to the system, and these accounts insulate the user and - the environment, preventing the users from damaging the system - or other users, and allowing users to customize their - environment without affecting others. + A felhasználói hozzáférések + a valós felhasználók elsõdleges + eszközei a rendszer felé, és ezek a + hozzáférések szigetelik el a + felhasználókat és a környezeteket, + megakadályozva, hogy a felhasználók + kárt okozzanak akár a rendszerben, akár + egymásnak, valamint lehetõvé teszik a + felhasználók számára a + környezeteik testreszabását a + többiekének módosítása + nélkül. - Every person accessing your system should have a unique user - account. This allows you to find out who is doing what, prevent - people from clobbering each others' settings or reading each - others' mail, and so forth. + Minden olyan személynek, aki hozzá akar + férni a rendszerünkhöz, rendelkeznie kell + felhasználói azonosítóval. + Ezáltal meg tudjuk állapítani ki mivel + foglalkozik éppen a rendszerben, és meg tudjuk + akadályozni, hogy a felhasználók + hozzápiszkáljanak egymás + beállításaihoz, olvassák egymás + leveleit és így tovább. - Each user can set up their own environment to accommodate - their use of the system, by using alternate shells, editors, key - bindings, and language. + Minden felhasználó alakítani tudja a + saját környezetét, és ezzel mintegy + berendezkedik a rendszerünkben, különfélek + shellek, szövegszerkesztõk, + billentyû-hozzárendelések és nyelvek + használatával. - Modifying Accounts + A hozzáférések + módosítása - accounts - modifying + hozzáférések + módosítás - There are a variety of different commands available in the - &unix; environment to manipulate user accounts. The most common - commands are summarized below, followed by more detailed - examples of their usage. + Egy &unix;-os környezetben több + különbözõ parancs közül + választhatunk a felhasználói + hozzáférések + módosításakor. A + legáltalánosabb parancsokat az alábbiakban + foglaljuk össze, amelyet ezután a használatukat + részletesebben bemutató példák + követnek. @@ -336,34 +494,41 @@ - Command - Summary + Parancs + Leírás &man.adduser.8; - The recommended command-line application for adding - new users. + Az új felhasználók + felvételére ajánlott parancssoros + alkalmazás. &man.rmuser.8; - The recommended command-line application for - removing users. + A felhasználók + eltávolítására ajánlott + parancssoros alkalmazás. &man.chpass.1; - A flexible tool to change user database information. + Rugalmas eszköz a felhasználói + adatbázis információinak + megváltoztatására. &man.passwd.1; - The simple command-line tool to change user - passwords. + Egy egyszerû parancssoros segédprogram a + elhasználói jelszavak + megváltoztatásához. &man.pw.8; - A powerful and flexible tool to modify all aspects - of user accounts. + Egy erõteljes és rugalmas + segédeszköz a felhasználói + hozzáférések teljeskörû + módosításához. @@ -373,8 +538,8 @@ <command>adduser</command> - accounts - adding + hozzáférések + hozzáadás adduser @@ -382,53 +547,63 @@ /usr/share/skel - skeleton directory - &man.adduser.8; is a simple program for - adding new users. It creates entries in the system - passwd and group - files. It will also create a home directory for the new user, - copy in the default configuration files (dotfiles) from - /usr/share/skel, and can optionally mail - the new user a welcome message. + vázkönyvtár + A &man.adduser.8; a felhasználók + hozzáadására használható + egyszerû program. Bejegyzéseket hoz létre a + rendszer passwd és + group állományaiban. Ezen + kívül még létrehozza az új + felhasználó könyvtárát is, + odamásolja az alapértelmezett + konfigurációs állományokat (az + ún. pontállományokat) a + /usr/share/skel + könyvtárból, és opcionálisan + küld egy üdvözlõlevelet az + újdonsült felhasználónak. - Adding a user on &os; + Felhasználó hozzáadása a + &os;-ben &prompt.root; adduser -Username: jru -Full name: J. Random User +Username: jantyik +Full name: Jantyik Zsolt Uid (Leave empty for default): -Login group [jru]: -Login group is jru. Invite jru into other groups? []: wheel +Login group [jantyik]: +Login group is jantyik. Invite jantyik into other groups? []: wheel Login class [default]: Shell (sh csh tcsh zsh nologin) [sh]: zsh -Home directory [/home/jru]: +Home directory [/home/jantyik]: Use password-based authentication? [yes]: Use an empty password? (yes/no) [no]: Use a random password? (yes/no) [no]: Enter password: Enter password again: Lock out the account after creation? [no]: -Username : jru +Username : jantyik Password : **** -Full Name : J. Random User +Full Name : Jantyik Zsolt Uid : 1001 Class : -Groups : jru wheel -Home : /home/jru +Groups : jantyik wheel +Home : /home/jantyik Shell : /usr/local/bin/zsh Locked : no OK? (yes/no): yes -adduser: INFO: Successfully added (jru) to the user database. +adduser: INFO: Successfully added (jantyik) to the user database. Add another user? (yes/no): no Goodbye! &prompt.root; - The password you type in is not echoed, nor are asterisks - displayed. Make sure that you do not mistype the password. - + A jelszót a beírás során + egyáltalán nem jelenik meg, még csillagokat + sem láthatunk a karakterek helyén. Ezért + vigyázzunk, nehogy elgépeljük + véletlenül a jelszót! @@ -437,77 +612,100 @@ rmuser - accounts - removing + hozzáférések + eltávolítás - You can use &man.rmuser.8; to - completely remove a user from the system. - &man.rmuser.8; performs the following - steps: + Az &man.rmuser.8; használható a + felhasználók teljesen + eltávolítására a rendszerbõl. + Az &man.rmuser.8; az alábbi lépeseket hajtja + végre: - Removes the user's &man.crontab.1; entry (if - any). + Eltávolítja a felhasználó + &man.crontab.1; bejegyzéseit (amennyiben + léteznek). - Removes any &man.at.1; jobs belonging to the - user. + Eltávolítja az &man.at.1; + felhasználóhoz tartozó + munkáit. - Kills all processes owned by the user. + Kilövi a felhasználó által + birtokolt összes futó programot. - Removes the user from the system's local password - file. + Eltávolítja a felhasználót a + rendszer helyi jelszó + állományából. - Removes the user's home directory (if it is owned by - the user). + Eltávolítja a felhasználó + könyvtárát (amennyiben az a + felhasználó birtokában van). - Removes the incoming mail files belonging to the user - from /var/mail. + Eltávolítja a felhasználóhoz + tartozó beérkezõ leveleket + tartalmazó állományt a + /var/mail + könyvtárból. - Removes all files owned by the user from temporary - file storage areas such as /tmp. + Eltávolítja a felhasználó + tulajdonában levõ összes + állományt az olyan ideiglenes + tárhelyekrõl, mint mondjuk a + /tmp könyvtár. - Finally, removes the username from all groups to which - it belongs in /etc/group. - + Végezetül eltávolítja a + felhasználó nevét az összes olyan + csoportból, amihez az /etc/group + szerint tartozik. + - If a group becomes empty and the group name is the - same as the username, the group is removed; this - complements the per-user unique groups created by - &man.adduser.8;. + Ha menetközben egy csoport üressé + válik, és a csoport neve megegyezik a + felhasználó nevével, a csoportot is + eltávolításra kerül. Ez + kiegészíti a &man.adduser.8; + eszközzel létrehozott + felhasználónkénti egyedi + csoportokat. - &man.rmuser.8; cannot be used to remove - superuser accounts, since that is almost always an indication - of massive destruction. + A &man.rmuser.8; nem használható + adminisztrátori hozzáférések + törlésére, mivel az szinte majdnem mindig a + teljes pusztulást vonja maga után. - By default, an interactive mode is used, which attempts to - make sure you know what you are doing. + Alapértelmezés szerint interaktív + módban mûködik, melynek során + megpróbál megbizonyosodni róla, hogy + tényleg a megfelelõ dolgot cselekedjük. - <command>rmuser</command> Interactive Account Removal + <command>rmuser</command> + Hozzáférések interaktív + eltávolítása - &prompt.root; rmuser jru + &prompt.root; rmuser jantyik Matching password entry: -jru:*:1001:1001::0:0:J. Random User:/home/jru:/usr/local/bin/zsh +jantyik:*:1001:1001::0:0:Jantyik Zsolt:/home/jantyik:/usr/local/bin/zsh Is this the entry you wish to remove? y -Remove user's home directory (/home/jru)? y +Remove user's home directory (/home/jantyik)? y Updating password file, updating databases, done. -Updating group file: trusted (removing group jru -- personal group is empty) done. -Removing user's incoming mail file /var/mail/jru: done. -Removing files belonging to jru from /tmp: done. -Removing files belonging to jru from /var/tmp: done. -Removing files belonging to jru from /var/tmp/vi.recover: done. +Updating group file: trusted (removing group jantyik -- personal group is empty) done. +Removing user's incoming mail file /var/mail/jantyik: done. +Removing files belonging to jantyik from /tmp: done. +Removing files belonging to jantyik from /var/tmp: done. +Removing files belonging to jantyik from /var/tmp/vi.recover: done. &prompt.root; @@ -516,54 +714,68 @@ <command>chpass</command> chpass - &man.chpass.1; changes user database - information such as passwords, shells, and personal - information. + A &man.chpass.1; segítségével meg + tudjuk változtatni a felhasználói + adatbázisban található + információkat, mint például a + jelszavakat, shelleket és a személyes + adatokat. - Only system administrators, as the superuser, may change - other users' information and passwords with - &man.chpass.1;. + Csak a rendszeradminisztrátoroknak, mint mondjuk + magának az adminisztrátornak, szabad + megváltoztatnia a felhasználók adatait a + &man.chpass.1; programmal. - When passed no options, aside from an optional username, - &man.chpass.1; displays an editor - containing user information. When the user exists from the - editor, the user database is updated with the new >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 20 09:05:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4324416A420; Sat, 20 Oct 2007 09:05: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 A460416A419 for ; Sat, 20 Oct 2007 09:05:33 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B28D13C4BE for ; Sat, 20 Oct 2007 09:05:33 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9K95X5Y075098 for ; Sat, 20 Oct 2007 09:05:33 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9K95O3p075095 for perforce@freebsd.org; Sat, 20 Oct 2007 09:05:24 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Sat, 20 Oct 2007 09:05:24 GMT Message-Id: <200710200905.l9K95O3p075095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 127814 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, 20 Oct 2007 09:05:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=127814 Change 127814 by zhouzhouyi@zhouzhouyi_mactest on 2007/10/20 09:04:23 Integrate from main branch Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/NOTES#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.i386#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/options#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ddb/db_ps.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/db_machdep.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_exec.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_fork.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_switch.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/kern_thread.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/sys_process.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/syscalls.master#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/modules/Makefile#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/bpf.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_bridge.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_gre.c#2 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/net/if_lagg.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_proto.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_input.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/ip_output.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/pci/if_xl.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/ata.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/param.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/proc.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/systm.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/sys/vmmeter.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_fault.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_glue.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_phys.c#3 integrate .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/vm/vm_phys.h#3 integrate Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,13 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/amd64/conf/GENERIC#101 -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.482 2007/06/14 17:14:25 delphij Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/amd64/conf/GENERIC#104 # $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.485 2007/10/19 12:30:33 kensmith Exp $ -==== YOURS //zhouzhouyi_mactest/sys/amd64/conf/GENERIC -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.483 2007/07/01 21:47:45 njl Exp $ -<<<< cpu HAMMER ident GENERIC ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#3 (text+ko) ==== @@ -45,13 +45,7 @@ * Created : 30/01/97 */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/cpufunc.c#16 -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.16 2007/02/11 22:24:54 cognet Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/cpufunc.c#19 __FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.19 2007/10/18 05:33:05 imp Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/arm/arm/cpufunc.c -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $"); -<<<< #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,13 +42,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/identcpu.c#10 -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.10 2006/11/19 23:45:33 sam Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/identcpu.c#12 __FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.12 2007/10/18 05:33:05 imp Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/arm/arm/identcpu.c -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $"); -<<<< #include #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,13 +147,7 @@ #include "opt_vm.h" #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/pmap.c#83 -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.83 2007/06/11 21:29:26 cognet Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/pmap.c#87 __FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.87 2007/10/16 20:40:04 cognet Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/arm/arm/pmap.c -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.85 2007/09/19 15:30:25 cognet Exp $"); -<<<< #include #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -83,13 +83,7 @@ #include #include #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/arm/swtch.S#19 -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.19 2006/04/09 20:16:47 cognet Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/arm/arm/swtch.S#21 __FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.21 2007/10/13 12:05:03 cognet Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/arm/arm/swtch.S -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.20 2007/08/07 18:20:55 cognet Exp $"); -<<<< /* ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#3 (text+ko) ==== @@ -35,13 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/include/armreg.h#5 - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/arm/include/armreg.h#7 * $FreeBSD: src/sys/arm/include/armreg.h,v 1.7 2007/10/18 05:06:58 imp Exp $ -==== YOURS //zhouzhouyi_mactest/sys/arm/include/armreg.h - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.6 2007/07/27 14:54:27 cognet Exp $ -<<<< */ #ifndef MACHINE_ARMREG_H ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,13 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/include/cpufunc.h#11 - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.11 2007/03/21 03:28:16 kevlo Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/arm/include/cpufunc.h#13 * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.13 2007/10/18 05:33:06 imp Exp $ -==== YOURS //zhouzhouyi_mactest/sys/arm/include/cpufunc.h - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.12 2007/07/27 14:39:41 cognet Exp $ -<<<< */ #ifndef _MACHINE_CPUFUNC_H_ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#3 (text+ko) ==== @@ -40,13 +40,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/arm/xscale/i80321/i80321_pci.c#10 -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.10 2007/02/23 12:18:28 piso Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/arm/xscale/i80321/i80321_pci.c#12 __FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/arm/xscale/i80321/i80321_pci.c -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $"); -<<<< #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,13 +6,7 @@ # # All arguments must be in double quotes. # ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/boot/forth/loader.conf#72 -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/boot/forth/loader.conf#74 # $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $ -==== YOURS //zhouzhouyi_mactest/sys/boot/forth/loader.conf -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ -<<<< ############################################################## ### Basic configuration options ############################ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,13 +26,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#20 -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.25 2007/05/22 02:22:57 kan Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#22 __FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/compat/ia32/ia32_sysvec.c -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $"); -<<<< #include "opt_compat.h" @@ -108,8 +102,6 @@ static u_long ia32_maxdsiz = IA32_MAXDSIZ; SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, ""); ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#20 -==== THEIRS //depot/vendor/freebsd/src/sys/compat/ia32/ia32_sysvec.c#22 TUNABLE_ULONG("compat.ia32.maxdsiz", &ia32_maxdsiz); static u_long ia32_maxssiz = IA32_MAXSSIZ; SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); @@ -118,13 +110,6 @@ SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem); -==== YOURS //zhouzhouyi_mactest/sys/compat/ia32/ia32_sysvec.c -static u_long ia32_maxssiz = IA32_MAXSSIZ; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, ""); -static u_long ia32_maxvmem = IA32_MAXVMEM; -SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); - -<<<< struct sysentvec ia32_freebsd_sysvec = { FREEBSD32_SYS_MAXSYSCALL, freebsd32_sysent, ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/NOTES#3 (text+ko) ==== @@ -1,10 +1,4 @@ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/NOTES#416 -# $FreeBSD: src/sys/conf/NOTES,v 1.1435 2007/06/23 06:42:40 rafan Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/conf/NOTES#435 # $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $ -==== YOURS //zhouzhouyi_mactest/sys/conf/NOTES -# $FreeBSD: src/sys/conf/NOTES,v 1.1451 2007/09/19 18:12:44 imp Exp $ -<<<< # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.amd64#3 (text+ko) ==== @@ -1,13 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/files.amd64#93 -# $FreeBSD: src/sys/conf/files.amd64,v 1.104 2007/06/11 00:38:05 marcel Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/conf/files.amd64#98 # $FreeBSD: src/sys/conf/files.amd64,v 1.109 2007/10/15 20:00:21 netchild Exp $ -==== YOURS //zhouzhouyi_mactest/sys/conf/files.amd64 -# $FreeBSD: src/sys/conf/files.amd64,v 1.107 2007/08/15 19:26:01 des Exp $ -<<<< # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files.i386#3 (text+ko) ==== @@ -1,13 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/files.i386#211 -# $FreeBSD: src/sys/conf/files.i386,v 1.577 2007/06/11 00:38:05 marcel Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/conf/files.i386#216 # $FreeBSD: src/sys/conf/files.i386,v 1.582 2007/10/15 20:00:21 netchild Exp $ -==== YOURS //zhouzhouyi_mactest/sys/conf/files.i386 -# $FreeBSD: src/sys/conf/files.i386,v 1.580 2007/08/15 19:26:01 des Exp $ -<<<< # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/kern.pre.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.92 2007/08/08 19:12:06 marcel Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -76,9 +76,6 @@ # .. and the same for twa INCLUDES+= -I$S/dev/twa -# .. and the same for em -INCLUDES+= -I$S/dev/em - # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs @@ -90,7 +87,11 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -#WERROR?= -Werror +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \ + ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "sparc64" +WERROR?= -Werror +.endif .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/options#3 (text+ko) ==== @@ -1,10 +1,4 @@ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/options#312 -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/conf/options#324 # $FreeBSD: src/sys/conf/options,v 1.608 2007/09/23 07:34:23 pjd Exp $ -==== YOURS //zhouzhouyi_mactest/sys/conf/options -# $FreeBSD: src/sys/conf/options,v 1.606 2007/09/12 07:43:42 ariff Exp $ -<<<< # # On the handling of kernel options # ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/ddb/db_ps.c#3 (text+ko) ==== @@ -28,13 +28,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/ddb/db_ps.c#43 -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.65 2006/12/06 06:34:54 julian Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/ddb/db_ps.c#45 __FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.67 2007/10/16 17:52:59 marcel Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/ddb/db_ps.c -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.66 2007/09/17 05:27:19 jeff Exp $"); -<<<< #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/aac/aac_pci.c#3 (text+ko) ==== @@ -28,13 +28,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#55 -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.61 2006/12/11 18:28:28 mjacob Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#57 __FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.63 2007/10/14 19:40:15 emaste Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/aac/aac_pci.c -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.62 2007/08/23 20:12:40 emaste Exp $"); -<<<< /* * PCI bus interface and resource allocation. @@ -202,8 +196,6 @@ "ICP ICP9047MA SATA RAID"}, {0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0, "ICP ICP9087MA SATA RAID"}, ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#55 -==== THEIRS //depot/vendor/freebsd/src/sys/dev/aac/aac_pci.c#57 {0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0, "ICP9067MA SATA RAID"}, {0x9005, 0x0285, 0x9005, 0x02b5, AAC_HWIF_I960RX, 0, @@ -246,12 +238,6 @@ "Adaptec RAID 3085"}, {0x9005, 0x0285, 0x9005, 0x02c8, AAC_HWIF_I960RX, 0, "ICP RAID ICP5805BL"}, -==== YOURS //zhouzhouyi_mactest/sys/dev/aac/aac_pci.c - {0x9005, 0x0285, 0x9005, 0x02bb, AAC_HWIF_I960RX, 0, - "Adaptec RAID 3405"}, - {0x9005, 0x0285, 0x9005, 0x02bc, AAC_HWIF_I960RX, 0, - "Adaptec RAID 3805"}, -<<<< {0x9005, 0x0286, 0x1014, 0x9580, AAC_HWIF_RKT, 0, "IBM ServeRAID-8k"}, {0x9005, 0x0285, 0x1014, 0x034d, AAC_HWIF_I960RX, 0, ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi.c#3 (text+ko) ==== @@ -28,13 +28,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/acpica/acpi.c#214 -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/acpica/acpi.c#217 __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243 2007/10/09 07:48:07 njl Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/acpica/acpi.c -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.242 2007/09/13 01:37:17 njl Exp $"); -<<<< #include "opt_acpi.h" #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/acpica/acpi_hpet.c#3 (text+ko) ==== @@ -25,13 +25,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/acpica/acpi_hpet.c#9 -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.9 2007/06/15 18:02:34 njl Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/acpica/acpi_hpet.c#12 __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.12 2007/10/09 07:48:07 njl Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/acpica/acpi_hpet.c -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.11 2007/07/30 15:21:26 njl Exp $"); -<<<< #include "opt_acpi.h" #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,13 +25,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ata/ata-chipset.c#197 -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ata/ata-chipset.c#202 __FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.202 2007/10/09 20:15:09 delphij Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/ata/ata-chipset.c -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $"); -<<<< #include "opt_ata.h" #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ata/ata-pci.h#3 (text+ko) ==== @@ -23,13 +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. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ata/ata-pci.h#76 - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ata/ata-pci.h#81 * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.81 2007/10/09 20:15:09 delphij Exp $ -==== YOURS //zhouzhouyi_mactest/sys/dev/ata/ata-pci.h - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $ -<<<< */ /* structure holding chipset config info */ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ath/ath_rate/sample/sample.c#3 (text+ko) ==== @@ -36,13 +36,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ath/ath_rate/sample/sample.c#17 -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.17 2007/06/11 03:36:50 sam Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ath/ath_rate/sample/sample.c#19 __FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.19 2007/10/13 22:30:41 sam Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/ath/ath_rate/sample/sample.c -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.18 2007/09/17 16:25:02 sam Exp $"); -<<<< /* * John Bicket's SampleRate control algorithm. @@ -144,6 +138,17 @@ return packet_size_bins[index]; } +static __inline int +rate_to_ndx(struct sample_node *sn, int rate) { + int x = 0; + for (x = 0; x < sn->num_rates; x++) { + if (sn->rates[x].rate == rate) { + return x; + } + } + return -1; +} + void ath_rate_node_init(struct ath_softc *sc, struct ath_node *an) { @@ -510,11 +515,10 @@ struct sample_node *sn = ATH_NODE_SAMPLE(an); const struct ath_tx_status *ts = &bf->bf_status.ds_txstat; const struct ath_desc *ds0 = &bf->bf_desc[0]; - const HAL_RATE_TABLE *rt = sc->sc_currates; - int short_tries, long_tries, frame_size; - int mrr, ndx0, ndx1, ndx2, ndx3; + int final_rate, short_tries, long_tries, frame_size; + int mrr; - ndx0 = rt->rateCodeToIndex[ts->ts_rate &~ HAL_TXSTAT_ALTRATE]; + final_rate = sc->sc_hwmap[ts->ts_rate &~ HAL_TXSTAT_ALTRATE].ieeerate; short_tries = ts->ts_shortretry; long_tries = ts->ts_longretry + 1; frame_size = ds0->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ @@ -532,6 +536,8 @@ } mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT); if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) { + int ndx = rate_to_ndx(sn, final_rate); + /* * Only one rate was used; optimize work. */ @@ -540,18 +546,18 @@ __func__, ether_sprintf(an->an_node.ni_macaddr), bin_to_size(size_to_bin(frame_size)), ts->ts_status ? "FAIL" : "OK", - sn->rates[ndx0].rate, short_tries, long_tries); + final_rate, short_tries, long_tries); update_stats(sc, an, frame_size, - ndx0, long_tries, + ndx, long_tries, 0, 0, 0, 0, 0, 0, short_tries, long_tries, ts->ts_status); } else { - int hwrate0, tries0; - int hwrate1, tries1; - int hwrate2, tries2; - int hwrate3, tries3; + int hwrate0, rate0, tries0, ndx0; + int hwrate1, rate1, tries1, ndx1; + int hwrate2, rate2, tries2, ndx2; + int hwrate3, rate3, tries3, ndx3; int finalTSIdx = ts->ts_finaltsi; /* @@ -569,17 +575,21 @@ hwrate3 = MS(ds0->ds_ctl3, AR5416_XmitRate3); } - ndx0 = rt->rateCodeToIndex[hwrate0]; + rate0 = sc->sc_hwmap[hwrate0].ieeerate; tries0 = MS(ds0->ds_ctl2, AR_XmitDataTries0); + ndx0 = rate_to_ndx(sn, rate0); - ndx1 = rt->rateCodeToIndex[hwrate1]; + rate1 = sc->sc_hwmap[hwrate1].ieeerate; tries1 = MS(ds0->ds_ctl2, AR_XmitDataTries1); + ndx1 = rate_to_ndx(sn, rate1); - ndx2 = rt->rateCodeToIndex[hwrate2]; + rate2 = sc->sc_hwmap[hwrate2].ieeerate; tries2 = MS(ds0->ds_ctl2, AR_XmitDataTries2); + ndx2 = rate_to_ndx(sn, rate2); - ndx3 = rt->rateCodeToIndex[hwrate3]; + rate3 = sc->sc_hwmap[hwrate3].ieeerate; tries3 = MS(ds0->ds_ctl2, AR_XmitDataTries3); + ndx3 = rate_to_ndx(sn, rate3); DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s size %d finaltsidx %d tries %d %s rate/try [%d/%d %d/%d %d/%d %d/%d]\n", @@ -588,10 +598,10 @@ finalTSIdx, long_tries, ts->ts_status ? "FAIL" : "OK", - sn->rates[ndx0].rate, tries0, - sn->rates[ndx1].rate, tries1, - sn->rates[ndx2].rate, tries2, - sn->rates[ndx3].rate, tries3); + rate0, tries0, + rate1, tries1, + rate2, tries2, + rate3, tries3); /* * NB: series > 0 are not penalized for failure ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ctau/if_ct.c#3 (text+ko) ==== @@ -22,13 +22,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ctau/if_ct.c#32 -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.33 2007/03/21 03:38:35 nyan Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ctau/if_ct.c#34 __FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.35 2007/10/12 06:03:43 kevlo Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/ctau/if_ct.c -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.34 2007/07/27 11:59:56 rwatson Exp $"); -<<<< #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/cx/if_cx.c#3 (text+ko) ==== @@ -23,13 +23,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/cx/if_cx.c#55 -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.56 2007/03/21 03:38:35 nyan Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/cx/if_cx.c#57 __FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.58 2007/10/12 06:03:43 kevlo Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/cx/if_cx.c -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.57 2007/07/27 11:59:56 rwatson Exp $"); -<<<< #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/ipw/if_ipw.c#3 (text+ko) ==== @@ -1,10 +1,4 @@ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27 -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.27 2007/06/11 03:36:51 sam Exp $ */ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32 /* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.32 2007/10/12 10:00:26 thompsa Exp $ */ -==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c -/* $FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30 2007/09/05 21:31:31 sam Exp $ */ -<<<< /*- * Copyright (c) 2004-2006 @@ -36,13 +30,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27 -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.27 2007/06/11 03:36:51 sam Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32 __FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.32 2007/10/12 10:00:26 thompsa Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c -__FBSDID("$FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.30 2007/09/05 21:31:31 sam Exp $"); -<<<< /*- * Intel(R) PRO/Wireless 2100 MiniPCI driver @@ -357,13 +345,7 @@ ic->ic_scan_mindwell = ipw_scan_mindwell; bpfattach2(ifp, DLT_IEEE802_11_RADIO, ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27 - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32 sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), -==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c - sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), -<<<< &sc->sc_drvbpf); sc->sc_rxtap_len = sizeof sc->sc_rxtap; @@ -2304,30 +2286,7 @@ if (error != 0) return error; ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#27 -#ifdef IPW_DEBUG - if (ipw_debug > 0) { - printf("Setting ESSID to "); - ieee80211_print_essid(ic->ic_des_essid, ic->ic_des_esslen); - printf("\n"); - } -#endif - error = ipw_cmd(sc, IPW_CMD_SET_ESSID, ic->ic_des_ssid[0].ssid, - ic->ic_des_ssid[0].len); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/ipw/if_ipw.c#32 error = ipw_setssid(sc, ic->ic_des_ssid[0].ssid, ic->ic_des_ssid[0].len); -==== YOURS //zhouzhouyi_mactest/sys/dev/ipw/if_ipw.c -#ifdef IPW_DEBUG - if (ipw_debug > 0) { - printf("Setting ESSID to "); - ieee80211_print_essid(ic->ic_des_ssid[0].ssid, - ic->ic_des_ssid[0].len); - printf("\n"); - } -#endif - error = ipw_cmd(sc, IPW_CMD_SET_ESSID, ic->ic_des_ssid[0].ssid, - ic->ic_des_ssid[0].len); -<<<< if (error != 0) return error; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt.c#3 (text+ko) ==== @@ -96,13 +96,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/mpt/mpt.c#43 -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.43 2007/06/04 06:18:07 scottl Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/mpt/mpt.c#45 __FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.45 2007/10/12 06:03:43 kevlo Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/mpt/mpt.c -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.44 2007/08/14 19:17:35 scottl Exp $"); -<<<< #include #include /* XXX For static handler registration */ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/mpt/mpt_cam.c#3 (text+ko) ==== @@ -94,13 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/mpt/mpt_cam.c#59 -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.60 2007/06/18 18:28:43 scottl Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/mpt/mpt_cam.c#61 __FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.62 2007/10/12 16:54:51 scottl Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/mpt/mpt_cam.c -__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.61 2007/08/14 19:17:35 scottl Exp $"); -<<<< #include #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pccard/pccarddevs#3 (text+ko) ==== @@ -1,10 +1,4 @@ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/pccard/pccarddevs#114 -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.128 2007/02/16 07:51:23 imp Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/pccard/pccarddevs#116 $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.130 2007/10/12 08:26:15 remko Exp $ -==== YOURS //zhouzhouyi_mactest/sys/dev/pccard/pccarddevs -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.129 2007/07/11 04:14:41 imp Exp $ -<<<< /* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/pci/pci.c#3 (text+ko) ==== @@ -27,13 +27,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/pci/pci.c#172 -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.353 2007/05/16 23:42:04 jhb Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/pci/pci.c#174 __FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.355 2007/09/30 11:05:15 marius Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/pci/pci.c -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.354 2007/07/29 02:44:41 marcel Exp $"); -<<<< #include "opt_bus.h" ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/atiixp.c#3 (text+ko) ==== @@ -63,13 +63,7 @@ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/atiixp.c#18 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.18 2007/06/14 11:13:37 ariff Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/atiixp.c#20 SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.20 2007/10/12 06:03:44 kevlo Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/atiixp.c -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/atiixp.c,v 1.19 2007/07/09 20:41:23 ariff Exp $"); -<<<< #define ATI_IXP_DMA_RETRY_MAX 100 ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/emu10kx.c#3 (text+ko) ==== @@ -24,13 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/emu10kx.c#11 - * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.11 2007/06/04 18:25:04 dwmalone Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/emu10kx.c#13 * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.13 2007/10/12 06:03:44 kevlo Exp $ -==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/emu10kx.c - * $FreeBSD: src/sys/dev/sound/pci/emu10kx.c,v 1.12 2007/09/12 07:43:42 ariff Exp $ -<<<< */ #include ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/sound/pci/hda/hdac.c#3 (text+ko) ==== @@ -81,22 +81,10 @@ #include "mixer_if.h" ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#42 -#define HDA_DRV_TEST_REV "20070619_0045" -==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#45 #define HDA_DRV_TEST_REV "20071020_0048" -==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/hda/hdac.c -#define HDA_DRV_TEST_REV "20070710_0047" -<<<< #define HDA_WIDGET_PARSER_REV 1 ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#42 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.42 2007/06/18 22:39:27 ariff Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/sound/pci/hda/hdac.c#45 SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.45 2007/10/19 15:49:39 ariff Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/sound/pci/hda/hdac.c -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.44 2007/07/09 20:42:11 ariff Exp $"); -<<<< #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axe.c#3 (text+ko) ==== @@ -31,13 +31,7 @@ */ #include ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51 -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.51 2007/06/18 22:25:45 imp Exp $"); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55 __FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.55 2007/09/25 21:08:33 imp Exp $"); -==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.53 2007/08/09 04:40:07 imp Exp $"); -<<<< /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. @@ -611,16 +605,10 @@ /* * Get station address. */ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51 - axe_cmd(sc, AXE_CMD_READ_NODEID, 0, 0, &eaddr); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55 if (sc->axe_flags & (AX178|AX772)) axe_cmd(sc, AXE_178_CMD_READ_NODEID, 0, 0, &eaddr); else axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, &eaddr); -==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c - axe_cmd(sc, AXE_172_CMD_READ_NODEID, 0, 0, &eaddr); -<<<< /* * Fetch IPG values. @@ -1087,11 +1075,6 @@ } /* Set transmitter IPG values */ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51 - axe_cmd(sc, AXE_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL); - axe_cmd(sc, AXE_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL); - axe_cmd(sc, AXE_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL); -==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55 if (sc->axe_flags & (AX178|AX772)) { axe_cmd(sc, AXE_178_CMD_WRITE_IPG012, sc->axe_ipgs[2], (sc->axe_ipgs[1]<<8) | sc->axe_ipgs[0], NULL); @@ -1100,25 +1083,14 @@ axe_cmd(sc, AXE_172_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL); axe_cmd(sc, AXE_172_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL); } -==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c - axe_cmd(sc, AXE_172_CMD_WRITE_IPG0, 0, sc->axe_ipgs[0], NULL); - axe_cmd(sc, AXE_172_CMD_WRITE_IPG1, 0, sc->axe_ipgs[1], NULL); - axe_cmd(sc, AXE_172_CMD_WRITE_IPG2, 0, sc->axe_ipgs[2], NULL); -<<<< /* Enable receiver, set RX mode */ ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#51 - rxmode = AXE_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE; -==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axe.c#55 rxmode = AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE; if (sc->axe_flags & (AX178|AX772)) { if (sc->axe_bufsz == AXE_178_MAX_BUFSZ) rxmode |= AXE_178_RXCMD_MFB_16384; } else rxmode |= AXE_172_RXCMD_UNICAST; -==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axe.c - rxmode = AXE_172_RXCMD_UNICAST|AXE_RXCMD_MULTICAST|AXE_RXCMD_ENABLE; -<<<< /* If we want promiscuous mode, set the allframes bit. */ if (ifp->if_flags & IFF_PROMISC) ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/dev/usb/if_axereg.h#3 (text+ko) ==== @@ -29,13 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#12 - * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.12 2007/06/10 07:24:32 imp Exp $ -==== THEIRS //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#16 * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.16 2007/09/25 21:08:33 imp Exp $ -==== YOURS //zhouzhouyi_mactest/sys/dev/usb/if_axereg.h - * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.14 2007/08/09 04:40:07 imp Exp $ -<<<< */ /* @@ -113,8 +107,6 @@ #define AXE_178_MEDIA_GMII 0x0001 #define AXE_MEDIA_FULL_DUPLEX 0x0002 #define AXE_172_MEDIA_TX_ABORT_ALLOW 0x0004 ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/dev/usb/if_axereg.h#12 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 20 17:01:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69E9016A46C; Sat, 20 Oct 2007 17:01: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 D4E9F16A418 for ; Sat, 20 Oct 2007 17:01:27 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7284F13C459 for ; Sat, 20 Oct 2007 17:01:27 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KH1R0B028166 for ; Sat, 20 Oct 2007 17:01:27 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KH1R1n028162 for perforce@freebsd.org; Sat, 20 Oct 2007 17:01:27 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 20 Oct 2007 17:01:27 GMT Message-Id: <200710201701.l9KH1R1n028162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127823 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, 20 Oct 2007 17:01:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=127823 Change 127823 by zec@zec_tpx32 on 2007/10/20 17:00:40 Oops... don't try to operate on uninitialized data... Affected files ... .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#15 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#15 (text+ko) ==== @@ -147,7 +147,6 @@ #endif ripcb_zone = uma_zcreate("ripcb", sizeof(struct inpcb), NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); #ifdef VIMAGE } V_ripcbinfo.ipi_vnet = curvnet; @@ -166,6 +165,7 @@ V_ripcbinfo.ipi_porthashbase = hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask); V_ripcbinfo.ipi_zone = ripcb_zone; + uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); } From owner-p4-projects@FreeBSD.ORG Sat Oct 20 17:58:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0DAA16A421; Sat, 20 Oct 2007 17:58: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 1658716A417 for ; Sat, 20 Oct 2007 17:58:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0428913C468 for ; Sat, 20 Oct 2007 17:58:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KHwT3t032729 for ; Sat, 20 Oct 2007 17:58:29 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KHwSKI032726 for perforce@freebsd.org; Sat, 20 Oct 2007 17:58:28 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 20 Oct 2007 17:58:28 GMT Message-Id: <200710201758.l9KHwSKI032726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 127824 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, 20 Oct 2007 17:58:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127824 Change 127824 by zec@zec_tpx32 on 2007/10/20 17:58:02 IFC @ 12781 Affected files ... .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/uchcom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/vimage/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/vimage/src/sys/modules/uchcom/Makefile#1 branch .. //depot/projects/vimage/src/sys/net/ethernet.h#6 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#16 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#9 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#10 (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.484 2007/09/26 20:05:06 brueffer Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.485 2007/10/19 12:30:33 kensmith Exp $ cpu HAMMER ident GENERIC @@ -26,7 +26,7 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -options SCHED_4BSD # 4BSD scheduler +options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols ==== //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.18 2007/08/07 18:37:21 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.19 2007/10/18 05:33:05 imp Exp $"); #include #include @@ -296,6 +296,64 @@ }; #endif /* CPU_ARM9 */ +#if defined(CPU_ARM9E) || defined(CPU_ARM10) +struct cpu_functions armv5_ec_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + cpufunc_nullop, /* cpwait */ + + /* MMU functions */ + + cpufunc_control, /* control */ + cpufunc_domains, /* Domain */ + armv5_ec_setttb, /* Setttb */ + cpufunc_faultstatus, /* Faultstatus */ + cpufunc_faultaddress, /* Faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + arm10_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + arm10_tlb_flushI_SE, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + armv5_ec_icache_sync_all, /* icache_sync_all */ + armv5_ec_icache_sync_range, /* icache_sync_range */ + + armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ + armv5_ec_dcache_wbinv_range, /* dcache_wbinv_range */ +/*XXX*/ armv5_ec_dcache_wbinv_range, /* dcache_inv_range */ + armv5_ec_dcache_wb_range, /* dcache_wb_range */ + + armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ + armv5_ec_idcache_wbinv_range, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + (void *)cpufunc_nullop, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + arm10_context_switch, /* context_switch */ + + arm10_setup /* cpu setup */ + +}; +#endif /* CPU_ARM9E || CPU_ARM10 */ + #ifdef CPU_ARM10 struct cpu_functions arm10_cpufuncs = { /* CPU functions */ @@ -869,6 +927,16 @@ goto out; } #endif /* CPU_ARM9 */ +#if defined(CPU_ARM9E) || defined(CPU_ARM10) + if (cputype == CPU_ID_ARM926EJS || + cputype == CPU_ID_ARM1026EJS) { + cpufuncs = armv5_ec_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ + get_cachetype_cp15(); + pmap_pte_init_generic(); + return 0; + } +#endif /* CPU_ARM9E || CPU_ARM10 */ #ifdef CPU_ARM10 if (/* cputype == CPU_ID_ARM1020T || */ cputype == CPU_ID_ARM1020E) { @@ -1434,10 +1502,12 @@ */ #if defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined (CPU_ARM9) || \ + defined(CPU_ARM9E) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ + defined(CPU_ARM10) || defined(CPU_ARM11) #define IGN 0 #define OR 1 @@ -1679,7 +1749,7 @@ } #endif /* CPU_ARM9 */ -#ifdef CPU_ARM10 +#if defined(CPU_ARM9E) || defined(CPU_ARM10) struct cpu_option arm10_options[] = { { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, @@ -1722,7 +1792,7 @@ cpu_idcache_wbinv_all(); /* Now really make sure they are clean. */ - asm volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); + __asm __volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); /* Set the control register */ ctrl = cpuctrl; @@ -1731,7 +1801,57 @@ /* And again. */ cpu_idcache_wbinv_all(); } -#endif /* CPU_ARM10 */ +#endif /* CPU_ARM9E || CPU_ARM10 */ + +#ifdef CPU_ARM11 +struct cpu_option arm11_options[] = { + { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "arm11.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, + { "arm11.icache", BIC, OR, CPU_CONTROL_IC_ENABLE }, + { "arm11.dcache", BIC, OR, CPU_CONTROL_DC_ENABLE }, + { NULL, IGN, IGN, 0 } +}; + +void +arm11_setup(args) + char *args; +{ + int cpuctrl, cpuctrlmask; + + cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + /* | CPU_CONTROL_BPRD_ENABLE */; + cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE + | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK; + +#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS + cpuctrl |= CPU_CONTROL_AFLT_ENABLE; +#endif + + cpuctrl = parse_cpu_options(args, arm11_options, cpuctrl); + +#ifdef __ARMEB__ + cpuctrl |= CPU_CONTROL_BEND_ENABLE; +#endif + + /* Clear out the cache */ + cpu_idcache_wbinv_all(); + + /* Now really make sure they are clean. */ + __asm __volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); + + /* Set the control register */ + curcpu()->ci_ctrl = cpuctrl; + cpu_control(0xffffffff, cpuctrl); + + /* And again. */ + cpu_idcache_wbinv_all(); +} +#endif /* CPU_ARM11 */ #ifdef CPU_SA110 struct cpu_option sa110_options[] = { ==== //depot/projects/vimage/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.11 2007/07/27 14:49:11 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.12 2007/10/18 05:33:05 imp Exp $"); #include #include #include @@ -70,9 +70,12 @@ CPU_CLASS_ARM8, CPU_CLASS_ARM9TDMI, CPU_CLASS_ARM9ES, + CPU_CLASS_ARM9EJS, CPU_CLASS_ARM10E, + CPU_CLASS_ARM10EJ, CPU_CLASS_SA1, - CPU_CLASS_XSCALE + CPU_CLASS_XSCALE, + CPU_CLASS_ARM11J }; static const char * const generic_steppings[16] = { @@ -119,6 +122,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i80219_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const i80321_steppings[16] = { "step A-0", "step B-0", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", @@ -133,6 +143,7 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +/* Steppings for PXA2[15]0 */ static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -140,6 +151,24 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +/* Steppings for PXA255/26x. + * rev 5: PXA26x B0, rev 6: PXA255 A0 + */ +static const char * const pxa255_steppings[16] = { + "rev 0", "rev 1", "rev 2", "step A-0", + "rev 4", "step B-0", "step A-0", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + +/* Stepping for PXA27x */ +static const char * const pxa27x_steppings[16] = { + "step A-0", "step A-1", "step B-0", "step B-1", + "step C-0", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const ixp425_steppings[16] = { "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", @@ -198,6 +227,8 @@ generic_steppings }, { CPU_ID_ARM922T, CPU_CLASS_ARM9TDMI, "ARM922T", generic_steppings }, + { CPU_ID_ARM926EJS, CPU_CLASS_ARM9EJS, "ARM926EJ-S", + generic_steppings }, { CPU_ID_ARM940T, CPU_CLASS_ARM9TDMI, "ARM940T", generic_steppings }, { CPU_ID_ARM946ES, CPU_CLASS_ARM9ES, "ARM946E-S", @@ -213,6 +244,8 @@ generic_steppings }, { CPU_ID_ARM1022ES, CPU_CLASS_ARM10E, "ARM1022E-S", generic_steppings }, + { CPU_ID_ARM1026EJS, CPU_CLASS_ARM10EJ, "ARM1026EJ-S", + generic_steppings }, { CPU_ID_SA110, CPU_CLASS_SA1, "SA-110", sa110_steppings }, @@ -240,11 +273,12 @@ i81342_steppings }, { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", - xscale_steppings }, - + i80219_steppings }, { CPU_ID_80219_600, CPU_CLASS_XSCALE, "i80219 600MHz", - xscale_steppings }, + i80219_steppings }, + { CPU_ID_PXA27X, CPU_CLASS_XSCALE, "PXA27x", + pxa27x_steppings }, { CPU_ID_PXA250A, CPU_CLASS_XSCALE, "PXA250", pxa2x0_steppings }, { CPU_ID_PXA210A, CPU_CLASS_XSCALE, "PXA210", @@ -253,8 +287,8 @@ pxa2x0_steppings }, { CPU_ID_PXA210B, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, - { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA250", - pxa2x0_steppings }, + { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA255", + pxa255_steppings }, { CPU_ID_PXA210C, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, @@ -265,6 +299,11 @@ { CPU_ID_IXP425_266, CPU_CLASS_XSCALE, "IXP425 266MHz", ixp425_steppings }, + { CPU_ID_ARM1136JS, CPU_CLASS_ARM11J, "ARM1136J-S", + generic_steppings }, + { CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1", + generic_steppings }, + { 0, CPU_CLASS_NONE, NULL, NULL } }; @@ -283,10 +322,13 @@ { "ARM7TDMI", "CPU_ARM7TDMI" }, /* CPU_CLASS_ARM7TDMI */ { "ARM8", "CPU_ARM8" }, /* CPU_CLASS_ARM8 */ { "ARM9TDMI", "CPU_ARM9TDMI" }, /* CPU_CLASS_ARM9TDMI */ - { "ARM9E-S", NULL }, /* CPU_CLASS_ARM9ES */ + { "ARM9E-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9ES */ + { "ARM9EJ-S", "CPU_ARM9E" }, /* CPU_CLASS_ARM9EJS */ { "ARM10E", "CPU_ARM10" }, /* CPU_CLASS_ARM10E */ + { "ARM10EJ", "CPU_ARM10" }, /* CPU_CLASS_ARM10EJ */ { "SA-1", "CPU_SA110" }, /* CPU_CLASS_SA1 */ { "XScale", "CPU_XSCALE_..." }, /* CPU_CLASS_XSCALE */ + { "ARM11J", "CPU_ARM11" }, /* CPU_CLASS_ARM11J */ }; /* @@ -310,7 +352,7 @@ "**unknown 11**", "**unknown 12**", "**unknown 13**", - "**unknown 14**", + "write-back-locking-C", "**unknown 15**", }; @@ -363,9 +405,13 @@ printf(" IDC enabled"); break; case CPU_CLASS_ARM9TDMI: + case CPU_CLASS_ARM9ES: + case CPU_CLASS_ARM9EJS: case CPU_CLASS_ARM10E: + case CPU_CLASS_ARM10EJ: case CPU_CLASS_SA1: case CPU_CLASS_XSCALE: + case CPU_CLASS_ARM11J: if ((ctrl & CPU_CONTROL_DC_ENABLE) == 0) printf(" DC disabled"); else ==== //depot/projects/vimage/src/sys/arm/at91/at91_mcireg.h#2 (text+ko) ==== @@ -23,10 +23,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.1 2006/10/20 06:44:04 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.2 2007/10/18 05:43:44 imp Exp $ */ -#ifndef ARM_AT91_AT91QDMMCREG_H -#define ARM_AT91_AT91QDMMCREG_H +#ifndef ARM_AT91_AT91_MCIREG_H +#define ARM_AT91_AT91_MCIREG_H #define MMC_MAX 30 @@ -125,4 +125,4 @@ #define AT91C_BUS_WIDTH_1BIT 0x00 #define AT91C_BUS_WIDTH_4BITS 0x02 -#endif /* ARM_AT91_AT91QDMMCREG_H */ +#endif /* ARM_AT91_AT91_MCIREG_H */ ==== //depot/projects/vimage/src/sys/arm/include/armreg.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.28 2003/10/31 16:30:15 scw Exp $ */ +/* $NetBSD: armreg.h,v 1.37 2007/01/06 00:50:54 christos Exp $ */ /*- * Copyright (c) 1998, 2001 Ben Harris @@ -35,11 +35,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.6 2007/07/27 14:54:27 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.7 2007/10/18 05:06:58 imp Exp $ */ #ifndef MACHINE_ARMREG_H #define MACHINE_ARMREG_H + #define INSN_SIZE 4 #define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define PSR_MODE 0x0000001f /* mode mask */ @@ -65,6 +66,7 @@ #define CPU_ID_DEC 0x44000000 /* 'D' */ #define CPU_ID_INTEL 0x69000000 /* 'i' */ #define CPU_ID_TI 0x54000000 /* 'T' */ +#define CPU_ID_FARADAY 0x66000000 /* 'f' */ /* How to decide what format the CPUID is in. */ #define CPU_ID_ISOLD(x) (((x) & 0x0000f000) == 0x00000000) @@ -89,6 +91,8 @@ #define CPU_ID_ARCH_V5 0x00030000 #define CPU_ID_ARCH_V5T 0x00040000 #define CPU_ID_ARCH_V5TE 0x00050000 +#define CPU_ID_ARCH_V5TEJ 0x00060000 +#define CPU_ID_ARCH_V6 0x00070000 #define CPU_ID_VARIANT_MASK 0x00f00000 /* Next three nybbles are part number */ @@ -118,7 +122,7 @@ /* ARM7 CPUs -- [15:12] == 7 */ #define CPU_ID_ARM700 0x41007000 /* XXX This is a guess. */ #define CPU_ID_ARM710 0x41007100 -#define CPU_ID_ARM7500 0x41027100 /* XXX This is a guess. */ +#define CPU_ID_ARM7500 0x41027100 #define CPU_ID_ARM710A 0x41047100 /* inc ARM7100 */ #define CPU_ID_ARM7500FE 0x41077100 #define CPU_ID_ARM710T 0x41807100 @@ -131,15 +135,20 @@ #define CPU_ID_ARM920T 0x41129200 #define CPU_ID_ARM920T_ALT 0x41009200 #define CPU_ID_ARM922T 0x41029220 +#define CPU_ID_ARM926EJS 0x41069260 #define CPU_ID_ARM940T 0x41029400 /* XXX no MMU */ #define CPU_ID_ARM946ES 0x41049460 /* XXX no MMU */ #define CPU_ID_ARM966ES 0x41049660 /* XXX no MMU */ #define CPU_ID_ARM966ESR1 0x41059660 /* XXX no MMU */ #define CPU_ID_ARM1020E 0x4115a200 /* (AKA arm10 rev 1) */ #define CPU_ID_ARM1022ES 0x4105a220 +#define CPU_ID_ARM1026EJS 0x4106a260 +#define CPU_ID_ARM1136JS 0x4107b360 +#define CPU_ID_ARM1136JSR1 0x4117b360 #define CPU_ID_SA110 0x4401a100 #define CPU_ID_SA1100 0x4401a110 #define CPU_ID_TI925T 0x54029250 +#define CPU_ID_FA526 0x66015260 #define CPU_ID_SA1110 0x6901b110 #define CPU_ID_IXP1200 0x6901c120 #define CPU_ID_80200 0x69052000 @@ -151,6 +160,7 @@ #define CPU_ID_PXA210B 0x69052920 /* 3rd version Core */ #define CPU_ID_PXA250C 0x69052d00 /* 4th version Core */ #define CPU_ID_PXA210C 0x69052d20 /* 4th version Core */ +#define CPU_ID_PXA27X 0x69054110 #define CPU_ID_80321_400 0x69052420 #define CPU_ID_80321_600 0x69052430 #define CPU_ID_80321_400_B0 0x69052c20 @@ -305,4 +315,6 @@ #define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define INSN_COND_AL 0xe0000000 /* Always condition */ +#define THUMB_INSN_SIZE 2 /* Some are 4 bytes. */ + #endif /* !MACHINE_ARMREG_H */ ==== //depot/projects/vimage/src/sys/arm/include/cpuconf.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.10 2006/11/30 23:30:40 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.11 2007/10/18 05:33:06 imp Exp $ * */ @@ -50,12 +50,22 @@ /* * Step 1: Count the number of CPU types configured into the kernel. */ -#define CPU_NTYPES 2 +#define CPU_NTYPES (defined(CPU_ARM7TDMI) + \ + defined(CPU_ARM8) + defined(CPU_ARM9) + \ + defined(CPU_ARM9E) + \ + defined(CPU_ARM10) + \ + defined(CPU_ARM11) + \ + defined(CPU_SA110) + defined(CPU_SA1100) + \ + defined(CPU_SA1110) + \ + defined(CPU_IXP12X0) + \ + defined(CPU_XSCALE_80200) + \ + defined(CPU_XSCALE_80321) + \ + defined(__CPU_XSCALE_PXA2XX) + \ + defined(CPU_XSCALE_IXP425)) /* * Step 2: Determine which ARM architecture versions are configured. */ - #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425)) @@ -64,20 +74,35 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) +#if (defined(CPU_ARM9E) || defined(CPU_ARM10) || \ + defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ + defined(CPU_XSCALE_PXA2X0)) #define ARM_ARCH_5 1 #else #define ARM_ARCH_5 0 #endif -#define ARM_NARCH (ARM_ARCH_4 + ARM_ARCH_5) +#if defined(CPU_ARM11) +#define ARM_ARCH_6 1 +#else +#define ARM_ARCH_6 0 +#endif + +#define ARM_NARCH (ARM_ARCH_4 + ARM_ARCH_5 + ARM_ARCH_6) #if ARM_NARCH == 0 && !defined(KLD_MODULE) && defined(_KERNEL) #error ARM_NARCH is 0 #endif +#if ARM_ARCH_5 || ARM_ARCH_6 /* + * We could support Thumb code on v4T, but the lack of clean interworking + * makes that hard. + */ +#define THUMB_CODE +#endif + +/* * Step 3: Define which MMU classes are configured: * * ARM_MMU_MEMC Prehistoric, external memory controller @@ -99,7 +124,8 @@ #endif #if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \ - defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM10)) + defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM9E) || \ + defined(CPU_ARM10) || defined(CPU_ARM11)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 ==== //depot/projects/vimage/src/sys/arm/include/cpufunc.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.12 2007/07/27 14:39:41 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.13 2007/10/18 05:33:06 imp Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -351,7 +351,7 @@ extern unsigned arm9_dcache_index_inc; #endif -#ifdef CPU_ARM10 +#if defined(CPU_ARM9E) || defined(CPU_ARM10) void arm10_setttb (u_int); void arm10_tlb_flushID_SE (u_int); @@ -378,8 +378,60 @@ extern unsigned arm10_dcache_index_inc; #endif -#if defined(CPU_ARM9) || defined(CPU_ARM10) || defined(CPU_SA110) || \ - defined(CPU_SA1100) || defined(CPU_SA1110) || \ +#ifdef CPU_ARM11 +void arm11_setttb (u_int); + +void arm11_tlb_flushID_SE (u_int); +void arm11_tlb_flushI_SE (u_int); + +void arm11_context_switch (void); + +void arm11_setup (char *string); +void arm11_tlb_flushID (void); +void arm11_tlb_flushI (void); +void arm11_tlb_flushD (void); +void arm11_tlb_flushD_SE (u_int va); + +void arm11_drain_writebuf (void); +#endif + +#if defined(CPU_ARM9E) || defined (CPU_ARM10) +void armv5_ec_setttb(u_int); + +void armv5_ec_icache_sync_all(void); +void armv5_ec_icache_sync_range(vm_offset_t, vm_size_t); + +void armv5_ec_dcache_wbinv_all(void); +void armv5_ec_dcache_wbinv_range(vm_offset_t, vm_size_t); +void armv5_ec_dcache_inv_range(vm_offset_t, vm_size_t); +void armv5_ec_dcache_wb_range(vm_offset_t, vm_size_t); + +void armv5_ec_idcache_wbinv_all(void); +void armv5_ec_idcache_wbinv_range(vm_offset_t, vm_size_t); +#endif + +#if defined (CPU_ARM10) || defined (CPU_ARM11) +void armv5_setttb(u_int); + +void armv5_icache_sync_all(void); +void armv5_icache_sync_range(vm_offset_t, vm_size_t); + +void armv5_dcache_wbinv_all(void); +void armv5_dcache_wbinv_range(vm_offset_t, vm_size_t); +void armv5_dcache_inv_range(vm_offset_t, vm_size_t); +void armv5_dcache_wb_range(vm_offset_t, vm_size_t); + +void armv5_idcache_wbinv_all(void); +void armv5_idcache_wbinv_range(vm_offset_t, vm_size_t); + +extern unsigned armv5_dcache_sets_max; +extern unsigned armv5_dcache_sets_inc; +extern unsigned armv5_dcache_index_max; +extern unsigned armv5_dcache_index_inc; +#endif + +#if defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_ARM10) || \ + defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) ==== //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.53 2007/10/18 21:52:13 darrenr Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -82,7 +82,7 @@ #ifdef sun # include #endif -#if !defined(_KERNEL) && defined(__FreeBSD__) +#if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(SOLARIS2)) # if (__FreeBSD_version >= 504000) # undef _RADIX_H_ # endif @@ -155,8 +155,8 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $"; -/* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.78 2006/03/29 11:19:54 darrenr Exp $"; */ +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.53 2007/10/18 21:52:13 darrenr Exp $"; +/* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */ #endif #ifndef _KERNEL @@ -362,7 +362,7 @@ static INLINE int frpr_mobility6 __P((fr_info_t *)); static INLINE int frpr_routing6 __P((fr_info_t *)); static INLINE int frpr_dstopts6 __P((fr_info_t *)); -static INLINE void frpr_fragment6 __P((fr_info_t *)); +static INLINE int frpr_fragment6 __P((fr_info_t *)); static INLINE int frpr_ipv6exthdr __P((fr_info_t *, int, int)); @@ -480,8 +480,9 @@ break; case IPPROTO_FRAGMENT : - frpr_fragment6(fin); - go = 0; + p = frpr_fragment6(fin); + if (fin->fin_off != 0) + go = 0; break; default : @@ -652,7 +653,7 @@ /* ------------------------------------------------------------------------ */ /* Function: frpr_fragment6 */ -/* Returns: void */ +/* Returns: int - value of the next header or IPPROTO_NONE if error */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* IPv6 Only */ @@ -664,7 +665,7 @@ /* upper layer header has been seen (or where it ends) and thus we are not */ /* able to continue processing beyond this header with any confidence. */ /* ------------------------------------------------------------------------ */ -static INLINE void frpr_fragment6(fin) +static INLINE int frpr_fragment6(fin) fr_info_t *fin; { struct ip6_frag *frag; @@ -673,12 +674,12 @@ fin->fin_flx |= FI_FRAG; if (frpr_ipv6exthdr(fin, 0, IPPROTO_FRAGMENT) == IPPROTO_NONE) - return; + return IPPROTO_NONE; extoff = (char *)fin->fin_exthdr - (char *)fin->fin_dp; if (frpr_pullup(fin, sizeof(*frag)) == -1) - return; + return IPPROTO_NONE; fin->fin_exthdr = (char *)fin->fin_dp + extoff; frag = fin->fin_exthdr; @@ -687,16 +688,18 @@ */ if (frag->ip6f_offlg == 0) { fin->fin_flx |= FI_BAD; - return; + return IPPROTO_NONE; } - fin->fin_off = frag->ip6f_offlg & IP6F_OFF_MASK; + fin->fin_off = ntohs(frag->ip6f_offlg & IP6F_OFF_MASK); fin->fin_off <<= 3; if (fin->fin_off != 0) fin->fin_flx |= FI_FRAGBODY; fin->fin_dp = (char *)fin->fin_dp + sizeof(*frag); fin->fin_dlen -= sizeof(*frag); + + return frag->ip6f_nxt; } @@ -752,15 +755,15 @@ case ICMP6_TIME_EXCEEDED : case ICMP6_PARAM_PROB : fin->fin_flx |= FI_ICMPERR; - if ((fin->fin_m != NULL) && - (M_LEN(fin->fin_m) < fin->fin_plen)) { + minicmpsz = ICMP6ERR_IPICMPHLEN - sizeof(ip6_t); + if (fin->fin_plen < ICMP6ERR_IPICMPHLEN) + break; + + if (M_LEN(fin->fin_m) < fin->fin_plen) { if (fr_coalesce(fin) != 1) return; } - if (frpr_pullup(fin, ICMP6ERR_MINPKTLEN) == -1) - return; - /* * If the destination of this packet doesn't match the * source of the original packet then this packet is @@ -772,7 +775,6 @@ (i6addr_t *)&ip6->ip6_src)) fin->fin_flx |= FI_BAD; - minicmpsz = ICMP6ERR_IPICMPHLEN - sizeof(ip6_t); break; default : break; @@ -913,6 +915,14 @@ /* Short inline function to cut down on code duplication to perform a call */ /* to fr_pullup to ensure there is the required amount of data, */ /* consecutively in the packet buffer. */ +/* */ +/* This function pulls up 'extra' data at the location of fin_dp. fin_dp */ +/* points to the first byte after the complete layer 3 header, which will */ +/* include all of the known extension headers for IPv6 or options for IPv4. */ +/* */ +/* Since fr_pullup() expects the total length of bytes to be pulled up, it */ +/* is necessary to add those we can already assume to be pulled up (fin_dp */ +/* - fin_ip) to what is passed through. */ /* ------------------------------------------------------------------------ */ static INLINE int frpr_pullup(fin, plen) fr_info_t *fin; @@ -1001,6 +1011,9 @@ fin->fin_data[0] = *(u_short *)icmp; + if (fin->fin_dlen >= 6) /* ID field */ + fin->fin_data[1] = icmp->icmp_id; + switch (icmp->icmp_type) { case ICMP_ECHOREPLY : @@ -1071,14 +1084,12 @@ default : break; } - - if (fin->fin_dlen >= 6) /* ID field */ - fin->fin_data[1] = icmp->icmp_id; } frpr_short(fin, minicmpsz); - fr_checkv4sum(fin); + if ((fin->fin_flx & FI_FRAG) == 0) + fr_checkv4sum(fin); } @@ -1194,6 +1205,7 @@ return -1; #if 0 + tcp = fin->fin_dp; ip = fin->fin_ip; s = (u_char *)(tcp + 1); off = IP_HL(ip) << 2; @@ -1281,8 +1293,10 @@ frpr_short(fin, sizeof(tcphdr_t)); - if (frpr_tcpcommon(fin) == 0) - fr_checkv4sum(fin); + if (frpr_tcpcommon(fin) == 0) { + if ((fin->fin_flx & FI_FRAG) == 0) + fr_checkv4sum(fin); + } } @@ -1300,8 +1314,10 @@ frpr_short(fin, sizeof(udphdr_t)); - if (frpr_udpcommon(fin) == 0) - fr_checkv4sum(fin); + if (frpr_udpcommon(fin) == 0) { + if ((fin->fin_flx & FI_FRAG) == 0) + fr_checkv4sum(fin); + } } @@ -1951,7 +1967,7 @@ fr_info_t *fin; u_32_t pass; { - int rulen, portcmp, off, logged, skip; + int rulen, portcmp, off, skip; struct frentry *fr, *fnext; u_32_t passt, passo; @@ -1970,7 +1986,6 @@ return pass; skip = 0; - logged = 0; portcmp = 0; fin->fin_depth++; fin->fin_fr = NULL; @@ -2104,7 +2119,7 @@ ATOMIC_INCL(frstats[fin->fin_out].fr_skip); } ATOMIC_INCL(frstats[fin->fin_out].fr_pkl); - logged = 1; + fin->fin_flx |= FI_DONTCACHE; } #endif /* IPFILTER_LOG */ fr->fr_bytes += (U_QUAD_T)fin->fin_plen; @@ -2129,8 +2144,6 @@ fin->fin_fr = fr; passt = pass; } - if (fin->fin_flx & FI_DONTCACHE) - logged = 1; pass = passt; } @@ -2158,8 +2171,6 @@ break; } } - if (logged) - fin->fin_flx |= FI_DONTCACHE; fin->fin_depth--; return pass; } @@ -2410,8 +2421,10 @@ # ifdef MENTAT qpktinfo_t *qpi = qif; +# if !defined(_INET_IP_STACK_H) if ((u_int)ip & 0x3) return 2; +# endif # else SPL_INT(s); # endif @@ -2564,11 +2577,20 @@ if (!out) (void) fr_acctpkt(fin, NULL); - if (fr == NULL) - if ((fin->fin_flx & (FI_FRAG|FI_BAD)) == FI_FRAG) + if (fr == NULL) { + if ((fin->fin_flx & (FI_FRAG|FI_BAD)) == FI_FRAG) { fr = fr_knownfrag(fin, &pass); - if (fr == NULL) - fr = fr_checkstate(fin, &pass); + /* + * Reset the keep state flag here so that we don't + * try and add a new state entry because of it, leading + * to a blocked packet because the add will fail. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:52:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3B3416A473; Sat, 20 Oct 2007 19:52: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 6C3E816A421 for ; Sat, 20 Oct 2007 19:52:00 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C38BC13C447 for ; Sat, 20 Oct 2007 19:51:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJpgdQ042590 for ; Sat, 20 Oct 2007 19:51:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJpgfx042587 for perforce@freebsd.org; Sat, 20 Oct 2007 19:51:42 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:51:42 GMT Message-Id: <200710201951.l9KJpgfx042587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127831 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, 20 Oct 2007 19:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=127831 Change 127831 by kmacy@kmacy_home:ethng on 2007/10/20 19:51:22 linux atomics shims Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_atomic.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:52:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5EF116A41B; Sat, 20 Oct 2007 19:52: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 A851B16A419 for ; Sat, 20 Oct 2007 19:52:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 996B813C46A for ; Sat, 20 Oct 2007 19:52:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJqio3042675 for ; Sat, 20 Oct 2007 19:52:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJqiEM042672 for perforce@freebsd.org; Sat, 20 Oct 2007 19:52:44 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:52:44 GMT Message-Id: <200710201952.l9KJqiEM042672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127832 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, 20 Oct 2007 19:52:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=127832 Change 127832 by kmacy@kmacy_home:ethng on 2007/10/20 19:52:30 more general compat macros and typedefs move atomics to own header Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_compat.h#6 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_compat.h#6 (text+ko) ==== @@ -15,13 +15,17 @@ typedef uint32_t __u32; typedef uint64_t __u64; +typedef int8_t __s8; +typedef int16_t __s16; +typedef int32_t __s32; +typedef int64_t __s64; + typedef uint8_t __be8; typedef uint16_t __be16; typedef uint32_t __be32; typedef uint64_t __be64; #define __attribute_const__ -typedef volatile int atomic_t; #define rw_semaphore rwlock #define __user typedef struct rwlock rwlock_t; @@ -133,4 +137,15 @@ static inline void idr_init(struct idr *idp){} +#define copy_from_user(a,b,c) copyin(b,a,c) +#define copy_to_user(a,b,c) copyout(b,a,c) +#define __user +#define put_user(a,b) copyout(&a,b,4) +#define get_user(a,b) copyin(&a,b,4) + + +#define ERR_PTR(err) ((void *)((long)(err))) +#define IS_ERR(ptr) ((unsigned long)(ptr) > (unsigned long)(-1000)) +#define PTR_ERR(ptr) ((long)(ptr)) + #endif From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:54:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4EC716A421; Sat, 20 Oct 2007 19:54: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 E704316A417 for ; Sat, 20 Oct 2007 19:54:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 809B613C45A for ; Sat, 20 Oct 2007 19:53:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJrj9N042714 for ; Sat, 20 Oct 2007 19:53:45 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJrjfr042711 for perforce@freebsd.org; Sat, 20 Oct 2007 19:53:45 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:53:45 GMT Message-Id: <200710201953.l9KJrjfr042711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127833 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, 20 Oct 2007 19:54:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=127833 Change 127833 by kmacy@kmacy_home:ethng on 2007/10/20 19:53:15 make umem buildable update to reflect separate header for linux atomics Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_user_verbs.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#5 edit Differences ... ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#2 (text+ko) ==== @@ -33,31 +33,34 @@ #ifndef IB_UMEM_H #define IB_UMEM_H -#include -#include -#include +#include +#include +#include + struct ib_ucontext; +struct ib_umem_chunk { + TAILQ_ENTRY(ib_umem_chunk) entry; + int nents; + int nmap; + struct scatterlist page_list[0]; +}; + struct ib_umem { struct ib_ucontext *context; size_t length; int offset; int page_size; int writable; - struct list_head chunk_list; + TAILQ_HEAD(, ib_umem_chunk) chunk_list; +#ifdef notyet struct work_struct work; struct mm_struct *mm; +#endif unsigned long diff; }; -struct ib_umem_chunk { - struct list_head list; - int nents; - int nmap; - struct scatterlist page_list[0]; -}; - #ifdef CONFIG_INFINIBAND_USER_MEM struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, @@ -67,7 +70,6 @@ #else /* CONFIG_INFINIBAND_USER_MEM */ -#include static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, size_t size, ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_user_verbs.h#2 (text+ko) ==== @@ -38,7 +38,6 @@ #ifndef IB_USER_VERBS_H #define IB_USER_VERBS_H -#include /* * Increment this value if any changes that break userspace ABI ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#5 (text+ko) ==== @@ -42,6 +42,7 @@ #if !defined(IB_VERBS_H) #define IB_VERBS_H +#include #include #include From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:55:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DE5216A46C; Sat, 20 Oct 2007 19:55: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 E145716A468 for ; Sat, 20 Oct 2007 19:55:10 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18F9013C494 for ; Sat, 20 Oct 2007 19:54:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJslxl042741 for ; Sat, 20 Oct 2007 19:54:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJslci042738 for perforce@freebsd.org; Sat, 20 Oct 2007 19:54:47 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:54:47 GMT Message-Id: <200710201954.l9KJslci042738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127834 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, 20 Oct 2007 19:55:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=127834 Change 127834 by kmacy@kmacy_home:ethng on 2007/10/20 19:54:06 add 2 new fields to pci_dev Affected files ... .. //depot/projects/ethng/src/sys/sys/linux_pci.h#2 edit Differences ... ==== //depot/projects/ethng/src/sys/sys/linux_pci.h#2 (text+ko) ==== @@ -29,6 +29,8 @@ unsigned int bus; unsigned int hdr_type; unsigned int rid_irq; + uint32_t vendor; + uint32_t device; struct resource *rmap[SEGS]; struct resource *intr; void *inthand_cookie; From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:56:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF2BA16A41B; Sat, 20 Oct 2007 19:56: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 A6C8616A419 for ; Sat, 20 Oct 2007 19:56:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 974BD13C481 for ; Sat, 20 Oct 2007 19:56:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJuqLA042849 for ; Sat, 20 Oct 2007 19:56:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJuq1J042846 for perforce@freebsd.org; Sat, 20 Oct 2007 19:56:52 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:56:52 GMT Message-Id: <200710201956.l9KJuq1J042846@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127835 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, 20 Oct 2007 19:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=127835 Change 127835 by kmacy@kmacy_home:ethng on 2007/10/20 19:56:20 add iwch_provider.c to the build Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.c#1 add .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 edit .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_user.h#1 add Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cxio_hal.h#3 (text+ko) ==== @@ -202,4 +202,16 @@ return hiBitSetTab[val & 0xff] - 1; } +#define cxfree(a) free((a), M_DEVBUF); +#define kmalloc(a, b) malloc((a), M_DEVBUF, (b)) +#define kzalloc(a, b) malloc((a), M_DEVBUF, (b)|M_ZERO) + +static inline __attribute__((const)) +unsigned long roundup_pow_of_two(unsigned long n) +{ + return 1UL << flsl(n - 1); +} + +#define PAGE_ALIGN(x) roundup2((x), PAGE_SIZE) + #endif ==== //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_provider.h#2 (text+ko) ==== @@ -69,12 +69,7 @@ struct t3_cq cq; spinlock_t lock; atomic_t refcnt; -#ifdef notyet - /* - * replace with a condition variable - */ - wait_queue_head_t wait; -#endif + struct cv wait; u32 __user *user_rptr_addr; }; @@ -132,16 +127,9 @@ struct t3_wq wq; spinlock_t lock; atomic_t refcnt; -#ifdef notyet - /* - * CV - */ - wait_queue_head_t wait; -#endif + struct cv wait; enum IWCH_QP_FLAGS flags; -#ifdef notyet - struct timer_list timer; -#endif + struct callout timer; }; static inline int qp_quiesced(struct iwch_qp *qhp) From owner-p4-projects@FreeBSD.ORG Sat Oct 20 19:59:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05FD016A4A5; Sat, 20 Oct 2007 19:59: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 8850316A477 for ; Sat, 20 Oct 2007 19:59:29 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C85D313C46B for ; Sat, 20 Oct 2007 19:57:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KJvrKf042904 for ; Sat, 20 Oct 2007 19:57:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KJvrC3042901 for perforce@freebsd.org; Sat, 20 Oct 2007 19:57:53 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 19:57:53 GMT Message-Id: <200710201957.l9KJvrC3042901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127836 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, 20 Oct 2007 19:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=127836 Change 127836 by kmacy@kmacy_home:ethng on 2007/10/20 19:56:54 compile ported iwch_provider.c Affected files ... .. //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#4 edit Differences ... ==== //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#4 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: ${IW_CXGB} ${CXGB}/common ${CXGB}/ulp/iw_cxgb KMOD= iw_cxgb -SRCS= iw_cxgb_iwch.c iw_cxgb_iwch_cm.c iw_cxgb_cxio_hal.c +SRCS= iw_cxgb_iwch.c iw_cxgb_iwch_cm.c iw_cxgb_cxio_hal.c iw_cxgb_iwch_provider.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -I${CXGB} -DSMP From owner-p4-projects@FreeBSD.ORG Sat Oct 20 20:25:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 520E116A41B; Sat, 20 Oct 2007 20:25: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 E585416A419 for ; Sat, 20 Oct 2007 20:25:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 96B2D13C480 for ; Sat, 20 Oct 2007 20:25:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KKPNWU045640 for ; Sat, 20 Oct 2007 20:25:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KKPNBh045637 for perforce@freebsd.org; Sat, 20 Oct 2007 20:25:23 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 20:25:23 GMT Message-Id: <200710202025.l9KKPNBh045637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127837 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, 20 Oct 2007 20:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127837 Change 127837 by kmacy@kmacy_home:ethng on 2007/10/20 20:25:08 add iwch_qp.c to build Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_qp.c#1 add .. //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#5 edit Differences ... ==== //depot/projects/ethng/src/sys/modules/cxgb/iw_cxgb/Makefile#5 (text+ko) ==== @@ -4,7 +4,8 @@ .PATH: ${IW_CXGB} ${CXGB}/common ${CXGB}/ulp/iw_cxgb KMOD= iw_cxgb -SRCS= iw_cxgb_iwch.c iw_cxgb_iwch_cm.c iw_cxgb_cxio_hal.c iw_cxgb_iwch_provider.c +SRCS= iw_cxgb_iwch.c iw_cxgb_iwch_cm.c iw_cxgb_cxio_hal.c +SRCS+= iw_cxgb_iwch_provider.c iw_cxgb_iwch_qp.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -I${CXGB} -DSMP From owner-p4-projects@FreeBSD.ORG Sat Oct 20 20:30:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07BBC16A41A; Sat, 20 Oct 2007 20:30: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 8EAE016A420 for ; Sat, 20 Oct 2007 20:30:29 +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 5B66913C455 for ; Sat, 20 Oct 2007 20:30:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KKUT0x051006 for ; Sat, 20 Oct 2007 20:30:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KKUTUh051003 for perforce@freebsd.org; Sat, 20 Oct 2007 20:30:29 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 20:30:29 GMT Message-Id: <200710202030.l9KKUTUh051003@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 127839 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, 20 Oct 2007 20:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=127839 Change 127839 by jb@jb_freebsd1 on 2007/10/20 20:29:53 Add the sys OpenSolaris bits. Affected files ... .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/acl/acl_common.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/acl/acl_common.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/avl/avl.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_decl.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_error.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/common/ctf/ctf_util.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/bitmap.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/kmem.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/mman.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/objfs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/processor.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/synch.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/vmem.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/Makefile.files#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/os/callb.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/os/list.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/os/taskq.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/avl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/callb.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cmn_err.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/compress.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cred.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/debug.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/fasttrap.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/list.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/note.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/processor.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/procset.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sdt_impl.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/synch.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 20:44:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C020E16A468; Sat, 20 Oct 2007 20:44: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 66AAF16A419 for ; Sat, 20 Oct 2007 20:44:45 +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 53AEE13C447 for ; Sat, 20 Oct 2007 20:44:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KKij53051822 for ; Sat, 20 Oct 2007 20:44:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KKijqv051819 for perforce@freebsd.org; Sat, 20 Oct 2007 20:44:45 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 20:44:45 GMT Message-Id: <200710202044.l9KKijqv051819@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 127841 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, 20 Oct 2007 20:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=127841 Change 127841 by jb@jb_freebsd1 on 2007/10/20 20:44:13 Hook the DTrace build infrastructure in. Affected files ... .. //depot/projects/dtrace6/src/Makefile.inc1#2 edit Differences ... ==== //depot/projects/dtrace6/src/Makefile.inc1#2 (text+ko) ==== @@ -21,6 +21,7 @@ # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update +# -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # TARGET="machine" to crossbuild world for a different machine type @@ -49,6 +50,11 @@ .if !defined(NO_GAMES) SUBDIR+=games .endif +.if !define(NO_CDDL) +SUBDIR+=cddl +.else +NO_CTF=1 +.endif SUBDIR+=gnu .if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) SUBDIR+=kerberos5 @@ -104,6 +110,11 @@ .endif .endif +.if !defined(VERSION) +VERSION!= uname -srp +VERSION+= ${OSRELDATE} +.endif + # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) TARGET_ARCH= ${TARGET:S/pc98/i386/} @@ -203,20 +214,22 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ + VERSION="${VERSION}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \ - -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS + -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -226,8 +239,12 @@ # world stage WMAKEENV= ${CROSSENV} \ _SHLIBDIRPREFIX=${WORLDTMP} \ + VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} +.if define(NO_CDDL) +WMAKEENV+= NO_CTF=1 +.endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" @@ -247,6 +264,7 @@ # Yes, the flags are redundant. LIB32WMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + VERSION="${VERSION}" \ MACHINE=i386 \ MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -433,6 +451,9 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} +.if !define(NO_CDDL) + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} +.endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} .if !defined(NO_CRYPT) cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t} @@ -844,8 +865,14 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif +.if !define(NO_CDDL) +_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ + lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge +.endif + bootstrap-tools: .for _tool in \ + ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ ${_groff} \ @@ -998,7 +1025,9 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ +_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libexpat \ + ${_lib_cddl} \ lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libnetgraph lib/libopie lib/libpam \ @@ -1010,6 +1039,10 @@ _generic_libs+= lib +.if !define(NO_CDDL) +_cddl_lib= cddl/lib +.endif + .if !defined(NO_CRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl From owner-p4-projects@FreeBSD.ORG Sat Oct 20 20:52:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 883D316A41A; Sat, 20 Oct 2007 20:52: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 1668A16A417 for ; Sat, 20 Oct 2007 20:52:55 +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 C49AB13C45A for ; Sat, 20 Oct 2007 20:52:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KKqsFR061055 for ; Sat, 20 Oct 2007 20:52:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KKqsVm061052 for perforce@freebsd.org; Sat, 20 Oct 2007 20:52:54 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 20:52:54 GMT Message-Id: <200710202052.l9KKqsVm061052@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 127842 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, 20 Oct 2007 20:52:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=127842 Change 127842 by jb@jb_freebsd1 on 2007/10/20 20:52:33 Merge the CTF conversion make stuff. Affected files ... .. //depot/projects/dtrace6/src/share/mk/bsd.lib.mk#2 edit .. //depot/projects/dtrace6/src/share/mk/bsd.prog.mk#2 edit .. //depot/projects/dtrace6/src/share/mk/bsd.sys.mk#2 edit .. //depot/projects/dtrace6/src/share/mk/sys.mk#2 edit Differences ... ==== //depot/projects/dtrace6/src/share/mk/bsd.lib.mk#2 (text+ko) ==== @@ -59,43 +59,82 @@ .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .c.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.So: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.po: ${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.So: ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .s.po .s.So: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.po: ${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.So: ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .S.po: ${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .S.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif all: objwarn @@ -143,6 +182,9 @@ @${CC} ${LDFLAGS} -shared -Wl,-x \ -o ${.TARGET} -Wl,-soname,${SONAME} \ `lorder ${SOBJS} | tsort -q` ${LDADD} +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} +.endif .endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ==== //depot/projects/dtrace6/src/share/mk/bsd.prog.mk#2 (text+ko) ==== @@ -47,6 +47,9 @@ .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} +.endif .else # !defined(SRCS) @@ -70,6 +73,9 @@ .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} +.endif .endif .endif ==== //depot/projects/dtrace6/src/share/mk/bsd.sys.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.37.2.1 2006/09/13 08:40:40 des Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.41 2007/05/24 21:53:42 obrien Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -51,6 +51,9 @@ # XXX always get it right. CWARNFLAGS += -Wno-uninitialized . endif +. if !defined(WITH_GCC3) +CWARNFLAGS += -Wno-pointer-sign +. endif . endif . if defined(FORMAT_AUDIT) @@ -67,5 +70,9 @@ . endif .endif +.if defined(IGNORE_PRAGMA) +CWARNFLAGS += -Wno-unknown-pragmas +.endif + # Allow user-specified additional warning flags CFLAGS += ${CWARNFLAGS} ==== //depot/projects/dtrace6/src/share/mk/sys.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.86.2.2 2006/11/14 12:05:54 lesi Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.92 2007/08/14 13:44:08 delphij Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -38,8 +38,26 @@ CFLAGS ?= -O2 -fno-strict-aliasing -pipe .endif +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" +NO_CTF= 1 +.endif + +# C Type Format data is required for DTrace +CTFFLAGS ?= -L VERSION + +.if !defined(NO_CTF) +CTFCONVERT ?= ctfconvert +CTFMERGE ?= ctfmerge +.if defined(DEBUG_FLAGS) +CTFFLAGS += -g +.else +DEBUG_FLAGS = -g +.endif +AFLAGS += --gdwarf2 +.endif + CXX ?= c++ -CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} +CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} CPP ?= cpp @@ -116,9 +134,15 @@ # SINGLE SUFFIX RULES .c: ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f: ${FC} ${FFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .sh: cp ${.IMPSRC} ${.TARGET} @@ -128,21 +152,33 @@ .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.o: ${FC} ${FFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .y.o: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c y.tab.c rm -f y.tab.c mv y.tab.o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.o: ${LEX} ${LFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c lex.yy.c rm -f lex.yy.c mv lex.yy.o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .y.c: ${YACC} ${YFLAGS} ${.IMPSRC} @@ -180,21 +216,39 @@ .c: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.o: ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .p.o: ${PC} ${PFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .e .r .F .f: ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} \ @@ -205,23 +259,38 @@ .S.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.o: ${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .s.o: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.o: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c y.tab.c -o ${.TARGET} rm -f y.tab.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.o: ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c ${CC} ${CFLAGS} -c ${.PREFIX}.tmp.c -o ${.TARGET} rm -f ${.PREFIX}.tmp.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.c: @@ -233,22 +302,34 @@ .s.out .c.out .o.out: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.out .F.out .r.out .e.out: ${FC} ${EFLAGS} ${RFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} \ ${LDLIBS} -o ${.TARGET} rm -f ${.PREFIX}.o +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.out: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET} rm -f y.tab.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.out: ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} rm -f ${.PREFIX}.tmp.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. __MAKE_CONF?=/etc/make.conf From owner-p4-projects@FreeBSD.ORG Sat Oct 20 20:59:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31EA416A419; Sat, 20 Oct 2007 20:59: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 DB98C16A417 for ; Sat, 20 Oct 2007 20:59:01 +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 B2B6713C457 for ; Sat, 20 Oct 2007 20:59:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KKx1Gf061222 for ; Sat, 20 Oct 2007 20:59:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KKx1dj061219 for perforce@freebsd.org; Sat, 20 Oct 2007 20:59:01 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 20:59:01 GMT Message-Id: <200710202059.l9KKx1dj061219@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 127843 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, 20 Oct 2007 20:59:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=127843 Change 127843 by jb@jb_freebsd1 on 2007/10/20 20:58:42 Suck the cyclic include files that remain firmly under the CDDL. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 21:03:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A3116A47B; Sat, 20 Oct 2007 21: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 5BF2816A473 for ; Sat, 20 Oct 2007 21:03:51 +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 CAE1813C474 for ; Sat, 20 Oct 2007 21:01:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KL13IF061475 for ; Sat, 20 Oct 2007 21:01:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KL13Mu061472 for perforce@freebsd.org; Sat, 20 Oct 2007 21:01:03 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 21:01:03 GMT Message-Id: <200710202101.l9KL13Mu061472@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 127844 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, 20 Oct 2007 21:03:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=127844 Change 127844 by jb@jb_freebsd1 on 2007/10/20 21:00:20 Add the cyclic headers that remain firmly under the CDDL. Affected files ... .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cyclic_impl.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 21:05:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEE5D16A41B; Sat, 20 Oct 2007 21:05: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 94F6416A417 for ; Sat, 20 Oct 2007 21:05:08 +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 6BB5113C457 for ; Sat, 20 Oct 2007 21:05:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KL58Fc062821 for ; Sat, 20 Oct 2007 21:05:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KL58mc062818 for perforce@freebsd.org; Sat, 20 Oct 2007 21:05:08 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 21:05:08 GMT Message-Id: <200710202105.l9KL58mc062818@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 127845 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, 20 Oct 2007 21:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=127845 Change 127845 by jb@jb_freebsd1 on 2007/10/20 21:04:47 Suck in two more files that also remain under the CDDL. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 21:06:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D8AF16A420; Sat, 20 Oct 2007 21:06: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 C763D16A41A for ; Sat, 20 Oct 2007 21:06:09 +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 9F0AE13C45B for ; Sat, 20 Oct 2007 21:06:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KL69Ka062890 for ; Sat, 20 Oct 2007 21:06:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KL69W9062887 for perforce@freebsd.org; Sat, 20 Oct 2007 21:06:09 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 21:06:09 GMT Message-Id: <200710202106.l9KL69W9062887@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 127846 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, 20 Oct 2007 21:06:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=127846 Change 127846 by jb@jb_freebsd1 on 2007/10/20 21:05:57 Add two more files that also remain under the CDDL. Affected files ... .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cpupart.h#1 add .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 21:59:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E85E016A41B; Sat, 20 Oct 2007 21:59: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 80DA716A419 for ; Sat, 20 Oct 2007 21:59:06 +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 6D9B213C447 for ; Sat, 20 Oct 2007 21:59:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KLx60n065889 for ; Sat, 20 Oct 2007 21:59:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KLx6aL065884 for perforce@freebsd.org; Sat, 20 Oct 2007 21:59:06 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 21:59:06 GMT Message-Id: <200710202159.l9KLx6aL065884@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 127847 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, 20 Oct 2007 21:59:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=127847 Change 127847 by jb@jb_freebsd1 on 2007/10/20 21:58:23 Avoid including stuff which is very Solaris-specific. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 (text) ==== @@ -35,8 +35,17 @@ #ifndef _ASM #include +#if defined(sun) #include #include +#else +#ifdef _KERNEL +#include +typepdef struct pcpu cpu_t; +#else +#define cpu_t void +#endif +#endif #endif /* !_ASM */ #define CY_LOW_LEVEL 0 From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:00:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27A0F16A41A; Sat, 20 Oct 2007 22:00: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 AC2C916A419 for ; Sat, 20 Oct 2007 22:00:07 +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 9A30013C442 for ; Sat, 20 Oct 2007 22:00:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KM07ah065987 for ; Sat, 20 Oct 2007 22:00:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KM07pp065984 for perforce@freebsd.org; Sat, 20 Oct 2007 22:00:07 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:00:07 GMT Message-Id: <200710202200.l9KM07pp065984@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 127848 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, 20 Oct 2007 22:00:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=127848 Change 127848 by jb@jb_freebsd1 on 2007/10/20 21:59:15 Avoid including stuff which is very Solaris-specific. Affected files ... .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 edit Differences ... ==== //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 (text+ko) ==== @@ -35,8 +35,17 @@ #ifndef _ASM #include +#if defined(sun) #include #include +#else +#ifdef _KERNEL +#include +typepdef struct pcpu cpu_t; +#else +#define cpu_t void +#endif +#endif #endif /* !_ASM */ #define CY_LOW_LEVEL 0 From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:03:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 106C216A41B; Sat, 20 Oct 2007 22:03: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 B81A916A418 for ; Sat, 20 Oct 2007 22:03:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56CC613C45A for ; Sat, 20 Oct 2007 22:03:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KM3BNF067425 for ; Sat, 20 Oct 2007 22:03:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KM3B3Y067408 for perforce@freebsd.org; Sat, 20 Oct 2007 22:03:11 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 20 Oct 2007 22:03:11 GMT Message-Id: <200710202203.l9KM3B3Y067408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127849 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, 20 Oct 2007 22:03:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=127849 Change 127849 by kmacy@kmacy_home:ethng on 2007/10/20 22:02:10 make mbuf ring a generic ring buffer for pointers Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#25 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#27 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#25 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#15 edit .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#34 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#25 (text+ko) ==== @@ -276,11 +276,11 @@ bus_dma_tag_t entry_tag; struct mbuf_head sendq; /* - * cleanq should really be an mbuf_ring to avoid extra + * cleanq should really be an buf_ring to avoid extra * mbuf touches */ struct mbuf_head cleanq; - struct mbuf_ring txq_mr; + struct buf_ring txq_mr; struct mbuf *immpkt; uint32_t txq_drops; uint32_t txq_skipped; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#27 (text+ko) ==== @@ -221,7 +221,7 @@ "use a single queue-set per port"); #ifndef IFNET_MULTIQUEUE -int cxgb_txq_mbuf_ring_size = 0; +int cxgb_txq_buf_ring_size = 0; #endif enum { ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_multiq.c#25 (text+ko) ==== @@ -103,9 +103,9 @@ SYSCTL_UINT(_hw_cxgb, OID_AUTO, sleep_ticks, CTLFLAG_RDTUN, &sleep_ticks, 0, "ticks to sleep between checking pcpu queues"); -int cxgb_txq_mbuf_ring_size = TX_ETH_Q_SIZE; -TUNABLE_INT("hw.cxgb.txq_mr_size", &cxgb_txq_mbuf_ring_size); -SYSCTL_UINT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_mbuf_ring_size, 0, +int cxgb_txq_buf_ring_size = TX_ETH_Q_SIZE; +TUNABLE_INT("hw.cxgb.txq_mr_size", &cxgb_txq_buf_ring_size); +SYSCTL_UINT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0, "size of per-queue mbuf ring"); @@ -117,7 +117,7 @@ cxgb_pcpu_enqueue_packet_(struct sge_qset *qs, struct mbuf *m) { struct sge_txq *txq; - struct mbuf_ring *mr; + struct buf_ring *mr; int prod, cons, mask; int err = 0; @@ -133,9 +133,9 @@ prod = mr->mr_prod; mask = mr->mr_size - 1; if (((prod + 1) & mask) != cons) { - mr->mr_ring[prod] = m; + mr->mr_ring[prod] = (caddr_t)m; + mb(); mr->mr_prod = (prod + 1) & mask; - mb(); } else { txq->txq_drops++; err = ENOBUFS; @@ -176,7 +176,7 @@ struct sge_qset *qs; int count, size, coalesced; struct adapter *sc; - struct mbuf_ring *mr; + struct buf_ring *mr; mr = &txq->txq_mr; coalesced = count = size = 0; @@ -193,7 +193,7 @@ } sc = qs->port->adapter; - m = mbuf_ring_dequeue(mr); + m = buf_ring_dequeue(mr); if (m == NULL) return (0); @@ -204,12 +204,12 @@ } count = 1; size = m->m_pkthdr.len; - for (m = mbuf_ring_peek(mr); m != NULL; m = mbuf_ring_peek(mr)) { + for (m = buf_ring_peek(mr); m != NULL; m = buf_ring_peek(mr)) { if (m->m_pkthdr.tso_segsz > 0 || size + m->m_pkthdr.len > TX_WR_SIZE_MAX || m->m_next != NULL) break; - mbuf_ring_dequeue(mr); + buf_ring_dequeue(mr); size += m->m_pkthdr.len; m_vec[count++] = m; @@ -360,7 +360,7 @@ while ((m = mbufq_dequeue(&txq->sendq)) != NULL) m_freem(m); - while ((m = mbuf_ring_dequeue(&txq->txq_mr)) != NULL) + while ((m = buf_ring_dequeue(&txq->txq_mr)) != NULL) m_freem(m); t3_free_tx_desc_all(txq); @@ -412,7 +412,7 @@ else { txq = &qs->txq[TXQ_ETH]; - if (!mbuf_ring_empty(&txq->txq_mr)) + if (!buf_ring_empty(&txq->txq_mr)) initerr = cxgb_pcpu_enqueue_packet_(qs, immpkt); else txq->immpkt = immpkt; @@ -442,11 +442,11 @@ } stopped = isset(&qs->txq_stopped, TXQ_ETH); - flush = ((!mbuf_ring_empty(&txq->txq_mr) && !stopped) || txq->immpkt); + flush = ((!buf_ring_empty(&txq->txq_mr) && !stopped) || txq->immpkt); max_desc = tx_flush ? TX_ETH_Q_SIZE : TX_START_MAX_DESC; err = flush ? cxgb_tx_common(qs->port->ifp, qs, max_desc) : ENOSPC; - if ((tx_flush && flush && err == 0) && !mbuf_ring_empty(&txq->txq_mr)) { + if ((tx_flush && flush && err == 0) && !buf_ring_empty(&txq->txq_mr)) { struct thread *td = curthread; if (++i > 1) { @@ -492,11 +492,11 @@ txq = &qs->txq[TXQ_ETH]; - if (((sc->tunq_coalesce == 0) || (mbuf_ring_count(&txq->txq_mr) > TX_WR_COUNT_MAX)) && mtx_trylock(&txq->lock)) { + if (((sc->tunq_coalesce == 0) || (buf_ring_count(&txq->txq_mr) > TX_WR_COUNT_MAX)) && mtx_trylock(&txq->lock)) { txq->flags |= TXQ_TRANSMITTING; err = cxgb_pcpu_start_(qs, immpkt, FALSE); txq->flags &= ~TXQ_TRANSMITTING; - resid = (mbuf_ring_count(&txq->txq_mr) > 64) || (desc_reclaimable(txq) > 64); + resid = (buf_ring_count(&txq->txq_mr) > 64) || (desc_reclaimable(txq) > 64); mtx_unlock(&txq->lock); } else if (immpkt) err = cxgb_pcpu_enqueue_packet_(qs, immpkt); @@ -586,7 +586,7 @@ if ((qs->port->ifp->if_drv_flags && IFF_DRV_RUNNING) == 0) { idleticks = hz; - if (!mbuf_ring_empty(&txq->txq_mr) || + if (!buf_ring_empty(&txq->txq_mr) || !mbufq_empty(&txq->sendq)) cxgb_pcpu_free(qs); goto done; @@ -610,7 +610,7 @@ mtx_unlock(&qs->rspq.lock); } - if ((!mbuf_ring_empty(&txq->txq_mr)) && err == 0) { + if ((!buf_ring_empty(&txq->txq_mr)) && err == 0) { if (cxgb_debug) printf("head=%p cons=%d prod=%d\n", txq->sendq.head, txq->txq_mr.mr_cons, ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_osdep.h#15 (text+ko) ==== @@ -161,8 +161,8 @@ #define L1_CACHE_BYTES 32 #endif -struct mbuf_ring { - struct mbuf **mr_ring; +struct buf_ring { + caddr_t *mr_ring; volatile uint32_t mr_cons; volatile uint32_t mr_prod; int mr_size; @@ -170,7 +170,7 @@ }; static __inline int -mbuf_ring_count(struct mbuf_ring *mr) +buf_ring_count(struct buf_ring *mr) { int size = mr->mr_size; int mask = size - 1; @@ -179,18 +179,23 @@ } static __inline int -mbuf_ring_empty(struct mbuf_ring *mr) +buf_ring_empty(struct buf_ring *mr) { return (mr->mr_cons == mr->mr_prod); } -static __inline struct mbuf * -mbuf_ring_dequeue(struct mbuf_ring *mr) +/* + * The producer and consumer are independently locked + * this relies on the consumer providing his own serialization + * + */ +static __inline void * +buf_ring_dequeue(struct buf_ring *mr) { int prod, cons, mask; - struct mbuf **ring, *m; + caddr_t *ring, m; - ring = mr->mr_ring; + ring = (caddr_t *)mr->mr_ring; mask = mr->mr_size - 1; cons = mr->mr_cons; prod = mr->mr_prod; @@ -200,17 +205,49 @@ mr->mr_cons = (cons + 1) & mask; mb(); } + return (m); +} + - return (m); +static __inline int +__buf_ring_enqueue(struct buf_ring *mr, void *m) +{ + + int prod, cons, mask, err; + + cons = mr->mr_cons; + prod = mr->mr_prod; + mask = mr->mr_size - 1; + if (((prod + 1) & mask) != cons) { + mr->mr_ring[prod] = m; + mb(); + mr->mr_prod = (prod + 1) & mask; + err = 0; + } else + err = ENOBUFS; + + return (err); +} + +static __inline int +buf_ring_enqueue(struct buf_ring *mr, void *m) +{ + int err; + + mtx_lock(&mr->mr_lock); + err = __buf_ring_enqueue(mr, m); + mtx_unlock(&mr->mr_lock); + + return (err); } -static __inline struct mbuf * -mbuf_ring_peek(struct mbuf_ring *mr) +static __inline void * +buf_ring_peek(struct buf_ring *mr) { int prod, cons, mask; - struct mbuf **ring, *m; + caddr_t *ring, m; - ring = mr->mr_ring; + ring = (caddr_t *)mr->mr_ring; mask = mr->mr_size - 1; cons = mr->mr_cons; prod = mr->mr_prod; ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#34 (text+ko) ==== @@ -74,7 +74,7 @@ #ifndef DISABLE_MBUF_IOVEC static int recycle_enable = 1; #endif -extern int cxgb_txq_mbuf_ring_size; +extern int cxgb_txq_buf_ring_size; int cxgb_cached_allocations; int cxgb_cached; int cxgb_ext_freed; @@ -2259,13 +2259,13 @@ int i, ret = 0; for (i = 0; i < SGE_TXQ_PER_SET; i++) { - if ((q->txq[i].txq_mr.mr_ring = malloc(cxgb_txq_mbuf_ring_size*sizeof(struct mbuf *), + if ((q->txq[i].txq_mr.mr_ring = malloc(cxgb_txq_buf_ring_size*sizeof(struct mbuf *), M_DEVBUF, M_WAITOK|M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate mbuf ring\n"); goto err; } q->txq[i].txq_mr.mr_prod = q->txq[i].txq_mr.mr_cons = 0; - q->txq[i].txq_mr.mr_size = cxgb_txq_mbuf_ring_size; + q->txq[i].txq_mr.mr_size = cxgb_txq_buf_ring_size; mtx_init(&q->txq[i].txq_mr.mr_lock, "txq mbuf ring", NULL, MTX_DEF); } From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:05:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B57716A41B; Sat, 20 Oct 2007 22:05: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 ABD1116A418 for ; Sat, 20 Oct 2007 22:05:13 +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 98D0313C455 for ; Sat, 20 Oct 2007 22:05:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KM5Dv3067526 for ; Sat, 20 Oct 2007 22:05:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KM5Dgr067523 for perforce@freebsd.org; Sat, 20 Oct 2007 22:05:13 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:05:13 GMT Message-Id: <200710202205.l9KM5Dgr067523@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 127850 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, 20 Oct 2007 22:05:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=127850 Change 127850 by jb@jb_freebsd1 on 2007/10/20 22:04:17 I plan to create a BSD libproc based on extensions to FreeBSD's ptrace rather than using procfs like Sun does. I won't be using the Solaris libproc API because I can't get Sun to release the whole thing un-encumbered. I'll then hack libdtrace to use our API. For the time being, this library code is just an incomplete hack to allow the working part of DTrace to operate. Expect it to be deleted. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.c#2 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Psymtab.c#2 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/Putil.c#2 edit .. //depot/projects/dtrace/src/cddl/lib/libproc/libproc.h#2 edit .. //depot/projects/dtrace6/src/cddl/lib/libproc/Pcontrol.c#2 edit .. //depot/projects/dtrace6/src/cddl/lib/libproc/Psymtab.c#2 edit .. //depot/projects/dtrace6/src/cddl/lib/libproc/Putil.c#2 edit .. //depot/projects/dtrace6/src/cddl/lib/libproc/libproc.h#2 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libproc/Pcontrol.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace/src/cddl/lib/libproc/Psymtab.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace/src/cddl/lib/libproc/Putil.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace/src/cddl/lib/libproc/libproc.h#2 (text+ko) ==== @@ -38,7 +38,110 @@ * rather than using 'procfs' like on Solaris. */ -#include +#include + +/* + * Control codes (long values) for messages written to ctl and lwpctl files. + */ +#define PCNULL 0L /* null request, advance to next message */ +#define PCSTOP 1L /* direct process or lwp to stop and wait for stop */ +#define PCDSTOP 2L /* direct process or lwp to stop */ +#define PCWSTOP 3L /* wait for process or lwp to stop, no timeout */ +#define PCTWSTOP 4L /* wait for stop, with long millisecond timeout arg */ +#define PCRUN 5L /* make process/lwp runnable, w/ long flags argument */ +#define PCCSIG 6L /* clear current signal from lwp */ +#define PCCFAULT 7L /* clear current fault from lwp */ +#define PCSSIG 8L /* set current signal from siginfo_t argument */ +#define PCKILL 9L /* post a signal to process/lwp, long argument */ +#define PCUNKILL 10L /* delete a pending signal from process/lwp, long arg */ +#define PCSHOLD 11L /* set lwp signal mask from sigset_t argument */ +#define PCSTRACE 12L /* set traced signal set from sigset_t argument */ +#define PCSFAULT 13L /* set traced fault set from fltset_t argument */ +#define PCSENTRY 14L /* set traced syscall entry set from sysset_t arg */ +#define PCSEXIT 15L /* set traced syscall exit set from sysset_t arg */ +#define PCSET 16L /* set modes from long argument */ +#define PCUNSET 17L /* unset modes from long argument */ +#define PCSREG 18L /* set lwp general registers from prgregset_t arg */ +#define PCSFPREG 19L /* set lwp floating-point registers from prfpregset_t */ +#define PCSXREG 20L /* set lwp extra registers from prxregset_t arg */ +#define PCNICE 21L /* set nice priority from long argument */ +#define PCSVADDR 22L /* set %pc virtual address from long argument */ +#define PCWATCH 23L /* set/unset watched memory area from prwatch_t arg */ +#define PCAGENT 24L /* create agent lwp with regs from prgregset_t arg */ +#define PCREAD 25L /* read from the address space via priovec_t arg */ +#define PCWRITE 26L /* write to the address space via priovec_t arg */ +#define PCSCRED 27L /* set process credentials from prcred_t argument */ +#define PCSASRS 28L /* set ancillary state registers from asrset_t arg */ +#define PCSPRIV 29L /* set process privileges from prpriv_t argument */ +#define PCSZONE 30L /* set zoneid from zoneid_t argument */ +#define PCSCREDX 31L /* as PCSCRED but with supplemental groups */ +/* + * PCRUN long operand flags. + */ +#define PRCSIG 0x01 /* clear current signal, if any */ +#define PRCFAULT 0x02 /* clear current fault, if any */ +#define PRSTEP 0x04 /* direct the lwp to single-step */ +#define PRSABORT 0x08 /* abort syscall, if in syscall */ +#define PRSTOP 0x10 /* set directed stop request */ + +typedef struct reg prgregset_t; +typedef struct fpreg prfpregset_t; + +typedef struct lwpstatus { + id_t pr_lwpid; /* lwp id */ + int pr_flags; /* flags */ + int pr_errno; /* errno for failed syscall, 0 if successful */ + short pr_why; /* reason for lwp stop, if stopped */ + short pr_what; /* more detailed reason */ + short pr_cursig; /* current signal, if any */ + prgregset_t + pr_reg; /* general registers */ + prfpregset_t + pr_fpreg; /* floating-point registers */ +} lwpstatus_t; + +typedef struct pstatus { + int pr_flags; /* flags (see below) */ +#define PR_STOPPED 0x00000001 /* lwp is stopped */ +#define PR_ISTOP 0x00000002 /* lwp is stopped on an event of interest */ +#define PR_DSTOP 0x00000004 /* lwp has a stop directive in effect */ +#define PR_STEP 0x00000008 /* lwp has a single-step directive in effect */ +#define PR_ASLEEP 0x00000010 /* lwp is sleeping in a system call */ +#define PR_PCINVAL 0x00000020 /* contents of pr_instr undefined */ +#define PR_ASLWP 0x00000040 /* obsolete flag; never set */ +#define PR_AGENT 0x00000080 /* this lwp is the /proc agent lwp */ +#define PR_DETACH 0x00000100 /* this is a detached lwp */ +#define PR_DAEMON 0x00000200 /* this is a daemon lwp */ +/* The following flags apply to the process, not to an individual lwp */ +#define PR_ISSYS 0x00001000 /* this is a system process */ +#define PR_VFORKP 0x00002000 /* process is the parent of a vfork()d child */ +#define PR_ORPHAN 0x00004000 /* process's process group is orphaned */ +/* The following process flags are modes settable by PCSET/PCUNSET */ +#define PR_FORK 0x00100000 /* inherit-on-fork is in effect */ +#define PR_RLC 0x00200000 /* run-on-last-close is in effect */ +#define PR_KLC 0x00400000 /* kill-on-last-close is in effect */ +#define PR_ASYNC 0x00800000 /* asynchronous-stop is in effect */ +#define PR_MSACCT 0x01000000 /* micro-state usage accounting is in effect */ +#define PR_BPTADJ 0x02000000 /* breakpoint trap pc adjustment is in effect */ +#define PR_PTRACE 0x04000000 /* ptrace-compatibility mode is in effect */ +#define PR_MSFORK 0x08000000 /* micro-state accounting inherited on fork */ +#define PR_IDLE 0x10000000 /* lwp is a cpu's idle thread */ + pid_t pr_pid; /* Process ID. */ + lwpstatus_t + pr_lwp; /* Status of the representative lwp.*/ +} pstatus_t; + +/* + * Reasons for stopping (pr_why). + */ +#define PR_REQUESTED 1 +#define PR_SIGNALLED 2 +#define PR_SYSENTRY 3 +#define PR_SYSEXIT 4 +#define PR_JOBCONTROL 5 +#define PR_FAULTED 6 +#define PR_SUSPENDED 7 +#define PR_CHECKPOINT 8 extern int _libproc_debug; /* set non-zero to enable debugging fprintfs */ ==== //depot/projects/dtrace6/src/cddl/lib/libproc/Pcontrol.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace6/src/cddl/lib/libproc/Psymtab.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace6/src/cddl/lib/libproc/Putil.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include +#ifdef DOODAD #include +#endif #include #include #include ==== //depot/projects/dtrace6/src/cddl/lib/libproc/libproc.h#2 (text+ko) ==== @@ -38,7 +38,110 @@ * rather than using 'procfs' like on Solaris. */ -#include +#include + +/* + * Control codes (long values) for messages written to ctl and lwpctl files. + */ +#define PCNULL 0L /* null request, advance to next message */ +#define PCSTOP 1L /* direct process or lwp to stop and wait for stop */ +#define PCDSTOP 2L /* direct process or lwp to stop */ +#define PCWSTOP 3L /* wait for process or lwp to stop, no timeout */ +#define PCTWSTOP 4L /* wait for stop, with long millisecond timeout arg */ +#define PCRUN 5L /* make process/lwp runnable, w/ long flags argument */ +#define PCCSIG 6L /* clear current signal from lwp */ +#define PCCFAULT 7L /* clear current fault from lwp */ +#define PCSSIG 8L /* set current signal from siginfo_t argument */ +#define PCKILL 9L /* post a signal to process/lwp, long argument */ +#define PCUNKILL 10L /* delete a pending signal from process/lwp, long arg */ +#define PCSHOLD 11L /* set lwp signal mask from sigset_t argument */ +#define PCSTRACE 12L /* set traced signal set from sigset_t argument */ +#define PCSFAULT 13L /* set traced fault set from fltset_t argument */ +#define PCSENTRY 14L /* set traced syscall entry set from sysset_t arg */ +#define PCSEXIT 15L /* set traced syscall exit set from sysset_t arg */ +#define PCSET 16L /* set modes from long argument */ +#define PCUNSET 17L /* unset modes from long argument */ +#define PCSREG 18L /* set lwp general registers from prgregset_t arg */ +#define PCSFPREG 19L /* set lwp floating-point registers from prfpregset_t */ +#define PCSXREG 20L /* set lwp extra registers from prxregset_t arg */ +#define PCNICE 21L /* set nice priority from long argument */ +#define PCSVADDR 22L /* set %pc virtual address from long argument */ +#define PCWATCH 23L /* set/unset watched memory area from prwatch_t arg */ +#define PCAGENT 24L /* create agent lwp with regs from prgregset_t arg */ +#define PCREAD 25L /* read from the address space via priovec_t arg */ +#define PCWRITE 26L /* write to the address space via priovec_t arg */ +#define PCSCRED 27L /* set process credentials from prcred_t argument */ +#define PCSASRS 28L /* set ancillary state registers from asrset_t arg */ +#define PCSPRIV 29L /* set process privileges from prpriv_t argument */ +#define PCSZONE 30L /* set zoneid from zoneid_t argument */ +#define PCSCREDX 31L /* as PCSCRED but with supplemental groups */ +/* + * PCRUN long operand flags. + */ +#define PRCSIG 0x01 /* clear current signal, if any */ +#define PRCFAULT 0x02 /* clear current fault, if any */ +#define PRSTEP 0x04 /* direct the lwp to single-step */ +#define PRSABORT 0x08 /* abort syscall, if in syscall */ +#define PRSTOP 0x10 /* set directed stop request */ + +typedef struct reg prgregset_t; +typedef struct fpreg prfpregset_t; + +typedef struct lwpstatus { + id_t pr_lwpid; /* lwp id */ + int pr_flags; /* flags */ + int pr_errno; /* errno for failed syscall, 0 if successful */ + short pr_why; /* reason for lwp stop, if stopped */ + short pr_what; /* more detailed reason */ + short pr_cursig; /* current signal, if any */ + prgregset_t + pr_reg; /* general registers */ + prfpregset_t + pr_fpreg; /* floating-point registers */ +} lwpstatus_t; + +typedef struct pstatus { + int pr_flags; /* flags (see below) */ +#define PR_STOPPED 0x00000001 /* lwp is stopped */ +#define PR_ISTOP 0x00000002 /* lwp is stopped on an event of interest */ +#define PR_DSTOP 0x00000004 /* lwp has a stop directive in effect */ +#define PR_STEP 0x00000008 /* lwp has a single-step directive in effect */ +#define PR_ASLEEP 0x00000010 /* lwp is sleeping in a system call */ +#define PR_PCINVAL 0x00000020 /* contents of pr_instr undefined */ +#define PR_ASLWP 0x00000040 /* obsolete flag; never set */ +#define PR_AGENT 0x00000080 /* this lwp is the /proc agent lwp */ +#define PR_DETACH 0x00000100 /* this is a detached lwp */ +#define PR_DAEMON 0x00000200 /* this is a daemon lwp */ +/* The following flags apply to the process, not to an individual lwp */ +#define PR_ISSYS 0x00001000 /* this is a system process */ +#define PR_VFORKP 0x00002000 /* process is the parent of a vfork()d child */ +#define PR_ORPHAN 0x00004000 /* process's process group is orphaned */ +/* The following process flags are modes settable by PCSET/PCUNSET */ +#define PR_FORK 0x00100000 /* inherit-on-fork is in effect */ +#define PR_RLC 0x00200000 /* run-on-last-close is in effect */ +#define PR_KLC 0x00400000 /* kill-on-last-close is in effect */ +#define PR_ASYNC 0x00800000 /* asynchronous-stop is in effect */ +#define PR_MSACCT 0x01000000 /* micro-state usage accounting is in effect */ +#define PR_BPTADJ 0x02000000 /* breakpoint trap pc adjustment is in effect */ +#define PR_PTRACE 0x04000000 /* ptrace-compatibility mode is in effect */ +#define PR_MSFORK 0x08000000 /* micro-state accounting inherited on fork */ +#define PR_IDLE 0x10000000 /* lwp is a cpu's idle thread */ + pid_t pr_pid; /* Process ID. */ + lwpstatus_t + pr_lwp; /* Status of the representative lwp.*/ +} pstatus_t; + +/* + * Reasons for stopping (pr_why). + */ +#define PR_REQUESTED 1 +#define PR_SIGNALLED 2 +#define PR_SYSENTRY 3 +#define PR_SYSEXIT 4 +#define PR_JOBCONTROL 5 +#define PR_FAULTED 6 +#define PR_SUSPENDED 7 +#define PR_CHECKPOINT 8 extern int _libproc_debug; /* set non-zero to enable debugging fprintfs */ From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:13:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FE0F16A468; Sat, 20 Oct 2007 22:13: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 0361B16A418 for ; Sat, 20 Oct 2007 22:13:24 +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 E4D8913C461 for ; Sat, 20 Oct 2007 22:13:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMDMVT067993 for ; Sat, 20 Oct 2007 22:13:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMDMNx067990 for perforce@freebsd.org; Sat, 20 Oct 2007 22:13:22 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:13:22 GMT Message-Id: <200710202213.l9KMDMNx067990@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 127851 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, 20 Oct 2007 22:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127851 Change 127851 by jb@jb_freebsd1 on 2007/10/20 22:12:59 Add a Solaris compatibility header. Affected files ... .. //depot/projects/dtrace/src/include/Makefile#12 edit .. //depot/projects/dtrace6/src/include/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/include/Makefile#12 (text+ko) ==== @@ -7,8 +7,8 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa gssapi protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ - db.h \ +INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h \ + ctype.h db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ fts.h ftw.h getopt.h glob.h grp.h gssapi.h \ histedit.h ieeefp.h ifaddrs.h \ ==== //depot/projects/dtrace6/src/include/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \ - db.h \ +INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h + ctype.h db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ fts.h ftw.h getopt.h glob.h grp.h \ hesiod.h histedit.h ieeefp.h ifaddrs.h \ From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:18:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 007C216A468; Sat, 20 Oct 2007 22:18: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 95BC116A420 for ; Sat, 20 Oct 2007 22:18:34 +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 906E713C47E for ; Sat, 20 Oct 2007 22:18:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMIX7e068161 for ; Sat, 20 Oct 2007 22:18:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMIX3L068156 for perforce@freebsd.org; Sat, 20 Oct 2007 22:18:33 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:18:33 GMT Message-Id: <200710202218.l9KMIX3L068156@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 127852 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, 20 Oct 2007 22:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=127852 Change 127852 by jb@jb_freebsd1 on 2007/10/20 22:18:08 Add the Solaris compatibility header. Affected files ... .. //depot/projects/dtrace6/src/include/alloca.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:21:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D59C16A41B; Sat, 20 Oct 2007 22:21: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 2D7AA16A475 for ; Sat, 20 Oct 2007 22:21:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86B4813C457 for ; Sat, 20 Oct 2007 22:21:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMKbnk068326 for ; Sat, 20 Oct 2007 22:20:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMKZto068323 for perforce@freebsd.org; Sat, 20 Oct 2007 22:20:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Oct 2007 22:20:35 GMT Message-Id: <200710202220.l9KMKZto068323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127853 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, 20 Oct 2007 22:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=127853 Change 127853 by rwatson@rwatson_cinnamon on 2007/10/20 22:20:07 automake 1.0, autoconf 2.61. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/aclocal.m4#3 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/config/config.h.in#10 edit .. //depot/projects/trustedbsd/openbsm/config/ltmain.sh#4 edit .. //depot/projects/trustedbsd/openbsm/configure#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#5 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#2 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.in#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,17 +15,13 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#5 $ # -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,18 +35,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ $(top_srcdir)/configure TODO config/config.guess \ config/config.sub config/depcomp config/install-sh \ config/ltmain.sh config/missing -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h CONFIG_CLEAN_FILES = @@ -58,10 +54,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -77,8 +76,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -105,8 +102,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -HAVE_AUDIT_SYSCALLS_FALSE = @HAVE_AUDIT_SYSCALLS_FALSE@ -HAVE_AUDIT_SYSCALLS_TRUE = @HAVE_AUDIT_SYSCALLS_TRUE@ +GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -118,9 +115,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -130,20 +126,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -155,28 +149,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = \ bsm \ libbsm \ @@ -231,7 +236,7 @@ config/config.h: config/stamp-h1 @if test ! -f $@; then \ rm -f config/stamp-h1; \ - $(MAKE) config/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) config/stamp-h1; \ else :; fi config/stamp-h1: $(top_srcdir)/config/config.h.in $(top_builddir)/config.status @@ -253,7 +258,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -286,8 +290,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -389,24 +392,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -420,7 +421,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -428,6 +429,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -435,7 +438,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -510,7 +513,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -580,12 +583,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -606,24 +617,26 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. ==== //depot/projects/trustedbsd/openbsm/aclocal.m4#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL +# serial 51 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -163,6 +168,7 @@ test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld test -z "$LN_S" && LN_S="ln -s" @@ -175,17 +181,17 @@ test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -233,6 +239,9 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER @@ -259,9 +268,10 @@ # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -272,9 +282,10 @@ # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* ])# _LT_LINKER_BOILERPLATE @@ -289,12 +300,20 @@ # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -525,13 +544,17 @@ rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -548,6 +571,9 @@ ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -580,6 +606,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -603,7 +645,7 @@ AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -622,9 +664,9 @@ if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 - if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -644,19 +686,20 @@ # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp - $SED '/^$/d' conftest.err >conftest.er2 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi @@ -731,6 +774,12 @@ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -744,25 +793,39 @@ esac fi ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -775,7 +838,7 @@ # _LT_AC_CHECK_DLFCN -# -------------------- +# ------------------ AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl ])# _LT_AC_CHECK_DLFCN @@ -783,7 +846,7 @@ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ------------------------------------------------------------------ +# --------------------------------------------------------------------- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "$cross_compiling" = yes; then : @@ -849,6 +912,8 @@ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } + else + puts (dlerror ()); exit (status); }] @@ -859,7 +924,7 @@ case x$lt_status in x$lt_dlno_uscore) $1 ;; x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; + x$lt_dlunknown|x*) $3 ;; esac else : # compilation failed @@ -871,7 +936,7 @@ # AC_LIBTOOL_DLOPEN_SELF -# ------------------- +# ---------------------- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl if test "x$enable_dlopen" != xyes; then @@ -942,7 +1007,7 @@ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -955,7 +1020,7 @@ ]) if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl _LT_AC_TRY_DLOPEN_SELF( @@ -987,7 +1052,8 @@ # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -995,7 +1061,7 @@ mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1015,9 +1081,9 @@ then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp - $SED '/^$/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes fi fi @@ -1135,6 +1201,7 @@ darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1152,7 +1219,8 @@ # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1166,20 +1234,58 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1336,12 +1442,8 @@ shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1358,18 +1460,6 @@ dynamic_linker=no ;; -kfreebsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1402,10 +1492,15 @@ shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; - *) # from 3.2 on + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; esac ;; @@ -1465,6 +1560,18 @@ postinstall_cmds='chmod 555 $lib' ;; +interix[[3-9]]*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1508,7 +1615,7 @@ ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1524,7 +1631,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1537,18 +1644,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -knetbsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -1586,6 +1681,7 @@ openbsd*) version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. case $host_os in @@ -1629,11 +1725,8 @@ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH +rdos*) + dynamic_linker=no ;; solaris*) @@ -1661,7 +1754,7 @@ need_version=yes ;; -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +sysv4 | sysv4.3*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -1694,6 +1787,29 @@ fi ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + uts4*) version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -1707,13 +1823,19 @@ esac AC_MSG_RESULT([$dynamic_linker]) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:27:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4174816A420; Sat, 20 Oct 2007 22:27: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 CE70316A41B for ; Sat, 20 Oct 2007 22:27:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6731513C45A for ; Sat, 20 Oct 2007 22:27:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMRl8p068778 for ; Sat, 20 Oct 2007 22:27:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMRlCD068775 for perforce@freebsd.org; Sat, 20 Oct 2007 22:27:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Oct 2007 22:27:47 GMT Message-Id: <200710202227.l9KMRlCD068775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 127855 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, 20 Oct 2007 22:27:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=127855 Change 127855 by rwatson@rwatson_cinnamon on 2007/10/20 22:26:53 The next OpenBSM version will be 1.0. Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#17 edit .. //depot/projects/trustedbsd/openbsm/configure#34 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#36 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#17 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_0_ALPHA_15 +OPENBSM_1_0 ==== //depot/projects/trustedbsd/openbsm/configure#34 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.0alpha15. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.0. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0alpha15' -PACKAGE_STRING='OpenBSM 1.0alpha15' +PACKAGE_VERSION='1.0' +PACKAGE_STRING='OpenBSM 1.0' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1399,7 +1399,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0alpha15 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1469,7 +1469,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0alpha15:";; + short | recursive ) echo "Configuration of OpenBSM 1.0:";; esac cat <<\_ACEOF @@ -1573,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0alpha15 +OpenBSM configure 1.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1587,7 +1587,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0alpha15, which was +It was created by OpenBSM $as_me 1.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -18998,7 +18998,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0alpha15 + VERSION=1.0 cat >>confdefs.h <<_ACEOF @@ -23166,7 +23166,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.0alpha15, which was +This file was extended by OpenBSM $as_me 1.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23219,7 +23219,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0alpha15 +OpenBSM config.status 1.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#36 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.0alpha15], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#35 $]) +AC_INIT([OpenBSM], [1.0], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#36 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:46:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05CCB16A41A; Sat, 20 Oct 2007 22:46: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 9C2D116A418 for ; Sat, 20 Oct 2007 22:46:08 +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 587F713C458 for ; Sat, 20 Oct 2007 22:46:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMk8TC069677 for ; Sat, 20 Oct 2007 22:46:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMk7Na069674 for perforce@freebsd.org; Sat, 20 Oct 2007 22:46:07 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:46:07 GMT Message-Id: <200710202246.l9KMk7Na069674@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 127856 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, 20 Oct 2007 22:46:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=127856 Change 127856 by jb@jb_freebsd1 on 2007/10/20 22:45:39 Solaris compatibility definitions. Affected files ... .. //depot/projects/dtrace/src/sys/sys/param.h#20 edit .. //depot/projects/dtrace6/src/include/elf.h#2 edit .. //depot/projects/dtrace6/src/include/stdlib.h#2 edit .. //depot/projects/dtrace6/src/include/strings.h#2 edit .. //depot/projects/dtrace6/src/sys/sys/fcntl.h#2 edit .. //depot/projects/dtrace6/src/sys/sys/param.h#2 edit .. //depot/projects/dtrace6/src/sys/sys/stat.h#2 edit .. //depot/projects/dtrace6/src/sys/sys/time.h#2 edit .. //depot/projects/dtrace6/src/sys/sys/types.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/param.h#20 (text+ko) ==== @@ -316,7 +316,7 @@ * FreeBSD headers provide to OpenSolaris code. Perhaps one day there * will be a really, really Single Unix Specification. */ -#define __OpenSolaris_version 20060731 +#define __OpenSolaris_version 20071001 #endif #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/dtrace6/src/include/elf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $ + * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ */ /* @@ -38,4 +38,8 @@ #include #include +#ifdef _SOLARIS_C_SOURCE +#include +#endif + #endif /* !_ELF_H_ */ ==== //depot/projects/dtrace6/src/include/stdlib.h#2 (text+ko) ==== @@ -281,6 +281,10 @@ extern char *suboptarg; /* getsubopt(3) external variable */ #endif /* __BSD_VISIBLE */ + +#ifdef _SOLARIS_C_SOURCE +#define getexecname getprogname +#endif __END_DECLS #endif /* !_STDLIB_H_ */ ==== //depot/projects/dtrace6/src/include/strings.h#2 (text+ko) ==== @@ -53,4 +53,8 @@ int strncasecmp(const char *, const char *, size_t) __pure; __END_DECLS +#ifdef _SOLARIS_C_SOURCE +#include +#endif + #endif /* _STRINGS_H_ */ ==== //depot/projects/dtrace6/src/sys/sys/fcntl.h#2 (text+ko) ==== @@ -223,6 +223,15 @@ #if __BSD_VISIBLE int flock(int, int); #endif + +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE + +#define open64 open + +#endif __END_DECLS #endif ==== //depot/projects/dtrace6/src/sys/sys/param.h#2 (text+ko) ==== @@ -327,4 +327,20 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to determine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20071001 +#endif + #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/dtrace6/src/sys/sys/stat.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)stat.h 8.12 (Berkeley) 6/16/95 - * $FreeBSD: src/sys/sys/stat.h,v 1.41 2005/03/22 01:19:18 das Exp $ + * $FreeBSD: src/sys/sys/stat.h,v 1.42 2006/08/04 23:47:30 jb Exp $ */ #ifndef _SYS_STAT_H_ @@ -304,6 +304,14 @@ #endif /* __BSD_VISIBLE */ +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define stat64 stat +#define fstat64 fstat +#endif + #ifndef _KERNEL __BEGIN_DECLS #if __BSD_VISIBLE ==== //depot/projects/dtrace6/src/sys/sys/time.h#2 (text+ko) ==== @@ -314,4 +314,27 @@ #endif /* !_KERNEL */ +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +/* + * Definitions for commonly used resolutions. + */ +#define SEC 1 +#define MILLISEC 1000 +#define MICROSEC 1000000 +#define NANOSEC 1000000000 + +typedef longlong_t hrtime_t; + +#ifndef _KERNEL +static __inline hrtime_t gethrtime(void) { + struct timespec ts; + clock_gettime(CLOCK_UPTIME,&ts); + return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); +} +#endif +#endif /* _SOLARIS_C_SOURCE */ + #endif /* !_SYS_TIME_H_ */ ==== //depot/projects/dtrace6/src/sys/sys/types.h#2 (text+ko) ==== @@ -291,6 +291,36 @@ #endif /* !_KERNEL */ /* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +typedef u_int uint_t; +typedef u_char uchar_t; +typedef u_short ushort_t; +typedef u_long ulong_t; + +typedef long long longlong_t; +typedef unsigned long long u_longlong_t; + +typedef off_t off64_t; + +typedef id_t taskid_t; +typedef id_t projid_t; +typedef id_t poolid_t; +typedef id_t zoneid_t; +typedef id_t ctid_t; + +#ifndef _KERNEL +#if defined(__XOPEN_OR_POSIX) +typedef enum { _B_FALSE, _B_TRUE } boolean_t; +#else +typedef enum { B_FALSE, B_TRUE } boolean_t; +#endif /* defined(__XOPEN_OR_POSIX) */ +#endif + +#endif /* _SOLARIS_C_SOURCE */ + +/* * The following are all things that really shouldn't exist in this header, * since its purpose is to provide typedefs, not miscellaneous doodads. */ From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:54:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F98F16A41A; Sat, 20 Oct 2007 22:54:21 +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 09AAF16A417 for ; Sat, 20 Oct 2007 22:54:21 +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 9571413C442 for ; Sat, 20 Oct 2007 22:54:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMsKZQ070111 for ; Sat, 20 Oct 2007 22:54:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMsKo8070108 for perforce@freebsd.org; Sat, 20 Oct 2007 22:54:20 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:54:20 GMT Message-Id: <200710202254.l9KMsKo8070108@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 127857 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, 20 Oct 2007 22:54:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=127857 Change 127857 by jb@jb_freebsd8 on 2007/10/20 22:54:09 No CLOCK_UPTIME in RELENG_6. RELENG_7 processes it the same as CLOCK_MONOTONIC. Affected files ... .. //depot/projects/dtrace6/src/sys/sys/time.h#3 edit Differences ... ==== //depot/projects/dtrace6/src/sys/sys/time.h#3 (text+ko) ==== @@ -331,7 +331,7 @@ #ifndef _KERNEL static __inline hrtime_t gethrtime(void) { struct timespec ts; - clock_gettime(CLOCK_UPTIME,&ts); + clock_gettime(CLOCK_MONOTONIC,&ts); return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); } #endif From owner-p4-projects@FreeBSD.ORG Sat Oct 20 22:55:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03D0416A419; Sat, 20 Oct 2007 22:55: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 B5A0416A468 for ; Sat, 20 Oct 2007 22:55:22 +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 3127813C467 for ; Sat, 20 Oct 2007 22:55:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KMtL46070188 for ; Sat, 20 Oct 2007 22:55:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMtLfN070185 for perforce@freebsd.org; Sat, 20 Oct 2007 22:55:21 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 22:55:21 GMT Message-Id: <200710202255.l9KMtLfN070185@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 127858 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, 20 Oct 2007 22:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=127858 Change 127858 by jb@jb_freebsd8 on 2007/10/20 22:54:24 Fix typos. Affected files ... .. //depot/projects/dtrace6/src/Makefile.inc1#3 edit .. //depot/projects/dtrace6/src/cddl/lib/Makefile#2 edit .. //depot/projects/dtrace6/src/include/Makefile#3 edit Differences ... ==== //depot/projects/dtrace6/src/Makefile.inc1#3 (text+ko) ==== @@ -50,7 +50,7 @@ .if !defined(NO_GAMES) SUBDIR+=games .endif -.if !define(NO_CDDL) +.if !defined(NO_CDDL) SUBDIR+=cddl .else NO_CTF=1 @@ -242,7 +242,7 @@ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -.if define(NO_CDDL) +.if defined(NO_CDDL) WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} @@ -451,7 +451,7 @@ .for _t in obj includes cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t} cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t} -.if !define(NO_CDDL) +.if !defined(NO_CDDL) cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t} .endif cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t} @@ -865,7 +865,7 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif -.if !define(NO_CDDL) +.if !defined(NO_CDDL) _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif @@ -1039,7 +1039,7 @@ _generic_libs+= lib -.if !define(NO_CDDL) +.if !defined(NO_CDDL) _cddl_lib= cddl/lib .endif ==== //depot/projects/dtrace6/src/cddl/lib/Makefile#2 (text+ko) ==== @@ -5,7 +5,6 @@ SUBDIR= libavl \ libctf \ libdtrace \ - libproc \ - libumem + libproc .include ==== //depot/projects/dtrace6/src/include/Makefile#3 (text+ko) ==== @@ -5,7 +5,7 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h +INCS= a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h \ ctype.h db.h \ dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ fts.h ftw.h getopt.h glob.h grp.h \ From owner-p4-projects@FreeBSD.ORG Sat Oct 20 23:34:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 982BF16A421; Sat, 20 Oct 2007 23:34: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 558F116A420 for ; Sat, 20 Oct 2007 23:34:13 +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 D3FFC13C467 for ; Sat, 20 Oct 2007 23:34:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNY6cG074490 for ; Sat, 20 Oct 2007 23:34:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNY6Ta074487 for perforce@freebsd.org; Sat, 20 Oct 2007 23:34:06 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 23:34:06 GMT Message-Id: <200710202334.l9KNY6Ta074487@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 127861 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, 20 Oct 2007 23:34:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=127861 Change 127861 by jb@jb_freebsd1 on 2007/10/20 23:33:51 Fix a clash between my p4 additions and what came through current, then propagate the change to RELENG_6. Affected files ... .. //depot/projects/dtrace/src/include/unistd.h#6 edit .. //depot/projects/dtrace6/src/include/unistd.h#2 edit Differences ... ==== //depot/projects/dtrace/src/include/unistd.h#6 (text+ko) ==== @@ -292,12 +292,12 @@ #if __BSD_VISIBLE #define _SC_NPROCESSORS_CONF 57 #define _SC_NPROCESSORS_ONLN 58 -#define _SC_NPROCESSORS_MAX 121 -#define _SC_CPUID_MAX 122 #endif /* Extensions found in Solaris and Linux. */ #define _SC_PHYS_PAGES 121 +#define _SC_NPROCESSORS_MAX 122 +#define _SC_CPUID_MAX 123 /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 ==== //depot/projects/dtrace6/src/include/unistd.h#2 (text+ko) ==== @@ -294,6 +294,11 @@ #define _SC_NPROCESSORS_ONLN 58 #endif +/* Extensions found in Solaris and Linux. */ +#define _SC_PHYS_PAGES 121 +#define _SC_NPROCESSORS_MAX 122 +#define _SC_CPUID_MAX 123 + /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 #define _CS_PATH 1 /* default value of PATH */ From owner-p4-projects@FreeBSD.ORG Sat Oct 20 23:44:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2C0316A419; Sat, 20 Oct 2007 23:44:21 +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 71BEE16A417 for ; Sat, 20 Oct 2007 23:44:20 +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 3833C13C43E for ; Sat, 20 Oct 2007 23:44:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNiKT6074959 for ; Sat, 20 Oct 2007 23:44:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNiJUh074956 for perforce@freebsd.org; Sat, 20 Oct 2007 23:44:19 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 23:44:19 GMT Message-Id: <200710202344.l9KNiJUh074956@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 127862 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, 20 Oct 2007 23:44:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=127862 Change 127862 by jb@jb_freebsd1 on 2007/10/20 23:44:11 Prevent Solaris-specific things from clashing with FreeBSD's definitions. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ==== @@ -111,6 +111,7 @@ #define L_MAXMIN L_MAXMIN32 #endif +#if defined(sun) #ifdef _KERNEL /* major part of a device internal to the kernel */ @@ -171,6 +172,8 @@ NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ)) #define geteminor(x) (minor_t)((x) & L_MAXMIN) +#endif /* sun */ + /* * These are versions of the kernel routines for compressing and * expanding long device numbers that don't return errors. ==== //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 (text+ko) ==== @@ -111,6 +111,7 @@ #define L_MAXMIN L_MAXMIN32 #endif +#if defined(sun) #ifdef _KERNEL /* major part of a device internal to the kernel */ @@ -171,6 +172,8 @@ NODEV : (((dev_t)(x) >> L_BITSMINOR) & L_MAXMAJ)) #define geteminor(x) (minor_t)((x) & L_MAXMIN) +#endif /* sun */ + /* * These are versions of the kernel routines for compressing and * expanding long device numbers that don't return errors. From owner-p4-projects@FreeBSD.ORG Sat Oct 20 23:51:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C004816A498; Sat, 20 Oct 2007 23:51: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 6A70516A494 for ; Sat, 20 Oct 2007 23:51:28 +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 3BF0013C442 for ; Sat, 20 Oct 2007 23:51:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNpShp075431 for ; Sat, 20 Oct 2007 23:51:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNpSHr075428 for perforce@freebsd.org; Sat, 20 Oct 2007 23:51:28 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 23:51:28 GMT Message-Id: <200710202351.l9KNpSHr075428@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 127863 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, 20 Oct 2007 23:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=127863 Change 127863 by jb@jb_freebsd1 on 2007/10/20 23:50:55 Expand linker file structure. Define version 2 of kld_file_stat. Affected files ... .. //depot/projects/dtrace6/src/sys/sys/linker.h#2 edit Differences ... ==== //depot/projects/dtrace6/src/sys/sys/linker.h#2 (text+ko) ==== @@ -73,6 +73,7 @@ #define LINKER_FILE_LINKED 0x1 /* file has been fully linked */ TAILQ_ENTRY(linker_file) link; /* list of all loaded files */ char* filename; /* file which was loaded */ + char* pathname; /* file name with full path */ int id; /* unique id */ caddr_t address; /* load address */ size_t size; /* size of file */ @@ -81,6 +82,18 @@ STAILQ_HEAD(, common_symbol) common; /* list of common symbols */ TAILQ_HEAD(, module) modules; /* modules in this file */ TAILQ_ENTRY(linker_file) loaded; /* preload dependency support */ + int loadcnt; /* load counter value */ + + /* + * Function Boundary Tracing (FBT) or Statically Defined Tracing (SDT) + * fields. + */ + int nenabled; /* number of enabled probes. */ + int fbt_nentries; /* number of fbt entries created. */ + void *sdt_probes; + int sdt_nentries; + size_t sdt_nprobes; + size_t sdt_size; }; /* @@ -267,6 +280,20 @@ #endif /* _KERNEL */ +/* + * This is version 1 of the KLD file status structure. It is identified + * by it's _size_ in the version field. + */ +struct kld_file_stat_1 { + int version; /* set to sizeof(linker_file_stat) */ + char name[MAXPATHLEN]; + int refs; + int id; + caddr_t address; /* load address */ + size_t size; /* size in bytes */ +}; +#endif /* _KERNEL */ + struct kld_file_stat { int version; /* set to sizeof(linker_file_stat) */ char name[MAXPATHLEN]; @@ -274,6 +301,7 @@ int id; caddr_t address; /* load address */ size_t size; /* size in bytes */ + char pathname[MAXPATHLEN]; }; struct kld_sym_lookup { From owner-p4-projects@FreeBSD.ORG Sat Oct 20 23:56:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4F4216A420; Sat, 20 Oct 2007 23:56: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 84E1916A41A for ; Sat, 20 Oct 2007 23:56:34 +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 569C613C43E for ; Sat, 20 Oct 2007 23:56:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNuYFw075607 for ; Sat, 20 Oct 2007 23:56:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNuYUu075604 for perforce@freebsd.org; Sat, 20 Oct 2007 23:56:34 GMT (envelope-from jb@freebsd.org) Date: Sat, 20 Oct 2007 23:56:34 GMT Message-Id: <200710202356.l9KNuYUu075604@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 127864 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, 20 Oct 2007 23:56:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=127864 Change 127864 by jb@jb_freebsd1 on 2007/10/20 23:56:21 Fix a mis-merge. Affected files ... .. //depot/projects/dtrace6/src/sys/sys/linker.h#3 edit Differences ... ==== //depot/projects/dtrace6/src/sys/sys/linker.h#3 (text+ko) ==== @@ -278,8 +278,6 @@ #define ELF_RELOC_REL 1 #define ELF_RELOC_RELA 2 -#endif /* _KERNEL */ - /* * This is version 1 of the KLD file status structure. It is identified * by it's _size_ in the version field.