From owner-p4-projects@FreeBSD.ORG Thu Jul 15 13:31:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFA0B1065674; Thu, 15 Jul 2010 13:31: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 7BDA91065672 for ; Thu, 15 Jul 2010 13:31:17 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69D8F8FC17 for ; Thu, 15 Jul 2010 13:31:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6FDVHPO046454 for ; Thu, 15 Jul 2010 13:31:17 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6FDVHWd046452 for perforce@freebsd.org; Thu, 15 Jul 2010 13:31:17 GMT (envelope-from afiveg@FreeBSD.org) Date: Thu, 15 Jul 2010 13:31:17 GMT Message-Id: <201007151331.o6FDVHWd046452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180994 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, 15 Jul 2010 13:31:18 -0000 http://p4web.freebsd.org/@@180994?ac=10 Change 180994 by afiveg@cottonmouth on 2010/07/15 13:31:15 cosmetic fixes Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#12 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#12 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#15 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#20 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#27 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#26 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#24 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#16 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#31 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#31 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#2 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#15 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#16 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#10 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#9 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#12 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#12 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#15 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#20 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#27 (text+ko) ==== @@ -1382,7 +1382,10 @@ { struct adapter *adapter = context; struct ifnet *ifp = adapter->ifp; + +#ifdef RINGMAP struct capt_object *co = NULL; +#endif if (ifp->if_drv_flags & IFF_DRV_RUNNING) { #ifdef RINGMAP ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#26 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#24 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#16 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#31 (text+ko) ==== @@ -273,7 +273,23 @@ ringmap_mmap(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size, struct vm_object **object, int nprot) { + vm_object_t obj; + vm_map_entry_t entry; + vm_pindex_t pindex; + vm_prot_t prot; + boolean_t wired; + + vm_map_lookup(&kmem_map, addr, VM_PROT_ALL, + &entry, &obj, &pindex, &prot, &wired); + vm_map_lookup_done(kmem_map, entry); + + if (obj == kmem_object){ + RINGMAP_ERROR(Got kmem_object); + } else { + RINGMAP_FUNC_DEBUG(Got other obj); + } + object = obj; return (0); } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#31 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#2 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#15 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#16 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#10 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#9 (text+ko) ====