From owner-p4-projects@FreeBSD.ORG Sun Oct 17 10:08:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D60C31065675; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 981DD1065673 for ; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 82C0B8FC1E for ; Sun, 17 Oct 2010 10:08:35 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HA8Zox063208 for ; Sun, 17 Oct 2010 10:08:35 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HA8ZfL063205 for perforce@freebsd.org; Sun, 17 Oct 2010 10:08:35 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 17 Oct 2010 10:08:35 GMT Message-Id: <201010171008.o9HA8ZfL063205@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 10:08:36 -0000 http://p4web.freebsd.org/@@184813?ac=10 Change 184813 by rene@rene_acer on 2010/10/17 10:08:29 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#54 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#47 integrate .. //depot/projects/docproj_nl/share/pgpkeys/culot.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#47 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#44 integrate .. //depot/projects/docproj_nl/www/en/advocacy/myths.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#45 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#19 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#33 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#92 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#17 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 (text+ko) ==== @@ -1,4 +1,4 @@ - + + aaron@FreeBSD.org"> @@ -234,6 +234,8 @@ csjp@FreeBSD.org"> +culot@FreeBSD.org"> + cwt@FreeBSD.org"> cy@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#47 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -296,6 +296,11 @@ &pgpkey.brucec; + + &a.culot; + &pgpkey.culot; + + &a.aaron; &pgpkey.aaron; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#44 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -70,6 +70,7 @@ + ==== //depot/projects/docproj_nl/www/en/advocacy/myths.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -154,6 +154,11 @@ the base FreeBSD operating system, but the development takes place separately.

+

  • Hybrid Cluster is + a web cluster, based on FreeBSD and ZFS, which provides data + redundancy and automated load balancing of standard LAMP + websites and applications. +

  • Frenzy is another live-CD distribution, but customized for administering tasks. It contains software for hardware ==== //depot/projects/docproj_nl/www/en/developers.sgml#45 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.269 2010/10/07 17:59:17 jonathan Exp $ +$FreeBSD: www/en/developers.sgml,v 1.270 2010/10/16 19:04:06 culot Exp $ --> @@ -119,6 +119,7 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#19 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.59 2010/09/10 18:45:26 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.60 2010/10/11 20:52:28 jkois Exp $ @@ -461,6 +461,18 @@ + + NQhost + http://nqhost.com/ + + NQhost offers virtual private servers with guaranteed resources. + Our FreeBSD VPS + packages can be created in Germany or US-located data centers. + We offer flexible tariff plans, configurations and friendly + support. + + + BSn.Com http://bsn.com/ ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#33 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.90 2010/09/06 21:21:33 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.91 2010/10/14 19:44:37 pgj Exp $ @@ -64,6 +64,33 @@ from commercial vendors. + + EuroBSDCon 2011 + http://2011.eurobsdcon.org/ + + 2011 + 10 + 6 + + + 2011 + 10 + 9 + + + The Netherlands + + EuroBSDCon is the annual European technical conference + for users and developers on BSD based systems. The 10th European + BSD Conference will take place in the Netherlands in October, + 2010, and include a technical track, tutorials, and FreeBSD + developer summit. Topics of interest to the conference include, + but are not limited to applications, architecture, implementation, + performance and security of BSD based operating systems, as well + as topics concerning the economic or organizational aspects of BSD + use. + + BSDCan 2011 http://www.bsdcan.org/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#92 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.348 2010/10/07 17:59:17 jonathan Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.350 2010/10/16 19:25:51 culot Exp $ @@ -34,11 +34,18 @@ 10 + + + 16 + +

    New committer: Frederic Culot (ports)

    + + 7 -

    New committer: Jonathan Anderson

    +

    New committer: Jonathan Anderson (src)

         ==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#17 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.97 2010/09/22 18:45:40 jkois Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.98 2010/10/11 21:08:12 jkois Exp $ @@ -622,6 +622,19 @@ + + The Sacramento BSD and Linux Users Group (SacBLUG) + http://sacblug.org/ + The Sacramento BSD and Linux Users Group (SacBLUG) is + a collaborative effort amongst *BSD/Linux professionals in the + Sacramento area, with a focus on enterprise and server + environments. Our aim is to share our experiences in managing + and maintaining systems while also providing a social network + for members. Check out our website for more information. + + + Yavapai Free Unix Users Group mailto:rcarter@consys.com From owner-p4-projects@FreeBSD.ORG Sun Oct 17 19:47:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B65E1065694; Sun, 17 Oct 2010 19:47: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 0E240106567A for ; Sun, 17 Oct 2010 19:47:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EEDD38FC0C for ; Sun, 17 Oct 2010 19:47:33 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HJlXMX023110 for ; Sun, 17 Oct 2010 19:47:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HJlXsf023107 for perforce@freebsd.org; Sun, 17 Oct 2010 19:47:33 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 17 Oct 2010 19:47:33 GMT Message-Id: <201010171947.o9HJlXsf023107@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 19:47:34 -0000 http://p4web.freebsd.org/@@184834?ac=10 Change 184834 by rene@rene_acer on 2010/10/17 19:47:06 MFen handbook/x11 1.203 -> 1.204 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#31 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.28 2010/08/25 18:29:50 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.203 + %SRCID% 1.204 --> @@ -1742,18 +1742,20 @@ GNOME of een andere) zij na het aanmelden willen gebruiken. - Om kdm te starten, moet de - ttyv8 regel in - /etc/ttys worden aangepast. De regel - moet er als volgend uitzien: + Om kdm te starten, moeten verschillende + bestanden gewijzigd worden, afhankelijk van de versie van + KDE. - Voor KDE3: + Voor KDE3 dient de regel met + ttyv8 als volgt aangepast te worden: ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure - Voor KDE4: + Voor KDE4 dienen de volgende regels + aan /etc/rc.conf toegevoegd te worden: - ttyv8 "/usr/local/kde4/bin/kdm -nodaemon" xterm on secure + local_startup="${local_startup} /usr/local/kde4/etc/rc.d" +kdm4_enable="YES" From owner-p4-projects@FreeBSD.ORG Sun Oct 17 20:43:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 385BD1065673; Sun, 17 Oct 2010 20:43: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 EC688106566B for ; Sun, 17 Oct 2010 20:43:31 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D71998FC08 for ; Sun, 17 Oct 2010 20:43:31 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HKhVRo043656 for ; Sun, 17 Oct 2010 20:43:31 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HKhV62043651 for perforce@freebsd.org; Sun, 17 Oct 2010 20:43:31 GMT (envelope-from afiveg@FreeBSD.org) Date: Sun, 17 Oct 2010 20:43:31 GMT Message-Id: <201010172043.o9HKhV62043651@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 20:43:32 -0000 http://p4web.freebsd.org/@@184838?ac=10 Change 184838 by afiveg@cottonmouth on 2010/10/17 20:42:25 Significantly reduced hardware-dependent part of code. Most of the function are removed into hardware-independent ringmap.c. The hardware-dependent function are now responsible only for accessing registers (HEAD, TAIL) and receive buffers allocated as array in the generic driver. capt_object structure is extended: the new members: rx/tx_buffers for accessing memory regions allocated by generic driver for receive and transmit, hw_rx/tx_ring for accessing hardware registers like HEAD and TAIL. Currently supported controllers: Intel 8254x (driver if_lem). Unfortunately, because of broken 10GbE adapter I've received for GSoC the work on 10GbE is stopped. Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#35 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#35 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#32 delete .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#24 delete .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#49 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#49 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#19 edit .. //depot/projects/soc2010/ringmap/doc/slides/Makefile#1 add .. //depot/projects/soc2010/ringmap/doc/slides/ringmap_slides.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Background/Capturing.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Motivation/Goal.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Motivation/Problem.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Performance/Results.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Performance/Setup.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Solution/Generic2Ringmap.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Solution/Overview.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Solution/Ringmap.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Summary/AchievedGoals.tex#1 add .. //depot/projects/soc2010/ringmap/doc/slides/section/Summary/FutureWorks.tex#1 add .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#31 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#32 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#26 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#35 (text+ko) ==== @@ -270,7 +270,7 @@ extern struct ringmap * ringmap_attach(device_t, struct ringmap_functions *); extern int ringmap_detach (device_t); -extern struct ringmap_functions ringmap_8254_f; +extern struct ringmap_functions ringmap_8254_functions; #endif #ifdef DEVICE_POLLING @@ -670,7 +670,7 @@ device_get_nameunit(dev)); #ifdef RINGMAP - adapter->rm = ringmap_attach (dev, &ringmap_8254_f); + adapter->rm = ringmap_attach (dev, &ringmap_8254_functions); if (adapter->rm == NULL) { goto err_rx_struct; } @@ -3498,7 +3498,7 @@ } #ifdef RINGMAP - adapter->rm->funcs->delayed_isr(adapter); + co = adapter->rm->funcs->delayed_isr(adapter, adapter->rm); #endif while ((current_desc->status & E1000_RXD_STAT_DD) && @@ -3556,8 +3556,8 @@ #ifdef RINGMAP RINGMAP_LOCK(adapter->rm); - if (adapter->rm->open_cnt) - adapter->rm->funcs->delayed_isr_per_packet(adapter->dev, i); + if ((adapter->rm->open_cnt) && (co != NULL)) + adapter->rm->funcs->per_packet_iteration(co, i); RINGMAP_UNLOCK(adapter->rm); #endif @@ -3670,12 +3670,8 @@ #ifdef RINGMAP RINGMAP_LOCK(adapter->rm); - SLIST_FOREACH(co, &adapter->rm->object_list, objects) { - adapter->rm->funcs->sync_head(co); - if (RING_NOT_EMPTY(co->ring)){ + if ((co != NULL) && (RING_NOT_EMPTY(co->ring))) wakeup(co->ring); - } - } RINGMAP_UNLOCK(adapter->rm); #endif @@ -3685,7 +3681,7 @@ if (--i < 0) i = adapter->num_rx_desc - 1; - /* RINGMAP: Don't write RDT. We do it in sync_tail() */ + /* RINGMAP: Don't write RDT. We'll do it after user has read packet */ #ifndef RINGMAP E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), i); #endif ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#35 (text+ko) ==== @@ -17,249 +17,92 @@ #include "e1000_api.h" #include "if_lem.h" -#include "ringmap_8254.h" -int rm_8254_set_slot(struct capt_object *, unsigned int); -void rm_8254_interrupt(void *); -void rm_8254_delayed_interrupt(void *); -void rm_8254_delayed_interrupt_per_packet(void *, int); -int rm_8254_print_ring_pointers(struct adapter *); -void rm_8254_sync_tail(struct capt_object *); -void rm_8254_sync_head(struct capt_object *); -struct capt_object * rm_8254_find_next(struct adapter *); int rm_8254_set_queue(struct capt_object *, unsigned int); +unsigned int rm_8245_get_rdh(void *hw_ring); +unsigned int rm_8245_get_rdt(void *hw_ring); +void rm_8245_set_rdt(unsigned int val, void *hw_ring); +struct mbuf * rm_8254_get_mbuf(void *buffer_area, unsigned int num); +vm_offset_t rm_8254_get_packet(void *buffer_area, unsigned int num); +vm_offset_t rm8254_get_rx_desc(void * rx_desc_area, unsigned int num); + extern devclass_t em_devclass; -extern void ringmap_print_slot(struct ring *, unsigned int); -extern void print_capt_obj(struct capt_object *); -extern int ringmap_filter(struct capt_object *, int); -struct ringmap_functions ringmap_8254_f = { - rm_8254_interrupt, - rm_8254_delayed_interrupt, - rm_8254_delayed_interrupt_per_packet, - rm_8254_sync_tail, - rm_8254_sync_head, - rm_8254_set_slot, - rm_8254_set_queue, +struct ringmap_functions ringmap_8254_functions = { + .isr = NULL, + .delayed_isr = NULL, + .per_packet_iteration = NULL, + .get_head = rm_8245_get_rdh, + .get_tail = rm_8245_get_rdt, + .set_tail = rm_8245_set_rdt, + .get_mbuf = rm_8254_get_mbuf, + .get_packet = rm_8254_get_packet, + .set_queue = rm_8254_set_queue, + .pkt_filter = NULL, }; -/* - * Write the userrp into the RDT register - * 2. SYNC_TAIL: RDT = ring->userrp - */ -void -rm_8254_sync_tail(struct capt_object *co) +struct mbuf * +rm_8254_get_mbuf(void *buffer_area, unsigned int num) { - struct adapter *adapter = (struct adapter *)device_get_softc(co->rm->dev); + struct em_buffer *buf = (struct em_buffer *)buffer_area; + return (buf[num].m_head); +} - RINGMAP_HW_SYNC_TAIL(adapter, co->ring); -} -/* Set value from RDH to the ring->kernrp*/ -void -rm_8254_sync_head(struct capt_object *co) +vm_offset_t +rm_8254_get_packet(void *buffer_area, unsigned int num) { - struct adapter *adapter = (struct adapter *)device_get_softc(co->rm->dev); - - RINGMAP_HW_SYNC_HEAD(adapter, co->ring); + struct mbuf *mb = rm_8254_get_mbuf(buffer_area, num); + return ((vm_offset_t)mb->m_data); } -/* - * This should be called from ISR. Other interrupts are disallowed! - * It means the functions must be as small as possible - */ -void inline -rm_8254_interrupt(void *arg) +unsigned int +rm_8245_get_rdh(void *hw_ring) { - /* Do nothing ... */ - return; + return (E1000_READ_REG((struct e1000_hw *)hw_ring, E1000_RDH(0))); } -void -rm_8254_delayed_interrupt(void *context) +unsigned int +rm_8245_get_rdt(void *hw_ring) { - struct adapter *adapter = (struct adapter *)context; - struct capt_object *co = NULL; - struct timeval last_ts; - - RINGMAP_INTR(start); - - RINGMAP_LOCK(adapter->rm); - /* Do the next steps only if there is capturing process */ - if (adapter->rm->open_cnt > 0) { - getmicrotime(&last_ts); - rm_8254_sync_tail(rm_8254_find_next(adapter)); - - SLIST_FOREACH(co, &adapter->rm->object_list, objects) { - if (co->ring != NULL) { -#if (RINGMAP_INTR_DEB) - PRINT_RING_PTRS(co->ring); -#endif - co->ring->last_ts = last_ts; - ++co->ring->intr_num; - } - } - } - RINGMAP_UNLOCK(adapter->rm); - - RINGMAP_INTR(end); + return (E1000_READ_REG((struct e1000_hw *)hw_ring, E1000_RDT(0))); } -void -rm_8254_delayed_interrupt_per_packet(void *context, int slot_num) +void +rm_8245_set_rdt(unsigned int val, void *hw_ring) { - device_t dev = (device_t)context; - struct capt_object *co = NULL; - struct adapter *adapter = NULL; - struct ringmap *rm = NULL; - - adapter = (struct adapter *)device_get_softc(dev); - rm = adapter->rm; - - RINGMAP_INTR(start); - - SLIST_FOREACH(co, &rm->object_list, objects) { - if (co->ring != NULL) { - co->ring->slot[slot_num].is_ok = 1; - co->ring->slot[slot_num].intr_num = co->ring->intr_num; - - ringmap_filter(co, slot_num); - -#ifdef RINGMAP_TIMESTAMP - co->ring->slot[slot_num].ts = co->ring->last_ts; -#endif -#if (RINGMAP_INTR_DEB) - PRINT_SLOT((co->ring), (slot_num)); -#endif - } - } - - RINGMAP_INTR(end); + E1000_WRITE_REG((struct e1000_hw *)hw_ring, E1000_RDT(0), val); } -/* Returns the ring which TAIL pointer is mostly near to to the HEAD(RDH) */ -struct capt_object * -rm_8254_find_next(struct adapter *adapter) +int +rm_8254_set_queue(struct capt_object *co, unsigned int i) { - unsigned int rdh, rdt, dist, min_dist = SLOTS_NUMBER; - struct ringmap *rm = adapter->rm; - struct capt_object *co = NULL, *min_co = NULL; - - rdh = RINGMAP_HW_READ_HEAD(adapter); - - SLIST_FOREACH(co, &rm->object_list, objects) { - rdt = co->ring->userrp; - dist = R_DISTANCE(rdh, rdt); - if (dist <= min_dist) { - min_dist = dist; - min_co = co; - } - } - - return (min_co); -} - - -int -rm_8254_set_slot(struct capt_object *co, unsigned int slot_num) -{ device_t dev = NULL; struct adapter *adapter = NULL; - struct ring *ring = NULL; - -#if (__RINGMAP_DEB) - printf("[%s] Set slot: %d\n", __func__, slot_num); -#endif dev = co->rm->dev; adapter = (struct adapter *)device_get_softc(dev); - ring = co->ring; - - /* First check ALL pointers */ - if (co == NULL) { - RINGMAP_ERROR(Pointer to capturing object is NULL); - goto fail; - } - if (co->rm == NULL) { - RINGMAP_ERROR(Pointer to ringmap is NULL); - goto fail; - } - if (GET_MBUF_P(adapter, slot_num) == NULL){ - RINGMAP_ERROR(Pointer to mbuf is NULL); - goto fail; - } - if (GET_PACKET_P(adapter, slot_num) == NULL){ - RINGMAP_ERROR(Pointer to packet is NULL); - goto fail; - } - if (GET_DESCRIPTOR_P(adapter, slot_num) == NULL){ - RINGMAP_ERROR(Pointer to descriptor is NULL); - goto fail; - } - /* Now if everything is Ok, we can initialize ring pointers */ - ring->slot[slot_num].mbuf.kern = - (vm_offset_t)GET_MBUF_P(adapter, slot_num); - ring->slot[slot_num].mbuf.phys = - (bus_addr_t)vtophys(GET_MBUF_P(adapter, slot_num)); - ring->slot[slot_num].packet.kern = - (vm_offset_t)GET_PACKET_P(adapter, slot_num); - ring->slot[slot_num].packet.phys = - (bus_addr_t)vtophys(GET_PACKET_P(adapter, slot_num)); + co->hw_rx_ring = &adapter->hw; + co->hw_tx_ring = &adapter->hw; - ring->slot[slot_num].descriptor.kern = - (vm_offset_t)GET_DESCRIPTOR_P(adapter, slot_num); - ring->slot[slot_num].descriptor.phys = - (bus_addr_t)vtophys(GET_DESCRIPTOR_P(adapter, slot_num)); + co->rx_buffers = adapter->rx_buffer_area; + co->tx_buffers = adapter->tx_buffer_area; - return (0); + co->rx_desc_base = adapter->rx_desc_base; + co->tx_desc_base = adapter->tx_desc_base; -fail: - RINGMAP_ERROR(Probably you have to do: ifconfig up); - return (-1); -} - - -/* Print the values from RDT and RDH */ -int -rm_8254_print_ring_pointers(struct adapter *adapter) -{ - unsigned int rdt, rdh; - struct ringmap *rm = NULL; - - rm = adapter->rm; - - if (rm == NULL) - goto out; - - rdh = RINGMAP_HW_READ_HEAD(adapter); - rdt = RINGMAP_HW_READ_TAIL(adapter); - - printf("\n== +++++++++ RING POINTERS ++++++++++++ \n"); - printf("== + HW HEAD = %d (KERN POINTER)\n", rdh); - printf("== + HW TAIL = %d (USER POINTER)\n", rdt); - printf("== ++++++++++++++++++++++++++++++++++++++ \n\n"); - -out: - return (0); -} - - -/* 8254x controllers have not multiqueue support: que = NULL */ -int -rm_8254_set_queue(struct capt_object *co, unsigned int i) -{ - /* No multiqueue for 8254 */ - co->que = NULL; + /* Interrupt context is adapter structure. Look in if_lem.h */ + co->intr_context = device_get_softc(co->rm->dev); return (0); } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#49 (text+ko) ==== @@ -45,7 +45,10 @@ void print_capt_obj(struct capt_object *); struct ringmap * cdev2ringmap(struct cdev *); struct ringmap * dev2ringmap(device_t); -int ringmap_filter(struct capt_object *, int); +void ringmap_bpf_filter(struct capt_object *, int); +void per_packet_iteration(struct capt_object *, int ); +struct capt_object * ringmap_delayed_isr(void *context, struct ringmap *rm); +int set_slot(struct capt_object *co, unsigned int slot_num); d_open_t ringmap_open; d_close_t ringmap_close; @@ -66,9 +69,11 @@ static struct ringmap_global_list ringmap_list_head = SLIST_HEAD_INITIALIZER(ringmap_list_head); + /* - * Will called from if_em.c before returning from - * em_attach() function. + * The function should be called from attach function of generic network driver. + * Here the ringmap structure is allocated and the character special device for + * the communication with user is created. */ struct ringmap * ringmap_attach(device_t dev, struct ringmap_functions *rf) @@ -77,9 +82,9 @@ RINGMAP_FUNC_DEBUG(begin); + /* Allocate ringmap */ MALLOC(rm, struct ringmap *, sizeof(struct ringmap), M_DEVBUF, (M_ZERO | M_WAITOK)); - if (rm == NULL) { RINGMAP_ERROR(Can not allocate space for ringmap structure); return (NULL); @@ -87,10 +92,10 @@ /* * Create char device for communication with user-space. The user-space - * process wich want to capture packets should first open this device. + * process wich want to capture packets first opens this device. * Then, by syscalls on this device it will: * - get physical adresses of packet buffers for mapping them in its - * virtual memory space + * virtual memory * * - controll packet capturing: start, stop, sleep to wait for packets. */ @@ -99,41 +104,55 @@ device_get_nameunit(dev)); if (rm->cdev == NULL) { RINGMAP_ERROR(Can not create char device); - contigfree(rm, sizeof(struct ringmap), M_DEVBUF); + FREE(rm, M_DEVBUF); return (NULL); } /* - * Tell to ringmap which hardware and driver speciffic functions - * should it use + * Set the hardware and driver speciffic functions */ rm->funcs = rf; - /* Store adapters device structure by ringmap */ + /* Store interface device structure in ringmap */ rm->dev = dev; - /* Initialize the list of capturing objects */ + /* + * Initialize the list of capturing objects. Each object represents the + * thread that capture traffic and its ring. + */ SLIST_INIT(&rm->object_list); - /* Insert ringmap in the global list */ + /* Insert ringmap structure into the list */ SLIST_INSERT_HEAD(&ringmap_list_head, rm, entries); /* Init the mutex to protecting our data */ RINGMAP_LOCK_INIT(rm, device_get_nameunit(dev)); + /* + * Set default functions if the generic driver's specific functions are not + * set + */ + if (rm->funcs->delayed_isr == NULL) + rm->funcs->delayed_isr = ringmap_delayed_isr; + + if (rm->funcs->per_packet_iteration == NULL) + rm->funcs->per_packet_iteration = per_packet_iteration; + + RINGMAP_FUNC_DEBUG(end); /* * Return ringmap pointer to the generic driver. Generic driver should - * store the pointer in the adapter structure + * store the pointer in the adapter structure in order to be able to access + * ringmap */ return (rm); } /* - * Should be called from driver detach function. It is a little dangerous - * place. Probably we shoul protect our data here with mutexes. + * Should be called from driver's detach function. It is a little dangerous + * place - probably we shoul protect our code here with locks!!! */ int ringmap_detach(device_t dev) @@ -194,7 +213,7 @@ rm = cdev2ringmap(cdev); if ( rm == NULL ) { - RINGMAP_ERROR(Null pointer to ringmap structure); + RINGMAP_ERROR(Could not get the pointer to ringmap structure); return (EIO); } @@ -237,7 +256,7 @@ } ring->size = SLOTS_NUMBER; - ring->pid = td->td_proc->p_pid; + ring->pid = td->td_proc->p_pid; /* Unneeded thing. TODO: Replace it with somth more resonable */ co->ring = ring; co->td = td; @@ -258,7 +277,7 @@ /* Init ring-slots with mbufs and packets adrresses */ for (i = 0 ; i < SLOTS_NUMBER ; i++) { - if (rm->funcs->set_slot(co, i) == -1){ + if (set_slot(co, i) == -1){ RINGMAP_ERROR(Ring initialization failed!); contigfree(ring, sizeof(struct ring), M_DEVBUF); @@ -273,7 +292,6 @@ /* * Insert the capturing object in the single linked list - * the head of the list is in the ringmap structure */ SLIST_INSERT_HEAD(&rm->object_list, co, objects); @@ -324,9 +342,8 @@ /* - * Callback of ringmap_close() - * Free memory allocated for capturing object and remove the - * capturing object from the list. + * Callback of ringmap_close() Free memory allocated for capturing object and + * remove the capturing object from the list. */ void clear_capt_object(void * data) @@ -336,15 +353,12 @@ RINGMAP_FUNC_DEBUG(start); - if (data != NULL) { - co = (struct capt_object *)data; + co = (struct capt_object *)data; + + if (co != NULL) { RINGMAP_LOCK(co->rm); - /* to be completely sure */ - if (co == NULL) - goto out; - rm = co->rm; #if (__RINGMAP_DEB) printf("[%s] Object to delete:\n", __func__); @@ -357,12 +371,12 @@ FREE(co, M_DEVBUF); data = co = NULL; - if (rm->open_cnt) { + if (rm->open_cnt > 0) { --rm->open_cnt; } else { RINGMAP_WARN(Incorrect value of rm->open_cnt); } -out: + RINGMAP_UNLOCK(rm); } else { @@ -433,15 +447,17 @@ struct ringmap *rm = NULL; struct capt_object *co = NULL; vm_paddr_t phys_ring_addr; + int error; RINGMAP_FUNC_DEBUG(start); /* Get pointer to the ringmap structure */ rm = cdev2ringmap(cdev); - if (devfs_get_cdevpriv((void **)&co)) { - RINGMAP_ERROR(Can not get capturing object); - return(EIO); + error = devfs_get_cdevpriv((void **)&co); + if (error) { + RINGMAP_ERROR(Can not access private data); + return(error); } if (co->td != curthread ){ @@ -481,9 +497,10 @@ printf("[%s] pid = %d\n", __func__, td->td_proc->p_pid); #endif - if (devfs_get_cdevpriv((void **)&co)) { + err = devfs_get_cdevpriv((void **)&co); + if (err != 0) { RINGMAP_IOCTL(Error! Can not get private data!); - return (ENODEV); + return (err); } rm = co->rm; @@ -496,8 +513,8 @@ /* Count how many times we wait for new packets */ co->ring->user_wait_kern++; - /* Set adapter TAIL register */ - rm->funcs->sync_tail(co); + /* Set adapter's TAIL register */ + rm->funcs->set_tail(co->ring->userrp, co->hw_rx_ring); #if (RINGMAP_IOCTL_DEB) print_capt_obj(co); @@ -506,7 +523,7 @@ /* * In the time: from user has called ioctl() until now could * come the new packets. It means, before we are going to sleep - * it makes a sence to check if we really must do it :) + * it makes a sence to check if we really must do it */ while (RING_IS_EMPTY(co->ring)) { RINGMAP_IOCTL(Sleep and wait for new packets); @@ -514,7 +531,7 @@ err = tsleep(co->ring, (PRI_MAX_ITHD) | PCATCH, "ioctl", 0); - /* go in user-space by catching signal */ + /* go back in user-space by catching signal */ if (err) goto out; } @@ -523,7 +540,7 @@ /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ case IOCTL_SYNC_TAIL: RINGMAP_LOCK(rm); - rm->funcs->sync_tail(co); + rm->funcs->set_tail(co->ring->userrp, co->hw_rx_ring); RINGMAP_UNLOCK(rm); break; @@ -531,7 +548,7 @@ bpf_prog = (struct bpf_program *)data; flen = bpf_prog->bf_len; if (flen > BPF_MAXINSNS) { - RINGMAP_ERROR("IOCTL_SETFILTER"); + RINGMAP_ERROR("bf_len > BPF_MAXINSNS"); err = EINVAL; goto out; } @@ -540,7 +557,7 @@ fcode = (struct bpf_insn *)malloc(size, M_BPF, M_WAITOK); if (copyin((caddr_t)bpf_prog->bf_insns, (caddr_t)fcode, size) == 0 && - bpf_validate(fcode, (int)flen)) { + bpf_validate(fcode, (int)flen)) { co->fcode = (struct bpf_insn *)fcode; } else { RINGMAP_ERROR("Could not set filter"); @@ -548,7 +565,12 @@ err = EINVAL; goto out; } - + + /* + * Everything went Ok. Set the filtering function + * Think about hardware support for packet filtering! + */ + co->rm->funcs->pkt_filter = ringmap_bpf_filter; break; default: @@ -564,22 +586,102 @@ } -/* Paket filtering */ -int -ringmap_filter(struct capt_object *co, int slot_num) +int +set_slot(struct capt_object *co, unsigned int slot_num) +{ + struct ring *ring = co->ring;; + struct ringmap *rm = co->rm; + +#if (__RINGMAP_DEB) + printf("[%s] Set slot: %d\n", __func__, slot_num); +#endif + + /* Now if everything is Ok, we can initialize ring pointers */ + ring->slot[slot_num].mbuf.kern = + (vm_offset_t)rm->funcs->get_mbuf(co->rx_buffers, slot_num); + ring->slot[slot_num].mbuf.phys = + (bus_addr_t)vtophys(ring->slot[slot_num].mbuf.kern); + + ring->slot[slot_num].packet.kern = + (vm_offset_t)rm->funcs->get_packet(co->rx_buffers, slot_num); + ring->slot[slot_num].packet.phys = + (bus_addr_t)vtophys(ring->slot[slot_num].packet.kern); + + return (0); +} + + +struct capt_object * +ringmap_delayed_isr(void *context, struct ringmap *rm) +{ + struct capt_object *co = NULL; + struct timeval last_ts; + + RINGMAP_INTR(start); + + RINGMAP_LOCK(rm); + /* Do the next steps only if there is capturing process */ + if (rm->open_cnt > 0) { + + /* TODO: do it through our set_timestamp() */ + getmicrotime(&last_ts); + + SLIST_FOREACH(co, &rm->object_list, objects) { + if (co->intr_context == context) { +#if (RINGMAP_INTR_DEB) + PRINT_RING_PTRS(co->ring); +#endif + rm->funcs->set_tail(co->ring->userrp, co->hw_rx_ring); + co->ring->last_ts = last_ts; + ++co->ring->intr_num; + break; + } + } + } + RINGMAP_UNLOCK(rm); + + RINGMAP_INTR(end); + + return(co); +} + + +void +per_packet_iteration(struct capt_object *co, int slot_num) +{ + struct ringmap *rm = co->rm; + + RINGMAP_INTR(start); + + co->ring->slot[slot_num].is_ok = 1; + co->ring->slot[slot_num].intr_num = co->ring->intr_num; + + if (rm->funcs->pkt_filter != NULL) + rm->funcs->pkt_filter(co, slot_num); + + co->ring->kernrp = slot_num; +#ifdef RINGMAP_TIMESTAMP + co->ring->slot[slot_num].ts = co->ring->last_ts; +#endif +#if (RINGMAP_INTR_DEB) + PRINT_SLOT(co->ring, slot_num); +#endif + + RINGMAP_INTR(end); +} + + +/* Paket filtering: wrapper around bpf_filter() */ +void +ringmap_bpf_filter(struct capt_object *co, int slot_num) { struct mbuf *mb = (struct mbuf *)K_MBUF(co->ring, slot_num); unsigned int pktlen = mb->m_len, slen; if (co->fcode != NULL) { slen = bpf_filter(co->fcode, (u_char *)mb, pktlen, 0); - if (slen) - co->ring->slot[slot_num].filtered = 1; - else - co->ring->slot[slot_num].filtered = 0; + co->ring->slot[slot_num].filtered = (slen + 1) ? slen:0; } - - return (0); } @@ -592,11 +694,6 @@ printf("=== Ring Kernel Addr:0x%X\n", (unsigned int)co->ring); - - /* Print addr of que only if multiqueue supported */ - if (co->que != NULL) - printf("=== Queue Kernel Addr:0x%X\n\n", - (unsigned int)co->que); } else { RINGMAP_WARN(NULL pointer: capturing object); } @@ -612,7 +709,6 @@ if (rm->dev == dev) return(rm); } - return(rm); } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#49 (text+ko) ==== @@ -1,4 +1,5 @@ -#define RING_SAFTY_MARGIN 2 +/* minimal distance between TAIL and HEAD */ +#define RING_SAFTY_MARGIN 1 /* * value for number of descriptors (a.k.a. slots in the ringbuffer) @@ -7,6 +8,7 @@ /* * Prefix for name of device (for example /dev/ringmap0 will full name) + * currently not used */ #define RINGMAP_DEVICE "ringmap" @@ -24,7 +26,7 @@ */ #define DEV_ID 0 -/* Enable/Disable Transiv. If 0, then the adapter will only receive pkts */ +/* Enable/Disable tranceive. If 0, then receive only */ #define RINGMAP_TX_ENABLE 0 /* 1 - enable time stamping in the driver */ @@ -40,10 +42,9 @@ }; /* - * This structure represents the ring slot. Each slot contains three - * entities: descriptor, mbuf and packet. The descriptore represents - * the hardware view of of packet. Mbuf represents the kernel view of - * packet. The packet represents the buffer where the packet data placed. + * This structure represents the ring slot. Each slot contains three entities: + * mbuf and packet. Mbuf represents the kernel view of packet. The packet + * represents the buffer where the packet data is placed. * * Each entity is of type 'struct address'. Struct 'address' contains * three addresses: physical-, kernel- and user-address. We need to store @@ -51,7 +52,6 @@ */ struct ring_slot { - struct address descriptor; struct address mbuf; struct address packet; @@ -85,19 +85,17 @@ struct ring { /* - * kernrp - ring HEAD. Should be changed ONLY in driver. And should be - * synchronized with the adapter-ring-HEAD register. Adapter increments - * the value in its HEAD-register after storing the incomming packets - * in the RAM. The driver should in the ISR check the value in the - * adapter-HEAD-register and set this value in kernrp. + * kernrp - ring HEAD. Must be changed ONLY in driver through synchronizing + * with ring-HEAD controller register. Adapter increments the value in its + * HEAD-register after storing the incomming packets in the RAM. The driver + * is responsible for synchronization kernrp with HEAD-register. */ unsigned int volatile kernrp; /* - * userrp - ring TAIL. Should be incremented by user space software after - * reading the slots with a new received packets. The driver, while - * executing ISR shoud check the value in userrp and set this value in - * the adapter-TAIL-register. + * userrp - ring TAIL. Must be incremented only in user space after + * reading a slot with a new received packet. The driver, while executing + * ISR shoud check userrp and set this value in the adapter-TAIL-register. */ unsigned int volatile userrp; @@ -117,7 +115,7 @@ unsigned long long kern_wait_user; /* - * Number of times the user process bumps into the HEAD. + * Number of times the TAIL bumps into the HEAD. * * A.K.A. User process has read everything there is to read in the ring. */ @@ -138,7 +136,7 @@ /* TODO: use other ID. Using PID is a wrong way */ unsigned int pid; - /* Array of slots */ + /* Array of slots (A.K.A packet buffers) */ struct ring_slot volatile slot[SLOTS_NUMBER]; }; @@ -266,6 +264,8 @@ #endif #ifndef __RINGMAP_DEB +#define __RINGMAP_DEB 0 +#elif #define __RINGMAP_DEB 1 #endif @@ -346,5 +346,5 @@ #ifdef _KERNEL -#include +#include "ringmap_kernel.h" #endif ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#19 (text+ko) ==== @@ -5,10 +5,30 @@ struct thread *td; struct ring *ring; - void *que; + + /* + * Pointers to the structures allocated in the generic driver for accesisng + * hardware registers related to the rx/tx queues associated with our + * capturing object. + */ + void *hw_rx_ring, *hw_tx_ring; + + /* + * Pointer to the arrays allocated in the generic driver for accessing + * rx/tx buffers and descriptors. + */ + void *rx_buffers, *tx_buffers, *rx_desc_base, *tx_desc_base; + /* Packet filtering code. */ struct bpf_insn *fcode; + /* + * Source of interrupts affecting our capturing object. It can be adapter, + * device or queue structure. + */ + void *intr_context; + + /* Let's concatenate our objects */ SLIST_ENTRY(capt_object) objects; }; @@ -20,20 +40,19 @@ * device and driver structures */ struct ringmap { - /* Device structure of network adapter */ + /* Device structure */ device_t dev; - /* Char device for communications between user and kernel spaces */ + /* Char device for communications between user and ringmap */ struct cdev *cdev; - /* Number of processes that opened cdev. + /* Number of threads that opened cdev. * A.K.A. number of capturing objects */ uint32_t volatile open_cnt; /* Hardware dependent functions */ struct ringmap_functions *funcs; - /* Mutex that should protect the data allocated in the ring */ struct mtx ringmap_mtx; /* Head of the list of capturing objects */ @@ -49,59 +68,60 @@ struct ringmap_functions { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 17 22:52:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AA941065694; Sun, 17 Oct 2010 22:52: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 5C409106567A for ; Sun, 17 Oct 2010 22:52:54 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 477188FC12 for ; Sun, 17 Oct 2010 22:52:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HMqsss004559 for ; Sun, 17 Oct 2010 22:52:54 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HMqrGa004556 for perforce@freebsd.org; Sun, 17 Oct 2010 22:52:53 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sun, 17 Oct 2010 22:52:53 GMT Message-Id: <201010172252.o9HMqrGa004556@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 22:52:54 -0000 http://p4web.freebsd.org/@@184839?ac=10 Change 184839 by dforsyth@skunk on 2010/10/17 22:51:57 drop pkg_property. fetched structs are safe from the client. Affected files ... .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.c#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.h#2 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.c#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_internal.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.c#3 delete .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/property.h#3 delete .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/util.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_dump/pkg_dump.c#3 edit Differences ... ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/Makefile#5 (text+ko) ==== @@ -11,7 +11,6 @@ SRCS= pkg.c \ - property.c \ database.c \ repository.c \ freebsd_plist.c \ ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#4 (text+ko) ==== @@ -132,7 +132,8 @@ } struct pkg * -pkg_db_add(struct pkg_db *db, const char *key) +pkg_db_add(struct pkg_db *db, const char *name, const char *origin, + const char *comment, const char *description) { struct pkg *pkg; @@ -142,7 +143,7 @@ } /* Do the add and set up pkg. */ - if (db->add(db, pkg, key) != PKG_OK) { + if (db->add(db, pkg, name, origin, comment, description) != PKG_OK) { pkg_free(pkg); return (NULL); } ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#4 (text+ko) ==== @@ -25,7 +25,8 @@ * allocates a package if the package is NOT already in the db. */ /* Create a pkg in a pkg_db. If the pkg already exists, returns NULL. */ -struct pkg *pkg_db_add(struct pkg_db *, const char *); +struct pkg *pkg_db_add(struct pkg_db *, const char *, const char *, + const char *, const char *); /* Get a pkg from a pkg_db. If the package does not exist, returns NULL. */ struct pkg *pkg_db_get(struct pkg_db *, const char *); ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database_internal.h#4 (text+ko) ==== @@ -15,7 +15,9 @@ /* Internal db pointer for whatever backend is in use. */ void *internal; - int (*add) (struct pkg_db *, struct pkg *, const char *); + int (*add) (struct pkg_db *, struct pkg *, + const char *, const char *, const char *, + const char *); int (*close) (struct pkg_db *); int (*contains) (struct pkg_db *, const char *); int (*get) (struct pkg_db *, struct pkg *, ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.c#2 (text+ko) ==== @@ -1,5 +1,15 @@ +#include +#include +#include + #include "depend.h" +struct pkg_depend * +pkg_depend_alloc(void) +{ + return (calloc(1, sizeof(struct pkg_depend))); +} + const char * pkg_depend_name(struct pkg_depend *dep) { @@ -7,7 +17,25 @@ } const char * +pkg_depend_origin(struct pkg_depend *dep) +{ + return (dep->origin); +} + +const char * pkg_depend_version(struct pkg_depend *dep) { return (dep->name); } + +void +_pkg_depend_set_name(struct pkg_depend *dep, const char *name) +{ + strncpy(dep->name, name, PATH_MAX); +} + +void +_pkg_depend_set_origin(struct pkg_depend *dep, const char *origin) +{ + strncpy(dep->origin, origin, PATH_MAX); +} ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/depend.h#2 (text+ko) ==== @@ -1,16 +1,27 @@ #ifndef __LIBPKG_DEPEND_H__ #define __LIBPKG_DEPEND_H__ +#include +#include + struct pkg_depend { char name[PATH_MAX]; - char version[PATH_MAX]; + char version[256]; + char origin[PATH_MAX]; TAILQ_ENTRY(pkg_depend) next; }; TAILQ_HEAD(pkg_depend_list, pkg_depend); +struct pkg_depend *pkg_depend_alloc(void); const char *pkg_depend_name(struct pkg_depend *); +const char *pkg_depend_origin(struct pkg_depend *); const char *pkg_depend_version(struct pkg_depend *); +void _pkg_depend_set_name(struct pkg_depend *, + const char *); +void _pkg_depend_set_origin(struct pkg_depend *, + const char *); + #endif ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.c#2 (text+ko) ==== @@ -1,7 +1,11 @@ #include #include +#include #include "file.h" +#include "util.h" + +/* Files can only be created or deleted, never modified. */ struct pkg_file * pkg_file_alloc(void) @@ -12,11 +16,66 @@ const char * pkg_file_prefix(struct pkg_file *file) { - return (file->prefix(file)); + return (file->prefix); +} + +void +_pkg_file_set_prefix(struct pkg_file *file, const char *prefix) +{ + strncpy(file->prefix, prefix, PATH_MAX); } const char * pkg_file_pathname(struct pkg_file *file) { - return (file->pathname(file)); + return (file->pathname); +} + +void +_pkg_file_set_pathname(struct pkg_file *file, const char *pathname) +{ + strncpy(file->pathname, pathname, PATH_MAX); +} + +int +pkg_file_ignore(struct pkg_file *file) +{ + return (file->ignore); +} + +void +_pkg_file_set_ignore(struct pkg_file *file) +{ + file->ignore = 1; +} + +const char * +pkg_file_hash(struct pkg_file *file) +{ + return (file->hash); +} + +const char * +pkg_file_update_hash(struct pkg_file *file) +{ + return (file->update_hash(file)); +} + +void +_pkg_file_set_hash(struct pkg_file *file, const char *hash) +{ + strncpy(file->hash, hash, 33); +} + +const struct stat * +pkg_file_stat(struct pkg_file *file) +{ + char final[PATH_MAX]; + + _pkg_util_path_join(final, file->prefix, file->pathname); + + /* there's no stat_r, are we thread safe? */ + if (stat(final, &file->sb) < 0) return (NULL); + + return ((const struct stat *)&file->sb); } ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.h#2 (text+ko) ==== @@ -14,9 +14,14 @@ /* The package that this file is in. */ struct pkg *pkg; - - const char *(*prefix) (struct pkg_file *); - const char *(*pathname) (struct pkg_file *); + + char prefix[PATH_MAX]; + char pathname[PATH_MAX]; + int ignore; + + char hash[33]; + + const char *(*update_hash) (struct pkg_file *); TAILQ_ENTRY(pkg_file) next; }; @@ -27,7 +32,16 @@ const char *pkg_file_prefix(struct pkg_file *); const char *pkg_file_pathname(struct pkg_file *); +int pkg_file_ignore(struct pkg_file *); +const char *pkg_file_hash(struct pkg_file *); +const char *pkg_file_update_hash(struct pkg_file *); const struct stat *pkg_file_stat(struct pkg_file *); +void _pkg_file_set_prefix(struct pkg_file *, const char *); +void _pkg_file_set_pathname(struct pkg_file *, + const char *); +void _pkg_file_set_ignore(struct pkg_file *); +void _pkg_file_set_hash(struct pkg_file *, const char *); + #endif ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.c#4 (text+ko) ==== @@ -21,6 +21,7 @@ #include "freebsd_plist.h" #include "file.h" +#include "depend.h" struct _read_plist { struct pkg_property *plist; @@ -67,26 +68,14 @@ { 0, NULL, NULL }, }; -static const char *fbsd_directorydb_pkg_origin(struct pkg *); -static const char *fbsd_directorydb_pkg_name(struct pkg *); -static const char *fbsd_directorydb_pkg_comment(struct pkg *); -static const char *fbsd_directorydb_pkg_description(struct pkg *); -static const char *fbsd_directorydb_get_string_property( - struct _directorydb *, const char *, - const char *, uint32_t); -static struct pkg_property *fbsd_directorydb_get_plist( - struct _directorydb *, const char *); static int fbsd_directorydb_read_pkg( - struct _directorydb *, const char *, - struct pkg_property *, uint32_t); + struct _directorydb *, struct pkg *); static char *read_file(const char *); static int _read_plist_cmp(struct _read_plist *, struct _read_plist *); -static int dselect(const struct dirent *ent); -static void fbsd_pkg_setup(struct pkg_db *, - struct pkg *pkg, const char *key); -static int fbsd_directorydb_property_to_file( - struct pkg_property *, struct pkg_file *file); +static int dselect(const struct dirent *); +static void fbsd_directorydb_pkg_setup(struct pkg_db *, + struct pkg *, const char *); RB_GENERATE_STATIC(plist_head, _read_plist, entry, _read_plist_cmp); @@ -187,22 +176,19 @@ } static void -fbsd_pkg_setup(struct pkg_db *db, struct pkg *pkg, const char *key) +fbsd_directorydb_pkg_setup(struct pkg_db *db, struct pkg *pkg, const char *key) { - if (pkg == NULL) { - return; - } - pkg->magic = PKG_DIRDB_MAGIC; pkg->source = db; strcpy(pkg->key, key); - pkg->name = fbsd_directorydb_pkg_name; - pkg->origin = fbsd_directorydb_pkg_origin; - pkg->comment = fbsd_directorydb_pkg_comment; - pkg->description = fbsd_directorydb_pkg_description; - - pkg->files = fbsd_directorydb_files; + pkg->add_file = fbsd_directorydb_add_file; + + pkg->files = malloc(sizeof(*pkg->files)); + TAILQ_INIT(pkg->files); + + pkg->depends = malloc(sizeof(*pkg->depends)); + TAILQ_INIT(pkg->depends); } struct pkg_list * @@ -225,7 +211,14 @@ TAILQ_INIT(list); for (int i = 0; i < c; ++i) { pkg = pkg_alloc(); - fbsd_pkg_setup(db, pkg, ents[i]->d_name); + /* XXX: I should just do a get here. */ + fbsd_directorydb_pkg_setup(db, pkg, ents[i]->d_name); + /* XXX: For now just hit every mask. */ + if (fbsd_directorydb_read_pkg(d, pkg) != PKG_OK) { + /* Do clean up */ + printf("bad read\n"); + return (NULL); + } TAILQ_INSERT_TAIL(list, pkg, next); free(ents[i]); } @@ -234,109 +227,15 @@ return (list); } -#define fbsd_directorydb_list(fn_name, list_type, type, list_name, data_loc, converter) \ -struct list_type * \ -fn_name(struct pkg *pkg) \ -{ \ - struct type *a; \ - struct pkg_property *plist; \ - struct pkg_property *property_list; \ - struct pkg_property *property_node; \ - struct list_type *list; \ - struct _directorydb *d; \ - struct pkg_db *db; \ - const char *key; \ - list = malloc(sizeof(*list)); \ - if (list == NULL) return (NULL); \ - TAILQ_INIT(list); \ - db = pkg->source; \ - d = db->internal; \ - key = pkg->key; \ - plist = fbsd_directorydb_get_plist(d, key); \ - if (plist == NULL) return (NULL); \ - property_list = pkg_property_dict_get_property(plist, list_name); \ - if (property_list == NULL) { \ - fbsd_directorydb_read_pkg(d, key, plist, data_loc); \ - property_list = pkg_property_dict_get_property(plist, \ - list_name); \ - } \ - if (property_list == NULL) return (NULL); \ - property_node = NULL; \ - while ((property_node = pkg_property_list_get_next_property( \ - property_list, property_node)) != NULL) { \ - a = malloc(sizeof(*a)); \ - converter(property_node, a); \ - TAILQ_INSERT_TAIL(list, a, next); \ - } \ - return (list); \ -} - -fbsd_directorydb_list(fbsd_directorydb_files, pkg_file_list, pkg_file, FBSD_FILES, - CONTENTS, fbsd_directorydb_property_to_file); - -#if 0 -struct pkg_file_list * -fbsd_directorydb_files(struct pkg *pkg) +struct pkg_file * +fbsd_directorydb_add_file(struct pkg *pkg, const char *prefix, + const char *pathname) { - struct pkg_file *file; - struct pkg_property *plist; - struct pkg_property *file_list; - struct pkg_property *file_node; - struct pkg_file_list *list; - struct _directorydb *d; - struct pkg_db *db; - const char *key; - - list = malloc(sizeof(*list)); - if (list == NULL) return (NULL); - TAILQ_INIT(list); - - db = pkg->source; - d = db->internal; - key = pkg->key; - - plist = fbsd_directorydb_get_plist(d, key); - if (plist == NULL) { - return (NULL); - } - - - file_list = pkg_property_dict_get_property(plist, FBSD_FILES); - if (file_list == NULL) { - fbsd_directorydb_read_pkg(d, key, plist, CONTENTS); - file_list = pkg_property_dict_get_property(plist, FBSD_FILES); - } - if (file_list == NULL) { - return (NULL); - } - - file_node = NULL; - while ((file_node = pkg_property_list_get_next_property(file_list, - file_node)) != NULL) { - file = pkg_file_alloc(); - fbsd_directorydb_property_to_file(file_node, file); - TAILQ_INSERT_TAIL(list, file, next); - } - - return (list); + (void)pkg; + (void)prefix; + (void)pathname; + return (NULL); } -#endif - -static int -fbsd_directorydb_property_to_file(struct pkg_property *node, - struct pkg_file *file) -{ - struct pkg_property *string; - - /* Should probably assert that node is a dict... */ - - string = pkg_property_dict_get_property(node, FBSD_PATHNAME); - strcpy(file->pathname, pkg_property_string_get_string(string)); - string = pkg_property_dict_get_property(node, FBSD_PREFIX); - strcpy(file->prefix, pkg_property_string_get_string(string)); - - return (PKG_OK); -} int fbsd_directorydb_contains(struct pkg_db *db, const char *key) @@ -359,7 +258,8 @@ } int -fbsd_directorydb_add(struct pkg_db *db, struct pkg *pkg, const char *name) +fbsd_directorydb_add(struct pkg_db *db, struct pkg *pkg, const char *name, + const char *origin, const char *comment, const char *description) { struct _directorydb *d; char path[PATH_MAX]; @@ -376,15 +276,17 @@ pkg->magic = PKG_DIRDB_MAGIC; pkg->source = db; pkg->plist = NULL; + + strncpy(pkg->origin, origin, PATH_MAX); + strncpy(pkg->name, name, PATH_MAX); + strncpy(pkg->comment, comment, 120); + pkg->description = strdup(description); - pkg->origin = fbsd_directorydb_pkg_origin; - pkg->name = fbsd_directorydb_pkg_name; - return (r == 0 ? PKG_OK : PKG_NOT_OK); } int -fbsd_directorydb_get(struct pkg_db *db, struct pkg *pkg, const char *name) +fbsd_directorydb_get(struct pkg_db *db, struct pkg *pkg, const char *key) { struct _directorydb *d; char path[PATH_MAX]; @@ -394,134 +296,21 @@ strcpy(path, d->path); strcat(path, "/"); - strcat(path, name); + strcat(path, key); if (stat(path, &sb) < 0) { - printf("no stat %s\n", name); + printf("no stat %s\n", key); return (PKG_NOT_OK); } - pkg->magic = PKG_DIRDB_MAGIC; - pkg->source = db; - pkg->plist = NULL; - - pkg->origin = fbsd_directorydb_pkg_origin; - pkg->name = fbsd_directorydb_pkg_name; + fbsd_directorydb_pkg_setup(db, pkg, key); + fbsd_directorydb_read_pkg(d, pkg); return (PKG_OK); } -static const char * -fbsd_directorydb_pkg_origin(struct pkg *pkg) -{ - struct pkg_db *db; - struct _directorydb *d; - - _pkg_check_magic(pkg); - - db = pkg->source; - _db_check_magic(db); - d = db->internal; - - return (fbsd_directorydb_get_string_property(d, pkg->key, FBSD_ORIGIN, - CONTENTS)); -} - -static const char * -fbsd_directorydb_pkg_name(struct pkg *pkg) -{ - struct pkg_db *db; - struct _directorydb *d; - - _pkg_check_magic(pkg); - - db = pkg->source; - _db_check_magic(db); - d = db->internal; - - - return (fbsd_directorydb_get_string_property(d, pkg->key, FBSD_NAME, - CONTENTS)); -} - -static const char * -fbsd_directorydb_pkg_comment(struct pkg *pkg) -{ - struct pkg_db *db; - struct _directorydb *d; - - _pkg_check_magic(pkg); - db = pkg->source; - _db_check_magic(db); - d = db->internal; - - return (fbsd_directorydb_get_string_property(d, pkg->key, - FBSD_METANAME_COMMENT, COMMENT)); -} - -static const char * -fbsd_directorydb_pkg_description(struct pkg *pkg) -{ - struct pkg_db *db; - struct _directorydb *d; - - _pkg_check_magic(pkg); - db = pkg->source; - _db_check_magic(db); - d = db->internal; - - return (fbsd_directorydb_get_string_property(d, pkg->key, - FBSD_METANAME_DESCRIPTION, DESCRIPTION)); -} - -static const char * -fbsd_directorydb_get_string_property(struct _directorydb *d, const char *key, - const char *pname, uint32_t from) -{ - struct pkg_property *plist; - struct pkg_property *pnode; - - if ((plist = fbsd_directorydb_get_plist(d, key)) == NULL) { - return (NULL); - } - - pnode = pkg_property_dict_get_property(plist, pname); - if (pnode == NULL) { - /* If we can't find the string property that we want, do a parse - * of from and look again. */ - fbsd_directorydb_read_pkg(d, key, plist, from); - pnode = pkg_property_dict_get_property(plist, pname); - } - if (pnode == NULL) { - return (NULL); - } - - return (pkg_property_string_get_string(pnode)); -} - -static struct pkg_property * -fbsd_directorydb_get_plist(struct _directorydb *d, const char *key) -{ - struct _read_plist needle; - struct _read_plist *found; - struct pkg_property *plist; - - strcpy(needle.key, key); - - found = RB_FIND(plist_head, &d->plist_head, &needle); - if (found == NULL) { - plist = pkg_property_dict_create(NULL, ""); - found = calloc(1, sizeof(*found)); - found->plist = plist; - RB_INSERT(plist_head, &d->plist_head, found); - } - - return (found->plist); -} - static int -fbsd_directorydb_read_pkg(struct _directorydb *d, const char *key, - struct pkg_property *plist, uint32_t from) +fbsd_directorydb_read_pkg(struct _directorydb *d, struct pkg *pkg) { struct pkg_info *pi; char path[PATH_MAX]; @@ -529,28 +318,15 @@ int r; for (pi = pkg_entries; pi->info_name != NULL; pi++) { - if (from & pi->info_mask) { - strcpy(path, d->path); - strcat(path, "/"); - strcat(path, key); - strcat(path, "/"); - strcat(path, pi->file_name); + _pkg_util_path_join(path, d->path, pkg->key); + _pkg_util_path_join(path, path, pi->file_name); + + if ((data = read_file(path)) == NULL) continue; - data = read_file(path); - /* For now... just assume a null means the file DNE... */ - if (data == NULL) { - continue; - } - - r = fbsd_plist_parse(plist, data, pi->info_name); - free(data); - if (r != PKG_OK) { - pkg_property_release(plist); - return (r); - } - } + r = fbsd_plist_parse(pkg, data, pi->info_name); + if (r != PKG_OK) return (r); } - + return (PKG_OK); } ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_database_directorydb.h#4 (text+ko) ==== @@ -9,7 +9,7 @@ #include "internal.h" /* For type declarations. */ int fbsd_directorydb_add(struct pkg_db *, struct pkg *, - const char *); + const char *, const char *, const char *, const char *); /* Test if a key exists. */ int fbsd_directorydb_contains(struct pkg_db *, const char *); @@ -25,6 +25,9 @@ int fbsd_directorydb_close(struct pkg_db *); /* Returns a pkg_list of all the packages in a database. */ struct pkg_list *fbsd_directorydb_all(struct pkg_db *); +/* Returns a newly created file in a package. */ +struct pkg_file *fbsd_directorydb_add_file(struct pkg *, const char *, + const char *); /* Returns a pkg_file_list of all files in a package. */ struct pkg_file_list *fbsd_directorydb_files(struct pkg *); /* Returns a pkg_depend_list of all dependencies in a package. */ @@ -34,6 +37,6 @@ const char *fbsd_directorydb_file_prefix(struct pkg_file *); const char *fbsd_directorydb_file_pathname(struct pkg_file *); -const char *fbsd_directorydb_depend_name +const char *fbsd_directorydb_depend_name(struct pkg_depend *); #endif ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/freebsd_plist.c#4 (text+ko) ==== @@ -18,6 +18,9 @@ #include "pkg.h" +#include "file.h" +#include "depend.h" + /* * Standard Plist commands in pkg format revision 1.1. */ @@ -100,41 +103,38 @@ */ struct plist_parse_state { - struct pkg_property *current_p; /* Whatever node we're building. */ - struct pkg_property *conflict_list; char cwd[PATH_MAX]; - struct pkg_property *depend_list; - struct pkg_property *exec_list; - struct pkg_property *file_list; + int ignore; unsigned int last; unsigned long line_number; - struct pkg_property *plist; /* PList root. */ - struct pkg_property *dirrm_list; - struct pkg_property *unexec_list; + + struct pkg *pkg; + struct pkg_file *current_file; + struct pkg_depend *current_dep; }; /* CONTENTS parsers functions. */ -static int _fbsd_plist_contents_parse(struct pkg_property *pl, char *buff); +static int _fbsd_plist_contents_parse(struct pkg *, char *); /* XXX: DNE */ #if 0 static int _fbsd_plist_contents_parse_fd(struct pkg_property *pl, int fd, size_t len); #endif -static int _fbsd_plist_parse_contents_line(const char *, struct pkg_property *, +static int _fbsd_plist_parse_contents_line(const char *, struct pkg *, struct plist_parse_state *); -static inline int _fbsd_plist_parse_contents_command(struct pkg_property *, +static inline int _fbsd_plist_parse_contents_command(struct pkg *, struct plist_parse_state *, const char *, const char *); -static int _fbsd_plist_parse_contents_option(struct pkg_property *, +static int _fbsd_plist_parse_contents_option(struct pkg *, struct plist_parse_state *, const char *); -static int _fbsd_plist_parse_contents_comment(struct pkg_property *, +static int _fbsd_plist_parse_contents_comment(struct pkg *, struct plist_parse_state *, const char *); /* Initializer for the contents parse state. */ static void _fbsd_plist_parse_contents_init(struct plist_parse_state *, - struct pkg_property *); + struct pkg *); /* REQUIRED_BY parsers functions. */ -static int _fbsd_plist_required_by_parse(struct pkg_property *pl, char *); +static int _fbsd_plist_required_by_parse(struct pkg *, char *); /* XXX: DNE */ #if 0 static int _fbsd_plist_required_by_parse_fd(struct pkg_property *, int, @@ -143,7 +143,7 @@ /* Blob 'parsers' for all other meta information. These just read/copy * information into PLSTRING property nodes. */ -static int _fbsd_plist_generic_parse(struct pkg_property *, char *, const char *); +static int _fbsd_plist_generic_parse(struct pkg *, char *, const char *); /* Write contents line. */ #if 0 @@ -159,19 +159,19 @@ /* PARSE */ int -fbsd_plist_parse(struct pkg_property *plist, char *data, const char *name) +fbsd_plist_parse(struct pkg *pkg, char *data, const char *name) { switch (name[0]) { case ('C'): case ('R'): if (STRMATCH(name, "CONTENTS")) { - return (_fbsd_plist_contents_parse(plist, data)); + return (_fbsd_plist_contents_parse(pkg, data)); } else if (STRMATCH(name, "REQUIRED_BY")) { - return (_fbsd_plist_required_by_parse(plist, data)); + return (_fbsd_plist_required_by_parse(pkg, data)); } /* FALLTHROUGH */ default: - return (_fbsd_plist_generic_parse(plist, data, name)); + return (_fbsd_plist_generic_parse(pkg, data, name)); } /* NOT REACHED */ @@ -188,41 +188,28 @@ * check for them everytime we want to add a property. */ static void _fbsd_plist_parse_contents_init(struct plist_parse_state *ps, - struct pkg_property *pl) + struct pkg *pkg) { - ps->conflict_list = NULL; - ps->current_p = NULL; - ps->depend_list = NULL; - ps->file_list = NULL; + ps->current_file = NULL; + ps->current_dep = NULL; + ps->ignore = 0; ps->line_number = 0; ps->last = PLIST_NONE; - ps->plist = pl; + ps->pkg = pkg; strcpy(ps->cwd, CWD_DEFAULT); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->conflict_list, - FBSD_CONFLICTS); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->depend_list, - FBSD_DEPENDENCIES); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->file_list, - FBSD_FILES); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->exec_list, - FBSD_EXECS); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->unexec_list, - FBSD_UNEXECS); - PLDICT_GET_OR_CREATE_LIST_PROPERTY(ps->plist, ps->dirrm_list, - FBSD_DIRRMS); } static int -_fbsd_plist_contents_parse(struct pkg_property *pl, char *buff) +_fbsd_plist_contents_parse(struct pkg *pkg, char *buff) { char *line; struct plist_parse_state ps; - _fbsd_plist_parse_contents_init(&ps, pl); - while ((line = strsep(&buff, "\n")) != NULL) { - if (_fbsd_plist_parse_contents_line(line, pl, &ps) != + _fbsd_plist_parse_contents_init(&ps, pkg); + while ((line = strsep(&buff, "\n")) != NULL) { + if (_fbsd_plist_parse_contents_line(line, pkg, &ps) != PKG_OK) { PKG_CLIENT_WARNING("parse failed."); return (PKG_NOT_OK); @@ -232,40 +219,13 @@ return (PKG_OK); } -/* XXX: These DO NOT check *anything*. */ - -/* Avoid duplicate plist entries. */ -#define ADD_SET_STRING_PROPERTY(root, new, pname, pvalue) \ -new = pkg_property_dict_get_property(root, pname); \ -if (new == NULL) { \ - new = pkg_property_string_create(root, pname); \ -} \ -pkg_property_string_set_string(new, pvalue) - -#define ADD_BOOLEAN_PROPERTY(root, new, pname, pvalue) \ -new = pkg_property_boolean_create(root, pname); \ -if (pvalue) { \ - pkg_property_boolean_set_true(new); \ -} else { \ - pkg_property_boolean_set_false(new); \ -} - -#define ADD_SET_DICT_PROPERTY(root, new, pname) \ -new = pkg_property_dict_create(root, pname) - -/* Append a string property to a list. */ -#define APPEND_SET_STRING_PROPERTY(root, new, pname, pvalue) \ -new = pkg_property_string_create(root, pname); \ -pkg_property_string_set_string(new, pvalue) - static int -_fbsd_plist_parse_contents_line(const char *line, struct pkg_property *pl, +_fbsd_plist_parse_contents_line(const char *line, struct pkg *pkg, struct plist_parse_state *ps) { const char *arg; char *cmdp; char cmd[LINE_MAX]; - struct pkg_property *p; /* Instead of using sscanf() [SLOW AS BALLS], use this method from * plist.c in the current pkg_install tools. */ @@ -283,26 +243,27 @@ } ++cmdp; ++arg; } - + switch (cmd[0]) { case (CMD_PREFIX): - if (_fbsd_plist_parse_contents_command(pl, ps, - cmd + 1, arg)!= PKG_OK) { + if (_fbsd_plist_parse_contents_command(ps->pkg, ps, + cmd + 1, arg) != PKG_OK) { return (PKG_NOT_OK); } break; default: - /* Now, we create a file dictionary node in the file list. */ - ps->current_p = pkg_property_dict_create(ps->file_list, - FBSD_FILE); - if (ps->current_p == NULL) { + ps->current_file = pkg_file_alloc(); + if (ps->current_file == NULL) { PKG_CLIENT_WARNING("allocation error"); return (PKG_NOT_OK); } - /* Add whatever file properties we can from the parse state. */ - ADD_SET_STRING_PROPERTY(ps->current_p, p, FBSD_PATHNAME, cmd); - ADD_SET_STRING_PROPERTY(ps->current_p, p, FBSD_PREFIX, ps->cwd); - ADD_BOOLEAN_PROPERTY(ps->current_p, p, FBSD_IGNORE, ps->ignore); + + _pkg_file_set_prefix(ps->current_file, ps->cwd); + _pkg_file_set_pathname(ps->current_file, cmd); + if (ps->ignore) _pkg_file_set_ignore(ps->current_file); + + _pkg_append_file(pkg, ps->current_file); + /* Reset ignore. */ ps->ignore = 0; ps->last = PLIST_FILE; @@ -313,12 +274,9 @@ } static int -_fbsd_plist_parse_contents_command(struct pkg_property *pl, +_fbsd_plist_parse_contents_command(struct pkg *pkg, struct plist_parse_state *ps, const char *command, const char *argument) { - struct pkg_property *pn; - struct pkg_property *nn; - /* Use two levels of switching to try and narrow the command * possibilities down before do a complete strcmp. */ switch (command[0]) { @@ -328,14 +286,15 @@ if (STRMATCH(command, CMD_COMMENT)) { /* @comment */ return (_fbsd_plist_parse_contents_comment( - pl, ps, argument)); + pkg, ps, argument)); } else if (STRMATCH(command, CMD_CONFLICTS)) { /* @conflicts */ - /* I'd really like this to become a PLDICT at - * some point, but right now it's a waste. */ - APPEND_SET_STRING_PROPERTY(ps->conflict_list, - nn, FBSD_CONFLICT, argument); + #if 0 + ps->current_conflict = pkg_conflict_alloc(); + _pkg_conflict_set_expr(conflict, argument); + _pkg_append_conflict(pkg, conflict); ps->last = PLIST_CONFLICT; + #endif return (PKG_OK); } break; @@ -354,8 +313,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 17 23:35:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2041A1065674; Sun, 17 Oct 2010 23:35: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 87D3C1065672 for ; Sun, 17 Oct 2010 23:35:37 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6B34C8FC15 for ; Sun, 17 Oct 2010 23:35:37 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9HNZbJd024942 for ; Sun, 17 Oct 2010 23:35:37 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9HNZbRx024939 for perforce@freebsd.org; Sun, 17 Oct 2010 23:35:37 GMT (envelope-from afiveg@FreeBSD.org) Date: Sun, 17 Oct 2010 23:35:37 GMT Message-Id: <201010172335.o9HNZbRx024939@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2010 23:35:38 -0000 http://p4web.freebsd.org/@@184840?ac=10 Change 184840 by afiveg@cottonmouth on 2010/10/17 23:35:27 Small fixes: in the ringmap_detach() lock is set and extra cheking whether the list is empty. Moving locks in clear_capt_obj() Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#50 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#32 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#33 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#27 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#50 (text+ko) ==== @@ -73,7 +73,7 @@ /* * The function should be called from attach function of generic network driver. * Here the ringmap structure is allocated and the character special device for - * the communication with user is created. + * the communication with user is created. Also default ringmap functions are set. */ struct ringmap * ringmap_attach(device_t dev, struct ringmap_functions *rf) @@ -125,7 +125,7 @@ /* Insert ringmap structure into the list */ SLIST_INSERT_HEAD(&ringmap_list_head, rm, entries); - /* Init the mutex to protecting our data */ + /* Init the mutex for protecting our data */ RINGMAP_LOCK_INIT(rm, device_get_nameunit(dev)); /* @@ -147,7 +147,7 @@ * ringmap */ return (rm); -} +} /* @@ -174,14 +174,21 @@ clear_capt_object((void *)co); } + RINGMAP_LOCK(rm); + /* To be sure */ + if (!SLIST_EMPTY(&rm->object_list)) { + RINGMAP_WARN(There are still active capturing objects); + } /* Destroy char device associated with ringmap */ if (rm->cdev != NULL) destroy_dev(rm->cdev); - RINGMAP_LOCK_DESTROY(rm); - /* And remove ringmap from global list */ SLIST_REMOVE(&ringmap_list_head, rm, ringmap, entries); + + RINGMAP_UNLOCK(rm); + + RINGMAP_LOCK_DESTROY(rm); FREE(rm, M_DEVBUF); @@ -192,7 +199,7 @@ /****************************************************************** - * This func will called as result of open(2). Here we allocate + * This func is called as result of open(2). Here we allocate * the memory for the new ring and capt_object structure (so called * capturing object). Capturing object represents the thread with * its ring. @@ -355,10 +362,8 @@ co = (struct capt_object *)data; + RINGMAP_LOCK(co->rm); if (co != NULL) { - - RINGMAP_LOCK(co->rm); - rm = co->rm; #if (__RINGMAP_DEB) printf("[%s] Object to delete:\n", __func__); @@ -376,12 +381,10 @@ } else { RINGMAP_WARN(Incorrect value of rm->open_cnt); } - - RINGMAP_UNLOCK(rm); - } else { RINGMAP_FUNC_DEBUG(NULL pointer to the capturing object!); } + RINGMAP_UNLOCK(rm); RINGMAP_FUNC_DEBUG(end); } ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#32 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#33 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#27 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Oct 18 17:56:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C24F106566B; Mon, 18 Oct 2010 17:56: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 E2C4C1065675 for ; Mon, 18 Oct 2010 17:56:43 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CE3A98FC20 for ; Mon, 18 Oct 2010 17:56:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9IHuhJb054718 for ; Mon, 18 Oct 2010 17:56:43 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9IHuh42054715 for perforce@freebsd.org; Mon, 18 Oct 2010 17:56:43 GMT (envelope-from afiveg@FreeBSD.org) Date: Mon, 18 Oct 2010 17:56:43 GMT Message-Id: <201010181756.o9IHuh42054715@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2010 17:56:44 -0000 http://p4web.freebsd.org/@@184865?ac=10 Change 184865 by afiveg@cottonmouth on 2010/10/18 17:55:43 Initialization of ring and association it with the capturing object is moved to ioctl IOCTL_ATTACH_RING. I've done it in order make it easier the attachment of certain queues to the capturing object in case if we have to do with multiqueue controller. Affected function: ringmap_ioctl. Two new ioctls: IOCTL_GETQUEUE_NUM, IOCTL_ATTACH_RING. Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#35 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#36 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#51 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#50 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#20 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#33 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#34 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#28 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#35 (text+ko) ==== @@ -43,7 +43,7 @@ int init_mmapped_capturing(const char *device, pcap_t *p) { - int devmem_fd, i; + int devmem_fd, i, queue_num; void *tmp_addr; char dev_path[1024]; off_t memoffset = 0; @@ -70,7 +70,7 @@ } /** - ** !!! Very important piece of code !!! + ** !!! Very important !!! ** ** Here we map the ring structure into the ** memory space of current process. @@ -80,6 +80,11 @@ return (-1); } + /* TODO: extend this for multiple queue case */ + queue_num = DEFAULT_QUEUE; + /* Attach and init the ring to our thread */ + ioctl(ringmap_cdev_fd, IOCTL_ATTACH_RING, &queue_num); + #if (__RINGMAP_DEB) printf("[%s] Phys addr of ring 0x%X\n", __func__, ring); #endif @@ -101,10 +106,6 @@ RINGMAP_ERROR("Wrong size of ring buffer!"); return -1; } - if (p->ring->pid != getpid() ){ - RINGMAP_ERROR(Wrong ring was mapped! Exit!); - return (-1); - } #if (__RINGMAP_DEB) printf("Virtual address of ring is 0x%X\n", p->ring); ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#36 (text+ko) ==== @@ -25,7 +25,7 @@ struct mbuf * rm_8254_get_mbuf(void *buffer_area, unsigned int num); vm_offset_t rm_8254_get_packet(void *buffer_area, unsigned int num); vm_offset_t rm8254_get_rx_desc(void * rx_desc_area, unsigned int num); - +int rm_8245_get_queuesnum(void); extern devclass_t em_devclass; @@ -41,6 +41,7 @@ .get_packet = rm_8254_get_packet, .set_queue = rm_8254_set_queue, .pkt_filter = NULL, + .get_queuesnum = rm_8245_get_queuesnum, }; @@ -52,6 +53,13 @@ } +int +rm_8245_get_queuesnum() +{ + return (1); +} + + vm_offset_t rm_8254_get_packet(void *buffer_area, unsigned int num) { ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#51 (text+ko) ==== @@ -263,40 +263,12 @@ } ring->size = SLOTS_NUMBER; - ring->pid = td->td_proc->p_pid; /* Unneeded thing. TODO: Replace it with somth more resonable */ co->ring = ring; co->td = td; co->rm = rm; - /* The next should be probably done in the ioctl() */ -#ifdef DEFAULT_QUEUE - /* Associate the capturing object with a queue */ - if (rm->funcs->set_queue(co, DEFAULT_QUEUE) == -1) { - RINGMAP_ERROR(Can not associate que with the capturing object!); - - contigfree(ring, sizeof(struct ring), M_DEVBUF); - FREE(co, M_DEVBUF); - err = EIO; goto out; - } -#endif - - /* Init ring-slots with mbufs and packets adrresses */ - for (i = 0 ; i < SLOTS_NUMBER ; i++) { - if (set_slot(co, i) == -1){ - RINGMAP_ERROR(Ring initialization failed!); - - contigfree(ring, sizeof(struct ring), M_DEVBUF); - FREE(co, M_DEVBUF); - - err = EIO; goto out; - } -#if (__RINGMAP_DEB) - PRINT_SLOT(ring, i); -#endif - } - /* * Insert the capturing object in the single linked list */ @@ -487,7 +459,7 @@ ringmap_ioctl (struct cdev *cdev, u_long cmd, caddr_t data, int fflag, struct thread *td) { - int err = 0, err_sleep = err_sleep, size, flen; + int err = 0, err_sleep = err_sleep, size, flen, qn, i; struct ringmap *rm = NULL; struct capt_object *co; @@ -576,6 +548,37 @@ co->rm->funcs->pkt_filter = ringmap_bpf_filter; break; + /* Tell to user how many queues we have */ + case IOCTL_GETQUEUE_NUM: + qn = rm->funcs->get_queuesnum(); + *(int *)data = qn; + break; + + /* Associate the ring/queue with the capturing object */ + case IOCTL_ATTACH_RING: + qn = *(int *)data; + + /* Associate the capturing object with a queue */ + if (rm->funcs->set_queue(co, qn) == -1) { + RINGMAP_ERROR(Queue attachment failed!); + err = EINVAL; + goto out; + } + + /* Init ring-slots with mbufs and packets adrresses */ + for (i = 0 ; i < SLOTS_NUMBER ; i++) { + if (set_slot(co, i) == -1){ + RINGMAP_ERROR(Ring initialization failed!); + err = EINVAL; + goto out; + } +#if (__RINGMAP_DEB) + PRINT_SLOT(co->ring, i); +#endif + } + break; + + default: RINGMAP_ERROR("Undefined command!"); err = ENODEV; @@ -599,9 +602,12 @@ printf("[%s] Set slot: %d\n", __func__, slot_num); #endif - /* Now if everything is Ok, we can initialize ring pointers */ ring->slot[slot_num].mbuf.kern = (vm_offset_t)rm->funcs->get_mbuf(co->rx_buffers, slot_num); + + if (ring->slot[slot_num].mbuf.kern == 0) + return (-1); + ring->slot[slot_num].mbuf.phys = (bus_addr_t)vtophys(ring->slot[slot_num].mbuf.kern); ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#50 (text+ko) ==== @@ -132,10 +132,6 @@ unsigned long long intr_num; - /* Ring identification. Should be initialized with process ID */ - /* TODO: use other ID. Using PID is a wrong way */ - unsigned int pid; - /* Array of slots (A.K.A packet buffers) */ struct ring_slot volatile slot[SLOTS_NUMBER]; }; @@ -179,7 +175,18 @@ */ #define IOCTL_SETFILTER _IOW(RINGMAP_IOC_MAGIC, 6, struct bpf_program) +/* + * Returns the number of available queues (A.K.A. rings) + */ +#define IOCTL_GETQUEUE_NUM _IOR(RINGMAP_IOC_MAGIC, 7, int) +/* + * Associate user-space capturing process with a queue + */ +#define IOCTL_ATTACH_RING _IOW(RINGMAP_IOC_MAGIC, 8, int) + + + /********************************************** * Arithmetic in Ring Buffer **********************************************/ @@ -338,10 +345,8 @@ #define PRINT_RING_PTRS(ring) \ do { \ - printf("\n=+= [%s] pid = %d\n", __func__, ring->pid); \ PRINT_TAIL(ring) \ PRINT_HEAD(ring) \ - printf("\n"); \ } while (0); ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#20 (text+ko) ==== @@ -116,6 +116,10 @@ */ void (*pkt_filter)(struct capt_object *, int); + /* Retunrns the number of available queues */ + int (*get_queuesnum)(void); + + /* * Set timestamp for packet placed in the slot. If ts != NULL set ts as * timestamp. Else compute timestamp calling getmicrotime(9) or take ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#33 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#34 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#28 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Oct 19 22:47:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4AC21065693; Tue, 19 Oct 2010 22:47:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 937001065674 for ; Tue, 19 Oct 2010 22:47:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7DCC98FC13 for ; Tue, 19 Oct 2010 22:47:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9JMlv7s016624 for ; Tue, 19 Oct 2010 22:47:57 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9JMlitQ016611 for perforce@freebsd.org; Tue, 19 Oct 2010 22:47:44 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 19 Oct 2010 22:47:44 GMT Message-Id: <201010192247.o9JMlitQ016611@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2010 22:47:58 -0000 http://p4web.freebsd.org/@@184909?ac=10 Change 184909 by gonzo@gonzo_figaro on 2010/10/19 22:47:40 IFC Affected files ... .. //depot/projects/avr32/src/Makefile.inc1#14 integrate .. //depot/projects/avr32/src/Makefile.mips#3 integrate .. //depot/projects/avr32/src/ObsoleteFiles.inc#16 integrate .. //depot/projects/avr32/src/UPDATING#16 integrate .. //depot/projects/avr32/src/bin/Makefile#3 integrate .. //depot/projects/avr32/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/avr32/src/bin/expr/expr.1#2 integrate .. //depot/projects/avr32/src/bin/pax/pax.1#2 integrate .. //depot/projects/avr32/src/bin/pax/tar.c#2 integrate .. //depot/projects/avr32/src/bin/ps/extern.h#4 integrate .. //depot/projects/avr32/src/bin/ps/keyword.c#5 integrate .. //depot/projects/avr32/src/bin/ps/ps.1#6 integrate .. //depot/projects/avr32/src/bin/rm/rm.1#2 integrate .. //depot/projects/avr32/src/bin/rm/rm.c#4 integrate .. //depot/projects/avr32/src/bin/sh/Makefile#2 integrate .. //depot/projects/avr32/src/bin/sh/alias.c#5 integrate .. //depot/projects/avr32/src/bin/sh/cd.c#3 integrate .. //depot/projects/avr32/src/bin/sh/error.c#3 integrate .. //depot/projects/avr32/src/bin/sh/eval.c#9 integrate .. //depot/projects/avr32/src/bin/sh/exec.c#7 integrate .. //depot/projects/avr32/src/bin/sh/expand.c#5 integrate .. //depot/projects/avr32/src/bin/sh/histedit.c#6 integrate .. //depot/projects/avr32/src/bin/sh/input.c#4 integrate .. //depot/projects/avr32/src/bin/sh/jobs.c#4 integrate .. //depot/projects/avr32/src/bin/sh/mail.c#3 integrate .. //depot/projects/avr32/src/bin/sh/main.c#4 integrate .. //depot/projects/avr32/src/bin/sh/memalloc.c#4 integrate .. //depot/projects/avr32/src/bin/sh/memalloc.h#4 integrate .. //depot/projects/avr32/src/bin/sh/miscbltin.c#6 integrate .. //depot/projects/avr32/src/bin/sh/mksyntax.c#5 integrate .. //depot/projects/avr32/src/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/avr32/src/bin/sh/options.c#3 integrate .. //depot/projects/avr32/src/bin/sh/output.c#4 integrate .. //depot/projects/avr32/src/bin/sh/parser.c#8 integrate .. //depot/projects/avr32/src/bin/sh/redir.c#4 integrate .. //depot/projects/avr32/src/bin/sh/sh.1#8 integrate .. //depot/projects/avr32/src/bin/sh/shell.h#2 integrate .. //depot/projects/avr32/src/bin/sh/show.c#3 integrate .. //depot/projects/avr32/src/bin/sh/trap.c#4 integrate .. //depot/projects/avr32/src/bin/sh/var.c#5 integrate .. //depot/projects/avr32/src/bin/stty/stty.1#2 integrate .. //depot/projects/avr32/src/bin/test/test.1#2 integrate .. //depot/projects/avr32/src/cddl/contrib/dtracetoolkit/dtruss#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localudp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteicmp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteudp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6remoteicmp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/main.c#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.d#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/prov.h#1 branch .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose3.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.include.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/usdt/tst.tailcall.ksh#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#5 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#4 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#4 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c#2 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#4 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 integrate .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c#2 integrate .. //depot/projects/avr32/src/cddl/lib/Makefile#3 integrate .. //depot/projects/avr32/src/cddl/lib/drti/Makefile#3 integrate .. //depot/projects/avr32/src/cddl/lib/libdtrace/Makefile#4 integrate .. //depot/projects/avr32/src/cddl/lib/libdtrace/libproc_compat.h#1 branch .. //depot/projects/avr32/src/cddl/lib/libdtrace/regs_x86.d#1 branch .. //depot/projects/avr32/src/cddl/lib/libzpool/Makefile#5 integrate .. //depot/projects/avr32/src/cddl/usr.bin/ctfconvert/Makefile#3 integrate .. //depot/projects/avr32/src/cddl/usr.bin/ctfconvert/ctfconvert.1#1 branch .. //depot/projects/avr32/src/cddl/usr.bin/ctfdump/Makefile#3 integrate .. //depot/projects/avr32/src/cddl/usr.bin/ctfdump/ctfdump.1#1 branch .. //depot/projects/avr32/src/cddl/usr.bin/ctfmerge/Makefile#3 integrate .. //depot/projects/avr32/src/cddl/usr.bin/ctfmerge/ctfmerge.1#1 branch .. //depot/projects/avr32/src/cddl/usr.sbin/Makefile#4 integrate .. //depot/projects/avr32/src/cddl/usr.sbin/dtruss/Makefile#1 branch .. //depot/projects/avr32/src/cddl/usr.sbin/dtruss/dtruss.1#1 branch .. //depot/projects/avr32/src/cddl/usr.sbin/plockstat/Makefile#1 branch .. //depot/projects/avr32/src/cddl/usr.sbin/plockstat/plockstat.1#1 branch .. //depot/projects/avr32/src/contrib/binutils/bfd/coff-x86_64.c#1 branch .. //depot/projects/avr32/src/contrib/binutils/bfd/efi-app-x86_64.c#1 branch .. //depot/projects/avr32/src/contrib/binutils/bfd/targets.c#3 integrate .. //depot/projects/avr32/src/contrib/binutils/include/coff/internal.h#2 integrate .. //depot/projects/avr32/src/contrib/binutils/include/coff/x86_64.h#1 branch .. //depot/projects/avr32/src/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/avr32/src/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/avr32/src/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/avr32/src/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/avr32/src/contrib/ee/ee.c#4 integrate .. //depot/projects/avr32/src/contrib/ee/ee_version.h#2 integrate .. //depot/projects/avr32/src/contrib/gcc/config/rs6000/freebsd.h#3 integrate .. //depot/projects/avr32/src/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/avr32/src/contrib/gcc/longlong.h#3 integrate .. //depot/projects/avr32/src/contrib/libf2c/ChangeLog#2 delete .. //depot/projects/avr32/src/contrib/libf2c/FREEBSD-upgrade#2 delete .. //depot/projects/avr32/src/contrib/libf2c/Makefile.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/README#2 delete .. //depot/projects/avr32/src/contrib/libf2c/TODO#2 delete .. //depot/projects/avr32/src/contrib/libf2c/aclocal.m4#2 delete .. //depot/projects/avr32/src/contrib/libf2c/changes.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/configure#2 delete .. //depot/projects/avr32/src/contrib/libf2c/configure.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/disclaimer.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/f2c.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/f2cext.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/g2c.hin#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/F77_aloc.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/Makefile.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/Notice#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/README.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/Version.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/abort_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_cos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_div.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_exp.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_log.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_sin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/c_sqrt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/cabs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/configure#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/configure.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_acos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_asin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_atan.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_atn2.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_cnjg.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_cos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_cosh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_dim.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_exp.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_imag.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_int.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_lg10.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_log.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_mod.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_nint.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_prod.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_sign.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_sin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_sinh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_sqrt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_tan.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/d_tanh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/derf_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/derfc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/dtime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/ef1asc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/ef1cmc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/erf_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/erfc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/etime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/exit_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/f2ch.add#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/getarg_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/getenv_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_dim.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_dnnt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_indx.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_len.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_mod.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_nint.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/h_sign.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/hl_ge.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/hl_gt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/hl_le.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/hl_lt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_dim.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_dnnt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_indx.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_len.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_mod.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_nint.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/i_sign.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/iargc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/l_ge.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/l_gt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/l_le.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/l_lt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/lbitbits.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/lbitshft.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/main.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/makefile.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_ci.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_dd.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_di.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_hh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_ii.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_qq.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_ri.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_zi.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/pow_zz.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/qbitbits.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/qbitshft.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_acos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_asin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_atan.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_atn2.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_cnjg.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_cos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_cosh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_dim.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_exp.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_imag.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_int.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_lg10.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_log.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_mod.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_nint.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_sign.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_sin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_sinh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_sqrt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_tan.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/r_tanh.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_cat.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_cmp.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_copy.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_paus.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_rnge.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/s_stop.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/setarg.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/setsig.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/sig_die.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/signal1.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/signal1.h0#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/signal_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/system_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_abs.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_cos.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_div.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_exp.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_log.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_sin.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libF77/z_sqrt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/Makefile.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/Notice#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/README.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/Version.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/backspace.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/close.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/config.h.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/configure#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/configure.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/dfe.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/dolio.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/due.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/endfile.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/err.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/f2ch.add#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/fio.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/fmt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/fmt.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/fmtlib.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/fp.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/ftell_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/iio.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/ilnw.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/inquire.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/lio.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/lread.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/lwrite.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/makefile.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/open.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/rdfmt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/rewind.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/rsfe.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/rsli.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/rsne.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/sfe.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/stamp-h.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/sue.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/typesize.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/uio.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/util.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/wref.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/wrtfmt.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/wsfe.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/wsle.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/wsne.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libI77/xwsne.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/COPYING.LIB#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/Makefile.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/PROJECTS#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/README#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/Version.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/access_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/acconfig.h#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/aclocal.m4#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/alarm_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/chdir_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/chmod_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/config.hin#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/configure#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/configure.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/ctime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/date_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/datetime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/dtime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/etime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/fdate_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/fgetc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/flush1_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/fnum_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/fputc_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/fstat_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/gerror_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/getcwd_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/getgid_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/getlog_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/getpid_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/getuid_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/gmtime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/hostnm_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/idate_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/ierrno_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/irand_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/isatty_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/itime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/kill_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/link_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/lnblnk_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/lstat_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/ltime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/mclock_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/perror_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/rand_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/rename_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/secnds_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/second_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/sleep_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/srand_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/stamp-h.in#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/stat_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/symlnk_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/sys_clock_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/time_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/ttynam_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/u77-test.f#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/umask_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/unlink_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/vxtidate_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/libU77/vxttime_.c#2 delete .. //depot/projects/avr32/src/contrib/libf2c/permission.netlib#2 delete .. //depot/projects/avr32/src/contrib/libf2c/readme.netlib#2 delete .. //depot/projects/avr32/src/contrib/libstdc++/include/ext/bitmap_allocator.h#2 integrate .. //depot/projects/avr32/src/contrib/libstdc++/include/ext/ropeimpl.h#2 integrate .. //depot/projects/avr32/src/contrib/libstdc++/src/locale-inst.cc#2 integrate .. //depot/projects/avr32/src/contrib/llvm/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/CREDITS.TXT#2 delete .. //depot/projects/avr32/src/contrib/llvm/LICENSE.TXT#2 delete .. //depot/projects/avr32/src/contrib/llvm/Makefile#3 delete .. //depot/projects/avr32/src/contrib/llvm/Makefile.common#2 delete .. //depot/projects/avr32/src/contrib/llvm/Makefile.config.in#3 delete .. //depot/projects/avr32/src/contrib/llvm/Makefile.rules#3 delete .. //depot/projects/avr32/src/contrib/llvm/ModuleInfo.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/README.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/AutoRegen.sh#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/ExportMap.map#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/LICENSE.TXT#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/README.TXT#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/config.guess#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/config.sub#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/configure.ac#3 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/depcomp#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/install-sh#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/ltmain.sh#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/bison.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/build_exeext.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/c_printf_a.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/check_gnu_make.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/config_makefile.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/config_project.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/cxx_flag_check.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/cxx_namespaces.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/find_std_program.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/flex.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/func_isinf.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/func_isnan.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/func_mmap_file.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/huge_val.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/libtool.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/link_options.m4#3 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/ltdl.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/path_perl.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/path_tclsh.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/rand48.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/sanity_check.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/single_cxx_check.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/missing#2 delete .. //depot/projects/avr32/src/contrib/llvm/autoconf/mkinstalldirs#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/README.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm.gpr#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm.ads#3 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/target/llvm_target.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/Makefile.ocaml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/analysis/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitreader/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitwriter/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/executionengine/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/llvm/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/llvm/llvm.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/llvm/llvm.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/target/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/target/llvm_target.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/target/llvm_target.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/target/target_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/transforms/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#2 delete .. //depot/projects/avr32/src/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#2 delete .. //depot/projects/avr32/src/contrib/llvm/build-for-llvm-top.sh#2 delete .. //depot/projects/avr32/src/contrib/llvm/configure#3 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm-c/Core.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm-c/ExecutionEngine.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm-c/Target.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm-c/lto.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/APInt.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/DenseMap.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/DenseSet.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/FoldingSet.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/NullablePtr.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/STLExtras.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/SmallVector.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/StringMap.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/StringRef.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/StringSet.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/StringSwitch.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/Triple.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/ValueMap.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/ilist.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/iterator.cmake#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ADT/iterator.h.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/DebugInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/Dominators.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LoopInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/LoopPass.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/Passes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/PointerTracking.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/PostDominators.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/RegionInfo.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/RegionIterator.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/RegionPrinter.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Analysis/ValueTracking.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Assembly/AssemblyAnnotationWriter.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/AutoUpgrade.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Bitcode/Archive.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CallGraphSCCPass.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/Passes.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Action.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/AutoGenerated.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Common.td#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Error.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Main.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Main.inc#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/CompilerDriver/Tool.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/AsmParsers.def.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/Disassemblers.def.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/Targets.def.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/config.h.cmake#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Config/config.h.in#3 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Constants.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/DerivedTypes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/GlobalValue.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Instruction.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Instructions.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/IntrinsicInst.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Intrinsics.td#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/IntrinsicsARM.td#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/IntrinsicsX86.td#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/LLVMContext.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/LinkAllPasses.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/LinkAllVMCore.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Linker.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/ELFObjectWriter.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCAsmInfo.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCAssembler.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCContext.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCDwarf.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCObjectWriter.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#3 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCSectionELF.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/MC/MCStreamer.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Metadata.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Module.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Pass.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/PassAnalysisSupport.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/PassManager.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/PassManagers.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/PassRegistry.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/PassSupport.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/COFF.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/CallSite.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/Casting.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/CommandLine.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/Compiler.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/ConstantRange.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/DataFlow.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/DataTypes.h.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/ELF.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/ErrorHandling.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/GraphWriter.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/IRBuilder.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/IRReader.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/MachO.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/MathExtras.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/PassNameParser.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/PatternMatch.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/Regex.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/Registry.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/SourceMgr.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/StandardPasses.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/SystemUtils.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/TypeBuilder.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Support/raw_ostream.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/DataTypes.h.cmake#3 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/DataTypes.h.in#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/LICENSE.TXT#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/Memory.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/Path.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/Process.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/Program.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/Signals.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/System/ThreadLocal.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/Target.td#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetAsmParser.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetCallingConv.td#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetData.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetLowering.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetMachine.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetOpcodes.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetOptions.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetRegistry.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Target/TargetSelect.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/IPO.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Scalar.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/Local.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#2 delete .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Type.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Use.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/Value.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/include/llvm/ValueSymbolTable.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/AliasDebugger.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/CFGPrinter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/CaptureTracking.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ConstantFolding.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/DebugInfo.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/DomPrinter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IPA/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IVUsers.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/InlineCost.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/InstCount.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/IntervalPartition.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/Lint.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LiveValues.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LoopInfo.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/LoopPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/PointerTracking.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/PostDominators.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ProfileInfo.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/README.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/RegionInfo.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/RegionPrinter.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/Analysis/ValueTracking.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Archive/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Archive/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/LLLexer.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/LLParser.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/LLParser.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/LLToken.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/AsmParser/Parser.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Reader/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Analysis.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/BranchFolding.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ELF.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ELFWriter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ELFWriter.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/GCMetadata.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/GCStrategy.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/IfConversion.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LiveInterval.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LiveVariables.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineCSE.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineDominators.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineFunction.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineInstr.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineLICM.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineSink.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PBQP/Solution.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PHIElimination.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PHIElimination.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/README.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/RenderMachineFunction.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Spiller.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Spiller.h#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SplitKit.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/SplitKit.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Splitter.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/Splitter.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/StackProtector.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/TailDuplication.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/VirtRegMap.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/Action.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/Main.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/CompilerDriver/Plugin.cpp#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/ExecutionEngine/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Linker/CMakeLists.txt#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Linker/LinkModules.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Linker/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/MC/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/MC/ELFObjectWriter.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCAsmInfo.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCAsmStreamer.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCAssembler.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCContext.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDInfo.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDInst.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDInst.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDOperand.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDToken.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDisassembler/EDToken.h#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCDwarf.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCELFStreamer.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCMachOStreamer.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCNullStreamer.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCObjectStreamer.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MCStreamer.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/MachObjectWriter.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/MC/WinCOFFStreamer.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Support/APFloat.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/APInt.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/CMakeLists.txt#3 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Support/COPYRIGHT.regex#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Support/ConstantRange.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/CrashRecoveryContext.cpp#1 branch .. //depot/projects/avr32/src/contrib/llvm/lib/Support/ErrorHandling.cpp#2 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/FoldingSet.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/Makefile#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Support/PrettyStackTrace.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/SlowOperationInformer.cpp#2 delete .. //depot/projects/avr32/src/contrib/llvm/lib/Support/SmallVector.cpp#3 integrate .. //depot/projects/avr32/src/contrib/llvm/lib/Support/Statistic.cpp#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 19 23:13:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60E151065672; Tue, 19 Oct 2010 23:13: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 1D141106566C for ; Tue, 19 Oct 2010 23:13:10 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 094478FC14 for ; Tue, 19 Oct 2010 23:13:10 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9JND94x022420 for ; Tue, 19 Oct 2010 23:13:09 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9JND9Bo022417 for perforce@freebsd.org; Tue, 19 Oct 2010 23:13:09 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 19 Oct 2010 23:13:09 GMT Message-Id: <201010192313.o9JND9Bo022417@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2010 23:13:10 -0000 http://p4web.freebsd.org/@@184911?ac=10 Change 184911 by gonzo@gonzo_figaro on 2010/10/19 23:13:08 Merge kib's patch: Supply some useful information to the started image using ELF aux vectors. In particular, provide pagesize and pagesizes array, the canary value for SSP use, number of host CPUs and osreldate. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/elf.h#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/elf.h#4 (text+ko) ==== @@ -78,7 +78,14 @@ #define AT_EGID 14 /* Effective gid. */ #define AT_EXECPATH 15 /* Path to the executable. */ -#define AT_COUNT 16 /* Count of defined aux entry types. */ +#define AT_CANARY 16 /* Canary for SSP */ +#define AT_CANARYLEN 17 /* Length of the canary. */ +#define AT_OSRELDATE 18 /* OSRELDATE. */ +#define AT_NCPUS 19 /* Number of CPUs. */ +#define AT_PAGESIZES 20 /* Pagesizes. */ +#define AT_PAGESIZESLEN 21 /* Number of pagesizes. */ + +#define AT_COUNT 22 /* Count of defined aux entry types. */ /* Define "machine" characteristics */ From owner-p4-projects@FreeBSD.ORG Wed Oct 20 03:39:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D44461065670; Wed, 20 Oct 2010 03:39:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 970CD106566C for ; Wed, 20 Oct 2010 03:39:20 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 83C158FC19 for ; Wed, 20 Oct 2010 03:39:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9K3dK8K078204 for ; Wed, 20 Oct 2010 03:39:20 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9K3dKvg078201 for perforce@freebsd.org; Wed, 20 Oct 2010 03:39:20 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 20 Oct 2010 03:39:20 GMT Message-Id: <201010200339.o9K3dKvg078201@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2010 03:39:21 -0000 http://p4web.freebsd.org/@@184919?ac=10 Change 184919 by gonzo@gonzo_figaro on 2010/10/20 03:39:10 Replace obsoleted mii_phy_probe with mii_attach Affected files ... .. //depot/projects/avr32/src/sys/dev/ate/if_ate.c#6 edit Differences ... ==== //depot/projects/avr32/src/sys/dev/ate/if_ate.c#6 (text) ==== @@ -273,7 +273,9 @@ } sc->ifp = ifp = if_alloc(IFT_ETHER); - if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { + if (mii_attach(dev, &sc->miibus, ifp, ate_ifmedia_upd, + ate_ifmedia_sts, BMSR_DEFCAPMASK, + MII_PHY_ANY, MII_OFFSET_ANY, 0)) { device_printf(dev, "Cannot find my PHY.\n"); err = ENXIO; goto out; From owner-p4-projects@FreeBSD.ORG Wed Oct 20 03:40:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 748E11065675; Wed, 20 Oct 2010 03:40: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 213C91065670 for ; Wed, 20 Oct 2010 03:40:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 05A198FC12 for ; Wed, 20 Oct 2010 03:40:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9K3ePGR078604 for ; Wed, 20 Oct 2010 03:40:25 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9K3ePRJ078598 for perforce@freebsd.org; Wed, 20 Oct 2010 03:40:25 GMT (envelope-from gonzo@FreeBSD.org) Date: Wed, 20 Oct 2010 03:40:25 GMT Message-Id: <201010200340.o9K3ePRJ078598@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2010 03:40:26 -0000 http://p4web.freebsd.org/@@184920?ac=10 Change 184920 by gonzo@gonzo_figaro on 2010/10/20 03:40:18 - Fix signature for bus_add_child method. Order now is u_int Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#13 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_smc.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/nexus.c#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#13 (text+ko) ==== @@ -52,7 +52,7 @@ /* Prototypes */ static int at32_probe(device_t); static int at32_attach(device_t); -static device_t at32_add_child(device_t, int, const char *, int); +static device_t at32_add_child(device_t, u_int, const char *, int); static void at32_hinted_child(device_t, const char *, int); static struct resource_list *at32_get_resource_list(device_t, device_t); static int at32_print_child(device_t, device_t); @@ -154,7 +154,7 @@ } static device_t -at32_add_child(device_t bus, int order, const char *name, int unit) +at32_add_child(device_t bus, u_int order, const char *name, int unit) { device_t child; struct at32_ivar *ivar; ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_smc.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ static int at32_smc_attach(device_t); static int at32_smc_detach(device_t); static void at32_smc_deactivate(device_t); -static device_t at32_smc_add_child(device_t, int, const char *, int); +static device_t at32_smc_add_child(device_t, u_int, const char *, int); static void at32_smc_hinted_child(device_t, const char *, int); static int at32_smc_print_child(device_t, device_t); static struct resource_list *at32_smc_get_resource_list(device_t, device_t); @@ -197,7 +197,7 @@ } static device_t -at32_smc_add_child(device_t bus, int order, const char *name, int unit) +at32_smc_add_child(device_t bus, u_int order, const char *name, int unit) { device_t child; struct at32_smc_ivar *ivar; ==== //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ static int at32_tc_probe(device_t); static int at32_tc_attach(device_t); static int at32_tc_detach(device_t); -static device_t at32_tc_add_child(device_t, int, const char *, int); +static device_t at32_tc_add_child(device_t, u_int, const char *, int); static void at32_tc_hinted_child(device_t, const char *, int); static int at32_tc_print_child(device_t, device_t); static struct resource_list *at32_tc_get_resource_list(device_t, device_t); @@ -200,7 +200,7 @@ } static device_t -at32_tc_add_child(device_t bus, int order, const char *name, int unit) +at32_tc_add_child(device_t bus, u_int order, const char *name, int unit) { device_t child; struct at32_tc_ivar *ivar; ==== //depot/projects/avr32/src/sys/avr32/avr32/nexus.c#4 (text+ko) ==== @@ -64,7 +64,7 @@ static int nexus_probe(device_t); static int nexus_attach(device_t); static int nexus_print_child(device_t, device_t); -static device_t nexus_add_child(device_t, int, const char *, int); +static device_t nexus_add_child(device_t, u_int, const char *, int); static void nexus_hinted_child(device_t, const char *, int); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); @@ -183,7 +183,7 @@ } static device_t -nexus_add_child(device_t bus, int order, const char *name, int unit) +nexus_add_child(device_t bus, u_int order, const char *name, int unit) { struct nexus_device *ndev; device_t child; From owner-p4-projects@FreeBSD.ORG Wed Oct 20 14:19:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55607106566B; Wed, 20 Oct 2010 14:19: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 179531065672 for ; Wed, 20 Oct 2010 14:19:51 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 03EA98FC14 for ; Wed, 20 Oct 2010 14:19:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9KEJoON025802 for ; Wed, 20 Oct 2010 14:19:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9KEJouG025799 for perforce@freebsd.org; Wed, 20 Oct 2010 14:19:50 GMT (envelope-from jhb@freebsd.org) Date: Wed, 20 Oct 2010 14:19:50 GMT Message-Id: <201010201419.o9KEJouG025799@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2010 14:19:51 -0000 http://p4web.freebsd.org/@@184932?ac=10 Change 184932 by jhb@jhb_jhbbsd on 2010/10/20 14:19:23 Add an intr_handler_drain() to attempt to supply similar semantics to Linux's synchronize_irq(). Affected files ... .. //depot/projects/smpng/sys/kern/kern_intr.c#105 edit .. //depot/projects/smpng/sys/sys/interrupt.h#31 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_intr.c#105 (text+ko) ==== @@ -720,6 +720,57 @@ } /* + * If an interrupt handler is currently running, wait for it to finish + * executing. + */ +void +intr_handler_drain(void *cookie) +{ + struct intr_handler *ih; + struct intr_event *ie; + struct intr_thread *it; + + ih = (struct intr_handler *)cookie; + if (ih == NULL || cold) + return; + ie = ih->ih_event; + KASSERT(ie != NULL, + ("interrupt handler \"%s\" has a NULL interrupt event", + ih->ih_name)); + + /* XXX: Punt on handlers that only have a filter for now. */ + if (ih->ih_handler == NULL) + return; + +#ifdef INTR_FILTER + if (ih->ih_thread) + it = ih->ih_thread; + else +#endif + it = ie->ie_thread; + + mtx_lock(&ie->ie_lock); + thread_lock(it->it_thread); + + /* If the thread is idle, then the interrupt handler is not running. */ + if (!TD_AWAITING_INTR(it->it_thread)) { + ih->ih_flags |= IH_DRAINING; + + /* + * Ensure the thread will process the handler list + * again if it has already passed this handler. + */ + it->it_need = 1; + thread_unlock(it->it_thread); + + while (ih->ih_flags & IH_DRAINING) + msleep(ih, &ie->ie_lock, 0, "idrain", 0); + } else + thread_unlock(it->it_thread); + mtx_unlock(&ie->ie_lock); +} + +/* * Return the ie_source field from the intr_event an intr_handler is * associated with. */ @@ -1152,7 +1203,7 @@ if (ih->ih_flags & IH_DEAD) { mtx_lock(&ie->ie_lock); TAILQ_REMOVE(&ie->ie_handlers, ih, ih_next); - ih->ih_flags &= ~IH_DEAD; + ih->ih_flags &= ~(IH_DEAD | IH_DRAINING); wakeup(ih); mtx_unlock(&ie->ie_lock); return; @@ -1168,6 +1219,13 @@ ih->ih_handler(ih->ih_argument); if (!(ih->ih_flags & IH_MPSAFE)) mtx_unlock(&Giant); + + if (ih->ih_flags & IH_DRAINING) { + mtx_lock(&ie->ie_lock); + ih->ih_flags &= ~IH_DRAINING; + wakeup(ih); + mtx_unlock(&ie->ie_lock); + } } #endif @@ -1188,7 +1246,7 @@ if (ih->ih_flags & IH_DEAD) { mtx_lock(&ie->ie_lock); TAILQ_REMOVE(&ie->ie_handlers, ih, ih_next); - ih->ih_flags &= ~IH_DEAD; + ih->ih_flags &= ~(IH_DEAD | IH_DRAINING); wakeup(ih); mtx_unlock(&ie->ie_lock); continue; @@ -1220,6 +1278,13 @@ ih->ih_handler(ih->ih_argument); if (!(ih->ih_flags & IH_MPSAFE)) mtx_unlock(&Giant); + + if (ih->ih_flags & IH_DRAINING) { + mtx_lock(&ie->ie_lock); + ih->ih_flags &= ~IH_DRAINING; + wakeup(ih); + mtx_unlock(&ie->ie_lock); + } } } @@ -1684,7 +1749,7 @@ db_printsym((uintptr_t)ih->ih_handler, DB_STGY_PROC); db_printf("(%p)", ih->ih_argument); if (ih->ih_need || - (ih->ih_flags & (IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD | + (ih->ih_flags & (IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD | IH_DRAINING | IH_MPSAFE)) != 0) { db_printf(" {"); comma = 0; @@ -1706,6 +1771,12 @@ db_printf("DEAD"); comma = 1; } + if (ih->ih_flags & IH_DRAINING) { + if (comma) + db_printf(", "); + db_printf("DRAINING"); + comma = 1; + } if (ih->ih_flags & IH_MPSAFE) { if (comma) db_printf(", "); ==== //depot/projects/smpng/sys/sys/interrupt.h#31 (text+ko) ==== @@ -59,6 +59,7 @@ #define IH_EXCLUSIVE 0x00000002 /* Exclusive interrupt. */ #define IH_ENTROPY 0x00000004 /* Device is a good entropy source. */ #define IH_DEAD 0x00000008 /* Handler should be removed. */ +#define IH_DRAINING 0x00000010 /* Has waiting drainer. */ #define IH_MPSAFE 0x80000000 /* Handler does not need Giant. */ /* @@ -175,6 +176,7 @@ int intr_event_handle(struct intr_event *ie, struct trapframe *frame); int intr_event_remove_handler(void *cookie); int intr_getaffinity(int irq, void *mask); +void intr_handler_drain(void *cookie); void *intr_handler_source(void *cookie); int intr_setaffinity(int irq, void *mask); int swi_add(struct intr_event **eventp, const char *name, From owner-p4-projects@FreeBSD.ORG Wed Oct 20 14:25:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 507A91065670; Wed, 20 Oct 2010 14:25:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 133DF106566B for ; Wed, 20 Oct 2010 14:25:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0044A8FC16 for ; Wed, 20 Oct 2010 14:25:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9KEPJ50027682 for ; Wed, 20 Oct 2010 14:25:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9KEPJj2027679 for perforce@freebsd.org; Wed, 20 Oct 2010 14:25:19 GMT (envelope-from jhb@freebsd.org) Date: Wed, 20 Oct 2010 14:25:19 GMT Message-Id: <201010201425.o9KEPJj2027679@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2010 14:25:20 -0000 http://p4web.freebsd.org/@@184933?ac=10 Change 184933 by jhb@jhb_jhbbsd on 2010/10/20 14:24:16 Drop these local changes. alc@ committed an alternate fix. Affected files ... .. //depot/projects/smpng/sys/i386/i386/vm86.c#25 edit .. //depot/projects/smpng/sys/i386/include/pmap.h#52 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/vm86.c#25 (text+ko) ==== @@ -592,7 +592,7 @@ mtx_lock(&vm86_lock); for (i = 0; i < vmc->npages; i++) { - page = pmap_kextract_early(vmc->pmap[i].kva & PG_FRAME); + page = vtophys(vmc->pmap[i].kva & PG_FRAME); entry = vmc->pmap[i].pte_num; vmc->pmap[i].old_pte = pte[entry]; pte[entry] = page | PG_V | PG_RW | PG_U; ==== //depot/projects/smpng/sys/i386/include/pmap.h#52 (text+ko) ==== @@ -302,29 +302,6 @@ return (pa); } -/* - * A version of pmap_kextract() that is safe to call before - * pmap_bootstrap(). This is used in vm86_datacall(). If - * pmap_bootstrap() has not been called, then KPTmap is not yet - * initialized, so fall back to using vtopte() instead. - */ -static __inline vm_paddr_t -pmap_kextract_early(vm_offset_t va) -{ - vm_paddr_t pa; - - if ((pa = PTD[va >> PDRSHIFT]) & PG_PS) { - pa = (pa & PG_PS_FRAME) | (va & PDRMASK); - } else { - if (KPTmap == NULL) - pa = *vtopte(va); - else - pa = KPTmap[i386_btop(va)]; - pa = (pa & PG_FRAME) | (va & PAGE_MASK); - } - return (pa); -} - #define PT_UPDATES_FLUSH() #endif From owner-p4-projects@FreeBSD.ORG Wed Oct 20 21:21:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E70EB1065679; Wed, 20 Oct 2010 21:21:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8BAC1065673 for ; Wed, 20 Oct 2010 21:21:04 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 939838FC12 for ; Wed, 20 Oct 2010 21:21:04 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9KLL45C014342 for ; Wed, 20 Oct 2010 21:21:04 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9KLL4wH014331 for perforce@freebsd.org; Wed, 20 Oct 2010 21:21:04 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 20 Oct 2010 21:21:04 GMT Message-Id: <201010202121.o9KLL4wH014331@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2010 21:21:05 -0000 http://p4web.freebsd.org/@@184942?ac=10 Change 184942 by afiveg@cottonmouth on 2010/10/20 21:20:26 Modifications in the kernel part of ringmap and libpcap that make it possible to use ringmap simultaneously with generic driver functions (protocol stack, (zero)BPF, etc...). At this point more explanation: Earlier ringmap affected the generic driver. The driver was compiled with ringmap and as result the driver was usable only for packet capturing - protocol stack and packet transmission was disabled. Now, compiling the network driver with ringmap code doesn't affect these functionalities. The protocol stack works as well as without ringmap. !!! But in order to capture with ringmap the interface must be switched in monitor mode !!! In the libpcap the function set_ringmap_flags() is added. Using this function the user-application can choose what capturing functionality has to be used - ringmap or standard packet capturing stack. As before, supported only Intel controller 8254x (if_lem driver). Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#19 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#19 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#23 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap/pcap.h#3 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#36 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#36 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#37 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#52 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#51 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#21 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#34 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#35 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#29 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#19 (text+ko) ==== @@ -165,7 +165,6 @@ #include #include "../../sys/net/ringmap.h" extern void uninit_mmapped_capturing(pcap_t *); -extern int pcap_read_ringmap(pcap_t *, int, pcap_handler, u_char *); #endif static int pcap_can_set_rfmon_bpf(pcap_t *p); @@ -1143,7 +1142,9 @@ #endif #ifdef RINGMAP - uninit_mmapped_capturing(p); + if (p->ringmap_flags == 1){ + uninit_mmapped_capturing(p); + } #endif if (p->md.must_clear != 0) { /* @@ -2067,11 +2068,7 @@ } } -#ifndef RINGMAP p->read_op = pcap_read_bpf; -#else - p->read_op = pcap_read_ringmap; -#endif p->inject_op = pcap_inject_bpf; p->setfilter_op = pcap_setfilter_bpf; p->setdirection_op = pcap_setdirection_bpf; @@ -2083,9 +2080,6 @@ return (status); bad: -#ifdef RINGMAP - RINGMAP_FUNC_DEBUG(failed); -#endif pcap_cleanup_bpf(p); return (status); } ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#19 (text+ko) ==== @@ -333,6 +333,7 @@ struct pcap_pkthdr pcap_header; /* This is needed for the pcap_next_ex() to work */ #ifdef RINGMAP + int ringmap_flags; struct ring *ring; #endif }; ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#23 (text+ko) ==== @@ -77,6 +77,7 @@ extern int init_mmapped_capturing(const char *device, pcap_t *); extern void ringmap_setfilter(struct bpf_program *); +extern int pcap_read_ringmap(pcap_t *, int , pcap_handler , u_char *); #endif @@ -255,10 +256,6 @@ if (status < 0) goto fail; -#ifdef RINGMAP - RINGMAP_FUNC_DEBUG(pcap is allocated); -#endif - /* * Mark this as opened with pcap_open_live(), so that, for * example, we show the full list of DLT_ values, rather @@ -275,8 +272,21 @@ goto fail; #ifdef RINGMAP - if (init_mmapped_capturing(source, p) < 0){ - goto fail; + /* + * The setting of ringmap flags should be done in enother function. Why ? + * We want be able to switch on\off ringmap functionality by setting + * ringmap_flags. In order to do it, the external libpcap application + * should first call the function for setting ringmap_flags. But this + * requires the modification of these application. Thats why I set + * ringmap_flags staticaly here + */ + p->ringmap_flags = set_ringmap_flags(1); + + /* Replace 1 with RINGMAP_ACTIVE macro */ + if (p->ringmap_flags == 1){ + if (init_mmapped_capturing(source, p) < 0) + goto fail; + p->read_op = pcap_read_ringmap; } #endif @@ -1012,8 +1022,10 @@ #ifdef RINGMAP int err = p->setfilter_op(p, fp); - if (err == 0) - ringmap_setfilter(fp); + if (p->ringmap_flags == 1){ + if (err == 0) + ringmap_setfilter(fp); + } return (err); #else ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap/pcap.h#3 (text+ko) ==== @@ -339,6 +339,10 @@ char *bpf_image(struct bpf_insn *, int); void bpf_dump(struct bpf_program *, int); +#ifdef RINGMAP +int set_ringmap_flags(int val); +#endif + #if defined(WIN32) /* ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#36 (text+ko) ==== @@ -25,8 +25,10 @@ #include "../../sys/net/ringmap.h" +/* TODO: That's dirty! Place the next into the pcap structure */ /* File descriptor of /dev/iface */ int ringmap_cdev_fd = -1; +int ringmap_active_status = 0; /*** F U N C T I O N S ***/ int init_mmapped_capturing(const char *device, pcap_t *); @@ -35,6 +37,18 @@ void ringmap_setfilter(struct bpf_program *); + + +int +set_ringmap_flags(int val) +{ + /* If active status already set do nothing */ + if (ringmap_active_status == 0) + ringmap_active_status = val; + + return (ringmap_active_status); +} + /******************************************************** * Open (/dev/iface) device to communicate with * kernel. Map buffers by calling mmap (/dev/mem, ...) @@ -70,8 +84,6 @@ } /** - ** !!! Very important !!! - ** ** Here we map the ring structure into the ** memory space of current process. **/ @@ -89,16 +101,15 @@ printf("[%s] Phys addr of ring 0x%X\n", __func__, ring); #endif - tmp_addr = - mmap( 0, /* Kernel gives us the address */ - sizeof(struct ring), /* Number of bytes we are mapping */ - PROT_WRITE|PROT_READ, /* We want both read and write */ - MAP_SHARED, /* Changes shoud be visible in kernel */ - devmem_fd, /* /dev/mem device */ - ring); /* offset = phys addr of ring */ - if (tmp_addr == MAP_FAILED){ + tmp_addr = mmap(0, /* Kernel gives us the address */ + sizeof(struct ring), /* Number of bytes we are mapping */ + PROT_WRITE|PROT_READ, /* We want both read and write */ + MAP_SHARED, /* Changes shoud be visible in kernel */ + devmem_fd, /* /dev/mem device */ + ring); /* offset = phys addr of ring */ + if (tmp_addr == MAP_FAILED) { RINGMAP_ERROR("Mapping of Ring Pointers structure failed! Exit!"); - return -1; + return (-1); } p->ring = (struct ring *)tmp_addr; @@ -121,20 +132,18 @@ /* * Mapping mbufs and packet buffers from kern into userspace. */ - for (i = 0; i < SLOTS_NUMBER; i++){ + for (i = 0; i < SLOTS_NUMBER; i++) { /* Map mbuf */ memoffset = (off_t)p->ring->slot[i].mbuf.phys; - tmp_addr = - mmap ( - 0, /* System will choose the addrress */ - sizeof(struct mbuf), /* Size of mapped region (mbuf) */ - PROT_WRITE|PROT_READ, /* protection: write & read */ - MAP_SHARED, /* shared maping */ - devmem_fd, /* device is /dev/mem */ - memoffset /* offset is physical addres */ - ); - if (tmp_addr == MAP_FAILED){ + tmp_addr = mmap (0, /* System will choose the addrress */ + sizeof(struct mbuf), /* Size of mapped region (mbuf) */ + PROT_WRITE|PROT_READ, /* protection: write & read */ + MAP_SHARED, /* shared maping */ + devmem_fd, /* device is /dev/mem */ + memoffset /* offset is physical addres */ + ); + if (tmp_addr == MAP_FAILED) { printf(ERR_PREFIX"[%s] Mapping of mbuf %d failed!\n", __func__, i); return -1; @@ -299,12 +308,6 @@ /* Slot we want to check */ curr_slot = R_MODULO( SW_TAIL(ring) + 1 ); - - mb = (struct mbuf *)U_MBUF(ring, curr_slot); - datap = (caddr_t)U_PACKET(ring, curr_slot); - pkthdr.caplen = pkthdr.len = mb->m_len; - pkthdr.ts = ring->slot[curr_slot].ts; - /* * ringmap-Driver tell us whether the slot contains * a good packet @@ -316,6 +319,11 @@ goto out; } + mb = (struct mbuf *)U_MBUF(ring, curr_slot); + datap = (caddr_t)U_PACKET(ring, curr_slot); + pkthdr.caplen = pkthdr.len = mb->m_len; + pkthdr.ts = ring->slot[curr_slot].ts; + /* Packet filtering */ if (p->md.use_bpf) { /* Filtered in Kernel */ @@ -361,8 +369,6 @@ /* * Prints HEAD (kern) and TAIL (user) pointers - * Return Value: - * -1 - Error */ int print_ring_pointers(pcap_t *p) ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#36 (text+ko) ==== @@ -81,9 +81,14 @@ #include #include "e1000_api.h" + #ifdef RINGMAP #include +extern struct ringmap * ringmap_attach(device_t, struct ringmap_functions *); +extern int ringmap_detach (struct ringmap *); +extern struct ringmap_functions ringmap_8254_functions; #endif + #include "if_lem.h" /********************************************************************* @@ -266,13 +271,6 @@ #endif /* ~EM_LEGACY_IRQ */ -#ifdef RINGMAP -extern struct ringmap * ringmap_attach(device_t, struct ringmap_functions *); -extern int ringmap_detach (device_t); - -extern struct ringmap_functions ringmap_8254_functions; -#endif - #ifdef DEVICE_POLLING static poll_handler_t lem_poll; #endif /* POLLING */ @@ -717,7 +715,7 @@ INIT_DEBUGOUT("em_detach: begin"); #ifdef RINGMAP - ringmap_detach (dev); + ringmap_detach (adapter->rm); #endif /* Make sure VLANS are not using driver */ @@ -3498,7 +3496,7 @@ } #ifdef RINGMAP - co = adapter->rm->funcs->delayed_isr(adapter, adapter->rm); + co = adapter->rm->funcs->delayed_isr(adapter, adapter->rm); #endif while ((current_desc->status & E1000_RXD_STAT_DD) && @@ -3556,17 +3554,18 @@ #ifdef RINGMAP RINGMAP_LOCK(adapter->rm); - if ((adapter->rm->open_cnt) && (co != NULL)) + if ((co != NULL) && (co->ring != NULL)) adapter->rm->funcs->per_packet_iteration(co, i); - RINGMAP_UNLOCK(adapter->rm); + else { #endif -#ifndef RINGMAP -/* RINGMAP: Do not allocate memory for new mbufs and packets. Work in ring */ if (lem_get_buf(adapter, i) != 0) { ifp->if_iqdrops++; goto discard; } +#ifdef RINGMAP + } + RINGMAP_UNLOCK(adapter->rm); #endif /* Assign correct length to the current fragment */ mp->m_len = len; @@ -3625,9 +3624,7 @@ } } else { ifp->if_ierrors++; -#ifndef RINGMAP discard: -#endif /* Reuse loaded DMA map and just update mbuf chain */ mp = adapter->rx_buffer_area[i].m_head; mp->m_len = mp->m_pkthdr.len = MCLBYTES; @@ -3656,11 +3653,18 @@ if (m != NULL) { adapter->next_rx_desc_to_check = i; -#ifndef RINGMAP -/* Do not send packet to the IP-stack */ +#ifdef RINGMAP + RINGMAP_LOCK(adapter->rm); + if ((co == NULL) || (co->ring == NULL)) { +#endif + EM_RX_UNLOCK(adapter); (*ifp->if_input)(ifp, m); EM_RX_LOCK(adapter); + +#ifdef RINGMAP + } + RINGMAP_UNLOCK(adapter->rm); #endif rx_sent++; i = adapter->next_rx_desc_to_check; @@ -3670,7 +3674,7 @@ #ifdef RINGMAP RINGMAP_LOCK(adapter->rm); - if ((co != NULL) && (RING_NOT_EMPTY(co->ring))) + if ((co != NULL) && (co->ring != NULL) && (RING_NOT_EMPTY(co->ring))) wakeup(co->ring); RINGMAP_UNLOCK(adapter->rm); #endif @@ -3682,8 +3686,14 @@ i = adapter->num_rx_desc - 1; /* RINGMAP: Don't write RDT. We'll do it after user has read packet */ -#ifndef RINGMAP - E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), i); +#ifdef RINGMAP + RINGMAP_LOCK(adapter->rm); + if ((co == NULL) || (co->ring == NULL)) { +#endif + E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), i); +#ifdef RINGMAP + } + RINGMAP_UNLOCK(adapter->rm); #endif EM_RX_UNLOCK(adapter); ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#37 (text+ko) ==== @@ -2,16 +2,11 @@ #include #include #include -#include -#include -#include - #include #include #include #include -#include #include @@ -26,7 +21,12 @@ vm_offset_t rm_8254_get_packet(void *buffer_area, unsigned int num); vm_offset_t rm8254_get_rx_desc(void * rx_desc_area, unsigned int num); int rm_8245_get_queuesnum(void); +void rm_8254_receive_disable (struct ringmap *rm); +void rm_8254_receive_enable (struct ringmap *rm); +void rm_8254_intr_disable (struct ringmap *rm); +void rm_8254_intr_enable (struct ringmap *rm); + extern devclass_t em_devclass; @@ -42,9 +42,65 @@ .set_queue = rm_8254_set_queue, .pkt_filter = NULL, .get_queuesnum = rm_8245_get_queuesnum, + .set_timestamp = NULL, + .receive_disable = rm_8254_receive_disable, + .receive_enable = rm_8254_receive_enable, + .intr_disable = rm_8254_intr_disable, + .intr_enable = rm_8254_intr_enable, }; +void +rm_8254_intr_disable (struct ringmap *rm) +{ + struct adapter *adapter =(struct adapter *)device_get_softc(rm->dev); + struct e1000_hw *hw = &adapter->hw; + + if (adapter->msix) + E1000_WRITE_REG(hw, EM_EIAC, 0); + E1000_WRITE_REG(&adapter->hw, E1000_IMC, 0xffffffff); +} + + +void +rm_8254_intr_enable (struct ringmap *rm) +{ + struct adapter *adapter =(struct adapter *)device_get_softc(rm->dev); + struct e1000_hw *hw = &adapter->hw; + u32 ims_mask = IMS_ENABLE_MASK; + + if (adapter->msix) { + E1000_WRITE_REG(hw, EM_EIAC, EM_MSIX_MASK); + ims_mask |= EM_MSIX_MASK; + } + E1000_WRITE_REG(hw, E1000_IMS, ims_mask); +} + + +void +rm_8254_receive_disable (struct ringmap *rm) +{ + struct adapter *adapter; + u32 rctl; + + adapter = (struct adapter *)device_get_softc(rm->dev); + rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); + E1000_WRITE_REG(&adapter->hw, E1000_RCTL, rctl & ~E1000_RCTL_EN); +} + + +void +rm_8254_receive_enable (struct ringmap *rm) +{ + struct adapter *adapter; + u32 rctl; + + adapter = (struct adapter *)device_get_softc(rm->dev); + rctl = E1000_READ_REG(&adapter->hw, E1000_RCTL); + E1000_WRITE_REG(&adapter->hw, E1000_RCTL, rctl | E1000_RCTL_EN); +} + + struct mbuf * rm_8254_get_mbuf(void *buffer_area, unsigned int num) { ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#52 (text+ko) ==== @@ -39,16 +39,16 @@ #include "ringmap.h" struct ringmap * ringmap_attach (device_t, struct ringmap_functions *); -int ringmap_detach (device_t); +int ringmap_detach (struct ringmap *rm); void ringmap_close_cb (void *data); void clear_capt_object(void *); -void print_capt_obj(struct capt_object *); struct ringmap * cdev2ringmap(struct cdev *); struct ringmap * dev2ringmap(device_t); void ringmap_bpf_filter(struct capt_object *, int); void per_packet_iteration(struct capt_object *, int ); struct capt_object * ringmap_delayed_isr(void *context, struct ringmap *rm); int set_slot(struct capt_object *co, unsigned int slot_num); +void ringmap_timestamp(struct ring_slot *slot, struct timeval *ts); d_open_t ringmap_open; d_close_t ringmap_close; @@ -71,9 +71,10 @@ /* - * The function should be called from attach function of generic network driver. - * Here the ringmap structure is allocated and the character special device for - * the communication with user is created. Also default ringmap functions are set. + * The function should be called from the attach function of generic network + * driver. Here the ringmap structure is allocated and the character special + * device for the communication with user is created. Also default ringmap + * functions are set. */ struct ringmap * ringmap_attach(device_t dev, struct ringmap_functions *rf) @@ -91,26 +92,23 @@ } /* - * Create char device for communication with user-space. The user-space - * process wich want to capture packets first opens this device. + * Create character special device for communication with user-space. The + * user-space process wich want to capture packets first opens this device. * Then, by syscalls on this device it will: * - get physical adresses of packet buffers for mapping them in its * virtual memory - * * - controll packet capturing: start, stop, sleep to wait for packets. */ rm->cdev = make_dev(&ringmap_devsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0666, device_get_nameunit(dev)); if (rm->cdev == NULL) { - RINGMAP_ERROR(Can not create char device); + RINGMAP_ERROR(Can not create character device); FREE(rm, M_DEVBUF); return (NULL); } - /* - * Set the hardware and driver speciffic functions - */ + /* Set the hardware and driver speciffic functions */ rm->funcs = rf; /* Store interface device structure in ringmap */ @@ -130,7 +128,7 @@ /* * Set default functions if the generic driver's specific functions are not - * set + * set. */ if (rm->funcs->delayed_isr == NULL) rm->funcs->delayed_isr = ringmap_delayed_isr; @@ -138,31 +136,30 @@ if (rm->funcs->per_packet_iteration == NULL) rm->funcs->per_packet_iteration = per_packet_iteration; + if (rm->funcs->set_timestamp == NULL) + rm->funcs->set_timestamp = ringmap_timestamp; RINGMAP_FUNC_DEBUG(end); /* * Return ringmap pointer to the generic driver. Generic driver should * store the pointer in the adapter structure in order to be able to access - * ringmap + * ringmap. */ return (rm); } /* - * Should be called from driver's detach function. It is a little dangerous - * place - probably we shoul protect our code here with locks!!! + * Should be called from driver's detach function. */ int -ringmap_detach(device_t dev) +ringmap_detach(struct ringmap *rm) { - struct ringmap *rm = NULL; struct capt_object *co = NULL; RINGMAP_FUNC_DEBUG(start); - rm = dev2ringmap(dev); if (rm == NULL) { RINGMAP_WARN(Can not get pointer to ringmap structure); return (-1); @@ -185,11 +182,9 @@ /* And remove ringmap from global list */ SLIST_REMOVE(&ringmap_list_head, rm, ringmap, entries); - RINGMAP_UNLOCK(rm); RINGMAP_LOCK_DESTROY(rm); - FREE(rm, M_DEVBUF); RINGMAP_FUNC_DEBUG(end); @@ -198,12 +193,11 @@ } -/****************************************************************** - * This func is called as result of open(2). Here we allocate - * the memory for the new ring and capt_object structure (so called - * capturing object). Capturing object represents the thread with - * its ring. - ******************************************************************/ +/* + * This function is called as result of open(2). Here we allocate the memory + * for the new ring and capt_object structure (so called capturing object). + * Capturing object represents a thread with its ring. + */ int ringmap_open(struct cdev *cdev, int flag, int otyp, struct thread *td) { @@ -217,7 +211,6 @@ #if (__RINGMAP_DEB) printf(RINGMAP_PREFIX"[%s] pid = %d\n", __func__, td->td_proc->p_pid); #endif - rm = cdev2ringmap(cdev); if ( rm == NULL ) { RINGMAP_ERROR(Could not get the pointer to ringmap structure); @@ -232,6 +225,11 @@ err = EIO; goto out; } + /* First stop receive and interupts while we allocate our data */ + rm->funcs->receive_disable(rm); + rm->funcs->intr_disable(rm); + // pause("wait", hz); + /* Only ONE open() per thread */ SLIST_FOREACH(co, &rm->object_list, objects) { if (co->td == td) { @@ -250,28 +248,22 @@ RINGMAP_ERROR(Can not allocate space for ring); err = EIO; goto out; } + ring->size = SLOTS_NUMBER; /* - * create the capturing object wich will represent - * current thread and packets ring + * create the capturing object wich will represent current thread and + * its packets ring */ MALLOC(co, struct capt_object *, sizeof(struct capt_object), M_DEVBUF, (M_ZERO | M_WAITOK)); - if ( co == NULL ){ + if ( co == NULL ) { contigfree(ring, sizeof(struct ring), M_DEVBUF); err = EIO; goto out; } - - ring->size = SLOTS_NUMBER; - co->ring = ring; co->td = td; co->rm = rm; - - /* - * Insert the capturing object in the single linked list - */ SLIST_INSERT_HEAD(&rm->object_list, co, objects); /* @@ -280,25 +272,19 @@ */ if (devfs_set_cdevpriv((void *)co, clear_capt_object)) { RINGMAP_ERROR(Can not set private data!); - contigfree(ring, sizeof(struct ring), M_DEVBUF); FREE(co, M_DEVBUF); - err = EIO; goto out; } ++rm->open_cnt; + CAPT_OBJECT_DEB(co); +out: + rm->funcs->intr_enable(rm); + rm->funcs->receive_enable(rm); -#if (__RINGMAP_DEB) - print_capt_obj(co); - PRINT_RING_PTRS(co->ring); -#endif - -out: RINGMAP_UNLOCK(rm); - RINGMAP_FUNC_DEBUG(end); - return (err); } @@ -335,27 +321,20 @@ co = (struct capt_object *)data; RINGMAP_LOCK(co->rm); - if (co != NULL) { - rm = co->rm; -#if (__RINGMAP_DEB) - printf("[%s] Object to delete:\n", __func__); - print_capt_obj(co); -#endif - if (co->ring != NULL) - contigfree(co->ring, sizeof(struct ring), M_DEVBUF); + + CAPT_OBJECT_DEB(co); + + rm = co->rm; + contigfree(co->ring, sizeof(struct ring), M_DEVBUF); + co->ring = NULL; - SLIST_REMOVE(&rm->object_list, co, capt_object, objects); - FREE(co, M_DEVBUF); - data = co = NULL; + SLIST_REMOVE(&rm->object_list, co, capt_object, objects); + FREE(co, M_DEVBUF); - if (rm->open_cnt > 0) { - --rm->open_cnt; - } else { - RINGMAP_WARN(Incorrect value of rm->open_cnt); - } - } else { - RINGMAP_FUNC_DEBUG(NULL pointer to the capturing object!); - } + if (rm->open_cnt > 0) + --rm->open_cnt; + else + RINGMAP_WARN(Incorrect value of rm->open_cnt); RINGMAP_UNLOCK(rm); RINGMAP_FUNC_DEBUG(end); @@ -369,17 +348,12 @@ { struct ringmap *rm = NULL; struct capt_object *co = NULL; - vm_object_t obj; vm_map_entry_t entry; vm_pindex_t pindex; vm_prot_t prot; boolean_t wired; - - RINGMAP_FUNC_DEBUG(start); - - rm = cdev2ringmap(cdev); if ( rm == NULL ) { RINGMAP_ERROR(Null pointer to ringmap structure); @@ -388,12 +362,12 @@ } SLIST_FOREACH(co, &rm->object_list, objects) { - if (co->td == curthread){ + if (co->td == curthread) { break; } } - if ((co == NULL) || (co->ring == NULL)){ + if ((co == NULL) || (co->ring == NULL)) { RINGMAP_ERROR(Null pointer); return (EIO); } @@ -402,7 +376,7 @@ &entry, &obj, &pindex, &prot, &wired); vm_map_lookup_done(kmem_map, entry); - if (obj == kmem_object){ + if (obj == kmem_object) { RINGMAP_ERROR(Got kmem_object); } else { RINGMAP_FUNC_DEBUG(Got other obj); @@ -410,12 +384,15 @@ object = &obj; - RINGMAP_FUNC_DEBUG(start); - return (0); } +/* + * Tells usre the physical addres of ring. User process will + * use this addres in order to map the buffer in its address + * space. + */ int ringmap_read(struct cdev *cdev, struct uio *uio, int ioflag) { @@ -432,21 +409,12 @@ error = devfs_get_cdevpriv((void **)&co); if (error) { RINGMAP_ERROR(Can not access private data); - return(error); + return (error); } - if (co->td != curthread ){ - RINGMAP_ERROR(Wrong capturing object!); - return(EIO); - } + CAPT_OBJECT_DEB(co); phys_ring_addr = vtophys(co->ring); - -#if (__RINGMAP_DEB) - print_capt_obj(co); - PRINT_RING_PTRS(co->ring); -#endif - uiomove(&phys_ring_addr, sizeof(phys_ring_addr), uio); RINGMAP_FUNC_DEBUG(end); @@ -484,34 +452,30 @@ /* Sleep and wait for new packets */ case IOCTL_SLEEP_WAIT: + /* Set the new value into the adapter's TAIL register */ + rm->funcs->set_tail(co->ring->userrp, co->hw_rx_ring); - /* Count how many times we wait for new packets */ - co->ring->user_wait_kern++; - - /* Set adapter's TAIL register */ - rm->funcs->set_tail(co->ring->userrp, co->hw_rx_ring); + CAPT_OBJECT_DEB(co); -#if (RINGMAP_IOCTL_DEB) - print_capt_obj(co); - PRINT_RING_PTRS(co->ring); -#endif /* - * In the time: from user has called ioctl() until now could - * come the new packets. It means, before we are going to sleep - * it makes a sence to check if we really must do it + * Before we are going to sleep it makes a sence to check if we + * really must do it */ while (RING_IS_EMPTY(co->ring)) { RINGMAP_IOCTL(Sleep and wait for new packets); + /* Count how many times we wait for new packets */ + co->ring->user_wait_kern++; + err = tsleep(co->ring, (PRI_MAX_ITHD) | PCATCH, "ioctl", 0); - - /* go back in user-space by catching signal */ + /* go back into user-space by catching signal */ if (err) goto out; } break; + /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ case IOCTL_SYNC_TAIL: RINGMAP_LOCK(rm); @@ -519,6 +483,7 @@ RINGMAP_UNLOCK(rm); break; + case IOCTL_SETFILTER: bpf_prog = (struct bpf_program *)data; flen = bpf_prog->bf_len; @@ -527,7 +492,6 @@ err = EINVAL; goto out; } - size = flen * sizeof(*bpf_prog->bf_insns); fcode = (struct bpf_insn *)malloc(size, M_BPF, M_WAITOK); @@ -540,7 +504,6 @@ err = EINVAL; goto out; } - /* * Everything went Ok. Set the filtering function * Think about hardware support for packet filtering! @@ -548,34 +511,41 @@ co->rm->funcs->pkt_filter = ringmap_bpf_filter; break; - /* Tell to user how many queues we have */ + + /* Tell user how many queues we have */ case IOCTL_GETQUEUE_NUM: qn = rm->funcs->get_queuesnum(); *(int *)data = qn; break; + /* Associate the ring/queue with the capturing object */ case IOCTL_ATTACH_RING: + /* First stop receive and interupts while we allocate our data */ + rm->funcs->receive_disable(rm); + rm->funcs->intr_disable(rm); + qn = *(int *)data; - /* Associate the capturing object with a queue */ if (rm->funcs->set_queue(co, qn) == -1) { RINGMAP_ERROR(Queue attachment failed!); err = EINVAL; - goto out; + goto xxx; } - /* Init ring-slots with mbufs and packets adrresses */ for (i = 0 ; i < SLOTS_NUMBER ; i++) { - if (set_slot(co, i) == -1){ + if (set_slot(co, i) == -1) { RINGMAP_ERROR(Ring initialization failed!); err = EINVAL; - goto out; + goto xxx; } #if (__RINGMAP_DEB) PRINT_SLOT(co->ring, i); #endif } +xxx: + rm->funcs->intr_enable(rm); + rm->funcs->receive_enable(rm); break; @@ -585,9 +555,7 @@ } out: - RINGMAP_IOCTL(end); - return (err); } @@ -624,24 +592,20 @@ ringmap_delayed_isr(void *context, struct ringmap *rm) { struct capt_object *co = NULL; - struct timeval last_ts; RINGMAP_INTR(start); RINGMAP_LOCK(rm); /* Do the next steps only if there is capturing process */ if (rm->open_cnt > 0) { - - /* TODO: do it through our set_timestamp() */ - getmicrotime(&last_ts); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 21 04:25:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42DC51065673; Thu, 21 Oct 2010 04:25: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 CFF84106566C for ; Thu, 21 Oct 2010 04:25:47 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B29AA8FC24 for ; Thu, 21 Oct 2010 04:25:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9L4Pl1Q001576 for ; Thu, 21 Oct 2010 04:25:47 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9L4PlxF001573 for perforce@freebsd.org; Thu, 21 Oct 2010 04:25:47 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 21 Oct 2010 04:25:47 GMT Message-Id: <201010210425.o9L4PlxF001573@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 04:25:48 -0000 http://p4web.freebsd.org/@@184946?ac=10 Change 184946 by gonzo@gonzo_figaro on 2010/10/21 04:25:44 - Fix pmap-related panic in the beginning of boot-up - Improve AVR32's pmap shape by bringing changes from MIPS code Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#24 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#24 (text+ko) ==== @@ -136,6 +136,9 @@ bit_offset(SYS, MMUCR, S) | bit_offset(SYS, MMUCR, E) | bit_offset(SYS, MMUCR, I)); + /* + * TODO: check for I bit cleared instead of nops + */ nop(); nop(); nop(); nop(); nop(); nop(); nop(); nop(); } @@ -208,6 +211,7 @@ PMAP_LOCK_INIT(pmap); /* allocate the page directory page */ + /* XXX: check the allocation */ ptdpg = vm_page_alloc(NULL, 512, VM_ALLOC_NOOBJ | VM_ALLOC_NORMAL | VM_ALLOC_WIRED | VM_ALLOC_ZERO); @@ -342,14 +346,21 @@ KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, ("pmap_is_referenced: page %p is not managed", m)); - return ((m->flags & PG_FICTITIOUS) == 0 && - (m->md.pv_flags & PV_TABLE_REF) != 0); + return ((m->md.pv_flags & PV_TABLE_REF) != 0); } void pmap_clear_reference(vm_page_t m) { - avr32_impl(); + + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_clear_reference: page %p is not managed", m)); + vm_page_lock_queues(); + if (m->md.pv_flags & PV_TABLE_REF) { + m->md.pv_flags &= ~PV_TABLE_REF; + } + vm_page_unlock_queues(); + } void @@ -407,6 +418,7 @@ ent = pmap_pte(kernel_pmap, va); *ent = 0; + pmap_invalidate_page(kernel_pmap, va); } /* @@ -575,6 +587,7 @@ { // Not really sure what to do here, need to look better into it, but the // kernel should have all the pages tables needed to grow within the P3 segment + panic("%s", __func__); } /* @@ -724,9 +737,8 @@ } if (prot & VM_PROT_WRITE) { newpte |= PTE_PERM_WRITE; - // XXX: Check what's the problem with - // managed pages and PG_WRITEABLE flag - vm_page_flag_set(m, PG_WRITEABLE); + if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0) + vm_page_flag_set(m, PG_WRITEABLE); } if (prot & VM_PROT_EXECUTE) { newpte |= PTE_PERM_EXECUTE; @@ -902,6 +914,9 @@ newpte |= PTE_MANAGED; } *pte = newpte; + /* + * XXX: check for kernel pmap? + */ return (mpte); } @@ -1453,7 +1468,10 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size) { - avr32_impl(); + + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); + KASSERT(object->type == OBJT_DEVICE || object->type == OBJT_SG, + ("pmap_object_init_pt: non-device object")); } static vm_page_t @@ -1487,6 +1505,7 @@ */ return (NULL); } + // XXX: Check if it is really required if ((m->flags & PG_ZERO) == 0) { pmap_zero_page(m); } @@ -1581,12 +1600,17 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) { - break; + if (pvh->pv_list_count < pmap->pm_stats.resident_count) { + TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { + if (pmap == pv->pv_pmap && va == pv->pv_va) + break; + } + } else { + TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { + if (va == pv->pv_va) + break; } } - if (pv != NULL) { TAILQ_REMOVE(&pvh->pv_list, pv, pv_list); pvh->pv_list_count--; @@ -1594,6 +1618,7 @@ } return (pv); } + static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va) { @@ -1638,6 +1663,7 @@ static pv_entry_t get_pv_entry(pmap_t locked_pmap) { + printf("--> get_pv_entry\n"); mtx_assert(&vm_page_queue_mtx, MA_OWNED); pv_entry_count++; From owner-p4-projects@FreeBSD.ORG Thu Oct 21 17:46:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B2610656A3; Thu, 21 Oct 2010 17:46: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 422571065697 for ; Thu, 21 Oct 2010 17:46:14 +0000 (UTC) (envelope-from bcr@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2F8FE8FC16 for ; Thu, 21 Oct 2010 17:46:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9LHkE2A071063 for ; Thu, 21 Oct 2010 17:46:14 GMT (envelope-from bcr@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9LHkDW2071060 for perforce@freebsd.org; Thu, 21 Oct 2010 17:46:13 GMT (envelope-from bcr@freebsd.org) Date: Thu, 21 Oct 2010 17:46:13 GMT Message-Id: <201010211746.o9LHkDW2071060@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bcr@freebsd.org using -f From: Benedict Reuschling To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 17:46:14 -0000 http://p4web.freebsd.org/@@184962?ac=10 Change 184962 by bcr@camelot on 2010/10/21 17:45:51 Fix a bunch of typos in the man pages, no functional changes. PR: docs/151531 Submitted by: Dmitry Banshchikov (me at ubique dot spb dot ru) Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#24 edit .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#24 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#24 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -83,7 +83,7 @@ .It "Token ID 1 byte Token ID" .It "Seconds 4 bytes File time stamp" .It "Microseconds 4 bytes File time stamp" -.It "File name lengh 2 bytes File name of audit trail" +.It "File name length 2 bytes File name of audit trail" .It "File pathname N bytes + 1 NUL File name of audit trail" .El .Ss Header Token @@ -157,7 +157,7 @@ .Dq arbitrary data token contains a byte stream of opaque (untyped) data. The size of the data is calculated as the size of each unit of data -multipled by the number of units of data. +multiplied by the number of units of data. A .Dq How to print field is present to specify how to print the data, but interpretation of @@ -486,13 +486,13 @@ .It Li "Creator user ID" Ta "4 bytes" Ta "User ID of IPC creator" .It Li "Creator group ID" Ta "4 bytes" Ta "Group ID of IPC creator" .It Li "Access mode" Ta "4 bytes" Ta "Access mode" -.It Li "Sequnce number" Ta "4 bytes" Ta "Sequnce number" +.It Li "Sequence number" Ta "4 bytes" Ta "Sequence number" .It Li "Key" Ta "4 bytes" Ta "IPC key" .El .Ss Arg Token The .Dq arg -token contains informations about arguments of the system call. +token contains information about arguments of the system call. Depending on the size of the desired argument value, an Arg token may be created using .Xr au_to_arg32 3 @@ -509,7 +509,7 @@ .Ss exec_args Token The .Dq exec_args -token contains informations about arguements of the exec() system call. +token contains information about arguments of the exec() system call. An exec_args token may be created using .Xr au_to_exec_args 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" @@ -521,7 +521,7 @@ .Ss exec_env Token The .Dq exec_env -token contains current eviroment variables to an exec() system call. +token contains current environment variables to an exec() system call. An exec_args token may be created using .Xr au_to_exec_env 3 . .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#24 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#23 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#24 $ .\" .Dd May 14, 2009 .Dt AUDIT_CONTROL 5 @@ -214,7 +214,7 @@ .El .Pp The suffixes on the values are case sensitive. -If both an age and disk space value are used they are seperated by +If both an age and disk space value are used they are separated by AND or OR and both values are used to determine when audit log files expire. In the case of AND, both the age and disk space conditions must be met From owner-p4-projects@FreeBSD.ORG Thu Oct 21 17:59:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4017A1065672; Thu, 21 Oct 2010 17:59: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 0322D106566B for ; Thu, 21 Oct 2010 17:59:26 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CB1E18FC0C for ; Thu, 21 Oct 2010 17:59:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9LHxPAu073103 for ; Thu, 21 Oct 2010 17:59:25 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9LHxPVA073100 for perforce@freebsd.org; Thu, 21 Oct 2010 17:59:25 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 21 Oct 2010 17:59:25 GMT Message-Id: <201010211759.o9LHxPVA073100@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 17:59:26 -0000 http://p4web.freebsd.org/@@184964?ac=10 Change 184964 by gonzo@gonzo_figaro on 2010/10/21 17:58:53 - Remove unneccessary mtx assert Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#25 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#25 (text+ko) ==== @@ -1682,7 +1682,7 @@ if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) { return (FALSE); } - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + return (!TAILQ_EMPTY(&m->md.pv_list)); } From owner-p4-projects@FreeBSD.ORG Thu Oct 21 19:49:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E25571065679; Thu, 21 Oct 2010 19:49: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 A50E51065673 for ; Thu, 21 Oct 2010 19:49:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 92BD68FC22 for ; Thu, 21 Oct 2010 19:49:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9LJn3N8096506 for ; Thu, 21 Oct 2010 19:49:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9LJn3Sa096503 for perforce@freebsd.org; Thu, 21 Oct 2010 19:49:03 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 21 Oct 2010 19:49:03 GMT Message-Id: <201010211949.o9LJn3Sa096503@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2010 19:49:04 -0000 http://p4web.freebsd.org/@@184972?ac=10 Change 184972 by gonzo@gonzo_figaro on 2010/10/21 19:48:49 Use built-in stdargs Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/stdarg.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/stdarg.h#2 (text+ko) ==== @@ -34,16 +34,11 @@ #ifndef _VA_LIST_DECLARED #define _VA_LIST_DECLARED -typedef __va_list va_list; +typedef __va_list va_list; #endif - -#ifdef __GNUCLIKE_BUILTIN_STDARG -#define va_start(v,l) __builtin_va_start((v),l) -#define va_end __builtin_va_end -#define va_arg __builtin_va_arg -#define va_copy __builtin_va_copy -#else -#error must use buildin stdarg for now -#endif /* __GNUCLIKE_BUILTIN_STDARG */ +#define va_start(v,l) __builtin_va_start((v),l) +#define va_end __builtin_va_end +#define va_arg __builtin_va_arg +#define va_copy __builtin_va_copy #endif /* !_MACHINE_STDARG_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Oct 22 10:46:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59F8A1065672; Fri, 22 Oct 2010 10:46:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C8E81065670 for ; Fri, 22 Oct 2010 10:46:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 093B38FC14 for ; Fri, 22 Oct 2010 10:46:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9MAk0ur078249 for ; Fri, 22 Oct 2010 10:46:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9MAk0A0078246 for perforce@freebsd.org; Fri, 22 Oct 2010 10:46:00 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 22 Oct 2010 10:46:00 GMT Message-Id: <201010221046.o9MAk0A0078246@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2010 10:46:01 -0000 http://p4web.freebsd.org/@@184985?ac=10 Change 184985 by rene@rene_acer on 2010/10/22 10:45:55 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#31 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#32 integrate .. //depot/projects/docproj_nl/share/pgpkeys/garga.key#3 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2010-07-2010-09.xml#1 branch Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#31 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1130 2010/08/20 13:58:43 jkois Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1131 2010/10/18 12:43:51 gjb Exp $ 1995 @@ -5981,7 +5981,7 @@ For example, if you wish to start &man.named.8;, the included DNS server, all you need to do is: - &prompt.root; echo named_enable="YES" >> /etc/rc.conf + &prompt.root; echo 'named_enable="YES"' >> /etc/rc.conf To start up local services, place shell scripts in the /usr/local/etc/rc.d directory. These ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1629,17 +1629,21 @@ GNOME, or something else) to run after logging on. - To enable kdm, the - ttyv8 entry in /etc/ttys - has to be adapted. The line should look as follows: + To enable kdm, different files + need to be edited depending on the version of + KDE. - For KDE3: + For KDE3, the ttyv8 + entry in /etc/ttys has to be adapted as + follows: ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure - For KDE4: + For KDE4, you have to add the + following lines to /etc/rc.conf: - ttyv8 "/usr/local/kde4/bin/kdm -nodaemon" xterm on secure + local_startup="${local_startup} /usr/local/kde4/etc/rc.d" +kdm4_enable="YES" ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#32 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/share/pgpkeys/garga.key#3 (text+ko) ==== @@ -1,13 +1,17 @@ - + uid Renato Botelho uid Renato Botelho +uid Renato Botelho +uid Renato Botelho +uid Renato Botelho +uid Renato Botelho sub 1024g/7B295760 2003-12-16 ]]> From owner-p4-projects@FreeBSD.ORG Fri Oct 22 20:18:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A8BB1065674; Fri, 22 Oct 2010 20:18: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 39CD6106566C for ; Fri, 22 Oct 2010 20:18:18 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 24D928FC0A for ; Fri, 22 Oct 2010 20:18:18 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9MKIIaK097688 for ; Fri, 22 Oct 2010 20:18:18 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9MKIAhN097685 for perforce@freebsd.org; Fri, 22 Oct 2010 20:18:10 GMT (envelope-from trasz@freebsd.org) Date: Fri, 22 Oct 2010 20:18:10 GMT Message-Id: <201010222018.o9MKIAhN097685@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 185001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2010 20:18:18 -0000 http://p4web.freebsd.org/@@185001?ac=10 Change 185001 by trasz@trasz_victim on 2010/10/22 20:17:55 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#27 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#27 integrate .. //depot/projects/soc2009/trasz_limits/bin/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/chflags/chflags.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/extern.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/keyword.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.1#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/rm/rm.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/rm/rm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/cd.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/error.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#14 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/input.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mail.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#11 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/nodes.c.pat#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/options.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/output.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#15 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/redir.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#15 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/shell.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/show.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#10 integrate .. //depot/projects/soc2009/trasz_limits/bin/stty/stty.1#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#6 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/plockstat/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/usr.sbin/plockstat/plockstat.1#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/coff-x86_64.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/efi-app-x86_64.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/binutils/bfd/targets.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/include/coff/internal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/include/coff/x86_64.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bzip2/decompress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee.c#4 integrate .. //depot/projects/soc2009/trasz_limits/contrib/ee/ee_version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/gcc/config/rs6000/freebsd.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/ChangeLog#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/FREEBSD-upgrade#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/README#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/TODO#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/aclocal.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/changes.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/configure#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/configure.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/disclaimer.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/f2c.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/f2cext.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/g2c.hin#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/F77_aloc.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/Notice#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/README.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/Version.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/abort_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_cos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_div.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_exp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_log.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_sin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/c_sqrt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/cabs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/configure#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/configure.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_acos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_asin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_atan.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_atn2.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_cnjg.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_cos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_cosh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_dim.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_exp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_imag.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_int.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_lg10.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_log.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_mod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_nint.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_prod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_sign.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_sin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_sinh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_sqrt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_tan.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/d_tanh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/derf_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/derfc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/dtime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/ef1asc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/ef1cmc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/erf_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/erfc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/etime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/exit_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/f2ch.add#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/getarg_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/getenv_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_dim.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_dnnt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_indx.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_len.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_mod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_nint.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/h_sign.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/hl_ge.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/hl_gt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/hl_le.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/hl_lt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_dim.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_dnnt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_indx.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_len.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_mod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_nint.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/i_sign.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/iargc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/l_ge.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/l_gt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/l_le.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/l_lt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/lbitbits.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/lbitshft.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/main.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/makefile.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_ci.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_dd.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_di.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_hh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_ii.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_qq.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_ri.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_zi.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/pow_zz.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/qbitbits.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/qbitshft.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_acos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_asin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_atan.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_atn2.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_cnjg.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_cos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_cosh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_dim.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_exp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_imag.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_int.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_lg10.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_log.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_mod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_nint.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_sign.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_sin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_sinh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_sqrt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_tan.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/r_tanh.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_cat.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_cmp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_copy.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_paus.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_rnge.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/s_stop.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/setarg.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/setsig.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/sig_die.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/signal1.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/signal1.h0#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/signal_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/system_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_abs.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_cos.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_div.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_exp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_log.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_sin.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libF77/z_sqrt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/Notice#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/README.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/Version.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/backspace.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/close.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/config.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/configure#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/configure.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/dfe.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/dolio.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/due.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/endfile.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/err.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/f2ch.add#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/fio.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/fmt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/fmt.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/fmtlib.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/fp.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/ftell_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/iio.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/ilnw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/inquire.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/lio.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/lread.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/lwrite.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/makefile.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/open.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/rdfmt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/rewind.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/rsfe.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/rsli.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/rsne.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/sfe.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/stamp-h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/sue.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/typesize.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/uio.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/util.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/wref.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/wrtfmt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/wsfe.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/wsle.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/wsne.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libI77/xwsne.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/COPYING.LIB#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/PROJECTS#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/README#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/Version.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/access_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/acconfig.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/aclocal.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/alarm_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/chdir_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/chmod_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/config.hin#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/configure#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/configure.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/ctime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/date_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/datetime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/dtime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/etime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/fdate_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/fgetc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/flush1_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/fnum_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/fputc_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/fstat_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/gerror_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/getcwd_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/getgid_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/getlog_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/getpid_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/getuid_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/gmtime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/hostnm_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/idate_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/ierrno_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/irand_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/isatty_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/itime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/kill_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/link_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/lnblnk_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/lstat_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/ltime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/mclock_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/perror_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/rand_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/rename_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/secnds_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/second_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/sleep_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/srand_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/stamp-h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/stat_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/symlnk_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/sys_clock_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/time_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/ttynam_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/u77-test.f#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/umask_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/unlink_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/vxtidate_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/libU77/vxttime_.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/permission.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/libf2c/readme.netlib#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/CREDITS.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/LICENSE.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.common#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.config.in#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.rules#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/ModuleInfo.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/AutoRegen.sh#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/ExportMap.map#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/LICENSE.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/README.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/config.guess#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/config.sub#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/configure.ac#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/depcomp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/install-sh#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/ltmain.sh#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/bison.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/build_exeext.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/c_printf_a.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/check_gnu_make.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/config_makefile.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/config_project.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_flag_check.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_namespaces.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/find_std_program.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/flex.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_isinf.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_isnan.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/func_mmap_file.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/huge_val.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/libtool.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/link_options.m4#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/ltdl.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/path_perl.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/path_tclsh.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/rand48.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/sanity_check.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/single_cxx_check.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/missing#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/mkinstalldirs#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm.gpr#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm.ads#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/Makefile.ocaml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/llvm_target.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/llvm_target.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/target/target_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/build-for-llvm-top.sh#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/configure#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Core.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/ExecutionEngine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Target.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/lto.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APInt.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseMap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseSet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/FoldingSet.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/NullablePtr.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/STLExtras.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallVector.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringMap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringRef.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringSet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/StringSwitch.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Triple.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ValueMap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ilist.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/iterator.cmake#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/iterator.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DebugInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Dominators.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopPass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Passes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/PointerTracking.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/PostDominators.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/RegionInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/RegionIterator.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/RegionPrinter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ValueTracking.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Assembly/AssemblyAnnotationWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/AutoUpgrade.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/Archive.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CallGraphSCCPass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Passes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Action.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/AutoGenerated.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Common.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Error.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Main.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Main.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CompilerDriver/Tool.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/AsmParsers.def.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/Disassemblers.def.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/Targets.def.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/config.h.cmake#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/config.h.in#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Constants.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/DerivedTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalValue.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instruction.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instructions.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicInst.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsARM.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicsX86.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LLVMContext.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllPasses.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllVMCore.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Linker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/ELFObjectWriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAssembler.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCContext.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCDwarf.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCELFSymbolFlags.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectWriter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSectionELF.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCStreamer.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Metadata.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Module.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Pass.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassAnalysisSupport.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassManager.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassManagers.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassRegistry.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassSupport.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/COFF.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CallSite.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Casting.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CommandLine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Compiler.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ConstantRange.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CrashRecoveryContext.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataFlow.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/DataTypes.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ELF.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ErrorHandling.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/GraphWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRBuilder.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRReader.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MachO.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MathExtras.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PassNameParser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PatternMatch.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Regex.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Registry.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SourceMgr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StandardPasses.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/SystemUtils.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/TypeBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/raw_ostream.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DataTypes.h.cmake#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DataTypes.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/LICENSE.TXT#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Memory.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Path.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Process.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Program.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Signals.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/ThreadLocal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/Target.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmParser.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetCallingConv.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetData.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLowering.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetMachine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOpcodes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOptions.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegistry.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetSelect.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Scalar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Local.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/ValueMapper.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Type.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Use.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Value.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ValueSymbolTable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasDebugger.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CFGPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CaptureTracking.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ConstantFolding.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DebugInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DomPrinter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IVUsers.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InlineCost.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InstCount.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IntervalPartition.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Lint.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LiveValues.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PointerTracking.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PostDominators.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/RegionInfo.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/RegionPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ValueTracking.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLToken.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/Parser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Analysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELF.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCMetadata.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCStrategy.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IfConversion.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveInterval.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveVariables.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LocalStackSlotAllocation.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineCSE.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineDominators.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunction.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineInstr.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineLICM.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineSink.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Solution.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PHIElimination.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PHIElimination.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PeepholeOptimizer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RenderMachineFunction.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RenderMachineFunction.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SplitKit.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SplitKit.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Splitter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Splitter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackProtector.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TailDuplication.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegMap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Action.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Main.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Plugin.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/LinkModules.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/ELFObjectWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmStreamer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAssembler.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCContext.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDDisassembler.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDInst.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDInst.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDOperand.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDOperand.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDToken.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDisassembler/EDToken.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCDwarf.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCELFStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCMachOStreamer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCNullStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCObjectStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MachObjectWriter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/WinCOFFStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APFloat.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APInt.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/COPYRIGHT.regex#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/ConstantRange.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/CrashRecoveryContext.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/ErrorHandling.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FoldingSet.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/PrettyStackTrace.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SlowOperationInformer.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SmallVector.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Statistic.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringRef.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SystemUtils.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Triple.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/raw_ostream.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/DynamicLibrary.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Path.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/RWMutex.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/ThreadLocal.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Path.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Signals.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/ThreadLocal.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Path.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Signals.inc#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/ThreadLocal.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMAsmPrinter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMCallingConv.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMGlobalMerge.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMMCInstLower.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMMCInstLower.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMSubtarget.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmParser/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMMCInstLower.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMMCInstLower.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/CMakeLists.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/NEONMoveFix.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/NEONPreAllocPass.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/README-Thumb.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/README-Thumb2.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/README.txt#3 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/TargetInfo/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/TargetInfo/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaBranchSelector.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaCodeEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaLLRP.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AsmPrinter/AlphaAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AsmPrinter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/TargetInfo/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/TargetInfo/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/AsmPrinter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/TargetInfo/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/TargetInfo/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/CBackend.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/TargetInfo/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/TargetInfo/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/AsmPrinter/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/AsmPrinter/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/README.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUCallingConv.td#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUOperands.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/TargetInfo/CMakeLists.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/TargetInfo/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CppBackend/CMakeLists.txt#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 23 20:08:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACFA91065672; Sat, 23 Oct 2010 20:08:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D57F106566C for ; Sat, 23 Oct 2010 20:08:17 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 586528FC12 for ; Sat, 23 Oct 2010 20:08:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o9NK8H86097018 for ; Sat, 23 Oct 2010 20:08:17 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o9NK8HwM097015 for perforce@freebsd.org; Sat, 23 Oct 2010 20:08:17 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sat, 23 Oct 2010 20:08:17 GMT Message-Id: <201010232008.o9NK8HwM097015@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to dforsyth@FreeBSD.org using -f From: David Forsythe To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 185022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2010 20:08:17 -0000 http://p4web.freebsd.org/@@185022?ac=10 Change 185022 by dforsyth@skunk on 2010/10/23 20:07:36 Rewrite pkg_info to use new design Affected files ... .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.c#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.h#3 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#6 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#6 edit .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.c#4 delete .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_freebsd.h#4 delete .. //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#5 edit .. //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_dump/pkg_dump.c#4 edit .. //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_info/pkg_info.c#3 edit Differences ... ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.c#5 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/database.h#5 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.c#3 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/file.h#3 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.c#6 (text+ko) ==== @@ -53,6 +53,12 @@ return (pkg->name); } +const char * +pkg_format_revision(struct pkg *pkg) +{ + return (pkg->format_revision); +} + void _pkg_set_name(struct pkg *pkg, const char *name) { ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg.h#6 (text+ko) ==== ==== //depot/projects/soc2010/dforsyth_libpkg/libpkg/pkg_pkg.h#5 (text+ko) ==== @@ -16,6 +16,7 @@ const char *pkg_comment(struct pkg *); const char *pkg_description(struct pkg *); +const char *pkg_format_revision(struct pkg *); void _pkg_set_origin(struct pkg *, const char *); ==== //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_dump/pkg_dump.c#4 (text+ko) ==== @@ -60,53 +60,13 @@ printf("\n"); } + + pkg = pkg_db_get(db, "vim-lite-7.3.21"); + printf("second: %s\n", pkg_name(pkg)); + free(pkgs); pkg_db_finish(db); return (0); -#if 0 - for (pkgname = *pkglist; pkgname != NULL; pkgname++) { - p = pkg_db_get(db, pkgname); - - printf("Package Name: %s\n", pkg_info(p, "name")); - printf("\tOrigin: %s\n", pkg_info(p, "origin")); - printf("\tFiles:\n"); - - pkgfiles = pkg_info_files(p); - pkgdeps = pkg_depends(p); - pkgcon = pkg_conflicts(p); - - pkgdeps = pkg_info_list(p, "dependencies"); - - - - while (pkg_freebsd_get_next_file(p, &f) == PKG_OK) { - printf("\t\t%s/%s\n", - pkg_freebsd_file_get_prefix(&f), - pkg_freebsd_file_get_pathname(&f)); - printf("\t\t\tMD5: %s\n", pkg_freebsd_file_get_hash(&f)); - printf("\t\t\tIgnored: %s\n", - (pkg_freebsd_file_get_ignored(&f) ? - "TRUE" : - "FALSE")); - } - printf("\tDependencies:\n"); - while (pkg_freebsd_get_next_dependency(p, &d) == PKG_OK) { - printf("\t\t%s\n", pkg_freebsd_dependency_get_name(&d)); - printf("\t\t\tOrigin: %s\n", - pkg_freebsd_dependency_get_origin(&d)); - } - printf("\tConflicts:\n"); - list = pkg_info(p, "conflicts", "expr"); - while (pkg_freebsd_get_next_conflict(p, &c) == PKG_OK) { - printf("\t\t%s\n", pkg_freebsd_conflict_get_expression(&c)); - } - - pkg_db_finish(db, p); - } - - pkg_db_free(db); -#endif } - ==== //depot/projects/soc2010/dforsyth_libpkg/pkg_install/pkg_info/pkg_info.c#3 (text+ko) ==== @@ -13,8 +13,6 @@ #include /* Libpkg base. */ #include -/* FreeBSD package and database. */ -#include #if 0 /* FreeBSD routines. */ @@ -108,9 +106,10 @@ static int pkg_info(struct info_config *); static int pattern_match(match_t, const char *, const char *); static int pkg_info_hash_match(struct pkg_file *); -static void print_chunk(struct pkg *, const char *(*)(struct pkg *), - const char *, struct info_config *); +static void print_chunk(const char *, const char *, struct info_config *); +#if 0 static void print_file(const char *, const char *, struct info_config *); +#endif /* Configuration for pkg_info run. */ struct info_config c; @@ -364,104 +363,83 @@ int r; int s; unsigned int match_count; + struct pkg_list *pkgs; + struct pkg_file_list *files; struct pkg_target *pt; - struct pkg_file f; FILE *pkg_fp; (void)pkg_fp; - char *target; - struct stat sb; - const char *pathname; + // char *target; + // struct stat sb; + // const char *pathname; char path[PATH_MAX]; - struct pkg_database *db; - struct pkg *p; + struct pkg_db *db; + struct pkg *pkg; + struct pkg_file *file; + + db = pkg_db_create(); + s = pkg_db_open(db, _c->database_location); - db = pkg_freebsd_database_create(); - p = pkg_freebsd_create(); - s = pkg_database_open(db, _c->database_location, 0); if (s != PKG_OK) { warnx("Error opening database"); - pkg_database_release(db); - pkg_release(p); + pkg_db_finish(db); return (1); } r = 0; - if (FLAGGED(_c->show_flags, SHOW_PKGNAME)) { - while (pkg_database_get_next_pkg(db, p, _c->skip_flags) == - PKG_OK) { + pkgs = pkg_db_all(db); + if (_c->show_flags & SHOW_PKGNAME) { + TAILQ_FOREACH(pkg, pkgs, next) { if (!_c->quiet) { printf("%s", _c->info_prefix); } - printf("%s\n", pkg_freebsd_get_name(p)); + printf("%s\n", pkg_name(pkg)); } } else if (_c->check_package != NULL) { - while (pkg_database_get_next_pkg(db, p, _c->skip_flags) == - PKG_OK) { - if (strcmp(_c->check_package, - pkg_freebsd_get_name(p)) == 0) { - /* Get out. */ - pkg_database_close(db); - pkg_database_release(db); - pkg_release(p); - return (0); - } + r = 1; + TAILQ_FOREACH(pkg, pkgs, next) { + if (strcmp(_c->check_package, pkg_name(pkg)) == 0) + r = 0; } - r = 1; } else if (!STAILQ_EMPTY(&_c->which)) { - /* Clean up the targets. */ STAILQ_FOREACH(pt, &_c->which, next) { - if (stat(pt->target, &sb) < 0) { - target = pkg_exec_run("/usr/bin/which %s", - pt->target); - if (target != NULL) { - warnx("Can't find %s\n", pt->target); - } else { - strcpy(pt->target, target); - } + if (access(pt->target, F_OK) < 0) { + /* Check target with which. */ } } - pkg_database_rewind(db); - while (pkg_database_get_next_pkg(db, p, _c->skip_flags) == - PKG_OK) { - while (pkg_freebsd_get_next_file(p, &f) == PKG_OK) { - pathname = pkg_freebsd_file_get_pathname(&f); - strcpy(path, pkg_freebsd_file_get_prefix(&f)); - strcat(path, "/"); - strcat(path, pathname); + TAILQ_FOREACH(pkg, pkgs, next) { + files = pkg_files(pkg); + TAILQ_FOREACH(file, files, next) { + snprintf(path, PATH_MAX, "%s/%s", + pkg_file_prefix(file), + pkg_file_pathname(file)); STAILQ_FOREACH(pt, &_c->which, next) { - if (strcmp(path, pt->target) == 0) { - printf("%s was installed by " - "package %s\n", pt->target, - pkg_freebsd_get_name(p)); - } + printf("%s was installed by package " + "%s\n", pt->target, + pkg_name(pkg)); } } + + // pkg_file_list_release(files); } } else if (_c->lookup_origin != NULL) { - if (!_c->quiet) { - printf("The following installed package(s) has %s " - "origin:\n", _c->lookup_origin); - } - while (pkg_database_get_next_pkg(db, p, _c->skip_flags) == - PKG_OK) { - if (strcmp(_c->lookup_origin, - pkg_freebsd_get_origin(p)) == 0) { - printf("%s\n", pkg_freebsd_get_name(p)); - } + if (!_c->quiet) + printf("The following installed packages(s) has %s " + "origin:\n", _c->lookup_origin); + TAILQ_FOREACH(pkg, pkgs, next) { + if (strcmp(_c->lookup_origin, pkg_origin(pkg)) == 0) + printf("%s\n", pkg_name(pkg)); } } else { match_count = 0; - while (pkg_database_get_next_pkg(db, p, _c->skip_flags) == - PKG_OK) { + TAILQ_FOREACH(pkg, pkgs, next) { if (_c->match == MATCH_ALL) { - info_show(p, _c); + info_show(pkg, _c); match_count++; } else { STAILQ_FOREACH(pt, &_c->targets, next) { if (pattern_match(_c->match, - pkg_freebsd_get_name(p), - pt->target)) { - info_show(p, _c); + pkg_name(pkg), pt->target)) { + info_show(pkg, _c); match_count++; } } @@ -488,9 +466,7 @@ } } - pkg_database_close(db); - pkg_database_release(db); - pkg_release(p); + pkg_db_finish(db); return (r); } @@ -523,6 +499,7 @@ { (void)string; (void)pattern; + /* I have no desire to write this. */ return (1); } @@ -557,86 +534,90 @@ } static int -info_show(struct pkg *_p, struct info_config *_c) +info_show(struct pkg *pkg, struct info_config *_c) { /* TODO: Break this up into smaller functions to make it readable. Too * many levels of indentation. */ - const char *show; const char *prefix; const char *last_prefix; + + // struct pkg_conflict_list *conflicts; + struct pkg_depend_list *depends; + struct pkg_file_list *files; + + // struct pkg_conflict *conflict; + struct pkg_depend *depend; + struct pkg_file *file; - struct pkg_conflict cn; - struct pkg_dependency dp; - struct pkg_file fl; + if (FLAGGED(_c->show_flags, SHOW_INDEX)) + printf("%-19s %s\n", pkg_name(pkg), pkg_comment(pkg)); + else { + if (!_c->quiet) + printf("%sInformation for %s:\n\n", _c->info_prefix, + pkg_name(pkg)); + else + printf("%s%s:", _c->info_prefix, pkg_name(pkg)); - if (FLAGGED(_c->show_flags, SHOW_INDEX)) { - /* No newline because _data_read picks that up from the file. */ - printf("%-19s %s", pkg_freebsd_get_name(_p), - pkg_freebsd_get_comment(_p)); - } else { - if (!_c->quiet) { - printf("%sInformation for %s:\n\n", _c->info_prefix, - pkg_freebsd_get_name(_p)); - } else { - printf("%s%s:", _c->info_prefix, - pkg_freebsd_get_name(_p)); - } - if (FLAGGED(_c->show_flags, SHOW_PLIST)) { + if (_c->show_flags & SHOW_PLIST) + if (!_c->quiet) + printf("%sPacking list:\n", _c->info_prefix); + + if (_c->show_flags & SHOW_PLIST) /* TODO: Write a show plist function for this flag * because the output is jacked in this case. */ - if (!_c->quiet) { + if (!_c->quiet) printf("%sPacking list:\n", _c->info_prefix); + + if (_c->show_flags & SHOW_COMMENT) + print_chunk(pkg_comment(pkg), "Comment:\n", _c); + + if (_c->show_flags & SHOW_CONFLICTS) { + if (!_c->quiet) {} +#if 0 + TAILQ_FOREACH(conflict, conflicts, next) { + printf((_c->quiet ? "@conflicts: %s\n" : + "Conflicts %s\n"), + pkg_conflict_expr(conflict)); } +#endif } - if (FLAGGED(_c->show_flags, SHOW_COMMENT)) { - print_chunk(_p, pkg_freebsd_get_comment, "Comment:\n", - _c); - } - if (FLAGGED(_c->show_flags, SHOW_CONFLICTS)) { - if (!_c->quiet) { - /* Eh, no title on this one... */ - } - while (pkg_freebsd_get_next_conflict(_p, &cn) == - PKG_OK) { - printf((_c->quiet ? "@conflicts: %s\n" : - "Conflicts: %s\n"), - pkg_freebsd_conflict_get_expression(&cn)); - } - } - if (FLAGGED(_c->show_flags, SHOW_DEPEND)) { - if (!_c->quiet) { + + if (_c->show_flags & SHOW_DEPEND) { + if (!_c->quiet) printf("%sDepends on:\n", _c->info_prefix); - } - while (pkg_freebsd_get_next_dependency(_p, &dp) == - PKG_OK) { - show = pkg_freebsd_dependency_get_name(&dp); - printf((_c->quiet ? "@pkgdep: %s\n" : - "Dependency: %s\n"), show); - show = pkg_freebsd_dependency_get_origin(&dp); - printf((_c->quiet ? "@comment DEPORIGIN:%s\n" : - "\tdependency origin: %s\n"), show); + + depends = pkg_depends(pkg); + TAILQ_FOREACH(depend, depends, next) { + printf((_c->quiet ? "@pkgdep: %s\n" : + "Dependency: %s\n"), + pkg_depend_name(depend)); + printf((_c->quiet ? "@comment DEPORIGIN: %s\n" : + "\tdependency origin: %s\n"), + pkg_depend_origin(depend)); } /* Separator. */ printf("\n"); } - if (FLAGGED(_c->show_flags, SHOW_REQBY)) { - if (!_c->quiet) { + + if (_c->show_flags & SHOW_REQBY) { + if (_c->quiet) printf("%sRequired by:\n", _c->info_prefix); - } - while ((show = pkg_freebsd_get_next_required_by(_p)) != - NULL) { - printf("%s\n", show); - } + +#if 0 + TAILQ_FOREACH(reqby, reqbys, next) + printf("%s\n", pkg_reqby_name(reqby)); +#endif } - if (FLAGGED(_c->show_flags, SHOW_DESCRIPTION)) { - print_chunk(_p, pkg_freebsd_get_description, - "Description\n", _c); - } - if (FLAGGED(_c->show_flags, SHOW_DISPLAY)) { - print_chunk(_p, pkg_freebsd_get_display, - "Install notice:\n", _c); - } - if (FLAGGED(_c->show_flags, SHOW_REQUIRE)) { + + if (_c->show_flags & SHOW_DESCRIPTION) + print_chunk(pkg_description(pkg), "Description\n", _c); + +#if 0 + if (_c->show_flags & SHOW_DISPLAY) + print_chunk(pkg_display(pkg), "Install notice:\n", _c); +#endif + + if (_c->show_flags & SHOW_REQUIRE) { #if 0 show = pkg_freebsd_get_require(_p); if (show != NULL) { @@ -645,113 +626,104 @@ } #endif } - if (FLAGGED(_c->show_flags, SHOW_INSTALL)) { - show = pkg_freebsd_get_install_script_path(_p); - if (show != NULL) { - print_file(show, "Install script:\n", _c); - } - show = pkg_freebsd_get_post_install_script_path(_p); - if (show != NULL) { - print_file(show, "Post-install script:\n", _c); - } + +#if 0 + if (_c->show_flags & SHOW_INSTALL) { + /* TODO: check if these exist before printing them. */ + print_file(pkg_install_script(pkg), + "Install script:\n", _c); + print_file(pkg_post_install_script(pkg), + "Post-install script:\n", _c); } - if (FLAGGED(_c->show_flags, SHOW_DEINSTALL)) { - show = pkg_freebsd_get_deinstall_script_path(_p); - if (show != NULL) { - print_file(show, "Deinstall script:\n", _c); - } - show = pkg_freebsd_get_post_deinstall_script_path(_p); - if (show != NULL) { - print_file(show, "Post-deinstall script:\n", _c); - } + + if (_c->show_flags & SHOW_DEINSTALL) { + print_file(pkg_deinstall_script(pkg), + "Deinstall script:\n", _c); + print_file(pkg_post_deinstall_script(pkg), + "Post-deinstall script:\n", _c); } - if (FLAGGED(_c->show_flags, SHOW_MTREE)) { - } - if (FLAGGED(_c->show_flags, SHOW_PREFIX)) { + + if (_c->show_flags & SHOW_MTREE) ; + + + if (_c->show_flags & SHOW_PREFIX) { /* XXX: I need to think about how to deal with this. * For now, only dump prefix when using SHOW_FILE * aswell. */ } - if (FLAGGED(_c->show_flags, SHOW_FILES)) { - /* Not the same as showing files for SHOW_PLIST. - * */ - if (!_c->quiet) { - printf("%sFiles:\n", _c->info_prefix); - } +#endif + if (_c->show_flags & SHOW_FILES) { + /* Not the same as showing files for SHOW_PLIST. */ + if (!_c->quiet) printf("%sFiles:\n", _c->info_prefix); + prefix = NULL; last_prefix = NULL; - while (pkg_freebsd_get_next_file(_p, &fl) == PKG_OK) { - if (last_prefix == NULL) { - last_prefix = - pkg_freebsd_file_get_prefix(&fl); - } else { - /* Check the prefix to see if it's - * changed. */ - prefix = - pkg_freebsd_file_get_prefix(&fl); - if (strcmp(prefix, last_prefix) == 0) { + + files = pkg_files(pkg); + TAILQ_FOREACH(file, files, next) { + if (last_prefix == NULL) + pkg_file_prefix(file); + else { + /* Check to see is the prefix has + * changes. */ + prefix = pkg_file_prefix(file); + if (strcmp(prefix, last_prefix) == 0) last_prefix = prefix; - } } - if (!pkg_freebsd_file_get_ignored(&fl)) { + + if (!pkg_file_ignore(file)) printf("%s/%s\n", last_prefix, - pkg_freebsd_file_get_pathname(&fl)); - } + pkg_file_pathname(file)); } } - if (FLAGGED(_c->show_flags, SHOW_SIZE)) { - } - if (FLAGGED(_c->show_flags, SHOW_CHECKSUM_CHECK)) { - if (!_c->quiet) { + + if (_c->show_flags & SHOW_SIZE) {} + + if (_c->show_flags & SHOW_CHECKSUM_CHECK) { + if (_c->quiet) printf("%sMismatched Checksums:\n", - _c->info_prefix); - } - while (pkg_freebsd_get_next_file(_p, &fl) == PKG_OK) { - if (pkg_info_hash_match(&fl)) { - if (!_c->verbose) { - /* - * This is gross, but I need - * some help with the 80 column - * barrier in this function :) - */ - continue; - } - printf("%s/%s matched the original MD5 " - "checksum\n", - pkg_freebsd_file_get_prefix(&fl), - pkg_freebsd_file_get_pathname(&fl)); - } else { + _c->info_prefix); + + files = pkg_files(pkg); + TAILQ_FOREACH(file, files, next) { + if (pkg_info_hash_match(file)) { + if (_c->verbose) + printf("%s/%s matched the " + "original MD5 " + "checksum\n", + pkg_file_prefix(file), + pkg_file_pathname(file)); + } else printf("%s/%s fails the original MD5 " - "checksum\n", - pkg_freebsd_file_get_prefix(&fl), - pkg_freebsd_file_get_pathname(&fl)); - } + "checksum\n", + pkg_file_prefix(file), + pkg_file_pathname(file)); } } - if (FLAGGED(_c->show_flags, SHOW_ORIGIN)) { - if (!_c->quiet) { - printf("%sOrigin:\n", _c->info_prefix); - } - printf("%s\n", pkg_freebsd_get_origin(_p)); + + if (_c->show_flags & SHOW_ORIGIN) { + if (_c->quiet) printf("%sOrigin:\n", _c->info_prefix); + + printf("%s\n", pkg_origin(pkg)); } - if (FLAGGED(_c->show_flags, SHOW_FMTREV)) { - if (!_c->quiet) { + + if (_c->show_flags & SHOW_FMTREV) { + if (_c->quiet) printf("%sFormat revision:\n", _c->info_prefix); - } - printf("%s\n", pkg_freebsd_get_format_revision(_p)); + + printf("%s\n", pkg_format_revision(pkg)); } + } - /* A bit of seperation. */ - if (!FLAGGED(_c->show_flags, SHOW_INDEX)) { - /* Adds an extra newline to SHOW_INDEX dumps. */ - printf("\n"); - } + /* Adds an extra newline to SHOW_INDEX dumps. */ + if (!(_c->show_flags & SHOW_INDEX)) printf("\n"); + return (0); } static int -pkg_info_hash_match(struct pkg_file *f) +pkg_info_hash_match(struct pkg_file *file) { char path[PATH_MAX]; char hash[33]; @@ -760,14 +732,10 @@ char link_buf[PATH_MAX]; struct stat sb; - _pkg_util_path_join(path, pkg_freebsd_file_get_prefix(f), - pkg_freebsd_file_get_pathname(f)); + snprintf(path, PATH_MAX, "%s/%s", pkg_file_prefix(file), + pkg_file_pathname(file)); + if (lstat(path, &sb) < 0) { - /* - * Technically, we're better than the current pkg_info here. - * pkg_info reports that a file doesn't exist just because it - * can't open it. That's a bug. - */ warnx("%s does not exist", path); return (0); } @@ -780,56 +748,43 @@ calc_hash = NULL; if (S_ISLNK(sb.st_mode)) { link_len = readlink(path, link_buf, PATH_MAX); - if (link_len > 0) { + + if (link_len > 0) calc_hash = MD5Data(link_buf, link_len, hash); - } - } else if (S_ISREG(sb.st_mode)) { + } else if (S_ISREG(sb.st_mode)) calc_hash = MD5File(path, hash); - } - if (calc_hash != NULL) { - if (strcmp(calc_hash, pkg_freebsd_file_get_hash(f)) != 0) { - return (0); - } else { - return (1); - } - } + + if (calc_hash != NULL) + return ((strcmp(calc_hash, pkg_file_hash(file)) == 0 ? 1 : 0)); return (0); } static void -print_chunk(struct pkg *p, const char *(*get_callback) (struct pkg *), - const char *title, struct info_config *_c) +print_chunk(const char *chunk, const char *title, struct info_config *_c) { - const char *chunk; + if (!_c->quiet) printf("%s%s", _c->info_prefix, title); - if (!_c->quiet) { - printf("%s%s", _c->info_prefix, title); - } - - chunk = get_callback(p); - if (chunk != NULL) { - printf("%s", chunk); - } + if (chunk != NULL) printf("%s", chunk); } +#if 0 static void print_file(const char *pathname, const char *title, struct info_config *_c) { FILE *fp; char line[LINE_MAX]; - if (!_c->quiet) { - printf("%s%s", _c->info_prefix, title); - } + if (!_c->quiet) printf("%s%s", _c->info_prefix, title); fp = fopen(pathname, "r"); - if (fp == NULL) { + if (fp == NULL) warnx("Error: %s: Can't open '%s' for reading!\n", __func__, pathname); - } - while (fgets(line, LINE_MAX, fp) != NULL) { + + while (fgets(line, LINE_MAX, fp) != NULL) printf("%s", line); - } + printf("\n"); } +#endif